fix compiler

Signed-off-by: Adrian Cole <adrian@tetrate.io>
openzipkin · Dec 18, 2023 · 677244a · 677244a
1 parent 2bde4fe
commit 677244a
Show file tree

Hide file tree

Showing 9 changed files with 3 additions and 24 deletions.
diff --git a/instrumentation/benchmarks/pom.xml b/instrumentation/benchmarks/pom.xml
@@ -26,8 +26,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>
     <!-- Note: versions above 2.2 move to jakarta package -->
     <undertow-servlet.version>2.2.28.Final</undertow-servlet.version>

diff --git a/instrumentation/dubbo/pom.xml b/instrumentation/dubbo/pom.xml
@@ -29,8 +29,6 @@
     <module.name>brave.dubbo</module.name>
 
     <main.basedir>${project.basedir}/../..</main.basedir>
-    <main.java.version>1.8</main.java.version>
-    <main.signature.artifact>java18</main.signature.artifact>
 
     <dubbo.version>3.2.9</dubbo.version>
     <!-- add opens to avoid below in JRE 21:

diff --git a/instrumentation/http-tests/pom.xml b/instrumentation/http-tests/pom.xml
@@ -27,8 +27,6 @@
 
   <properties>
     <main.basedir>${project.basedir}/../..</main.basedir>
-    <main.java.version>1.8</main.java.version>
-    <main.signature.artifact>java18</main.signature.artifact>
     <!-- disable errorprone warning that "return this" is not synchronized! -->
     <errorprone.args>-Xep:UnsynchronizedOverridesSynchronized:OFF</errorprone.args>
   </properties>

diff --git a/instrumentation/kafka-clients/pom.xml b/instrumentation/kafka-clients/pom.xml
@@ -30,8 +30,6 @@
     <module.name>brave.kafka.clients</module.name>
 
     <main.basedir>${project.basedir}/../..</main.basedir>
-    <main.java.version>1.8</main.java.version>
-    <main.signature.artifact>java18</main.signature.artifact>
 
     <old-kafka-clients.version>1.0.0</old-kafka-clients.version>
     <old-kafka-junit.version>4.0.0</old-kafka-junit.version>

diff --git a/instrumentation/kafka-streams/pom.xml b/instrumentation/kafka-streams/pom.xml
@@ -30,8 +30,6 @@
     <module.name>brave.kafka.streams</module.name>
 
     <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/instrumentation/mysql6/pom.xml b/instrumentation/mysql6/pom.xml
@@ -31,8 +31,6 @@
 
     <main.basedir>${project.basedir}/../..</main.basedir>
     <!-- mysql-connector-java 6+ requires Java 8 -->
-    <main.java.version>1.8</main.java.version>
-    <main.signature.artifact>java18</main.signature.artifact>
   </properties>
 
   <dependencies>

diff --git a/instrumentation/mysql8/pom.xml b/instrumentation/mysql8/pom.xml
@@ -31,8 +31,6 @@
 
     <main.basedir>${project.basedir}/../..</main.basedir>
     <!-- mysql-connector-java 8+ requires Java 8 -->
-    <main.java.version>1.8</main.java.version>
-    <main.signature.artifact>java18</main.signature.artifact>
 
     <!-- disable errorprone return type warning as we do not control the type QueryInterceptor -->
     <errorprone.args>-Xep:TypeParameterUnusedInFormals:OFF</errorprone.args>

diff --git a/instrumentation/sparkjava/pom.xml b/instrumentation/sparkjava/pom.xml
@@ -30,8 +30,6 @@
     <module.name>brave.sparkjava</module.name>
 
     <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/pom.xml b/pom.xml
@@ -70,10 +70,6 @@
     <main.java.version>1.8</main.java.version>
     <main.signature.artifact>java18</main.signature.artifact>
 
-    <!-- default bytecode version for src/test -->
-    <maven.compiler.source>1.8</maven.compiler.source>
-    <maven.compiler.target>1.8</maven.compiler.target>
-
     <!-- override to set exclusions per-project -->
     <errorprone.args />
     <errorprone.version>2.23.0</errorprone.version>
@@ -298,11 +294,10 @@
           <version>${maven-compiler-plugin.version}</version>
           <inherited>true</inherited>
           <configuration>
-            <!-- Retrolambda will rewrite lambdas as Java 6 bytecode -->
-            <source>1.8</source>
-            <target>1.8</target>
-            <!-- or die! com.sun.tools.javac.api.JavacTool -->
+            <source>${main.java.version}</source>
+            <target>${main.java.version}</target>
             <fork>true</fork>
+            <release>8</release>
             <showWarnings>true</showWarnings>
           </configuration>
         </plugin>