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.git
The following commit(s) were added to refs/heads/master by this push:
new 2512507 Scopes retrolambda to the core library (#2557)
2512507 is described below
commit 25125079e8bf4b4cf4dfdcaf25eb9aec63a3b1ee
Author: Adrian Cole <[email protected]>
AuthorDate: Mon May 6 20:46:53 2019 +0800
Scopes retrolambda to the core library (#2557)
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 62a630c..e2dfb5f 100644
--- a/benchmarks/pom.xml
+++ b/benchmarks/pom.xml
@@ -94,16 +94,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 1e5e1d1..bb45fe1 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>
@@ -587,12 +569,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 310cbd8..2574765 100644
--- a/zipkin-server/pom.xml
+++ b/zipkin-server/pom.xml
@@ -440,16 +440,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>
