Mirror
/
seaweedfs
mirror of https://github.com/seaweedfs/seaweedfs.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

3.30 java

pull/3778/head
chrislu 2 years ago
parent
29632d5a34
commit
707abd5b2d
8 changed files with 70 additions and 62 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      other/java/client/pom.xml
  2. 4
      other/java/client/pom.xml.deploy
  3. 4
      other/java/client/pom_debug.xml
  4. 4
      other/java/examples/pom.xml
  5. 92
      other/java/hdfs2/dependency-reduced-pom.xml
  6. 4
      other/java/hdfs2/pom.xml
  7. 16
      other/java/hdfs3/dependency-reduced-pom.xml
  8. 4
      other/java/hdfs3/pom.xml

4
other/java/client/pom.xml
View File

@ -5,7 +5,7 @@
<groupId>com.github.chrislusf</groupId> <groupId>com.github.chrislusf</groupId>
<artifactId>seaweedfs-client</artifactId> <artifactId>seaweedfs-client</artifactId>
<version>3.13</version>
<version>3.30</version>
<parent> <parent>
<groupId>org.sonatype.oss</groupId> <groupId>org.sonatype.oss</groupId>
@ -159,7 +159,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId> <artifactId>maven-javadoc-plugin</artifactId>
<version>2.9.1</version>
<version>3.0.1</version>
<executions> <executions>
<execution> <execution>
<id>attach-javadocs</id> <id>attach-javadocs</id>

4
other/java/client/pom.xml.deploy
View File

@ -5,7 +5,7 @@
<groupId>com.github.chrislusf</groupId> <groupId>com.github.chrislusf</groupId>
<artifactId>seaweedfs-client</artifactId> <artifactId>seaweedfs-client</artifactId>
<version>3.13</version>
<version>3.30</version>
<parent> <parent>
<groupId>org.sonatype.oss</groupId> <groupId>org.sonatype.oss</groupId>
@ -154,7 +154,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId> <artifactId>maven-javadoc-plugin</artifactId>
<version>2.9.1</version>
<version>3.0.1</version>
<executions> <executions>
<execution> <execution>
<id>attach-javadocs</id> <id>attach-javadocs</id>

4
other/java/client/pom_debug.xml
View File

@ -5,7 +5,7 @@
<groupId>com.github.chrislusf</groupId> <groupId>com.github.chrislusf</groupId>
<artifactId>seaweedfs-client</artifactId> <artifactId>seaweedfs-client</artifactId>
<version>3.13</version>
<version>3.30</version>
<parent> <parent>
<groupId>org.sonatype.oss</groupId> <groupId>org.sonatype.oss</groupId>
@ -128,7 +128,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId> <artifactId>maven-javadoc-plugin</artifactId>
<version>2.9.1</version>
<version>3.0.1</version>
<executions> <executions>
<execution> <execution>
<id>attach-javadocs</id> <id>attach-javadocs</id>

4
other/java/examples/pom.xml
View File

@ -11,13 +11,13 @@
<dependency> <dependency>
<groupId>com.github.chrislusf</groupId> <groupId>com.github.chrislusf</groupId>
<artifactId>seaweedfs-client</artifactId> <artifactId>seaweedfs-client</artifactId>
<version>3.13</version>
<version>3.30</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.github.chrislusf</groupId> <groupId>com.github.chrislusf</groupId>
<artifactId>seaweedfs-hadoop2-client</artifactId> <artifactId>seaweedfs-hadoop2-client</artifactId>
<version>3.13</version>
<version>3.30</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>

92
other/java/hdfs2/dependency-reduced-pom.xml
View File

@ -108,7 +108,7 @@
</plugin> </plugin>
<plugin> <plugin>
<artifactId>maven-javadoc-plugin</artifactId> <artifactId>maven-javadoc-plugin</artifactId>
<version>2.9.1</version>
<version>3.0.1</version>
<executions> <executions>
<execution> <execution>
<id>attach-javadocs</id> <id>attach-javadocs</id>
@ -124,7 +124,7 @@
<dependency> <dependency>
<groupId>org.apache.hadoop</groupId> <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-client</artifactId> <artifactId>hadoop-client</artifactId>
<version>2.10.1</version>
<version>3.2.4</version>
<scope>provided</scope> <scope>provided</scope>
<exclusions> <exclusions>
<exclusion> <exclusion>
@ -132,11 +132,11 @@
<groupId>org.apache.hadoop</groupId> <groupId>org.apache.hadoop</groupId>
</exclusion> </exclusion>
<exclusion> <exclusion>
<artifactId>hadoop-mapreduce-client-app</artifactId>
<artifactId>hadoop-yarn-api</artifactId>
<groupId>org.apache.hadoop</groupId> <groupId>org.apache.hadoop</groupId>
</exclusion> </exclusion>
<exclusion> <exclusion>
<artifactId>hadoop-yarn-api</artifactId>
<artifactId>hadoop-yarn-client</artifactId>
<groupId>org.apache.hadoop</groupId> <groupId>org.apache.hadoop</groupId>
</exclusion> </exclusion>
<exclusion> <exclusion>
@ -156,7 +156,7 @@
<dependency> <dependency>
<groupId>org.apache.hadoop</groupId> <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId> <artifactId>hadoop-common</artifactId>
<version>2.10.1</version>
<version>3.2.4</version>
<scope>provided</scope> <scope>provided</scope>
<exclusions> <exclusions>
<exclusion> <exclusion>
@ -167,10 +167,6 @@
<artifactId>commons-math3</artifactId> <artifactId>commons-math3</artifactId>
<groupId>org.apache.commons</groupId> <groupId>org.apache.commons</groupId>
</exclusion> </exclusion>
<exclusion>
<artifactId>xmlenc</artifactId>
<groupId>xmlenc</groupId>
</exclusion>
<exclusion> <exclusion>
<artifactId>commons-io</artifactId> <artifactId>commons-io</artifactId>
<groupId>commons-io</groupId> <groupId>commons-io</groupId>
@ -184,20 +180,28 @@
<groupId>commons-collections</groupId> <groupId>commons-collections</groupId>
</exclusion> </exclusion>
<exclusion> <exclusion>
<artifactId>servlet-api</artifactId>
<artifactId>javax.servlet-api</artifactId>
<groupId>javax.servlet</groupId> <groupId>javax.servlet</groupId>
</exclusion> </exclusion>
<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>
<exclusion> <exclusion>
<artifactId>jetty-util</artifactId> <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>
<exclusion> <exclusion>
<artifactId>jetty-sslengine</artifactId>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty-webapp</artifactId>
<groupId>org.eclipse.jetty</groupId>
</exclusion> </exclusion>
<exclusion> <exclusion>
<artifactId>jsp-api</artifactId> <artifactId>jsp-api</artifactId>
@ -208,57 +212,49 @@
<groupId>com.sun.jersey</groupId> <groupId>com.sun.jersey</groupId>
</exclusion> </exclusion>
<exclusion> <exclusion>
<artifactId>jersey-json</artifactId>
<artifactId>jersey-servlet</artifactId>
<groupId>com.sun.jersey</groupId> <groupId>com.sun.jersey</groupId>
</exclusion> </exclusion>
<exclusion> <exclusion>
<artifactId>jersey-server</artifactId>
<artifactId>jersey-json</artifactId>
<groupId>com.sun.jersey</groupId> <groupId>com.sun.jersey</groupId>
</exclusion> </exclusion>
<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>
<exclusion> <exclusion>
<artifactId>commons-digester</artifactId>
<groupId>commons-digester</groupId>
<artifactId>reload4j</artifactId>
<groupId>ch.qos.reload4j</groupId>
</exclusion> </exclusion>
<exclusion> <exclusion>
<artifactId>commons-beanutils</artifactId> <artifactId>commons-beanutils</artifactId>
<groupId>commons-beanutils</groupId> <groupId>commons-beanutils</groupId>
</exclusion> </exclusion>
<exclusion> <exclusion>
<artifactId>commons-lang3</artifactId>
<artifactId>commons-configuration2</artifactId>
<groupId>org.apache.commons</groupId> <groupId>org.apache.commons</groupId>
</exclusion> </exclusion>
<exclusion> <exclusion>
<artifactId>slf4j-log4j12</artifactId>
<groupId>org.slf4j</groupId>
<artifactId>commons-lang3</artifactId>
<groupId>org.apache.commons</groupId>
</exclusion> </exclusion>
<exclusion> <exclusion>
<artifactId>jackson-core-asl</artifactId>
<groupId>org.codehaus.jackson</groupId>
<artifactId>commons-text</artifactId>
<groupId>org.apache.commons</groupId>
</exclusion> </exclusion>
<exclusion> <exclusion>
<artifactId>jackson-mapper-asl</artifactId>
<groupId>org.codehaus.jackson</groupId>
<artifactId>slf4j-reload4j</artifactId>
<groupId>org.slf4j</groupId>
</exclusion> </exclusion>
<exclusion> <exclusion>
<artifactId>avro</artifactId> <artifactId>avro</artifactId>
<groupId>org.apache.avro</groupId> <groupId>org.apache.avro</groupId>
</exclusion> </exclusion>
<exclusion>
<artifactId>re2j</artifactId>
<groupId>com.google.re2j</groupId>
</exclusion>
<exclusion> <exclusion>
<artifactId>hadoop-auth</artifactId> <artifactId>hadoop-auth</artifactId>
<groupId>org.apache.hadoop</groupId> <groupId>org.apache.hadoop</groupId>
@ -287,6 +283,14 @@
<artifactId>commons-compress</artifactId> <artifactId>commons-compress</artifactId>
<groupId>org.apache.commons</groupId> <groupId>org.apache.commons</groupId>
</exclusion> </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> <exclusion>
<artifactId>stax2-api</artifactId> <artifactId>stax2-api</artifactId>
<groupId>org.codehaus.woodstox</groupId> <groupId>org.codehaus.woodstox</groupId>
@ -295,6 +299,10 @@
<artifactId>woodstox-core</artifactId> <artifactId>woodstox-core</artifactId>
<groupId>com.fasterxml.woodstox</groupId> <groupId>com.fasterxml.woodstox</groupId>
</exclusion> </exclusion>
<exclusion>
<artifactId>dnsjava</artifactId>
<groupId>dnsjava</groupId>
</exclusion>
<exclusion> <exclusion>
<artifactId>hadoop-annotations</artifactId> <artifactId>hadoop-annotations</artifactId>
<groupId>org.apache.hadoop</groupId> <groupId>org.apache.hadoop</groupId>
@ -309,7 +317,7 @@
</snapshotRepository> </snapshotRepository>
</distributionManagement> </distributionManagement>
<properties> <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> </properties>
</project> </project>

4
other/java/hdfs2/pom.xml
View File

@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<properties> <properties>
<seaweedfs.client.version>3.13</seaweedfs.client.version>
<seaweedfs.client.version>3.30</seaweedfs.client.version>
<hadoop.version>3.2.4</hadoop.version> <hadoop.version>3.2.4</hadoop.version>
</properties> </properties>
@ -129,7 +129,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId> <artifactId>maven-javadoc-plugin</artifactId>
<version>2.9.1</version>
<version>3.0.1</version>
<executions> <executions>
<execution> <execution>
<id>attach-javadocs</id> <id>attach-javadocs</id>

16
other/java/hdfs3/dependency-reduced-pom.xml
View File

@ -108,7 +108,7 @@
</plugin> </plugin>
<plugin> <plugin>
<artifactId>maven-javadoc-plugin</artifactId> <artifactId>maven-javadoc-plugin</artifactId>
<version>2.9.1</version>
<version>3.0.1</version>
<executions> <executions>
<execution> <execution>
<id>attach-javadocs</id> <id>attach-javadocs</id>
@ -124,7 +124,7 @@
<dependency> <dependency>
<groupId>org.apache.hadoop</groupId> <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-client</artifactId> <artifactId>hadoop-client</artifactId>
<version>3.2.3</version>
<version>3.2.4</version>
<scope>provided</scope> <scope>provided</scope>
<exclusions> <exclusions>
<exclusion> <exclusion>
@ -156,7 +156,7 @@
<dependency> <dependency>
<groupId>org.apache.hadoop</groupId> <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId> <artifactId>hadoop-common</artifactId>
<version>3.2.3</version>
<version>3.2.4</version>
<scope>provided</scope> <scope>provided</scope>
<exclusions> <exclusions>
<exclusion> <exclusion>
@ -224,8 +224,8 @@
<groupId>com.sun.jersey</groupId> <groupId>com.sun.jersey</groupId>
</exclusion> </exclusion>
<exclusion> <exclusion>
<artifactId>log4j</artifactId>
<groupId>log4j</groupId>
<artifactId>reload4j</artifactId>
<groupId>ch.qos.reload4j</groupId>
</exclusion> </exclusion>
<exclusion> <exclusion>
<artifactId>commons-beanutils</artifactId> <artifactId>commons-beanutils</artifactId>
@ -244,7 +244,7 @@
<groupId>org.apache.commons</groupId> <groupId>org.apache.commons</groupId>
</exclusion> </exclusion>
<exclusion> <exclusion>
<artifactId>slf4j-log4j12</artifactId>
<artifactId>slf4j-reload4j</artifactId>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
</exclusion> </exclusion>
<exclusion> <exclusion>
@ -317,7 +317,7 @@
</snapshotRepository> </snapshotRepository>
</distributionManagement> </distributionManagement>
<properties> <properties>
<seaweedfs.client.version>3.13</seaweedfs.client.version>
<hadoop.version>3.2.3</hadoop.version>
<seaweedfs.client.version>3.30</seaweedfs.client.version>
<hadoop.version>3.2.4</hadoop.version>
</properties> </properties>
</project> </project>

4
other/java/hdfs3/pom.xml
View File

@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<properties> <properties>
<seaweedfs.client.version>3.13</seaweedfs.client.version>
<seaweedfs.client.version>3.30</seaweedfs.client.version>
<hadoop.version>3.2.4</hadoop.version> <hadoop.version>3.2.4</hadoop.version>
</properties> </properties>
@ -129,7 +129,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId> <artifactId>maven-javadoc-plugin</artifactId>
<version>2.9.1</version>
<version>3.0.1</version>
<executions> <executions>
<execution> <execution>
<id>attach-javadocs</id> <id>attach-javadocs</id>

Write Preview
Loading…
Cancel
Save