build: fixes animal-sniffer phase and runs on all JDKs (#3660)

Signed-off-by: Adrian Cole <adrian@tetrate.io>
openzipkin · Dec 18, 2023 · 3503a31 · 3503a31
1 parent 98e4c03
commit 3503a31
Show file tree

Hide file tree

Showing 8 changed files with 63 additions and 72 deletions.
diff --git a/benchmarks/pom.xml b/benchmarks/pom.xml
@@ -29,8 +29,6 @@
 
   <properties>
     <main.basedir>${project.basedir}/..</main.basedir>
-    <main.java.version>1.8</main.java.version>
-    <main.signature.artifact>java18</main.signature.artifact>
     <jmh.version>1.37</jmh.version>
     <unpack-proto.directory>${project.build.directory}/main/proto</unpack-proto.directory>
   </properties>

diff --git a/pom.xml b/pom.xml
@@ -420,6 +420,8 @@
         </configuration>
         <executions>
           <execution>
+            <id>animal-sniffer</id>
+            <phase>verify</phase>
             <goals>
               <goal>check</goal>
             </goals>

diff --git a/zipkin-collector/pom.xml b/zipkin-collector/pom.xml
@@ -30,8 +30,6 @@
 
   <properties>
     <main.basedir>${project.basedir}/..</main.basedir>
-    <main.java.version>1.8</main.java.version>
-    <main.signature.artifact>java18</main.signature.artifact>
   </properties>
 
   <modules>

diff --git a/zipkin-lens/package-lock.json b/zipkin-lens/package-lock.json
diff --git a/zipkin-server/pom.xml b/zipkin-server/pom.xml
@@ -28,8 +28,6 @@
 
   <properties>
     <main.basedir>${project.basedir}/..</main.basedir>
-    <main.java.version>1.8</main.java.version>
-    <main.signature.artifact>java18</main.signature.artifact>
 
     <!-- Sometimes we need to override Armeria's Brave version -->
     <brave.version>5.16.0</brave.version>

diff --git a/zipkin-storage/pom.xml b/zipkin-storage/pom.xml
@@ -30,8 +30,6 @@
 
   <properties>
     <main.basedir>${project.basedir}/..</main.basedir>
-    <main.java.version>1.8</main.java.version>
-    <main.signature.artifact>java18</main.signature.artifact>
   </properties>
 
   <modules>

diff --git a/zipkin-tests/pom.xml b/zipkin-tests/pom.xml
@@ -29,8 +29,6 @@
 
   <properties>
     <main.basedir>${project.basedir}/..</main.basedir>
-    <main.java.version>1.8</main.java.version>
-    <main.signature.artifact>java18</main.signature.artifact>
   </properties>
 
   <dependencies>

diff --git a/zipkin/pom.xml b/zipkin/pom.xml
@@ -39,10 +39,10 @@
 
     <main.basedir>${project.basedir}/..</main.basedir>
 
-    <!-- CI should run the "release" profile during tests to ensure no 1.8
+    <!-- Note: CI should run the "release" profile during tests to ensure no 1.8
          features are in use. -->
-    <main.java.version>1.8</main.java.version>
-    <main.signature.artifact>java18</main.signature.artifact>
+    <!-- The core jar needs to be Java 1.6 bytecode -->
+    <main.signature.artifact>java16</main.signature.artifact>
   </properties>
 
   <dependencies>
@@ -128,7 +128,6 @@
       <properties>
         <!-- The core jar needs to be Java 1.6 bytecode -->
         <main.java.version>1.6</main.java.version>
-        <main.signature.artifact>java16</main.signature.artifact>
       </properties>
       <build>
         <plugins>