Refactor pb version (#12109)
* refactor pb version * fix * fix * fix * fix
This commit is contained in:
earthchen
GitHub
parent
6e787b0bcd
commit
43bbf9f727
|
|
@ -34,7 +34,6 @@
|
|||
<skip_maven_deploy>true</skip_maven_deploy>
|
||||
<source.level>1.8</source.level>
|
||||
<target.level>1.8</target.level>
|
||||
<protobuf-java.version>3.22.3</protobuf-java.version>
|
||||
<maven-compiler-plugin.version>3.11.0</maven-compiler-plugin.version>
|
||||
</properties>
|
||||
|
||||
|
|
@ -115,7 +114,6 @@
|
|||
<dependency>
|
||||
<groupId>com.google.protobuf</groupId>
|
||||
<artifactId>protobuf-java</artifactId>
|
||||
<version>${protobuf-java.version}</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
|
||||
|
|
@ -124,7 +122,7 @@
|
|||
<plugin>
|
||||
<groupId>kr.motd.maven</groupId>
|
||||
<artifactId>os-maven-plugin</artifactId>
|
||||
<version>1.7.1</version>
|
||||
<version>${maven_os_plugin_version}</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<phase>initialize</phase>
|
||||
|
|
@ -137,9 +135,9 @@
|
|||
<plugin>
|
||||
<groupId>org.xolstice.maven.plugins</groupId>
|
||||
<artifactId>protobuf-maven-plugin</artifactId>
|
||||
<version>0.6.1</version>
|
||||
<version>${maven_protobuf_plugin_version}</version>
|
||||
<configuration>
|
||||
<protocArtifact>com.google.protobuf:protoc:${protobuf-java.version}:exe:${os.detected.classifier}</protocArtifact>
|
||||
<protocArtifact>com.google.protobuf:protoc:${protobuf-java_version}:exe:${os.detected.classifier}</protocArtifact>
|
||||
<pluginId>triple-java</pluginId>
|
||||
<outputDirectory>build/generated/source/proto/main/java</outputDirectory>
|
||||
</configuration>
|
||||
|
|
|
|||
|
|
@ -140,6 +140,7 @@
|
|||
<prometheus_client.version>0.16.0</prometheus_client.version>
|
||||
<reactive.version>1.0.4</reactive.version>
|
||||
<reactor.version>3.5.4</reactor.version>
|
||||
<rxjava.version>2.2.21</rxjava.version>
|
||||
<okhttp_version>3.14.9</okhttp_version>
|
||||
|
||||
<rs_api_version>2.1.1</rs_api_version>
|
||||
|
|
@ -898,6 +899,11 @@
|
|||
<artifactId>reactor-core</artifactId>
|
||||
<version>${reactor.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>io.reactivex.rxjava2</groupId>
|
||||
<artifactId>rxjava</artifactId>
|
||||
<version>${rxjava.version}</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
</dependencyManagement>
|
||||
|
||||
|
|
|
|||
|
|
@ -22,6 +22,7 @@
|
|||
<groupId>org.apache.dubbo</groupId>
|
||||
<artifactId>dubbo-rpc</artifactId>
|
||||
<version>${revision}</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
<artifactId>dubbo-rpc-triple</artifactId>
|
||||
<packaging>jar</packaging>
|
||||
|
|
@ -29,10 +30,6 @@
|
|||
<description>The triple protocol module</description>
|
||||
<properties>
|
||||
<skip_maven_deploy>false</skip_maven_deploy>
|
||||
<dubbo.compiler.version>0.0.4.1-SNAPSHOT</dubbo.compiler.version>
|
||||
<reactive.version>1.0.4</reactive.version>
|
||||
<reactor.version>3.5.4</reactor.version>
|
||||
<protobuf-java.version>3.22.3</protobuf-java.version>
|
||||
</properties>
|
||||
<dependencies>
|
||||
<dependency>
|
||||
|
|
@ -53,7 +50,6 @@
|
|||
<dependency>
|
||||
<groupId>com.google.protobuf</groupId>
|
||||
<artifactId>protobuf-java</artifactId>
|
||||
<version>${protobuf-java.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.springframework</groupId>
|
||||
|
|
@ -79,7 +75,6 @@
|
|||
<dependency>
|
||||
<groupId>io.reactivex.rxjava2</groupId>
|
||||
<artifactId>rxjava</artifactId>
|
||||
<version>2.2.21</version>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
|
|
@ -89,7 +84,6 @@
|
|||
<dependency>
|
||||
<groupId>io.projectreactor</groupId>
|
||||
<artifactId>reactor-core</artifactId>
|
||||
<version>${reactor.version}</version>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
|
|
@ -98,7 +92,7 @@
|
|||
<plugin>
|
||||
<groupId>kr.motd.maven</groupId>
|
||||
<artifactId>os-maven-plugin</artifactId>
|
||||
<version>1.7.1</version>
|
||||
<version>${maven_os_plugin_version}</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<phase>initialize</phase>
|
||||
|
|
@ -111,10 +105,10 @@
|
|||
<plugin>
|
||||
<groupId>org.xolstice.maven.plugins</groupId>
|
||||
<artifactId>protobuf-maven-plugin</artifactId>
|
||||
<version>0.6.1</version>
|
||||
<version>${maven_protobuf_plugin_version}</version>
|
||||
<configuration>
|
||||
<protocArtifact>
|
||||
com.google.protobuf:protoc:${protobuf-java.version}:exe:${os.detected.classifier}
|
||||
com.google.protobuf:protoc:${protobuf-java_version}:exe:${os.detected.classifier}
|
||||
</protocArtifact>
|
||||
<protocPlugins>
|
||||
<protocPlugin>
|
||||
|
|
|
|||
|
|
@ -31,8 +31,6 @@
|
|||
<description>The xDS Integration</description>
|
||||
<properties>
|
||||
<skip_maven_deploy>false</skip_maven_deploy>
|
||||
<protobuf-java.version>3.22.3</protobuf-java.version>
|
||||
<grpc.version>1.54.0</grpc.version>
|
||||
</properties>
|
||||
|
||||
<dependencies>
|
||||
|
|
@ -52,19 +50,16 @@
|
|||
<dependency>
|
||||
<groupId>io.grpc</groupId>
|
||||
<artifactId>grpc-protobuf</artifactId>
|
||||
<version>${grpc.version}</version>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>io.grpc</groupId>
|
||||
<artifactId>grpc-stub</artifactId>
|
||||
<version>${grpc.version}</version>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>io.grpc</groupId>
|
||||
<artifactId>grpc-netty-shaded</artifactId>
|
||||
<version>${grpc.version}</version>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
|
|
@ -75,13 +70,11 @@
|
|||
<dependency>
|
||||
<groupId>com.google.protobuf</groupId>
|
||||
<artifactId>protobuf-java</artifactId>
|
||||
<version>${protobuf-java.version}</version>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>com.google.protobuf</groupId>
|
||||
<artifactId>protobuf-java-util</artifactId>
|
||||
<version>${protobuf-java.version}</version>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
|
|
@ -104,18 +97,18 @@
|
|||
<extension>
|
||||
<groupId>kr.motd.maven</groupId>
|
||||
<artifactId>os-maven-plugin</artifactId>
|
||||
<version>1.7.1</version>
|
||||
<version>${maven_os_plugin_version}</version>
|
||||
</extension>
|
||||
</extensions>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<groupId>org.xolstice.maven.plugins</groupId>
|
||||
<artifactId>protobuf-maven-plugin</artifactId>
|
||||
<version>0.6.1</version>
|
||||
<version>${maven_protobuf_plugin_version}</version>
|
||||
<configuration>
|
||||
<protocArtifact>com.google.protobuf:protoc:${protobuf-java.version}:exe:${os.detected.classifier}</protocArtifact>
|
||||
<protocArtifact>com.google.protobuf:protoc:${protobuf-java_version}:exe:${os.detected.classifier}</protocArtifact>
|
||||
<pluginId>grpc-java</pluginId>
|
||||
<pluginArtifact>io.grpc:protoc-gen-grpc-java:${grpc.version}:exe:${os.detected.classifier}</pluginArtifact>
|
||||
<pluginArtifact>io.grpc:protoc-gen-grpc-java:${grpc_version}:exe:${os.detected.classifier}</pluginArtifact>
|
||||
</configuration>
|
||||
<executions>
|
||||
<execution>
|
||||
|
|
|
|||
6
pom.xml
6
pom.xml
|
|
@ -125,11 +125,17 @@
|
|||
<maven_flatten_version>1.4.1</maven_flatten_version>
|
||||
<maven_enforce_version>3.3.0</maven_enforce_version>
|
||||
<maven_antrun_version>3.1.0</maven_antrun_version>
|
||||
<maven_os_plugin_version>1.7.1</maven_os_plugin_version>
|
||||
<maven_protobuf_plugin_version>0.6.1</maven_protobuf_plugin_version>
|
||||
<arguments />
|
||||
<checkstyle.skip>true</checkstyle.skip>
|
||||
<checkstyle_unix.skip>true</checkstyle_unix.skip>
|
||||
<rat.skip>true</rat.skip>
|
||||
<jacoco.skip>true</jacoco.skip>
|
||||
|
||||
<jprotoc_version>1.2.2</jprotoc_version>
|
||||
<protobuf-java_version>3.22.3</protobuf-java_version>
|
||||
<grpc_version>1.54.0</grpc_version>
|
||||
<revision>3.2.1-SNAPSHOT</revision>
|
||||
</properties>
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue