[sling-org-apache-sling-jcr-repoinit] 04/29: use Sling parent 29 and adjust some dependencies

[ro...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to annotated tag org.apache.sling.jcr.repoinit-1.1.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-repoinit.git

commit 64abc92da7565da4c3e7583186be9ccb0489a8ba
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Thu Oct 27 14:29:46 2016 +0000

    use Sling parent 29 and adjust some dependencies
    
    git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/jcr/repoinit@1766835 13f79535-47bb-0310-9956-ffa450edef68
---
 pom.xml | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/pom.xml b/pom.xml
index bdbe411..1d9235d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.sling</groupId>
     <artifactId>sling</artifactId>
-    <version>26</version>
+    <version>29</version>
     <relativePath />
   </parent>
 
@@ -35,7 +35,7 @@
 	  Initializes a JCR repository based on the output
 	  of the RepoInit Language parser.
   </description>
-  
+
   <properties>
     <jackrabbit.version>2.10.0</jackrabbit.version>
   </properties>
@@ -45,7 +45,7 @@
     <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/jcr/repoinit</developerConnection>
     <url>https://svn.apache.org/repos/asf/sling/trunk/bundles/jcr/repoinit</url>
   </scm>
-  
+
   <build>
     <plugins>
       <plugin>
@@ -59,19 +59,22 @@
       </plugin>
     </plugins>
   </build>
-  
+
   <dependencies>
     <dependency>
       <groupId>org.osgi</groupId>
-      <artifactId>org.osgi.core</artifactId>
+      <artifactId>osgi.core</artifactId>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.osgi</groupId>
-      <artifactId>org.osgi.compendium</artifactId>
+      <artifactId>osgi.cmpn</artifactId>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
@@ -81,8 +84,7 @@
     <dependency>
       <groupId>javax.jcr</groupId>
       <artifactId>jcr</artifactId>
-	  <version>2.0</version>
-	  <scope>provided</scope>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.jackrabbit</groupId>
@@ -98,7 +100,8 @@
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
+      <artifactId>javax.servlet-api</artifactId>
+      <scope>provided</scope>
     </dependency>
      <dependency>
       <groupId>org.apache.sling</groupId>
@@ -126,6 +129,7 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>commons-io</groupId>

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.