You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by kw...@apache.org on 2021/12/02 08:32:09 UTC
[sling-org-apache-sling-validation-core] branch feature/upgrade-to-parent46 created (now fdd8712)
This is an automated email from the ASF dual-hosted git repository.
kwin pushed a change to branch feature/upgrade-to-parent46
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-validation-core.git.
at fdd8712 SLING-10958 Upgrade to parent 46
This branch includes the following new commits:
new fdd8712 SLING-10958 Upgrade to parent 46
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[sling-org-apache-sling-validation-core] 01/01: SLING-10958 Upgrade to parent 46
Posted by kw...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
kwin pushed a commit to branch feature/upgrade-to-parent46
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-validation-core.git
commit fdd87121e0a4f68a7d89fba054627e63c8289a72
Author: Konrad Windszus <kw...@apache.org>
AuthorDate: Thu Dec 2 09:31:58 2021 +0100
SLING-10958 Upgrade to parent 46
Use IT based on Sling Starter 11 to run with Java 11
---
bnd.bnd | 3 ++
pom.xml | 64 ++++++++++++++++++++++-------------------
src/test/provisioning/model.txt | 4 +--
3 files changed, 40 insertions(+), 31 deletions(-)
diff --git a/bnd.bnd b/bnd.bnd
new file mode 100644
index 0000000..97cce81
--- /dev/null
+++ b/bnd.bnd
@@ -0,0 +1,3 @@
+# embed the commons.osgi bundle as described in http://njbartlett.name/2014/05/26/static-linking.html, to make this bundle compatible with older versions of Sling
+Conditional-Package:org.apache.sling.commons.osgi
+Sling-Initial-Content:SLING-INF/libs/sling/validation/i18n;overwrite:=true;path:=/libs/sling/validation/i18n
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index a0f2308..4726f8b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,17 +21,17 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.sling</groupId>
- <artifactId>sling</artifactId>
- <version>33</version>
+ <artifactId>sling-bundle-parent</artifactId>
+ <version>46</version>
<relativePath />
</parent>
<artifactId>org.apache.sling.validation.core</artifactId>
- <packaging>bundle</packaging>
<version>1.0.5-SNAPSHOT</version>
<properties>
<sling.java.version>8</sling.java.version>
+ <project.build.outputTimestamp>2020-01-22T15:10:38Z</project.build.outputTimestamp>
<!-- start with -DkeepITServerRunning=true to allow to rerun ITs or inspect the server after the ITs have been executed there -->
<keepITServerRunning>false</keepITServerRunning>
</properties>
@@ -49,19 +49,6 @@
<build>
<plugins>
<plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <!-- embed the commons.osgi bundle as described in http://njbartlett.name/2014/05/26/static-linking.html,
- to make this bundle compatible with older versions of Sling -->
- <Conditional-Package>org.apache.sling.commons.osgi</Conditional-Package>
- <Sling-Initial-Content>SLING-INF/libs/sling/validation/i18n;overwrite:=true;path:=/libs/sling/validation/i18n</Sling-Initial-Content>
- </instructions>
- </configuration>
- </plugin>
- <plugin>
<!-- Find free ports to run our server -->
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
@@ -158,6 +145,36 @@
</build>
<dependencies>
<dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.annotation.versioning</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.component.annotations</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.metatype.annotations</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.framework</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.event</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.component</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.api</artifactId>
<!-- for now we should rely on 2.9.0 only (not newer) to stay compatible with older Sling distributions -->
@@ -179,7 +196,6 @@
<dependency>
<groupId>org.jetbrains</groupId>
<artifactId>annotations</artifactId>
- <version>16.0.2</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -188,16 +204,6 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi.cmpn</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi.core</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>jackrabbit-jcr-commons</artifactId>
<version>2.14.0</version>
@@ -218,8 +224,8 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
- <!-- need at least 3.1 for OSGi due to https://issues.apache.org/jira/browse/LANG-749 -->
- <version>3.1</version>
+ <!-- need at least 3.8 for building with Java 11: https://issues.apache.org/jira/browse/LANG-1384 -->
+ <version>3.8</version>
<scope>provided</scope>
</dependency>
<!-- for the SlingPostProcessor (https://issues.apache.org/jira/browse/SLING-594)-->
diff --git a/src/test/provisioning/model.txt b/src/test/provisioning/model.txt
index 6ae8524..0d925bc 100644
--- a/src/test/provisioning/model.txt
+++ b/src/test/provisioning/model.txt
@@ -17,11 +17,11 @@
# under the License.
#
-# must be the same feature name as the feature defined in slingstart to allow merging
+# must be the same feature name as the feature defined in starter to allow merging
[feature name=sling-validation]
# Dependencies
[artifacts]
- org.apache.sling/org.apache.sling.launchpad/9/slingstart
+ org.apache.sling/org.apache.sling.starter/11/slingstart
# the following additional bundles have their versions specified in the pom.xml
# this assures that the IT always runs against the right version
org.apache.sling/org.apache.sling.validation.core