Add Java 21 build support and enable running of pulsar-metadatastore-…

…oxia tests (#194) * Update test dependencies, cleanup build and make it buildable with Java 21 * Fix tests * Run spotless:apply
streamnative · Nov 28, 2024 · e93ed82 · e93ed82
1 parent 31afaf7
commit e93ed82
Show file tree

Hide file tree

Showing 6 changed files with 92 additions and 36 deletions.
diff --git a/pom.xml b/pom.xml
@@ -79,6 +79,7 @@
     <properties>
         <maven.compiler.source>17</maven.compiler.source>
         <maven.compiler.target>17</maven.compiler.target>
+        <maven.compiler.release>17</maven.compiler.release>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
@@ -92,22 +93,24 @@
         <protobuf.version>3.24.0</protobuf.version>
 
         <assertj.version>3.24.1</assertj.version>
-        <awaitility.version>3.0.0</awaitility.version>
-        <lombok.version>1.18.30</lombok.version>
+        <awaitility.version>4.2.2</awaitility.version>
+        <lombok.version>1.18.32</lombok.version>
         <slf4j.version>1.7.32</slf4j.version>
-        <junit.jupiter.version>5.11.0-M1</junit.jupiter.version>
-        <mockito.junit.jupiter.version>5.11.0</mockito.junit.jupiter.version>
+        <junit.jupiter.version>5.11.3</junit.jupiter.version>
+        <mockito.junit.jupiter.version>5.14.2</mockito.junit.jupiter.version>
         <opentelemetry.version>1.37.0</opentelemetry.version>
-        <testcontainers.version>1.19.7</testcontainers.version>
+        <testcontainers.version>1.20.4</testcontainers.version>
         <guava.version>32.1.3-jre</guava.version>
 
         <jacoco.plugin.version>0.8.12</jacoco.plugin.version>
         <license.plugin.version>4.1</license.plugin.version>
-        <maven.compiler.plugin.version>3.10.1</maven.compiler.plugin.version>
-        <maven.enforcer.plugin.version>3.1.0</maven.enforcer.plugin.version>
-        <maven.surefire.plugin.version>3.2.5</maven.surefire.plugin.version>
+        <maven.compiler.plugin.version>3.13.0</maven.compiler.plugin.version>
+        <maven.enforcer.plugin.version>3.5.0</maven.enforcer.plugin.version>
+        <maven.surefire.plugin.version>3.5.2</maven.surefire.plugin.version>
+        <maven.shade.plugin.version>3.6.0</maven.shade.plugin.version>
         <spotbugs.plugin.version>4.8.1.0</spotbugs.plugin.version>
         <spotless.plugin.version>2.39.0</spotless.plugin.version>
+        <byte-buddy.version>1.15.10</byte-buddy.version>
     </properties>
 
     <dependencyManagement>
@@ -126,6 +129,13 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
+            <dependency>
+                <groupId>org.junit</groupId>
+                <artifactId>junit-bom</artifactId>
+                <version>${junit.jupiter.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
             <dependency>
                 <groupId>org.testcontainers</groupId>
                 <artifactId>testcontainers-bom</artifactId>
@@ -138,6 +148,36 @@
                 <artifactId>guava</artifactId>
                 <version>${guava.version}</version>
             </dependency>
+            <dependency>
+                <groupId>net.bytebuddy</groupId>
+                <artifactId>byte-buddy</artifactId>
+                <version>${byte-buddy.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>net.bytebuddy</groupId>
+                <artifactId>byte-buddy-agent</artifactId>
+                <version>${byte-buddy.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.assertj</groupId>
+                <artifactId>assertj-core</artifactId>
+                <version>${assertj.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.awaitility</groupId>
+                <artifactId>awaitility</artifactId>
+                <version>${awaitility.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.mockito</groupId>
+                <artifactId>mockito-junit-jupiter</artifactId>
+                <version>${mockito.junit.jupiter.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.projectlombok</groupId>
+                <artifactId>lombok</artifactId>
+                <version>${lombok.version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
@@ -150,44 +190,27 @@
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <version>${lombok.version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>
-            <version>${assertj.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.awaitility</groupId>
             <artifactId>awaitility</artifactId>
-            <version>${awaitility.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.awaitility</groupId>
-            <artifactId>awaitility-proxy</artifactId>
-            <version>${awaitility.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter</artifactId>
-            <version>${junit.jupiter.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-junit-jupiter</artifactId>
-            <version>${mockito.junit.jupiter.version}</version>
             <scope>test</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.junit.jupiter</groupId>
-                    <artifactId>junit-jupiter-api</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>

diff --git a/pulsar-metadatastore-oxia/pom.xml b/pulsar-metadatastore-oxia/pom.xml
@@ -30,23 +30,17 @@
     <name>Oxia Metadatastore implementation for Apache Pulsar</name>
 
     <properties>
-        <maven.compiler.source>17</maven.compiler.source>
-        <maven.compiler.target>17</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <shade.relocation.package>io.streamnative.pulsarmetadatastoreoxia.shaded</shade.relocation.package>
 
+        <!-- Breaks for 3.0.5 to 3.0.7 due to missing https://github.com/apache/pulsar/pull/21950 -->
         <pulsar.version>3.0.2</pulsar.version>
 
-        <testng.version>7.7.0</testng.version>
+        <testng.version>7.7.1</testng.version>
         <dropwizard.version>4.1.12.1</dropwizard.version>
         <snappy.version>1.1.10.4</snappy.version>
 
-        <license.plugin.version>4.1</license.plugin.version>
-        <maven.compiler.plugin.version>3.10.1</maven.compiler.plugin.version>
-        <maven.enforcer.plugin.version>3.1.0</maven.enforcer.plugin.version>
-        <maven.shade.plugin.version>3.4.1</maven.shade.plugin.version>
-        <maven.surefire.plugin.version>3.0.0-M7</maven.surefire.plugin.version>
         <spotbugs.plugin.version>4.8.1.0</spotbugs.plugin.version>
         <spotless.plugin.version>2.39.0</spotless.plugin.version>
     </properties>
@@ -86,6 +80,12 @@
             <artifactId>buildtools</artifactId>
             <version>${pulsar.version}</version>
             <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.apache.pulsar</groupId>
@@ -314,6 +314,17 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>${maven.surefire.plugin.version}</version>
+                <dependencies>
+                    <dependency>
+                        <groupId>org.apache.maven.surefire</groupId>
+                        <artifactId>surefire-testng</artifactId>
+                        <version>${maven.surefire.plugin.version}</version>
+                    </dependency>
+                </dependencies>
+            </plugin>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>build-helper-maven-plugin</artifactId>

diff --git a/...tastore-oxia/src/main/java/io/streamnative/pulsarmetadatastoreoxia/OxiaMetadataStore.java b/...tastore-oxia/src/main/java/io/streamnative/pulsarmetadatastoreoxia/OxiaMetadataStore.java
@@ -269,10 +269,12 @@ private CompletableFuture<Void> createParents(String path) {
 
     @Override
     public void close() throws Exception {
-        if (client != null) {
-            client.close();
+        if (isClosed.compareAndSet(false, true)) {
+            if (client != null) {
+                client.close();
+            }
+            super.close();
         }
-        super.close();
     }
 
     public Optional<MetadataEventSynchronizer> getMetadataEventSynchronizer() {

diff --git a/...ore-oxia/src/test/java/io/streamnative/pulsarmetadatastoreoxia/OxiaMetadataStoreTest.java b/...ore-oxia/src/test/java/io/streamnative/pulsarmetadatastoreoxia/OxiaMetadataStoreTest.java
@@ -67,4 +67,12 @@ public void testGetChildren(String provider, Supplier<String> urlSupplier) throw
     @Test(dataProvider = "impl")
     public void testDeleteUnusedDirectories(String provider, Supplier<String> urlSupplier)
             throws Exception {}
+
+    @Ignore
+    @Test(dataProvider = "conditionOfSwitchThread")
+    @Override
+    public void testThreadSwitchOfZkMetadataStore(boolean hasSynchronizer, boolean enabledBatch)
+            throws Exception {
+        super.testThreadSwitchOfZkMetadataStore(hasSynchronizer, enabledBatch);
+    }
 }
diff --git a/...treamnative/pulsarmetadatastoreoxia/bookkeeper/OxiaLedgerUnderreplicationManagerTest.java b/...treamnative/pulsarmetadatastoreoxia/bookkeeper/OxiaLedgerUnderreplicationManagerTest.java
@@ -23,6 +23,7 @@
 import org.apache.pulsar.metadata.bookkeeper.LedgerUnderreplicationManagerTest;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.DataProvider;
+import org.testng.annotations.Ignore;
 
 /** Test the zookeeper implementation of the ledger replication manager. */
 @Slf4j
@@ -40,4 +41,8 @@ public void setup() throws Exception {
     public Object[][] implementations() {
         return impl();
     }
+
+    @Ignore
+    @Override
+    public void testZkMetasStoreMarkReplicatedDeleteEmptyParentNodes() throws Exception {}
 }
diff --git a/.../io/streamnative/pulsarmetadatastoreoxia/bookkeeper/OxiaPulsarRegistrationClientTest.java b/.../io/streamnative/pulsarmetadatastoreoxia/bookkeeper/OxiaPulsarRegistrationClientTest.java
@@ -23,6 +23,7 @@
 import org.apache.pulsar.metadata.bookkeeper.PulsarRegistrationClientTest;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.DataProvider;
+import org.testng.annotations.Ignore;
 
 @Slf4j
 public class OxiaPulsarRegistrationClientTest extends PulsarRegistrationClientTest
@@ -39,4 +40,10 @@ public void setup() throws Exception {
     public Object[][] implementations() {
         return impl();
     }
+
+    @Ignore
+    @Override
+    public void testNetworkDelayWithBkZkManager() throws Throwable {
+        // ignore
+    }
 }