You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ss...@apache.org on 2021/12/01 20:26:15 UTC
[sling-org-apache-sling-models-validation-impl] branch feature/SLING-10960-osgi-r7-annotations created (now 60b7b3d)
This is an automated email from the ASF dual-hosted git repository.
sseifert pushed a change to branch feature/SLING-10960-osgi-r7-annotations
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-models-validation-impl.git.
at 60b7b3d SLING-10960 switch to OSGI R7 annotations and update to sling-bundle-parent 46 also update integration tests to Sling 11 to ensure they can be run with Java 8 and Java 11
This branch includes the following new commits:
new 60b7b3d SLING-10960 switch to OSGI R7 annotations and update to sling-bundle-parent 46 also update integration tests to Sling 11 to ensure they can be run with Java 8 and Java 11
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-models-validation-impl] 01/01: SLING-10960 switch to OSGI R7 annotations and update to sling-bundle-parent 46 also update integration tests to Sling 11 to ensure they can be run with Java 8 and Java 11
Posted by ss...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sseifert pushed a commit to branch feature/SLING-10960-osgi-r7-annotations
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-models-validation-impl.git
commit 60b7b3de0a9be33d43365201cea069c84204e8ad
Author: Stefan Seifert <st...@users.noreply.github.com>
AuthorDate: Wed Dec 1 21:07:22 2021 +0100
SLING-10960 switch to OSGI R7 annotations and update to sling-bundle-parent 46
also update integration tests to Sling 11 to ensure they can be run with Java 8 and Java 11
---
pom.xml | 12 ++++++++----
src/test/provisioning/model.txt | 6 +++---
2 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/pom.xml b/pom.xml
index 4a4fff8..9f7245e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling-bundle-parent</artifactId>
- <version>39</version>
+ <version>46</version>
<relativePath />
</parent>
@@ -159,6 +159,7 @@
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.annotation.versioning</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
@@ -175,13 +176,11 @@
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.service.component.annotations</artifactId>
- <version>1.3.0</version> <!-- downgrade to DS 1.3 (OSGi R6), as this leads to a run time dependency -->
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.service.metatype.annotations</artifactId>
- <version>1.3.0</version> <!-- downgrade to metatype 1.3 (OSGi R6) -->
<scope>provided</scope>
</dependency>
<dependency>
@@ -225,7 +224,12 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.junit.teleporter</artifactId>
- <version>1.0.14</version>
+ <version>1.0.20</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.framework</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/src/test/provisioning/model.txt b/src/test/provisioning/model.txt
index ac33fec..3d5bb54 100644
--- a/src/test/provisioning/model.txt
+++ b/src/test/provisioning/model.txt
@@ -19,11 +19,11 @@
[feature name=models.validation-impl.it]
# Dependencies
[artifacts]
- org.apache.sling/org.apache.sling.launchpad/9/slingstart
+ org.apache.sling/org.apache.sling.starter/11/slingstart
# this is necessary to execute the tests
- org.apache.sling/org.apache.sling.junit.core/1.0.26
+ org.apache.sling/org.apache.sling.junit.core/1.0.28
# deploy the to-be-tested bundle as well
- org.apache.sling/org.apache.sling.models.validation-impl/1.0.0-SNAPSHOT
+ org.apache.sling/org.apache.sling.models.validation-impl
[configurations]
# configure service user mapping for validation framework