From a13d46a656319e25e4f5e5c191cd8afbbabb3923 Mon Sep 17 00:00:00 2001 From: Benjamin Habegger Date: Thu, 5 Feb 2026 17:42:32 +0100 Subject: [PATCH] Rationalize dependency management to avoid multiple versions of the same artifacts --- oak-benchmarks/pom.xml | 1 - oak-blob-cloud-azure/pom.xml | 1 - oak-commons/pom.xml | 1 - oak-lucene/pom.xml | 14 - oak-parent/pom.xml | 673 ++++++++++++++++++++++++++++++++++- oak-pojosr/pom.xml | 9 - oak-run/pom.xml | 15 +- oak-segment-azure/pom.xml | 26 +- oak-store-document/pom.xml | 7 - 9 files changed, 666 insertions(+), 81 deletions(-) diff --git a/oak-benchmarks/pom.xml b/oak-benchmarks/pom.xml index 41d79b2bca9..ac3b255e710 100644 --- a/oak-benchmarks/pom.xml +++ b/oak-benchmarks/pom.xml @@ -203,7 +203,6 @@ org.apache.commons commons-compress - 1.28.0 org.mongodb diff --git a/oak-blob-cloud-azure/pom.xml b/oak-blob-cloud-azure/pom.xml index 9099901fbbd..4ef258f26ca 100644 --- a/oak-blob-cloud-azure/pom.xml +++ b/oak-blob-cloud-azure/pom.xml @@ -292,7 +292,6 @@ com.google.guava guava - 33.1.0-jre com.google.code.findbugs diff --git a/oak-commons/pom.xml b/oak-commons/pom.xml index ecc5409c4d5..a65f1578a2f 100644 --- a/oak-commons/pom.xml +++ b/oak-commons/pom.xml @@ -116,7 +116,6 @@ org.apache.jackrabbit jackrabbit-jcr-commons - ${jackrabbit.version} org.apache.jackrabbit diff --git a/oak-lucene/pom.xml b/oak-lucene/pom.xml index 7dd516cbc8e..26cf8c48b03 100644 --- a/oak-lucene/pom.xml +++ b/oak-lucene/pom.xml @@ -211,7 +211,6 @@ org.apache.tika tika-core - ${tika.version} org.apache.jackrabbit @@ -223,42 +222,34 @@ org.apache.lucene lucene-analyzers-common - ${lucene.version} org.apache.lucene lucene-queryparser - ${lucene.version} org.apache.lucene lucene-queries - ${lucene.version} org.apache.lucene lucene-suggest - ${lucene.version} org.apache.lucene lucene-highlighter - ${lucene.version} org.apache.lucene lucene-memory - ${lucene.version} org.apache.lucene lucene-misc - ${lucene.version} org.apache.lucene lucene-facet - ${lucene.version} @@ -359,7 +350,6 @@ org.apache.jackrabbit jackrabbit-jcr-tests - ${jackrabbit.version} test @@ -372,7 +362,6 @@ org.apache.jackrabbit jackrabbit-core - ${jackrabbit.version} tests test @@ -385,7 +374,6 @@ org.apache.tika tika-parsers - ${tika.version} test @@ -438,7 +426,6 @@ com.google.code.gson gson - 2.11.0 test @@ -449,7 +436,6 @@ com.h2database h2 - ${h2.version} test diff --git a/oak-parent/pom.xml b/oak-parent/pom.xml index 716bd6e4f9a..cd6d2ae9043 100644 --- a/oak-parent/pom.xml +++ b/oak-parent/pom.xml @@ -71,6 +71,74 @@ 3.0.25 4.1.131.Final 2.34.1 + + 3.20.0 + 2.21.0 + 1.19.0 + 1.3.5 + + 5.13.0 + 1.17.7 + 9.8 + + 1.5.7-6 + 2.14.6 + 6.7.0 + + 1.10.15 + 6.3.1 + + 2.41.0 + 3.1 + 3.42.0 + + 1.10 + 4.0.2 + 1.9.24 + + 2.0 + 1.1.2 + 7.0.0 + 1.4.0 + 1.4.0 + 1.6.1 + 1.4.1 + 1.5.0 + 1.0.9 + + 12.25.3 + 12.24.3 + 12.10.3 + 1.0.0 + + 4.2.2 + 3.0.2 + 3.6.10 + 1.2.0 + 5.14.0 + 3.9.2 + 4.2.1 + + 1.4 + 1.4.0 + + 1.3 + 4.13.1 + 1.4 + 5.20.0 + + 2.3.2 + 1.1.1 + 3.2.6 + 1.0.4 + 1.9.26 + 0.2.0 + 3.7.4 + 4.1.14 + 2.2.10 + 4.9.6 + 1.2.4 + 11 ${javaTargetVersion} @@ -604,7 +672,7 @@ org.apache.commons commons-lang3 - 3.19.0 + ${commons.lang3.version} org.apache.commons @@ -619,12 +687,22 @@ commons-io commons-io - 2.20.0 + ${commons.io.version} commons-codec commons-codec - 1.19.0 + ${commons.codec.version} + + + commons-logging + commons-logging + ${commons.logging.version} + + + org.apache.commons + commons-compress + 1.28.0 org.apache.commons @@ -706,13 +784,7 @@ httpmime 4.5.14 - - - org.testcontainers - testcontainers - ${testcontainers.version} - test - + com.microsoft.azure azure-storage @@ -876,6 +948,587 @@ 1.19.0 test + + + + com.google.guava + guava + 33.5.0-jre + + + com.google.guava + failureaccess + 1.0.3 + + + com.google.errorprone + error_prone_annotations + ${error.prone.version} + + + com.google.j2objc + j2objc-annotations + ${j2objc.version} + + + org.checkerframework + checker-qual + ${checker.qual.version} + + + + + com.google.code.gson + gson + 2.11.0 + + + + + io.netty + netty-buffer + ${netty.version} + + + io.netty + netty-codec + ${netty.version} + + + io.netty + netty-codec-http + ${netty.version} + + + io.netty + netty-codec-http2 + ${netty.version} + + + io.netty + netty-codec-dns + ${netty.version} + + + io.netty + netty-codec-socks + ${netty.version} + + + io.netty + netty-common + ${netty.version} + + + io.netty + netty-handler + ${netty.version} + + + io.netty + netty-handler-proxy + ${netty.version} + + + io.netty + netty-resolver + ${netty.version} + + + io.netty + netty-resolver-dns + ${netty.version} + + + io.netty + netty-transport + ${netty.version} + + + io.netty + netty-transport-native-unix-common + ${netty.version} + + + io.netty + netty-transport-classes-epoll + ${netty.version} + + + + + net.java.dev.jna + jna + ${jna.version} + + + net.java.dev.jna + jna-platform + ${jna.version} + + + + + net.bytebuddy + byte-buddy + ${byte.buddy.version} + + + net.bytebuddy + byte-buddy-agent + ${byte.buddy.version} + + + + + org.ow2.asm + asm + ${asm.version} + + + org.ow2.asm + asm-commons + ${asm.version} + + + org.ow2.asm + asm-tree + ${asm.version} + + + + + com.github.luben + zstd-jni + ${zstd.jni.version} + + + org.tukaani + xz + ${xz.version} + + + + + org.apache.ant + ant + ${ant.version} + + + org.apache.ant + ant-launcher + ${ant.version} + + + + + biz.aQute.bnd + biz.aQute.bndlib + ${bnd.version} + + + biz.aQute.bnd + biz.aQute.bnd.util + ${bnd.version} + + + + + com.fasterxml.woodstox + woodstox-core + ${woodstox.version} + + + + + + jline + jline + ${jline.version} + + + + + org.mongodb + mongodb-driver-core + ${mongo.driver.version} + + + org.mongodb + bson + ${mongo.driver.version} + + + org.mongodb + bson-record-codec + ${mongo.driver.version} + + + + + com.jayway.jsonpath + json-path + 2.9.0 + + + + + joda-time + joda-time + 2.12.7 + + + + + com.mchange + c3p0 + 0.9.5.5 + + + com.mchange + mchange-commons-java + 0.2.19 + + + + + org.codehaus.plexus + plexus-utils + ${plexus.utils.version} + + + org.codehaus.plexus + plexus-io + 3.6.0 + + + org.codehaus.plexus + plexus-archiver + 4.10.4 + + + org.codehaus.plexus + plexus-interpolation + 1.29 + + + org.codehaus.plexus + plexus-classworlds + 2.6.0 + + + + + org.apache.maven.resolver + maven-resolver-api + ${maven.resolver.version} + + + org.apache.maven.resolver + maven-resolver-util + ${maven.resolver.version} + + + + + com.azure + azure-storage-blob + ${azure.storage.blob.version} + + + com.azure + azure-storage-common + ${azure.storage.common.version} + + + com.azure + azure-storage-internal-avro + ${azure.storage.internal.avro.version} + + + com.azure + azure-xml + ${azure.xml.version} + + + + + org.codehaus.woodstox + stax2-api + ${stax2.api.version} + + + + + com.google.code.findbugs + jsr305 + ${jsr305.version} + + + + + io.projectreactor + reactor-test + ${reactor.test.version} + + + javax.activation + javax.activation-api + ${javax.activation.api.version} + + + org.osgi + org.osgi.util.converter + ${osgi.converter.version} + + + org.mock-server + mockserver-junit-rule-no-dependencies + ${mockserver.version} + + + org.wiremock + wiremock + ${wiremock.version} + + + org.awaitility + awaitility + ${awaitility.version} + + + + + javax.jcr + jcr + ${jcr.version} + + + + + org.hamcrest + hamcrest-all + ${hamcrest.version} + + + org.hamcrest + hamcrest-core + ${hamcrest.version} + + + org.hamcrest + hamcrest-library + ${hamcrest.version} + + + junit-addons + junit-addons + ${junit.addons.version} + + + + + org.quartz-scheduler + quartz + ${quartz.version} + + + + + com.googlecode.json-simple + json-simple + ${json.simple.version} + + + + + de.flapdoodle.embed + de.flapdoodle.embed.mongo + ${flapdoodle.embed.mongo.version} + + + + + org.apache.felix + org.apache.felix.inventory + ${felix.inventory.version} + + + org.apache.felix + org.apache.felix.configadmin + ${felix.configadmin.version} + + + org.apache.felix + org.apache.felix.connect + ${felix.connect.version} + + + org.apache.felix + org.apache.felix.fileinstall + ${felix.fileinstall.version} + + + org.apache.felix + org.apache.felix.http.bridge + ${felix.http.bridge.version} + + + org.apache.felix + org.apache.felix.scr + ${felix.scr.version} + + + org.apache.felix + org.apache.felix.webconsole + ${felix.webconsole.version} + + + org.apache.felix + org.apache.felix.metatype + ${felix.metatype.version} + + + + + org.apache.jackrabbit + jackrabbit-aws-ext + ${jackrabbit.version} + + + org.apache.jackrabbit + jackrabbit-core + ${jackrabbit.version} + + + org.apache.jackrabbit + jackrabbit-core + ${jackrabbit.version} + tests + + + org.apache.jackrabbit + jackrabbit-data + ${jackrabbit.version} + + + org.apache.jackrabbit + jackrabbit-jcr-commons + ${jackrabbit.version} + + + org.apache.jackrabbit + jackrabbit-jcr-server + ${jackrabbit.version} + + + org.apache.jackrabbit + jackrabbit-jcr-servlet + ${jackrabbit.version} + + + org.apache.jackrabbit + jackrabbit-jcr-tests + ${jackrabbit.version} + + + org.apache.jackrabbit + jackrabbit-spi + ${jackrabbit.version} + + + + + org.apache.lucene + lucene-analyzers-common + ${lucene.version} + + + org.apache.lucene + lucene-core + ${lucene.version} + + + org.apache.lucene + lucene-facet + ${lucene.version} + + + org.apache.lucene + lucene-highlighter + ${lucene.version} + + + org.apache.lucene + lucene-memory + ${lucene.version} + + + org.apache.lucene + lucene-misc + ${lucene.version} + + + org.apache.lucene + lucene-queries + ${lucene.version} + + + org.apache.lucene + lucene-queryparser + ${lucene.version} + + + org.apache.lucene + lucene-suggest + ${lucene.version} + + + + + org.apache.tika + tika-core + ${tika.version} + + + org.apache.tika + tika-parsers + ${tika.version} + + + + + com.h2database + h2 + ${h2.version} + + + com.h2database + h2-mvstore + ${h2.version} + + + + + org.testcontainers + elasticsearch + ${testcontainers.version} + + + org.testcontainers + mongodb + ${testcontainers.version} + + + org.testcontainers + testcontainers + ${testcontainers.version} + + + org.testcontainers + toxiproxy + ${testcontainers.version} + diff --git a/oak-pojosr/pom.xml b/oak-pojosr/pom.xml index 651ee2ae2b4..c1d902999cc 100644 --- a/oak-pojosr/pom.xml +++ b/oak-pojosr/pom.xml @@ -104,7 +104,6 @@ org.apache.jackrabbit jackrabbit-data - ${jackrabbit.version} commons-io @@ -187,13 +186,11 @@ org.apache.tika tika-core - ${tika.version} test org.apache.tika tika-parsers - ${tika.version} test @@ -215,31 +212,26 @@ org.apache.lucene lucene-core - ${lucene.version} test org.apache.lucene lucene-analyzers-common - ${lucene.version} true org.apache.lucene lucene-queryparser - ${lucene.version} test org.apache.lucene lucene-queries - ${lucene.version} test org.apache.lucene lucene-suggest - ${lucene.version} test @@ -285,7 +277,6 @@ com.h2database h2 - ${h2.version} test diff --git a/oak-run/pom.xml b/oak-run/pom.xml index 6402fa6629a..161137c2bd3 100644 --- a/oak-run/pom.xml +++ b/oak-run/pom.xml @@ -34,6 +34,7 @@ 9.4.53.v20231009 - 91226112 + 91500000 @@ -247,7 +248,6 @@ org.apache.jackrabbit jackrabbit-aws-ext - ${jackrabbit.version} true @@ -264,7 +264,6 @@ org.apache.jackrabbit jackrabbit-jcr-server - ${jackrabbit.version} @@ -349,7 +348,6 @@ com.h2database h2 - ${h2.version} com.googlecode.json-simple @@ -365,12 +363,10 @@ org.apache.tika tika-parsers - ${tika.version} org.apache.tika tika-core - ${tika.version} org.apache.felix @@ -394,7 +390,6 @@ com.google.code.gson gson - 2.10.1 org.apache.httpcomponents @@ -529,32 +524,26 @@ org.apache.lucene lucene-core - ${lucene.version} org.apache.lucene lucene-analyzers-common - ${lucene.version} org.apache.lucene lucene-queryparser - ${lucene.version} org.apache.lucene lucene-queries - ${lucene.version} org.apache.lucene lucene-suggest - ${lucene.version} org.apache.lucene lucene-facet - ${lucene.version} org.apache.jackrabbit diff --git a/oak-segment-azure/pom.xml b/oak-segment-azure/pom.xml index f170b940c13..48e5cbf7b83 100644 --- a/oak-segment-azure/pom.xml +++ b/oak-segment-azure/pom.xml @@ -181,29 +181,24 @@ org.codehaus.woodstox stax2-api - 4.2.2 com.azure azure-storage-blob - 12.25.3 com.azure azure-storage-common - 12.24.3 com.azure azure-storage-internal-avro - 12.10.3 com.azure azure-xml - 1.0.0 @@ -244,57 +239,46 @@ io.netty netty-transport - ${netty.version} io.netty netty-resolver - ${netty.version} io.netty netty-common - ${netty.version} io.netty netty-resolver-dns - ${netty.version} io.netty netty-codec-http - ${netty.version} io.netty netty-codec - ${netty.version} io.netty netty-codec-http2 - ${netty.version} io.netty netty-buffer - ${netty.version} io.netty netty-handler - ${netty.version} io.netty netty-handler-proxy - ${netty.version} io.netty netty-transport-native-unix-common - ${netty.version} io.projectreactor.netty @@ -326,16 +310,14 @@ - + com.google.guava guava - 33.1.0-jre com.google.code.findbugs jsr305 - 3.0.2 @@ -390,7 +372,6 @@ io.projectreactor reactor-test - 3.6.10 test @@ -401,7 +382,6 @@ javax.activation javax.activation-api - 1.2.0 test @@ -422,13 +402,11 @@ org.osgi org.osgi.util.converter - 1.0.9 test org.mock-server mockserver-junit-rule-no-dependencies - 5.14.0 test @@ -454,13 +432,11 @@ org.wiremock wiremock - 3.9.2 test org.awaitility awaitility - 4.2.1 test diff --git a/oak-store-document/pom.xml b/oak-store-document/pom.xml index e9af358ba30..a745610d467 100644 --- a/oak-store-document/pom.xml +++ b/oak-store-document/pom.xml @@ -159,7 +159,6 @@ org.quartz-scheduler quartz - 2.3.2 provided @@ -174,7 +173,6 @@ org.apache.felix org.apache.felix.inventory - 1.0.4 true @@ -190,7 +188,6 @@ javax.jcr jcr - 2.0 org.apache.jackrabbit @@ -214,7 +211,6 @@ org.hamcrest hamcrest-all - 1.3 test @@ -225,7 +221,6 @@ junit-addons junit-addons - 1.4 test @@ -322,13 +317,11 @@ com.googlecode.json-simple json-simple - 1.1.1 test de.flapdoodle.embed de.flapdoodle.embed.mongo - 3.2.6 test