This is an automated email from the ASF dual-hosted git repository.
reschke pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
The following commit(s) were added to refs/heads/trunk by this push:
new 1ee0a13637 Revert "[maven-release-plugin] rollback the release of
jackrabbit-oak-1.82.0"
1ee0a13637 is described below
commit 1ee0a13637aa5833447bcee5e3d594f152b583ad
Author: Julian Reschke <[email protected]>
AuthorDate: Sat Aug 9 06:40:12 2025 +0200
Revert "[maven-release-plugin] rollback the release of
jackrabbit-oak-1.82.0"
This reverts commit 124381da7546aeaa35af78aa1b2ac89a03df4ac9.
---
oak-api/pom.xml | 2 +-
oak-auth-external/pom.xml | 2 +-
oak-auth-ldap/pom.xml | 2 +-
oak-authorization-cug/pom.xml | 2 +-
oak-authorization-principalbased/pom.xml | 2 +-
oak-benchmarks-elastic/pom.xml | 2 +-
oak-benchmarks-lucene/pom.xml | 2 +-
oak-benchmarks/pom.xml | 4 ++--
oak-blob-cloud-azure/pom.xml | 2 +-
oak-blob-cloud/pom.xml | 17 ++++++++++++++++-
oak-blob-plugins/pom.xml | 2 +-
oak-blob/pom.xml | 2 +-
oak-commons/pom.xml | 2 +-
oak-core-spi/pom.xml | 2 +-
oak-core/pom.xml | 2 +-
oak-examples/pom.xml | 2 +-
oak-examples/standalone/pom.xml | 11 +++++------
oak-examples/webapp/pom.xml | 4 ++--
oak-exercise/pom.xml | 2 +-
oak-http/pom.xml | 2 +-
oak-it-osgi/pom.xml | 8 ++------
oak-it/pom.xml | 4 ++--
oak-jackrabbit-api/pom.xml | 2 +-
oak-jcr/pom.xml | 13 ++++++-------
oak-lucene/pom.xml | 4 ++--
oak-parent/pom.xml | 31 ++++++++++++++++++-------------
oak-pojosr/pom.xml | 4 ++--
oak-query-spi/pom.xml | 2 +-
oak-run-commons/pom.xml | 8 ++++++--
oak-run-elastic/pom.xml | 5 +++--
oak-run/pom.xml | 8 ++++++--
oak-search-elastic/pom.xml | 2 +-
oak-search/pom.xml | 2 +-
oak-security-spi/pom.xml | 2 +-
oak-segment-aws/pom.xml | 2 +-
oak-segment-azure/pom.xml | 8 +-------
oak-segment-remote/pom.xml | 2 +-
oak-segment-tar/pom.xml | 2 +-
oak-shaded-guava/pom.xml | 4 ++--
oak-store-composite/pom.xml | 4 ++--
oak-store-document/pom.xml | 8 ++++----
oak-store-spi/pom.xml | 2 +-
oak-upgrade/pom.xml | 4 ++--
pom.xml | 2 +-
44 files changed, 109 insertions(+), 92 deletions(-)
diff --git a/oak-api/pom.xml b/oak-api/pom.xml
index 3dab5a994c..175e668404 100644
--- a/oak-api/pom.xml
+++ b/oak-api/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>oak-parent</artifactId>
- <version>1.81-SNAPSHOT</version>
+ <version>1.83-SNAPSHOT</version>
<relativePath>../oak-parent/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/oak-auth-external/pom.xml b/oak-auth-external/pom.xml
index 4298205008..6e56ca1696 100644
--- a/oak-auth-external/pom.xml
+++ b/oak-auth-external/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>oak-parent</artifactId>
- <version>1.81-SNAPSHOT</version>
+ <version>1.83-SNAPSHOT</version>
<relativePath>../oak-parent/pom.xml</relativePath>
</parent>
diff --git a/oak-auth-ldap/pom.xml b/oak-auth-ldap/pom.xml
index dbc995dcea..56eeeed5ce 100644
--- a/oak-auth-ldap/pom.xml
+++ b/oak-auth-ldap/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>oak-parent</artifactId>
- <version>1.81-SNAPSHOT</version>
+ <version>1.83-SNAPSHOT</version>
<relativePath>../oak-parent/pom.xml</relativePath>
</parent>
diff --git a/oak-authorization-cug/pom.xml b/oak-authorization-cug/pom.xml
index 637f993988..3c33b20f95 100644
--- a/oak-authorization-cug/pom.xml
+++ b/oak-authorization-cug/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>oak-parent</artifactId>
- <version>1.81-SNAPSHOT</version>
+ <version>1.83-SNAPSHOT</version>
<relativePath>../oak-parent/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/oak-authorization-principalbased/pom.xml
b/oak-authorization-principalbased/pom.xml
index cc10322a4c..b0a3d910e8 100644
--- a/oak-authorization-principalbased/pom.xml
+++ b/oak-authorization-principalbased/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>oak-parent</artifactId>
- <version>1.81-SNAPSHOT</version>
+ <version>1.83-SNAPSHOT</version>
<relativePath>../oak-parent/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/oak-benchmarks-elastic/pom.xml b/oak-benchmarks-elastic/pom.xml
index 1464581487..9ad8e432e5 100644
--- a/oak-benchmarks-elastic/pom.xml
+++ b/oak-benchmarks-elastic/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>oak-parent</artifactId>
- <version>1.81-SNAPSHOT</version>
+ <version>1.83-SNAPSHOT</version>
<relativePath>../oak-parent/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/oak-benchmarks-lucene/pom.xml b/oak-benchmarks-lucene/pom.xml
index ceba5aae63..716442a34d 100644
--- a/oak-benchmarks-lucene/pom.xml
+++ b/oak-benchmarks-lucene/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>oak-parent</artifactId>
- <version>1.81-SNAPSHOT</version>
+ <version>1.83-SNAPSHOT</version>
<relativePath>../oak-parent/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/oak-benchmarks/pom.xml b/oak-benchmarks/pom.xml
index ad990431f9..405cb13ca9 100644
--- a/oak-benchmarks/pom.xml
+++ b/oak-benchmarks/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>oak-parent</artifactId>
- <version>1.81-SNAPSHOT</version>
+ <version>1.83-SNAPSHOT</version>
<relativePath>../oak-parent/pom.xml</relativePath>
</parent>
@@ -207,7 +207,7 @@
</dependency>
<dependency>
<groupId>org.mongodb</groupId>
- <artifactId>mongo-java-driver</artifactId>
+ <artifactId>mongodb-driver-sync</artifactId>
</dependency>
<dependency>
<groupId>com.h2database</groupId>
diff --git a/oak-blob-cloud-azure/pom.xml b/oak-blob-cloud-azure/pom.xml
index db5a912bdf..b01e13a2ff 100644
--- a/oak-blob-cloud-azure/pom.xml
+++ b/oak-blob-cloud-azure/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>oak-parent</artifactId>
<groupId>org.apache.jackrabbit</groupId>
- <version>1.81-SNAPSHOT</version>
+ <version>1.83-SNAPSHOT</version>
<relativePath>../oak-parent/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/oak-blob-cloud/pom.xml b/oak-blob-cloud/pom.xml
index 9233ec61b4..720cf0d728 100644
--- a/oak-blob-cloud/pom.xml
+++ b/oak-blob-cloud/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>oak-parent</artifactId>
<groupId>org.apache.jackrabbit</groupId>
- <version>1.81-SNAPSHOT</version>
+ <version>1.83-SNAPSHOT</version>
<relativePath>../oak-parent/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -234,6 +234,21 @@
<artifactId>mockito-core</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.event</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.log</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.cm</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
diff --git a/oak-blob-plugins/pom.xml b/oak-blob-plugins/pom.xml
index 3e18d2a689..e06d808d95 100644
--- a/oak-blob-plugins/pom.xml
+++ b/oak-blob-plugins/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>oak-parent</artifactId>
- <version>1.81-SNAPSHOT</version>
+ <version>1.83-SNAPSHOT</version>
<relativePath>../oak-parent/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/oak-blob/pom.xml b/oak-blob/pom.xml
index d777d3c39d..1903b68773 100644
--- a/oak-blob/pom.xml
+++ b/oak-blob/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>oak-parent</artifactId>
<groupId>org.apache.jackrabbit</groupId>
- <version>1.81-SNAPSHOT</version>
+ <version>1.83-SNAPSHOT</version>
<relativePath>../oak-parent/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/oak-commons/pom.xml b/oak-commons/pom.xml
index e4a9bacbe7..5e8396cd65 100644
--- a/oak-commons/pom.xml
+++ b/oak-commons/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>oak-parent</artifactId>
- <version>1.81-SNAPSHOT</version>
+ <version>1.83-SNAPSHOT</version>
<relativePath>../oak-parent/pom.xml</relativePath>
</parent>
diff --git a/oak-core-spi/pom.xml b/oak-core-spi/pom.xml
index 47b433e2a0..53c2dc20b8 100644
--- a/oak-core-spi/pom.xml
+++ b/oak-core-spi/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>oak-parent</artifactId>
- <version>1.81-SNAPSHOT</version>
+ <version>1.83-SNAPSHOT</version>
<relativePath>../oak-parent/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/oak-core/pom.xml b/oak-core/pom.xml
index 546addf81b..018dbcbb5e 100644
--- a/oak-core/pom.xml
+++ b/oak-core/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>oak-parent</artifactId>
- <version>1.81-SNAPSHOT</version>
+ <version>1.83-SNAPSHOT</version>
<relativePath>../oak-parent/pom.xml</relativePath>
</parent>
diff --git a/oak-examples/pom.xml b/oak-examples/pom.xml
index 558f629d8f..982fee3484 100644
--- a/oak-examples/pom.xml
+++ b/oak-examples/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>oak-parent</artifactId>
- <version>1.81-SNAPSHOT</version>
+ <version>1.83-SNAPSHOT</version>
<relativePath>../oak-parent/pom.xml</relativePath>
</parent>
diff --git a/oak-examples/standalone/pom.xml b/oak-examples/standalone/pom.xml
index 92b4b3165d..88ea5eb337 100644
--- a/oak-examples/standalone/pom.xml
+++ b/oak-examples/standalone/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>oak-parent</artifactId>
- <version>1.81-SNAPSHOT</version>
+ <version>1.83-SNAPSHOT</version>
<relativePath>../../oak-parent/pom.xml</relativePath>
</parent>
<artifactId>oak-standalone</artifactId>
@@ -90,7 +90,7 @@
<dependency>
<groupId>org.fusesource.jansi</groupId>
<artifactId>jansi</artifactId>
- <version>2.4.1</version>
+ <version>2.4.2</version>
<optional>true</optional>
</dependency>
<dependency>
@@ -100,8 +100,7 @@
</dependency>
<dependency>
<groupId>org.mongodb</groupId>
- <artifactId>mongo-java-driver</artifactId>
- <version>${mongo.driver.version}</version>
+ <artifactId>mongodb-driver-sync</artifactId>
<optional>true</optional>
</dependency>
<!-- Required for the persistent cache -->
@@ -192,12 +191,12 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.http.bridge</artifactId>
- <version>5.1.6</version>
+ <version>5.1.8</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.webconsole</artifactId>
- <version>5.0.0</version>
+ <version>5.0.12</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
diff --git a/oak-examples/webapp/pom.xml b/oak-examples/webapp/pom.xml
index 8471098242..94e5d207fa 100644
--- a/oak-examples/webapp/pom.xml
+++ b/oak-examples/webapp/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>oak-parent</artifactId>
- <version>1.81-SNAPSHOT</version>
+ <version>1.83-SNAPSHOT</version>
<relativePath>../../oak-parent/pom.xml</relativePath>
</parent>
<artifactId>oak-webapp</artifactId>
@@ -35,7 +35,7 @@
<description>Web application that hosts and serves a Jackrabbit Oak content
repository</description>
<properties>
- <tomcat.version>9.0.106</tomcat.version>
+ <tomcat.version>9.0.107</tomcat.version>
<skip.deployment>true</skip.deployment>
</properties>
diff --git a/oak-exercise/pom.xml b/oak-exercise/pom.xml
index b0cc1b2522..4fa775ec20 100644
--- a/oak-exercise/pom.xml
+++ b/oak-exercise/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>oak-parent</artifactId>
- <version>1.81-SNAPSHOT</version>
+ <version>1.83-SNAPSHOT</version>
<relativePath>../oak-parent/pom.xml</relativePath>
</parent>
diff --git a/oak-http/pom.xml b/oak-http/pom.xml
index c26228c9f9..a7178ffc7b 100644
--- a/oak-http/pom.xml
+++ b/oak-http/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>oak-parent</artifactId>
- <version>1.81-SNAPSHOT</version>
+ <version>1.83-SNAPSHOT</version>
<relativePath>../oak-parent/pom.xml</relativePath>
</parent>
diff --git a/oak-it-osgi/pom.xml b/oak-it-osgi/pom.xml
index d54d739190..0bdf1dfb3f 100644
--- a/oak-it-osgi/pom.xml
+++ b/oak-it-osgi/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>oak-parent</artifactId>
- <version>1.81-SNAPSHOT</version>
+ <version>1.83-SNAPSHOT</version>
<relativePath>../oak-parent/pom.xml</relativePath>
</parent>
@@ -82,6 +82,7 @@
<configuration>
<excludes>
<exclude>**/test.txt</exclude>
+ <exclude>**/test2.txt</exclude>
<exclude>**/test.rtf</exclude>
<exclude>**/test.doc</exclude>
<exclude>**/test.docx</exclude>
@@ -215,11 +216,6 @@
<artifactId>commons-text</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>commons-fileupload</groupId>
- <artifactId>commons-fileupload</artifactId>
- <version>1.5</version>
- </dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
diff --git a/oak-it/pom.xml b/oak-it/pom.xml
index 80254c58e3..10a4fdf838 100644
--- a/oak-it/pom.xml
+++ b/oak-it/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>oak-parent</artifactId>
- <version>1.81-SNAPSHOT</version>
+ <version>1.83-SNAPSHOT</version>
<relativePath>../oak-parent/pom.xml</relativePath>
</parent>
@@ -186,7 +186,7 @@
</dependency>
<dependency>
<groupId>org.mongodb</groupId>
- <artifactId>mongo-java-driver</artifactId>
+ <artifactId>mongodb-driver-sync</artifactId>
<optional>true</optional>
<scope>test</scope>
</dependency>
diff --git a/oak-jackrabbit-api/pom.xml b/oak-jackrabbit-api/pom.xml
index 36ab45973c..8d909e13a6 100644
--- a/oak-jackrabbit-api/pom.xml
+++ b/oak-jackrabbit-api/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>oak-parent</artifactId>
- <version>1.81-SNAPSHOT</version>
+ <version>1.83-SNAPSHOT</version>
<relativePath>../oak-parent/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/oak-jcr/pom.xml b/oak-jcr/pom.xml
index bb25c3f800..1c9d8eac35 100644
--- a/oak-jcr/pom.xml
+++ b/oak-jcr/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>oak-parent</artifactId>
- <version>1.81-SNAPSHOT</version>
+ <version>1.83-SNAPSHOT</version>
<relativePath>../oak-parent/pom.xml</relativePath>
</parent>
@@ -216,6 +216,10 @@
<groupId>org.apache.commons</groupId>
<artifactId>commons-collections4</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.jackrabbit</groupId>
@@ -392,7 +396,7 @@
</dependency>
<dependency>
<groupId>org.mongodb</groupId>
- <artifactId>mongo-java-driver</artifactId>
+ <artifactId>mongodb-driver-sync</artifactId>
<scope>test</scope>
</dependency>
<dependency>
@@ -490,11 +494,6 @@
<artifactId>org.osgi.service.component</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
diff --git a/oak-lucene/pom.xml b/oak-lucene/pom.xml
index 3a4be2b5e3..c1883d37a6 100644
--- a/oak-lucene/pom.xml
+++ b/oak-lucene/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>oak-parent</artifactId>
- <version>1.81-SNAPSHOT</version>
+ <version>1.83-SNAPSHOT</version>
<relativePath>../oak-parent/pom.xml</relativePath>
</parent>
@@ -291,7 +291,7 @@
</dependency>
<dependency>
<groupId>org.mongodb</groupId>
- <artifactId>mongo-java-driver</artifactId>
+ <artifactId>mongodb-driver-sync</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/oak-parent/pom.xml b/oak-parent/pom.xml
index 99c63f0d23..b94c8f1a2c 100644
--- a/oak-parent/pom.xml
+++ b/oak-parent/pom.xml
@@ -30,13 +30,13 @@
<groupId>org.apache.jackrabbit</groupId>
<artifactId>oak-parent</artifactId>
<name>Oak Parent POM</name>
- <version>1.81-SNAPSHOT</version>
+ <version>1.83-SNAPSHOT</version>
<packaging>pom</packaging>
<properties>
<!-- build time stamp: should be updated prior to a release -->
<!-- see
https://maven.apache.org/guides/mini/guide-reproducible-builds.html -->
- <project.build.outputTimestamp>1747400914</project.build.outputTimestamp>
+ <project.build.outputTimestamp>1751129729</project.build.outputTimestamp>
<minimalMavenBuildVersion>3.6.1</minimalMavenBuildVersion><!-- due to
https://issues.apache.org/jira/browse/MNG-6059 -->
<test.opts.memory>-Xmx512m</test.opts.memory>
<test.opts>${test.opts.coverage} ${test.opts.memory}
-XX:+HeapDumpOnOutOfMemoryError -Dupdate.limit=100
-Djava.awt.headless=true</test.opts>
@@ -48,7 +48,7 @@
<project.reporting.outputEncoding>
${project.build.sourceEncoding}
</project.reporting.outputEncoding>
- <jackrabbit.version>2.22.0</jackrabbit.version>
+ <jackrabbit.version>2.22.2</jackrabbit.version>
<mongo.host>127.0.0.1</mongo.host>
<mongo.port>27017</mongo.port>
<mongo.db>MongoMKDB</mongo.db>
@@ -57,7 +57,7 @@
<mongo.version>3.6</mongo.version>
<segment.db>SegmentMK</segment.db>
<lucene.version>4.7.2</lucene.version>
- <mongo.driver.version>3.12.14</mongo.driver.version>
+ <mongo.driver.version>5.2.1</mongo.driver.version>
<slf4j.api.version>1.7.36</slf4j.api.version>
<slf4j.version>1.7.36</slf4j.version> <!-- sync with logback version -->
<logback.version>1.2.13</logback.version>
@@ -521,7 +521,7 @@
</dependency>
<dependency>
<groupId>org.mongodb</groupId>
- <artifactId>mongo-java-driver</artifactId>
+ <artifactId>mongodb-driver-sync</artifactId>
<version>${mongo.driver.version}</version>
</dependency>
<dependency>
@@ -532,7 +532,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
- <version>5.17.0</version>
+ <version>5.18.0</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
@@ -594,22 +594,27 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
- <version>3.17.0</version>
+ <version>3.18.0</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-text</artifactId>
- <version>1.13.1</version>
+ <version>1.14.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-csv</artifactId>
+ <version>1.14.1</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>2.18.0</version>
+ <version>2.20.0</version>
</dependency>
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
- <version>1.18.0</version>
+ <version>1.19.0</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
@@ -619,12 +624,12 @@
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-jdbc</artifactId>
- <version>9.0.106</version>
+ <version>9.0.107</version>
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-juli</artifactId>
- <version>9.0.106</version>
+ <version>9.0.107</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
@@ -1265,6 +1270,6 @@
<connection>scm:git:https://gitbox.apache.org/repos/asf/jackrabbit-oak.git</connection>
<developerConnection>scm:git:https://gitbox.apache.org/repos/asf/jackrabbit-oak.git</developerConnection>
<url>https://github.com/apache/jackrabbit/tree/${project.scm.tag}</url>
- <tag>jackrabbit-oak-1.80</tag>
+ <tag>jackrabbit-oak-1.82.0</tag>
</scm>
</project>
diff --git a/oak-pojosr/pom.xml b/oak-pojosr/pom.xml
index 58350ba13f..1b05a54b20 100644
--- a/oak-pojosr/pom.xml
+++ b/oak-pojosr/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>oak-parent</artifactId>
- <version>1.81-SNAPSHOT</version>
+ <version>1.83-SNAPSHOT</version>
<relativePath>../oak-parent/pom.xml</relativePath>
</parent>
@@ -103,7 +103,7 @@
</dependency>
<dependency>
<groupId>org.mongodb</groupId>
- <artifactId>mongo-java-driver</artifactId>
+ <artifactId>mongodb-driver-sync</artifactId>
<optional>true</optional>
</dependency>
<dependency>
diff --git a/oak-query-spi/pom.xml b/oak-query-spi/pom.xml
index edcc461d2a..f8d5733792 100644
--- a/oak-query-spi/pom.xml
+++ b/oak-query-spi/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>oak-parent</artifactId>
- <version>1.81-SNAPSHOT</version>
+ <version>1.83-SNAPSHOT</version>
<relativePath>../oak-parent/pom.xml</relativePath>
</parent>
diff --git a/oak-run-commons/pom.xml b/oak-run-commons/pom.xml
index 3871b5635a..e1288dccc2 100644
--- a/oak-run-commons/pom.xml
+++ b/oak-run-commons/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>oak-parent</artifactId>
- <version>1.81-SNAPSHOT</version>
+ <version>1.83-SNAPSHOT</version>
<relativePath>../oak-parent/pom.xml</relativePath>
</parent>
@@ -117,12 +117,16 @@
</dependency>
<dependency>
<groupId>org.mongodb</groupId>
- <artifactId>mongo-java-driver</artifactId>
+ <artifactId>mongodb-driver-sync</artifactId>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-collections4</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.configadmin</artifactId>
diff --git a/oak-run-elastic/pom.xml b/oak-run-elastic/pom.xml
index 8385808b91..f2fc279859 100644
--- a/oak-run-elastic/pom.xml
+++ b/oak-run-elastic/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>oak-parent</artifactId>
- <version>1.81-SNAPSHOT</version>
+ <version>1.83-SNAPSHOT</version>
<relativePath>../oak-parent/pom.xml</relativePath>
</parent>
@@ -41,8 +41,9 @@
103.5 MB: Azure Identity client library for Java (OAK-10604)
105 MB: Azure updates
107 MB: RDB/Tomcat (OAK-10752)
+ 120 MB: added commons-csv for csv parsing (OAK-10790)
-->
- <max.jar.size>119000000</max.jar.size>
+ <max.jar.size>120000000</max.jar.size>
</properties>
diff --git a/oak-run/pom.xml b/oak-run/pom.xml
index 387473add1..1129335ef2 100644
--- a/oak-run/pom.xml
+++ b/oak-run/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>oak-parent</artifactId>
- <version>1.81-SNAPSHOT</version>
+ <version>1.83-SNAPSHOT</version>
<relativePath>../oak-parent/pom.xml</relativePath>
</parent>
@@ -296,7 +296,7 @@
</dependency>
<dependency>
<groupId>org.mongodb</groupId>
- <artifactId>mongo-java-driver</artifactId>
+ <artifactId>mongodb-driver-sync</artifactId>
</dependency>
<dependency>
<groupId>org.mapdb</groupId>
@@ -336,6 +336,10 @@
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-collections4</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-text</artifactId>
diff --git a/oak-search-elastic/pom.xml b/oak-search-elastic/pom.xml
index b83fc728b9..8ebd6dced9 100644
--- a/oak-search-elastic/pom.xml
+++ b/oak-search-elastic/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>oak-parent</artifactId>
- <version>1.81-SNAPSHOT</version>
+ <version>1.83-SNAPSHOT</version>
<relativePath>../oak-parent/pom.xml</relativePath>
</parent>
diff --git a/oak-search/pom.xml b/oak-search/pom.xml
index 2686e154d1..1bed57085d 100644
--- a/oak-search/pom.xml
+++ b/oak-search/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>oak-parent</artifactId>
- <version>1.81-SNAPSHOT</version>
+ <version>1.83-SNAPSHOT</version>
<relativePath>../oak-parent/pom.xml</relativePath>
</parent>
diff --git a/oak-security-spi/pom.xml b/oak-security-spi/pom.xml
index f06b671636..23197c438c 100644
--- a/oak-security-spi/pom.xml
+++ b/oak-security-spi/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>oak-parent</artifactId>
- <version>1.81-SNAPSHOT</version>
+ <version>1.83-SNAPSHOT</version>
<relativePath>../oak-parent/pom.xml</relativePath>
</parent>
diff --git a/oak-segment-aws/pom.xml b/oak-segment-aws/pom.xml
index ebbb5a88b0..9a7cae77f1 100644
--- a/oak-segment-aws/pom.xml
+++ b/oak-segment-aws/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>oak-parent</artifactId>
- <version>1.81-SNAPSHOT</version>
+ <version>1.83-SNAPSHOT</version>
<relativePath>../oak-parent/pom.xml</relativePath>
</parent>
diff --git a/oak-segment-azure/pom.xml b/oak-segment-azure/pom.xml
index 53191f6aab..8701e4cbc5 100644
--- a/oak-segment-azure/pom.xml
+++ b/oak-segment-azure/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>oak-parent</artifactId>
- <version>1.81-SNAPSHOT</version>
+ <version>1.83-SNAPSHOT</version>
<relativePath>../oak-parent/pom.xml</relativePath>
</parent>
@@ -119,12 +119,6 @@
<!-- D E P E N D E N C I E S -->
<!--
====================================================================== -->
<dependencies>
- <dependency>
- <groupId>org.apache.jackrabbit</groupId>
- <artifactId>oak-shaded-guava</artifactId>
- <version>${project.version}</version>
- </dependency>
-
<!-- Optional OSGi dependencies, used only when running within OSGi -->
<dependency>
<groupId>org.osgi</groupId>
diff --git a/oak-segment-remote/pom.xml b/oak-segment-remote/pom.xml
index f18b8d8196..99995c83c6 100644
--- a/oak-segment-remote/pom.xml
+++ b/oak-segment-remote/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>oak-parent</artifactId>
- <version>1.81-SNAPSHOT</version>
+ <version>1.83-SNAPSHOT</version>
<relativePath>../oak-parent/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/oak-segment-tar/pom.xml b/oak-segment-tar/pom.xml
index 59c24cdfd4..872c0836c3 100644
--- a/oak-segment-tar/pom.xml
+++ b/oak-segment-tar/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>oak-parent</artifactId>
- <version>1.81-SNAPSHOT</version>
+ <version>1.83-SNAPSHOT</version>
<relativePath>../oak-parent/pom.xml</relativePath>
</parent>
diff --git a/oak-shaded-guava/pom.xml b/oak-shaded-guava/pom.xml
index 8b821a50d2..b3db1a81b1 100644
--- a/oak-shaded-guava/pom.xml
+++ b/oak-shaded-guava/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>oak-parent</artifactId>
- <version>1.81-SNAPSHOT</version>
+ <version>1.83-SNAPSHOT</version>
<relativePath>../oak-parent/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -61,6 +61,7 @@
<artifact>*:*</artifact>
<excludes>
<exclude>com/google/common/annotations/**</exclude>
+ <exclude>com/google/common/escape/**</exclude>
<exclude>com/google/common/eventbus/**</exclude>
<exclude>com/google/common/html/**</exclude>
<exclude>com/google/common/io/**</exclude>
@@ -99,7 +100,6 @@
${pref}.common.base;version="33.5.0",
${pref}.common.cache;version="33.4.1";uses:="${pref}.common.base,${pref}.common.collect,${pref}.common.util.concurrent",
${pref}.common.collect;version="34.0.0";uses:="${pref}.common.base",
-
${pref}.common.escape;version="33.4.1";uses:="${pref}.common.base",
${pref}.common.graph;version="33.4.1";uses:="${pref}.common.collect",
${pref}.common.hash;version="33.5.0";uses:="${pref}.common.base",
${pref}.common.math;version="33.4.1",
diff --git a/oak-store-composite/pom.xml b/oak-store-composite/pom.xml
index 2b83b93d9d..7e470711db 100644
--- a/oak-store-composite/pom.xml
+++ b/oak-store-composite/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>oak-parent</artifactId>
- <version>1.81-SNAPSHOT</version>
+ <version>1.83-SNAPSHOT</version>
<relativePath>../oak-parent/pom.xml</relativePath>
</parent>
@@ -212,7 +212,7 @@
</dependency>
<dependency>
<groupId>org.mongodb</groupId>
- <artifactId>mongo-java-driver</artifactId>
+ <artifactId>mongodb-driver-sync</artifactId>
<optional>true</optional>
<scope>test</scope>
</dependency>
diff --git a/oak-store-document/pom.xml b/oak-store-document/pom.xml
index 141a4b69a4..1c64f261f8 100644
--- a/oak-store-document/pom.xml
+++ b/oak-store-document/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>oak-parent</artifactId>
- <version>1.81-SNAPSHOT</version>
+ <version>1.83-SNAPSHOT</version>
<relativePath>../oak-parent/pom.xml</relativePath>
</parent>
@@ -43,8 +43,8 @@
<configuration>
<instructions>
<Import-Package>
- com.mongodb*;version="[3.8, 4)";resolution:=optional,
- org.bson*;version="[3.8, 4)";resolution:=optional,
+ com.mongodb*;version="[5.2, 5.3)";resolution:=optional,
+ org.bson*;version="[5.2, 5.3)";resolution:=optional,
*
</Import-Package>
<Export-Package>
@@ -166,7 +166,7 @@
<!-- Optional dependencies for different persistence backends -->
<dependency>
<groupId>org.mongodb</groupId>
- <artifactId>mongo-java-driver</artifactId>
+ <artifactId>mongodb-driver-sync</artifactId>
<optional>true</optional>
</dependency>
diff --git a/oak-store-spi/pom.xml b/oak-store-spi/pom.xml
index 86c3eb9bb8..98283598e7 100644
--- a/oak-store-spi/pom.xml
+++ b/oak-store-spi/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>oak-parent</artifactId>
- <version>1.81-SNAPSHOT</version>
+ <version>1.83-SNAPSHOT</version>
<relativePath>../oak-parent/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/oak-upgrade/pom.xml b/oak-upgrade/pom.xml
index 6bbabd817d..a64fad8e0d 100644
--- a/oak-upgrade/pom.xml
+++ b/oak-upgrade/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>oak-parent</artifactId>
- <version>1.81-SNAPSHOT</version>
+ <version>1.83-SNAPSHOT</version>
<relativePath>../oak-parent/pom.xml</relativePath>
</parent>
@@ -169,7 +169,7 @@
<dependency>
<groupId>org.mongodb</groupId>
- <artifactId>mongo-java-driver</artifactId>
+ <artifactId>mongodb-driver-sync</artifactId>
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
diff --git a/pom.xml b/pom.xml
index 15056e7909..2e08b0f0bf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>oak-parent</artifactId>
- <version>1.81-SNAPSHOT</version>
+ <version>1.83-SNAPSHOT</version>
<relativePath>oak-parent/pom.xml</relativePath>
</parent>
