From 3ff6d27f4611a4aa06f31c77495dc51d6278cd46 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 31 Aug 2023 10:54:18 +0000 Subject: Update dependency org.apache.felix:org.apache.felix.log to v1.3.0 --- dependency-versions/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'dependency-versions/pom.xml') diff --git a/dependency-versions/pom.xml b/dependency-versions/pom.xml index 0e779267371..801821b78f3 100644 --- a/dependency-versions/pom.xml +++ b/dependency-versions/pom.xml @@ -89,7 +89,7 @@ 4.2.19 11.1.0 7.0.5 - 1.0.1 + 1.3.0 3.0.2 2.2 2.1.12 -- cgit v1.2.3 From d52e759812a446ae454f2829ee12e6d6e669592d Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 4 Sep 2023 08:59:42 +0000 Subject: Update dependency com.google.inject:guice to v7 --- dependency-versions/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'dependency-versions/pom.xml') diff --git a/dependency-versions/pom.xml b/dependency-versions/pom.xml index 0e779267371..9ec4e8d7d50 100644 --- a/dependency-versions/pom.xml +++ b/dependency-versions/pom.xml @@ -36,7 +36,7 @@ 1.2 2.21.1 32.1.2-jre - 4.2.3 + 7.0.0 2.15.2 2.15.2 1 -- cgit v1.2.3 From bb436916fd27e669ba0107761312d1cd4229a303 Mon Sep 17 00:00:00 2001 From: Bjørn Christian Seime Date: Mon, 4 Sep 2023 13:42:44 +0200 Subject: Use Guice 6.0 https://github.com/google/guice/wiki/Guice600 We cannot upgrade to 7.x as we export javax.inject from container. 6.x supports both the old javax.inject and the new jakarta.inject replacement. --- application/pom.xml | 4 ++++ cloud-tenant-base-dependencies-enforcer/pom.xml | 3 ++- config-model-fat/pom.xml | 3 ++- configserver-flags/pom.xml | 2 +- container-core/pom.xml | 2 +- container-dependencies-enforcer/pom.xml | 3 ++- container-dependency-versions/pom.xml | 6 ------ container-dev/pom.xml | 7 ++++++- container-messagebus/pom.xml | 2 +- container-search-and-docproc/pom.xml | 2 +- container-test/pom.xml | 5 +++++ controller-server/pom.xml | 2 +- dependency-versions/pom.xml | 3 ++- document/pom.xml | 2 +- flags/pom.xml | 2 +- jdisc-security-filters/pom.xml | 5 +++++ jdisc_core/pom.xml | 3 +-- .../src/test/java/com/yahoo/jdisc/core/ExportPackagesIT.java | 2 +- linguistics-components/pom.xml | 2 +- linguistics/pom.xml | 2 +- lucene-linguistics/pom.xml | 2 +- maven-plugins/allowed-maven-dependencies.txt | 3 ++- parent/pom.xml | 6 +++++- provided-dependencies/pom.xml | 2 +- testutil/pom.xml | 2 +- vespa-dependencies-enforcer/allowed-maven-dependencies.txt | 4 ++-- 26 files changed, 51 insertions(+), 30 deletions(-) (limited to 'dependency-versions/pom.xml') diff --git a/application/pom.xml b/application/pom.xml index bb1ea4b30ee..46f6ee3132b 100644 --- a/application/pom.xml +++ b/application/pom.xml @@ -104,6 +104,10 @@ org.apache.commons commons-math3 + + jakarta.inject + jakarta.inject-api + com.yahoo.vespa diff --git a/cloud-tenant-base-dependencies-enforcer/pom.xml b/cloud-tenant-base-dependencies-enforcer/pom.xml index 3a5098b8b4e..d1ba571863d 100644 --- a/cloud-tenant-base-dependencies-enforcer/pom.xml +++ b/cloud-tenant-base-dependencies-enforcer/pom.xml @@ -53,7 +53,7 @@ com.google.guava:failureaccess:[1.0.1, 2):provided com.google.j2objc:j2objc-annotations:[2.8, 3):provided - com.google.inject:guice:jar:no_aop:${guice.vespa.version}:provided + com.google.inject:guice:jar:${guice.vespa.version}:provided com.sun.activation:javax.activation:[1.2.0, 2):provided com.sun.xml.bind:jaxb-core:${jaxb-core.vespa.version}:provided com.sun.xml.bind:jaxb-impl:${jaxb-impl.vespa.version}:provided @@ -149,6 +149,7 @@ io.prometheus:simpleclient_tracer_common:${prometheus.client.vespa.version}:test io.prometheus:simpleclient_tracer_otel:${prometheus.client.vespa.version}:test io.prometheus:simpleclient_tracer_otel_agent:${prometheus.client.vespa.version}:test + jakarta.inject:jakarta.inject-api:${jakarta.inject.vespa.version}:test junit:junit:${junit4.vespa.version}:test net.java.dev.jna:jna:${jna.vespa.version}:test net.openhft:zero-allocation-hashing:jar:${zero-allocation-hashing.vespa.version}:test diff --git a/config-model-fat/pom.xml b/config-model-fat/pom.xml index adf511faabe..c6dedb838bc 100644 --- a/config-model-fat/pom.xml +++ b/config-model-fat/pom.xml @@ -195,7 +195,7 @@ com.google.errorprone:error_prone_annotations:*:* com.google.guava:failureaccess:*:* com.google.guava:guava:*:* - com.google.inject:guice:jar:no_aop:*:* + com.google.inject:guice:jar:*:* com.google.j2objc:j2objc-annotations:*:* com.google.protobuf:protobuf-java:*:* com.sun.activation:javax.activation:*:* @@ -207,6 +207,7 @@ io.prometheus:simpleclient_tracer_common:*:* io.prometheus:simpleclient_tracer_otel:*:* io.prometheus:simpleclient_tracer_otel_agent:*:* + jakarta.inject:jakarta.inject-api:*:* javax.inject:javax.inject:*:* net.openhft:zero-allocation-hashing:*:* org.antlr:antlr-runtime:*:* diff --git a/configserver-flags/pom.xml b/configserver-flags/pom.xml index 02824f2e6e3..02395fc3559 100644 --- a/configserver-flags/pom.xml +++ b/configserver-flags/pom.xml @@ -58,7 +58,7 @@ com.google.inject guice provided - no_aop + junit diff --git a/container-core/pom.xml b/container-core/pom.xml index 8c30dad7e22..549b3ad5953 100644 --- a/container-core/pom.xml +++ b/container-core/pom.xml @@ -290,7 +290,7 @@ com.google.inject guice - no_aop + provided diff --git a/container-dependencies-enforcer/pom.xml b/container-dependencies-enforcer/pom.xml index 885be3b6ee6..2275e6429d7 100644 --- a/container-dependencies-enforcer/pom.xml +++ b/container-dependencies-enforcer/pom.xml @@ -73,7 +73,7 @@ com.google.guava:failureaccess:[1.0.1, 2):provided com.google.j2objc:j2objc-annotations:[2.8, 3):provided - com.google.inject:guice:jar:no_aop:${guice.vespa.version}:provided + com.google.inject:guice:jar:${guice.vespa.version}:provided com.sun.activation:javax.activation:[1.2.0, 2):provided com.sun.xml.bind:jaxb-core:${jaxb-core.vespa.version}:provided com.sun.xml.bind:jaxb-impl:${jaxb-impl.vespa.version}:provided @@ -163,6 +163,7 @@ io.prometheus:simpleclient_tracer_common:${prometheus.client.vespa.version}:test io.prometheus:simpleclient_tracer_otel:${prometheus.client.vespa.version}:test io.prometheus:simpleclient_tracer_otel_agent:${prometheus.client.vespa.version}:test + jakarta.inject:jakarta.inject-api:${jakarta.inject.vespa.version}:test junit:junit:${junit4.vespa.version}:test net.java.dev.jna:jna:${jna.vespa.version}:test net.openhft:zero-allocation-hashing:jar:${zero-allocation-hashing.vespa.version}:test diff --git a/container-dependency-versions/pom.xml b/container-dependency-versions/pom.xml index 8d3ae6aca0e..19f177d6f09 100644 --- a/container-dependency-versions/pom.xml +++ b/container-dependency-versions/pom.xml @@ -82,12 +82,6 @@ guice ${guice.vespa.version} - - com.google.inject - guice - ${guice.vespa.version} - no_aop - commons-logging commons-logging diff --git a/container-dev/pom.xml b/container-dev/pom.xml index 96aa120d42f..76ed8b1e3d4 100644 --- a/container-dev/pom.xml +++ b/container-dev/pom.xml @@ -55,7 +55,12 @@ com.google.inject guice - no_aop + + + jakarta.inject + jakarta.inject-api + + net.java.dev.jna diff --git a/container-messagebus/pom.xml b/container-messagebus/pom.xml index 2ad5633b7dc..38a2c8e2b78 100644 --- a/container-messagebus/pom.xml +++ b/container-messagebus/pom.xml @@ -19,7 +19,7 @@ com.google.inject guice - no_aop + provided diff --git a/container-search-and-docproc/pom.xml b/container-search-and-docproc/pom.xml index 71d547ecacd..3137fd449a4 100644 --- a/container-search-and-docproc/pom.xml +++ b/container-search-and-docproc/pom.xml @@ -101,7 +101,7 @@ com.google.inject guice - no_aop + provided diff --git a/container-test/pom.xml b/container-test/pom.xml index a22d0b59ace..9c6fe8025a2 100644 --- a/container-test/pom.xml +++ b/container-test/pom.xml @@ -115,6 +115,11 @@ org.lz4 lz4-java + + jakarta.inject + jakarta.inject-api + ${jakarta.inject.vespa.version} + diff --git a/controller-server/pom.xml b/controller-server/pom.xml index 3c3c93735e7..0fcd55eb7d3 100644 --- a/controller-server/pom.xml +++ b/controller-server/pom.xml @@ -91,7 +91,7 @@ com.google.inject guice - no_aop + provided diff --git a/dependency-versions/pom.xml b/dependency-versions/pom.xml index 9ec4e8d7d50..781dc4e587a 100644 --- a/dependency-versions/pom.xml +++ b/dependency-versions/pom.xml @@ -36,9 +36,10 @@ 1.2 2.21.1 32.1.2-jre - 7.0.0 + 6.0.0 2.15.2 2.15.2 + 2.0.1 1 3.1.0 2.1.1 diff --git a/document/pom.xml b/document/pom.xml index 5db432d2447..2b13a4ace4f 100644 --- a/document/pom.xml +++ b/document/pom.xml @@ -65,7 +65,7 @@ com.google.inject guice - no_aop + provided diff --git a/flags/pom.xml b/flags/pom.xml index 0bfb02b1f32..816e5416cec 100644 --- a/flags/pom.xml +++ b/flags/pom.xml @@ -51,7 +51,7 @@ com.google.inject guice - no_aop + provided diff --git a/jdisc-security-filters/pom.xml b/jdisc-security-filters/pom.xml index 3440f9089d7..8a456d06a40 100644 --- a/jdisc-security-filters/pom.xml +++ b/jdisc-security-filters/pom.xml @@ -69,6 +69,11 @@ ${project.version} test + + jakarta.inject + jakarta.inject-api + test + diff --git a/jdisc_core/pom.xml b/jdisc_core/pom.xml index 4471269358a..009eee26d9c 100644 --- a/jdisc_core/pom.xml +++ b/jdisc_core/pom.xml @@ -87,7 +87,6 @@ com.google.inject guice - no_aop org.apache.felix @@ -217,7 +216,7 @@ __REPLACE_VERSION__${project.build.directory}/dependency/guava.jar - ${project.build.directory}/dependency/guice-no_aop.jar + ${project.build.directory}/dependency/guice.jar ${project.build.directory}/dependency/slf4j-api.jar ${project.build.directory}/dependency/slf4j-jdk14.jar ${project.build.directory}/dependency/jcl-over-slf4j.jar diff --git a/jdisc_core/src/test/java/com/yahoo/jdisc/core/ExportPackagesIT.java b/jdisc_core/src/test/java/com/yahoo/jdisc/core/ExportPackagesIT.java index b5a9e19bb2a..2d0b9ba9651 100644 --- a/jdisc_core/src/test/java/com/yahoo/jdisc/core/ExportPackagesIT.java +++ b/jdisc_core/src/test/java/com/yahoo/jdisc/core/ExportPackagesIT.java @@ -36,7 +36,7 @@ public class ExportPackagesIT { // This list must be kept in sync with the list in the export-packages execution in pom.xml. private static final List RE_EXPORTED_BUNDLES = Stream.of( "guava.jar", - "guice-no_aop.jar", + "guice.jar", "slf4j-api.jar", "slf4j-jdk14.jar", "jcl-over-slf4j.jar", diff --git a/linguistics-components/pom.xml b/linguistics-components/pom.xml index 19bb244b5d9..68b0437ac3f 100644 --- a/linguistics-components/pom.xml +++ b/linguistics-components/pom.xml @@ -87,7 +87,7 @@ com.google.inject guice provided - no_aop + com.yahoo.vespa diff --git a/linguistics/pom.xml b/linguistics/pom.xml index 5db3302b597..8813af8b981 100644 --- a/linguistics/pom.xml +++ b/linguistics/pom.xml @@ -56,7 +56,7 @@ com.google.inject guice provided - no_aop + diff --git a/lucene-linguistics/pom.xml b/lucene-linguistics/pom.xml index 929d33a0736..18f2b1a8574 100644 --- a/lucene-linguistics/pom.xml +++ b/lucene-linguistics/pom.xml @@ -63,7 +63,7 @@ com.google.inject guice - no_aop + provided diff --git a/maven-plugins/allowed-maven-dependencies.txt b/maven-plugins/allowed-maven-dependencies.txt index 319d6874f40..e3e2e52339d 100644 --- a/maven-plugins/allowed-maven-dependencies.txt +++ b/maven-plugins/allowed-maven-dependencies.txt @@ -10,10 +10,11 @@ com.github.luben:zstd-jni:1.5.5-5 com.google.errorprone:error_prone_annotations:2.21.1 com.google.guava:failureaccess:1.0.1 com.google.guava:guava:32.1.2-jre -com.google.inject:guice:4.2.3 +com.google.inject:guice:6.0.0 com.google.j2objc:j2objc-annotations:2.8 commons-codec:commons-codec:1.16.0 commons-io:commons-io:2.13.0 +jakarta.inject:jakarta.inject-api:2.0.1 javax.annotation:javax.annotation-api:1.2 javax.inject:javax.inject:1 org.apache-extras.beanshell:bsh:2.0b6 diff --git a/parent/pom.xml b/parent/pom.xml index eeacc667b22..7d83876d3a4 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -1146,7 +1146,11 @@ google-auth-library-oauth2-http 1.19.0 - + + jakarta.inject + jakarta.inject-api + ${jakarta.inject.vespa.version} + diff --git a/provided-dependencies/pom.xml b/provided-dependencies/pom.xml index 09d76265466..8bf84956a12 100755 --- a/provided-dependencies/pom.xml +++ b/provided-dependencies/pom.xml @@ -49,7 +49,7 @@ com.google.inject guice - no_aop + diff --git a/testutil/pom.xml b/testutil/pom.xml index 7f57b6defee..a26459c0b8a 100644 --- a/testutil/pom.xml +++ b/testutil/pom.xml @@ -24,7 +24,7 @@ com.google.inject guice provided - no_aop + com.yahoo.vespa diff --git a/vespa-dependencies-enforcer/allowed-maven-dependencies.txt b/vespa-dependencies-enforcer/allowed-maven-dependencies.txt index 50ab762bd9b..1019493a3b8 100644 --- a/vespa-dependencies-enforcer/allowed-maven-dependencies.txt +++ b/vespa-dependencies-enforcer/allowed-maven-dependencies.txt @@ -36,7 +36,7 @@ com.google.guava:guava:32.1.2-jre com.google.http-client:google-http-client:1.43.3 com.google.http-client:google-http-client-apache-v2:1.43.3 com.google.http-client:google-http-client-gson:1.42.3 -com.google.inject:guice:4.2.3:no_aop +com.google.inject:guice:6.0.0 com.google.j2objc:j2objc-annotations:2.8 com.google.protobuf:protobuf-java:3.24.2 com.ibm.icu:icu4j:73.2 @@ -82,6 +82,7 @@ io.prometheus:simpleclient_tracer_common:0.16.0 io.prometheus:simpleclient_tracer_otel:0.16.0 io.prometheus:simpleclient_tracer_otel_agent:0.16.0 jakarta.annotation:jakarta.annotation-api:1.3.5 +jakarta.inject:jakarta.inject-api:2.0.1 jakarta.validation:jakarta.validation-api:2.0.2 jakarta.ws.rs:jakarta.ws.rs-api:2.1.6 javax.activation:javax.activation-api:1.2.0 @@ -218,7 +219,6 @@ xml-apis:xml-apis:1.4.01 #[test-only] # Contains dependencies that are used exclusively in 'test' scope -com.google.inject:guice:4.2.3 com.google.jimfs:jimfs:1.3.0 net.bytebuddy:byte-buddy:1.14.7 net.bytebuddy:byte-buddy-agent:1.14.7 -- cgit v1.2.3 From 7a54ac5b55185a6fbf56f95e620e0dba0e83df32 Mon Sep 17 00:00:00 2001 From: Bjørn Christian Seime Date: Mon, 4 Sep 2023 14:11:42 +0200 Subject: Remove xml-apis as it's part of Java standard library --- cloud-tenant-base-dependencies-enforcer/pom.xml | 1 - config-model-fat/pom.xml | 13 +++---------- container-dependencies-enforcer/pom.xml | 1 - container-dependency-versions/pom.xml | 5 ----- dependency-versions/pom.xml | 1 - jdisc_core/pom.xml | 5 ----- parent/pom.xml | 6 ++++++ vespa-dependencies-enforcer/allowed-maven-dependencies.txt | 1 - 8 files changed, 9 insertions(+), 24 deletions(-) (limited to 'dependency-versions/pom.xml') diff --git a/cloud-tenant-base-dependencies-enforcer/pom.xml b/cloud-tenant-base-dependencies-enforcer/pom.xml index 3a5098b8b4e..85f0962555d 100644 --- a/cloud-tenant-base-dependencies-enforcer/pom.xml +++ b/cloud-tenant-base-dependencies-enforcer/pom.xml @@ -66,7 +66,6 @@ org.slf4j:log4j-over-slf4j:${slf4j.vespa.version}:provided org.slf4j:slf4j-api:${slf4j.vespa.version}:provided org.slf4j:slf4j-jdk14:${slf4j.vespa.version}:provided - xml-apis:xml-apis:${xml-apis.vespa.version}:provided com.yahoo.vespa:annotations:*:provided diff --git a/config-model-fat/pom.xml b/config-model-fat/pom.xml index adf511faabe..85edae6b6a1 100644 --- a/config-model-fat/pom.xml +++ b/config-model-fat/pom.xml @@ -98,16 +98,10 @@ javax.security.auth.callback, javax.security.auth.x500, javax.security.auth, - javax.xml.datatype, - javax.xml.namespace, - javax.xml.parsers, - javax.xml.transform, - javax.xml.xpath, + javax.xml.*, org.bouncycastle.*, - org.w3c.dom.bootstrap, - org.w3c.dom.ls, - org.w3c.dom, - org.xml.sax, + org.w3c.dom.*, + org.xml.sax.*, com.yahoo.vespa.config, com.yahoo.vespa.config.buildergen, @@ -219,7 +213,6 @@ org.slf4j:slf4j-api:*:* org.slf4j:slf4j-jdk14:*:* xerces:xercesImpl:*:* - xml-apis:xml-apis:*:* diff --git a/container-dependencies-enforcer/pom.xml b/container-dependencies-enforcer/pom.xml index 885be3b6ee6..1e91c1534cd 100644 --- a/container-dependencies-enforcer/pom.xml +++ b/container-dependencies-enforcer/pom.xml @@ -86,7 +86,6 @@ org.slf4j:log4j-over-slf4j:${slf4j.vespa.version}:provided org.slf4j:slf4j-api:${slf4j.vespa.version}:provided org.slf4j:slf4j-jdk14:${slf4j.vespa.version}:provided - xml-apis:xml-apis:${xml-apis.vespa.version}:provided com.yahoo.vespa:annotations:*:provided diff --git a/container-dependency-versions/pom.xml b/container-dependency-versions/pom.xml index 8d3ae6aca0e..8c0185c9b92 100644 --- a/container-dependency-versions/pom.xml +++ b/container-dependency-versions/pom.xml @@ -159,11 +159,6 @@ slf4j-jdk14 ${slf4j.vespa.version} - - xml-apis - xml-apis - ${xml-apis.vespa.version} - diff --git a/dependency-versions/pom.xml b/dependency-versions/pom.xml index 0e779267371..db38fcc82fa 100644 --- a/dependency-versions/pom.xml +++ b/dependency-versions/pom.xml @@ -46,7 +46,6 @@ 2.3.0.1 2.3.0 1.7.36 - 1.4.01 diff --git a/jdisc_core/pom.xml b/jdisc_core/pom.xml index 4471269358a..879a7fd2950 100644 --- a/jdisc_core/pom.xml +++ b/jdisc_core/pom.xml @@ -35,11 +35,6 @@ - - - xml-apis - xml-apis - org.mockito mockito-core diff --git a/parent/pom.xml b/parent/pom.xml index eeacc667b22..1da2698b4cb 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -1120,6 +1120,12 @@ xerces xercesImpl ${xerces.vespa.version} + + + xml-apis + xml-apis + + org.json diff --git a/vespa-dependencies-enforcer/allowed-maven-dependencies.txt b/vespa-dependencies-enforcer/allowed-maven-dependencies.txt index 50ab762bd9b..65ef50c49e5 100644 --- a/vespa-dependencies-enforcer/allowed-maven-dependencies.txt +++ b/vespa-dependencies-enforcer/allowed-maven-dependencies.txt @@ -214,7 +214,6 @@ org.tukaani:xz:1.9 org.xerial.snappy:snappy-java:1.1.10.3 software.amazon.ion:ion-java:1.0.2 xerces:xercesImpl:2.12.2 -xml-apis:xml-apis:1.4.01 #[test-only] # Contains dependencies that are used exclusively in 'test' scope -- cgit v1.2.3