You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ol...@apache.org on 2014/11/20 12:00:06 UTC
svn commit: r1640720 - in /sling/trunk/contrib/launchpad/karaf: org.apache.sling.launchpad.karaf-features/src/main/feature/feature.xml org.apache.sling.launchpad.karaf-integration-tests/pom.xml

Author: olli
Date: Thu Nov 20 11:00:06 2014
New Revision: 1640720

URL: http://svn.apache.org/r1640720
Log:
SLING-3027 use latest releases (Sling Engine, Sling Servlets Resolver)

Modified:
    sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-features/src/main/feature/feature.xml
    sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/pom.xml

Modified: sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-features/src/main/feature/feature.xml
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-features/src/main/feature/feature.xml?rev=1640720&r1=1640719&r2=1640720&view=diff
==============================================================================
--- sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-features/src/main/feature/feature.xml (original)
+++ sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-features/src/main/feature/feature.xml Thu Nov 20 11:00:06 2014
@@ -43,7 +43,7 @@
     <feature version="${project.version}">commons-sling</feature>
     <bundle>mvn:org.apache.sling/org.apache.sling.api/2.8.0</bundle>
     <bundle>mvn:org.apache.sling/org.apache.sling.auth.core/1.3.2</bundle>
-    <bundle>mvn:org.apache.sling/org.apache.sling.engine/2.3.8</bundle>
+    <bundle>mvn:org.apache.sling/org.apache.sling.engine/2.3.10</bundle>
     <!-- org.apache.sling.resourceresolver requires jcr -->
     <bundle>mvn:org.apache.sling/org.apache.sling.resourceresolver/1.1.6</bundle>
     <bundle>mvn:org.apache.sling/org.apache.sling.serviceusermapper/1.0.4</bundle>
@@ -237,7 +237,7 @@
     <feature version="${project.version}">sling-jcr</feature>
     <bundle>mvn:org.apache.sling/org.apache.sling.servlets.get/2.1.10</bundle>
     <bundle>mvn:org.apache.sling/org.apache.sling.servlets.post/2.3.6</bundle>
-    <bundle>mvn:org.apache.sling/org.apache.sling.servlets.resolver/2.3.4</bundle>
+    <bundle>mvn:org.apache.sling/org.apache.sling.servlets.resolver/2.3.6</bundle>
   </feature>
   <!-- Apache Jackrabbit -->
   <feature name="jackrabbit-sling" version="${project.version}">

Modified: sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/pom.xml?rev=1640720&r1=1640719&r2=1640720&view=diff
==============================================================================
--- sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/pom.xml (original)
+++ sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/pom.xml Thu Nov 20 11:00:06 2014
@@ -71,7 +71,7 @@
     <dependency>
       <groupId>org.apache.sling</groupId>
       <artifactId>org.apache.sling.engine</artifactId>
-      <version>2.3.8</version>
+      <version>2.3.10</version>
       <scope>test</scope>
     </dependency>
     <!-- logging -->
@@ -159,10 +159,10 @@
               </execution>
             </executions>
             <configuration>
-              <excludes>
-                <exclude>**/SlingExtensionModelsIT.*</exclude>
-                <exclude>**/SlingScriptingJavaIT.*</exclude>
-              </excludes>
+              <includes>
+                <include>**/SlingExtensionModelsIT.*</include>
+                <!-- <include>**/SlingScriptingJavaIT.*</include> -->
+              </includes>
             </configuration>
           </plugin>
         </plugins>