diff options
| author | chrislu <chris.lu@gmail.com> | 2024-08-12 17:30:18 -0700 |
|---|---|---|
| committer | chrislu <chris.lu@gmail.com> | 2024-08-12 17:30:21 -0700 |
| commit | 915f9f50547daae9c046ef0dab38ef768ce3fc0c (patch) | |
| tree | 1da8c52869147c7caa06371ca340445f209602c4 /other/java | |
| parent | 9a0b71e87450e745964ced9e0de3c78858ff1094 (diff) | |
| download | seaweedfs-915f9f50547daae9c046ef0dab38ef768ce3fc0c.tar.xz seaweedfs-915f9f50547daae9c046ef0dab38ef768ce3fc0c.zip | |
update java client to 3.71, also adjust the groupId
Diffstat (limited to 'other/java')
| -rw-r--r-- | other/java/client/pom.xml | 46 | ||||
| -rw-r--r-- | other/java/client/pom.xml.deploy | 59 | ||||
| -rw-r--r-- | other/java/client/pom_debug.xml | 2 | ||||
| -rw-r--r-- | other/java/examples/pom.xml | 4 | ||||
| -rw-r--r-- | other/java/hdfs-over-ftp/pom.xml | 4 | ||||
| -rw-r--r-- | other/java/hdfs2/dependency-reduced-pom.xml | 47 | ||||
| -rw-r--r-- | other/java/hdfs2/pom.xml | 48 | ||||
| -rw-r--r-- | other/java/hdfs3/dependency-reduced-pom.xml | 47 | ||||
| -rw-r--r-- | other/java/hdfs3/pom.xml | 48 |
9 files changed, 184 insertions, 121 deletions
diff --git a/other/java/client/pom.xml b/other/java/client/pom.xml index 3c983f9e5..7e5c3f732 100644 --- a/other/java/client/pom.xml +++ b/other/java/client/pom.xml @@ -3,15 +3,32 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> - <groupId>com.github.chrislusf</groupId> + <groupId>com.seaweedfs</groupId> <artifactId>seaweedfs-client</artifactId> <version>3.71</version> - <parent> - <groupId>org.sonatype.oss</groupId> - <artifactId>oss-parent</artifactId> - <version>9</version> - </parent> + <name>SeaweedFS Java Client</name> + <description>A java client for SeaweedFS.</description> + <url>https://github.com/seaweedfs/seaweedfs</url> + <licenses> + <license> + <name>The Apache License, Version 2.0</name> + <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> + </license> + </licenses> + <developers> + <developer> + <name>Chris Lu</name> + <email>chris.lu@gmail.com</email> + <organization>SeaweedFS</organization> + <organizationUrl>https://seaweedfs.com</organizationUrl> + </developer> + </developers> + <scm> + <connection>scm:git:git://github.com/seaweedfs/seaweedfs.git</connection> + <developerConnection>scm:git:ssh://github.com:seaweedfs/seaweedfs.git</developerConnection> + <url>https://github.com/seaweedfs/seaweedfs/tree/master</url> + </scm> <properties> <protobuf.version>3.16.3</protobuf.version> @@ -75,12 +92,6 @@ </dependency> </dependencies> - <distributionManagement> - <snapshotRepository> - <id>ossrh</id> - <url>https://oss.sonatype.org/content/repositories/snapshots</url> - </snapshotRepository> - </distributionManagement> <build> <extensions> <extension> @@ -134,14 +145,13 @@ </executions> </plugin> <plugin> - <groupId>org.sonatype.plugins</groupId> - <artifactId>nexus-staging-maven-plugin</artifactId> - <version>1.6.8</version> + <groupId>org.sonatype.central</groupId> + <artifactId>central-publishing-maven-plugin</artifactId> + <version>0.5.0</version> <extensions>true</extensions> <configuration> - <serverId>ossrh</serverId> - <nexusUrl>https://oss.sonatype.org/</nexusUrl> - <autoReleaseAfterClose>true</autoReleaseAfterClose> + <publishingServerId>central</publishingServerId> + <autoPublish>true</autoPublish> </configuration> </plugin> <plugin> diff --git a/other/java/client/pom.xml.deploy b/other/java/client/pom.xml.deploy index cf98f2467..7e5c3f732 100644 --- a/other/java/client/pom.xml.deploy +++ b/other/java/client/pom.xml.deploy @@ -3,21 +3,38 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> - <groupId>com.github.chrislusf</groupId> + <groupId>com.seaweedfs</groupId> <artifactId>seaweedfs-client</artifactId> <version>3.71</version> - <parent> - <groupId>org.sonatype.oss</groupId> - <artifactId>oss-parent</artifactId> - <version>9</version> - </parent> + <name>SeaweedFS Java Client</name> + <description>A java client for SeaweedFS.</description> + <url>https://github.com/seaweedfs/seaweedfs</url> + <licenses> + <license> + <name>The Apache License, Version 2.0</name> + <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> + </license> + </licenses> + <developers> + <developer> + <name>Chris Lu</name> + <email>chris.lu@gmail.com</email> + <organization>SeaweedFS</organization> + <organizationUrl>https://seaweedfs.com</organizationUrl> + </developer> + </developers> + <scm> + <connection>scm:git:git://github.com/seaweedfs/seaweedfs.git</connection> + <developerConnection>scm:git:ssh://github.com:seaweedfs/seaweedfs.git</developerConnection> + <url>https://github.com/seaweedfs/seaweedfs/tree/master</url> + </scm> <properties> - <protobuf.version>3.9.1</protobuf.version> + <protobuf.version>3.16.3</protobuf.version> <!-- follow https://github.com/grpc/grpc-java --> - <grpc.version>1.23.0</grpc.version> - <guava.version>28.0-jre</guava.version> + <grpc.version>1.53.0</grpc.version> + <guava.version>32.0.0-jre</guava.version> </properties> <dependencies> @@ -65,17 +82,16 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.12</version> + <version>4.13.1</version> <scope>test</scope> </dependency> + <dependency> + <groupId>javax.annotation</groupId> + <artifactId>javax.annotation-api</artifactId> + <version>1.3.2</version> + </dependency> </dependencies> - <distributionManagement> - <snapshotRepository> - <id>ossrh</id> - <url>https://oss.sonatype.org/content/repositories/snapshots</url> - </snapshotRepository> - </distributionManagement> <build> <extensions> <extension> @@ -129,14 +145,13 @@ </executions> </plugin> <plugin> - <groupId>org.sonatype.plugins</groupId> - <artifactId>nexus-staging-maven-plugin</artifactId> - <version>1.6.8</version> + <groupId>org.sonatype.central</groupId> + <artifactId>central-publishing-maven-plugin</artifactId> + <version>0.5.0</version> <extensions>true</extensions> <configuration> - <serverId>ossrh</serverId> - <nexusUrl>https://oss.sonatype.org/</nexusUrl> - <autoReleaseAfterClose>true</autoReleaseAfterClose> + <publishingServerId>central</publishingServerId> + <autoPublish>true</autoPublish> </configuration> </plugin> <plugin> diff --git a/other/java/client/pom_debug.xml b/other/java/client/pom_debug.xml index b2386e019..f6751512f 100644 --- a/other/java/client/pom_debug.xml +++ b/other/java/client/pom_debug.xml @@ -3,7 +3,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> - <groupId>com.github.chrislusf</groupId> + <groupId>com.seaweedfs</groupId> <artifactId>seaweedfs-client</artifactId> <version>3.71</version> diff --git a/other/java/examples/pom.xml b/other/java/examples/pom.xml index b3fc1c024..534febb6e 100644 --- a/other/java/examples/pom.xml +++ b/other/java/examples/pom.xml @@ -9,13 +9,13 @@ <version>1.0-SNAPSHOT</version> <dependencies> <dependency> - <groupId>com.github.chrislusf</groupId> + <groupId>com.seaweedfs</groupId> <artifactId>seaweedfs-client</artifactId> <version>3.71</version> <scope>compile</scope> </dependency> <dependency> - <groupId>com.github.chrislusf</groupId> + <groupId>com.seaweedfs</groupId> <artifactId>seaweedfs-hadoop2-client</artifactId> <version>3.71</version> <scope>compile</scope> diff --git a/other/java/hdfs-over-ftp/pom.xml b/other/java/hdfs-over-ftp/pom.xml index 5e82dfc63..6cf1c86ea 100644 --- a/other/java/hdfs-over-ftp/pom.xml +++ b/other/java/hdfs-over-ftp/pom.xml @@ -49,7 +49,7 @@ <version>1.1.1</version> </dependency> <dependency> - <groupId>com.github.chrislusf</groupId> + <groupId>com.seaweedfs</groupId> <artifactId>seaweedfs-hadoop3-client</artifactId> <version>1.6.2</version> </dependency> @@ -117,4 +117,4 @@ </plugins> </build> -</project>
\ No newline at end of file +</project> diff --git a/other/java/hdfs2/dependency-reduced-pom.xml b/other/java/hdfs2/dependency-reduced-pom.xml index fb44ffdc3..bba755a11 100644 --- a/other/java/hdfs2/dependency-reduced-pom.xml +++ b/other/java/hdfs2/dependency-reduced-pom.xml @@ -1,15 +1,31 @@ <?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <artifactId>oss-parent</artifactId>
- <groupId>org.sonatype.oss</groupId>
- <version>9</version>
- <relativePath>../pom.xml/pom.xml</relativePath>
- </parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>com.github.chrislusf</groupId>
+ <groupId>com.seaweedfs</groupId>
<artifactId>seaweedfs-hadoop2-client</artifactId>
+ <name>SeaweedFS HDFS2 Client</name>
<version>${seaweedfs.client.version}</version>
+ <description>A java client for SeaweedFS.</description>
+ <url>https://github.com/seaweedfs/seaweedfs</url>
+ <developers>
+ <developer>
+ <name>Chris Lu</name>
+ <email>chris.lu@gmail.com</email>
+ <organization>SeaweedFS</organization>
+ <organizationUrl>https://seaweedfs.com</organizationUrl>
+ </developer>
+ </developers>
+ <licenses>
+ <license>
+ <name>The Apache License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ </license>
+ </licenses>
+ <scm>
+ <connection>scm:git:git://github.com/seaweedfs/seaweedfs.git</connection>
+ <developerConnection>scm:git:ssh://github.com:seaweedfs/seaweedfs.git</developerConnection>
+ <url>https://github.com/seaweedfs/seaweedfs/tree/master</url>
+ </scm>
<build>
<plugins>
<plugin>
@@ -85,14 +101,13 @@ </executions>
</plugin>
<plugin>
- <groupId>org.sonatype.plugins</groupId>
- <artifactId>nexus-staging-maven-plugin</artifactId>
- <version>1.6.8</version>
+ <groupId>org.sonatype.central</groupId>
+ <artifactId>central-publishing-maven-plugin</artifactId>
+ <version>0.5.0</version>
<extensions>true</extensions>
<configuration>
- <serverId>ossrh</serverId>
- <nexusUrl>https://oss.sonatype.org/</nexusUrl>
- <autoReleaseAfterClose>true</autoReleaseAfterClose>
+ <publishingServerId>central</publishingServerId>
+ <autoPublish>true</autoPublish>
</configuration>
</plugin>
<plugin>
@@ -311,12 +326,6 @@ </exclusions>
</dependency>
</dependencies>
- <distributionManagement>
- <snapshotRepository>
- <id>ossrh</id>
- <url>https://oss.sonatype.org/content/repositories/snapshots</url>
- </snapshotRepository>
- </distributionManagement>
<properties>
<seaweedfs.client.version>3.71</seaweedfs.client.version>
<hadoop.version>3.2.4</hadoop.version>
diff --git a/other/java/hdfs2/pom.xml b/other/java/hdfs2/pom.xml index baa889c65..e3aa2ab44 100644 --- a/other/java/hdfs2/pom.xml +++ b/other/java/hdfs2/pom.xml @@ -9,22 +9,33 @@ <hadoop.version>3.2.4</hadoop.version> </properties> - <groupId>com.github.chrislusf</groupId> + <groupId>com.seaweedfs</groupId> <artifactId>seaweedfs-hadoop2-client</artifactId> <version>${seaweedfs.client.version}</version> - <parent> - <groupId>org.sonatype.oss</groupId> - <artifactId>oss-parent</artifactId> - <version>9</version> - </parent> + <name>SeaweedFS HDFS2 Client</name> + <description>A java client for SeaweedFS.</description> + <url>https://github.com/seaweedfs/seaweedfs</url> + <licenses> + <license> + <name>The Apache License, Version 2.0</name> + <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> + </license> + </licenses> + <developers> + <developer> + <name>Chris Lu</name> + <email>chris.lu@gmail.com</email> + <organization>SeaweedFS</organization> + <organizationUrl>https://seaweedfs.com</organizationUrl> + </developer> + </developers> + <scm> + <connection>scm:git:git://github.com/seaweedfs/seaweedfs.git</connection> + <developerConnection>scm:git:ssh://github.com:seaweedfs/seaweedfs.git</developerConnection> + <url>https://github.com/seaweedfs/seaweedfs/tree/master</url> + </scm> - <distributionManagement> - <snapshotRepository> - <id>ossrh</id> - <url>https://oss.sonatype.org/content/repositories/snapshots</url> - </snapshotRepository> - </distributionManagement> <build> <plugins> <plugin> @@ -104,14 +115,13 @@ </executions> </plugin> <plugin> - <groupId>org.sonatype.plugins</groupId> - <artifactId>nexus-staging-maven-plugin</artifactId> - <version>1.6.8</version> + <groupId>org.sonatype.central</groupId> + <artifactId>central-publishing-maven-plugin</artifactId> + <version>0.5.0</version> <extensions>true</extensions> <configuration> - <serverId>ossrh</serverId> - <nexusUrl>https://oss.sonatype.org/</nexusUrl> - <autoReleaseAfterClose>true</autoReleaseAfterClose> + <publishingServerId>central</publishingServerId> + <autoPublish>true</autoPublish> </configuration> </plugin> <plugin> @@ -151,7 +161,7 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>com.github.chrislusf</groupId> + <groupId>com.seaweedfs</groupId> <artifactId>seaweedfs-client</artifactId> <version>${seaweedfs.client.version}</version> </dependency> diff --git a/other/java/hdfs3/dependency-reduced-pom.xml b/other/java/hdfs3/dependency-reduced-pom.xml index 877948e56..dddf529dc 100644 --- a/other/java/hdfs3/dependency-reduced-pom.xml +++ b/other/java/hdfs3/dependency-reduced-pom.xml @@ -1,15 +1,31 @@ <?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <artifactId>oss-parent</artifactId>
- <groupId>org.sonatype.oss</groupId>
- <version>9</version>
- <relativePath>../pom.xml/pom.xml</relativePath>
- </parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>com.github.chrislusf</groupId>
+ <groupId>com.seaweedfs</groupId>
<artifactId>seaweedfs-hadoop3-client</artifactId>
+ <name>SeaweedFS HDFS3 Client</name>
<version>${seaweedfs.client.version}</version>
+ <description>A java client for SeaweedFS.</description>
+ <url>https://github.com/seaweedfs/seaweedfs</url>
+ <developers>
+ <developer>
+ <name>Chris Lu</name>
+ <email>chris.lu@gmail.com</email>
+ <organization>SeaweedFS</organization>
+ <organizationUrl>https://seaweedfs.com</organizationUrl>
+ </developer>
+ </developers>
+ <licenses>
+ <license>
+ <name>The Apache License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ </license>
+ </licenses>
+ <scm>
+ <connection>scm:git:git://github.com/seaweedfs/seaweedfs.git</connection>
+ <developerConnection>scm:git:ssh://github.com:seaweedfs/seaweedfs.git</developerConnection>
+ <url>https://github.com/seaweedfs/seaweedfs/tree/master</url>
+ </scm>
<build>
<plugins>
<plugin>
@@ -85,14 +101,13 @@ </executions>
</plugin>
<plugin>
- <groupId>org.sonatype.plugins</groupId>
- <artifactId>nexus-staging-maven-plugin</artifactId>
- <version>1.6.8</version>
+ <groupId>org.sonatype.central</groupId>
+ <artifactId>central-publishing-maven-plugin</artifactId>
+ <version>0.5.0</version>
<extensions>true</extensions>
<configuration>
- <serverId>ossrh</serverId>
- <nexusUrl>https://oss.sonatype.org/</nexusUrl>
- <autoReleaseAfterClose>true</autoReleaseAfterClose>
+ <publishingServerId>central</publishingServerId>
+ <autoPublish>true</autoPublish>
</configuration>
</plugin>
<plugin>
@@ -311,12 +326,6 @@ </exclusions>
</dependency>
</dependencies>
- <distributionManagement>
- <snapshotRepository>
- <id>ossrh</id>
- <url>https://oss.sonatype.org/content/repositories/snapshots</url>
- </snapshotRepository>
- </distributionManagement>
<properties>
<seaweedfs.client.version>3.71</seaweedfs.client.version>
<hadoop.version>3.2.4</hadoop.version>
diff --git a/other/java/hdfs3/pom.xml b/other/java/hdfs3/pom.xml index 09b990839..067d649ff 100644 --- a/other/java/hdfs3/pom.xml +++ b/other/java/hdfs3/pom.xml @@ -9,22 +9,33 @@ <hadoop.version>3.2.4</hadoop.version> </properties> - <groupId>com.github.chrislusf</groupId> + <groupId>com.seaweedfs</groupId> <artifactId>seaweedfs-hadoop3-client</artifactId> <version>${seaweedfs.client.version}</version> - <parent> - <groupId>org.sonatype.oss</groupId> - <artifactId>oss-parent</artifactId> - <version>9</version> - </parent> + <name>SeaweedFS HDFS3 Client</name> + <description>A java client for SeaweedFS.</description> + <url>https://github.com/seaweedfs/seaweedfs</url> + <licenses> + <license> + <name>The Apache License, Version 2.0</name> + <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> + </license> + </licenses> + <developers> + <developer> + <name>Chris Lu</name> + <email>chris.lu@gmail.com</email> + <organization>SeaweedFS</organization> + <organizationUrl>https://seaweedfs.com</organizationUrl> + </developer> + </developers> + <scm> + <connection>scm:git:git://github.com/seaweedfs/seaweedfs.git</connection> + <developerConnection>scm:git:ssh://github.com:seaweedfs/seaweedfs.git</developerConnection> + <url>https://github.com/seaweedfs/seaweedfs/tree/master</url> + </scm> - <distributionManagement> - <snapshotRepository> - <id>ossrh</id> - <url>https://oss.sonatype.org/content/repositories/snapshots</url> - </snapshotRepository> - </distributionManagement> <build> <plugins> <plugin> @@ -104,14 +115,13 @@ </executions> </plugin> <plugin> - <groupId>org.sonatype.plugins</groupId> - <artifactId>nexus-staging-maven-plugin</artifactId> - <version>1.6.8</version> + <groupId>org.sonatype.central</groupId> + <artifactId>central-publishing-maven-plugin</artifactId> + <version>0.5.0</version> <extensions>true</extensions> <configuration> - <serverId>ossrh</serverId> - <nexusUrl>https://oss.sonatype.org/</nexusUrl> - <autoReleaseAfterClose>true</autoReleaseAfterClose> + <publishingServerId>central</publishingServerId> + <autoPublish>true</autoPublish> </configuration> </plugin> <plugin> @@ -151,7 +161,7 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>com.github.chrislusf</groupId> + <groupId>com.seaweedfs</groupId> <artifactId>seaweedfs-client</artifactId> <version>${seaweedfs.client.version}</version> </dependency> |
