Work for release 0.23.x

.github/workflows/ci.yml

@@ -14,7 +14,14 @@ jobs:
   ci:
     uses: killbill/gh-actions-shared/.github/workflows/ci.yml@main
     with:
-      test-profile-matrix: '[ "travis"]'
+      test-profile-matrix: '[ "travis", "integration-mysql", "integration-postgresql" ]'
       failure-upload-path: 'target/*'
-      jdk-matrix: '[ "11"]'
-
+      jdk-matrix: '[ "11"]'      
+
+  integration_test:
+    uses: killbill/gh-actions-shared/.github/workflows/integration_test.yml@main
+    with:
+      plugin_name: 'payment-test'
+      integration_tests_goal: 'test:plugins:payment-test'
+      ddl_file: 'src/main/resources/ddl.sql'
+      integration_tests_ref: 'refs/heads/work-for-release-0.23.x'

.github/workflows/codeql-analysis.yml

@@ -0,0 +1,10 @@
+name: CodeQL
+
+on:
+  push:
+  pull_request:
+  workflow_dispatch:
+
+jobs:
+  analyze:
+    uses: killbill/gh-actions-shared/.github/workflows/codeql-analysis.yml@main

.gitignore

@@ -39,3 +39,4 @@ dependency-reduced-pom.xml
 
 pom.xml.releaseBackup
 release.properties
+/.project

README.md

@@ -8,11 +8,12 @@ Kill Bill compatibility
 -----------------------
 
 | Plugin version | Kill Bill version |
-| -------------: | ----------------: |
-| 4.x.y          | 0.18.z            |
-| 5.x.y          | 0.19.z            |
-| 6.x.y          | 0.20.z            |
-| 7.x.y          | 0.22.z            |
+|---------------:|------------------:|
+|          4.x.y |            0.18.z |
+|          5.x.y |            0.19.z |
+|          6.x.y |            0.20.z |
+|          7.x.y |            0.22.z |
+|          8.x.y |            0.23.z |
 
 
 Requirements

docker/docker-compose.ci.mysql.yml

@@ -0,0 +1,41 @@
+#
+# Copyright 2020-2022 Equinix, Inc
+# Copyright 2014-2022 The Billing Project, LLC
+#
+# The Billing Project licenses this file to you under the Apache License, version 2.0
+# (the "License"); you may not use this file except in compliance with the
+# License.  You may obtain a copy of the License at:
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations
+# under the License.
+#
+
+version: '3.8'
+
+services:
+  killbill:
+    network_mode: host
+    image: killbill/killbill:0.23.0-9116fa4-SNAPSHOT
+    environment:
+      - KILLBILL_CATALOG_URI=SpyCarAdvanced.xml
+      - KILLBILL_DAO_URL=jdbc:mysql://127.0.0.1:3306/killbill
+      - KILLBILL_DAO_USER=root
+      - KILLBILL_DAO_PASSWORD=root
+      - KILLBILL_SERVER_TEST_MODE=true
+      - KILLBILL_INVOICE_SANITY_SAFETY_BOUND_ENABLED=false
+      - KILLBILL_INVOICE_MAX_DAILY_NUMBER_OF_ITEMS_SAFETY_BOUND=-1
+    depends_on:
+      - db
+    volumes:
+      - /var/tmp/bundles/plugins/java/payment-test-plugin:/var/lib/killbill/bundles/plugins/java/payment-test-plugin
+      - /var/tmp/tomcat_logs:/var/lib/tomcat/logs
+  db:
+    network_mode: host
+    image: killbill/mariadb:0.23
+    environment:
+      - MYSQL_ROOT_PASSWORD=root

docker/docker-compose.ci.postgresql.yml

@@ -0,0 +1,41 @@
+#
+# Copyright 2020-2022 Equinix, Inc
+# Copyright 2014-2022 The Billing Project, LLC
+#
+# The Billing Project licenses this file to you under the Apache License, version 2.0
+# (the "License"); you may not use this file except in compliance with the
+# License.  You may obtain a copy of the License at:
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations
+# under the License.
+#
+
+version: '3.8'
+
+services:
+  killbill:
+    network_mode: host
+    image: killbill/killbill:0.23.0-9116fa4-SNAPSHOT
+    environment:
+      - KILLBILL_CATALOG_URI=SpyCarAdvanced.xml
+      - KILLBILL_DAO_URL=jdbc:postgresql://127.0.0.1:5432/killbill
+      - KILLBILL_DAO_USER=postgres
+      - KILLBILL_DAO_PASSWORD=postgres
+      - KILLBILL_SERVER_TEST_MODE=true
+      - KILLBILL_INVOICE_SANITY_SAFETY_BOUND_ENABLED=false
+      - KILLBILL_INVOICE_MAX_DAILY_NUMBER_OF_ITEMS_SAFETY_BOUND=-1
+    depends_on:
+      - db
+    volumes:
+      - /var/tmp/bundles/plugins/java/payment-test-plugin:/var/lib/killbill/bundles/plugins/java/payment-test-plugin
+      - /var/tmp/tomcat_logs:/var/lib/tomcat/logs
+  db:
+    network_mode: host
+    image: killbill/postgresql:0.23
+    environment:
+      - POSTGRES_PASSWORD=postgres

pom.xml

@@ -19,11 +19,11 @@
     <parent>
         <groupId>org.kill-bill.billing</groupId>
         <artifactId>killbill-oss-parent</artifactId>
-        <version>0.144.84</version>
+        <version>0.145.3-6e4b9ef-SNAPSHOT</version>
     </parent>
     <groupId>org.kill-bill.billing.plugin.java</groupId>
     <artifactId>payment-test-plugin</artifactId>
-    <version>7.0.5-SNAPSHOT</version>
+    <version>8.0.0-SNAPSHOT</version>
     <packaging>bundle</packaging>
     <name>Kill Bill Payment Test plugin</name>
     <description>Kill Bill Payment Test plugin</description>
@@ -40,6 +40,7 @@
     <properties>
         <check.fail-spotbugs>true</check.fail-spotbugs>
         <check.spotbugs-exclude-filter-file>spotbugs-exclude.xml</check.spotbugs-exclude-filter-file>
+        <killbill-base-plugin.version>5.0.0-14752c2-SNAPSHOT</killbill-base-plugin.version>
         <osgi.private>org.killbill.billing.plugin.payment.*</osgi.private>
     </properties>
     <dependencies>
@@ -60,14 +61,24 @@
             <artifactId>guava</artifactId>
         </dependency>
         <dependency>
-            <groupId>javax.inject</groupId>
-            <artifactId>javax.inject</artifactId>
+            <groupId>io.airlift</groupId>
+            <artifactId>testing-mysql-server</artifactId>
+            <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>javax.servlet-api</artifactId>
+            <groupId>io.airlift</groupId>
+            <artifactId>testing-postgresql-server</artifactId>
+            <scope>test</scope>
+        </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>
@@ -76,6 +87,7 @@
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.framework</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.jooby</groupId>
@@ -104,35 +116,31 @@
         <dependency>
             <groupId>org.kill-bill.billing</groupId>
             <artifactId>killbill-platform-osgi-bundles-lib-killbill</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.kill-bill.billing</groupId>
             <artifactId>killbill-platform-test</artifactId>
             <scope>test</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.osgi</groupId>
-                    <artifactId>org.osgi.core</artifactId>
-                </exclusion>
-            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.kill-bill.billing.plugin</groupId>
+            <artifactId>killbill-plugin-api-control</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.kill-bill.billing.plugin</groupId>
+            <artifactId>killbill-plugin-api-notification</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.kill-bill.billing.plugin</groupId>
             <artifactId>killbill-plugin-api-payment</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.kill-bill.billing.plugin.java</groupId>
             <artifactId>killbill-base-plugin</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.osgi</groupId>
-                    <artifactId>org.osgi.core</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.reactivestreams</groupId>
-                    <artifactId>reactive-streams</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.kill-bill.billing.plugin.java</groupId>
@@ -144,11 +152,22 @@
             <groupId>org.kill-bill.commons</groupId>
             <artifactId>killbill-clock</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.kill-bill.commons</groupId>
+            <artifactId>killbill-clock</artifactId>
+            <type>test-jar</type>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.kill-bill.commons</groupId>
             <artifactId>killbill-embeddeddb-common</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.kill-bill.commons</groupId>
+            <artifactId>killbill-metrics-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
@@ -159,6 +178,11 @@
             <artifactId>slf4j-api</artifactId>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-simple</artifactId>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>
@@ -167,43 +191,10 @@
     </dependencies>
     <build>
         <plugins>
-            <plugin>
-                <groupId>com.ning.maven.plugins</groupId>
-                <artifactId>maven-dependency-versions-check-plugin</artifactId>
-                <configuration>
-                    <exceptions>
-                        <exception>
-                            <groupId>org.jooq</groupId>
-                            <artifactId>jooq</artifactId>
-                            <expectedVersion>3.14.13</expectedVersion>
-                            <resolvedVersion>3.13.5</resolvedVersion>
-                        </exception>
-                        <exception>
-                            <groupId>org.reactivestreams</groupId>
-                            <artifactId>reactive-streams</artifactId>
-                            <expectedVersion>1.0.3</expectedVersion>
-                            <resolvedVersion>1.0.2</resolvedVersion>
-                        </exception>
-                    </exceptions>
-                </configuration>
-            </plugin>
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-enforcer-plugin</artifactId>
-                <configuration>
-                    <rules>
-                        <requireUpperBoundDeps>
-                            <excludes>
-                                <exclude>org.jooq:jooq</exclude>
-                            </excludes>
-                        </requireUpperBoundDeps>
-                    </rules>
-                </configuration>
-            </plugin>
         </plugins>
     </build>
 </project>