This is an automated email from the ASF dual-hosted git repository.

tison pushed a commit to branch build
in repository https://gitbox.apache.org/repos/asf/incubator-horaedb-proto.git

commit ea041255a5ea6c11e51f2489eb47e807377fea0c
Author: tison <[email protected]>
AuthorDate: Thu Jan 4 17:10:27 2024 +0800

    chore pom.xml
    
    Signed-off-by: tison <[email protected]>
---
 java/pom.xml | 74 +++++++++++++-----------------------------------------------
 1 file changed, 16 insertions(+), 58 deletions(-)

diff --git a/java/pom.xml b/java/pom.xml
index 4cde1f6..874bcd7 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -51,42 +51,35 @@
     </mailingLists>
 
     <properties>
-        <io.grpc.version>1.58.0</io.grpc.version>
         <maven.compiler.source>8</maven.compiler.source>
         <maven.compiler.target>8</maven.compiler.target>
         <project.encoding>UTF-8</project.encoding>
+
+        <grpc.version>1.58.0</grpc.version>
+        <javax-annotation-api.version>1.3.2</javax-annotation-api.version>
         <protobuf.version>3.25.1</protobuf.version>
     </properties>
 
     <dependencies>
-        <dependency>
-            <groupId>io.grpc</groupId>
-            <artifactId>grpc-all</artifactId>
-            <version>${io.grpc.version}</version>
-            <exclusions>
-                <exclusion>
-                    <artifactId>netty-codec-http2</artifactId>
-                    <groupId>io.netty</groupId>
-                </exclusion>
-                <exclusion>
-                    <artifactId>netty-handler-proxy</artifactId>
-                    <groupId>io.netty</groupId>
-                </exclusion>
-                <exclusion>
-                    <artifactId>junit</artifactId>
-                    <groupId>junit</groupId>
-                </exclusion>
-            </exclusions>
-        </dependency>
         <dependency>
             <groupId>com.google.protobuf</groupId>
             <artifactId>protobuf-java</artifactId>
             <version>${protobuf.version}</version>
         </dependency>
+        <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>javax.annotation</groupId>
             <artifactId>javax.annotation-api</artifactId>
-            <version>1.3.2</version>
+            <version>${javax-annotation-api.version}</version>
         </dependency>
     </dependencies>
 
@@ -95,7 +88,7 @@
             <extension>
                 <groupId>kr.motd.maven</groupId>
                 <artifactId>os-maven-plugin</artifactId>
-                <version>1.4.1.Final</version>
+                <version>1.7.1</version>
             </extension>
         </extensions>
         <finalName>horaedb-proto-internal</finalName>
@@ -112,41 +105,6 @@
                     <showWarnings>true</showWarnings>
                 </configuration>
             </plugin>
-            <!-- sort pom -->
-            <plugin>
-                <groupId>com.github.ekryd.sortpom</groupId>
-                <artifactId>sortpom-maven-plugin</artifactId>
-                <version>2.4.0</version>
-                <executions>
-                    <execution>
-                        <id>sort-pom</id>
-                        <phase>compile</phase>
-                        <goals>
-                            <goal>sort</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <nrOfIndentSpace>4</nrOfIndentSpace>
-                    <keepBlankLines>true</keepBlankLines>
-                    <sortProperties>true</sortProperties>
-                    <encoding>${project.encoding}</encoding>
-                </configuration>
-            </plugin>
-            <!-- Source -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-source-plugin</artifactId>
-                <version>3.0.1</version>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>jar-no-fork</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
             <plugin>
                 <groupId>org.xolstice.maven.plugins</groupId>
                 <artifactId>protobuf-maven-plugin</artifactId>
@@ -162,7 +120,7 @@
                 <configuration>
                     
<protocArtifact>com.google.protobuf:protoc:${protobuf.version}:exe:${os.detected.classifier}</protocArtifact>
                     <pluginId>grpc-java</pluginId>
-                    
<pluginArtifact>io.grpc:protoc-gen-grpc-java:${io.grpc.version}:exe:${os.detected.classifier}</pluginArtifact>
+                    
<pluginArtifact>io.grpc:protoc-gen-grpc-java:${grpc.version}:exe:${os.detected.classifier}</pluginArtifact>
                     
<protoSourceRoot>${project.basedir}/../protos</protoSourceRoot>
                     
<outputDirectory>${project.basedir}/src/main/java</outputDirectory>
                     <clearOutputDirectory>false</clearOutputDirectory>


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to