3.30 java

2 files changed, 52 insertions, 44 deletions

diff --git a/other/java/hdfs2/dependency-reduced-pom.xml b/other/java/hdfs2/dependency-reduced-pom.xml
index a5dedc27a..3ee5034d0 100644
--- a/other/java/hdfs2/dependency-reduced-pom.xml
+++ b/other/java/hdfs2/dependency-reduced-pom.xml
@@ -108,7 +108,7 @@
       </plugin>

       <plugin>

         <artifactId>maven-javadoc-plugin</artifactId>

-        <version>2.9.1</version>

+        <version>3.0.1</version>

         <executions>

           <execution>

             <id>attach-javadocs</id>

@@ -124,7 +124,7 @@
     <dependency>

       <groupId>org.apache.hadoop</groupId>

       <artifactId>hadoop-client</artifactId>

-      <version>2.10.1</version>

+      <version>3.2.4</version>

       <scope>provided</scope>

       <exclusions>

         <exclusion>

@@ -132,11 +132,11 @@
           <groupId>org.apache.hadoop</groupId>

         </exclusion>

         <exclusion>

-          <artifactId>hadoop-mapreduce-client-app</artifactId>

+          <artifactId>hadoop-yarn-api</artifactId>

           <groupId>org.apache.hadoop</groupId>

         </exclusion>

         <exclusion>

-          <artifactId>hadoop-yarn-api</artifactId>

+          <artifactId>hadoop-yarn-client</artifactId>

           <groupId>org.apache.hadoop</groupId>

         </exclusion>

         <exclusion>

@@ -156,7 +156,7 @@
     <dependency>

       <groupId>org.apache.hadoop</groupId>

       <artifactId>hadoop-common</artifactId>

-      <version>2.10.1</version>

+      <version>3.2.4</version>

       <scope>provided</scope>

       <exclusions>

         <exclusion>

@@ -168,10 +168,6 @@
           <groupId>org.apache.commons</groupId>

         </exclusion>

         <exclusion>

-          <artifactId>xmlenc</artifactId>

-          <groupId>xmlenc</groupId>

-        </exclusion>

-        <exclusion>

           <artifactId>commons-io</artifactId>

           <groupId>commons-io</groupId>

         </exclusion>

@@ -184,20 +180,28 @@
           <groupId>commons-collections</groupId>

         </exclusion>

         <exclusion>

-          <artifactId>servlet-api</artifactId>

+          <artifactId>javax.servlet-api</artifactId>

           <groupId>javax.servlet</groupId>

         </exclusion>

         <exclusion>

-          <artifactId>jetty</artifactId>

-          <groupId>org.mortbay.jetty</groupId>

+          <artifactId>javax.activation-api</artifactId>

+          <groupId>javax.activation</groupId>

+        </exclusion>

+        <exclusion>

+          <artifactId>jetty-server</artifactId>

+          <groupId>org.eclipse.jetty</groupId>

         </exclusion>

         <exclusion>

           <artifactId>jetty-util</artifactId>

-          <groupId>org.mortbay.jetty</groupId>

+          <groupId>org.eclipse.jetty</groupId>

+        </exclusion>

+        <exclusion>

+          <artifactId>jetty-servlet</artifactId>

+          <groupId>org.eclipse.jetty</groupId>

         </exclusion>

         <exclusion>

-          <artifactId>jetty-sslengine</artifactId>

-          <groupId>org.mortbay.jetty</groupId>

+          <artifactId>jetty-webapp</artifactId>

+          <groupId>org.eclipse.jetty</groupId>

         </exclusion>

         <exclusion>

           <artifactId>jsp-api</artifactId>

@@ -208,58 +212,50 @@
           <groupId>com.sun.jersey</groupId>

         </exclusion>

         <exclusion>

-          <artifactId>jersey-json</artifactId>

+          <artifactId>jersey-servlet</artifactId>

           <groupId>com.sun.jersey</groupId>

         </exclusion>

         <exclusion>

-          <artifactId>jersey-server</artifactId>

+          <artifactId>jersey-json</artifactId>

           <groupId>com.sun.jersey</groupId>

         </exclusion>

         <exclusion>

-          <artifactId>log4j</artifactId>

-          <groupId>log4j</groupId>

-        </exclusion>

-        <exclusion>

-          <artifactId>jets3t</artifactId>

-          <groupId>net.java.dev.jets3t</groupId>

-        </exclusion>

-        <exclusion>

-          <artifactId>commons-lang</artifactId>

-          <groupId>commons-lang</groupId>

-        </exclusion>

-        <exclusion>

-          <artifactId>commons-configuration</artifactId>

-          <groupId>commons-configuration</groupId>

+          <artifactId>jersey-server</artifactId>

+          <groupId>com.sun.jersey</groupId>

         </exclusion>

         <exclusion>

-          <artifactId>commons-digester</artifactId>

-          <groupId>commons-digester</groupId>

+          <artifactId>reload4j</artifactId>

+          <groupId>ch.qos.reload4j</groupId>

         </exclusion>

         <exclusion>

           <artifactId>commons-beanutils</artifactId>

           <groupId>commons-beanutils</groupId>

         </exclusion>

         <exclusion>

-          <artifactId>commons-lang3</artifactId>

+          <artifactId>commons-configuration2</artifactId>

           <groupId>org.apache.commons</groupId>

         </exclusion>

         <exclusion>

-          <artifactId>slf4j-log4j12</artifactId>

-          <groupId>org.slf4j</groupId>

+          <artifactId>commons-lang3</artifactId>

+          <groupId>org.apache.commons</groupId>

         </exclusion>

         <exclusion>

-          <artifactId>jackson-core-asl</artifactId>

-          <groupId>org.codehaus.jackson</groupId>

+          <artifactId>commons-text</artifactId>

+          <groupId>org.apache.commons</groupId>

         </exclusion>

         <exclusion>

-          <artifactId>jackson-mapper-asl</artifactId>

-          <groupId>org.codehaus.jackson</groupId>

+          <artifactId>slf4j-reload4j</artifactId>

+          <groupId>org.slf4j</groupId>

         </exclusion>

         <exclusion>

           <artifactId>avro</artifactId>

           <groupId>org.apache.avro</groupId>

         </exclusion>

         <exclusion>

+          <artifactId>re2j</artifactId>

+          <groupId>com.google.re2j</groupId>

+        </exclusion>

+        <exclusion>

           <artifactId>hadoop-auth</artifactId>

           <groupId>org.apache.hadoop</groupId>

         </exclusion>

@@ -288,6 +284,14 @@
           <groupId>org.apache.commons</groupId>

         </exclusion>

         <exclusion>

+          <artifactId>kerb-simplekdc</artifactId>

+          <groupId>org.apache.kerby</groupId>

+        </exclusion>

+        <exclusion>

+          <artifactId>jackson-databind</artifactId>

+          <groupId>com.fasterxml.jackson.core</groupId>

+        </exclusion>

+        <exclusion>

           <artifactId>stax2-api</artifactId>

           <groupId>org.codehaus.woodstox</groupId>

         </exclusion>

@@ -296,6 +300,10 @@
           <groupId>com.fasterxml.woodstox</groupId>

         </exclusion>

         <exclusion>

+          <artifactId>dnsjava</artifactId>

+          <groupId>dnsjava</groupId>

+        </exclusion>

+        <exclusion>

           <artifactId>hadoop-annotations</artifactId>

           <groupId>org.apache.hadoop</groupId>

         </exclusion>

@@ -309,7 +317,7 @@
     </snapshotRepository>

   </distributionManagement>

   <properties>

-    <seaweedfs.client.version>3.13</seaweedfs.client.version>

-    <hadoop.version>2.10.1</hadoop.version>

+    <seaweedfs.client.version>3.30</seaweedfs.client.version>

+    <hadoop.version>3.2.4</hadoop.version>

   </properties>

 </project>

diff --git a/other/java/hdfs2/pom.xml b/other/java/hdfs2/pom.xml
index 1e26cf96d..8bbd4c99e 100644
--- a/other/java/hdfs2/pom.xml
+++ b/other/java/hdfs2/pom.xml
@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <properties>
-        <seaweedfs.client.version>3.13</seaweedfs.client.version>
+        <seaweedfs.client.version>3.30</seaweedfs.client.version>
         <hadoop.version>3.2.4</hadoop.version>
     </properties>
 
@@ -129,7 +129,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <version>2.9.1</version>
+                <version>3.0.1</version>
                 <executions>
                     <execution>
                         <id>attach-javadocs</id>