From 1eb75cd19212ecff9e76fc26f52f87ca9f661e51 Mon Sep 17 00:00:00 2001 From: Arnstein Ressem Date: Fri, 21 Jul 2023 13:37:05 +0200 Subject: Revert "New parent pom" --- application-model/pom.xml | 2 +- bootstrap.sh | 4 - bundle-plugin/pom.xml | 2 +- cloud-tenant-base-dependencies-enforcer/pom.xml | 147 +++++++----- clustercontroller-core/pom.xml | 2 +- config-model/pom.xml | 2 +- configserver/pom.xml | 12 +- container-dependencies-enforcer/pom.xml | 98 ++++---- container-dependency-versions/pom.xml | 74 +++--- container-dev/pom.xml | 2 +- container-disc/pom.xml | 18 +- container-search/pom.xml | 2 +- container-spifly/pom.xml | 8 +- container/pom.xml | 2 +- dependency-versions/README.md | 6 - dependency-versions/pom.xml | 123 ---------- fat-model-dependencies/pom.xml | 2 +- hosted-tenant-base/pom.xml | 40 ++-- orchestrator-restapi/pom.xml | 2 +- orchestrator/pom.xml | 2 +- parent/pom.xml | 284 +++++++++++++++--------- pom.xml | 1 - screwdriver/release-java-artifacts.sh | 5 +- service-monitor/pom.xml | 2 +- vespa-athenz/pom.xml | 2 +- zookeeper-command-line-client/pom.xml | 2 +- 26 files changed, 412 insertions(+), 434 deletions(-) delete mode 100644 dependency-versions/README.md delete mode 100644 dependency-versions/pom.xml diff --git a/application-model/pom.xml b/application-model/pom.xml index e1bac1f2b85..9f5cd9c23c1 100644 --- a/application-model/pom.xml +++ b/application-model/pom.xml @@ -18,7 +18,7 @@ com.fasterxml.jackson.core jackson-annotations - ${jackson2.vespa.version} + ${jackson2.version} provided diff --git a/bootstrap.sh b/bootstrap.sh index e0dbfd33133..0108999b1c6 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -62,10 +62,6 @@ $top/dist/getversionmap.sh $top > $top/dist/vtag.map # must install parent poms first: echo "Downloading all dependencies. This may take a few minutes with an empty Maven cache." -( - cd dependency-versions - mvn_install -) ( cd container-dependency-versions mvn_install diff --git a/bundle-plugin/pom.xml b/bundle-plugin/pom.xml index 6b106ee19b5..d1119327f0e 100644 --- a/bundle-plugin/pom.xml +++ b/bundle-plugin/pom.xml @@ -63,7 +63,7 @@ org.apache.maven.plugins maven-shade-plugin - ${maven-shade-plugin.vespa.version} + ${maven-shade-plugin.version} compile diff --git a/cloud-tenant-base-dependencies-enforcer/pom.xml b/cloud-tenant-base-dependencies-enforcer/pom.xml index b098339a0c8..42eef0ad3de 100644 --- a/cloud-tenant-base-dependencies-enforcer/pom.xml +++ b/cloud-tenant-base-dependencies-enforcer/pom.xml @@ -16,6 +16,43 @@ 8-SNAPSHOT pom + + 1.8.1 + + + 1.11.34 + + 1.74 + 1.15 + 7.0.5 + 5.2.1 + 5.2.2 + 4.5.14 + 4.4.16 + 5.8.1 + 1.13.1 + 0.12.0 + + + + + 1.0 + 32.1.1-jre + 4.2.3 + 2.15.2 + 2.15.2 + 1 + 3.1.0 + 2.0.1 + 2.3.0 + 11.0.15 + 1.8.0 + 20230227 + 1.7.32 + 1.4.01 + + @@ -41,33 +78,33 @@ - aopalliance:aopalliance:${aopalliance.vespa.version}:provided - com.fasterxml.jackson.core:jackson-annotations:${jackson2.vespa.version}:provided - com.fasterxml.jackson.core:jackson-core:${jackson2.vespa.version}:provided - com.fasterxml.jackson.core:jackson-databind:${jackson-databind.vespa.version}:provided - com.fasterxml.jackson.datatype:jackson-datatype-jdk8:${jackson2.vespa.version}:provided - com.fasterxml.jackson.datatype:jackson-datatype-jsr310:${jackson2.vespa.version}:provided + aopalliance:aopalliance:${aopalliance.version}:provided + com.fasterxml.jackson.core:jackson-annotations:${jackson2.version}:provided + com.fasterxml.jackson.core:jackson-core:${jackson2.version}:provided + com.fasterxml.jackson.core:jackson-databind:${jackson-databind.version}:provided + com.fasterxml.jackson.datatype:jackson-datatype-jdk8:${jackson2.version}:provided + com.fasterxml.jackson.datatype:jackson-datatype-jsr310:${jackson2.version}:provided - com.google.guava:guava:${guava.vespa.version}:provided + com.google.guava:guava:${guava.version}:provided com.google.errorprone:error_prone_annotations:2.18.0:provided com.google.guava:failureaccess:1.0.1:provided com.google.j2objc:j2objc-annotations:2.8:provided - com.google.inject:guice:jar:no_aop:${guice.vespa.version}:provided + com.google.inject:guice:jar:no_aop:${guice.version}:provided com.sun.activation:javax.activation:1.2.0:provided - com.sun.xml.bind:jaxb-core:${jaxb.vespa.version}:provided - com.sun.xml.bind:jaxb-impl:${jaxb.vespa.version}:provided + com.sun.xml.bind:jaxb-core:${jaxb.version}:provided + com.sun.xml.bind:jaxb-impl:${jaxb.version}:provided commons-logging:commons-logging:1.2:provided - javax.inject:javax.inject:${javax.inject.vespa.version}:provided - javax.servlet:javax.servlet-api:${javax.servlet-api.vespa.version}:provided - javax.ws.rs:javax.ws.rs-api:${javax.ws.rs-api.vespa.version}:provided - javax.xml.bind:jaxb-api:${jaxb.vespa.version}:provided - org.slf4j:jcl-over-slf4j:${slf4j.vespa.version}:provided - 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 + javax.inject:javax.inject:${javax.inject.version}:provided + javax.servlet:javax.servlet-api:${javax.servlet-api.version}:provided + javax.ws.rs:javax.ws.rs-api:${javax.ws.rs-api.version}:provided + javax.xml.bind:jaxb-api:${jaxb.version}:provided + org.slf4j:jcl-over-slf4j:${slf4j.version}:provided + org.slf4j:log4j-over-slf4j:${slf4j.version}:provided + org.slf4j:slf4j-api:${slf4j.version}:provided + org.slf4j:slf4j-jdk14:${slf4j.version}:provided + xml-apis:xml-apis:${xml-apis.version}:provided com.yahoo.vespa:annotations:*:provided @@ -141,9 +178,9 @@ com.google.code.findbugs:jsr305:3.0.2:test com.google.protobuf:protobuf-java:3.21.7:test com.ibm.icu:icu4j:70.1:test - com.microsoft.onnxruntime:onnxruntime:jar:${onnxruntime.vespa.version}:test + com.microsoft.onnxruntime:onnxruntime:jar:${onnxruntime.version}:test com.thaiopensource:jing:20091111:test - commons-codec:commons-codec:${commons-codec.vespa.version}:test + commons-codec:commons-codec:${commons-codec.version}:test io.airlift:airline:0.9:test io.prometheus:simpleclient:0.6.0:test io.prometheus:simpleclient_common:0.6.0:test @@ -154,47 +191,47 @@ org.antlr:antlr4-runtime:4.11.1:test org.apache.commons:commons-exec:1.3:test org.apache.commons:commons-math3:3.6.1:test - org.apache.felix:org.apache.felix.framework:${felix.vespa.version}:test + org.apache.felix:org.apache.felix.framework:${felix.version}:test org.apache.felix:org.apache.felix.log:1.0.1:test - org.apache.httpcomponents.client5:httpclient5:${apache.httpclient5.vespa.version}:test - org.apache.httpcomponents.core5:httpcore5:${apache.httpcore5.vespa.version}:test - org.apache.httpcomponents.core5:httpcore5-h2:${apache.httpcore5.vespa.version}:test - org.apache.httpcomponents:httpclient:${apache.httpclient.vespa.version}:test - org.apache.httpcomponents:httpcore:${apache.httpcore.vespa.version}:test - org.apache.httpcomponents:httpmime:${apache.httpclient.vespa.version}:test + org.apache.httpcomponents.client5:httpclient5:${httpclient5.version}:test + org.apache.httpcomponents.core5:httpcore5:${httpcore5.version}:test + org.apache.httpcomponents.core5:httpcore5-h2:${httpcore5.version}:test + org.apache.httpcomponents:httpclient:${httpclient.version}:test + org.apache.httpcomponents:httpcore:${httpcore.version}:test + org.apache.httpcomponents:httpmime:${httpclient.version}:test org.apache.opennlp:opennlp-tools:1.9.3:test org.apiguardian:apiguardian-api:1.1.2:test - org.bouncycastle:bcpkix-jdk18on:${bouncycastle.vespa.version}:test - org.bouncycastle:bcprov-jdk18on:${bouncycastle.vespa.version}:test - org.bouncycastle:bcutil-jdk18on:${bouncycastle.vespa.version}:test - org.eclipse.jetty.http2:http2-client:${jetty.vespa.version}:test - org.eclipse.jetty.http2:http2-common:${jetty.vespa.version}:test - org.eclipse.jetty.http2:http2-hpack:${jetty.vespa.version}:test - org.eclipse.jetty.http2:http2-http-client-transport:${jetty.vespa.version}:test - org.eclipse.jetty.http2:http2-server:${jetty.vespa.version}:test + org.bouncycastle:bcpkix-jdk18on:${bouncycastle.version}:test + org.bouncycastle:bcprov-jdk18on:${bouncycastle.version}:test + org.bouncycastle:bcutil-jdk18on:${bouncycastle.version}:test + org.eclipse.jetty.http2:http2-client:${jetty.version}:test + org.eclipse.jetty.http2:http2-common:${jetty.version}:test + org.eclipse.jetty.http2:http2-hpack:${jetty.version}:test + org.eclipse.jetty.http2:http2-http-client-transport:${jetty.version}:test + org.eclipse.jetty.http2:http2-server:${jetty.version}:test org.eclipse.jetty.toolchain:jetty-jakarta-servlet-api:5.0.2:test - org.eclipse.jetty:jetty-alpn-client:${jetty.vespa.version}:test - org.eclipse.jetty:jetty-alpn-java-client:${jetty.vespa.version}:test - org.eclipse.jetty:jetty-alpn-java-server:${jetty.vespa.version}:test - org.eclipse.jetty:jetty-alpn-server:${jetty.vespa.version}:test - org.eclipse.jetty:jetty-client:${jetty.vespa.version}:test - org.eclipse.jetty:jetty-http:${jetty.vespa.version}:test - org.eclipse.jetty:jetty-io:${jetty.vespa.version}:test - org.eclipse.jetty:jetty-jmx:${jetty.vespa.version}:test - org.eclipse.jetty:jetty-security:${jetty.vespa.version}:test - org.eclipse.jetty:jetty-server:${jetty.vespa.version}:test - org.eclipse.jetty:jetty-servlet:${jetty.vespa.version}:test - org.eclipse.jetty:jetty-util:${jetty.vespa.version}:test + org.eclipse.jetty:jetty-alpn-client:${jetty.version}:test + org.eclipse.jetty:jetty-alpn-java-client:${jetty.version}:test + org.eclipse.jetty:jetty-alpn-java-server:${jetty.version}:test + org.eclipse.jetty:jetty-alpn-server:${jetty.version}:test + org.eclipse.jetty:jetty-client:${jetty.version}:test + org.eclipse.jetty:jetty-http:${jetty.version}:test + org.eclipse.jetty:jetty-io:${jetty.version}:test + org.eclipse.jetty:jetty-jmx:${jetty.version}:test + org.eclipse.jetty:jetty-security:${jetty.version}:test + org.eclipse.jetty:jetty-server:${jetty.version}:test + org.eclipse.jetty:jetty-servlet:${jetty.version}:test + org.eclipse.jetty:jetty-util:${jetty.version}:test org.hamcrest:hamcrest-core:1.3:test org.hdrhistogram:HdrHistogram:2.1.12:test - org.json:json:${org.json.vespa.version}:test - org.junit.jupiter:junit-jupiter-api:${junit.vespa.version}:test - org.junit.jupiter:junit-jupiter-engine:${junit.vespa.version}:test - org.junit.platform:junit-platform-commons:${junit.platform.vespa.version}:test - org.junit.platform:junit-platform-engine:${junit.platform.vespa.version}:test - org.junit.vintage:junit-vintage-engine:${junit.vespa.version}:test - org.lz4:lz4-java:${org.lz4.vespa.version}:test + org.json:json:${org.json.version}:test + org.junit.jupiter:junit-jupiter-api:${junit5.version}:test + org.junit.jupiter:junit-jupiter-engine:${junit5.version}:test + org.junit.platform:junit-platform-commons:${junit5.platform.version}:test + org.junit.platform:junit-platform-engine:${junit5.platform.version}:test + org.junit.vintage:junit-vintage-engine:${junit5.version}:test + org.lz4:lz4-java:${org.lz4.version}:test org.opentest4j:opentest4j:1.2.0:test org.osgi:org.osgi.compendium:4.1.0:test org.osgi:org.osgi.core:4.1.0:test diff --git a/clustercontroller-core/pom.xml b/clustercontroller-core/pom.xml index 6fc29fc811c..61176c178c6 100644 --- a/clustercontroller-core/pom.xml +++ b/clustercontroller-core/pom.xml @@ -38,7 +38,7 @@ org.mockito mockito-junit-jupiter - ${mockito.vespa.version} + ${mockito.version} test diff --git a/config-model/pom.xml b/config-model/pom.xml index bfaa82a186f..afb5a7f49c0 100644 --- a/config-model/pom.xml +++ b/config-model/pom.xml @@ -59,7 +59,7 @@ com.google.protobuf protobuf-java - ${protobuf.vespa.version} + ${protobuf.version} com.google.guava diff --git a/configserver/pom.xml b/configserver/pom.xml index 7c94464864c..5b130969ae4 100644 --- a/configserver/pom.xml +++ b/configserver/pom.xml @@ -20,7 +20,7 @@ com.fasterxml.jackson.jaxrs jackson-jaxrs-json-provider - ${jackson2.vespa.version} + ${jackson2.version} @@ -42,12 +42,12 @@ org.glassfish.jersey.core jersey-client - ${jersey.vespa.version} + 2.25 org.glassfish.jersey.core jersey-server - ${jersey.vespa.version} + 2.25 org.glassfish.jersey.media @@ -58,12 +58,12 @@ org.glassfish.jersey.ext jersey-proxy-client - ${jersey.vespa.version} + 2.25 org.glassfish.jersey.media jersey-media-json-jackson - ${jersey.vespa.version} + 2.25 @@ -79,7 +79,7 @@ org.glassfish.jersey.media jersey-media-multipart - ${jersey.vespa.version} + 2.25 diff --git a/container-dependencies-enforcer/pom.xml b/container-dependencies-enforcer/pom.xml index 6c30c3a4b5c..38988ddeabc 100644 --- a/container-dependencies-enforcer/pom.xml +++ b/container-dependencies-enforcer/pom.xml @@ -60,33 +60,33 @@ - aopalliance:aopalliance:${aopalliance.vespa.version}:provided - com.fasterxml.jackson.core:jackson-annotations:${jackson2.vespa.version}:provided - com.fasterxml.jackson.core:jackson-core:${jackson2.vespa.version}:provided - com.fasterxml.jackson.core:jackson-databind:${jackson-databind.vespa.version}:provided - com.fasterxml.jackson.datatype:jackson-datatype-jdk8:${jackson2.vespa.version}:provided - com.fasterxml.jackson.datatype:jackson-datatype-jsr310:${jackson2.vespa.version}:provided + aopalliance:aopalliance:${aopalliance.version}:provided + com.fasterxml.jackson.core:jackson-annotations:${jackson2.version}:provided + com.fasterxml.jackson.core:jackson-core:${jackson2.version}:provided + com.fasterxml.jackson.core:jackson-databind:${jackson-databind.version}:provided + com.fasterxml.jackson.datatype:jackson-datatype-jdk8:${jackson2.version}:provided + com.fasterxml.jackson.datatype:jackson-datatype-jsr310:${jackson2.version}:provided - com.google.guava:guava:${guava.vespa.version}:provided + com.google.guava:guava:${guava.version}:provided com.google.errorprone:error_prone_annotations:2.18.0:provided com.google.guava:failureaccess:1.0.1:provided com.google.j2objc:j2objc-annotations:2.8:provided - com.google.inject:guice:jar:no_aop:${guice.vespa.version}:provided + com.google.inject:guice:jar:no_aop:${guice.version}:provided com.sun.activation:javax.activation:1.2.0:provided - com.sun.xml.bind:jaxb-core:${jaxb.vespa.version}:provided - com.sun.xml.bind:jaxb-impl:${jaxb.vespa.version}:provided + com.sun.xml.bind:jaxb-core:${jaxb.version}:provided + com.sun.xml.bind:jaxb-impl:${jaxb.version}:provided commons-logging:commons-logging:1.2:provided - javax.inject:javax.inject:${javax.inject.vespa.version}:provided - javax.servlet:javax.servlet-api:${javax.servlet-api.vespa.version}:provided - javax.ws.rs:javax.ws.rs-api:${javax.ws.rs-api.vespa.version}:provided - javax.xml.bind:jaxb-api:${jaxb.vespa.version}:provided - org.slf4j:jcl-over-slf4j:${slf4j.vespa.version}:provided - 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 + javax.inject:javax.inject:${javax.inject.version}:provided + javax.servlet:javax.servlet-api:${javax.servlet-api.version}:provided + javax.ws.rs:javax.ws.rs-api:${javax.ws.rs-api.version}:provided + javax.xml.bind:jaxb-api:${jaxb.version}:provided + org.slf4j:jcl-over-slf4j:${slf4j.version}:provided + org.slf4j:log4j-over-slf4j:${slf4j.version}:provided + org.slf4j:slf4j-api:${slf4j.version}:provided + org.slf4j:slf4j-jdk14:${slf4j.version}:provided + xml-apis:xml-apis:${xml-apis.version}:provided com.yahoo.vespa:annotations:*:provided @@ -152,11 +152,11 @@ com.google.code.findbugs:jsr305:3.0.2:test - com.google.protobuf:protobuf-java:${protobuf.vespa.version}:test + com.google.protobuf:protobuf-java:${protobuf.version}:test com.ibm.icu:icu4j:70.1:test - com.microsoft.onnxruntime:onnxruntime:${onnxruntime.vespa.version}:test + com.microsoft.onnxruntime:onnxruntime:${onnxruntime.version}:test com.thaiopensource:jing:20091111:test - commons-codec:commons-codec:${commons-codec.vespa.version}:test + commons-codec:commons-codec:${commons-codec.version}:test io.airlift:airline:0.9:test io.prometheus:simpleclient:0.6.0:test io.prometheus:simpleclient_common:0.6.0:test @@ -167,38 +167,38 @@ org.antlr:antlr4-runtime:4.11.1:test org.apache.commons:commons-exec:1.3:test org.apache.commons:commons-math3:3.6.1:test - org.apache.felix:org.apache.felix.framework:${felix.vespa.version}:test - org.apache.felix:org.apache.felix.framework:${felix.vespa.version}:test + org.apache.felix:org.apache.felix.framework:${felix.version}:test + org.apache.felix:org.apache.felix.framework:${felix.version}:test org.apache.felix:org.apache.felix.log:1.0.1:test - org.apache.httpcomponents.client5:httpclient5:${apache.httpclient5.vespa.version}:test - org.apache.httpcomponents.core5:httpcore5:${apache.httpcore5.vespa.version}:test - org.apache.httpcomponents.core5:httpcore5-h2:${apache.httpcore5.vespa.version}:test - org.apache.httpcomponents:httpclient:${apache.httpclient.vespa.version}:test - org.apache.httpcomponents:httpcore:${apache.httpcore.vespa.version}:test - org.apache.httpcomponents:httpmime:${apache.httpclient.vespa.version}:test + org.apache.httpcomponents.client5:httpclient5:${apache.httpclient5.version}:test + org.apache.httpcomponents.core5:httpcore5:${apache.httpcore5.version}:test + org.apache.httpcomponents.core5:httpcore5-h2:${apache.httpcore5.version}:test + org.apache.httpcomponents:httpclient:${apache.httpclient.version}:test + org.apache.httpcomponents:httpcore:${apache.httpcore.version}:test + org.apache.httpcomponents:httpmime:${apache.httpclient.version}:test org.apache.opennlp:opennlp-tools:1.9.3:test - org.bouncycastle:bcpkix-jdk18on:${bouncycastle.vespa.version}:test - org.bouncycastle:bcprov-jdk18on:${bouncycastle.vespa.version}:test - org.bouncycastle:bcutil-jdk18on:${bouncycastle.vespa.version}:test - org.eclipse.jetty.http2:http2-common:${jetty.vespa.version}:test - org.eclipse.jetty.http2:http2-hpack:${jetty.vespa.version}:test - org.eclipse.jetty.http2:http2-server:${jetty.vespa.version}:test + org.bouncycastle:bcpkix-jdk18on:${bouncycastle.version}:test + org.bouncycastle:bcprov-jdk18on:${bouncycastle.version}:test + org.bouncycastle:bcutil-jdk18on:${bouncycastle.version}:test + org.eclipse.jetty.http2:http2-common:${jetty.version}:test + org.eclipse.jetty.http2:http2-hpack:${jetty.version}:test + org.eclipse.jetty.http2:http2-server:${jetty.version}:test org.eclipse.jetty.toolchain:jetty-jakarta-servlet-api:5.0.2:test - org.eclipse.jetty:jetty-alpn-client:${jetty.vespa.version}:test - org.eclipse.jetty:jetty-alpn-java-server:${jetty.vespa.version}:test - org.eclipse.jetty:jetty-alpn-server:${jetty.vespa.version}:test - org.eclipse.jetty:jetty-client:${jetty.vespa.version}:test - org.eclipse.jetty:jetty-http:${jetty.vespa.version}:test - org.eclipse.jetty:jetty-io:${jetty.vespa.version}:test - org.eclipse.jetty:jetty-jmx:${jetty.vespa.version}:test - org.eclipse.jetty:jetty-security:${jetty.vespa.version}:test - org.eclipse.jetty:jetty-server:${jetty.vespa.version}:test - org.eclipse.jetty:jetty-servlet:${jetty.vespa.version}:test - org.eclipse.jetty:jetty-util:${jetty.vespa.version}:test + org.eclipse.jetty:jetty-alpn-client:${jetty.version}:test + org.eclipse.jetty:jetty-alpn-java-server:${jetty.version}:test + org.eclipse.jetty:jetty-alpn-server:${jetty.version}:test + org.eclipse.jetty:jetty-client:${jetty.version}:test + org.eclipse.jetty:jetty-http:${jetty.version}:test + org.eclipse.jetty:jetty-io:${jetty.version}:test + org.eclipse.jetty:jetty-jmx:${jetty.version}:test + org.eclipse.jetty:jetty-security:${jetty.version}:test + org.eclipse.jetty:jetty-server:${jetty.version}:test + org.eclipse.jetty:jetty-servlet:${jetty.version}:test + org.eclipse.jetty:jetty-util:${jetty.version}:test org.hamcrest:hamcrest-core:1.3:test org.hdrhistogram:HdrHistogram:2.1.12:test - org.json:json:${org.json.vespa.version}:test - org.lz4:lz4-java:${org.lz4.vespa.version}:test + org.json:json:${org.json.version}:test + org.lz4:lz4-java:${org.lz4.version}:test org.osgi:org.osgi.compendium:4.1.0:test org.osgi:org.osgi.core:4.1.0:test xerces:xercesImpl:2.12.2:test diff --git a/container-dependency-versions/pom.xml b/container-dependency-versions/pom.xml index ffb692f9eb3..0e210a54d87 100644 --- a/container-dependency-versions/pom.xml +++ b/container-dependency-versions/pom.xml @@ -2,6 +2,7 @@ 4.0.0 + com.yahoo.vespa container-dependency-versions pom 8-SNAPSHOT @@ -9,13 +10,6 @@ Versions for all 3rd party dependencies provided from the Vespa container. https://github.com/vespa-engine - - com.yahoo.vespa - dependency-versions - 8-SNAPSHOT - ../dependency-versions/pom.xml - - The Apache License, Version 2.0 @@ -39,53 +33,53 @@ aopalliance aopalliance - ${aopalliance.vespa.version} + ${aopalliance.version} com.fasterxml.jackson.core jackson-annotations - ${jackson2.vespa.version} + ${jackson2.version} com.fasterxml.jackson.core jackson-core - ${jackson2.vespa.version} + ${jackson2.version} com.fasterxml.jackson.core jackson-databind - ${jackson-databind.vespa.version} + ${jackson-databind.version} com.fasterxml.jackson.datatype jackson-datatype-jdk8 - ${jackson2.vespa.version} + ${jackson2.version} com.fasterxml.jackson.datatype jackson-datatype-jsr310 - ${jackson2.vespa.version} + ${jackson2.version} com.google.guava guava - ${guava.vespa.version} + ${guava.version} com.google.errorprone error_prone_annotations - ${error-prone-annotations.vespa.version} + ${error-prone-annotations.version} com.google.inject guice - ${guice.vespa.version} + ${guice.version} com.google.inject guice - ${guice.vespa.version} + ${guice.version} no_aop @@ -97,18 +91,18 @@ javax.inject javax.inject - ${javax.inject.vespa.version} + ${javax.inject.version} javax.servlet javax.servlet-api - ${javax.servlet-api.vespa.version} + ${javax.servlet-api.version} javax.ws.rs javax.ws.rs-api - ${javax.ws.rs-api.vespa.version} + ${javax.ws.rs-api.version} @@ -117,19 +111,19 @@ javax.xml.bind jaxb-api - ${jaxb.vespa.version} + ${jaxb.version} com.sun.xml.bind jaxb-core - ${jaxb.vespa.version} + ${jaxb.version} com.sun.xml.bind jaxb-impl - ${jaxb.vespa.version} + ${jaxb.version} @@ -143,27 +137,27 @@ org.slf4j jcl-over-slf4j - ${slf4j.vespa.version} + ${slf4j.version} org.slf4j log4j-over-slf4j - ${slf4j.vespa.version} + ${slf4j.version} org.slf4j slf4j-api - ${slf4j.vespa.version} + ${slf4j.version} org.slf4j slf4j-jdk14 - ${slf4j.vespa.version} + ${slf4j.version} xml-apis xml-apis - ${xml-apis.vespa.version} + ${xml-apis.version} @@ -176,7 +170,7 @@ org.codehaus.mojo versions-maven-plugin - ${versions-maven-plugin.vespa.version} + ${versions-maven-plugin.version} verify @@ -202,7 +196,7 @@ org.apache.maven.plugins maven-gpg-plugin - ${maven.gpg.plugin.vespa.version} + ${maven.gpg.plugin.version} sign-artifacts @@ -222,7 +216,7 @@ org.sonatype.plugins nexus-staging-maven-plugin - ${nexus.staging.maven.plugin.vespa.version} + ${nexus.staging.maven.plugin.version} true ossrh @@ -244,4 +238,22 @@ + + 1.0 + 2.18.0 + 32.1.1-jre + 4.2.3 + 2.15.2 + 2.15.2 + 1 + 3.1.0 + 2.0.1 + 2.3.0 + 1.7.32 + 1.4.01 + + + 2.8.1 + + diff --git a/container-dev/pom.xml b/container-dev/pom.xml index 0120a6c82fe..ef6ce1529ee 100644 --- a/container-dev/pom.xml +++ b/container-dev/pom.xml @@ -292,7 +292,7 @@ true custom - $${artifact.groupId}:$${artifact.artifactId}:$${artifact.vespa.version} + $${artifact.groupId}:$${artifact.artifactId}:$${artifact.version} diff --git a/container-disc/pom.xml b/container-disc/pom.xml index 4ec141d2758..16ce99220f1 100644 --- a/container-disc/pom.xml +++ b/container-disc/pom.xml @@ -196,19 +196,19 @@ hosted-zone-api-jar-with-dependencies.jar, container-apache-http-client-bundle-jar-with-dependencies.jar, security-utils.jar, - bcprov-jdk18on-${bouncycastle.vespa.version}.jar, - bcpkix-jdk18on-${bouncycastle.vespa.version}.jar, - bcutil-jdk18on-${bouncycastle.vespa.version}.jar, + bcprov-jdk18on-${bouncycastle.version}.jar, + bcpkix-jdk18on-${bouncycastle.version}.jar, + bcutil-jdk18on-${bouncycastle.version}.jar, - jackson-annotations-${jackson2.vespa.version}.jar, - jackson-core-${jackson2.vespa.version}.jar, - jackson-databind-${jackson-databind.vespa.version}.jar, - jackson-datatype-jdk8-${jackson2.vespa.version}.jar, - jackson-datatype-jsr310-${jackson2.vespa.version}.jar, + jackson-annotations-${jackson2.version}.jar, + jackson-core-${jackson2.version}.jar, + jackson-databind-${jackson-databind.version}.jar, + jackson-datatype-jdk8-${jackson2.version}.jar, + jackson-datatype-jsr310-${jackson2.version}.jar, - javax.ws.rs-api-${javax.ws.rs-api.vespa.version}.jar + javax.ws.rs-api-${javax.ws.rs-api.version}.jar diff --git a/container-search/pom.xml b/container-search/pom.xml index cea05826ce0..5d3b88157aa 100644 --- a/container-search/pom.xml +++ b/container-search/pom.xml @@ -214,7 +214,7 @@ org.antlr antlr4-maven-plugin - ${antlr4.vespa.version} + ${antlr4.version} diff --git a/container-spifly/pom.xml b/container-spifly/pom.xml index 74b58f3c852..09a58a6fc34 100644 --- a/container-spifly/pom.xml +++ b/container-spifly/pom.xml @@ -72,11 +72,11 @@ container-spifly container-spifly - ${spifly.vespa.version} + ${spifly.version} - ${relocation-pkg-prefix}.spifly;version="${spifly.vespa.version}", - ${relocation-pkg-prefix}.spifly.dynamic;version="${spifly.vespa.version}", - ${relocation-pkg-prefix}.spifly.weaver;version="${spifly.vespa.version}" + ${relocation-pkg-prefix}.spifly;version="${spifly.version}", + ${relocation-pkg-prefix}.spifly.dynamic;version="${spifly.version}", + ${relocation-pkg-prefix}.spifly.weaver;version="${spifly.version}" org.osgi.framework;version="[1.7,2)", diff --git a/container/pom.xml b/container/pom.xml index b4d446ae356..f86f1fc3625 100644 --- a/container/pom.xml +++ b/container/pom.xml @@ -56,7 +56,7 @@ true custom - $${artifact.groupId}:$${artifact.artifactId}:$${artifact.vespa.version} + $${artifact.groupId}:$${artifact.artifactId}:$${artifact.version} diff --git a/dependency-versions/README.md b/dependency-versions/README.md deleted file mode 100644 index 77290899619..00000000000 --- a/dependency-versions/README.md +++ /dev/null @@ -1,6 +0,0 @@ - -# Version properites for all Vespa dependencies - -This pom should contain all version properties for 3rd party -dependencies used in Vespa. It should be used as parent pom for -all Vespa modules, including user "base poms". diff --git a/dependency-versions/pom.xml b/dependency-versions/pom.xml deleted file mode 100644 index 4146ea3853c..00000000000 --- a/dependency-versions/pom.xml +++ /dev/null @@ -1,123 +0,0 @@ - - - - 4.0.0 - com.yahoo.vespa - dependency-versions - pom - 8-SNAPSHOT - Version properties for (almost) all Vespa dependencies. - https://github.com/vespa-engine - - - - The Apache License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - - - - - Vespa - https://github.com/vespa-engine - - - - scm:git:git@github.com:vespa-engine/vespa.git - scm:git:git@github.com:vespa-engine/vespa.git - git@github.com:vespa-engine/vespa.git - - - - - - 1.0 - 2.18.0 - 32.1.1-jre - 4.2.3 - 2.15.2 - 2.15.2 - 1 - 3.1.0 - 2.0.1 - 2.3.0 - 1.7.32 - 1.4.01 - - - - 0.9 - 3.5.3 - 4.11.1 - 4.5.14 - 4.4.16 - 5.2.1 - 5.2.2 - 9.3 - - - 1.11.34 - 1.12.460 - - - - 1.74 - 5.4.0 - 1.15 - 2.11.0 - 3.6.1 - 11.0.0 - 7.0.5 - 1.0.1 - 3.0.2 - 2.1.12 - 2.25 - 11.0.15 - 5.0.2 - 0.11.5 - 5.11.0 - 5.8.1 - 1.8.1 - 3.6.0 - 2.10 - 4.0.0 - 4.1.94.Final - 2.0.61.Final - 1.13.1 - 20230227 - 1.8.0 - 0.6.0 - 3.21.7 - 1.3.6 - 3.0.0-M9 - 2.35.0 - 0.16 - 3.8.0 - - - - 3.3.0 - 5.1.9 - 3.10.1 - 3.8.7 - 3.6.0 - 2.8.2 - 3.3.0 - 3.0.0-M6 - 3.1.1 - 3.2.0 - 3.3.1 - ${maven-core.vespa.version} - 3.6.4 - 3.2.0 - 3.4.1 - 3.9.1 - 3.2.1 - 2.8.1 - - - diff --git a/fat-model-dependencies/pom.xml b/fat-model-dependencies/pom.xml index 901e2db4c99..b2ee5c64b38 100644 --- a/fat-model-dependencies/pom.xml +++ b/fat-model-dependencies/pom.xml @@ -268,7 +268,7 @@ com.google.protobuf protobuf-java - ${protobuf.vespa.version} + ${protobuf.version} diff --git a/hosted-tenant-base/pom.xml b/hosted-tenant-base/pom.xml index 7bf3a9a5152..f2d4c6ab012 100644 --- a/hosted-tenant-base/pom.xml +++ b/hosted-tenant-base/pom.xml @@ -13,13 +13,6 @@ https://github.com/vespa-engine pom - - dependency-versions - com.yahoo.vespa - 8-SNAPSHOT - ../dependency-versions/pom.xml - - The Apache License, Version 2.0 @@ -42,9 +35,12 @@ ${project.version} false 17 - + 3.10.1 + 2.22.2 + 3.6.0 + 2.15.2 - 5.8.1 + 5.8.1 !integration @@ -102,19 +98,19 @@ org.junit.jupiter junit-jupiter-engine - ${junit.vespa.tenant.version} + ${vespa.junit.version} org.junit.jupiter junit-jupiter-api - ${junit.vespa.tenant.version} + ${vespa.junit.version} org.junit.vintage junit-vintage-engine - ${junit.vespa.tenant.version} + ${vespa.junit.version} @@ -167,7 +163,7 @@ org.apache.maven.plugins maven-surefire-plugin - ${maven-surefire-plugin.vespa.version} + ${maven-surefire-plugin.version} ${test.categories} false @@ -190,7 +186,7 @@ org.apache.maven.plugins maven-surefire-report-plugin - ${maven-surefire-plugin.vespa.version} + ${maven-surefire-plugin.version} ${env.TEST_DIR} @@ -249,8 +245,8 @@ org.junit.jupiter:junit-jupiter-api:*:jar:compile org.junit.jupiter:junit-jupiter-api:*:jar:provided org.junit.jupiter:junit-jupiter-api:*:jar:runtime - org.junit.jupiter:junit-jupiter-api:(,${junit.vespa.tenant.version}):jar:* - org.junit.jupiter:junit-jupiter-api:(${junit.vespa.tenant.version},):jar:* + org.junit.jupiter:junit-jupiter-api:(,${vespa.junit.version}):jar:* + org.junit.jupiter:junit-jupiter-api:(${vespa.junit.version},):jar:* @@ -381,7 +377,7 @@ - ${vespa.compile.vespa.version} + ${vespa.compile.version} @@ -393,7 +389,7 @@ - ${vespa.runtime.vespa.version} + ${vespa.runtime.version} @@ -408,7 +404,7 @@ org.apache.maven.plugins maven-gpg-plugin - ${maven.gpg.plugin.vespa.version} + ${maven.gpg.plugin.version} sign-artifacts @@ -428,7 +424,7 @@ org.sonatype.plugins nexus-staging-maven-plugin - ${nexus.staging.maven.plugin.vespa.version} + ${nexus.staging.maven.plugin.version} true ossrh @@ -456,7 +452,7 @@ org.apache.maven.plugins maven-dependency-plugin - ${maven-dependency-plugin.vespa.version} + ${maven-dependency-plugin.version} @@ -464,7 +460,7 @@ org.apache.maven.plugins maven-compiler-plugin - ${maven-compiler-plugin.vespa.version} + ${maven-compiler-plugin.version} ${target_jdk_version} true diff --git a/orchestrator-restapi/pom.xml b/orchestrator-restapi/pom.xml index 56a58666ab5..3b86309f66a 100644 --- a/orchestrator-restapi/pom.xml +++ b/orchestrator-restapi/pom.xml @@ -25,7 +25,7 @@ com.fasterxml.jackson.core jackson-annotations - ${jackson2.vespa.version} + ${jackson2.version} provided diff --git a/orchestrator/pom.xml b/orchestrator/pom.xml index 3ec98af3565..bd9c7ed977a 100644 --- a/orchestrator/pom.xml +++ b/orchestrator/pom.xml @@ -107,7 +107,7 @@ com.fasterxml.jackson.core jackson-annotations - ${jackson2.vespa.version} + ${jackson2.version} provided diff --git a/parent/pom.xml b/parent/pom.xml index e51c9620c58..8f057bcf7ae 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -40,7 +40,7 @@ org.apache.maven.wagon wagon-ssh-external - ${maven-wagon.vespa.version} + ${maven-wagon.version} org.apache.maven.archetype @@ -53,7 +53,7 @@ org.antlr antlr3-maven-plugin - ${antlr.vespa.version} + ${antlr.version} org.apache.maven.plugins @@ -63,17 +63,17 @@ org.apache.felix maven-bundle-plugin - ${maven-bundle-plugin.vespa.version} + ${maven-bundle-plugin.version} org.apache.maven.plugins maven-assembly-plugin - ${maven-assembly-plugin.vespa.version} + ${maven-assembly-plugin.version} org.apache.maven.plugins maven-compiler-plugin - ${maven-compiler-plugin.vespa.version} + ${maven-compiler-plugin.version} 17 true @@ -90,12 +90,12 @@ org.apache.maven.plugins maven-dependency-plugin - ${maven-dependency-plugin.vespa.version} + ${maven-dependency-plugin.version} org.apache.maven.plugins maven-deploy-plugin - ${maven-deploy-plugin.vespa.version} + ${maven-deploy-plugin.version} 10 @@ -103,22 +103,22 @@ org.apache.maven.plugins maven-enforcer-plugin - ${maven-enforcer-plugin.vespa.version} + ${maven-enforcer-plugin.version} org.apache.maven.plugins maven-failsafe-plugin - ${maven-failsafe-plugin.vespa.version} + ${maven-failsafe-plugin.version} org.apache.maven.plugins maven-install-plugin - ${maven-install-plugin.vespa.version} + ${maven-install-plugin.version} org.apache.maven.plugins maven-jar-plugin - ${maven-jar-plugin.vespa.version} + ${maven-jar-plugin.version} org.apache.maven.plugins @@ -131,12 +131,12 @@ false - ${maven-javadoc-plugin.vespa.version} + ${maven-javadoc-plugin.version} org.apache.maven.plugins maven-plugin-plugin - ${maven-plugin-tools.vespa.version} + ${maven-plugin-tools.version} true @@ -153,7 +153,7 @@ org.apache.maven.plugins maven-resources-plugin - ${maven-resources-plugin.vespa.version} + ${maven-resources-plugin.version} \ @@ -161,7 +161,7 @@ org.apache.maven.plugins maven-shade-plugin - ${maven-shade-plugin.vespa.version} + ${maven-shade-plugin.version} @@ -190,12 +190,12 @@ org.apache.maven.plugins maven-site-plugin - ${maven-site-plugin.vespa.version} + ${maven-site-plugin.version} org.apache.maven.plugins maven-source-plugin - ${maven-source-plugin.vespa.version} + ${maven-source-plugin.version} true @@ -203,7 +203,7 @@ org.apache.maven.plugins maven-surefire-plugin - ${surefire.vespa.version} + ${surefire.version} ${test.hide} @@ -218,7 +218,7 @@ org.apache.maven.plugins maven-surefire-report-plugin - ${surefire.vespa.version} + ${surefire.version} false false @@ -273,7 +273,7 @@ run - ${protobuf.vespa.version} + ${protobuf.version} main ${project.build.directory}/generated-sources/protobuf @@ -448,17 +448,17 @@ com.amazonaws aws-java-sdk-core - ${aws-sdk.vespa.version} + ${aws-sdk.version} com.amazonaws aws-java-sdk-ssm - ${aws-sdk.vespa.version} + ${aws-sdk.version} com.amazonaws aws-java-sdk-sts - ${aws-sdk.vespa.version} + ${aws-sdk.version} com.auth0 @@ -468,7 +468,7 @@ com.fasterxml.jackson.dataformat jackson-dataformat-cbor - ${jackson2.vespa.version} + ${jackson2.version} com.github.cverges.expect4j @@ -478,7 +478,7 @@ org.apache.zookeeper zookeeper - ${zookeeper.client.vespa.version} + ${zookeeper.client.version} org.slf4j @@ -506,17 +506,17 @@ com.github.tomakehurst wiremock-jre8-standalone - ${wiremock.vespa.version} + ${wiremock.version} com.google.code.findbugs jsr305 - ${findbugs.vespa.version} + ${findbugs.version} com.google.guava guava - ${guava.vespa.version} + ${guava.version} @@ -543,7 +543,7 @@ com.google.guava guava-testlib - ${guava.vespa.version} + ${guava.version} com.google.jimfs @@ -554,7 +554,7 @@ com.google.protobuf protobuf-java - ${protobuf.vespa.version} + ${protobuf.version} com.ibm.icu @@ -569,12 +569,12 @@ com.microsoft.onnxruntime onnxruntime - ${onnxruntime.vespa.version} + ${onnxruntime.version} com.yahoo.athenz athenz-cert-refresher - ${athenz.vespa.version} + ${athenz.version} org.bouncycastle @@ -585,7 +585,7 @@ com.yahoo.athenz athenz-zms-java-client - ${athenz.vespa.version} + ${athenz.version} org.bouncycastle @@ -596,12 +596,12 @@ com.yahoo.athenz athenz-zpe-java-client - ${athenz.vespa.version} + ${athenz.version} com.yahoo.athenz athenz-zts-java-client - ${athenz.vespa.version} + ${athenz.version} org.bouncycastle @@ -612,7 +612,7 @@ commons-io commons-io - ${commons-io.vespa.version} + ${commons-io.version} org.apache.commons @@ -622,17 +622,17 @@ io.jsonwebtoken jjwt-api - ${jjwt.vespa.version} + ${jjwt.version} io.jsonwebtoken jjwt-impl - ${jjwt.vespa.version} + ${jjwt.version} io.jsonwebtoken jjwt-jackson - ${jjwt.vespa.version} + ${jjwt.version} joda-time @@ -642,12 +642,12 @@ net.openhft zero-allocation-hashing - ${zero-allocation-hashing.vespa.version} + ${zero-allocation-hashing.version} org.apache.commons commons-math3 - ${commons.math3.vespa.version} + ${commons.math3.version} commons-cli @@ -657,37 +657,37 @@ commons-codec commons-codec - ${commons-codec.vespa.version} + ${commons-codec.version} io.airlift airline - ${airline.vespa.version} + ${airline.version} io.netty netty-handler - ${netty.vespa.version} + ${netty.version} io.netty netty-transport-native-epoll - ${netty.vespa.version} + ${netty.version} io.netty netty-tcnative - ${netty-tcnative.vespa.version} + ${netty-tcnative.version} io.prometheus simpleclient - ${prometheus.client.vespa.version} + ${prometheus.client.version} io.prometheus simpleclient_common - ${prometheus.client.vespa.version} + ${prometheus.client.version} junit @@ -697,7 +697,7 @@ net.java.dev.jna jna - ${jna.vespa.version} + ${jna.version} net.spy @@ -707,17 +707,17 @@ org.antlr antlr-runtime - ${antlr.vespa.version} + ${antlr.version} org.antlr antlr4-runtime - ${antlr4.vespa.version} + ${antlr4.version} org.apache.aries.spifly org.apache.aries.spifly.dynamic.bundle - ${spifly.vespa.version} + ${spifly.version} org.apache.commons @@ -732,17 +732,17 @@ org.apache.curator curator-recipes - ${curator.vespa.version} + ${curator.version} org.apache.curator curator-test - ${curator.vespa.version} + ${curator.version} org.apache.httpcomponents httpclient - ${apache.httpclient.vespa.version} + ${apache.httpclient.version} org.apache.commons @@ -752,7 +752,7 @@ org.apache.felix org.apache.felix.framework - ${felix.vespa.version} + ${felix.version} org.codehaus.mojo @@ -763,67 +763,67 @@ org.apache.felix org.apache.felix.log - ${felix.log.vespa.version} + ${felix.log.version} org.apache.httpcomponents httpcore - ${apache.httpcore.vespa.version} + ${apache.httpcore.version} org.apache.httpcomponents.client5 httpclient5 - ${apache.httpclient5.vespa.version} + ${apache.httpclient5.version} org.apache.httpcomponents.core5 httpcore5 - ${apache.httpcore5.vespa.version} + ${apache.httpcore5.version} org.apache.httpcomponents.core5 httpcore5-h2 - ${apache.httpcore5.vespa.version} + ${apache.httpcore5.version} org.apache.httpcomponents httpmime - ${apache.httpclient.vespa.version} + ${apache.httpclient.version} org.apache.maven maven-archiver - ${maven-archiver.vespa.version} + ${maven-archiver.version} org.apache.maven maven-artifact - ${maven-core.vespa.version} + ${maven-core.version} org.apache.maven maven-core - ${maven-core.vespa.version} + ${maven-core.version} org.apache.maven maven-model - ${maven-core.vespa.version} + ${maven-core.version} org.apache.maven maven-repository-metadata - ${maven-core.vespa.version} + ${maven-core.version} org.apache.maven maven-settings - ${maven-core.vespa.version} + ${maven-core.version} org.apache.maven maven-plugin-api - ${maven-plugin-api.vespa.version} + ${maven-plugin-api.version} org.apache.maven @@ -833,17 +833,17 @@ org.apache.maven.enforcer enforcer-api - ${maven-enforcer-plugin.vespa.version} + ${maven-enforcer-plugin.version} org.apache.maven.plugin-tools maven-plugin-annotations - ${maven-plugin-tools.vespa.version} + ${maven-plugin-tools.version} org.apache.maven.plugins maven-jar-plugin - ${maven-jar-plugin.vespa.version} + ${maven-jar-plugin.version} org.apache.maven.shared @@ -853,23 +853,23 @@ org.apache.maven.surefire surefire-junit4 - ${surefire.vespa.version} + ${surefire.version} org.apache.maven.surefire surefire-providers - ${surefire.vespa.version} + ${surefire.version} pom org.apache.maven.wagon wagon-ssh-external - ${maven-wagon.vespa.version} + ${maven-wagon.version} org.apache.maven.wagon wagon-provider-api - ${maven-wagon.vespa.version} + ${maven-wagon.version} org.apache.opennlp @@ -894,17 +894,17 @@ org.bouncycastle bcpkix-jdk18on - ${bouncycastle.vespa.version} + ${bouncycastle.version} org.bouncycastle bcprov-jdk18on - ${bouncycastle.vespa.version} + ${bouncycastle.version} org.bouncycastle bcutil-jdk18on - ${bouncycastle.vespa.version} + ${bouncycastle.version} org.cthul @@ -915,77 +915,77 @@ org.eclipse.collections eclipse-collections - ${eclipse-collections.vespa.version} + ${eclipse-collections.version} org.eclipse.collections eclipse-collections-api - ${eclipse-collections.vespa.version} + ${eclipse-collections.version} org.eclipse.jetty.http2 http2-common - ${jetty.vespa.version} + ${jetty.version} org.eclipse.jetty.http2 http2-http-client-transport - ${jetty.vespa.version} + ${jetty.version} org.eclipse.jetty.http2 http2-server - ${jetty.vespa.version} + ${jetty.version} org.eclipse.jetty jetty-alpn-java-server - ${jetty.vespa.version} + ${jetty.version} org.eclipse.jetty jetty-alpn-server - ${jetty.vespa.version} + ${jetty.version} org.eclipse.jetty jetty-client - ${jetty.vespa.version} + ${jetty.version} org.eclipse.jetty jetty-http - ${jetty.vespa.version} + ${jetty.version} org.eclipse.jetty jetty-io - ${jetty.vespa.version} + ${jetty.version} org.eclipse.jetty jetty-jmx - ${jetty.vespa.version} + ${jetty.version} org.eclipse.jetty jetty-server - ${jetty.vespa.version} + ${jetty.version} org.eclipse.jetty jetty-servlet - ${jetty.vespa.version} + ${jetty.version} org.eclipse.jetty jetty-util - ${jetty.vespa.version} + ${jetty.version} org.eclipse.jetty.toolchain jetty-jakarta-servlet-api - ${jetty-servlet-api.vespa.version} + ${jetty-servlet-api.version} org.glassfish.jaxb @@ -1013,32 +1013,32 @@ org.hdrhistogram HdrHistogram - ${hdrhistogram.vespa.version} + ${hdrhistogram.version} org.junit.jupiter junit-jupiter - ${junit.vespa.version} + ${junit.version} org.junit.jupiter junit-jupiter-api - ${junit.vespa.version} + ${junit.version} org.junit.jupiter junit-jupiter-engine - ${junit.vespa.version} + ${junit.version} org.junit.jupiter junit-jupiter-params - ${junit.vespa.version} + ${junit.version} org.junit.vintage junit-vintage-engine - ${junit.vespa.version} + ${junit.version} org.jvnet.mimepull @@ -1048,12 +1048,12 @@ org.lz4 lz4-java - ${org.lz4.vespa.version} + ${org.lz4.version} org.mockito mockito-core - ${mockito.vespa.version} + ${mockito.version} test @@ -1068,27 +1068,27 @@ org.ow2.asm asm - ${asm.vespa.version} + ${asm.version} org.ow2.asm asm-analysis - ${asm.vespa.version} + ${asm.version} org.ow2.asm asm-commons - ${asm.vespa.version} + ${asm.version} org.ow2.asm asm-tree - ${asm.vespa.version} + ${asm.version} org.ow2.asm asm-util - ${asm.vespa.version} + ${asm.version} org.twdata.maven @@ -1119,7 +1119,7 @@ org.json json - ${org.json.vespa.version} + ${org.json.version} com.google.errorprone @@ -1136,6 +1136,74 @@ + 0.9 + 3.5.3 + 4.11.1 + 4.5.14 + 4.4.16 + 5.2.1 + 5.2.2 + 9.3 + + + 1.11.34 + 1.12.460 + + + + 1.74 + 5.4.0 + 1.15 + 2.11.0 + 3.6.1 + 11.0.0 + 7.0.5 + 1.0.1 + 3.0.2 + 2.1.12 + 11.0.15 + 5.0.2 + 0.11.5 + 5.11.0 + 5.8.1 + 3.6.0 + 3.3.0 + 5.1.9 + 3.10.1 + 3.8.7 + 3.6.0 + 2.8.2 + 3.3.0 + 3.0.0-M6 + 3.1.1 + 3.2.0 + 3.3.1 + ${maven-core.version} + 3.6.4 + 3.2.0 + 3.4.1 + 3.9.1 + 3.2.1 + 2.10 + 4.0.0 + 4.1.94.Final + 2.0.61.Final + 1.13.1 + 20230227 + 1.8.0 + 0.6.0 + 3.21.7 + 1.3.6 + 3.0.0-M9 + 2.35.0 + 0.16 + 3.8.0 + all true diff --git a/pom.xml b/pom.xml index ba25de063f1..7e54b97383e 100644 --- a/pom.xml +++ b/pom.xml @@ -66,7 +66,6 @@ controller-api controller-server defaults - dependency-versions docproc docprocs document diff --git a/screwdriver/release-java-artifacts.sh b/screwdriver/release-java-artifacts.sh index b01cadc9d9c..8cf61dfc839 100755 --- a/screwdriver/release-java-artifacts.sh +++ b/screwdriver/release-java-artifacts.sh @@ -61,14 +61,12 @@ export FACTORY_VESPA_VERSION=$VESPA_RELEASE COMMON_MAVEN_OPTS="$VESPA_MAVEN_EXTRA_OPTS --no-snapshot-updates --settings $(pwd)/screwdriver/settings-publish.xml --activate-profiles ossrh-deploy-vespa -DskipTests" TMPFILE=$(mktemp) -mvn $COMMON_MAVEN_OPTS -pl :dependency-versions -DskipStagingRepositoryClose=true deploy 2>&1 | tee $TMPFILE +mvn $COMMON_MAVEN_OPTS -pl :container-dependency-versions -DskipStagingRepositoryClose=true deploy 2>&1 | tee $TMPFILE # Find the stage repo name STG_REPO=$(cat $TMPFILE | grep 'Staging repository at http' | head -1 | awk -F/ '{print $NF}') rm -f $TMPFILE -mvn $COMMON_MAVEN_OPTS -pl :container-dependency-versions -DskipStagingRepositoryClose=true -DstagingRepositoryId=$STG_REPO deploy - # Deploy plugins mvn $COMMON_MAVEN_OPTS --file ./maven-plugins/pom.xml -DskipStagingRepositoryClose=true -DstagingRepositoryId=$STG_REPO deploy @@ -83,3 +81,4 @@ mvn $COMMON_MAVEN_OPTS -N org.sonatype.plugins:nexus-staging-maven-plugin:1.6.12 # Delete the GPG rings rm -rf $SD_SOURCE_DIR/screwdriver/deploy + diff --git a/service-monitor/pom.xml b/service-monitor/pom.xml index f119dcdae5f..039e9dbf5fa 100644 --- a/service-monitor/pom.xml +++ b/service-monitor/pom.xml @@ -93,7 +93,7 @@ com.fasterxml.jackson.core jackson-annotations - ${jackson2.vespa.version} + ${jackson2.version} provided diff --git a/vespa-athenz/pom.xml b/vespa-athenz/pom.xml index 7c3c982af84..a6f83fb102f 100644 --- a/vespa-athenz/pom.xml +++ b/vespa-athenz/pom.xml @@ -141,7 +141,7 @@ com.yahoo.athenz athenz-auth-core - ${athenz.vespa.version} + ${athenz.version} compile diff --git a/zookeeper-command-line-client/pom.xml b/zookeeper-command-line-client/pom.xml index 00545192491..7bbbf33a62f 100644 --- a/zookeeper-command-line-client/pom.xml +++ b/zookeeper-command-line-client/pom.xml @@ -41,7 +41,7 @@ org.slf4j slf4j-simple - ${slf4j.vespa.version} + ${slf4j.version} -- cgit v1.2.3