Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 30 additions & 11 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@
<maven.ignore.testfailure>false</maven.ignore.testfailure>
<maven.surefire.version>2.22.0</maven.surefire.version>
<maven.javadoc.version>3.0.1</maven.javadoc.version>
<central-publishing-maven-plugin.version>0.7.0</central-publishing-maven-plugin.version>
<exec.maven.version>3.1.0</exec.maven.version>
<file.encoding>UTF-8</file.encoding>
</properties>
Expand Down Expand Up @@ -312,9 +313,14 @@
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<version>${maven.deploy.version}</version>
<groupId>org.sonatype.central</groupId>
<artifactId>central-publishing-maven-plugin</artifactId>
<version>${central-publishing-maven-plugin.version}</version>
<extensions>true</extensions>
<configuration>
<publishingServerId>central-repo</publishingServerId>
<autoPublish>true</autoPublish>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand Down Expand Up @@ -374,14 +380,27 @@
</profile>
</profiles>

<distributionManagement>
<snapshotRepository>
<id>ossrh</id>
<url>https://oss.sonatype.org/content/repositories/snapshots/</url>
</snapshotRepository>
<repositories>
<repository>
<id>maven-central</id>
<url>https://repo.maven.apache.org/maven2/</url>
<snapshots>
<enabled>false</enabled>
</snapshots>
<releases>
<enabled>true</enabled>
</releases>
</repository>
<repository>
<id>ossrh</id>
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
<name>Central Portal Snapshots</name>
<id>central-portal-snapshots</id>
<url>https://central.sonatype.com/repository/maven-snapshots/</url>
<releases>
<enabled>false</enabled>
</releases>
<snapshots>
<enabled>true</enabled>
</snapshots>
</repository>
</distributionManagement>
</repositories>
</project>
1 change: 1 addition & 0 deletions trpc-code-generator/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@

<artifactId>trpc-code-generator</artifactId>
<packaging>jar</packaging>
<name>trpc-code-generator</name>

<properties>
<maven.compiler.source>8</maven.compiler.source>
Expand Down
7 changes: 2 additions & 5 deletions trpc-demo/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@

<artifactId>trpc-demo</artifactId>
<packaging>pom</packaging>
<description>Trpc Parent Project ${project.version}</description>
<description>trpc-demo</description>
<name>trpc</name>

<properties>
<skip_maven_deploy>true</skip_maven_deploy>
<maven.deploy.skip>true</maven.deploy.skip>
<trpc-maven-plugin.version>1.0.0</trpc-maven-plugin.version>
</properties>
<modules>
Expand All @@ -36,9 +36,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
<plugin>
<groupId>org.jacoco</groupId>
Expand Down
3 changes: 0 additions & 3 deletions trpc-demo/trpc-java-demo/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,6 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.0.1</version>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
<plugin>
<groupId>org.jacoco</groupId>
Expand Down
1 change: 1 addition & 0 deletions trpc-demo/trpc-spring-demo/trpc-spring-client-demo/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
</parent>
<modelVersion>4.0.0</modelVersion>

<name>trpc-spring-client-demo</name>
<artifactId>trpc-spring-client-demo</artifactId>

<dependencies>
Expand Down
1 change: 1 addition & 0 deletions trpc-demo/trpc-spring-demo/trpc-spring-server-demo/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
<modelVersion>4.0.0</modelVersion>

<artifactId>trpc-spring-server-demo</artifactId>
<name>trpc-spring-server-demo</name>

<dependencies>
<dependency>
Expand Down
72 changes: 58 additions & 14 deletions trpc-dependencies/trpc-bom/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,25 +8,64 @@
<artifactId>trpc-bom</artifactId>
<version>1.4.0-SNAPSHOT</version>
<packaging>pom</packaging>
<description>trpc-bom</description>
<name>trpc</name>
<url>https://github.com/trpc-group/trpc-java</url>

<licenses>
<license>
<name>Apache License Version 2.0</name>
<url>https://opensource.org/license/apache-2-0</url>
<distribution>repo</distribution>
</license>
</licenses>

<scm>
<url>https://github.com/trpc-group/trpc-java</url>
<connection>
scm:git:git@github.com:trpc-group/trpc-java.git
</connection>
<developerConnection>
scm:git:ssh://git@github.com/trpc-group/trpc-java.git
</developerConnection>
<tag>HEAD</tag>
</scm>

<developers>
<developer>
<name>Base Zhang</name>
<email>basezhang@vip.qq.com</email>
</developer>
<developer>
<name>Shore Wang</name>
<email>wangxiao1208@foxmail.com</email>
</developer>
<developer>
<name>Thirteen Wang</name>
<email>779754345@qq.com</email>
</developer>
<developer>
<name>Shiyou Wu</name>
<email>258154927@qq.com</email>
</developer>
<developer>
<name>Kelgon Wu</name>
<email>kelgonwu@126.com</email>
</developer>
<developer>
<name>Layne Xiong</name>
<email>wardseptember@163.com</email>
</developer>
</developers>

<properties>
<central-publishing-maven-plugin.version>0.7.0</central-publishing-maven-plugin.version>
<maven.gpg.version>3.1.0</maven.gpg.version>
<maven.deploy.version>3.0.0</maven.deploy.version>
<maven.source.version>3.0.1</maven.source.version>
<maven.javadoc.version>3.0.1</maven.javadoc.version>
</properties>

<distributionManagement>
<snapshotRepository>
<id>ossrh</id>
<url>https://oss.sonatype.org/content/repositories/snapshots/</url>
</snapshotRepository>
<repository>
<id>ossrh</id>
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
</repository>
</distributionManagement>

<dependencyManagement>
<dependencies>
<!--trpc module -->
Expand Down Expand Up @@ -194,9 +233,14 @@
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<version>${maven.deploy.version}</version>
<groupId>org.sonatype.central</groupId>
<artifactId>central-publishing-maven-plugin</artifactId>
<version>${central-publishing-maven-plugin.version}</version>
<extensions>true</extensions>
<configuration>
<publishingServerId>central-repo</publishingServerId>
<autoPublish>true</autoPublish>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand Down
70 changes: 57 additions & 13 deletions trpc-dependencies/trpc-dependencies-bom/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,24 +8,63 @@
<artifactId>trpc-dependencies-bom</artifactId>
<version>1.4.0-SNAPSHOT</version>
<packaging>pom</packaging>
<description>trpc-dependencies-bom</description>
<name>trpc</name>
<url>https://github.com/trpc-group/trpc-java</url>

<distributionManagement>
<snapshotRepository>
<id>ossrh</id>
<url>https://oss.sonatype.org/content/repositories/snapshots/</url>
</snapshotRepository>
<repository>
<id>ossrh</id>
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
</repository>
</distributionManagement>
<licenses>
<license>
<name>Apache License Version 2.0</name>
<url>https://opensource.org/license/apache-2-0</url>
<distribution>repo</distribution>
</license>
</licenses>

<scm>
<url>https://github.com/trpc-group/trpc-java</url>
<connection>
scm:git:git@github.com:trpc-group/trpc-java.git
</connection>
<developerConnection>
scm:git:ssh://git@github.com/trpc-group/trpc-java.git
</developerConnection>
<tag>HEAD</tag>
</scm>

<developers>
<developer>
<name>Base Zhang</name>
<email>basezhang@vip.qq.com</email>
</developer>
<developer>
<name>Shore Wang</name>
<email>wangxiao1208@foxmail.com</email>
</developer>
<developer>
<name>Thirteen Wang</name>
<email>779754345@qq.com</email>
</developer>
<developer>
<name>Shiyou Wu</name>
<email>258154927@qq.com</email>
</developer>
<developer>
<name>Kelgon Wu</name>
<email>kelgonwu@126.com</email>
</developer>
<developer>
<name>Layne Xiong</name>
<email>wardseptember@163.com</email>
</developer>
</developers>

<properties>
<auto-service.version>1.1.0</auto-service.version>
<assertj-core.version>3.12.1</assertj-core.version>
<apollo.version>2.1.0</apollo.version>
<byte.buddy.version>1.14.9</byte.buddy.version>
<caffeine.version>2.9.3</caffeine.version>
<central-publishing-maven-plugin.version>0.7.0</central-publishing-maven-plugin.version>
<commons.codec.version>1.15</commons.codec.version>
<commons.collections4.version>4.4</commons.collections4.version>
<commons.configurations.version>2.10.1</commons.configurations.version>
Expand Down Expand Up @@ -931,9 +970,14 @@
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<version>${maven.deploy.version}</version>
<groupId>org.sonatype.central</groupId>
<artifactId>central-publishing-maven-plugin</artifactId>
<version>${central-publishing-maven-plugin.version}</version>
<extensions>true</extensions>
<configuration>
<publishingServerId>central-repo</publishingServerId>
<autoPublish>true</autoPublish>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand Down
1 change: 1 addition & 0 deletions trpc-maven-plugin/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
<version>1.4.0-SNAPSHOT</version>
</parent>

<name>trpc-maven-plugin</name>
<artifactId>trpc-maven-plugin</artifactId>
<packaging>maven-plugin</packaging>

Expand Down
1 change: 1 addition & 0 deletions trpc-opentelemetry/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
</parent>

<artifactId>trpc-opentelemetry</artifactId>
<name>trpc-opentelemetry</name>

<dependencies>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion trpc-spring-boot-starters/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<version>1.4.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

<name>trpc-spring-boot-starters</name>
<artifactId>trpc-spring-boot-starters</artifactId>
<packaging>pom</packaging>
<modules>
Expand Down
1 change: 1 addition & 0 deletions trpc-spring-boot-starters/trpc-spring-boot-starter/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
<modelVersion>4.0.0</modelVersion>

<artifactId>trpc-spring-boot-starter</artifactId>
<name>trpc-spring-boot-starter</name>

<dependencies>
<dependency>
Expand Down
1 change: 1 addition & 0 deletions trpc-spring-support/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@

<artifactId>trpc-spring-support</artifactId>
<packaging>pom</packaging>
<name>trpc-spring-support</name>

<modules>
<module>trpc-spring</module>
Expand Down
1 change: 1 addition & 0 deletions trpc-spring-support/trpc-spring/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
<version>1.4.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<name>trpc-spring</name>

<artifactId>trpc-spring</artifactId>

Expand Down
1 change: 1 addition & 0 deletions trpc-spring-support/trpc-springmvc/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
<modelVersion>4.0.0</modelVersion>

<artifactId>trpc-springmvc</artifactId>
<name>trpc-springmvc</name>

<properties>
<springboot.version>2.2.2.RELEASE</springboot.version>
Expand Down
5 changes: 1 addition & 4 deletions trpc-test/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
</modules>

<properties>
<skip_maven_deploy>true</skip_maven_deploy>
<maven.deploy.skip>true</maven.deploy.skip>

<google.android.annotations.version>4.1.1.4</google.android.annotations.version>
<!-- reactor-bom and springboot need to be consistent with the version of the jar package in the trpc-dependencies-bom.pom.xml file -->
Expand Down Expand Up @@ -85,9 +85,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
<plugin>
<groupId>org.jacoco</groupId>
Expand Down
Loading