You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ol...@apache.org on 2018/01/20 21:23:38 UTC
[sling-samples] branch master updated (bfaf7e0 -> 1068426)
This is an automated email from the ASF dual-hosted git repository.
olli pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/sling-samples.git.
from bfaf7e0 SLING-7308 - Sling 9 Compatibility
new 7c2421b SLING-7353 Update to Sling Parent 33
new 1068426 SLING-7353 Update to Sling Parent 33
The 2 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.
Summary of changes:
slingshot/pom.xml | 11 +++++++++--
testing/module-with-it/pom.xml | 17 ++++-------------
2 files changed, 13 insertions(+), 15 deletions(-)
--
To stop receiving notification emails like this one, please contact
['"commits@sling.apache.org" <co...@sling.apache.org>'].
[sling-samples] 01/02: SLING-7353 Update to Sling Parent 33
Posted by ol...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
olli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-samples.git
commit 7c2421be1ace69af277811f734121c779276a8c1
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Sat Jan 20 22:22:31 2018 +0100
SLING-7353 Update to Sling Parent 33
---
slingshot/pom.xml | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/slingshot/pom.xml b/slingshot/pom.xml
index be5620c..51eddc2 100644
--- a/slingshot/pom.xml
+++ b/slingshot/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>30</version>
+ <version>33</version>
<relativePath />
</parent>
@@ -79,7 +79,6 @@
<plugin>
<groupId>org.apache.sling</groupId>
<artifactId>slingstart-maven-plugin</artifactId>
- <version>1.7.0</version>
<extensions>true</extensions>
<executions>
<execution>
@@ -166,10 +165,18 @@
</profiles>
<dependencies>
+ <!-- OSGi -->
<dependency>
<groupId>org.osgi</groupId>
<artifactId>osgi.core</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.annotation.versioning</artifactId>
+ <scope>provided</scope>
</dependency>
+ <!-- Apache Sling -->
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.api</artifactId>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-samples] 02/02: SLING-7353 Update to Sling Parent 33
Posted by ol...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
olli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-samples.git
commit 1068426dfc35f8b3205b4e34143ae8293ba6b5e8
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Sat Jan 20 22:23:19 2018 +0100
SLING-7353 Update to Sling Parent 33
---
testing/module-with-it/pom.xml | 17 ++++-------------
1 file changed, 4 insertions(+), 13 deletions(-)
diff --git a/testing/module-with-it/pom.xml b/testing/module-with-it/pom.xml
index 2f7c53a..49fb727 100644
--- a/testing/module-with-it/pom.xml
+++ b/testing/module-with-it/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>26</version>
+ <version>33</version>
<relativePath/>
</parent>
@@ -52,10 +52,6 @@
<build>
<plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-scr-plugin</artifactId>
- </plugin>
<plugin>
<!-- Find free ports to run our server -->
<groupId>org.codehaus.mojo</groupId>
@@ -80,7 +76,6 @@
<!-- the Sling instance is provisioned from the model in src/main/provisioning/model.txt -->
<groupId>org.apache.sling</groupId>
<artifactId>slingstart-maven-plugin</artifactId>
- <version>1.7.0</version>
<extensions>true</extensions>
<executions>
<execution>
@@ -162,11 +157,11 @@
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
+ <artifactId>osgi.core</artifactId>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
+ <artifactId>osgi.cmpn</artifactId>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
@@ -176,14 +171,10 @@
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
+ <artifactId>javax.servlet-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.scr.annotations</artifactId>
- </dependency>
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.