Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
13 changes: 13 additions & 0 deletions clock/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,13 @@
<artifactId>guice</artifactId>
<scope>runtime</scope>
</dependency>
<!-- required during redis testing (RedissonClient) -->
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-common</artifactId>
<version>${netty.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>it.ozimov</groupId>
<artifactId>embedded-redis</artifactId>
Expand All @@ -51,6 +58,12 @@
<groupId>org.redisson</groupId>
<artifactId>redisson</artifactId>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>io.netty</groupId>
<artifactId>netty-common</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
Expand Down
135 changes: 14 additions & 121 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>org.kill-bill.billing</groupId>
<artifactId>killbill-oss-parent</artifactId>
<version>0.146.63</version>
<version>0.147.0-bc60504-SNAPSHOT</version>
</parent>
<groupId>org.kill-bill.commons</groupId>
<artifactId>killbill-commons</artifactId>
Expand Down Expand Up @@ -66,108 +66,10 @@
</issueManagement>
<properties>
<check.fail-spotbugs>true</check.fail-spotbugs>
<!-- killbill-oss-parent still brings extra-enforcer-rules 1.6.1, which rejects Java 21 as
an unknown target. Keep this local override until the parent is updated. -->
<extra-enforcer-rules.version>1.12.0</extra-enforcer-rules.version>
<!-- Used across the reactor; Guice Servlet 7 is required by jooby, metrics, and skeleton. -->
<guice.version>7.0.0</guice.version>
<!-- Used by skeleton. -->
<hk2.version>3.0.6</hk2.version>
<!-- Used by skeleton. -->
<jackson.jakarta.rs.version>2.13.4</jackson.jakarta.rs.version>
<!-- Used by automaton and xmlloader. -->
<jakarta.activation-api.version>2.1.0</jakarta.activation-api.version>
<!-- Used by jooby and skeleton. -->
<jakarta.annotation-api.version>2.1.1</jakarta.annotation-api.version>
<!-- Used by jooby, queue, jdbi, metrics, and skeleton. -->
<jakarta.inject-api.version>2.0.1</jakarta.inject-api.version>
<!-- Used by jooby, metrics, and skeleton. -->
<jakarta.servlet-api.version>5.0.0</jakarta.servlet-api.version>
<!-- Used by skeleton. -->
<jakarta.validation-api.version>3.0.2</jakarta.validation-api.version>
<!-- Used by skeleton. -->
<jakarta.ws.rs-api.version>3.0.0</jakarta.ws.rs-api.version>
<!-- Used by skeleton. -->
<javassist.version>3.30.2-GA</javassist.version>
<!-- Used by automaton and xmlloader. -->
<jaxb-api.version>4.0.0</jaxb-api.version>
<!-- Used by automaton and xmlloader. -->
<jaxb-runtime.version>4.0.0</jaxb-runtime.version>
<!-- Used by skeleton. -->
<jersey.version>3.0.18</jersey.version>
<!-- Used by skeleton and jooby. -->
<jetty.version>11.0.24</jetty.version>
<project.build.targetJdk>21</project.build.targetJdk>
<!-- killbill-oss-parent still brings spotbugs-maven-plugin 4.7.2.1, whose bundled ASM
stack cannot read Java 21 class files (major version 65). Keep this local override
until the parent moves to a Java-21-capable SpotBugs line. -->
<spotbugs-maven-plugin.version>4.9.8.3</spotbugs-maven-plugin.version>
<surefireArgLine>-Xmx${build.jvmsize} --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.io=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED</surefireArgLine>
</properties>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>com.fasterxml.jackson.jakarta.rs</groupId>
<artifactId>jackson-jakarta-rs-json-provider</artifactId>
<version>${jackson.jakarta.rs.version}</version>
</dependency>
<dependency>
<groupId>com.google.inject</groupId>
<artifactId>guice</artifactId>
<version>${guice.version}</version>
</dependency>
<dependency>
<groupId>com.google.inject.extensions</groupId>
<artifactId>guice-servlet</artifactId>
<version>${guice.version}</version>
</dependency>
<dependency>
<groupId>jakarta.activation</groupId>
<artifactId>jakarta.activation-api</artifactId>
<version>${jakarta.activation-api.version}</version>
</dependency>
<dependency>
<groupId>jakarta.inject</groupId>
<artifactId>jakarta.inject-api</artifactId>
<version>${jakarta.inject-api.version}</version>
</dependency>
<dependency>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
<version>${jaxb-api.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-alpn-server</artifactId>
<version>${jetty.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.http2</groupId>
<artifactId>http2-server</artifactId>
<version>${jetty.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.websocket</groupId>
<artifactId>websocket-jetty-api</artifactId>
<version>${jetty.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId>
<version>${jaxb-runtime.version}</version>
<exclusions>
<exclusion>
<!-- We use jakarta.activation:jakarta.activation-api instead -->
<groupId>com.sun.activation</groupId>
<artifactId>jakarta.activation</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.javassist</groupId>
<artifactId>javassist</artifactId>
<version>${javassist.version}</version>
</dependency>
<dependency>
<groupId>org.kill-bill.commons</groupId>
<artifactId>killbill-automaton</artifactId>
Expand Down Expand Up @@ -281,26 +183,17 @@
</dependency>
</dependencies>
</dependencyManagement>
<build>
<plugins>
<plugin>
<groupId>com.github.spotbugs</groupId>
<artifactId>spotbugs-maven-plugin</artifactId>
<version>${spotbugs-maven-plugin.version}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<dependencies>
<!-- Only the helper dependency version changes here; the inherited Enforcer
rules/executions stay intact. -->
<dependency>
<groupId>org.codehaus.mojo</groupId>
<artifactId>extra-enforcer-rules</artifactId>
<version>${extra-enforcer-rules.version}</version>
</dependency>
</dependencies>
</plugin>
</plugins>
</build>
<repositories>
<repository>
<releases>
<enabled>false</enabled>
</releases>
<snapshots>
<enabled>true</enabled>
</snapshots>
<id>sonatype-snapshots</id>
<name>Sonatype Snapshots</name>
<url>https://central.sonatype.com/repository/maven-snapshots</url>
</repository>
</repositories>
</project>
Loading