diff options
| author | gjoranv <gv@verizonmedia.com> | 2021-10-27 00:31:03 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-27 00:31:03 +0200 |
| commit | aa74c4bd38752431d1bcf7515afe7e0acea65709 (patch) | |
| tree | 45f9edb9bd76be0a524ff224e7632d3ac3ed1a0b | |
| parent | 71ee71009627591dd4f5d19db030df5d109c9043 (diff) | |
| parent | a5dcc1e8a200e608bcb86372ca88a30460f04fe5 (diff) | |
Merge pull request #19736 from vespa-engine/upgrade-misc-container-deps_take2
Upgrade misc container deps take2 [run-systemtest]
| -rw-r--r-- | cloud-tenant-base-dependencies-enforcer/pom.xml | 6 | ||||
| -rw-r--r-- | container-dependency-versions/pom.xml | 6 | ||||
| -rw-r--r-- | parent/pom.xml | 1 |
3 files changed, 6 insertions, 7 deletions
diff --git a/cloud-tenant-base-dependencies-enforcer/pom.xml b/cloud-tenant-base-dependencies-enforcer/pom.xml index 636dbf91a57..9f4a14387f4 100644 --- a/cloud-tenant-base-dependencies-enforcer/pom.xml +++ b/cloud-tenant-base-dependencies-enforcer/pom.xml @@ -35,9 +35,9 @@ <junit5.version>5.7.0</junit5.version> <junit5.platform.version>1.7.0</junit5.platform.version> <onnxruntime.version>1.8.0</onnxruntime.version> - <org.lz4.version>1.7.1</org.lz4.version> - <org.json.version>20090211</org.json.version><!-- TODO Vespa 8: remove as provided dependency --> - <slf4j.version>1.7.30</slf4j.version> + <org.lz4.version>1.8.0</org.lz4.version> + <org.json.version>20090211</org.json.version> + <slf4j.version>1.7.32</slf4j.version> <xml-apis.version>1.4.01</xml-apis.version> <hk2.version>2.5.0-b32</hk2.version> diff --git a/container-dependency-versions/pom.xml b/container-dependency-versions/pom.xml index 27f7374b802..005ccc8da88 100644 --- a/container-dependency-versions/pom.xml +++ b/container-dependency-versions/pom.xml @@ -413,9 +413,9 @@ <jaxb.version>2.3.0</jaxb.version> <jetty.version>9.4.44.v20210927</jetty.version> <jetty-alpn.version>1.1.3.v20160715</jetty-alpn.version> - <org.lz4.version>1.7.1</org.lz4.version> + <org.lz4.version>1.8.0</org.lz4.version> <org.json.version>20090211</org.json.version> - <slf4j.version>1.7.30</slf4j.version> + <slf4j.version>1.7.32</slf4j.version> <xml-apis.version>1.4.01</xml-apis.version> <!-- These must be kept in sync with version used by current jersey2.version. --> @@ -434,7 +434,7 @@ <mimepull.version>1.9.6</mimepull.version> <!-- Not a dependency. Only included to allow the versions-maven-plugin to check for updates of itself --> - <versions-maven-plugin.version>2.7</versions-maven-plugin.version> + <versions-maven-plugin.version>2.8.1</versions-maven-plugin.version> </properties> </project> diff --git a/parent/pom.xml b/parent/pom.xml index fb68da949bd..488683d688b 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -889,7 +889,6 @@ <commons.math3.version>3.6.1</commons.math3.version> <junit.version>5.7.0</junit.version> <maven-assembly-plugin.version>3.1.1</maven-assembly-plugin.version> - <!-- TODO: in order to upgrade above 4.1.0, we probably need to convert fat-model-deps to a jar artifact. --> <maven-bundle-plugin.version>5.1.2</maven-bundle-plugin.version> <maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version> <maven-dependency-plugin.version>3.1.1</maven-dependency-plugin.version> |