SLING-1205 Upgrade all projects to parent POM 8 and use OSGi provided OSGi libraries
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@885680 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/espblog/pom.xml b/espblog/pom.xml
index a2eba2e..b7795b0 100644
--- a/espblog/pom.xml
+++ b/espblog/pom.xml
@@ -12,7 +12,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>6</version>
+ <version>8</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
@@ -76,12 +76,12 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.felix</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.felix</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<scope>provided</scope>
</dependency>
diff --git a/javashell/pom.xml b/javashell/pom.xml
index 66ffcc7..b1202dd 100644
--- a/javashell/pom.xml
+++ b/javashell/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>6</version>
+ <version>8</version>
<relativePath>../../../parent/pom.xml</relativePath>
</parent>
diff --git a/path-based-rtp/pom.xml b/path-based-rtp/pom.xml
index c39e81a..3a36be6 100644
--- a/path-based-rtp/pom.xml
+++ b/path-based-rtp/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>6</version>
+ <version>8</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
<groupId>org.apache.sling.samples</groupId>
@@ -96,11 +96,11 @@
<!-- OSGi Libraries -->
<dependency>
- <groupId>org.apache.felix</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.felix</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
</dependency>
</dependencies>
diff --git a/post-servlet-extensions/pom.xml b/post-servlet-extensions/pom.xml
index a0c54d0..1e1b048 100644
--- a/post-servlet-extensions/pom.xml
+++ b/post-servlet-extensions/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>6</version>
+ <version>8</version>
<relativePath>../../../parent/pom.xml</relativePath>
</parent>
@@ -102,12 +102,12 @@
<!-- OSGi Libraries -->
<dependency>
- <groupId>org.apache.felix</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.felix</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
</dependency>
diff --git a/simple-demo/pom.xml b/simple-demo/pom.xml
index 9473d73..930f1be 100644
--- a/simple-demo/pom.xml
+++ b/simple-demo/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>6</version>
+ <version>8</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
@@ -170,7 +170,7 @@
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.felix</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
</dependency>
</dependencies>
diff --git a/webloader/service/pom.xml b/webloader/service/pom.xml
index 8434c38..5f48c4a 100644
--- a/webloader/service/pom.xml
+++ b/webloader/service/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>6</version>
+ <version>8</version>
<relativePath>../../../parent/pom.xml</relativePath>
</parent>
diff --git a/webloader/ui/pom.xml b/webloader/ui/pom.xml
index 44d6fdc..f103cce 100644
--- a/webloader/ui/pom.xml
+++ b/webloader/ui/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>6</version>
+ <version>8</version>
<relativePath>../../../parent/pom.xml</relativePath>
</parent>
