From e3169fb9db8ceb8f5c750d971c9f3fe6c135db3f Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Tue, 21 Apr 2026 00:07:34 +0000
Subject: [PATCH 1/4] Update killbill-oss-parent to 0.147.0-e4efed1-SNAPSHOT,
 remove version properties and targetJdk

Agent-Logs-Url: https://github.com/killbill/killbill-commons/sessions/0cd0a140-7cb2-4780-9385-7e0741ebdf50

Co-authored-by: xsalefter <510438+xsalefter@users.noreply.github.com>
---
 pom.xml | 122 +-------------------------------------------------------
 1 file changed, 1 insertion(+), 121 deletions(-)

diff --git a/pom.xml b/pom.xml
index fa694a84..ff9b0f38 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.kill-bill.billing</groupId>
         <artifactId>killbill-oss-parent</artifactId>
-        <version>0.146.63</version>
+        <version>0.147.0-12af62b-SNAPSHOT</version>
     </parent>
     <groupId>org.kill-bill.commons</groupId>
     <artifactId>killbill-commons</artifactId>
@@ -66,108 +66,10 @@
     </issueManagement>
     <properties>
         <check.fail-spotbugs>true</check.fail-spotbugs>
-        <!-- killbill-oss-parent still brings extra-enforcer-rules 1.6.1, which rejects Java 21 as
-             an unknown target. Keep this local override until the parent is updated. -->
-        <extra-enforcer-rules.version>1.12.0</extra-enforcer-rules.version>
-        <!-- Used across the reactor; Guice Servlet 7 is required by jooby, metrics, and skeleton. -->
-        <guice.version>7.0.0</guice.version>
-        <!-- Used by skeleton. -->
-        <hk2.version>3.0.6</hk2.version>
-        <!-- Used by skeleton. -->
-        <jackson.jakarta.rs.version>2.13.4</jackson.jakarta.rs.version>
-        <!-- Used by automaton and xmlloader. -->
-        <jakarta.activation-api.version>2.1.0</jakarta.activation-api.version>
-        <!-- Used by jooby and skeleton. -->
-        <jakarta.annotation-api.version>2.1.1</jakarta.annotation-api.version>
-        <!-- Used by jooby, queue, jdbi, metrics, and skeleton. -->
-        <jakarta.inject-api.version>2.0.1</jakarta.inject-api.version>
-        <!-- Used by jooby, metrics, and skeleton. -->
-        <jakarta.servlet-api.version>5.0.0</jakarta.servlet-api.version>
-        <!-- Used by skeleton. -->
-        <jakarta.validation-api.version>3.0.2</jakarta.validation-api.version>
-        <!-- Used by skeleton. -->
-        <jakarta.ws.rs-api.version>3.0.0</jakarta.ws.rs-api.version>
-        <!-- Used by skeleton. -->
-        <javassist.version>3.30.2-GA</javassist.version>
-        <!-- Used by automaton and xmlloader. -->
-        <jaxb-api.version>4.0.0</jaxb-api.version>
-        <!-- Used by automaton and xmlloader. -->
-        <jaxb-runtime.version>4.0.0</jaxb-runtime.version>
-        <!-- Used by skeleton. -->
-        <jersey.version>3.0.18</jersey.version>
-        <!-- Used by skeleton and jooby. -->
-        <jetty.version>11.0.24</jetty.version>
-        <project.build.targetJdk>21</project.build.targetJdk>
-        <!-- killbill-oss-parent still brings spotbugs-maven-plugin 4.7.2.1, whose bundled ASM
-             stack cannot read Java 21 class files (major version 65). Keep this local override
-             until the parent moves to a Java-21-capable SpotBugs line. -->
-        <spotbugs-maven-plugin.version>4.9.8.3</spotbugs-maven-plugin.version>
         <surefireArgLine>-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</surefireArgLine>
     </properties>
     <dependencyManagement>
         <dependencies>
-            <dependency>
-                <groupId>com.fasterxml.jackson.jakarta.rs</groupId>
-                <artifactId>jackson-jakarta-rs-json-provider</artifactId>
-                <version>${jackson.jakarta.rs.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>com.google.inject</groupId>
-                <artifactId>guice</artifactId>
-                <version>${guice.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>com.google.inject.extensions</groupId>
-                <artifactId>guice-servlet</artifactId>
-                <version>${guice.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>jakarta.activation</groupId>
-                <artifactId>jakarta.activation-api</artifactId>
-                <version>${jakarta.activation-api.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>jakarta.inject</groupId>
-                <artifactId>jakarta.inject-api</artifactId>
-                <version>${jakarta.inject-api.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>jakarta.xml.bind</groupId>
-                <artifactId>jakarta.xml.bind-api</artifactId>
-                <version>${jaxb-api.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.eclipse.jetty</groupId>
-                <artifactId>jetty-alpn-server</artifactId>
-                <version>${jetty.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.eclipse.jetty.http2</groupId>
-                <artifactId>http2-server</artifactId>
-                <version>${jetty.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.eclipse.jetty.websocket</groupId>
-                <artifactId>websocket-jetty-api</artifactId>
-                <version>${jetty.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.glassfish.jaxb</groupId>
-                <artifactId>jaxb-runtime</artifactId>
-                <version>${jaxb-runtime.version}</version>
-                <exclusions>
-                    <exclusion>
-                        <!-- We use jakarta.activation:jakarta.activation-api instead -->
-                        <groupId>com.sun.activation</groupId>
-                        <artifactId>jakarta.activation</artifactId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
-            <dependency>
-                <groupId>org.javassist</groupId>
-                <artifactId>javassist</artifactId>
-                <version>${javassist.version}</version>
-            </dependency>
             <dependency>
                 <groupId>org.kill-bill.commons</groupId>
                 <artifactId>killbill-automaton</artifactId>
@@ -281,26 +183,4 @@
             </dependency>
         </dependencies>
     </dependencyManagement>
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>com.github.spotbugs</groupId>
-                <artifactId>spotbugs-maven-plugin</artifactId>
-                <version>${spotbugs-maven-plugin.version}</version>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-enforcer-plugin</artifactId>
-                <dependencies>
-                    <!-- Only the helper dependency version changes here; the inherited Enforcer
-                         rules/executions stay intact. -->
-                    <dependency>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>extra-enforcer-rules</artifactId>
-                        <version>${extra-enforcer-rules.version}</version>
-                    </dependency>
-                </dependencies>
-            </plugin>
-        </plugins>
-    </build>
 </project>

From b7f5514f7e41e2c14761c09c9622458013a09c10 Mon Sep 17 00:00:00 2001
From: xsalefter <xsalefter@gmail.com>
Date: Wed, 22 Apr 2026 13:49:08 +0700
Subject: [PATCH 2/4] add netty-commons dependencies explicitly

---
 clock/pom.xml | 13 +++++++++++++
 1 file changed, 13 insertions(+)

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 @@
             <artifactId>guice</artifactId>
             <scope>runtime</scope>
         </dependency>
+        <!-- required during redis testing (RedissonClient) -->
+        <dependency>
+            <groupId>io.netty</groupId>
+            <artifactId>netty-common</artifactId>
+            <version>${netty.version}</version>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>it.ozimov</groupId>
             <artifactId>embedded-redis</artifactId>
@@ -51,6 +58,12 @@
             <groupId>org.redisson</groupId>
             <artifactId>redisson</artifactId>
             <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>io.netty</groupId>
+                    <artifactId>netty-common</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>

From 5b5f72820b6c29d11724ce3685a5f3194c0dddee Mon Sep 17 00:00:00 2001
From: xsalefter <xsalefter@gmail.com>
Date: Fri, 24 Apr 2026 17:50:26 +0700
Subject: [PATCH 3/4] update release.yml to use latest actions

---
 .github/workflows/release.yml | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

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}
-

From fdcb53c802de9364e4c0f71f8e85a6463a79772a Mon Sep 17 00:00:00 2001
From: xsalefter <xsalefter@gmail.com>
Date: Fri, 24 Apr 2026 17:51:49 +0700
Subject: [PATCH 4/4] update killbill-oss-parent to 0.147.0

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index ff9b0f38..87b33d84 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.kill-bill.billing</groupId>
         <artifactId>killbill-oss-parent</artifactId>
-        <version>0.147.0-12af62b-SNAPSHOT</version>
+        <version>0.147.0</version>
     </parent>
     <groupId>org.kill-bill.commons</groupId>
     <artifactId>killbill-commons</artifactId>