Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions parent/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -53,11 +53,11 @@ Apache Jackrabbit FileVault is a project of the Apache Software Foundation.
<!-- for dependencies used for calculating OSGi import-package version ranges the minimally supported version should be used to be backwards compatible in OSGi containers -->
<jackrabbit.min.version>2.20.17</jackrabbit.min.version>
<!-- for embedded dependencies the newest version should be used -->
<jackrabbit.max.version>2.22.1</jackrabbit.max.version>
<jackrabbit.max.version>2.22.2</jackrabbit.max.version>
<!-- for dependencies used for calculating OSGi import-package version ranges the minimally supported version should be used to be backwards compatible in OSGi containers -->
<oak.min.version>1.22.4</oak.min.version>
<!-- for embedded dependencies the newest version should be used -->
<oak.max.version>1.82.0</oak.max.version>
<oak.max.version>1.84.0</oak.max.version>
<slf4j.version>1.7.25</slf4j.version>
<commons-io.version>2.7</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 -->
Expand Down
25 changes: 12 additions & 13 deletions target-osgi-environment/max-target-osgi-environment/pom.xml
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In line40 the comment must be changed (was wrong right from the beginning), it used to reflect the bundles provided by some AEMaaCS version.

Original file line number Diff line number Diff line change
Expand Up @@ -37,18 +37,18 @@
<jackson.version>2.13.4</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 AEMaaCS, 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 -->
Expand Down Expand Up @@ -79,7 +79,7 @@
<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>
Expand All @@ -91,14 +91,14 @@
<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>
Expand All @@ -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.18.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>
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why is this necessary in this context? IMHO the max versions are never used to calculate import package version ranges....

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry, indeed we are embedding the max versions of some JR2 artifacts even in the OSGi bundles. Should we rethink this? Currently those are

-conditionalpackage: org.apache.jackrabbit.jcr2spi.*
. I guess the runtime requirement for Collections 4.5 comes from that, right?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The requirement comes from the fact that otherwise ITs fails because they need 4.5.0.

<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 -->
Expand Down Expand Up @@ -189,7 +189,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>
Expand All @@ -216,6 +216,5 @@
<version>${jackson.version}</version>
<scope>provided</scope>
</dependency>

</dependencies>
</project>