killbill · reshmabidikar · Dec 14, 2022 · May 18, 2022 · May 23, 2022 · May 24, 2022
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -5,51 +5,19 @@ on:
   - pull_request
   - workflow_dispatch
 
-env:
-  MAVEN_FLAGS: "-B --no-transfer-progress"
-  MAVEN_OPTS: "-Xmx2G -XX:+ExitOnOutOfMemoryError -Dmaven.wagon.rto=60000 -Dmaven.wagon.httpconnectionManager.ttlSeconds=25 -Dmaven.wagon.http.retryHandler.count=3"
-
 jobs:
-  tests:
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        java-version:
-          - 8
-          - 11
-        java-distribution:
-          - adopt
-          - zulu
-        profile:
-          - travis
-          - integration-mysql
-          - integration-postgresql
-        is-pr:
-          - ${{ contains(github.event_name, 'pull_request') }}
-        # PR don't have access to secrets
-        exclude:
-          - is-pr: true
-            profile: integration-mysql
-          - is-pr: true
-            profile: integration-postgresql
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v2
-      - name: Setup Java
-        uses: actions/setup-java@v2
-        with:
-          distribution: ${{ matrix.java-distribution }}
-          java-version: ${{ matrix.java-version }}
-      - name: Configure Sonatype mirror
-        uses: s4u/maven-settings-action@v2.3.0
-        # Go to Sonatype directly to avoid delay syncs (could get rid of this if actions/setup-java were to support mirrors).
-        with:
-          mirrors: '[{"id": "oss-releases", "name": "Sonatype releases", "mirrorOf": "*", "url": "https://oss.sonatype.org/content/repositories/releases/"}]'
-      - name: Tests
-        env:
-          MAVEN_PROFILE: ${{ matrix.profile }}
-          STRIPE_API_KEY: ${{ secrets.STRIPE_API_KEY }}
-          STRIPE_PUBLIC_KEY: ${{ secrets.STRIPE_PUBLIC_KEY }}
-        run: |
-          mvn ${MAVEN_FLAGS} clean install -P${MAVEN_PROFILE}
+  ci:
+    uses: killbill/gh-actions-shared/.github/workflows/ci.yml@main
+    with:
+      test-profile-matrix: '[ "travis", "integration-mysql", "integration-postgresql" ]'
+    secrets:
+      extra-env: '{ "STRIPE_API_KEY": "${{ secrets.STRIPE_API_KEY }}", "STRIPE_PUBLIC_KEY": "${{ secrets.STRIPE_PUBLIC_KEY }}" }'
+
+  integration_test:
+    uses: killbill/gh-actions-shared/.github/workflows/integration_test.yml@main
+    with:
+      plugin_name: 'stripe'
+      integration_tests_goal: 'test:plugins:stripe'
+      integration_tests_ref: 'refs/heads/work-for-release-0.23.x'
+    secrets:
+      extra-env: '{ "STRIPE_API_KEY": "${{ secrets.STRIPE_API_KEY }}", "STRIPE_PUBLIC_KEY": "${{ secrets.STRIPE_PUBLIC_KEY }}" }'
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/README.md b/README.md
@@ -7,17 +7,18 @@ A full end-to-end integration demo is available [here](https://github.com/killbi
 
 ## Kill Bill compatibility
 
-| Plugin version | Kill Bill version  | Stripe version                                            |
-| -------------: | -----------------: | --------------------------------------------------------: |
-| 1.x.y          | 0.14.z             | [2015-02-18](https://stripe.com/docs/upgrades#2015-02-18) |
-| 3.x.y          | 0.16.z             | [2015-02-18](https://stripe.com/docs/upgrades#2015-02-18) |
-| 4.x.y          | 0.18.z             | [2015-02-18](https://stripe.com/docs/upgrades#2015-02-18) |
-| 5.x.y          | 0.19.z             | [2015-02-18](https://stripe.com/docs/upgrades#2015-02-18) |
-| 6.x.y          | 0.20.z             | [2015-02-18](https://stripe.com/docs/upgrades#2015-02-18) |
-| 7.0.y          | 0.22.z             | [2019-12-03](https://stripe.com/docs/upgrades#2019-12-03) |
-| 7.1.y          | 0.22.z             | [2019-12-03](https://stripe.com/docs/upgrades#2019-12-03) |
-| 7.2.y          | 0.22.z             | [2020-08-27](https://stripe.com/docs/upgrades#2020-08-27) |
-| 7.3.y          | 0.22.z             | [2020-08-27](https://stripe.com/docs/upgrades#2020-08-27) |
+| Plugin version | Kill Bill version | Stripe version                                            |
+|---------------:|------------------:| --------------------------------------------------------: |
+|          1.x.y |            0.14.z | [2015-02-18](https://stripe.com/docs/upgrades#2015-02-18) |
+|          3.x.y |            0.16.z | [2015-02-18](https://stripe.com/docs/upgrades#2015-02-18) |
+|          4.x.y |            0.18.z | [2015-02-18](https://stripe.com/docs/upgrades#2015-02-18) |
+|          5.x.y |            0.19.z | [2015-02-18](https://stripe.com/docs/upgrades#2015-02-18) |
+|          6.x.y |            0.20.z | [2015-02-18](https://stripe.com/docs/upgrades#2015-02-18) |
+|          7.0.y |            0.22.z | [2019-12-03](https://stripe.com/docs/upgrades#2019-12-03) |
+|          7.1.y |            0.22.z | [2019-12-03](https://stripe.com/docs/upgrades#2019-12-03) |
+|          7.2.y |            0.22.z | [2020-08-27](https://stripe.com/docs/upgrades#2020-08-27) |
+|          7.3.y |            0.22.z | [2020-08-27](https://stripe.com/docs/upgrades#2020-08-27) |
+|          8.0.y |            0.23.z | [2020-08-27](https://stripe.com/docs/upgrades#2020-08-27) |
 
 ### Release notes
 

diff --git a/docker/docker-compose.ci.mysql.yml b/docker/docker-compose.ci.mysql.yml
@@ -0,0 +1,44 @@
+#
+# 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/stripe-plugin:/var/lib/killbill/bundles/plugins/java/stripe-plugin
+      - /var/tmp/tomcat_logs:/var/lib/tomcat/logs
+  db:
+    network_mode: host
+    image: killbill/mariadb:0.23
+    environment:
+      - MYSQL_ROOT_PASSWORD=root
+  toxiproxy:
+    network_mode: host
+    image: ghcr.io/shopify/toxiproxy
diff --git a/docker/docker-compose.ci.postgresql.yml b/docker/docker-compose.ci.postgresql.yml
@@ -0,0 +1,44 @@
+#
+# 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/stripe-plugin:/var/lib/killbill/bundles/plugins/java/stripe-plugin
+      - /var/tmp/tomcat_logs:/var/lib/tomcat/logs
+  db:
+    network_mode: host
+    image: killbill/postgresql:0.23
+    environment:
+      - POSTGRES_PASSWORD=postgres
+  toxiproxy:
+    network_mode: host
+    image: ghcr.io/shopify/toxiproxy
diff --git a/pom.xml b/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright 2020-2021 Equinix, Inc
-  ~ Copyright 2014-2021 The Billing Project, LLC
+  ~ 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
@@ -20,11 +20,11 @@
     <parent>
         <groupId>org.kill-bill.billing</groupId>
         <artifactId>killbill-oss-parent</artifactId>
-        <version>0.144.58</version>
+        <version>0.145.3-8ff3c94-SNAPSHOT</version>
     </parent>
     <groupId>org.kill-bill.billing.plugin.java</groupId>
     <artifactId>stripe-plugin</artifactId>
-    <version>7.3.4-SNAPSHOT</version>
+    <version>8.0.0-SNAPSHOT</version>
     <packaging>bundle</packaging>
     <name>Kill Bill Stripe plugin</name>
     <description>Kill Bill Stripe plugin</description>
@@ -42,8 +42,19 @@
     <properties>
         <check.fail-spotbugs>true</check.fail-spotbugs>
         <check.spotbugs-exclude-filter-file>spotbugs-exclude.xml</check.spotbugs-exclude-filter-file>
+        <!-- This is just for wiremock -->
+        <jetty.version>9.4.46.v20220331</jetty.version>
         <osgi.private>org.killbill.billing.plugin.stripe.*</osgi.private>
     </properties>
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.reactivestreams</groupId>
+                <artifactId>reactive-streams</artifactId>
+                <version>1.0.4</version>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
     <dependencies>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
@@ -57,6 +68,21 @@
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.github.tomakehurst</groupId>
+            <artifactId>wiremock</artifactId>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>javax.xml.bind</groupId>
+                    <artifactId>jaxb-api</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.commons</groupId>
+                    <artifactId>commons-lang3</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
         <dependency>
             <groupId>com.google.code.findbugs</groupId>
             <artifactId>jsr305</artifactId>
@@ -72,27 +98,22 @@
         <dependency>
             <groupId>com.stripe</groupId>
             <artifactId>stripe-java</artifactId>
-            <version>20.33.0</version>
+            <version>21.15.0</version>
         </dependency>
         <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>testing-mysql-server</artifactId>
+            <groupId>io.zonky.test</groupId>
+            <artifactId>embedded-postgres</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>testing-postgresql-server</artifactId>
-            <scope>test</scope>
+            <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>javax.servlet</groupId>
-            <artifactId>javax.servlet-api</artifactId>
-            <scope>provided</scope>
-        </dependency>
         <dependency>
             <groupId>joda-time</groupId>
             <artifactId>joda-time</artifactId>
@@ -103,19 +124,20 @@
             <artifactId>org.apache.felix.framework</artifactId>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>org.asynchttpclient</groupId>
-            <artifactId>async-http-client</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.jooby</groupId>
             <artifactId>jooby</artifactId>
         </dependency>
         <dependency>
             <groupId>org.jooq</groupId>
             <artifactId>jooq</artifactId>
-            <!-- 3.14.0 broke returning() on MySQL :( -->
-            <version>3.13.5</version>
+            <exclusions>
+                <exclusion>
+                    <!-- Pulls in 1.8.0-beta4 -->
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-api</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.kill-bill.billing</groupId>
@@ -173,6 +195,16 @@
             <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.kill-bill.testing</groupId>
+            <artifactId>testing-mysql-server</artifactId>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
@@ -204,7 +236,7 @@
                         <exception>
                             <groupId>org.jooq</groupId>
                             <artifactId>jooq</artifactId>
-                            <expectedVersion>3.14.13</expectedVersion>
+                            <expectedVersion>3.15.10</expectedVersion>
                             <resolvedVersion>3.13.5</resolvedVersion>
                         </exception>
                     </exceptions>

diff --git a/spotbugs-exclude.xml b/spotbugs-exclude.xml
@@ -19,4 +19,7 @@
     <Match>
         <Class name="~org\.killbill\.billing\.plugin\.stripe\.dao\.gen.*"/>
     </Match>
+    <Match>
+        <Bug pattern="EI_EXPOSE_REP,EI_EXPOSE_REP2"/>
+    </Match>
 </FindBugsFilter>