Skip to content

Commit

Permalink
build: fixes animal-sniffer phase and runs on all JDKs (#231)
Browse files Browse the repository at this point in the history
Signed-off-by: Adrian Cole <adrian@tetrate.io>
  • Loading branch information
codefromthecrypt authored Dec 18, 2023
1 parent e635df8 commit 4e886ea
Show file tree
Hide file tree
Showing 11 changed files with 30 additions and 14 deletions.
5 changes: 2 additions & 3 deletions activemq-client/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
4 changes: 3 additions & 1 deletion amqp-client/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2016-2020 The OpenZipkin Authors
* Copyright 2016-2023 The OpenZipkin Authors
*
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
* in compliance with the License. You may obtain a copy of the License at
Expand All @@ -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;
Expand All @@ -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();
Expand Down
4 changes: 3 additions & 1 deletion brave/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
4 changes: 3 additions & 1 deletion core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand Down
4 changes: 3 additions & 1 deletion kafka/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
4 changes: 3 additions & 1 deletion libthrift/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
4 changes: 3 additions & 1 deletion okhttp3/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
2 changes: 2 additions & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -396,6 +396,8 @@
</configuration>
<executions>
<execution>
<id>animal-sniffer</id>
<phase>verify</phase>
<goals>
<goal>check</goal>
</goals>
Expand Down
4 changes: 3 additions & 1 deletion spring-beans/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
4 changes: 3 additions & 1 deletion urlconnection/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand Down

0 comments on commit 4e886ea

Please sign in to comment.