This is an automated email from the ASF dual-hosted git repository. kezhenxu94 pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/skywalking.git
The following commit(s) were added to refs/heads/master by this push: new b8e4a025aa Avoid Antlr dependencies' versions might be different in compile time and runtime (#10339) b8e4a025aa is described below commit b8e4a025aa8987d448009f6251b244a6d8dfbd0d Author: kezhenxu94 <kezhenx...@apache.org> AuthorDate: Sat Feb 4 15:26:49 2023 +0800 Avoid Antlr dependencies' versions might be different in compile time and runtime (#10339) --- .licenserc.yaml | 2 +- apm-webapp/pom.xml | 10 +--- dist-material/release-docs/LICENSE | 38 +++++------- docs/en/changes/changes.md | 3 + oap-server-bom/pom.xml | 14 ++--- oap-server/oal-grammar/pom.xml | 5 -- .../configuration-etcd/pom.xml | 13 ---- oap-server/server-starter/pom.xml | 15 ----- pom.xml | 70 ++++++++-------------- 9 files changed, 47 insertions(+), 123 deletions(-) diff --git a/.licenserc.yaml b/.licenserc.yaml index ec0af00052..ec5b7f5184 100644 --- a/.licenserc.yaml +++ b/.licenserc.yaml @@ -102,7 +102,7 @@ dependency: version: 2.13.4 license: Apache-2.0 - name: com.fasterxml.jackson.datatype:jackson-datatype-jsr310 - version: 2.13.2 + version: 2.14.1 license: Apache-2.0 - name: com.graphql-java:graphql-java-extended-scalars version: 18.1 diff --git a/apm-webapp/pom.xml b/apm-webapp/pom.xml index 59861f8e7c..bb3db65ae9 100644 --- a/apm-webapp/pom.xml +++ b/apm-webapp/pom.xml @@ -29,8 +29,8 @@ <packaging>jar</packaging> <properties> - <java.version>1.8</java.version> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + <frontend-maven-plugin.version>1.12.1</frontend-maven-plugin.version> <ui.path>${project.parent.basedir}/skywalking-ui</ui.path> @@ -95,14 +95,6 @@ <build> <finalName>skywalking-webapp</finalName> <plugins> - <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>${compiler.version}</source> - <target>${compiler.version}</target> - <encoding>${project.build.sourceEncoding}</encoding> - </configuration> - </plugin> <plugin> <groupId>com.github.eirslett</groupId> <artifactId>frontend-maven-plugin</artifactId> diff --git a/dist-material/release-docs/LICENSE b/dist-material/release-docs/LICENSE index 9d20c83729..a536ad7c0b 100644 --- a/dist-material/release-docs/LICENSE +++ b/dist-material/release-docs/LICENSE @@ -210,23 +210,23 @@ The following components are provided under the Apache-2.0 License. See project The text of each license is the standard Apache 2.0 license. https://mvnrepository.com/artifact/build.buf.protoc-gen-validate/pgv-java-stub/0.6.13 Apache-2.0 https://mvnrepository.com/artifact/build.buf.protoc-gen-validate/protoc-gen-validate/0.6.13 Apache-2.0 - https://mvnrepository.com/artifact/com.aayushatharva.brotli4j/brotli4j/1.7.1 Apache-2.0 + https://mvnrepository.com/artifact/com.aayushatharva.brotli4j/brotli4j/1.8.0 Apache-2.0 https://mvnrepository.com/artifact/com.alibaba.nacos/nacos-api/1.4.2 Apache-2.0 https://mvnrepository.com/artifact/com.alibaba.nacos/nacos-client/1.4.2 Apache-2.0 https://mvnrepository.com/artifact/com.alibaba.nacos/nacos-common/1.4.2 Apache-2.0 https://mvnrepository.com/artifact/com.ctrip.framework.apollo/apollo-client/1.8.0 Apache-2.0 https://mvnrepository.com/artifact/com.ctrip.framework.apollo/apollo-core/1.8.0 Apache-2.0 - https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-annotations/2.13.4 Apache-2.0 - https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-annotations/2.13.3 Apache-2.0 - https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-core/2.13.4 Apache-2.0 - https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-core/2.13.3 Apache-2.0 - https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-databind/2.13.4.1 Apache-2.0 - https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-databind/2.13.3 Apache-2.0 + https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-annotations/2.14.1 Apache-2.0 + https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-core/2.14.1 Apache-2.0 + https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-databind/2.14.1 Apache-2.0 https://mvnrepository.com/artifact/com.fasterxml.jackson.datatype/jackson-datatype-guava/2.12.0 Apache-2.0 https://mvnrepository.com/artifact/com.fasterxml.jackson.datatype/jackson-datatype-guava/2.9.5 Apache-2.0 + https://mvnrepository.com/artifact/com.fasterxml.jackson.datatype/jackson-datatype-jdk8/2.14.1 Apache-2.0 https://mvnrepository.com/artifact/com.fasterxml.jackson.datatype/jackson-datatype-jdk8/2.12.0 Apache-2.0 + https://mvnrepository.com/artifact/com.fasterxml.jackson.datatype/jackson-datatype-jdk8/2.10.0 Apache-2.0 https://mvnrepository.com/artifact/com.fasterxml.jackson.datatype/jackson-datatype-jdk8/2.13.4 Apache-2.0 https://mvnrepository.com/artifact/com.fasterxml.jackson.datatype/jackson-datatype-jdk8/2.9.5 Apache-2.0 + https://mvnrepository.com/artifact/com.fasterxml.jackson.datatype/jackson-datatype-jsr310/2.14.1 Apache-2.0 https://mvnrepository.com/artifact/com.fasterxml.jackson.module/jackson-module-kotlin/2.13.4 Apache-2.0 https://mvnrepository.com/artifact/com.fasterxml/classmate/1.5.1 Apache-2.0 https://mvnrepository.com/artifact/com.google.android/annotations/4.1.1.4 Apache-2.0 @@ -244,10 +244,10 @@ The text of each license is the standard Apache 2.0 license. https://mvnrepository.com/artifact/com.google.inject/guice/4.1.0 Apache-2.0 https://mvnrepository.com/artifact/com.google.j2objc/j2objc-annotations/1.3 Apache-2.0 https://mvnrepository.com/artifact/com.graphql-java/java-dataloader/3.2.0 Apache-2.0 - https://mvnrepository.com/artifact/com.linecorp.armeria/armeria/1.18.0 Apache-2.0 - https://mvnrepository.com/artifact/com.linecorp.armeria/armeria-graphql/1.18.0 Apache-2.0 - https://mvnrepository.com/artifact/com.linecorp.armeria/armeria-graphql-protocol/1.18.0 Apache-2.0 - https://mvnrepository.com/artifact/com.linecorp.armeria/armeria-protobuf/1.18.0 Apache-2.0 + https://mvnrepository.com/artifact/com.linecorp.armeria/armeria/1.21.0 Apache-2.0 + https://mvnrepository.com/artifact/com.linecorp.armeria/armeria-graphql/1.21.0 Apache-2.0 + https://mvnrepository.com/artifact/com.linecorp.armeria/armeria-graphql-protocol/1.21.0 Apache-2.0 + https://mvnrepository.com/artifact/com.linecorp.armeria/armeria-protobuf/1.21.0 Apache-2.0 https://mvnrepository.com/artifact/com.orbitz.consul/consul-client/1.5.3 Apache-2.0 https://mvnrepository.com/artifact/com.orbitz.consul/consul-client/1.2.6 Apache-2.0 https://mvnrepository.com/artifact/com.squareup.okhttp3/logging-interceptor/4.9.2 Apache-2.0 @@ -283,15 +283,15 @@ The text of each license is the standard Apache 2.0 license. https://mvnrepository.com/artifact/io.kubernetes/client-java/16.0.0 Apache-2.0 https://mvnrepository.com/artifact/io.kubernetes/client-java-api/16.0.0 Apache-2.0 https://mvnrepository.com/artifact/io.kubernetes/client-java-proto/16.0.0 Apache-2.0 - https://mvnrepository.com/artifact/io.micrometer/micrometer-core/1.9.2 Apache-2.0 + https://mvnrepository.com/artifact/io.micrometer/micrometer-commons/1.10.2 Apache-2.0 + https://mvnrepository.com/artifact/io.micrometer/micrometer-core/1.10.2 Apache-2.0 + https://mvnrepository.com/artifact/io.micrometer/micrometer-observation/1.10.2 Apache-2.0 https://mvnrepository.com/artifact/io.netty/netty-buffer/4.1.77.Final Apache-2.0 https://mvnrepository.com/artifact/io.netty/netty-buffer/4.1.86.Final Apache-2.0 https://mvnrepository.com/artifact/io.netty/netty-codec/4.1.77.Final Apache-2.0 https://mvnrepository.com/artifact/io.netty/netty-codec/4.1.86.Final Apache-2.0 https://mvnrepository.com/artifact/io.netty/netty-codec-dns/4.1.86.Final Apache-2.0 - https://mvnrepository.com/artifact/io.netty/netty-codec-dns/4.1.79.Final Apache-2.0 https://mvnrepository.com/artifact/io.netty/netty-codec-haproxy/4.1.86.Final Apache-2.0 - https://mvnrepository.com/artifact/io.netty/netty-codec-haproxy/4.1.79.Final Apache-2.0 https://mvnrepository.com/artifact/io.netty/netty-codec-http/4.1.77.Final Apache-2.0 https://mvnrepository.com/artifact/io.netty/netty-codec-http/4.1.86.Final Apache-2.0 https://mvnrepository.com/artifact/io.netty/netty-codec-http2/4.1.77.Final Apache-2.0 @@ -306,30 +306,20 @@ The text of each license is the standard Apache 2.0 license. https://mvnrepository.com/artifact/io.netty/netty-handler-proxy/4.1.86.Final Apache-2.0 https://mvnrepository.com/artifact/io.netty/netty-resolver/4.1.77.Final Apache-2.0 https://mvnrepository.com/artifact/io.netty/netty-resolver/4.1.86.Final Apache-2.0 - https://mvnrepository.com/artifact/io.netty/netty-resolver/4.1.79.Final Apache-2.0 https://mvnrepository.com/artifact/io.netty/netty-resolver-dns/4.1.86.Final Apache-2.0 - https://mvnrepository.com/artifact/io.netty/netty-resolver-dns/4.1.79.Final Apache-2.0 https://mvnrepository.com/artifact/io.netty/netty-resolver-dns-classes-macos/4.1.86.Final Apache-2.0 - https://mvnrepository.com/artifact/io.netty/netty-resolver-dns-classes-macos/4.1.79.Final Apache-2.0 https://mvnrepository.com/artifact/io.netty/netty-resolver-dns-native-macos/4.1.86.Final Apache-2.0 - https://mvnrepository.com/artifact/io.netty/netty-resolver-dns-native-macos/4.1.79.Final Apache-2.0 https://mvnrepository.com/artifact/io.netty/netty-tcnative-boringssl-static/2.0.52.Final Apache-2.0 https://mvnrepository.com/artifact/io.netty/netty-tcnative-boringssl-static/2.0.54.Final Apache-2.0 - https://mvnrepository.com/artifact/io.netty/netty-tcnative-boringssl-static/2.0.53.Final Apache-2.0 https://mvnrepository.com/artifact/io.netty/netty-tcnative-classes/2.0.52.Final Apache-2.0 https://mvnrepository.com/artifact/io.netty/netty-tcnative-classes/2.0.54.Final Apache-2.0 - https://mvnrepository.com/artifact/io.netty/netty-tcnative-classes/2.0.53.Final Apache-2.0 https://mvnrepository.com/artifact/io.netty/netty-transport/4.1.77.Final Apache-2.0 https://mvnrepository.com/artifact/io.netty/netty-transport/4.1.86.Final Apache-2.0 - https://mvnrepository.com/artifact/io.netty/netty-transport/4.1.79.Final Apache-2.0 https://mvnrepository.com/artifact/io.netty/netty-transport-classes-epoll/4.1.86.Final Apache-2.0 - https://mvnrepository.com/artifact/io.netty/netty-transport-classes-epoll/4.1.79.Final Apache-2.0 https://mvnrepository.com/artifact/io.netty/netty-transport-native-epoll/4.1.86.Final Apache-2.0 https://mvnrepository.com/artifact/io.netty/netty-transport-native-epoll/4.1.45.Final Apache-2.0 - https://mvnrepository.com/artifact/io.netty/netty-transport-native-epoll/4.1.79.Final Apache-2.0 https://mvnrepository.com/artifact/io.netty/netty-transport-native-unix-common/4.1.77.Final Apache-2.0 https://mvnrepository.com/artifact/io.netty/netty-transport-native-unix-common/4.1.86.Final Apache-2.0 - https://mvnrepository.com/artifact/io.netty/netty-transport-native-unix-common/4.1.79.Final Apache-2.0 https://mvnrepository.com/artifact/io.perfmark/perfmark-api/0.25.0 Apache-2.0 https://mvnrepository.com/artifact/io.prometheus/simpleclient/0.6.0 Apache-2.0 https://mvnrepository.com/artifact/io.prometheus/simpleclient_common/0.15.0 Apache-2.0 diff --git a/docs/en/changes/changes.md b/docs/en/changes/changes.md index 23d10c7d22..976a9dca80 100644 --- a/docs/en/changes/changes.md +++ b/docs/en/changes/changes.md @@ -4,6 +4,8 @@ * Bump up Zipkin and Zipkin lens UI dependency to 2.24.0. * Bump up Apache parent pom version to 29. +* Bump up Armeria version to 1.21.0. +* Clean up maven `pom.xml`s. #### OAP Server @@ -84,6 +86,7 @@ * Enhance OAP HTTP server to support HTTPS * Remove handler scan in otel receiver, manual initialization instead * Add aws-firehose-receiver to support collecting AWS CloudWatch metric(OpenTelemetry format) +* Avoid Antlr dependencies' versions might be different in compile time and runtime. #### UI diff --git a/oap-server-bom/pom.xml b/oap-server-bom/pom.xml index 3d0f63467d..26c7a54a45 100644 --- a/oap-server-bom/pom.xml +++ b/oap-server-bom/pom.xml @@ -46,19 +46,18 @@ <commons-codec.version>1.11</commons-codec.version> <commons-lang3.version>3.12.0</commons-lang3.version> <commons-io.version>2.7</commons-io.version> + <commons-text.version>1.4</commons-text.version> <kubernetes.version>16.0.0</kubernetes.version> <hikaricp.version>3.1.0</hikaricp.version> <zipkin.version>2.24.0</zipkin.version> - <jackson.version>2.13.4</jackson.version> - <jackson-databind.version>2.13.4.1</jackson-databind.version> - <commons-text.version>1.4</commons-text.version> + <jackson.version>2.14.1</jackson.version> + <jackson-databind.version>2.14.1</jackson-databind.version> <simpleclient.version>0.6.0</simpleclient.version> <apollo.version>1.8.0</apollo.version> <nacos.version>1.4.2</nacos.version> <curator.version>4.3.0</curator.version> <curator-test.version>2.12.0</curator-test.version> <etcd4j.version>2.18.0</etcd4j.version> - <antlr.version>4.9.2</antlr.version> <freemarker.version>2.3.31</freemarker.version> <javaassist.version>3.25.0-GA</javaassist.version> <vavr.version>0.10.3</vavr.version> @@ -69,7 +68,7 @@ <postgresql.version>42.4.1</postgresql.version> <jetcd.version>0.5.3</jetcd.version> <testcontainers.version>1.15.3</testcontainers.version> - <armeria.version>1.18.0</armeria.version> + <armeria.version>1.21.0</armeria.version> <awaitility.version>3.0.0</awaitility.version> <httpcore.version>4.4.13</httpcore.version> <commons-compress.version>1.21</commons-compress.version> @@ -444,11 +443,6 @@ <scope>test</scope> </dependency> - <dependency> - <groupId>org.antlr</groupId> - <artifactId>antlr4-runtime</artifactId> - <version>${antlr.version}</version> - </dependency> <dependency> <groupId>org.freemarker</groupId> <artifactId>freemarker</artifactId> diff --git a/oap-server/oal-grammar/pom.xml b/oap-server/oal-grammar/pom.xml index 54be5fb681..56ec8b5357 100755 --- a/oap-server/oal-grammar/pom.xml +++ b/oap-server/oal-grammar/pom.xml @@ -27,10 +27,6 @@ <artifactId>oal-grammar</artifactId> - <properties> - <antlr.version>4.9.2</antlr.version> - </properties> - <dependencies> <dependency> <groupId>org.antlr</groupId> @@ -43,7 +39,6 @@ <plugin> <groupId>org.antlr</groupId> <artifactId>antlr4-maven-plugin</artifactId> - <version>${antlr.version}</version> <executions> <execution> <id>antlr</id> diff --git a/oap-server/server-configuration/configuration-etcd/pom.xml b/oap-server/server-configuration/configuration-etcd/pom.xml index 3ec77b4f75..c313ae1850 100644 --- a/oap-server/server-configuration/configuration-etcd/pom.xml +++ b/oap-server/server-configuration/configuration-etcd/pom.xml @@ -78,17 +78,4 @@ <artifactId>snakeyaml</artifactId> </dependency> </dependencies> - - <build> - <plugins> - <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>${compiler.version}</source> - <target>${compiler.version}</target> - <encoding>${project.build.sourceEncoding}</encoding> - </configuration> - </plugin> - </plugins> - </build> </project> diff --git a/oap-server/server-starter/pom.xml b/oap-server/server-starter/pom.xml index 322c7687e8..28e11d16e5 100644 --- a/oap-server/server-starter/pom.xml +++ b/oap-server/server-starter/pom.xml @@ -286,21 +286,6 @@ <build> <finalName>skywalking-oap</finalName> <plugins> - <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>${compiler.version}</source> - <target>${compiler.version}</target> - <encoding>${project.build.sourceEncoding}</encoding> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-resources-plugin</artifactId> - <configuration> - <encoding>${project.build.sourceEncoding}</encoding> - </configuration> - </plugin> <plugin> <artifactId>maven-jar-plugin</artifactId> <configuration> diff --git a/pom.xml b/pom.xml index 1ead073a63..4ea7267376 100755 --- a/pom.xml +++ b/pom.xml @@ -146,8 +146,11 @@ </profiles> <properties> + <!-- Built in properties --> + <maven.compiler.source>1.8</maven.compiler.source> + <maven.compiler.target>1.8</maven.compiler.target> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <compiler.version>1.8</compiler.version> + <powermock.version>2.0.7</powermock.version> <checkstyle.version>6.18</checkstyle.version> <junit.version>4.13.1</junit.version> @@ -168,14 +171,20 @@ <!-- necessary for Java 9+ --> <org.apache.tomcat.annotations-api.version>6.0.53</org.apache.tomcat.annotations-api.version> + <!-- + The version of Antlr compiler (maven plugin) must match the version of runtime (maven dependency), + hence we don't allow arbitrary dependency overriding in oap-server-bom and keep the version only here + in a single place. Upgrading Antlr version here requires recompiling the oal-rt/oal-rt modules so users + won't face error like "ANTLR Tool version 4.9.3 used for code generation does not match the current runtime version 4.7.1". + --> + <antlr.version>4.9.2</antlr.version> + <!-- Plugin versions --> - <docker.plugin.version>0.4.13</docker.plugin.version> <takari-maven-plugin.version>0.6.1</takari-maven-plugin.version> <exec-maven-plugin.version>1.6.0</exec-maven-plugin.version> <build-helper-maven-plugin.version>3.2.0</build-helper-maven-plugin.version> <maven-checkstyle-plugin.version>3.1.0</maven-checkstyle-plugin.version> <jmh.version>1.21</jmh.version> - <gmaven-plugin.version>1.5</gmaven-plugin.version> <checkstyle.fails.on.error>true</checkstyle.fails.on.error> <assertj-core.version>3.20.2</assertj-core.version> @@ -287,24 +296,18 @@ <artifactId>jaxb-runtime</artifactId> <scope>provided</scope> </dependency> + + <dependency> + <groupId>org.antlr</groupId> + <artifactId>antlr4-runtime</artifactId> + <version>${antlr.version}</version> + </dependency> </dependencies> </dependencyManagement> <build> <pluginManagement> <plugins> - <!-- mvn -N io.takari:maven:wrapper -Dmaven=3.5.4 --> - <plugin> - <groupId>io.takari</groupId> - <artifactId>maven</artifactId> - <version>${takari-maven-plugin.version}</version> - </plugin> - <plugin> - <artifactId>maven-deploy-plugin</artifactId> - </plugin> - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-failsafe-plugin</artifactId> @@ -350,6 +353,12 @@ </excludes> </configuration> </plugin> + + <plugin> + <groupId>org.antlr</groupId> + <artifactId>antlr4-maven-plugin</artifactId> + <version>${antlr.version}</version> + </plugin> </plugins> </pluginManagement> <plugins> @@ -381,46 +390,15 @@ <!-- Build has not yet been updated for Java 9+ --> <version>1.8</version> </requireJavaVersion> - <requireMavenVersion> - <version>3.6</version> - </requireMavenVersion> </rules> </configuration> </execution> </executions> </plugin> - <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>${compiler.version}</source> - <target>${compiler.version}</target> - <encoding>${project.build.sourceEncoding}</encoding> - </configuration> - </plugin> - <plugin> - <artifactId>maven-javadoc-plugin</artifactId> - <configuration> - <source>${compiler.version}</source> - </configuration> - </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-failsafe-plugin</artifactId> </plugin> - <plugin> - <artifactId>maven-resources-plugin</artifactId> - <configuration> - <encoding>${project.build.sourceEncoding}</encoding> - </configuration> - </plugin> - <plugin> - <groupId>com.spotify</groupId> - <artifactId>docker-maven-plugin</artifactId> - <version>${docker.plugin.version}</version> - <configuration> - <skipDocker>true</skipDocker> - </configuration> - </plugin> <plugin> <artifactId>maven-source-plugin</artifactId> <executions>