zipkin-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From adrianc...@apache.org
Subject [incubator-zipkin-brave-cassandra] branch master updated: Moves build to JDK 11 (#19)
Date Mon, 18 Mar 2019 03:25:10 GMT
This is an automated email from the ASF dual-hosted git repository.

adriancole pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-zipkin-brave-cassandra.git


The following commit(s) were added to refs/heads/master by this push:
     new 2f2a7d6  Moves build to JDK 11 (#19)
2f2a7d6 is described below

commit 2f2a7d612a35796b290223300bacc99ae4ca6ace
Author: Adrian Cole <adriancole@users.noreply.github.com>
AuthorDate: Mon Mar 18 11:25:06 2019 +0800

    Moves build to JDK 11 (#19)
    
    works around error-prone issue
---
 Jenkinsfile |  2 +-
 pom.xml     | 51 ++++-----------------------------------------------
 2 files changed, 5 insertions(+), 48 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 5c28c35..599f06d 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -21,7 +21,7 @@ pipeline {
     }
 
     tools {
-        jdk 'JDK 1.8 (latest)'
+        jdk 'JDK 11 (latest)'
     }
 
     options {
diff --git a/pom.xml b/pom.xml
index 78f5a4a..0b4493a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -50,7 +50,7 @@
 
     <!-- override to set exclusions per-project -->
     <errorprone.args />
-    <errorprone.version>2.3.2</errorprone.version>
+    <errorprone.version>2.3.3</errorprone.version>
 
     <license-maven-plugin.version>3.0</license-maven-plugin.version>
     <maven-failsafe-plugin.version>3.0.0-M3</maven-failsafe-plugin.version>
@@ -331,7 +331,7 @@
             <configuration>
               <rules>
                 <requireJavaVersion>
-                  <version>[1.8,12)</version>
+                  <version>[11,12)</version>
                 </requireJavaVersion>
               </rules>
             </configuration>
@@ -403,52 +403,9 @@
 
   <profiles>
     <profile>
-      <id>error-prone-1.8</id>
+      <id>error-prone-11+</id>
       <activation>
-        <jdk>1.8</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>
-                  <compilerId>javac-with-errorprone</compilerId>
-                  <forceJavacCompilerUse>true</forceJavacCompilerUse>
-                  <compilerArgs>
-                    <arg>${errorprone.args}</arg>
-                  </compilerArgs>
-                </configuration>
-              </execution>
-            </executions>
-            <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>
+        <jdk>[11,)</jdk>
         <activeByDefault>false</activeByDefault>
       </activation>
       <build>


Mime
View raw message