incubator-sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From romb...@apache.org
Subject svn commit: r1540694 - in /sling/trunk: bundles/extensions/event/src/test/java/org/apache/sling/event/it/ bundles/jcr/it-jackrabbit-oak/src/test/java/org/apache/sling/jcr/repository/it/ contrib/extensions/cache/container-test/ contrib/extensions/cache/...
Date Mon, 11 Nov 2013 12:25:06 GMT
Author: rombert
Date: Mon Nov 11 12:25:06 2013
New Revision: 1540694

URL: http://svn.apache.org/r1540694
Log:
SLING-3239 - Upgrade to SCR 1.8.0

Use org.apache.felix.scr in the launchpad/builder and also upgrade the
version referenced in integration tests.

Modified:
    sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/AbstractJobHandlingTest.java
    sling/trunk/bundles/jcr/it-jackrabbit-oak/src/test/java/org/apache/sling/jcr/repository/it/JackrabbitRepositoryIT.java
    sling/trunk/bundles/jcr/it-jackrabbit-oak/src/test/java/org/apache/sling/jcr/repository/it/OakRepositoryIT.java
    sling/trunk/contrib/extensions/cache/container-test/pom.xml
    sling/trunk/contrib/extensions/cache/container-test/src/main/java/org/apache/sling/test/AbstractOSGiRunner.java
    sling/trunk/installer/it/src/test/java/org/apache/sling/installer/it/OsgiInstallerTestBase.java
    sling/trunk/launchpad/builder/src/main/bundles/list.xml

Modified: sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/AbstractJobHandlingTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/AbstractJobHandlingTest.java?rev=1540694&r1=1540693&r2=1540694&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/AbstractJobHandlingTest.java
(original)
+++ sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/AbstractJobHandlingTest.java
Mon Nov 11 12:25:06 2013
@@ -108,7 +108,7 @@ public abstract class AbstractJobHandlin
 
                 mavenBundle("org.apache.felix", "org.apache.felix.http.jetty", "2.2.0"),
                 mavenBundle("org.apache.felix", "org.apache.felix.eventadmin", "1.2.14"),
-                mavenBundle("org.apache.felix", "org.apache.felix.scr", "1.6.2"),
+                mavenBundle("org.apache.felix", "org.apache.felix.scr", "1.8.0"),
                 mavenBundle("org.apache.felix", "org.apache.felix.configadmin", "1.6.0"),
                 mavenBundle("org.apache.felix", "org.apache.felix.inventory", "1.0.0"),
 //                mavenBundle("org.apache.felix", "org.apache.felix.metatype", "1.0.6"),
@@ -261,4 +261,4 @@ public abstract class AbstractJobHandlin
             cfg.delete();
         }
     }
-}
\ No newline at end of file
+}

Modified: sling/trunk/bundles/jcr/it-jackrabbit-oak/src/test/java/org/apache/sling/jcr/repository/it/JackrabbitRepositoryIT.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/it-jackrabbit-oak/src/test/java/org/apache/sling/jcr/repository/it/JackrabbitRepositoryIT.java?rev=1540694&r1=1540693&r2=1540694&view=diff
==============================================================================
--- sling/trunk/bundles/jcr/it-jackrabbit-oak/src/test/java/org/apache/sling/jcr/repository/it/JackrabbitRepositoryIT.java
(original)
+++ sling/trunk/bundles/jcr/it-jackrabbit-oak/src/test/java/org/apache/sling/jcr/repository/it/JackrabbitRepositoryIT.java
Mon Nov 11 12:25:06 2013
@@ -66,7 +66,7 @@ public class JackrabbitRepositoryIT exte
 
                 mavenBundle("org.apache.felix", "org.apache.felix.http.jetty", "2.2.0"),
                 mavenBundle("org.apache.felix", "org.apache.felix.eventadmin", "1.2.14"),
-                mavenBundle("org.apache.felix", "org.apache.felix.scr", "1.6.2"),
+                mavenBundle("org.apache.felix", "org.apache.felix.scr", "1.8.0"),
                 mavenBundle("org.apache.felix", "org.apache.felix.configadmin", "1.6.0"),
                 mavenBundle("org.apache.felix", "org.apache.felix.inventory", "1.0.0"),
 

Modified: sling/trunk/bundles/jcr/it-jackrabbit-oak/src/test/java/org/apache/sling/jcr/repository/it/OakRepositoryIT.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/it-jackrabbit-oak/src/test/java/org/apache/sling/jcr/repository/it/OakRepositoryIT.java?rev=1540694&r1=1540693&r2=1540694&view=diff
==============================================================================
--- sling/trunk/bundles/jcr/it-jackrabbit-oak/src/test/java/org/apache/sling/jcr/repository/it/OakRepositoryIT.java
(original)
+++ sling/trunk/bundles/jcr/it-jackrabbit-oak/src/test/java/org/apache/sling/jcr/repository/it/OakRepositoryIT.java
Mon Nov 11 12:25:06 2013
@@ -67,7 +67,7 @@ public class OakRepositoryIT extends Com
 
                 mavenBundle("org.apache.felix", "org.apache.felix.http.jetty", "2.2.0"),
                 mavenBundle("org.apache.felix", "org.apache.felix.eventadmin", "1.2.14"),
-                mavenBundle("org.apache.felix", "org.apache.felix.scr", "1.6.2"),
+                mavenBundle("org.apache.felix", "org.apache.felix.scr", "1.8.0"),
                 mavenBundle("org.apache.felix", "org.apache.felix.configadmin", "1.6.0"),
                 mavenBundle("org.apache.felix", "org.apache.felix.inventory", "1.0.0"),
 

Modified: sling/trunk/contrib/extensions/cache/container-test/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/cache/container-test/pom.xml?rev=1540694&r1=1540693&r2=1540694&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/cache/container-test/pom.xml (original)
+++ sling/trunk/contrib/extensions/cache/container-test/pom.xml Mon Nov 11 12:25:06 2013
@@ -109,7 +109,7 @@
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.scr</artifactId>
-            <version>1.6.0</version>
+            <version>1.8.0</version>
         </dependency>
 
     </dependencies>

Modified: sling/trunk/contrib/extensions/cache/container-test/src/main/java/org/apache/sling/test/AbstractOSGiRunner.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/cache/container-test/src/main/java/org/apache/sling/test/AbstractOSGiRunner.java?rev=1540694&r1=1540693&r2=1540694&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/cache/container-test/src/main/java/org/apache/sling/test/AbstractOSGiRunner.java
(original)
+++ sling/trunk/contrib/extensions/cache/container-test/src/main/java/org/apache/sling/test/AbstractOSGiRunner.java
Mon Nov 11 12:25:06 2013
@@ -109,7 +109,7 @@ public  abstract class AbstractOSGiRunne
 						// url resolution for pax
 						mavenBundle("org.ops4j.pax.url", "pax-url-mvn", "1.3.5"),
 						// to support declarative services
-						mavenBundle("org.apache.felix", "org.apache.felix.scr", "1.6.0"),
+						mavenBundle("org.apache.felix", "org.apache.felix.scr", "1.8.0"),
 						// bound to need servlet api
 						mavenBundle("org.apache.felix", "javax.servlet","1.0.0"),
 						// standard items.

Modified: sling/trunk/installer/it/src/test/java/org/apache/sling/installer/it/OsgiInstallerTestBase.java
URL: http://svn.apache.org/viewvc/sling/trunk/installer/it/src/test/java/org/apache/sling/installer/it/OsgiInstallerTestBase.java?rev=1540694&r1=1540693&r2=1540694&view=diff
==============================================================================
--- sling/trunk/installer/it/src/test/java/org/apache/sling/installer/it/OsgiInstallerTestBase.java
(original)
+++ sling/trunk/installer/it/src/test/java/org/apache/sling/installer/it/OsgiInstallerTestBase.java
Mon Nov 11 12:25:06 2013
@@ -407,7 +407,7 @@ class OsgiInstallerTestBase implements F
                         mavenBundle("org.slf4j", "jcl-over-slf4j", "1.6.4"),
                         mavenBundle("org.slf4j", "log4j-over-slf4j", "1.6.4"),
 
-        	            mavenBundle("org.apache.felix", "org.apache.felix.scr", "1.6.0"),
+        	            mavenBundle("org.apache.felix", "org.apache.felix.scr", "1.8.0"),
         	            mavenBundle("org.apache.felix", "org.apache.felix.configadmin", "1.2.8"),
                         mavenBundle("org.apache.felix", "org.apache.felix.metatype", "1.0.2"),
         	        	mavenBundle("org.apache.sling", "org.apache.sling.installer.core", POM_VERSION),
@@ -574,4 +574,4 @@ class OsgiInstallerTestBase implements F
             }
         }
     }
-}
\ No newline at end of file
+}

Modified: sling/trunk/launchpad/builder/src/main/bundles/list.xml
URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/builder/src/main/bundles/list.xml?rev=1540694&r1=1540693&r2=1540694&view=diff
==============================================================================
--- sling/trunk/launchpad/builder/src/main/bundles/list.xml (original)
+++ sling/trunk/launchpad/builder/src/main/bundles/list.xml Mon Nov 11 12:25:06 2013
@@ -422,7 +422,7 @@
         <bundle>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.scr</artifactId>
-            <version>1.6.0</version>
+            <version>1.8.0</version>
         </bundle>
         <bundle>
             <groupId>org.apache.felix</groupId>



Mime
View raw message