diff --git a/address/pom.xml b/address/pom.xml index d0829b650..2dfb65afa 100644 --- a/address/pom.xml +++ b/address/pom.xml @@ -29,12 +29,6 @@ nacos-address ${project.version} https://nacos.io - - UTF-8 - 1.8 - 1.8 - - ${project.groupId} diff --git a/api/pom.xml b/api/pom.xml index 6ba00e811..79a33d42b 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -50,22 +50,9 @@ --> - - - org.apache.maven.plugins - maven-compiler-plugin - - 8 - 8 - - - - UTF-8 - - com.fasterxml.jackson.core @@ -105,11 +92,6 @@ com.google.protobuf protobuf-java - - io.grpc - protoc-gen-grpc-java - pom - javax.annotation javax.annotation-api diff --git a/auth/pom.xml b/auth/pom.xml index 65db85924..745aab5dd 100644 --- a/auth/pom.xml +++ b/auth/pom.xml @@ -30,10 +30,6 @@ jar nacos-auth ${project.version} https://nacos.io - - - UTF-8 - @@ -60,17 +56,4 @@ tomcat-embed-core - - - - - org.apache.maven.plugins - maven-compiler-plugin - - 8 - 8 - - - - diff --git a/client/pom.xml b/client/pom.xml index 8f7922c9e..36e64e8db 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -31,10 +31,6 @@ nacos-client ${project.version} https://nacos.io - - UTF-8 - - @@ -125,159 +121,160 @@ - - - org.apache.maven.plugins - maven-compiler-plugin - - 8 - 8 - - - + + + + maven-shade-plugin + 3.2.4 + + false + + + + package + + shade + + + false + true + false + true + true + true + + + + *:* + + META-INF/*.SF + META-INF/*.DSA + META-INF/*.RSA + + + + io.grpc:grpc-netty-shaded + + + META-INF/native/*.* + + + + + com.google.*:* + + + google/**/*.proto + + + + + com.alibaba.nacos:nacos-api + + + com/alibaba/nacos/api/**/** + + + META-INF/**/*.* + + + + + + + + com.alibaba.nacos:nacos-api + com.alibaba.nacos:nacos-common + org.conscrypt:conscrypt-openjdk + org.mortbay.jetty.alpn:alpn-boot + org.eclipse.jetty.npn:npn-api + org.reflections:reflections + com.google.guava:guava + io.grpc:* + io.opencensus:* + org.javassist:* + io.perfmark:perfmark-api + com.google.*:* + javax.annotation:javax.annotation-api + org.checkerframework:* + org.codehaus.mojo:* + + + + + + io.grpc + com.alibaba.nacos.shaded.io.grpc + + io.grpc.netty.shaded.io.grpc.netty.* + + + + io.grpc.netty.shaded.io.grpc.netty + com.alibaba.nacos.shaded.io.grpc.netty.shaded.io.grpc.netty + + + io.grpc.netty.shaded.io.grpc.netty.* + + + + + com.google + com.alibaba.nacos.shaded.com.google + + + + javax.annotation + com.alibaba.nacos.shaded.javax.annotation + + + + io.perfmark + com.alibaba.nacos.shaded.io.perfmark + + + io.opencensus + com.alibaba.nacos.shaded.io.opencensus + + + org.codehaus + com.alibaba.nacos.shaded.org.codehaus + + + org.checkerframework + com.alibaba.nacos.shaded.org.checkerframework + + + android.annotation + com.alibaba.nacos.shaded.android.annotation + + + org.example + com.alibaba.nacos.shaded.org.example + + + + + + + + + + + + + - + release-sign-artifacts - org.apache.maven.plugins maven-shade-plugin - 3.2.4 - - false - - - - package - - shade - - - false - true - false - true - - - *:* - - META-INF/*.SF - META-INF/*.DSA - META-INF/*.RSA - - - - io.grpc:grpc-netty-shaded - - - META-INF/native/*.* - - - - - com.alibaba.nacos:nacos-api - - - com/alibaba/nacos/api/**/** - - - META-INF/**/*.* - - - - - - true - true - - - - com.alibaba.nacos:nacos-api - com.alibaba.nacos:nacos-common - org.conscrypt:conscrypt-openjdk - org.mortbay.jetty.alpn:alpn-boot - org.eclipse.jetty.npn:npn-api - org.reflections:reflections - com.google.guava:guava - io.grpc:* - io.opencensus:* - org.javassist:* - io.perfmark:perfmark-api - com.google.*:* - javax.annotation:javax.annotation-api - org.checkerframework:* - org.codehaus.mojo:* - - - - - - - - io.grpc - com.alibaba.nacos.shaded.io.grpc - - io.grpc.netty.shaded.io.grpc.netty.* - - - - io.grpc.netty.shaded.io.grpc.netty - com.alibaba.nacos.shaded.io.grpc.netty.shaded.io.grpc.netty - - - io.grpc.netty.shaded.io.grpc.netty.* - - - - - com.google - com.alibaba.nacos.shaded.com.google - - - - javax.annotation - com.alibaba.nacos.shaded.javax.annotation - - - - io.perfmark - com.alibaba.nacos.shaded.io.perfmark - - - io.opencensus - com.alibaba.nacos.shaded.io.opencensus - - - org.codehaus - com.alibaba.nacos.shaded.org.codehaus - - - org.checkerframework - com.alibaba.nacos.shaded.org.checkerframework - - - android.annotation - com.alibaba.nacos.shaded.android.annotation - - - org.example - com.alibaba.nacos.shaded.org.example - - - - - - - - - - - maven-jar-plugin @@ -302,141 +299,7 @@ - org.apache.maven.plugins maven-shade-plugin - 3.2.4 - - false - - - - package - - shade - - - false - true - false - true - - - *:* - - META-INF/*.SF - META-INF/*.DSA - META-INF/*.RSA - - - - io.grpc:grpc-netty-shaded - - - META-INF/native/*.* - - - - - com.alibaba.nacos:nacos-api - - - com/alibaba/nacos/api/**/** - - - META-INF/**/*.* - - - - - - true - true - - - - com.alibaba.nacos:nacos-api - com.alibaba.nacos:nacos-common - org.conscrypt:conscrypt-openjdk - org.mortbay.jetty.alpn:alpn-boot - org.eclipse.jetty.npn:npn-api - org.reflections:reflections - com.google.guava:guava - io.grpc:* - io.opencensus:* - org.javassist:* - io.perfmark:perfmark-api - com.google.*:* - javax.annotation:javax.annotation-api - org.checkerframework:* - org.codehaus.mojo:* - - - - - - - - io.grpc - com.alibaba.nacos.shaded.io.grpc - - io.grpc.netty.shaded.io.grpc.netty.* - - - - io.grpc.netty.shaded.io.grpc.netty - com.alibaba.nacos.shaded.io.grpc.netty.shaded.io.grpc.netty - - - io.grpc.netty.shaded.io.grpc.netty.* - - - - - com.google - com.alibaba.nacos.shaded.com.google - - - - javax.annotation - com.alibaba.nacos.shaded.javax.annotation - - - - io.perfmark - com.alibaba.nacos.shaded.io.perfmark - - - io.opencensus - com.alibaba.nacos.shaded.io.opencensus - - - org.codehaus - com.alibaba.nacos.shaded.org.codehaus - - - org.checkerframework - com.alibaba.nacos.shaded.org.checkerframework - - - android.annotation - com.alibaba.nacos.shaded.android.annotation - - - org.example - com.alibaba.nacos.shaded.org.example - - - - - - - - - - - maven-jar-plugin diff --git a/cmdb/pom.xml b/cmdb/pom.xml index 421bbe204..4aa45d2b0 100644 --- a/cmdb/pom.xml +++ b/cmdb/pom.xml @@ -32,12 +32,6 @@ nacos-cmdb ${project.version} https://nacos.io - - UTF-8 - 1.7 - 1.7 - - ${project.groupId} diff --git a/common/pom.xml b/common/pom.xml index cc7501011..f7d085708 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -32,10 +32,6 @@ nacos-common ${project.version} https://nacos.io - - UTF-8 - - org.slf4j @@ -68,16 +64,6 @@ - - - org.apache.maven.plugins - maven-compiler-plugin - - 8 - 8 - - - src/main/resources diff --git a/config/pom.xml b/config/pom.xml index 345d191ce..dc4f8611d 100644 --- a/config/pom.xml +++ b/config/pom.xml @@ -31,10 +31,6 @@ nacos-config ${project.version} https://nacos.io - - UTF-8 - - org.springframework.boot diff --git a/consistency/pom.xml b/consistency/pom.xml index edd3c5bc6..e505a6357 100644 --- a/consistency/pom.xml +++ b/consistency/pom.xml @@ -50,14 +50,6 @@ - - org.apache.maven.plugins - maven-compiler-plugin - - 8 - 8 - - @@ -90,10 +82,6 @@ ${revision} - - UTF-8 - - https://nacos.io diff --git a/console/pom.xml b/console/pom.xml index 4c7b4295d..619a8aefb 100644 --- a/console/pom.xml +++ b/console/pom.xml @@ -27,9 +27,6 @@ jar nacos-console ${project.version} https://nacos.io - - UTF-8 - diff --git a/core/pom.xml b/core/pom.xml index cf4cff814..04b98fd10 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -32,22 +32,6 @@ nacos-core ${project.version} https://nacos.io - - - - org.apache.maven.plugins - maven-compiler-plugin - - 8 - 8 - - - - - - - UTF-8 - @@ -160,12 +144,6 @@ - - io.grpc - protoc-gen-grpc-java - pom - - io.grpc grpc-testing diff --git a/example/pom.xml b/example/pom.xml index e16848869..84f8c08c8 100644 --- a/example/pom.xml +++ b/example/pom.xml @@ -33,10 +33,6 @@ nacos-example ${project.version} https://nacos.io - - UTF-8 - - ${project.groupId} diff --git a/istio/pom.xml b/istio/pom.xml index 462686ea6..a98e7e566 100644 --- a/istio/pom.xml +++ b/istio/pom.xml @@ -71,12 +71,6 @@ com.google.protobuf protobuf-java - - io.grpc - protoc-gen-grpc-java - pom - - io.envoyproxy.controlplane api diff --git a/naming/pom.xml b/naming/pom.xml index 0d25a17a3..ba5f6fe3c 100644 --- a/naming/pom.xml +++ b/naming/pom.xml @@ -33,12 +33,6 @@ nacos-naming ${project.version} https://nacos.io - - UTF-8 - 1.8 - 1.8 - - ${project.groupId} diff --git a/pom.xml b/pom.xml index 75647af90..738f4d5f8 100644 --- a/pom.xml +++ b/pom.xml @@ -92,8 +92,9 @@ UTF-8 UTF-8 - 1.8 - 1.8 + 1.8 + ${java.version} + ${java.version} false true @@ -107,6 +108,7 @@ 1.4.1 3.5.1 2.10.4 + 3.2.2 3.0.1 3.8 0.12 @@ -161,6 +163,10 @@ + + maven-jar-plugin + ${maven-jar-plugin.version} + org.springframework.boot spring-boot-maven-plugin @@ -956,12 +962,6 @@ grpc-stub ${grpc-java.version} - - io.grpc - protoc-gen-grpc-java - ${grpc-java.version} - pom - io.grpc grpc-testing diff --git a/sys/pom.xml b/sys/pom.xml index b922936c5..ed5967f57 100644 --- a/sys/pom.xml +++ b/sys/pom.xml @@ -31,10 +31,6 @@ nacos-sys ${project.version} https://nacos.io - - UTF-8 - - ${project.groupId} @@ -76,17 +72,4 @@ nacos-custom-environment-plugin - - - - - org.apache.maven.plugins - maven-compiler-plugin - - 8 - 8 - - - - diff --git a/test/pom.xml b/test/pom.xml index 0b40817e3..164d75afd 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -36,10 +36,6 @@ core-test - - UTF-8 - -