Skip to content

Commit 71bfc7d

Browse files
Copilotxsalefter
Copilot
and
xsalefter
authored
chore: align commons and jooby versions
Agent-Logs-Url: https://github.com/killbill/killbill-plugin-framework-java/sessions/b2a3b3c0-6981-4f2b-bfa3-8ad51d3633f4 Co-authored-by: xsalefter <510438+xsalefter@users.noreply.github.com>
1 parent 0b27a59 commit 71bfc7d

5 files changed

Lines changed: 104 additions & 24 deletions

File tree

‎pom.xml‎

Lines changed: 89 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -43,12 +43,74 @@
4343
<properties>
4444
<check.fail-spotbugs>true</check.fail-spotbugs>
4545
<check.spotbugs-exclude-filter-file>spotbugs-exclude.xml</check.spotbugs-exclude-filter-file>
46+
<extra-enforcer-rules.version>1.12.0</extra-enforcer-rules.version>
47+
<guice.version>7.0.0</guice.version>
48+
<jakarta.annotation-api.version>2.1.1</jakarta.annotation-api.version>
49+
<jakarta.inject-api.version>2.0.1</jakarta.inject-api.version>
50+
<jakarta.servlet-api.version>5.0.0</jakarta.servlet-api.version>
51+
<jetty.version>11.0.24</jetty.version>
52+
<killbill-commons.version>0.27.0</killbill-commons.version>
4653
<killbill-platform.version>0.40.13</killbill-platform.version>
54+
<project.build.targetJdk>21</project.build.targetJdk>
4755
<!-- killbill-oss-parent still brings SpotBugs 4.7.2.1, whose ASM stack cannot parse
4856
Java 21 class files. Keep this local override until the parent moves to a
4957
Java-21-capable SpotBugs line. -->
5058
<spotbugs-maven-plugin.version>4.9.8.3</spotbugs-maven-plugin.version>
5159
</properties>
60+
<dependencyManagement>
61+
<dependencies>
62+
<dependency>
63+
<groupId>com.google.inject</groupId>
64+
<artifactId>guice</artifactId>
65+
<version>${guice.version}</version>
66+
</dependency>
67+
<dependency>
68+
<groupId>jakarta.annotation</groupId>
69+
<artifactId>jakarta.annotation-api</artifactId>
70+
<version>${jakarta.annotation-api.version}</version>
71+
</dependency>
72+
<dependency>
73+
<groupId>jakarta.inject</groupId>
74+
<artifactId>jakarta.inject-api</artifactId>
75+
<version>${jakarta.inject-api.version}</version>
76+
</dependency>
77+
<dependency>
78+
<groupId>jakarta.servlet</groupId>
79+
<artifactId>jakarta.servlet-api</artifactId>
80+
<version>${jakarta.servlet-api.version}</version>
81+
</dependency>
82+
<dependency>
83+
<groupId>org.eclipse.jetty</groupId>
84+
<artifactId>jetty-alpn-server</artifactId>
85+
<version>${jetty.version}</version>
86+
</dependency>
87+
<dependency>
88+
<groupId>org.eclipse.jetty</groupId>
89+
<artifactId>jetty-http</artifactId>
90+
<version>${jetty.version}</version>
91+
</dependency>
92+
<dependency>
93+
<groupId>org.eclipse.jetty</groupId>
94+
<artifactId>jetty-io</artifactId>
95+
<version>${jetty.version}</version>
96+
</dependency>
97+
<dependency>
98+
<groupId>org.eclipse.jetty</groupId>
99+
<artifactId>jetty-server</artifactId>
100+
<version>${jetty.version}</version>
101+
</dependency>
102+
<dependency>
103+
<groupId>org.eclipse.jetty</groupId>
104+
<artifactId>jetty-util</artifactId>
105+
<version>${jetty.version}</version>
106+
</dependency>
107+
<dependency>
108+
<groupId>org.eclipse.jetty.http2</groupId>
109+
<artifactId>http2-server</artifactId>
110+
<version>${jetty.version}</version>
111+
</dependency>
112+
</dependencies>
113+
</dependencyManagement>
52114
<dependencies>
53115
<dependency>
54116
<groupId>com.fasterxml.jackson.core</groupId>
@@ -107,6 +169,14 @@
107169
<artifactId>jakarta.activation-api</artifactId>
108170
<scope>runtime</scope>
109171
</dependency>
172+
<dependency>
173+
<groupId>jakarta.annotation</groupId>
174+
<artifactId>jakarta.annotation-api</artifactId>
175+
</dependency>
176+
<dependency>
177+
<groupId>jakarta.inject</groupId>
178+
<artifactId>jakarta.inject-api</artifactId>
179+
</dependency>
110180
<dependency>
111181
<groupId>jakarta.servlet</groupId>
112182
<artifactId>jakarta.servlet-api</artifactId>
@@ -132,16 +202,9 @@
132202
<artifactId>joda-money</artifactId>
133203
</dependency>
134204
<dependency>
135-
<groupId>org.jooby</groupId>
136-
<artifactId>jooby</artifactId>
137-
</dependency>
138-
<dependency>
139-
<groupId>org.jooby</groupId>
140-
<artifactId>jooby-jackson</artifactId>
141-
</dependency>
142-
<dependency>
143-
<groupId>org.jooby</groupId>
144-
<artifactId>jooby-servlet</artifactId>
205+
<groupId>org.kill-bill.commons</groupId>
206+
<artifactId>killbill-jooby</artifactId>
207+
<version>${killbill-commons.version}</version>
145208
</dependency>
146209
<dependency>
147210
<groupId>org.jooq</groupId>
@@ -228,26 +291,31 @@
228291
<dependency>
229292
<groupId>org.kill-bill.commons</groupId>
230293
<artifactId>killbill-clock</artifactId>
294+
<version>${killbill-commons.version}</version>
231295
<scope>provided</scope>
232296
</dependency>
233297
<dependency>
234298
<groupId>org.kill-bill.commons</groupId>
235299
<artifactId>killbill-embeddeddb-common</artifactId>
300+
<version>${killbill-commons.version}</version>
236301
<scope>test</scope>
237302
</dependency>
238303
<dependency>
239304
<groupId>org.kill-bill.commons</groupId>
240305
<artifactId>killbill-embeddeddb-mysql</artifactId>
306+
<version>${killbill-commons.version}</version>
241307
<scope>test</scope>
242308
</dependency>
243309
<dependency>
244310
<groupId>org.kill-bill.commons</groupId>
245311
<artifactId>killbill-embeddeddb-postgresql</artifactId>
312+
<version>${killbill-commons.version}</version>
246313
<scope>test</scope>
247314
</dependency>
248315
<dependency>
249316
<groupId>org.kill-bill.commons</groupId>
250317
<artifactId>killbill-utils</artifactId>
318+
<version>${killbill-commons.version}</version>
251319
<scope>provided</scope>
252320
</dependency>
253321
<dependency>
@@ -292,6 +360,17 @@
292360
<artifactId>spotbugs-maven-plugin</artifactId>
293361
<version>${spotbugs-maven-plugin.version}</version>
294362
</plugin>
363+
<plugin>
364+
<groupId>org.apache.maven.plugins</groupId>
365+
<artifactId>maven-enforcer-plugin</artifactId>
366+
<dependencies>
367+
<dependency>
368+
<groupId>org.codehaus.mojo</groupId>
369+
<artifactId>extra-enforcer-rules</artifactId>
370+
<version>${extra-enforcer-rules.version}</version>
371+
</dependency>
372+
</dependencies>
373+
</plugin>
295374
<plugin>
296375
<groupId>org.apache.maven.plugins</groupId>
297376
<artifactId>maven-jar-plugin</artifactId>

‎src/main/java/org/killbill/billing/plugin/core/JoobyServlet.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@
2020

2121
import java.io.IOException;
2222

23-
import javax.servlet.ServletException;
24-
import javax.servlet.ServletRequest;
25-
import javax.servlet.http.HttpServletRequest;
26-
import javax.servlet.http.HttpServletResponse;
23+
import jakarta.servlet.ServletException;
24+
import jakarta.servlet.ServletRequest;
25+
import jakarta.servlet.http.HttpServletRequest;
26+
import jakarta.servlet.http.HttpServletResponse;
2727

2828
import org.jooby.Sse;
2929
import org.jooby.servlet.ServletServletRequest;

‎src/main/java/org/killbill/billing/plugin/core/PluginServlet.java‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,12 @@
2626
import java.util.regex.Pattern;
2727

2828
import javax.annotation.Nullable;
29-
import javax.servlet.ServletRequest;
30-
import javax.servlet.ServletResponse;
31-
import javax.servlet.http.HttpServlet;
32-
import javax.servlet.http.HttpServletRequest;
33-
import javax.servlet.http.HttpServletResponse;
29+
30+
import jakarta.servlet.ServletRequest;
31+
import jakarta.servlet.ServletResponse;
32+
import jakarta.servlet.http.HttpServlet;
33+
import jakarta.servlet.http.HttpServletRequest;
34+
import jakarta.servlet.http.HttpServletResponse;
3435

3536
import org.joda.time.LocalDate;
3637
import org.joda.time.format.DateTimeFormat;

‎src/main/java/org/killbill/billing/plugin/core/resources/ServletSse.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@
2323
import java.util.concurrent.CompletableFuture;
2424
import java.util.concurrent.atomic.AtomicBoolean;
2525

26-
import javax.servlet.AsyncContext;
27-
import javax.servlet.ServletRequest;
28-
import javax.servlet.ServletResponse;
29-
import javax.servlet.http.HttpServletResponse;
26+
import jakarta.servlet.AsyncContext;
27+
import jakarta.servlet.ServletRequest;
28+
import jakarta.servlet.ServletResponse;
29+
import jakarta.servlet.http.HttpServletResponse;
3030

3131
import org.jooby.Sse;
3232

‎src/main/java/org/killbill/billing/plugin/core/resources/jooby/PluginApp.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
package org.killbill.billing.plugin.core.resources.jooby;
2020

21-
import javax.servlet.http.HttpServlet;
21+
import jakarta.servlet.http.HttpServlet;
2222

2323
import org.jooby.Jooby;
2424
import org.jooby.json.Jackson;

0 commit comments

Comments
 (0)