Fix a bunch of classpath issues

gruelbox · Dec 22, 2023 · af1220e · af1220e
1 parent 29f3b08
commit af1220e
Show file tree

Hide file tree

Showing 8 changed files with 83 additions and 130 deletions.
diff --git a/pom.xml b/pom.xml
@@ -48,12 +48,12 @@
       <dependency>
         <groupId>org.slf4j</groupId>
         <artifactId>slf4j-api</artifactId>
-        <version>2.0.7</version>
+        <version>2.0.9</version>
       </dependency>
       <dependency>
         <groupId>net.bytebuddy</groupId>
         <artifactId>byte-buddy</artifactId>
-        <version>1.14.10</version>
+        <version>1.14.11</version>
         <optional>true</optional>
       </dependency>
       <dependency>
@@ -160,7 +160,7 @@
       <dependency>
         <groupId>mysql</groupId>
         <artifactId>mysql-connector-java</artifactId>
-        <version>8.0.30</version>
+        <version>8.0.33</version>
         <scope>test</scope>
       </dependency>
       <dependency>
@@ -196,7 +196,7 @@
         <artifactId>maven-surefire-plugin</artifactId>
         <version>3.2.3</version>
         <configuration>
-          <argLine>-Doracle.jdbc.javaNetNio=false</argLine>
+          <argLine>-Doracle.jdbc.javaNetNio=false -XX:+EnableDynamicAgentLoading</argLine>
         </configuration>
       </plugin>
       <plugin>

diff --git a/transactionoutbox-acceptance/pom.xml b/transactionoutbox-acceptance/pom.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <parent>
     <artifactId>transactionoutbox-parent</artifactId>
     <groupId>com.gruelbox</groupId>
@@ -17,12 +18,6 @@
       <version>${project.version}</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>com.gruelbox</groupId>
-      <artifactId>transactionoutbox-testing</artifactId>
-      <version>${project.version}</version>
-      <scope>test</scope>
-    </dependency>
 
     <!-- Compile time -->
     <dependency>
@@ -32,28 +27,10 @@
 
     <!-- Test dependencies -->
     <dependency>
-      <groupId>org.hamcrest</groupId>
-      <artifactId>hamcrest-core</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.junit.jupiter</groupId>
-      <artifactId>junit-jupiter-engine</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.junit.jupiter</groupId>
-      <artifactId>junit-jupiter-params</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-all</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>ch.qos.logback</groupId>
-      <artifactId>logback-classic</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>ch.qos.logback</groupId>
-      <artifactId>logback-core</artifactId>
+      <groupId>com.gruelbox</groupId>
+      <artifactId>transactionoutbox-testing</artifactId>
+      <version>${project.version}</version>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.testcontainers</groupId>
@@ -87,10 +64,6 @@
       <groupId>mysql</groupId>
       <artifactId>mysql-connector-java</artifactId>
     </dependency>
-    <dependency>
-      <groupId>com.zaxxer</groupId>
-      <artifactId>HikariCP</artifactId>
-    </dependency>
     <dependency>
       <groupId>com.h2database</groupId>
       <artifactId>h2</artifactId>

diff --git a/transactionoutbox-jackson/pom.xml b/transactionoutbox-jackson/pom.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <parent>
     <artifactId>transactionoutbox-parent</artifactId>
     <groupId>com.gruelbox</groupId>
@@ -9,11 +10,11 @@
   <name>Transaction Outbox Jackson</name>
   <packaging>jar</packaging>
   <artifactId>transactionoutbox-jackson</artifactId>
-  <description>A safe implementation of the transactional outbox pattern for Java (Jackson extension library)</description>
+  <description>A safe implementation of the transactional outbox pattern for Java (Jackson extension library)
+  </description>
   <properties>
-    <guice.version>5.2.4.RELEASE</guice.version>
     <jackson.version>2.16.0</jackson.version>
-    <commons.lang.version>3.13.0</commons.lang.version>
+    <commons.lang.version>3.14.0</commons.lang.version>
   </properties>
   <dependencies>
     <!-- Run time -->
@@ -22,12 +23,6 @@
       <artifactId>transactionoutbox-core</artifactId>
       <version>${project.version}</version>
     </dependency>
-    <dependency>
-      <groupId>com.gruelbox</groupId>
-      <artifactId>transactionoutbox-testing</artifactId>
-      <version>${project.version}</version>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-databind</artifactId>
@@ -44,11 +39,31 @@
       <artifactId>lombok</artifactId>
     </dependency>
     <!-- Test -->
+    <dependency>
+      <groupId>com.gruelbox</groupId>
+      <artifactId>transactionoutbox-testing</artifactId>
+      <version>${project.version}</version>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.datatype</groupId>
       <artifactId>jackson-datatype-guava</artifactId>
       <version>${jackson.version}</version>
       <scope>test</scope>
+      <exclusions>
+        <!-- There's a vulnerability in the version provided by Jackson -->
+        <exclusion>
+          <groupId>com.google.guava</groupId>
+          <artifactId>guava</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <!-- There's a vulnerability in the version provided by Jackson -->
+    <dependency>
+      <groupId>com.google.guava</groupId>
+      <artifactId>guava</artifactId>
+      <version>33.0.0-jre</version>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.datatype</groupId>
@@ -62,33 +77,9 @@
       <version>${jackson.version}</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>ch.qos.logback</groupId>
-      <artifactId>logback-classic</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>ch.qos.logback</groupId>
-      <artifactId>logback-core</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.hamcrest</groupId>
-      <artifactId>hamcrest-core</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.junit.jupiter</groupId>
-      <artifactId>junit-jupiter-engine</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-all</artifactId>
-    </dependency>
     <dependency>
       <groupId>com.h2database</groupId>
       <artifactId>h2</artifactId>
     </dependency>
-    <dependency>
-      <groupId>com.zaxxer</groupId>
-      <artifactId>HikariCP</artifactId>
-    </dependency>
   </dependencies>
 </project>
diff --git a/...rc/test/java/com/gruelbox/transactionoutbox/jackson/acceptance/TestJacksonSerializer.java b/...rc/test/java/com/gruelbox/transactionoutbox/jackson/acceptance/TestJacksonSerializer.java
@@ -16,32 +16,40 @@
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 import lombok.extern.slf4j.Slf4j;
-import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 @Slf4j
 class TestJacksonSerializer extends AbstractAcceptanceTest {
 
   private final CountDownLatch latch = new CountDownLatch(1);
-  private TransactionManager transactionManager;
-  private TransactionOutbox outbox;
 
-  @BeforeEach
-  void beforeEach() {
-    var mapper = new ObjectMapper();
-    mapper.registerModule(new GuavaModule());
-    mapper.registerModule(new Jdk8Module());
-    mapper.registerModule(new JavaTimeModule());
-    mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, true);
-    transactionManager = txManager();
-    outbox =
+  @Override
+  protected Persistor persistor() {
+    return DefaultPersistor.builder()
+        .dialect(connectionDetails().dialect())
+        .serializer(
+            JacksonInvocationSerializer.builder()
+                .mapper(
+                    new ObjectMapper()
+                        .registerModule(new GuavaModule())
+                        .registerModule(new Jdk8Module())
+                        .registerModule(new JavaTimeModule())
+                        .configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, true))
+                .build())
+        .build();
+  }
+
+  void process(List<Object> difficultDataStructure) {
+    assertEquals(List.of(LocalDate.of(2000, 1, 1), "a", "b", 2), difficultDataStructure);
+  }
+
+  @Test
+  void testPolymorphicDeserialization() throws InterruptedException {
+    var transactionManager = txManager();
+    var outbox =
         TransactionOutbox.builder()
             .transactionManager(transactionManager)
-            .persistor(
-                DefaultPersistor.builder()
-                    .dialect(Dialect.H2)
-                    .serializer(JacksonInvocationSerializer.builder().mapper(mapper).build())
-                    .build())
+            .persistor(persistor())
             .instantiator(Instantiator.using(clazz -> TestJacksonSerializer.this))
             .listener(
                 new TransactionOutboxListener() {
@@ -51,14 +59,6 @@ public void success(TransactionOutboxEntry entry) {
                   }
                 })
             .build();
-  }
-
-  void process(List<Object> difficultDataStructure) {
-    assertEquals(List.of(LocalDate.of(2000, 1, 1), "a", "b", 2), difficultDataStructure);
-  }
-
-  @Test
-  void testPolymorphicDeserialization() throws InterruptedException {
     transactionManager.inTransaction(
         () -> outbox.schedule(getClass()).process(List.of(LocalDate.of(2000, 1, 1), "a", "b", 2)));
     assertTrue(latch.await(2, TimeUnit.SECONDS));

diff --git a/transactionoutbox-jooq/pom.xml b/transactionoutbox-jooq/pom.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <parent>
     <artifactId>transactionoutbox-parent</artifactId>
     <groupId>com.gruelbox</groupId>
@@ -20,12 +21,6 @@
       <artifactId>transactionoutbox-core</artifactId>
       <version>${project.version}</version>
     </dependency>
-    <dependency>
-      <groupId>com.gruelbox</groupId>
-      <artifactId>transactionoutbox-testing</artifactId>
-      <version>${project.version}</version>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.jooq</groupId>
       <artifactId>jooq</artifactId>
@@ -38,33 +33,15 @@
     </dependency>
     <!-- Test -->
     <dependency>
-      <groupId>ch.qos.logback</groupId>
-      <artifactId>logback-classic</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>ch.qos.logback</groupId>
-      <artifactId>logback-core</artifactId>
+      <groupId>com.gruelbox</groupId>
+      <artifactId>transactionoutbox-testing</artifactId>
+      <version>${project.version}</version>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>com.h2database</groupId>
       <artifactId>h2</artifactId>
     </dependency>
-    <dependency>
-      <groupId>com.zaxxer</groupId>
-      <artifactId>HikariCP</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.junit.jupiter</groupId>
-      <artifactId>junit-jupiter-engine</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-all</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.hamcrest</groupId>
-      <artifactId>hamcrest-core</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.testcontainers</groupId>
       <artifactId>testcontainers</artifactId>

diff --git a/transactionoutbox-spring/pom.xml b/transactionoutbox-spring/pom.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <parent>
     <artifactId>transactionoutbox-parent</artifactId>
     <groupId>com.gruelbox</groupId>
@@ -9,11 +10,12 @@
   <name>Transaction Outbox Spring</name>
   <packaging>jar</packaging>
   <artifactId>transactionoutbox-spring</artifactId>
-  <description>A safe implementation of the transactional outbox pattern for Java (Spring extension library)</description>
+  <description>A safe implementation of the transactional outbox pattern for Java (Spring extension library)
+  </description>
   <properties>
     <maven.compiler.source>17</maven.compiler.source>
     <maven.compiler.target>17</maven.compiler.target>
-    <spring.boot.version>3.1.4</spring.boot.version>
+    <spring.boot.version>3.2.1</spring.boot.version>
     <spring.version>6.1.2</spring.version>
   </properties>
   <dependencies>

diff --git a/transactionoutbox-testing/pom.xml b/transactionoutbox-testing/pom.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <parent>
     <artifactId>transactionoutbox-parent</artifactId>
     <groupId>com.gruelbox</groupId>
@@ -47,6 +48,11 @@
       <artifactId>junit-jupiter-api</artifactId>
       <scope>compile</scope>
     </dependency>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-params</artifactId>
+      <scope>compile</scope>
+    </dependency>
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-all</artifactId>

diff --git a/...-testing/src/main/java/com/gruelbox/transactionoutbox/testing/AbstractAcceptanceTest.java b/...-testing/src/main/java/com/gruelbox/transactionoutbox/testing/AbstractAcceptanceTest.java
@@ -95,7 +95,7 @@ public void success(TransactionOutboxEntry entry) {
                             chainedLatch.countDown();
                           }
                         }))
-            .persistor(Persistor.forDialect(connectionDetails().dialect()))
+            .persistor(persistor())
             .initializeImmediately(false)
             .build();
 
@@ -600,6 +600,10 @@ protected TransactionManager txManager() {
     return TransactionManager.fromDataSource(dataSource);
   }
 
+  protected Persistor persistor() {
+    return Persistor.forDialect(connectionDetails().dialect());
+  }
+
   protected void clearOutbox() {
     DefaultPersistor persistor = Persistor.forDialect(connectionDetails().dialect());
     TransactionManager transactionManager = txManager();