Drop support for Java 1.6 and 1.7 (#802)

jaegertracing · Sep 22, 2021 · 9c11b8e · 9c11b8e
1 parent 6ed8df2
commit 9c11b8e
Show file tree

Hide file tree

Showing 11 changed files with 19 additions and 157 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,15 +3,16 @@ Changes by Version
 
 1.7.0 (unreleased)
 -------------------
-- Nothing yet.
+
+- Drop support for Java 1.6 and 1.7 (#511) -- Yuri Shkuro
 
 
 1.6.0 (2021-03-29)
 -------------------
 
- - Update the version of libthrift to 0.14.1 (#772). (#774) -- Robert Greig
- - Add unit tests and crossdock in github actions (#775) -- Ashmita
- - Fix dead loop in QueueProcessor (#763) -- Yaoliang Chen
+- Update the version of libthrift to 0.14.1 (#772). (#774) -- Robert Greig
+- Add unit tests and crossdock in github actions (#775) -- Ashmita
+- Fix dead loop in QueueProcessor (#763) -- Yaoliang Chen
 
 
 1.5.0 (2020-11-12)

diff --git a/build.gradle b/build.gradle
@@ -68,8 +68,8 @@ subprojects {
 
 
     compileJava {
-        sourceCompatibility = 1.6
-        targetCompatibility = 1.6
+        sourceCompatibility = 1.8
+        targetCompatibility = 1.8
     }
 
     compileTestJava {
@@ -145,9 +145,9 @@ subprojects {
     }
 
     dependencies {
-        annotationProcessor 'org.projectlombok:lombok:1.18.2'
-        compileOnly 'org.projectlombok:lombok:1.18.2'
-        compileOnly 'org.codehaus.mojo:animal-sniffer-annotations:1.16'
+        annotationProcessor 'org.projectlombok:lombok:1.18.20'
+        compileOnly 'org.projectlombok:lombok:1.18.20'
+        compileOnly 'org.codehaus.mojo:animal-sniffer-annotations:1.20'
     }
 
     signing {

diff --git a/jaeger-core/build.gradle b/jaeger-core/build.gradle
@@ -16,7 +16,7 @@ dependencies {
     testCompile group: 'ch.qos.logback', name: 'logback-classic', version: logbackVersion
     testCompile group: 'io.micrometer', name: 'micrometer-registry-prometheus', version: micrometerVersion
 
-    signature 'org.codehaus.mojo.signature:java16:1.1@signature'
+    signature 'org.codehaus.mojo.signature:java18:1.0@signature'
 }
 
 task testJar(type: Jar, dependsOn: testClasses) {
@@ -38,4 +38,3 @@ task jaegerVersion {
 }
 
 compileJava.dependsOn jaegerVersion
-
diff --git a/...-core/src/main/java/io/jaegertracing/internal/utils/Java6CompatibleThreadLocalRandom.java b/...-core/src/main/java/io/jaegertracing/internal/utils/Java6CompatibleThreadLocalRandom.java
diff --git a/jaeger-core/src/main/java/io/jaegertracing/internal/utils/Utils.java b/jaeger-core/src/main/java/io/jaegertracing/internal/utils/Utils.java
@@ -19,6 +19,7 @@
 import java.net.InetAddress;
 import java.net.UnknownHostException;
 import java.util.Locale;
+import java.util.concurrent.ThreadLocalRandom;
 
 public class Utils {
   public static String normalizeBaggageKey(String key) {
@@ -51,7 +52,7 @@ public static int ipToInt(String ip) throws EmptyIpException, NotFourOctetsExcep
   public static long uniqueId() {
     long val = 0;
     while (val == 0) {
-      val = Java6CompatibleThreadLocalRandom.current().nextLong();
+      val = ThreadLocalRandom.current().nextLong();
     }
     return val;
   }

diff --git a/...e/src/test/java/io/jaegertracing/internal/utils/Java6CompatibleThreadLocalRandomTest.java b/...e/src/test/java/io/jaegertracing/internal/utils/Java6CompatibleThreadLocalRandomTest.java
diff --git a/jaeger-crossdock/build.gradle b/jaeger-crossdock/build.gradle
@@ -26,7 +26,7 @@ dependencies {
     // Testing Frameworks
     testCompile group: 'junit', name: 'junit', version: junitVersion
 
-    signature 'org.codehaus.mojo.signature:java17:1.0@signature'
+    signature 'org.codehaus.mojo.signature:java18:1.0@signature'
 }
 
 jar {

diff --git a/jaeger-micrometer/build.gradle b/jaeger-micrometer/build.gradle
@@ -7,5 +7,5 @@ dependencies {
     testCompile group: 'junit', name: 'junit', version: junitVersion
     testCompile group: 'io.micrometer', name: 'micrometer-registry-prometheus', version: micrometerVersion
 
-    signature 'org.codehaus.mojo.signature:java16:1.1@signature'
+    signature 'org.codehaus.mojo.signature:java18:1.0@signature'
 }
diff --git a/jaeger-thrift/build.gradle b/jaeger-thrift/build.gradle
@@ -18,7 +18,7 @@ dependencies {
     testCompile group: 'org.awaitility', name: 'awaitility', version: awaitilityVersion
     testCompile group: 'org.glassfish.jersey.test-framework.providers', name: 'jersey-test-framework-provider-grizzly2', version: jerseyVersion
 
-    signature 'org.codehaus.mojo.signature:java16:1.1@signature'
+    signature 'org.codehaus.mojo.signature:java18:1.0@signature'
 }
 
 compileThrift {

diff --git a/jaeger-tracerresolver/build.gradle b/jaeger-tracerresolver/build.gradle
@@ -3,8 +3,8 @@ description = 'TracerResolver implementation for Jaeger Tracer'
 dependencies {
     compile project(':jaeger-core')
     compile group: 'io.opentracing.contrib', name: 'opentracing-tracerresolver', version: tracerResolverVersion
- 
+
     testCompile group: 'junit', name: 'junit', version: junitVersion
 
-    signature 'org.codehaus.mojo.signature:java16:1.1@signature'
+    signature 'org.codehaus.mojo.signature:java18:1.0@signature'
 }
diff --git a/jaeger-zipkin/build.gradle b/jaeger-zipkin/build.gradle
@@ -9,5 +9,5 @@ dependencies {
     testCompile group: 'io.zipkin.zipkin2', name: 'zipkin-junit', version: '2.19.2'
     testCompile group: 'com.tngtech.java', name: 'junit-dataprovider', version: junitDataProviderVersion
 
-    signature 'org.codehaus.mojo.signature:java16:1.1@signature'
+    signature 'org.codehaus.mojo.signature:java18:1.0@signature'
 }