diff options
Diffstat (limited to 'other/java')
| -rw-r--r-- | other/java/client/pom.xml | 2 | ||||
| -rw-r--r-- | other/java/client/pom.xml.deploy | 2 | ||||
| -rw-r--r-- | other/java/client/pom_debug.xml | 2 | ||||
| -rw-r--r-- | other/java/client/src/main/java/seaweedfs/client/SeaweedOutputStream.java | 1 | ||||
| -rw-r--r-- | other/java/examples/pom.xml | 4 | ||||
| -rw-r--r-- | other/java/hdfs2/dependency-reduced-pom.xml | 16 | ||||
| -rw-r--r-- | other/java/hdfs2/pom.xml | 2 | ||||
| -rw-r--r-- | other/java/hdfs2/src/main/java/seaweed/hdfs/SeaweedFileSystemStore.java | 2 | ||||
| -rw-r--r-- | other/java/hdfs3/dependency-reduced-pom.xml | 24 | ||||
| -rw-r--r-- | other/java/hdfs3/pom.xml | 2 | ||||
| -rw-r--r-- | other/java/hdfs3/src/main/java/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 @@ <groupId>com.github.chrislusf</groupId> <artifactId>seaweedfs-client</artifactId> - <version>2.85</version> + <version>3.13</version> <parent> <groupId>org.sonatype.oss</groupId> 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 @@ <groupId>com.github.chrislusf</groupId> <artifactId>seaweedfs-client</artifactId> - <version>2.85</version> + <version>3.13</version> <parent> <groupId>org.sonatype.oss</groupId> 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 @@ <groupId>com.github.chrislusf</groupId> <artifactId>seaweedfs-client</artifactId> - <version>2.85</version> + <version>3.13</version> <parent> <groupId>org.sonatype.oss</groupId> 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 @@ <dependency> <groupId>com.github.chrislusf</groupId> <artifactId>seaweedfs-client</artifactId> - <version>2.85</version> + <version>3.13</version> <scope>compile</scope> </dependency> <dependency> <groupId>com.github.chrislusf</groupId> <artifactId>seaweedfs-hadoop2-client</artifactId> - <version>2.85</version> + <version>3.13</version> <scope>compile</scope> </dependency> <dependency> 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 @@ <dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-client</artifactId>
- <version>2.9.2</version>
+ <version>2.10.1</version>
<scope>provided</scope>
<exclusions>
<exclusion>
@@ -156,7 +156,7 @@ <dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId>
- <version>2.9.2</version>
+ <version>2.10.1</version>
<scope>provided</scope>
<exclusions>
<exclusion>
@@ -232,6 +232,14 @@ <groupId>commons-configuration</groupId>
</exclusion>
<exclusion>
+ <artifactId>commons-digester</artifactId>
+ <groupId>commons-digester</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>commons-beanutils</artifactId>
+ <groupId>commons-beanutils</groupId>
+ </exclusion>
+ <exclusion>
<artifactId>commons-lang3</artifactId>
<groupId>org.apache.commons</groupId>
</exclusion>
@@ -301,7 +309,7 @@ </snapshotRepository>
</distributionManagement>
<properties>
- <seaweedfs.client.version>2.85</seaweedfs.client.version>
- <hadoop.version>2.9.2</hadoop.version>
+ <seaweedfs.client.version>3.13</seaweedfs.client.version>
+ <hadoop.version>2.10.1</hadoop.version>
</properties>
</project>
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 @@ <modelVersion>4.0.0</modelVersion> <properties> - <seaweedfs.client.version>2.85</seaweedfs.client.version> + <seaweedfs.client.version>3.13</seaweedfs.client.version> <hadoop.version>2.10.1</hadoop.version> </properties> 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 @@ <dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-client</artifactId>
- <version>3.1.1</version>
+ <version>3.2.3</version>
<scope>provided</scope>
<exclusions>
<exclusion>
@@ -156,7 +156,7 @@ <dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId>
- <version>3.1.1</version>
+ <version>3.2.3</version>
<scope>provided</scope>
<exclusions>
<exclusion>
@@ -184,6 +184,10 @@ <groupId>javax.servlet</groupId>
</exclusion>
<exclusion>
+ <artifactId>javax.activation-api</artifactId>
+ <groupId>javax.activation</groupId>
+ </exclusion>
+ <exclusion>
<artifactId>jetty-server</artifactId>
<groupId>org.eclipse.jetty</groupId>
</exclusion>
@@ -224,10 +228,6 @@ <groupId>log4j</groupId>
</exclusion>
<exclusion>
- <artifactId>commons-lang</artifactId>
- <groupId>commons-lang</groupId>
- </exclusion>
- <exclusion>
<artifactId>commons-beanutils</artifactId>
<groupId>commons-beanutils</groupId>
</exclusion>
@@ -240,6 +240,10 @@ <groupId>org.apache.commons</groupId>
</exclusion>
<exclusion>
+ <artifactId>commons-text</artifactId>
+ <groupId>org.apache.commons</groupId>
+ </exclusion>
+ <exclusion>
<artifactId>slf4j-log4j12</artifactId>
<groupId>org.slf4j</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>2.85</seaweedfs.client.version>
- <hadoop.version>3.1.1</hadoop.version>
+ <seaweedfs.client.version>3.13</seaweedfs.client.version>
+ <hadoop.version>3.2.3</hadoop.version>
</properties>
</project>
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 @@ <modelVersion>4.0.0</modelVersion> <properties> - <seaweedfs.client.version>2.85</seaweedfs.client.version> + <seaweedfs.client.version>3.13</seaweedfs.client.version> <hadoop.version>3.2.3</hadoop.version> </properties> 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()) |
