Skip to content

Migrate to Jakarta EE, update jooby to killbill fork, bump parent to 0.147.0-9c99329-SNAPSHOT #27

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
xsalefter merged 3 commits into from
May 11, 2026
Merged

Migrate to Jakarta EE, update jooby to killbill fork, bump parent to 0.147.0-9c99329-SNAPSHOT #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
eaa4b2f
Migrate to Jakarta EE, update jooby coordinates, bump parent to 0.147…
Copilot May 8, 2026
f55814d
exclude killbill-jooby dependency from killbill-base-plugin
xsalefter May 11, 2026
1e8e2d5
make TestingStates final as reported by spotbugs
xsalefter May 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 5 additions & 15 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,10 @@ on:
push:
pull_request:
workflow_dispatch:
inputs:
jdk-matrix:
description: 'jdk matrix as json array'
required: false
default: '[ "11" ]'

jobs:
ci:
uses: killbill/gh-actions-shared/.github/workflows/ci.yml@main

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/master'
snapshot:
uses: killbill/gh-actions-shared/.github/workflows/snapshot.yml@java21
secrets:
MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }}
MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}
2 changes: 1 addition & 1 deletion .github/workflows/codeql-analysis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
22 changes: 17 additions & 5 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<parent>
<groupId>org.kill-bill.billing</groupId>
<artifactId>killbill-oss-parent</artifactId>
<version>0.146.63</version>
<version>0.147.0-9c99329-SNAPSHOT</version>
</parent>
<groupId>org.kill-bill.billing.plugin.java</groupId>
<artifactId>payment-test-plugin</artifactId>
Expand Down Expand Up @@ -72,8 +72,8 @@
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId>
<groupId>jakarta.inject</groupId>
<artifactId>jakarta.inject-api</artifactId>
</dependency>
<dependency>
<groupId>joda-time</groupId>
Expand All @@ -91,8 +91,8 @@
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jooby</groupId>
<artifactId>jooby</artifactId>
<groupId>org.kill-bill.commons</groupId>
<artifactId>killbill-jooby</artifactId>
</dependency>
<dependency>
<groupId>org.jooq</groupId>
Expand Down Expand Up @@ -142,12 +142,24 @@
<dependency>
<groupId>org.kill-bill.billing.plugin.java</groupId>
<artifactId>killbill-base-plugin</artifactId>
<exclusions>
<exclusion>
<groupId>org.kill-bill.commons</groupId>
<artifactId>killbill-jooby</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.kill-bill.billing.plugin.java</groupId>
<artifactId>killbill-base-plugin</artifactId>
<type>test-jar</type>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>org.kill-bill.commons</groupId>
<artifactId>killbill-jooby</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.kill-bill.commons</groupId>
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/killbill/billing/plugin/payment/PaymentTestActivator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@

package org.killbill.billing.plugin.payment;

import javax.servlet.Servlet;
import javax.servlet.http.HttpServlet;
import jakarta.servlet.Servlet;
import jakarta.servlet.http.HttpServlet;
import java.util.Hashtable;
import org.killbill.billing.osgi.api.OSGIPluginProperties;
import org.killbill.billing.osgi.libs.killbill.KillbillActivatorBase;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/killbill/billing/plugin/payment/TestingStates.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@

import javax.annotation.Nullable;

public class TestingStates {
public final class TestingStates {

public static final String SLEEP_PLUGIN_CONFIG_PARAM = "sleepFor";
public static final String AMOUNT_PLUGIN_CONFIG_PARAM = "amount";
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/killbill/billing/plugin/payment/resources/PaymentTestResource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@
import org.killbill.billing.plugin.payment.TestingStates;
import org.killbill.billing.plugin.payment.model.Payload;

import javax.inject.Inject;
import javax.inject.Singleton;
import jakarta.inject.Inject;
import jakarta.inject.Singleton;

@Singleton
@Path("/")
Expand Down
Loading