You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by jo...@apache.org on 2025/10/13 19:37:40 UTC
(jackrabbit-filevault) branch master updated: JCRVLT-816 update dependencies (#383)
This is an automated email from the ASF dual-hosted git repository.
joerghoh pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jackrabbit-filevault.git
The following commit(s) were added to refs/heads/master by this push:
new 5104f882 JCRVLT-816 update dependencies (#383)
5104f882 is described below
commit 5104f882a2ff268f6195eda357fbee174d3b66e4
Author: Jörg Hoh <jo...@users.noreply.github.com>
AuthorDate: Mon Oct 13 21:37:35 2025 +0200
JCRVLT-816 update dependencies (#383)
update dependencies; for the integration tests use these dependencies:
* min version: versions as of AEM 6.5 LTS SP1
* max version: versions as of a current AEM CS release
Co-authored-by: Konrad Windszus <kw...@apache.org>
---
parent/pom.xml | 17 +++++---
.../max-target-osgi-environment/pom.xml | 28 ++++++------
.../min-target-osgi-environment/pom.xml | 51 ++++++++++++----------
vault-core/pom.xml | 2 +-
vault-hook-externalclass-test/pom.xml | 1 -
vault-rcp/pom.xml | 7 ++-
vault-validation/pom.xml | 2 +-
7 files changed, 61 insertions(+), 47 deletions(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 4d005935..37f6c773 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -59,13 +59,14 @@ Apache Jackrabbit FileVault is a project of the Apache Software Foundation.
<!-- for embedded dependencies the newest version should be used -->
<oak.max.version>1.82.0</oak.max.version>
<slf4j.version>1.7.25</slf4j.version>
- <commons-io.version>2.7</commons-io.version>
+ <commons-io.version>2.18.0</commons-io.version>
<test.oak>true</test.oak> <!-- passed to integration test as property "oak", set to true to test with Oak, false means test with Jackrabbit 2 -->
<bnd.version>6.4.0</bnd.version>
<minimalMavenBuildVersion>3.6.1</minimalMavenBuildVersion><!-- due to https://issues.apache.org/jira/browse/MNG-6059 -->
<minimalJavaBuildVersion>11</minimalJavaBuildVersion>
<maven.compiler.release>11</maven.compiler.release>
<sling.url>http://localhost:4502</sling.url>
+ <sling.api.version>2.27.6</sling.api.version> <!-- identical to the minimum version -->
<jacoco.command /><!-- is overwritten by https://www.eclemma.org/jacoco/trunk/doc/prepare-agent-mojo.html -->
<!-- downgrade to m-release-p 3.1.0 due to https://github.com/apache/maven-release/issues/1380 -->
<version.maven-release-plugin>3.1.0</version.maven-release-plugin>
@@ -514,12 +515,12 @@ Bundle-Category: jackrabbit
<artifactId>org.osgi.service.cm</artifactId>
<version>1.6.0</version>
</dependency>
- <!-- Service Component 1.4, Compendium R7 (https://osgi.org/javadoc/osgi.cmpn/7.0.0/org/osgi/service/component/package-frame.html) -->
+ <!-- Service Component 1.5, Compendium R7 (https://osgi.org/javadoc/osgi.cmpn/7.0.0/org/osgi/service/component/package-frame.html) -->
<!-- and component property types (https://osgi.org/javadoc/osgi.cmpn/7.0.0/org/osgi/service/component/propertytypes/package-frame.html) -->
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.service.component</artifactId>
- <version>1.4.0</version>
+ <version>1.5.0</version>
</dependency>
<!-- Event Admin 1.3.1, Compendium R6 (https://osgi.org/javadoc/r6/cmpn/org/osgi/service/event/package-summary.html) -->
<dependency>
@@ -556,7 +557,7 @@ Bundle-Category: jackrabbit
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
- <version>3.6</version>
+ <version>3.18.0</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
@@ -576,7 +577,7 @@ Bundle-Category: jackrabbit
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
- <version>4.5.8</version>
+ <version>4.5.13</version>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
@@ -605,6 +606,12 @@ Bundle-Category: jackrabbit
<artifactId>mockito-core</artifactId>
<version>5.20.0</version>
</dependency>
+ <!-- Sling -->
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.api</artifactId>
+ <version>${sling.api.version}</version>
+ </dependency>
</dependencies>
</dependencyManagement>
diff --git a/target-osgi-environment/max-target-osgi-environment/pom.xml b/target-osgi-environment/max-target-osgi-environment/pom.xml
index 851b103f..7825e4cb 100644
--- a/target-osgi-environment/max-target-osgi-environment/pom.xml
+++ b/target-osgi-environment/max-target-osgi-environment/pom.xml
@@ -34,21 +34,21 @@
<description>The bndrun files referencing a repository index (containing all bundles with their metadata) for resolving all FileVault bundles with dependent bundles in their maximum supported version</description>
<properties>
- <jackson.version>2.13.4</jackson.version>
+ <jackson.version>2.19.1</jackson.version>
</properties>
- <!-- the following dependencies are provided by AEM 6.5.16, all must have scope "provided" to prevent them polluting referencing modules -->
+ <!-- the following dependencies are provided by AEM CS (2025.09), all must have scope "provided" to prevent them polluting referencing modules -->
<dependencies>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.framework</artifactId>
- <version>7.0.3</version>
+ <version>7.0.5</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.scr</artifactId>
- <version>2.2.4</version>
+ <version>2.2.12</version>
<scope>provided</scope>
</dependency>
<!-- transitive deps of felix.scr -->
@@ -73,32 +73,32 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.configadmin</artifactId>
- <version>1.9.24</version>
+ <version>1.9.26</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.http.servlet-api</artifactId>
- <version>1.2.0</version>
+ <version>2.1.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>1.7.32</version>
+ <version>1.7.36</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
- <version>1.7.32</version>
+ <version>1.7.36</version>
<scope>provided</scope>
</dependency>
<!-- required SLF4J Impl capability -->
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.commons.log</artifactId>
- <version>5.4.2</version>
+ <version>5.5.0</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -116,31 +116,31 @@
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>2.11.0</version>
+ <version>2.20.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
- <version>3.12.0</version>
+ <version>3.19.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-collections4</artifactId>
- <version>4.4</version>
+ <version>4.5.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
- <version>1.15</version>
+ <version>1.19.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.api</artifactId>
- <version>2.27.0</version>
+ <version>2.27.6</version>
<scope>provided</scope>
</dependency>
<!--transitive dep of sling.api -->
diff --git a/target-osgi-environment/min-target-osgi-environment/pom.xml b/target-osgi-environment/min-target-osgi-environment/pom.xml
index e74b9551..370aac2e 100644
--- a/target-osgi-environment/min-target-osgi-environment/pom.xml
+++ b/target-osgi-environment/min-target-osgi-environment/pom.xml
@@ -35,65 +35,76 @@
<description>The bndrun files referencing a repository index (containing all bundles with their metadata) for resolving all FileVault bundles with dependent bundles in their minimally required version</description>
<properties>
- <jackson.version>2.13.4</jackson.version>
+ <jackson.version>2.17.2</jackson.version>
</properties>
- <!-- the following dependencies are provided by AEM 6.5.16, all must have scope "provided" to prevent them polluting referencing modules -->
+ <!--
+ The following dependencies are provided by AEM 6.5 LTS SP1, all must have scope "provided" to prevent them polluting referencing modules
+
+ We also list explicit dependency versions so any change in the parent pom does not influence this maven project as well, as it would
+ defeat the purpose of it.
+ -->
<dependencies>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.framework</artifactId>
- <version>6.0.2</version>
+ <version>7.0.5</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.scr</artifactId>
- <version>2.1.20</version>
+ <version>2.2.12</version>
<scope>provided</scope>
</dependency>
<!-- transitive deps of felix.scr -->
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.component</artifactId>
+ <version>1.5.0</version>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.util.function</artifactId>
- <version>1.1.0</version>
+ <version>1.2.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.util.promise</artifactId>
- <version>1.1.0</version>
+ <version>1.2.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.configadmin</artifactId>
- <version>1.9.12</version>
+ <version>1.9.24</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.http.servlet-api</artifactId>
- <version>1.2.0</version>
+ <version>2.1.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>1.7.25</version>
+ <version>1.7.36</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
- <version>1.7.25</version>
+ <version>1.7.36</version>
<scope>provided</scope>
</dependency>
<!-- required SLF4J Impl capability -->
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.commons.log</artifactId>
- <version>5.1.10</version>
+ <version>5.5.0</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -111,25 +122,25 @@
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>2.8.0</version>
+ <version>2.18.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
- <version>3.12.0</version>
+ <version>3.17.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-collections4</artifactId>
- <version>4.4</version>
+ <version>4.5.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
- <version>1.14</version>
+ <version>1.18.0</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -141,20 +152,12 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.api</artifactId>
- <version>2.22.0</version>
<scope>provided</scope>
</dependency>
<!--transitive dep of sling.api -->
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.converter</artifactId>
- <version>1.0.2</version>
- <scope>provided</scope>
- </dependency>
<dependency>
<groupId>javax.jcr</groupId>
<artifactId>jcr</artifactId>
- <version>2.0</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -190,7 +193,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.jcr.base</artifactId>
- <version>3.1.6</version>
+ <version>3.1.14</version>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/vault-core/pom.xml b/vault-core/pom.xml
index a20d29d7..282515d7 100644
--- a/vault-core/pom.xml
+++ b/vault-core/pom.xml
@@ -285,7 +285,7 @@
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
- <version>2.1.212</version>
+ <version>2.2.220</version>
<scope>provided</scope>
</dependency>
<!-- test deps -->
diff --git a/vault-hook-externalclass-test/pom.xml b/vault-hook-externalclass-test/pom.xml
index 2e357c53..4c7489da 100644
--- a/vault-hook-externalclass-test/pom.xml
+++ b/vault-hook-externalclass-test/pom.xml
@@ -122,7 +122,6 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.api</artifactId>
- <version>2.16.4</version>
<scope>provided</scope>
</dependency>
</dependencies>
diff --git a/vault-rcp/pom.xml b/vault-rcp/pom.xml
index e8d69da8..50a313d0 100644
--- a/vault-rcp/pom.xml
+++ b/vault-rcp/pom.xml
@@ -209,7 +209,6 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.api</artifactId>
- <version>2.16.4</version>
<scope>provided</scope>
</dependency>
<!-- OSGi Annotations: @Version -->
@@ -309,5 +308,11 @@
<version>3.10</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.util.converter</artifactId>
+ <version>1.0.9</version>
+ <scope>compile</scope>
+ </dependency>
</dependencies>
</project>
diff --git a/vault-validation/pom.xml b/vault-validation/pom.xml
index fd1e3deb..bae22edc 100644
--- a/vault-validation/pom.xml
+++ b/vault-validation/pom.xml
@@ -166,6 +166,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
+ <version>3.12.0</version>
<scope>provided</scope>
</dependency>
@@ -324,7 +325,6 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.api</artifactId>
- <version>2.9.0</version>
<scope>test</scope>
</dependency>
</dependencies>