Merge pull request #75 from cisco-open/fix/master/updateDependencies

Update all 3rd party dependencies

Author: preet-dev

build.gradle

@@ -19,29 +19,29 @@ repositories {
 }
 
 dependencies {
-    api group: 'jakarta.el', name: 'jakarta.el-api', version: '4.0.0'
+    api group: 'jakarta.el', name: 'jakarta.el-api', version: '5.0.1'
     api group: 'org.glassfish', name: 'jakarta.el', version: '4.0.2'
-    api group: 'org.slf4j', name: 'slf4j-api', version: '1.7.36'
-    api group: 'ch.qos.logback', name: 'logback-classic', version: '1.2.11'
-    api group: 'org.projectlombok', name: 'lombok', version: '1.18.20'
-    api group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-yaml', version: '2.13.2'
+    api group: 'org.slf4j', name: 'slf4j-api', version: '2.0.6'
+    api group: 'ch.qos.logback', name: 'logback-classic', version: '1.4.5'
+    api group: 'org.projectlombok', name: 'lombok', version: '1.18.26'
+    api group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-yaml', version: '2.14.2'
     api group: 'io.opentelemetry.proto', name: 'opentelemetry-proto', version: '0.18.0-alpha'
     api group: 'io.opentelemetry', name: 'opentelemetry-sdk-trace', version: '1.17.0'
-    api group: 'com.google.guava', name: 'guava', version: 'r05'
+    api group: 'com.google.guava', name: 'guava', version: '31.1-jre'
     api group: 'org.apache.commons', name: 'commons-collections4', version: '4.4'
     api group: 'org.apache.commons', name: 'commons-lang3', version: '3.12.0'
     api group: 'commons-cli', name: 'commons-cli', version: '1.5.0'
-    api group: 'javax.ws.rs', name: 'javax.ws.rs-api', version: '2.0.1'
-    api group: 'com.github.f4b6a3', name: 'uuid-creator', version: '4.3.1'
-    api group: 'io.grpc', name: 'grpc-protobuf', version: '1.44.0'
-    api group: 'io.grpc', name: 'grpc-stub', version: '1.44.0'
-    api group: 'io.grpc', name: 'grpc-netty', version: '1.44.0'
-    api group: 'io.netty', name: 'netty-tcnative-boringssl-static', version: '2.0.48.Final'
-    api group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.17.2'
+    api group: 'jakarta.ws.rs', name: 'jakarta.ws.rs-api', version: '3.1.0'
+    api group: 'com.github.f4b6a3', name: 'uuid-creator', version: '5.2.0'
+    api group: 'io.grpc', name: 'grpc-protobuf', version: '1.53.0'
+    api group: 'io.grpc', name: 'grpc-stub', version: '1.53.0'
+    api group: 'io.grpc', name: 'grpc-netty', version: '1.53.0'
+    api group: 'io.netty', name: 'netty-tcnative-boringssl-static', version: '2.0.59.Final'
+    api group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.20.0'
 
-    implementation group: 'org.testng', name: 'testng', version: '7.5'
-    annotationProcessor group: 'org.projectlombok', name: 'lombok', version: '1.18.20'
-    testAnnotationProcessor group: 'org.projectlombok', name: 'lombok', version: '1.18.20'
+    implementation group: 'org.testng', name: 'testng', version: '7.7.1'
+    annotationProcessor group: 'org.projectlombok', name: 'lombok', version: '1.18.26'
+    testAnnotationProcessor group: 'org.projectlombok', name: 'lombok', version: '1.18.26'
 }
 
 test {

src/main/java/io/opentelemetry/contrib/generator/telemetry/transport/auth/OAuthHandler.java

@@ -20,9 +20,9 @@
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import io.opentelemetry.contrib.generator.telemetry.transport.implementations.HTTPClient;
+import jakarta.ws.rs.core.HttpHeaders;
 import lombok.extern.slf4j.Slf4j;
 
-import javax.ws.rs.core.HttpHeaders;
 import java.util.Base64;
 import java.util.Optional;
 import java.util.concurrent.TimeUnit;

src/main/java/io/opentelemetry/contrib/generator/telemetry/transport/implementations/grpc/GRPCPayloadHandler.java

@@ -30,10 +30,10 @@
 import io.opentelemetry.proto.collector.trace.v1.ExportTraceServiceRequest;
 import io.opentelemetry.proto.collector.trace.v1.ExportTraceServiceResponse;
 import io.opentelemetry.proto.collector.trace.v1.TraceServiceGrpc;
+import jakarta.ws.rs.core.HttpHeaders;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 
-import javax.ws.rs.core.HttpHeaders;
 import java.util.stream.IntStream;
 
 @Slf4j

src/main/java/io/opentelemetry/contrib/generator/telemetry/transport/implementations/rest/RESTPayloadHandler.java

@@ -23,12 +23,12 @@
 import io.opentelemetry.contrib.generator.telemetry.transport.implementations.HTTPClient;
 import io.opentelemetry.proto.collector.logs.v1.ExportLogsServiceRequest;
 import io.opentelemetry.proto.collector.metrics.v1.ExportMetricsServiceRequest;
+import jakarta.ws.rs.core.HttpHeaders;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 
-import javax.ws.rs.core.HttpHeaders;
 import java.util.ArrayList;
 import java.util.List;
 

src/test/java/io/opentelemetry/contrib/generator/core/TestExpressionMethods.java

@@ -125,9 +125,9 @@ public void testList() {
                 Arrays.asList("n.abc4", Arrays.asList("n1.abc4", "n1.abc"), "nested-10.10.11.4"),
                 Arrays.asList("n.abc5", Arrays.asList("n1.abc5", "n1.abc"), "nested-10.10.11.5"));
         IntStream.range(0, 5).forEach(i -> {
-            String simpleOutput = StringUtils.join(jelProcessor.eval(simpleExpression));
-            String concatenatedOutput = StringUtils.join(jelProcessor.eval(concatenatedExpression));
-            String nestedOutput = StringUtils.join(jelProcessor.eval(nestedExpression));
+            String simpleOutput = StringUtils.join((List<String>) jelProcessor.eval(simpleExpression));
+            String concatenatedOutput = StringUtils.join((List<String>) jelProcessor.eval(concatenatedExpression));
+            String nestedOutput = StringUtils.join((List<String>) jelProcessor.eval(nestedExpression));
             Assert.assertEquals(simpleOutput, StringUtils.join(simpleExpectedOutputs.get(i)));
             Assert.assertEquals(concatenatedOutput, StringUtils.join(concatenatedExpectedOutputs.get(i)));
             Assert.assertEquals(nestedOutput, StringUtils.join(nestedExpectedOutputs.get(i)));

src/test/java/io/opentelemetry/contrib/generator/telemetry/TestMELTAttributeExpressions.java

@@ -152,9 +152,9 @@ public void testList() {
                 Arrays.asList("n.abc4", Arrays.asList("n1.abc4", "n1.abc"), "nested-10.10.11.4"),
                 Arrays.asList("n.abc5", Arrays.asList("n1.abc5", "n1.abc"), "nested-10.10.11.5"));
         IntStream.range(0, 5).forEach(i -> {
-            String simpleOutput = StringUtils.join(jelProcessor.eval(simpleExpression));
-            String concatenatedOutput = StringUtils.join(jelProcessor.eval(concatenatedExpression));
-            String nestedOutput = StringUtils.join(jelProcessor.eval(nestedExpression));
+            String simpleOutput = StringUtils.join((List<String>) jelProcessor.eval(simpleExpression));
+            String concatenatedOutput = StringUtils.join((List<String>) jelProcessor.eval(concatenatedExpression));
+            String nestedOutput = StringUtils.join((List<String>) jelProcessor.eval(nestedExpression));
             Assert.assertEquals(simpleOutput, StringUtils.join(simpleExpectedOutputs.get(i)));
             Assert.assertEquals(concatenatedOutput, StringUtils.join(concatenatedExpectedOutputs.get(i)));
             Assert.assertEquals(nestedOutput, StringUtils.join(nestedExpectedOutputs.get(i)));