Use Java 21 and killbill-oss-parent:0.147.12

.github/workflows/ci.yml

@@ -7,10 +7,10 @@ on:
 
 jobs:
   ci:
-    uses: killbill/gh-actions-shared/.github/workflows/ci.yml@main  
+    uses: killbill/gh-actions-shared/.github/workflows/ci.yml@java21
 
   integration_test:
-    uses: killbill/gh-actions-shared/.github/workflows/integration_test.yml@main
+    uses: killbill/gh-actions-shared/.github/workflows/integration_test.yml@java21
     with:
       plugin_name: 'catalog-test'
       integration_tests_goal: 'test:plugins:catalog-test'

.github/workflows/codeql-analysis.yml

@@ -7,4 +7,4 @@ on:
 
 jobs:
   analyze:
-    uses: killbill/gh-actions-shared/.github/workflows/codeql-analysis.yml@main
+    uses: killbill/gh-actions-shared/.github/workflows/codeql-analysis.yml@java21

.github/workflows/snapshot.yml

@@ -0,0 +1,12 @@
+name: snapshot
+
+on:
+  push:
+  workflow_dispatch:
+
+jobs:
+  snapshot:
+    uses: killbill/gh-actions-shared/.github/workflows/snapshot.yml@java21
+    secrets:
+      MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }}
+      MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}

README.md

@@ -17,11 +17,12 @@ Kill Bill compatibility
 
 
 | Plugin version | Kill Bill version |
-| -------------: | ----------------: |
-| 0.2.y          | 0.18.z            |
-| 0.3.y          | 0.20.z            |
-| 0.4.y          | 0.22.z            |
-| 0.5.y          | 0.24.z            |
+|---------------:|------------------:|
+|          0.2.y |            0.18.z |
+|          0.3.y |            0.20.z |
+|          0.4.y |            0.22.z |
+|          0.5.y |            0.24.z |
+|          0.6.y |            0.26.z |
 
 
 ## Requirements

docker/docker-compose.ci.mysql.yml

@@ -20,7 +20,7 @@ version: '3.8'
 services:
   killbill:
     network_mode: host
-    image: killbill/killbill:0.24.0
+    image: xsalefter/killbill:0.25.1
     environment:
       - KILLBILL_CATALOG_URI=SpyCarAdvanced.xml
       - KILLBILL_DAO_URL=jdbc:mysql://127.0.0.1:3306/killbill

docker/docker-compose.ci.postgresql.yml

@@ -20,7 +20,7 @@ version: '3.8'
 services:
   killbill:
     network_mode: host
-    image: killbill/killbill:0.24.0
+    image: xsalefter/killbill:0.25.1
     environment:
       - KILLBILL_CATALOG_URI=SpyCarAdvanced.xml
       - KILLBILL_DAO_URL=jdbc:postgresql://127.0.0.1:5432/killbill

pom.xml

@@ -22,11 +22,11 @@
     <parent>
         <groupId>org.kill-bill.billing</groupId>
         <artifactId>killbill-oss-parent</artifactId>
-        <version>0.146.63</version>
+        <version>0.147.12</version>
     </parent>
     <groupId>org.kill-bill.billing.plugin.java</groupId>
     <artifactId>catalog-test-plugin</artifactId>
-    <version>0.5.3-SNAPSHOT</version>
+    <version>0.6.0-SNAPSHOT</version>
     <packaging>bundle</packaging>
     <name>Test Plugin for CatalogPluginApi</name>
     <description>Test Plugin for CatalogPluginApi</description>
@@ -43,13 +43,11 @@
     </issueManagement>
     <properties>
         <check.skip-spotbugs>true</check.skip-spotbugs>
-        <killbill.version>0.24.0</killbill.version>
+        <killbill.version>0.25.1</killbill.version>
         <maven.javadoc.failOnError>false</maven.javadoc.failOnError>
         <osgi.export>org.killbill.xmlloader;version=0.0.0,
             javax.xml.bind;version=0.0.0,
             org.killbill.commons.concurrent;version=0.0.0,
-            org.killbill.commons.utils;version=0.0.0,
-            org.killbill.commons.utils.io;version=0.0.0,
             org.killbill.billing.util.config.definition;version=0.0.0</osgi.export>
         <osgi.private>org.killbill.billing.plugin.catalog.*</osgi.private>
     </properties>
@@ -80,18 +78,18 @@
             <artifactId>guice</artifactId>
         </dependency>
         <dependency>
-            <groupId>io.swagger</groupId>
-            <artifactId>swagger-annotations</artifactId>
+            <groupId>io.swagger.core.v3</groupId>
+            <artifactId>swagger-annotations-jakarta</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.inject</groupId>
+            <artifactId>jakarta.inject-api</artifactId>
         </dependency>
         <dependency>
             <groupId>jakarta.servlet</groupId>
             <artifactId>jakarta.servlet-api</artifactId>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>javax.inject</groupId>
-            <artifactId>javax.inject</artifactId>
-        </dependency>
         <dependency>
             <groupId>joda-time</groupId>
             <artifactId>joda-time</artifactId>
@@ -100,10 +98,6 @@
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.framework</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.jooby</groupId>
-            <artifactId>jooby</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.kill-bill.billing</groupId>
             <artifactId>killbill-api</artifactId>
@@ -112,6 +106,14 @@
         <dependency>
             <groupId>org.kill-bill.billing</groupId>
             <artifactId>killbill-catalog</artifactId>
+            <exclusions>
+                <!-- killbill-catalog pulls killbill-util at compile scope.
+                Redisson is unused here and triggers a Netty upper-bound conflict -->
+                <exclusion>
+                    <groupId>org.redisson</groupId>
+                    <artifactId>redisson</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.kill-bill.billing</groupId>
@@ -145,11 +147,22 @@
         <dependency>
             <groupId>org.kill-bill.billing.plugin.java</groupId>
             <artifactId>killbill-base-plugin</artifactId>
+            <exclusions>
+                <!-- Excluded here because different in version -->
+                <exclusion>
+                    <groupId>org.kill-bill.commons</groupId>
+                    <artifactId>killbill-jooby</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.kill-bill.commons</groupId>
+            <artifactId>killbill-jooby</artifactId>
         </dependency>
         <dependency>
             <groupId>org.kill-bill.commons</groupId>
             <artifactId>killbill-utils</artifactId>
-            <scope>provided</scope>
+            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>

src/main/java/org/killbill/billing/plugin/catalog/CatalogActivator.java

@@ -33,8 +33,8 @@
 
 import java.util.Hashtable;
 
-import javax.servlet.Servlet;
-import javax.servlet.http.HttpServlet;
+import jakarta.servlet.Servlet;
+import jakarta.servlet.http.HttpServlet;
 
 public class CatalogActivator extends KillbillActivatorBase {
 

src/main/java/org/killbill/billing/plugin/catalog/CatalogTestHealthcheckServlet.java

@@ -19,8 +19,8 @@
 
 import java.util.Optional;
 
-import javax.inject.Named;
-import javax.inject.Singleton;
+import jakarta.inject.Named;
+import jakarta.inject.Singleton;
 
 import org.jooby.Result;
 import org.jooby.mvc.GET;

src/main/java/org/killbill/billing/plugin/catalog/json/formats/CatalogJson.java

@@ -24,14 +24,14 @@
 import com.google.common.base.Function;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Lists;
-import io.swagger.annotations.ApiModel;
+import io.swagger.v3.oas.annotations.media.Schema;
 import org.killbill.billing.catalog.api.Currency;
 import org.killbill.billing.catalog.api.*;
 
 import java.math.BigDecimal;
 import java.util.*;
 
-@ApiModel(value = "Catalog")
+@Schema(name = "Catalog")
 public class CatalogJson {
 
     private final String name;
@@ -190,7 +190,7 @@ public int hashCode() {
         return result;
     }
 
-    @ApiModel(value = "Unit")
+    @Schema(name = "Unit")
     public static class UnitJson {
 
         private final String name;
@@ -240,7 +240,7 @@ public int hashCode() {
 
     }
 
-    @ApiModel(value = "Product")
+    @Schema(name = "Product")
     public static class ProductJson {
 
         private final String type;
@@ -362,7 +362,7 @@ public String apply(final Product input) {
         }
     }
 
-    @ApiModel(value = "Plan")
+    @Schema(name = "Plan")
     public static class PlanJson {
 
         private final String name;
@@ -454,7 +454,7 @@ public int hashCode() {
         }
     }
 
-    @ApiModel(value = "TieredBlock")
+    @Schema(name = "TieredBlock")
     public static class TieredBlockJson {
         private final String unit;
         private final String size;
@@ -536,7 +536,7 @@ public int hashCode() {
         }
     }
 
-    @ApiModel(value = "Limit")
+    @Schema(name = "Limit")
     public static class LimitJson {
         private final String unit;
         private final String max;
@@ -606,7 +606,7 @@ public int hashCode() {
         }
     }
 
-    @ApiModel(value = "Tier")
+    @Schema(name = "Tier")
     public static class TierJson {
         private final List<TieredBlockJson> blocks;
         private final List<LimitJson> limits;
@@ -688,7 +688,7 @@ public int hashCode() {
         }
     }
 
-    @ApiModel(value = "Usage")
+    @Schema(name = "Usage")
     public static class UsageJson {
         private final String billingPeriod;
         private final List<TierJson> tiers;
@@ -746,7 +746,7 @@ public int hashCode() {
         }
     }
 
-    @ApiModel(value = "Phase")
+    @Schema(name = "Phase")
     public static class PhaseJson {
 
         private final String type;
@@ -913,7 +913,7 @@ private List<TieredBlockJson> buildTieredBlocks(final TieredBlock[] tieredBlocks
     }
 
 
-    @ApiModel(value = "Price")
+    @Schema(name = "Price")
     public static class PriceJson {
 
         private final Currency currency;
@@ -976,7 +976,7 @@ public int hashCode() {
         }
     }
 
-    @ApiModel(value = "PriceList")
+    @Schema(name = "PriceList")
     public static class PriceListJson {
 
         private String name;
@@ -1042,7 +1042,7 @@ public int hashCode() {
 
     }
 
-    @ApiModel(value = "Duration")
+    @Schema(name = "Duration")
     public static class DurationJson {
 
         private final TimeUnit unit;