sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sseif...@apache.org
Subject svn commit: r1756521 - in /sling/trunk/testing/mocks: logging-mock/pom.xml osgi-mock/pom.xml sling-mock-oak/pom.xml sling-mock/pom.xml
Date Tue, 16 Aug 2016 15:03:14 GMT
Author: sseifert
Date: Tue Aug 16 15:03:14 2016
New Revision: 1756521

URL: http://svn.apache.org/viewvc?rev=1756521&view=rev
Log:
SLING-5970 mocks: Update to Parent Pom 28

Modified:
    sling/trunk/testing/mocks/logging-mock/pom.xml
    sling/trunk/testing/mocks/osgi-mock/pom.xml
    sling/trunk/testing/mocks/sling-mock-oak/pom.xml
    sling/trunk/testing/mocks/sling-mock/pom.xml

Modified: sling/trunk/testing/mocks/logging-mock/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/testing/mocks/logging-mock/pom.xml?rev=1756521&r1=1756520&r2=1756521&view=diff
==============================================================================
--- sling/trunk/testing/mocks/logging-mock/pom.xml (original)
+++ sling/trunk/testing/mocks/logging-mock/pom.xml Tue Aug 16 15:03:14 2016
@@ -23,12 +23,12 @@
     <parent>
         <groupId>org.apache.sling</groupId>
         <artifactId>sling</artifactId>
-        <version>26</version>
+        <version>28</version>
         <relativePath/>
     </parent>
 
     <artifactId>org.apache.sling.testing.logging-mock</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>2.0.0-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
     <name>Apache Sling Testing Mock Log Configuration</name>

Modified: sling/trunk/testing/mocks/osgi-mock/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/testing/mocks/osgi-mock/pom.xml?rev=1756521&r1=1756520&r2=1756521&view=diff
==============================================================================
--- sling/trunk/testing/mocks/osgi-mock/pom.xml (original)
+++ sling/trunk/testing/mocks/osgi-mock/pom.xml Tue Aug 16 15:03:14 2016
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.sling</groupId>
         <artifactId>sling</artifactId>
-        <version>26</version>
+        <version>28</version>
         <relativePath />
     </parent>
 
@@ -42,17 +42,14 @@
     
     <dependencies>
   
-        <!-- This version of OSGi mocks is targeted at OSGi R6. osgi-mocks 1.x is compatible
with older versions. -->
         <dependency>
             <groupId>org.osgi</groupId>
             <artifactId>osgi.core</artifactId>
-            <version>6.0.0</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.osgi</groupId>
             <artifactId>osgi.cmpn</artifactId>
-            <version>6.0.0</version>
             <scope>compile</scope>
         </dependency>
 
@@ -118,7 +115,7 @@
         <dependency>
             <groupId>org.apache.sling</groupId>
             <artifactId>org.apache.sling.testing.logging-mock</artifactId>
-            <version>1.0.0</version>
+            <version>2.0.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 

Modified: sling/trunk/testing/mocks/sling-mock-oak/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/testing/mocks/sling-mock-oak/pom.xml?rev=1756521&r1=1756520&r2=1756521&view=diff
==============================================================================
--- sling/trunk/testing/mocks/sling-mock-oak/pom.xml (original)
+++ sling/trunk/testing/mocks/sling-mock-oak/pom.xml Tue Aug 16 15:03:14 2016
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.sling</groupId>
         <artifactId>sling</artifactId>
-        <version>26</version>
+        <version>28</version>
         <relativePath />
     </parent>
 
@@ -82,10 +82,15 @@
             <version>${jackrabbit.version}</version>
         </dependency>
 
+        <!-- those two compile dependencies are requires to avoid "Dependency-reduced
POM written" endless loop in maven-shade-plugin -->
         <dependency>
             <groupId>javax.jcr</groupId>
             <artifactId>jcr</artifactId>
-            <version>2.0</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>javax.servlet-api</artifactId>
             <scope>compile</scope>
         </dependency>
 
@@ -103,7 +108,7 @@
         <dependency>
             <groupId>org.apache.sling</groupId>
             <artifactId>org.apache.sling.testing.logging-mock</artifactId>
-            <version>1.0.0</version>
+            <version>2.0.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
   
@@ -147,7 +152,7 @@
           <plugin>
               <groupId>org.apache.maven.plugins</groupId>
               <artifactId>maven-shade-plugin</artifactId>
-              <version>2.4.1</version>
+              <version>2.4.3</version>
               <configuration>
                 <!--
                     embed all jackrabbit artifacts to prevent classpath clashes

Modified: sling/trunk/testing/mocks/sling-mock/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/testing/mocks/sling-mock/pom.xml?rev=1756521&r1=1756520&r2=1756521&view=diff
==============================================================================
--- sling/trunk/testing/mocks/sling-mock/pom.xml (original)
+++ sling/trunk/testing/mocks/sling-mock/pom.xml Tue Aug 16 15:03:14 2016
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.sling</groupId>
         <artifactId>sling</artifactId>
-        <version>26</version>
+        <version>28</version>
         <relativePath />
     </parent>
 
@@ -45,13 +45,13 @@
         <dependency>
             <groupId>org.apache.sling</groupId>
             <artifactId>org.apache.sling.testing.osgi-mock</artifactId>
-            <version>2.0.4</version>
+            <version>2.0.5-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.sling</groupId>
             <artifactId>org.apache.sling.testing.jcr-mock</artifactId>
-            <version>1.1.14</version>
+            <version>1.1.15-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
@@ -212,7 +212,6 @@
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>javax.servlet-api</artifactId>
-            <version>3.0.1</version>
             <scope>compile</scope>
         </dependency>
     
@@ -226,7 +225,6 @@
         <dependency>
             <groupId>javax.jcr</groupId>
             <artifactId>jcr</artifactId>
-            <version>2.0</version>
             <scope>compile</scope>
         </dependency>
     
@@ -244,7 +242,7 @@
         <dependency>
             <groupId>org.apache.sling</groupId>
             <artifactId>org.apache.sling.testing.logging-mock</artifactId>
-            <version>1.0.0</version>
+            <version>2.0.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 



Mime
View raw message