zipkin-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From adrianc...@apache.org
Subject [incubator-zipkin] 01/01: Scopes retrolambda to the core library
Date Sat, 04 May 2019 00:33:01 GMT
This is an automated email from the ASF dual-hosted git repository.

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

commit f3ec0e741cc0d75beb8ab9e7a48fc0608333fcdb
Author: Adrian Cole <acole@pivotal.io>
AuthorDate: Sat May 4 08:32:08 2019 +0800

    Scopes retrolambda to the core library
    
    All other libraries use Java 1.8 or aren't Java. Scoping retrolambda
    to the core jar speeds up the build.
---
 benchmarks/pom.xml           | 10 ----------
 pom.xml                      | 26 ++------------------------
 zipkin-autoconfigure/pom.xml | 10 ----------
 zipkin-collector/pom.xml     | 10 ----------
 zipkin-lens/pom.xml          | 10 ----------
 zipkin-server/pom.xml        | 10 ----------
 zipkin-storage/pom.xml       | 10 ----------
 zipkin-tests/pom.xml         |  9 ---------
 zipkin-ui/pom.xml            | 10 ----------
 zipkin/pom.xml               | 18 ++++++++++++++++++
 10 files changed, 20 insertions(+), 103 deletions(-)

diff --git a/benchmarks/pom.xml b/benchmarks/pom.xml
index 1407979..177bceb 100644
--- a/benchmarks/pom.xml
+++ b/benchmarks/pom.xml
@@ -107,16 +107,6 @@
         <groupId>com.squareup.wire</groupId>
         <artifactId>wire-maven-plugin</artifactId>
       </plugin>
-      <!-- disable retrolambda as we allow language level 1.8 benchmark classes -->
-      <plugin>
-        <groupId>net.orfjackal.retrolambda</groupId>
-        <artifactId>retrolambda-maven-plugin</artifactId>
-        <executions>
-          <execution>
-            <phase>none</phase>
-          </execution>
-        </executions>
-      </plugin>
       <!-- The benchmark test suite is not a valid dependency to others -->
       <plugin>
         <artifactId>maven-deploy-plugin</artifactId>
diff --git a/pom.xml b/pom.xml
index e0a8c4c..ab166a0 100755
--- a/pom.xml
+++ b/pom.xml
@@ -527,24 +527,6 @@
           </configuration>
         </plugin>
 
-        <plugin>
-          <groupId>net.orfjackal.retrolambda</groupId>
-          <artifactId>retrolambda-maven-plugin</artifactId>
-          <version>2.5.6</version>
-          <executions>
-            <execution>
-              <goals>
-                <goal>process-main</goal>
-              </goals>
-              <configuration>
-                <target>${main.java.version}</target>
-                <fork>true</fork>
-                <quiet>true</quiet>
-              </configuration>
-            </execution>
-          </executions>
-        </plugin>
-
         <!-- The below plugins compile protobuf stubs in the indicated source tree -->
         <plugin>
           <artifactId>maven-dependency-plugin</artifactId>
@@ -590,12 +572,8 @@
     </pluginManagement>
 
     <plugins>
-      <!-- Explicitly disable when using java version 1.8+ or not using java -->
-      <plugin>
-        <groupId>net.orfjackal.retrolambda</groupId>
-        <artifactId>retrolambda-maven-plugin</artifactId>
-      </plugin>
-
+      <!-- Top-level to ensure our server can use JDK 1.8
+             (by checking we don't accidentally use later apis) -->
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>animal-sniffer-maven-plugin</artifactId>
diff --git a/zipkin-autoconfigure/pom.xml b/zipkin-autoconfigure/pom.xml
index 19c4536..cc1c81e 100644
--- a/zipkin-autoconfigure/pom.xml
+++ b/zipkin-autoconfigure/pom.xml
@@ -57,16 +57,6 @@
 
   <build>
     <plugins>
-      <!-- disable retrolambda as zipkin-server is language level 1.8 -->
-      <plugin>
-        <groupId>net.orfjackal.retrolambda</groupId>
-        <artifactId>retrolambda-maven-plugin</artifactId>
-        <executions>
-          <execution>
-            <phase>none</phase>
-          </execution>
-        </executions>
-      </plugin>
       <plugin>
         <artifactId>maven-remote-resources-plugin</artifactId>
         <configuration>
diff --git a/zipkin-collector/pom.xml b/zipkin-collector/pom.xml
index dd09f62..153398d 100644
--- a/zipkin-collector/pom.xml
+++ b/zipkin-collector/pom.xml
@@ -62,16 +62,6 @@
 
   <build>
     <plugins>
-      <!-- disable retrolambda as zipkin-server is language level 1.8 -->
-      <plugin>
-        <groupId>net.orfjackal.retrolambda</groupId>
-        <artifactId>retrolambda-maven-plugin</artifactId>
-        <executions>
-          <execution>
-            <phase>none</phase>
-          </execution>
-        </executions>
-      </plugin>
       <plugin>
         <artifactId>maven-remote-resources-plugin</artifactId>
         <configuration>
diff --git a/zipkin-lens/pom.xml b/zipkin-lens/pom.xml
index ef12556..38121fb 100644
--- a/zipkin-lens/pom.xml
+++ b/zipkin-lens/pom.xml
@@ -97,16 +97,6 @@
           </execution>
         </executions>
       </plugin>
-      <!-- disable retrolambda as this module doesn't include Java -->
-      <plugin>
-        <groupId>net.orfjackal.retrolambda</groupId>
-        <artifactId>retrolambda-maven-plugin</artifactId>
-        <executions>
-          <execution>
-            <phase>none</phase>
-          </execution>
-        </executions>
-      </plugin>
     </plugins>
   </build>
 </project>
diff --git a/zipkin-server/pom.xml b/zipkin-server/pom.xml
index 5e22f50..e4b6f94 100644
--- a/zipkin-server/pom.xml
+++ b/zipkin-server/pom.xml
@@ -453,16 +453,6 @@
           <executable>true</executable>
         </configuration>
       </plugin>
-      <!-- disable retrolambda since this module uses java 8 types -->
-      <plugin>
-        <groupId>net.orfjackal.retrolambda</groupId>
-        <artifactId>retrolambda-maven-plugin</artifactId>
-        <executions>
-          <execution>
-            <phase>none</phase>
-          </execution>
-        </executions>
-      </plugin>
       <plugin>
         <artifactId>maven-remote-resources-plugin</artifactId>
         <configuration>
diff --git a/zipkin-storage/pom.xml b/zipkin-storage/pom.xml
index f0e7f69..2da3b6b 100644
--- a/zipkin-storage/pom.xml
+++ b/zipkin-storage/pom.xml
@@ -61,16 +61,6 @@
 
   <build>
     <plugins>
-      <!-- disable retrolambda as we set language level to 1.8 -->
-      <plugin>
-        <groupId>net.orfjackal.retrolambda</groupId>
-        <artifactId>retrolambda-maven-plugin</artifactId>
-        <executions>
-          <execution>
-            <phase>none</phase>
-          </execution>
-        </executions>
-      </plugin>
       <plugin>
         <artifactId>maven-remote-resources-plugin</artifactId>
         <configuration>
diff --git a/zipkin-tests/pom.xml b/zipkin-tests/pom.xml
index 39690a9..bd1e55b 100644
--- a/zipkin-tests/pom.xml
+++ b/zipkin-tests/pom.xml
@@ -61,15 +61,6 @@
   <build>
     <plugins>
       <plugin>
-        <groupId>net.orfjackal.retrolambda</groupId>
-        <artifactId>retrolambda-maven-plugin</artifactId>
-        <executions>
-          <execution>
-            <phase>none</phase>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
         <artifactId>maven-remote-resources-plugin</artifactId>
         <configuration>
           <skip>false</skip>
diff --git a/zipkin-ui/pom.xml b/zipkin-ui/pom.xml
index cb6b2b8..09ef56e 100644
--- a/zipkin-ui/pom.xml
+++ b/zipkin-ui/pom.xml
@@ -98,16 +98,6 @@
           </execution>
         </executions>
       </plugin>
-      <!-- disable retrolambda as this module doesn't include Java -->
-      <plugin>
-        <groupId>net.orfjackal.retrolambda</groupId>
-        <artifactId>retrolambda-maven-plugin</artifactId>
-        <executions>
-          <execution>
-            <phase>none</phase>
-          </execution>
-        </executions>
-      </plugin>
     </plugins>
   </build>
 </project>
diff --git a/zipkin/pom.xml b/zipkin/pom.xml
index dbe1c0f..15b9e77 100644
--- a/zipkin/pom.xml
+++ b/zipkin/pom.xml
@@ -90,6 +90,24 @@
           </instructions>
         </configuration>
       </plugin>
+      <!-- Rewrites bytecode back down to java 1.6 -->
+      <plugin>
+        <groupId>net.orfjackal.retrolambda</groupId>
+        <artifactId>retrolambda-maven-plugin</artifactId>
+        <version>2.5.6</version>
+        <executions>
+          <execution>
+            <goals>
+              <goal>process-main</goal>
+            </goals>
+            <configuration>
+              <target>${main.java.version}</target>
+              <fork>true</fork>
+              <quiet>true</quiet>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
       <!-- Use of gson is internal only -->
       <plugin>
         <artifactId>maven-shade-plugin</artifactId>


Mime
View raw message