diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 6d31c914..805b9a37 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -27,11 +27,11 @@ jobs: steps: - name: Checkout code if: github.event.inputs.perform_version == '' - uses: actions/checkout@v4 + uses: actions/checkout@v6 - name: Checkout full repository # Required when performing an existing release. if: github.event.inputs.perform_version != '' - uses: actions/checkout@v4 + uses: actions/checkout@v6 with: fetch-depth: '0' - name: Setup git user @@ -43,7 +43,7 @@ jobs: git config --global user.name "Kill Bill core team" git config --global url."https://${BUILD_USER}:${BUILD_TOKEN}@github.com/".insteadOf "git@github.com:" - name: Configure Java - uses: actions/setup-java@v4 + uses: actions/setup-java@v5 with: java-version: 21 distribution: temurin @@ -65,7 +65,7 @@ jobs: # Will be pushed as part of the release process, only if the release is successful git commit -m "pom.xml: update killbill-oss-parent to ${{ github.event.inputs.parent_version }}" - name: Configure settings.xml for release - uses: actions/setup-java@v4 + uses: actions/setup-java@v5 with: java-version: 21 distribution: temurin @@ -102,4 +102,3 @@ jobs: run: | PROJECT_VERSION=$(git describe --abbrev=0 | cut -d '-' -f 3) gh workflow -R killbill/killbill-oss-parent run release.yml -f commons_version=${PROJECT_VERSION} - diff --git a/clock/pom.xml b/clock/pom.xml index f6c3d091..21e07470 100644 --- a/clock/pom.xml +++ b/clock/pom.xml @@ -33,6 +33,13 @@ guice runtime + + + io.netty + netty-common + ${netty.version} + test + it.ozimov embedded-redis @@ -51,6 +58,12 @@ org.redisson redisson test + + + io.netty + netty-common + + org.slf4j diff --git a/pom.xml b/pom.xml index fa694a84..87b33d84 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ org.kill-bill.billing killbill-oss-parent - 0.146.63 + 0.147.0 org.kill-bill.commons killbill-commons @@ -66,108 +66,10 @@ true - - 1.12.0 - - 7.0.0 - - 3.0.6 - - 2.13.4 - - 2.1.0 - - 2.1.1 - - 2.0.1 - - 5.0.0 - - 3.0.2 - - 3.0.0 - - 3.30.2-GA - - 4.0.0 - - 4.0.0 - - 3.0.18 - - 11.0.24 - 21 - - 4.9.8.3 -Xmx${build.jvmsize} --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.io=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED - - com.fasterxml.jackson.jakarta.rs - jackson-jakarta-rs-json-provider - ${jackson.jakarta.rs.version} - - - com.google.inject - guice - ${guice.version} - - - com.google.inject.extensions - guice-servlet - ${guice.version} - - - jakarta.activation - jakarta.activation-api - ${jakarta.activation-api.version} - - - jakarta.inject - jakarta.inject-api - ${jakarta.inject-api.version} - - - jakarta.xml.bind - jakarta.xml.bind-api - ${jaxb-api.version} - - - org.eclipse.jetty - jetty-alpn-server - ${jetty.version} - - - org.eclipse.jetty.http2 - http2-server - ${jetty.version} - - - org.eclipse.jetty.websocket - websocket-jetty-api - ${jetty.version} - - - org.glassfish.jaxb - jaxb-runtime - ${jaxb-runtime.version} - - - - com.sun.activation - jakarta.activation - - - - - org.javassist - javassist - ${javassist.version} - org.kill-bill.commons killbill-automaton @@ -281,26 +183,4 @@ - - - - com.github.spotbugs - spotbugs-maven-plugin - ${spotbugs-maven-plugin.version} - - - org.apache.maven.plugins - maven-enforcer-plugin - - - - org.codehaus.mojo - extra-enforcer-rules - ${extra-enforcer-rules.version} - - - - -