You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by kw...@apache.org on 2021/05/12 18:01:40 UTC
[jackrabbit-filevault] 01/01: JCRVLT-521 drop support of Jackrabbit
2.14, Oak 1.6 and Declarative Services 1.3
This is an automated email from the ASF dual-hosted git repository.
kwin pushed a commit to branch feature/JCRVLT-521-drop-aem-63-compatibility
in repository https://gitbox.apache.org/repos/asf/jackrabbit-filevault.git
commit a44ce92ad090802b10055847dec8d41fe13fc1b7
Author: Konrad Windszus <kw...@apache.org>
AuthorDate: Wed May 12 20:01:13 2021 +0200
JCRVLT-521 drop support of Jackrabbit 2.14, Oak 1.6 and Declarative
Services 1.3
---
parent/pom.xml | 18 +++---
.../{aem6.3.bndrun => min-target.bndrun} | 0
target-osgi-environment/pom.xml | 65 ++++++++++++++++++----
.../aem6.3.bndrun => vault-core/min-target.bndrun | 2 +-
vault-core/pom.xml | 6 --
.../aem6.3.bndrun => vault-rcp/min-target.bndrun | 2 +-
.../aem6.3.bndrun => vault-sync/min-target.bndrun | 2 +-
7 files changed, 65 insertions(+), 30 deletions(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index aace9c3..f6edbe7 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -50,7 +50,7 @@ Apache Jackrabbit FileVault is a project of the Apache Software Foundation.
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<jackrabbit.version>2.20.2</jackrabbit.version>
<oak.version>1.38.0</oak.version>
- <slf4j.version>1.7.6</slf4j.version>
+ <slf4j.version>1.7.25</slf4j.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 -->
<java.target.version>1.8</java.target.version>
<bnd.version>5.3.0</bnd.version>
@@ -145,8 +145,8 @@ Bundle-Category: jackrabbit
-snapshot: SNAPSHOT
# export all versioned packages except for conditional ones (https://github.com/bndtools/bnd/issues/3721#issuecomment-579026778)
-exportcontents: ${removeall;${packages;VERSIONED};${packages;CONDITIONAL}}
-# support only DS 1.3 (https://github.com/bndtools/bnd/pull/3121/files)
--dsannotations-options: version;maximum=1.3.0
+# support only DS 1.4 (https://github.com/bndtools/bnd/pull/3121/files)
+-dsannotations-options: version;maximum=1.4.0
]]></bnd>
</configuration>
</execution>
@@ -517,12 +517,12 @@ Bundle-Category: jackrabbit
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
- <version>3.9</version>
+ <version>3.6</version>
</dependency>
<dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- <version>3.2.2</version>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-collections4</artifactId>
+ <version>4.1</version>
</dependency>
<dependency>
<groupId>commons-codec</groupId>
@@ -532,12 +532,12 @@ Bundle-Category: jackrabbit
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpmime</artifactId>
- <version>4.5.3</version>
+ <version>4.5.8</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
- <version>4.5.3</version>
+ <version>4.5.8</version>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
diff --git a/target-osgi-environment/aem6.3.bndrun b/target-osgi-environment/min-target.bndrun
similarity index 100%
rename from target-osgi-environment/aem6.3.bndrun
rename to target-osgi-environment/min-target.bndrun
diff --git a/target-osgi-environment/pom.xml b/target-osgi-environment/pom.xml
index 22e5bd3..cbe383f 100644
--- a/target-osgi-environment/pom.xml
+++ b/target-osgi-environment/pom.xml
@@ -35,7 +35,7 @@
<description>The bndrun files and the used bundles for resolving all FileVault bundles in the minimum support OSGi container</description>
<properties>
- <jackrabbit.version>2.14.0</jackrabbit.version>
+ <jackrabbit.version>2.16.0</jackrabbit.version>
<jackson.version>2.8.4</jackson.version>
</properties>
<!-- ====================================================================== -->
@@ -68,7 +68,7 @@
<configuration>
<attach>false</attach>
<includeGzip>false</includeGzip>
- <scopes>compile,runtime,provided</scopes>
+ <scopes>provided</scopes>
</configuration>
</execution>
</executions>
@@ -76,146 +76,187 @@
</plugins>
</build>
+ <!-- the following dependencies are provided by AEM 6.4, 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>5.6.0</version>
+ <version>5.6.10</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.scr</artifactId>
<version>2.1.0</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.configadmin</artifactId>
<version>1.9.0</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.http.servlet-api</artifactId>
<version>1.1.2</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>1.7.21</version>
+ <version>1.7.25</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
- <version>1.7.21</version>
+ <version>1.7.25</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcore-osgi</artifactId>
- <version>4.4.5</version>
+ <version>4.4.8</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient-osgi</artifactId>
- <version>4.5.2</version>
+ <version>4.5.4</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>15.0</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.5</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ <version>3.6</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
<version>3.2.2</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-collections4</artifactId>
+ <version>4.1</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
<version>1.10</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.daisy.libs</groupId>
<artifactId>commons-httpclient</artifactId>
<version>3.1.0</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.api</artifactId>
- <version>2.16.0</version>
+ <version>2.16.4</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.commons.log</artifactId>
- <version>5.0.0</version>
+ <version>5.1.0</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.commons.classloader</artifactId>
- <version>1.3.8</version>
+ <version>1.4.2</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.commons.json</artifactId>
<version>2.0.20</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.jcr</groupId>
<artifactId>jcr</artifactId>
<version>2.0</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>jackrabbit-api</artifactId>
<version>${jackrabbit.version}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>jackrabbit-webdav</artifactId>
<version>${jackrabbit.version}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>jackrabbit-jcr-commons</artifactId>
<version>${jackrabbit.version}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>jackrabbit-spi-commons</artifactId>
<version>${jackrabbit.version}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.jcr.api</artifactId>
<version>2.4.0</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.jcr.base</artifactId>
- <version>3.0.0</version>
+ <version>3.0.4</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.jcr.oak.server</artifactId>
- <version>1.2.0</version> <!-- uses Oak 1.6.1 -->
+ <version>1.2.0</version> <!-- uses Oak 1.8 -->
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<version>${jackson.version}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>${jackson.version}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
<version>${jackson.version}</version>
+ <scope>provided</scope>
</dependency>
</dependencies>
diff --git a/vault-rcp/aem6.3.bndrun b/vault-core/min-target.bndrun
similarity index 93%
rename from vault-rcp/aem6.3.bndrun
rename to vault-core/min-target.bndrun
index 0c620ab..5359b89 100644
--- a/vault-rcp/aem6.3.bndrun
+++ b/vault-core/min-target.bndrun
@@ -12,4 +12,4 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
--include ../target-osgi-environment/aem6.3.bndrun
\ No newline at end of file
+-include ../target-osgi-environment/min-target.bndrun
\ No newline at end of file
diff --git a/vault-core/pom.xml b/vault-core/pom.xml
index 092c475..e887adc 100644
--- a/vault-core/pom.xml
+++ b/vault-core/pom.xml
@@ -247,12 +247,6 @@
</dependency>
<dependency>
<groupId>org.apache.jackrabbit</groupId>
- <artifactId>jackrabbit-api</artifactId>
- <version>2.16.0</version><!-- use a newer test dependency due to usage of JackrabbitAccessControlList.isMultiValueRestriction in tests -->
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.jackrabbit</groupId>
<artifactId>jackrabbit-core</artifactId>
<version>${jackrabbit.version}</version>
<scope>test</scope>
diff --git a/vault-sync/aem6.3.bndrun b/vault-rcp/min-target.bndrun
similarity index 93%
rename from vault-sync/aem6.3.bndrun
rename to vault-rcp/min-target.bndrun
index 0c620ab..5359b89 100644
--- a/vault-sync/aem6.3.bndrun
+++ b/vault-rcp/min-target.bndrun
@@ -12,4 +12,4 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
--include ../target-osgi-environment/aem6.3.bndrun
\ No newline at end of file
+-include ../target-osgi-environment/min-target.bndrun
\ No newline at end of file
diff --git a/vault-core/aem6.3.bndrun b/vault-sync/min-target.bndrun
similarity index 93%
rename from vault-core/aem6.3.bndrun
rename to vault-sync/min-target.bndrun
index 0c620ab..5359b89 100644
--- a/vault-core/aem6.3.bndrun
+++ b/vault-sync/min-target.bndrun
@@ -12,4 +12,4 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
--include ../target-osgi-environment/aem6.3.bndrun
\ No newline at end of file
+-include ../target-osgi-environment/min-target.bndrun
\ No newline at end of file