You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by cz...@apache.org on 2019/05/07 12:29:47 UTC

[sling-whiteboard] branch master updated: Update to latest parent pom and clean up pom

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

cziegeler pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-whiteboard.git


The following commit(s) were added to refs/heads/master by this push:
     new a896743  Update to latest parent pom and clean up pom
a896743 is described below

commit a896743e13acffb26b45746be984b00bcb628276
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Tue May 7 14:29:38 2019 +0200

    Update to latest parent pom and clean up pom
---
 sfsresourceprovider/pom.xml | 54 +++++++++++++--------------------------------
 1 file changed, 15 insertions(+), 39 deletions(-)

diff --git a/sfsresourceprovider/pom.xml b/sfsresourceprovider/pom.xml
index 8516b0c..b0f193b 100644
--- a/sfsresourceprovider/pom.xml
+++ b/sfsresourceprovider/pom.xml
@@ -15,8 +15,9 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.sling</groupId>
-        <artifactId>sling</artifactId>
-        <version>33</version>
+        <artifactId>sling-bundle-parent</artifactId>
+        <version>35</version>
+        <relativePath/>
     </parent>
 
     <artifactId>org.apache.sling.sfsresourceprovider</artifactId>
@@ -24,26 +25,28 @@
 
     <name>Apache Sling Simple File System Resource Provider</name>
 
+    <properties>
+        <sling.java.version>8</sling.java.version>
+    </properties>
+
     <build>
         <plugins>
             <plugin>
                 <groupId>biz.aQute.bnd</groupId>
-                <artifactId>bnd-maven-plugin</artifactId>
-		<version>4.1.0</version>
-		<executions>
-                    <execution>
-                        <id>run-bnd</id>
-                        <goals>
-                            <goal>bnd-process</goal>
-                        </goals>
-                    </execution>
-                </executions>
+                <artifactId>bnd-baseline-maven-plugin</artifactId>
+                <configuration>
+                     <skip>true</skip> <!-- Need to be disabled as there is no previous version -->
+                </configuration>
             </plugin>
         </plugins>
     </build>
 
     <dependencies>
         <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+        </dependency>
+        <dependency>
             <groupId>org.apache.sling</groupId>
             <artifactId>org.apache.sling.api</artifactId>
             <version>2.18.4</version>
@@ -61,32 +64,5 @@
 	    <version>1.4.0</version>
             <scope>provided</scope>
         </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.sling</groupId>
-            <artifactId>org.apache.sling.testing.sling-mock</artifactId>
-            <version>2.2.6</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.sling</groupId>
-            <artifactId>org.apache.sling.testing.logging-mock</artifactId>
-            <version>2.0.0</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.sling</groupId>
-            <artifactId>org.apache.sling.testing.hamcrest</artifactId>
-            <version>1.0.2</version>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
-    <properties>
-        <sling.java.version>8</sling.java.version>
-    </properties>
 </project>