From 735a391823c9128e89f554684fccba9a45ff667d Mon Sep 17 00:00:00 2001 From: Rob Walpole <183595007+robwtelicent@users.noreply.github.com> Date: Tue, 17 Dec 2024 11:50:51 +0000 Subject: [PATCH] Updating dependencies based on mvn dependency:analyze WIP --- cli/cli-core/pom.xml | 56 ++++++++- cli/cli-debug/pom.xml | 108 +++++++++++++++--- cli/cli-probe-server/pom.xml | 33 ++++++ configurator/pom.xml | 10 -- event-sources/event-source-file/pom.xml | 55 ++++++++- event-sources/event-source-kafka/pom.xml | 81 +++++++++++++- event-sources/event-sources-core/pom.xml | 28 +++-- jaxrs-base-server/pom.xml | 129 +++++++++++++++++---- jwt-auth-common/pom.xml | 11 ++ live-reporter/pom.xml | 42 ++++++- observability-core/pom.xml | 28 ++++- pom.xml | 137 ++++++++++++++++++++++- projector-driver/pom.xml | 25 ++++- projectors-core/pom.xml | 28 ++++- 14 files changed, 682 insertions(+), 89 deletions(-) diff --git a/cli/cli-core/pom.xml b/cli/cli-core/pom.xml index 6c27c8b..b2aff5e 100644 --- a/cli/cli-core/pom.xml +++ b/cli/cli-core/pom.xml @@ -66,6 +66,49 @@ logback-classic + + org.apache.kafka + kafka-clients + + + + org.apache.jena + jena-arq + + + + org.apache.commons + commons-lang3 + + + + io.telicent.smart-caches + event-sources-core + ${project.version} + + + + org.apache.commons + commons-collections4 + + + + io.telicent.smart-caches + jaxrs-base-server + ${project.version} + + + + org.slf4j + slf4j-api + + + + io.telicent.smart-caches + projectors-core + ${project.version} + + org.testng @@ -81,10 +124,21 @@ test + + commons-io + commons-io + test + + + + org.testcontainers + testcontainers + test + + org.testcontainers kafka - ${dependency.testcontainers} test diff --git a/cli/cli-debug/pom.xml b/cli/cli-debug/pom.xml index b2d0f5e..46c6116 100644 --- a/cli/cli-debug/pom.xml +++ b/cli/cli-debug/pom.xml @@ -21,9 +21,68 @@ - io.opentelemetry.javaagent - opentelemetry-javaagent - runtime + org.apache.kafka + kafka-clients + + + + org.apache.jena + jena-arq + + + + org.apache.commons + commons-lang3 + + + + io.telicent.smart-caches + event-sources-core + ${project.version} + + + + com.github.rvesse + airline + + + + io.telicent.smart-caches + jaxrs-base-server + ${project.version} + + + + org.apache.jena + jena-rdfpatch + + + + io.telicent.smart-caches + event-source-kafka + ${project.version} + + + + org.slf4j + slf4j-api + + + + io.telicent.smart-caches + projectors-core + ${project.version} + + + + io.telicent.smart-caches + live-reporter + ${project.version} + + + + org.apache.jena + jena-core @@ -52,32 +111,51 @@ - org.testcontainers - kafka - ${dependency.testcontainers} + ch.qos.logback + logback-classic test - - - org.apache.commons - commons-compress - - - org.testng - testng + jakarta.ws.rs + jakarta.ws.rs-api test io.telicent.smart-caches - event-source-kafka + event-source-file + ${project.version} + test + + + + io.telicent.smart-caches + projector-driver ${project.version} certs-helper test zip + + + org.testng + testng + test + + + + org.testcontainers + kafka + test + + + org.apache.commons + commons-compress + + + + diff --git a/cli/cli-probe-server/pom.xml b/cli/cli-probe-server/pom.xml index b129723..068af91 100644 --- a/cli/cli-probe-server/pom.xml +++ b/cli/cli-probe-server/pom.xml @@ -23,6 +23,38 @@ ${project.version} + + org.apache.commons + commons-lang3 + + + + jakarta.servlet + jakarta.servlet-api + + + + org.slf4j + slf4j-api + + + + jakarta.ws.rs + jakarta.ws.rs-api + + + + org.glassfish.jersey.inject + jersey-hk2 + runtime + + + + org.glassfish.jersey.media + jersey-media-json-jackson + runtime + + io.telicent.smart-caches @@ -43,6 +75,7 @@ slf4j-test test + diff --git a/configurator/pom.xml b/configurator/pom.xml index 7ab751a..4f48d06 100644 --- a/configurator/pom.xml +++ b/configurator/pom.xml @@ -20,11 +20,6 @@ commons-lang3 - - org.slf4j - slf4j-api - - org.testng @@ -32,11 +27,6 @@ test - - ch.qos.logback - logback-classic - test - diff --git a/event-sources/event-source-file/pom.xml b/event-sources/event-source-file/pom.xml index 8c77b60..2e3e7b4 100644 --- a/event-sources/event-source-file/pom.xml +++ b/event-sources/event-source-file/pom.xml @@ -38,6 +38,47 @@ ${dependency.jackson} + + org.apache.kafka + kafka-clients + + + + org.apache.jena + jena-arq + + + + com.fasterxml.jackson.core + jackson-databind + + + + org.apache.commons + commons-lang3 + + + + io.telicent.smart-caches + event-sources-core + ${project.version} + + + + org.apache.jena + jena-base + + + + org.apache.commons + commons-collections4 + + + + com.fasterxml.jackson.core + jackson-core + + org.testng @@ -46,14 +87,20 @@ - com.github.valfirst - slf4j-test + org.mockito + mockito-core test - org.mockito - mockito-core + commons-io + commons-io + test + + + + org.apache.jena + jena-core test diff --git a/event-sources/event-source-kafka/pom.xml b/event-sources/event-source-kafka/pom.xml index 02ca814..7acf6c8 100644 --- a/event-sources/event-source-kafka/pom.xml +++ b/event-sources/event-source-kafka/pom.xml @@ -36,6 +36,73 @@ ${project.version} + + org.apache.jena + jena-arq + ${dependency.jena} + + + + com.fasterxml.jackson.core + jackson-databind + + + + com.github.ben-manes.caffeine + caffeine + + + + org.apache.commons + commons-lang3 + + + + io.opentelemetry + opentelemetry-api + + + + org.apache.jena + jena-base + + + + org.apache.commons + commons-collections4 + + + + org.apache.jena + jena-rdfpatch + + + + com.fasterxml.jackson.core + jackson-core + + + + io.opentelemetry.semconv + opentelemetry-semconv + + + + io.telicent.smart-caches + observability-core + ${project.version} + + + + org.apache.jena + jena-core + + + + org.projectlombok + lombok + + org.testng @@ -63,10 +130,22 @@ test + + org.testcontainers + testcontainers + test + + + + org.jetbrains + annotations + ${dependency.jetbrains-annotations} + test + + org.testcontainers kafka - ${dependency.testcontainers} test diff --git a/event-sources/event-sources-core/pom.xml b/event-sources/event-sources-core/pom.xml index 47b45a7..493ffeb 100644 --- a/event-sources/event-sources-core/pom.xml +++ b/event-sources/event-sources-core/pom.xml @@ -30,15 +30,30 @@ commons-lang3 + + org.projectlombok + lombok + provided + + org.apache.jena jena-rdfpatch + - org.projectlombok - lombok - ${dependency.lombok} - provided + org.apache.jena + jena-arq + + + + org.apache.jena + jena-core + + + + org.slf4j + slf4j-api @@ -48,11 +63,6 @@ test - - com.github.valfirst - slf4j-test - test - diff --git a/jaxrs-base-server/pom.xml b/jaxrs-base-server/pom.xml index f97483a..c76f688 100644 --- a/jaxrs-base-server/pom.xml +++ b/jaxrs-base-server/pom.xml @@ -26,47 +26,102 @@ ${project.version} - - org.apache.commons - commons-lang3 + org.apache.jena + jena-arq - com.fasterxml.jackson.core - jackson-annotations + com.github.ben-manes.caffeine + caffeine - - jakarta.servlet - jakarta.servlet-api - provided + org.glassfish.grizzly + grizzly-framework + + + + org.glassfish.jersey.ext + jersey-bean-validation + + + + jakarta.ws.rs + jakarta.ws.rs-api org.glassfish.jersey.containers - jersey-container-grizzly2-servlet + jersey-container-servlet-core - org.glassfish.jersey.media - jersey-media-json-jackson + jakarta.annotation + jakarta.annotation-api - org.glassfish.jersey.inject - jersey-hk2 + org.glassfish.jersey.core + jersey-server - org.glassfish.jersey.ext - jersey-bean-validation + io.jsonwebtoken + jjwt-api + + + + org.glassfish.grizzly + grizzly-http-server + + + + org.glassfish.grizzly + grizzly-http-servlet + + + + org.glassfish.grizzly + grizzly-http + + + + io.telicent.public + jwt-servlet-auth-core + + + + org.glassfish.jersey.containers + jersey-container-grizzly2-http + + + + org.projectlombok + lombok + + + + jakarta.validation + jakarta.validation-api + + + + + org.apache.commons + commons-lang3 - jakarta.inject - jakarta.inject-api + com.fasterxml.jackson.core + jackson-annotations + + + + + jakarta.servlet + jakarta.servlet-api + provided @@ -112,20 +167,27 @@ - org.glassfish.jersey.core - jersey-client + org.mockito + mockito-core test - ch.qos.logback - logback-classic + com.fasterxml.jackson.core + jackson-databind test - org.mockito - mockito-core + io.jsonwebtoken + jjwt-jackson + ${dependency.jjwt} + test + + + + com.fasterxml.jackson.core + jackson-core test @@ -136,6 +198,25 @@ tests test + + + io.telicent.public + jwt-servlet-auth-aws + test + + + + org.glassfish.jersey.inject + jersey-hk2 + test + + + + org.glassfish.jersey.media + jersey-media-json-jackson + test + + diff --git a/jwt-auth-common/pom.xml b/jwt-auth-common/pom.xml index 9397cd8..909b310 100644 --- a/jwt-auth-common/pom.xml +++ b/jwt-auth-common/pom.xml @@ -24,6 +24,17 @@ jwt-servlet-auth-aws + + io.telicent.public + jwt-servlet-auth-core + ${dependency.jwt-auth} + + + + org.apache.commons + commons-lang3 + + org.testng diff --git a/live-reporter/pom.xml b/live-reporter/pom.xml index bbf4d98..9a44034 100644 --- a/live-reporter/pom.xml +++ b/live-reporter/pom.xml @@ -21,17 +21,49 @@ ${project.version} + + io.telicent.smart-caches + event-sources-core + ${project.version} + + + + io.telicent.smart-caches + projectors-core + ${project.version} + + + + com.fasterxml.jackson.core + jackson-databind + + + + org.apache.kafka + kafka-clients + + + + com.fasterxml.jackson.core + jackson-annotations + + + + org.apache.commons + commons-lang3 + + + + org.slf4j + slf4j-api + + org.testng testng test - - ch.qos.logback - logback-classic - test - io.telicent.smart-caches projectors-core diff --git a/observability-core/pom.xml b/observability-core/pom.xml index 5b61428..60d4afe 100644 --- a/observability-core/pom.xml +++ b/observability-core/pom.xml @@ -21,11 +21,6 @@ opentelemetry-api - - io.opentelemetry.semconv - opentelemetry-semconv - - org.apache.commons commons-lang3 @@ -40,7 +35,6 @@ org.projectlombok lombok - ${dependency.lombok} @@ -67,6 +61,28 @@ slf4j-test test + + + io.opentelemetry + opentelemetry-sdk-metrics + ${dependency.opentelemetry.sdk} + test + + + + io.opentelemetry + opentelemetry-sdk-common + ${dependency.opentelemetry.sdk} + test + + + + io.opentelemetry + opentelemetry-context + ${dependency.opentelemetry.sdk} + test + + diff --git a/pom.xml b/pom.xml index ad3c9c6..9a9f0aa 100644 --- a/pom.xml +++ b/pom.xml @@ -113,12 +113,20 @@ 3.0.0 + 3.1.8 4.4 + 2.17.0 3.17.0 + 4.0.2 2.18.2 + 2.1.1 2.0.1.MR + 3.0.2 + 3.1.0 5.2.0 3.1.9 + 17.0.0 + 0.12.6 0.17.5 3.9.0 1.5.12 @@ -158,6 +166,18 @@ ${dependency.jena} + + org.apache.jena + jena-base + ${dependency.jena} + + + + org.apache.jena + jena-core + ${dependency.jena} + + io.telicent.jena @@ -197,6 +217,18 @@ ${dependency.mockito} + + org.testcontainers + testcontainers + ${dependency.testcontainers} + + + + org.testcontainers + kafka + ${dependency.testcontainers} + + org.apache.kafka @@ -246,6 +284,12 @@ ${dependency.commons-collections} + + commons-io + commons-io + ${dependency.commons-io} + + com.github.rvesse @@ -260,9 +304,21 @@ ${dependency.servlet} + + jakarta.ws.rs + jakarta.ws.rs-api + ${dependency.jakarta.ws.rs} + + + + jakarta.annotation + jakarta.annotation-api + ${dependency.jakarta.annotation} + + org.glassfish.jersey.containers - jersey-container-grizzly2-servlet + jersey-container-servlet-core ${dependency.jersey} @@ -290,12 +346,54 @@ ${dependency.jersey} + + org.glassfish.jersey.core + jersey-server + ${dependency.jersey} + + + + org.glassfish.jersey.containers + jersey-container-grizzly2-http + ${dependency.jersey} + + + + org.glassfish.grizzly + grizzly-framework + ${dependency.grizzly} + + + + org.glassfish.grizzly + grizzly-http-server + ${dependency.grizzly} + + + + org.glassfish.grizzly + grizzly-http-servlet + ${dependency.grizzly} + + + + org.glassfish.grizzly + grizzly-http + ${dependency.grizzly} + + jakarta.inject jakarta.inject-api ${dependency.jakarta-inject} + + jakarta.validation + jakarta.validation-api + ${dependency.jakarta.validation} + + io.telicent.public jwt-servlet-auth-jaxrs3 @@ -308,6 +406,18 @@ ${dependency.jwt-auth} + + io.jsonwebtoken + jjwt-api + ${dependency.jjwt} + + + + io.telicent.public + jwt-servlet-auth-core + ${dependency.jwt-auth} + + io.github.resilience4j @@ -331,11 +441,6 @@ opentelemetry-semconv ${dependency.opentelemetry.sdk-alpha} - - io.opentelemetry.javaagent - opentelemetry-javaagent - ${dependency.opentelemetry.agent} - @@ -580,6 +685,26 @@ io.telicent.smart-caches + + analyze + + analyze-only + + + true + + org.glassfish.grizzly:grizzly-http + jakarta.ws.rs:jakarta.ws.rs-api + + + org.glassfish.jersey.inject:jersey-hk2 + org.glassfish.jersey.media:jersey-media-json-jackson + io.opentelemetry:opentelemetry-sdk + org.testcontainers:kafka + org.slf4j:jul-to-slf4j + + + diff --git a/projector-driver/pom.xml b/projector-driver/pom.xml index dfa8a41..6148eeb 100644 --- a/projector-driver/pom.xml +++ b/projector-driver/pom.xml @@ -26,6 +26,27 @@ ${project.version} + + io.telicent.smart-caches + observability-core + ${project.version} + + + + io.opentelemetry + opentelemetry-api + + + + org.apache.jena + jena-base + + + + org.slf4j + slf4j-api + + org.testng @@ -34,8 +55,8 @@ - ch.qos.logback - logback-classic + org.apache.jena + jena-core test diff --git a/projectors-core/pom.xml b/projectors-core/pom.xml index e477325..eff5cf3 100644 --- a/projectors-core/pom.xml +++ b/projectors-core/pom.xml @@ -21,11 +21,6 @@ ${project.version} - - org.apache.jena - jena-arq - - com.fasterxml.jackson.core jackson-core @@ -59,9 +54,24 @@ test + + org.apache.commons + commons-lang3 + + io.opentelemetry - opentelemetry-sdk + opentelemetry-api + + + + org.apache.jena + jena-base + + + + commons-io + commons-io test @@ -73,6 +83,12 @@ test + + io.opentelemetry + opentelemetry-sdk + test + +