From bf8a8300e2facaba9764f45628d625ec6ee3078b Mon Sep 17 00:00:00 2001
From: zzuljin <zethix@gmail.com>
Date: Fri, 1 Nov 2024 13:58:15 +0200
Subject: [PATCH 1/6] Updating tests

---
 hadoop/hadoop-common-stable/pom.xml | 47 ++++++++++++++++++++++++++---
 zookeeper/stable-client/pom.xml     | 33 ++++++++++++++------
 2 files changed, 66 insertions(+), 14 deletions(-)

diff --git a/hadoop/hadoop-common-stable/pom.xml b/hadoop/hadoop-common-stable/pom.xml
index 1ac6027..413e8c8 100644
--- a/hadoop/hadoop-common-stable/pom.xml
+++ b/hadoop/hadoop-common-stable/pom.xml
@@ -570,18 +570,18 @@
       <groupId>io.dropwizard.metrics</groupId>
       <artifactId>metrics-core</artifactId>
     </dependency>
-    <!-- Change to contained artifact -->
     <dependency>
       <groupId>io.mishmash.apache.zookeeper</groupId>
-      <artifactId>mmio-zookeeper-stable-client</artifactId>
+      <artifactId>mmio-zookeeper-stable</artifactId>
       <version>${zookeeper.stable.version}-mmio.${zookeeper.stable.mishmash.io.patch}</version>
-      <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>io.mishmash.apache.zookeeper</groupId>
-      <artifactId>mmio-zookeeper-stable-server</artifactId>
+      <artifactId>mmio-zookeeper-stable</artifactId>
       <version>${zookeeper.stable.version}-mmio.${zookeeper.stable.mishmash.io.patch}</version>
+      <classifier>tests</classifier>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.commons</groupId>
@@ -826,6 +826,45 @@
           </execution>
         </executions>
       </plugin>
+      <plugin>
+        <groupId>org.apache.avro</groupId>
+        <artifactId>avro-maven-plugin</artifactId>
+        <version>1.12.0</version>
+        <executions>
+          <execution>
+            <id>generate-avro-test-sources</id>
+            <phase>generate-test-sources</phase>
+            <goals>
+              <goal>schema</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <testSourceDirectory>${project.build.directory}/hadoop-rel-release-${hadoop.stable.version}/hadoop-common-project/hadoop-common/src/test/avro</testSourceDirectory>
+          <testOutputDirectory>${project.build.directory}/generated-test-sources/java</testOutputDirectory>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>default-testCompile</id>
+            <phase>test-compile</phase>
+            <goals>
+              <goal>testCompile</goal>
+            </goals>
+            <configuration>
+              <!--
+                TODO: Exclude the following tests for now
+              -->
+              <testExcludes>
+                <exclude>**/TestProtoBufRpc.java</exclude>
+              </testExcludes>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jar-plugin</artifactId>
diff --git a/zookeeper/stable-client/pom.xml b/zookeeper/stable-client/pom.xml
index 74a93ec..3bf9a46 100644
--- a/zookeeper/stable-client/pom.xml
+++ b/zookeeper/stable-client/pom.xml
@@ -115,6 +115,22 @@
       <groupId>io.netty</groupId>
       <artifactId>netty-transport-native-epoll</artifactId>
     </dependency>
+
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-api</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-engine</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-core</artifactId>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
   <build>
@@ -157,7 +173,6 @@
                   <groupId>org.apache.zookeeper</groupId>
                   <artifactId>zookeeper-jute</artifactId>
                   <version>${zookeeper.stable.version}</version>
-                  <type>jar</type>
                   <classifier>sources</classifier>
                   <overWrite>false</overWrite>
                   <excludes>
@@ -174,7 +189,7 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-dependency-plugin</artifactId>
         <executions>
-          <execution>
+          <!--execution>
             <id>unpack-test</id>
             <phase>generate-test-sources</phase>
             <goals>
@@ -186,22 +201,20 @@
                   <groupId>io.mishmash.apache.zookeeper</groupId>
                   <artifactId>mmio-zookeeper-stable</artifactId>
                   <version>${project.version}</version>
-                  <type>test-jar</type>
-                  <classifier>sources</classifier>
+                  <classifier>test-sources</classifier>
                   <overWrite>false</overWrite>
                   <includes>
                     **/zookeeper/*.java,
-                    **/zookeeper/client/**
+                    **/zookeeper/client/**,
+                    **/zookeeper/common/**,
+                    **/zookeeper/metrics/**,
+                    **/zookeeper/util/**
                   </includes>
-                  <excludes>
-                    **/zookeeper/JLineZNodeCompleter*.java,
-                    **/zookeeper/ZooKeeperMain*.java,
-                  </excludes>
                 </artifactItem>
               </artifactItems>
               <outputDirectory>${project.build.directory}/generated-test-sources/java</outputDirectory>
             </configuration>
-          </execution>
+          </execution-->
         </executions>
       </plugin>
       <plugin>

From 17f7f3ca6d6297eb2141e3656c81289aebfe6152 Mon Sep 17 00:00:00 2001
From: zzuljin <zethix@gmail.com>
Date: Sat, 9 Nov 2024 12:30:36 +0200
Subject: [PATCH 2/6] Upgrading hadoop common tests

---
 hadoop/hadoop-common-stable/pom.xml | 36 +++++++++++++++++------------
 1 file changed, 21 insertions(+), 15 deletions(-)

diff --git a/hadoop/hadoop-common-stable/pom.xml b/hadoop/hadoop-common-stable/pom.xml
index 413e8c8..12c6517 100644
--- a/hadoop/hadoop-common-stable/pom.xml
+++ b/hadoop/hadoop-common-stable/pom.xml
@@ -419,8 +419,19 @@
       <scope>compile</scope>
     </dependency>
     <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-engine</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-params</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.platform</groupId>
+      <artifactId>junit-platform-console</artifactId>
+      <version>${junit-platform.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -469,6 +480,12 @@
       <artifactId>mockito-core</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-junit-jupiter</artifactId>
+      <version>${mockito.version}</version>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.apache.avro</groupId>
       <artifactId>avro</artifactId>
@@ -611,7 +628,8 @@
     </dependency>
     <dependency>
       <groupId>com.squareup.okhttp3</groupId>
-      <artifactId>mockwebserver</artifactId>
+      <artifactId>mockwebserver3-junit5</artifactId>
+      <version>5.0.0-alpha.14</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -815,9 +833,6 @@
             <phase>generate-test-sources</phase>
             <configuration>
               <protoSourceRoot>${project.build.directory}/hadoop-rel-release-${hadoop.stable.version}/hadoop-common-project/hadoop-common/src/test/proto</protoSourceRoot>
-              <excludes>
-                <exclude>*legacy.proto</exclude>
-              </excludes>
               <outputDirectory>${project.build.directory}/generated-test-sources/protobuf/java</outputDirectory>
             </configuration>
             <goals>
@@ -855,12 +870,6 @@
               <goal>testCompile</goal>
             </goals>
             <configuration>
-              <!--
-                TODO: Exclude the following tests for now
-              -->
-              <testExcludes>
-                <exclude>**/TestProtoBufRpc.java</exclude>
-              </testExcludes>
             </configuration>
           </execution>
         </executions>
@@ -877,9 +886,6 @@
           <includes>
             <include>**/Test*.java</include>
           </includes>
-          <excludes>
-            <exclude>**/Test*$*.java</exclude>
-          </excludes>
         </configuration>
       </plugin>
       <plugin>

From a4b4261f11e9c52259ee7903d701a9a35a684fe7 Mon Sep 17 00:00:00 2001
From: zzuljin <zethix@gmail.com>
Date: Sat, 9 Nov 2024 12:31:13 +0200
Subject: [PATCH 3/6] Upgrading hadoop common tests

---
 pom.xml                  | 7 +++++++
 zookeeper/stable/pom.xml | 7 -------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pom.xml b/pom.xml
index fe16508..17f2255 100644
--- a/pom.xml
+++ b/pom.xml
@@ -100,6 +100,7 @@
     <spotbugsannotations.version>4.8.6</spotbugsannotations.version>
 
     <junit.version>5.11.0</junit.version>
+    <junit-platform.version>1.11.3</junit-platform.version>
     <mockito.version>5.13.0</mockito.version>
     <hamcrest.version>3.0</hamcrest.version>
   </properties>
@@ -259,6 +260,12 @@
         <version>${junit.version}</version>
         <scope>test</scope>
       </dependency>
+      <dependency>
+        <groupId>org.junit.jupiter</groupId>
+        <artifactId>junit-jupiter-params</artifactId>
+        <version>${junit.version}</version>
+        <scope>test</scope>
+      </dependency>
       <dependency>
         <groupId>org.junit.jupiter</groupId>
         <artifactId>junit-jupiter-engine</artifactId>
diff --git a/zookeeper/stable/pom.xml b/zookeeper/stable/pom.xml
index 5073e51..a9824b1 100644
--- a/zookeeper/stable/pom.xml
+++ b/zookeeper/stable/pom.xml
@@ -85,7 +85,6 @@
     <logback-version>1.5.8</logback-version>
     <audience-annotations.version>0.15.0</audience-annotations.version>
     <jmockit.version>1.49</jmockit.version>
-    <junit-platform.version>1.11.0</junit-platform.version>
     <jline.version>2.14.6</jline.version>
     <burningwave.mockdns.version>0.26.2</burningwave.mockdns.version>
   </properties>
@@ -125,12 +124,6 @@
         <version>${jmockit.version}</version>
         <scope>test</scope>
       </dependency>
-      <dependency>
-        <groupId>org.junit.jupiter</groupId>
-        <artifactId>junit-jupiter-params</artifactId>
-        <version>${junit.version}</version>
-        <scope>test</scope>
-      </dependency>
       <dependency>
         <groupId>org.junit.platform</groupId>
         <artifactId>junit-platform-suite-api</artifactId>

From 6a3ef89564dfec4ad96edf5650c4711c734ee22c Mon Sep 17 00:00:00 2001
From: zzuljin <zethix@gmail.com>
Date: Sat, 9 Nov 2024 13:59:33 +0200
Subject: [PATCH 4/6] Updating hadoop common tests

---
 hadoop/hadoop-common-stable/pom.xml | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/hadoop/hadoop-common-stable/pom.xml b/hadoop/hadoop-common-stable/pom.xml
index 12c6517..05f6c66 100644
--- a/hadoop/hadoop-common-stable/pom.xml
+++ b/hadoop/hadoop-common-stable/pom.xml
@@ -801,6 +801,24 @@
               </sources>
             </configuration>
           </execution>
+          <execution>
+            <id>add-test-resources</id>
+            <phase>generate-test-resources</phase>
+            <goals>
+              <goal>add-test-resource</goal>
+            </goals>
+            <configuration>
+              <resources>
+                <resource>
+                  <directory>${project.build.directory}/hadoop-rel-release-${hadoop.stable.version}/hadoop-common-project/hadoop-common/src/test/resources</directory>
+                </resource>
+                <!-- also use the default resources provided in src/main -->
+                <resource>
+                  <directory>${project.build.directory}/hadoop-rel-release-${hadoop.stable.version}/hadoop-common-project/hadoop-common/src/main/resources</directory>
+                </resource>
+              </resources>
+            </configuration>
+          </execution>
         </executions>
       </plugin>
       <plugin>
@@ -883,6 +901,7 @@
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
           <reuseForks>false</reuseForks>
+          <argLine>-Xmx2048m -XX:+HeapDumpOnOutOfMemoryError</argLine>
           <includes>
             <include>**/Test*.java</include>
           </includes>

From d51c7668ce0a4376525a64d593ee5c65979ec68c Mon Sep 17 00:00:00 2001
From: zzuljin <zethix@gmail.com>
Date: Mon, 11 Nov 2024 13:27:34 +0200
Subject: [PATCH 5/6] Upgrading tests

---
 hadoop/hadoop-common-stable/pom.xml | 93 ++++++++++++++++++++++++++---
 1 file changed, 84 insertions(+), 9 deletions(-)

diff --git a/hadoop/hadoop-common-stable/pom.xml b/hadoop/hadoop-common-stable/pom.xml
index 05f6c66..73cb11d 100644
--- a/hadoop/hadoop-common-stable/pom.xml
+++ b/hadoop/hadoop-common-stable/pom.xml
@@ -84,6 +84,16 @@
   <properties>
     <wildfly-openssl.version>2.2.5.Final</wildfly-openssl.version>
     <jsp-api.version>4.0.0</jsp-api.version>
+    <jersey.version>3.1.9</jersey.version>
+
+    <hadoop.common.build.dir>${project.build.directory}</hadoop.common.build.dir>
+    <hadoop.log.dir>${project.build.directory}/log</hadoop.log.dir>
+    <hadoop.tmp.dir>${project.build.directory}/tmp</hadoop.tmp.dir>
+    <java.security.egd>file:///dev/urandom</java.security.egd>
+    <test.build.dir>${project.build.directory}/test-dir</test.build.dir>
+    <test.build.data>${test.build.dir}</test.build.data>
+    <test.cache.data>${project.build.directory}/test-classes</test.cache.data>
+    <test.build.webapps>${project.build.directory}/test-classes/webapps</test.build.webapps>
   </properties>
 
   <dependencyManagement>
@@ -224,6 +234,12 @@
         <version>1.2.0</version>
         <scope>test</scope>
       </dependency>
+      <dependency>
+        <groupId>org.apache.ftpserver</groupId>
+        <artifactId>ftplet-api</artifactId>
+        <version>1.2.0</version>
+        <scope>test</scope>
+      </dependency>
       <dependency>
         <groupId>org.codehaus.woodstox</groupId>
         <artifactId>stax2-api</artifactId>
@@ -275,7 +291,13 @@
       <dependency>
         <groupId>org.glassfish.jersey.containers</groupId>
         <artifactId>jersey-container-servlet</artifactId>
-        <version>3.1.9</version>
+        <version>${jersey.version}</version>
+        <scope>compile</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.glassfish.jersey.inject</groupId>
+        <artifactId>jersey-hk2</artifactId>
+        <version>${jersey.version}</version>
         <scope>compile</scope>
       </dependency>
     </dependencies>
@@ -287,10 +309,6 @@
       <artifactId>hadoop-annotations</artifactId>
       <scope>compile</scope>
     </dependency>
-    <dependency>
-      <groupId>org.apache.hadoop.thirdparty</groupId>
-      <artifactId>hadoop-shaded-guava</artifactId>
-    </dependency>
     <!--Guava is required during runtime for curator-->
     <dependency>
       <groupId>com.google.guava</groupId>
@@ -338,8 +356,9 @@
       <scope>compile</scope>
     </dependency>
     <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>javax.servlet-api</artifactId>
+      <groupId>jakarta.servlet</groupId>
+      <artifactId>jakarta.servlet-api</artifactId>
+      <version>${jakarta-servlet.version}</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -413,6 +432,11 @@
       <artifactId>jersey-container-servlet</artifactId>
       <scope>compile</scope>
     </dependency>
+    <dependency>
+      <groupId>org.glassfish.jersey.inject</groupId>
+      <artifactId>jersey-hk2</artifactId>
+      <scope>compile</scope>
+    </dependency>
     <dependency>
       <groupId>ch.qos.reload4j</groupId>
       <artifactId>reload4j</artifactId>
@@ -486,6 +510,11 @@
       <version>${mockito.version}</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.hamcrest</groupId>
+      <artifactId>hamcrest</artifactId>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.apache.avro</groupId>
       <artifactId>avro</artifactId>
@@ -527,8 +556,9 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-minikdc</artifactId>
+      <groupId>io.mishmash.apache.hadoop</groupId>
+      <artifactId>mmio-hadoop-minikdc-stable</artifactId>
+      <version>${project.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -746,6 +776,28 @@
               </target>
             </configuration>
           </execution>
+          <execution>
+            <id>create-log-dir</id>
+            <phase>process-test-resources</phase>
+            <goals>
+              <goal>run</goal>
+            </goals>
+            <configuration>
+              <target>
+                <!--
+                TODO: there are tests (TestLocalFileSystem#testCopy) that fail if data
+                TODO: from a previous run is present
+                -->
+                <delete dir="${test.build.data}"/>
+                <mkdir dir="${test.build.data}"/>
+                <mkdir dir="${hadoop.log.dir}"/>
+
+                <copy toDir="${project.build.directory}/test-classes">
+                  <fileset dir="${project.build.directory}/hadoop-rel-release-${hadoop.stable.version}/hadoop-common-project/hadoop-common/src/main/conf"/>
+                </copy>
+              </target>
+            </configuration>
+          </execution>
         </executions>
       </plugin>
       <!-- Add the original sources for compilation -->
@@ -902,6 +954,29 @@
         <configuration>
           <reuseForks>false</reuseForks>
           <argLine>-Xmx2048m -XX:+HeapDumpOnOutOfMemoryError</argLine>
+          <environmentVariables>
+            <HADOOP_COMMON_HOME>${hadoop.common.build.dir}</HADOOP_COMMON_HOME>
+            <!-- HADOOP_HOME required for tests on Windows to find winutils -->
+            <HADOOP_HOME>${hadoop.common.build.dir}</HADOOP_HOME>
+            <LD_LIBRARY_PATH>${env.LD_LIBRARY_PATH}:${project.build.directory}/native/target/usr/local/lib:${hadoop.common.build.dir}/native/target/usr/local/lib</LD_LIBRARY_PATH>
+            <DYLD_LIBRARY_PATH>${env.DYLD_LIBRARY_PATH}:${project.build.directory}/native/target/usr/local/lib:${hadoop.common.build.dir}/native/target/usr/local/lib</DYLD_LIBRARY_PATH>
+            <MALLOC_ARENA_MAX>4</MALLOC_ARENA_MAX>
+          </environmentVariables>
+          <systemPropertyVariables>
+            <hadoop.log.dir>${hadoop.log.dir}</hadoop.log.dir>
+            <hadoop.tmp.dir>${hadoop.tmp.dir}</hadoop.tmp.dir>
+
+            <test.build.dir>${test.build.dir}</test.build.dir>
+            <test.build.data>${test.build.data}</test.build.data>
+            <test.build.webapps>${test.build.webapps}</test.build.webapps>
+            <test.cache.data>${test.cache.data}</test.cache.data>
+            <test.build.classes>${project.build.directory}/test-classes</test.build.classes>
+
+            <java.net.preferIPv4Stack>true</java.net.preferIPv4Stack>
+            <java.security.krb5.conf>${project.build.directory}/test-classes/krb5.conf</java.security.krb5.conf>
+            <java.security.egd>${java.security.egd}</java.security.egd>
+            <!--require.test.libhadoop>${require.test.libhadoop}</require.test.libhadoop-->
+          </systemPropertyVariables>
           <includes>
             <include>**/Test*.java</include>
           </includes>

From a14fab7b356aca933d784d65c3418382a2498d9c Mon Sep 17 00:00:00 2001
From: Andrey Rusev <a.rusev@mishmash.io>
Date: Mon, 11 Nov 2024 14:37:37 +0200
Subject: [PATCH 6/6] Update github workflow

---
 .github/workflows/maven.yml | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 09dbb35..6f850ad 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -24,6 +24,14 @@ jobs:
       contents: write
       pull-requests: write
 
+    services:
+      otel-to-parquet:
+        image: mishmashio/opentelemetry-parquet-server
+        ports:
+          - 4317:4317
+          - 4318:4318
+        volumes:
+          - /tmp/tests-parquet:/parquet
     steps:
     - uses: actions/checkout@v4
     - name: Set up JDK 17
@@ -34,6 +42,14 @@ jobs:
         cache: maven
     - name: Build with Maven
       run: mvn -Dsurefire.rerunFailingTestsCount=2 -B package --file pom.xml
+    
+    - name: Upload telemetry
+      uses: actions/upload-artifact@v4
+      if: always()
+      continue-on-error: true
+      with:
+        name: build-telemetry
+        path: /tmp/tests-parquet/*.parquet
 
     # Optional: Uploads the full dependency graph to GitHub to improve the quality of Dependabot alerts this repository can receive
     - name: Update dependency graph