From d003bb01666d8a71f8a1c0dc389c1f18e961cdb4 Mon Sep 17 00:00:00 2001 From: chrislu Date: Sun, 26 Jun 2022 20:41:51 -0700 Subject: [PATCH] java 3.13 --- other/java/client/pom.xml | 2 +- other/java/client/pom.xml.deploy | 2 +- other/java/client/pom_debug.xml | 2 +- .../seaweedfs/client/SeaweedOutputStream.java | 1 - other/java/examples/pom.xml | 4 ++-- other/java/hdfs2/dependency-reduced-pom.xml | 16 +++++++++---- other/java/hdfs2/pom.xml | 2 +- .../seaweed/hdfs/SeaweedFileSystemStore.java | 2 -- other/java/hdfs3/dependency-reduced-pom.xml | 24 ++++++++++++------- other/java/hdfs3/pom.xml | 2 +- .../seaweed/hdfs/SeaweedFileSystemStore.java | 2 -- 11 files changed, 35 insertions(+), 24 deletions(-) diff --git a/other/java/client/pom.xml b/other/java/client/pom.xml index 33596f2a8..221de5f8f 100644 --- a/other/java/client/pom.xml +++ b/other/java/client/pom.xml @@ -5,7 +5,7 @@ com.github.chrislusf seaweedfs-client - 2.85 + 3.13 org.sonatype.oss diff --git a/other/java/client/pom.xml.deploy b/other/java/client/pom.xml.deploy index 865467cdc..e3239de0e 100644 --- a/other/java/client/pom.xml.deploy +++ b/other/java/client/pom.xml.deploy @@ -5,7 +5,7 @@ com.github.chrislusf seaweedfs-client - 2.85 + 3.13 org.sonatype.oss diff --git a/other/java/client/pom_debug.xml b/other/java/client/pom_debug.xml index 29c8c459d..dade66f7b 100644 --- a/other/java/client/pom_debug.xml +++ b/other/java/client/pom_debug.xml @@ -5,7 +5,7 @@ com.github.chrislusf seaweedfs-client - 2.85 + 3.13 org.sonatype.oss diff --git a/other/java/client/src/main/java/seaweedfs/client/SeaweedOutputStream.java b/other/java/client/src/main/java/seaweedfs/client/SeaweedOutputStream.java index 7a94acbd0..d5c3399ed 100644 --- a/other/java/client/src/main/java/seaweedfs/client/SeaweedOutputStream.java +++ b/other/java/client/src/main/java/seaweedfs/client/SeaweedOutputStream.java @@ -75,7 +75,6 @@ public class SeaweedOutputStream extends OutputStream { .setIsDirectory(false) .setAttributes(FilerProto.FuseAttributes.newBuilder() .setFileMode(0755) - .setReplication(replication) .setCrtime(now) .setMtime(now) .clearGroupName() diff --git a/other/java/examples/pom.xml b/other/java/examples/pom.xml index c0927559a..7a5994072 100644 --- a/other/java/examples/pom.xml +++ b/other/java/examples/pom.xml @@ -11,13 +11,13 @@ com.github.chrislusf seaweedfs-client - 2.85 + 3.13 compile com.github.chrislusf seaweedfs-hadoop2-client - 2.85 + 3.13 compile diff --git a/other/java/hdfs2/dependency-reduced-pom.xml b/other/java/hdfs2/dependency-reduced-pom.xml index 74f8e6240..a5dedc27a 100644 --- a/other/java/hdfs2/dependency-reduced-pom.xml +++ b/other/java/hdfs2/dependency-reduced-pom.xml @@ -124,7 +124,7 @@ org.apache.hadoop hadoop-client - 2.9.2 + 2.10.1 provided @@ -156,7 +156,7 @@ org.apache.hadoop hadoop-common - 2.9.2 + 2.10.1 provided @@ -231,6 +231,14 @@ commons-configuration commons-configuration + + commons-digester + commons-digester + + + commons-beanutils + commons-beanutils + commons-lang3 org.apache.commons @@ -301,7 +309,7 @@ - 2.85 - 2.9.2 + 3.13 + 2.10.1 diff --git a/other/java/hdfs2/pom.xml b/other/java/hdfs2/pom.xml index eccbb54bf..6e1dee356 100644 --- a/other/java/hdfs2/pom.xml +++ b/other/java/hdfs2/pom.xml @@ -5,7 +5,7 @@ 4.0.0 - 2.85 + 3.13 2.10.1 diff --git a/other/java/hdfs2/src/main/java/seaweed/hdfs/SeaweedFileSystemStore.java b/other/java/hdfs2/src/main/java/seaweed/hdfs/SeaweedFileSystemStore.java index 2ba8e1a10..a73dbeb74 100644 --- a/other/java/hdfs2/src/main/java/seaweed/hdfs/SeaweedFileSystemStore.java +++ b/other/java/hdfs2/src/main/java/seaweed/hdfs/SeaweedFileSystemStore.java @@ -200,7 +200,6 @@ public class SeaweedFileSystemStore { entry.getAttributesBuilder().setMtime(now); LOG.debug("createFile merged entry path:{} entry:{} from:{}", path, entry, existingEntry); writePosition = SeaweedRead.fileSize(existingEntry); - replication = existingEntry.getAttributes().getReplication(); } } if (entry == null) { @@ -209,7 +208,6 @@ public class SeaweedFileSystemStore { .setIsDirectory(false) .setAttributes(FilerProto.FuseAttributes.newBuilder() .setFileMode(permissionToMode(permission, false)) - .setReplication(replication) .setCrtime(now) .setMtime(now) .setUserName(userGroupInformation.getUserName()) diff --git a/other/java/hdfs3/dependency-reduced-pom.xml b/other/java/hdfs3/dependency-reduced-pom.xml index bbfd48ab9..066687017 100644 --- a/other/java/hdfs3/dependency-reduced-pom.xml +++ b/other/java/hdfs3/dependency-reduced-pom.xml @@ -124,7 +124,7 @@ org.apache.hadoop hadoop-client - 3.1.1 + 3.2.3 provided @@ -156,7 +156,7 @@ org.apache.hadoop hadoop-common - 3.1.1 + 3.2.3 provided @@ -183,6 +183,10 @@ javax.servlet-api javax.servlet + + javax.activation-api + javax.activation + jetty-server org.eclipse.jetty @@ -223,10 +227,6 @@ log4j log4j - - commons-lang - commons-lang - commons-beanutils commons-beanutils @@ -239,6 +239,10 @@ commons-lang3 org.apache.commons + + commons-text + org.apache.commons + slf4j-log4j12 org.slf4j @@ -295,6 +299,10 @@ woodstox-core com.fasterxml.woodstox + + dnsjava + dnsjava + hadoop-annotations org.apache.hadoop @@ -309,7 +317,7 @@ - 2.85 - 3.1.1 + 3.13 + 3.2.3 diff --git a/other/java/hdfs3/pom.xml b/other/java/hdfs3/pom.xml index f25ecf986..976029aee 100644 --- a/other/java/hdfs3/pom.xml +++ b/other/java/hdfs3/pom.xml @@ -5,7 +5,7 @@ 4.0.0 - 2.85 + 3.13 3.2.3 diff --git a/other/java/hdfs3/src/main/java/seaweed/hdfs/SeaweedFileSystemStore.java b/other/java/hdfs3/src/main/java/seaweed/hdfs/SeaweedFileSystemStore.java index 2ba8e1a10..a73dbeb74 100644 --- a/other/java/hdfs3/src/main/java/seaweed/hdfs/SeaweedFileSystemStore.java +++ b/other/java/hdfs3/src/main/java/seaweed/hdfs/SeaweedFileSystemStore.java @@ -200,7 +200,6 @@ public class SeaweedFileSystemStore { entry.getAttributesBuilder().setMtime(now); LOG.debug("createFile merged entry path:{} entry:{} from:{}", path, entry, existingEntry); writePosition = SeaweedRead.fileSize(existingEntry); - replication = existingEntry.getAttributes().getReplication(); } } if (entry == null) { @@ -209,7 +208,6 @@ public class SeaweedFileSystemStore { .setIsDirectory(false) .setAttributes(FilerProto.FuseAttributes.newBuilder() .setFileMode(permissionToMode(permission, false)) - .setReplication(replication) .setCrtime(now) .setMtime(now) .setUserName(userGroupInformation.getUserName())