This is an automated email from the ASF dual-hosted git repository. abesto pushed a commit to branch dont-sign-snapshots in repository https://gitbox.apache.org/repos/asf/incubator-zipkin-brave-karaf.git
commit a32fc5d9f23cd7efa865b5f055a65661bf824264 Author: Adrian Cole <[email protected]> AuthorDate: Thu Oct 18 13:29:13 2018 +0800 Updates build and deps to work with JDK 11 (#9) --- .circleci/config.yml | 8 +-- features/src/main/resources/features.xml | 8 ++- itests/pom.xml | 2 +- pom.xml | 104 +++++++++++++++++++++++++------ 4 files changed, 94 insertions(+), 28 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 971fdab..91ed2c0 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -16,7 +16,7 @@ version: 2 jobs: build: docker: - - image: circleci/openjdk:8-jdk + - image: circleci/openjdk:11-jdk steps: - checkout @@ -50,7 +50,7 @@ jobs: publish_snapshot: docker: - - image: circleci/openjdk:8-jdk + - image: circleci/openjdk:11-jdk steps: - checkout - restore_cache: @@ -65,7 +65,7 @@ jobs: publish_stable: docker: - - image: circleci/openjdk:8-jdk + - image: circleci/openjdk:11-jdk steps: - checkout - restore_cache: @@ -82,7 +82,7 @@ jobs: trigger_publish: docker: - - image: circleci/openjdk:8-jdk + - image: circleci/openjdk:11-jdk steps: - checkout - restore_cache: diff --git a/features/src/main/resources/features.xml b/features/src/main/resources/features.xml index 440a43a..2933d20 100644 --- a/features/src/main/resources/features.xml +++ b/features/src/main/resources/features.xml @@ -30,15 +30,17 @@ <feature name="brave-sender-kafka"> <feature>brave</feature> - <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.kafka-clients/1.1.0_1</bundle> + <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.kafka-clients/2.0.0_1</bundle> <bundle>mvn:io.zipkin.reporter2/zipkin-sender-kafka11/${zipkin-reporter.version}</bundle> <bundle>mvn:io.zipkin.brave.karaf/brave-exporter-sender-kafka/${project.version}</bundle> </feature> <feature name="brave-sender-okhttp"> <feature>brave</feature> - <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.okio/1.14.0_1</bundle> - <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.okhttp/3.10.0_2</bundle> + <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.okio/1.15.0_1</bundle> + <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.okhttp/3.11.0_1</bundle> + <!-- for javax.annotation.Nullable used by OkHttp. Lacking this is a problem in JDK 11 --> + <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jsr305/3.0.2_1</bundle> <bundle>mvn:io.zipkin.reporter2/zipkin-sender-okhttp3/${zipkin-reporter.version}</bundle> <bundle>mvn:io.zipkin.brave.karaf/brave-exporter-sender-okhttp/${project.version}</bundle> </feature> diff --git a/itests/pom.xml b/itests/pom.xml index 65addcb..ebef717 100644 --- a/itests/pom.xml +++ b/itests/pom.xml @@ -26,7 +26,7 @@ <properties> <pax-exam.version>4.12.0</pax-exam.version> - <karaf.version>4.2.0</karaf.version> + <karaf.version>4.2.1</karaf.version> <main.basedir>${project.basedir}/..</main.basedir> </properties> diff --git a/pom.xml b/pom.xml index 3847d1b..5ec2fdf 100644 --- a/pom.xml +++ b/pom.xml @@ -40,13 +40,17 @@ <main.basedir>${project.basedir}</main.basedir> + <!-- override to set exclusions per-project --> + <errorprone.args /> + <errorprone.version>2.3.2</errorprone.version> + <!-- Make sure these versions match brave-bom --> - <brave.version>5.3.0</brave.version> - <zipkin.version>2.11.5</zipkin.version> - <zipkin-reporter.version>2.7.8</zipkin-reporter.version> + <brave.version>5.4.3</brave.version> + <zipkin.version>2.11.7</zipkin.version> + <zipkin-reporter.version>2.7.10</zipkin-reporter.version> <license-maven-plugin.version>2.11</license-maven-plugin.version> - <maven-failsafe-plugin.version>2.22.0</maven-failsafe-plugin.version> + <maven-failsafe-plugin.version>2.22.1</maven-failsafe-plugin.version> </properties> <name>Brave Karaf (Parent)</name> @@ -227,33 +231,20 @@ <plugin> <inherited>true</inherited> <artifactId>maven-compiler-plugin</artifactId> - <version>3.7.0</version> + <version>3.8.0</version> <configuration> <!-- Retrolambda will rewrite lambdas as Java 6 bytecode --> <source>1.8</source> <target>1.8</target> - <compilerId>javac-with-errorprone</compilerId> <forceJavacCompilerUse>true</forceJavacCompilerUse> <showWarnings>true</showWarnings> </configuration> - <dependencies> - <dependency> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-compiler-javac-errorprone</artifactId> - <version>2.8.4</version> - </dependency> - <dependency> - <groupId>com.google.errorprone</groupId> - <artifactId>error_prone_core</artifactId> - <version>2.3.1</version> - </dependency> - </dependencies> </plugin> <plugin> <groupId>net.orfjackal.retrolambda</groupId> <artifactId>retrolambda-maven-plugin</artifactId> - <version>2.5.4</version> + <version>2.5.5</version> <executions> <execution> <goals> @@ -375,7 +366,7 @@ <configuration> <rules> <requireJavaVersion> - <version>[1.8,9)</version> + <version>[1.8,12)</version> </requireJavaVersion> </rules> </configuration> @@ -407,6 +398,79 @@ <profiles> <profile> + <id>error-prone-1.8</id> + <activation> + <jdk>1.8</jdk> + <activeByDefault>false</activeByDefault> + </activation> + <build> + <plugins> + <plugin> + <artifactId>maven-compiler-plugin</artifactId> + <!-- running errorprone even on test tree to avoid + java.lang.NoSuchFieldError: ANNOTATION_PROCESSOR_MODULE_PATH compiling tests --> + <configuration> + <compilerId>javac-with-errorprone</compilerId> + <forceJavacCompilerUse>true</forceJavacCompilerUse> + <compilerArgs> + <arg>${errorprone.args}</arg> + </compilerArgs> + </configuration> + <dependencies> + <dependency> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-compiler-javac-errorprone</artifactId> + <version>2.8.5</version> + </dependency> + <dependency> + <groupId>com.google.errorprone</groupId> + <artifactId>error_prone_core</artifactId> + <version>${errorprone.version}</version> + </dependency> + </dependencies> + </plugin> + </plugins> + </build> + </profile> + <profile> + <id>error-prone-9+</id> + <activation> + <jdk>[9,)</jdk> + <activeByDefault>false</activeByDefault> + </activation> + <build> + <plugins> + <plugin> + <artifactId>maven-compiler-plugin</artifactId> + <executions> + <execution> + <!-- only use errorprone on main source tree --> + <id>default-compile</id> + <phase>compile</phase> + <goals> + <goal>compile</goal> + </goals> + <configuration> + <forceJavacCompilerUse>true</forceJavacCompilerUse> + <compilerArgs> + <arg>-XDcompilePolicy=simple</arg> + <arg>-Xplugin:ErrorProne ${errorprone.args}</arg> + </compilerArgs> + <annotationProcessorPaths> + <processorPath> + <groupId>com.google.errorprone</groupId> + <artifactId>error_prone_core</artifactId> + <version>${errorprone.version}</version> + </processorPath> + </annotationProcessorPaths> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + <profile> <id>release</id> <build> <plugins>
