build: fixes animal-sniffer phase and runs on all JDKs

Signed-off-by: Adrian Cole <[email protected]>

activemq-client/pom.xml

@@ -37,8 +37,8 @@
 
     <!-- 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>
+    <!-- activemq is Java 1.6 bytecode -->
+    <main.signature.artifact>java16</main.signature.artifact>
   </properties>
 
   <dependencies>
@@ -68,7 +68,6 @@
       <properties>
         <!-- activemq is Java 1.6 bytecode -->
         <main.java.version>1.6</main.java.version>
-        <main.signature.artifact>java16</main.signature.artifact>
       </properties>
       <build>
         <plugins>

amqp-client/pom.xml

@@ -34,6 +34,9 @@
     <amqp-client.version>5.20.0</amqp-client.version>
     <!-- Last pre-1.8 version -->
     <old-amqp-client.version>4.12.0</old-amqp-client.version>
+
+    <!-- amqp-client 4.x is Java 1.6 bytecode -->
+    <main.signature.artifact>java16</main.signature.artifact>
   </properties>
 
   <dependencies>
@@ -95,7 +98,6 @@
       <properties>
         <!-- amqp-client 4.x is Java 1.6 bytecode -->
         <main.java.version>1.6</main.java.version>
-        <main.signature.artifact>java16</main.signature.artifact>
       </properties>
       <build>
         <plugins>

benchmarks/src/main/java/zipkin2/reporter/amqp/RabbitMQSenderBenchmarks.java

@@ -16,7 +16,6 @@
 import com.rabbitmq.client.Channel;
 import com.rabbitmq.client.DefaultConsumer;
 import java.io.IOException;
-import org.junit.AssumptionViolatedException;
 import org.openjdk.jmh.runner.Runner;
 import org.openjdk.jmh.runner.RunnerException;
 import org.openjdk.jmh.runner.options.Options;
@@ -35,7 +34,7 @@ public class RabbitMQSenderBenchmarks extends SenderBenchmarks {
 
     CheckResult check = result.check();
     if (!check.ok()) {
-      throw new AssumptionViolatedException(check.error().getMessage(), check.error());
+      throw new IllegalStateException(check.error().getMessage(), check.error());
     }
 
     channel = result.localChannel();

brave/pom.xml

@@ -31,6 +31,9 @@
     <module.name>zipkin2.reporter.brave</module.name>
 
     <main.basedir>${project.basedir}/..</main.basedir>
+
+    <!-- The brave jar needs to be Java 1.6 bytecode -->
+    <main.signature.artifact>java16</main.signature.artifact>
   </properties>
 
   <dependencies>
@@ -73,7 +76,6 @@
       <properties>
         <!-- The brave 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>

core/pom.xml

@@ -31,6 +31,9 @@
     <module.name>zipkin2.reporter</module.name>
 
     <main.basedir>${project.basedir}/..</main.basedir>
+
+    <!-- The core jar needs to be Java 1.6 bytecode -->
+    <main.signature.artifact>java16</main.signature.artifact>
   </properties>
 
   <dependencies>
@@ -47,7 +50,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>

kafka/pom.xml

@@ -31,6 +31,9 @@
     <module.name>zipkin2.reporter.kafka</module.name>
 
     <main.basedir>${project.basedir}/..</main.basedir>
+
+    <!-- Kafka 0.11+ is Java 1.7 bytecode -->
+    <main.signature.artifact>java17</main.signature.artifact>
   </properties>
 
   <dependencies>
@@ -61,7 +64,6 @@
       <properties>
         <!-- Kafka 0.11+ is Java 1.7 bytecode -->
         <main.java.version>1.7</main.java.version>
-        <main.signature.artifact>java17</main.signature.artifact>
       </properties>
       <build>
         <plugins>

libthrift/pom.xml

@@ -31,6 +31,9 @@
     <module.name>zipkin2.reporter.libthrift</module.name>
 
     <main.basedir>${project.basedir}/..</main.basedir>
+
+    <!-- Libthrift is Java 1.6 bytecode -->
+    <main.signature.artifact>java16</main.signature.artifact>
   </properties>
 
   <dependencies>
@@ -72,7 +75,6 @@
       <properties>
         <!-- Libthrift is Java 1.6 bytecode -->
         <main.java.version>1.6</main.java.version>
-        <main.signature.artifact>java16</main.signature.artifact>
       </properties>
       <build>
         <plugins>

okhttp3/pom.xml

@@ -33,6 +33,9 @@
     <main.basedir>${project.basedir}/..</main.basedir>
     <!-- pre-1.8, pre-kotlin, and last version before Call.timeout. -->
     <old-okhttp.version>3.11.0</old-okhttp.version>
+
+    <!-- OkHttp 3.x is Java 1.7 bytecode -->
+    <main.signature.artifact>java17</main.signature.artifact>
   </properties>
 
   <dependencies>
@@ -102,7 +105,6 @@
       <properties>
         <!-- OkHttp 3.x is Java 1.7 bytecode -->
         <main.java.version>1.7</main.java.version>
-        <main.signature.artifact>java17</main.signature.artifact>
       </properties>
       <build>
         <plugins>

pom.xml

@@ -396,6 +396,8 @@
         </configuration>
         <executions>
           <execution>
+            <id>animal-sniffer</id>
+            <phase>verify</phase>
             <goals>
               <goal>check</goal>
             </goals>

spring-beans/pom.xml

@@ -31,6 +31,9 @@
     <module.name>zipkin2.reporter.beans</module.name>
 
     <main.basedir>${project.basedir}/..</main.basedir>
+
+    <!-- floor Java version we support for Spring 2.5 is 1.6 -->
+    <main.signature.artifact>java16</main.signature.artifact>
   </properties>
 
   <dependencyManagement>
@@ -120,7 +123,6 @@
       <properties>
         <!-- floor Java version we support for Spring 2.5 is 1.6 -->
         <main.java.version>1.6</main.java.version>
-        <main.signature.artifact>java16</main.signature.artifact>
       </properties>
       <build>
         <plugins>

urlconnection/pom.xml

@@ -31,6 +31,9 @@
     <module.name>zipkin2.reporter.urlconnection</module.name>
 
     <main.basedir>${project.basedir}/..</main.basedir>
+
+    <!-- floor Java version we support for urlconnection is 1.6 -->
+    <main.signature.artifact>java16</main.signature.artifact>
   </properties>
 
   <dependencies>
@@ -54,7 +57,6 @@
       <properties>
         <!-- floor Java version we support for urlconnection is 1.6 -->
         <main.java.version>1.6</main.java.version>
-        <main.signature.artifact>java16</main.signature.artifact>
       </properties>
       <build>
         <plugins>