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/09/17 16:40:07 UTC
svn commit: r1625615 - in /sling/trunk/contrib/launchpad/karaf:
org.apache.sling.launchpad.karaf-features/src/main/feature/
org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/
Author: olli
Date: Wed Sep 17 14:40:06 2014
New Revision: 1625615
URL: http://svn.apache.org/r1625615
Log:
SLING-3027 SLING-3017 downgrade Sling Scripting Java to version 2.0.6
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/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingScriptingJavaIT.java
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=1625615&r1=1625614&r2=1625615&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 Wed Sep 17 14:40:06 2014
@@ -295,12 +295,11 @@
<!-- bundle dependencies -->
<bundle dependency="true">mvn:org.codehaus.groovy/groovy-all/1.8.0</bundle>
</feature>
- <feature name="sling-scripting-java" version="2.0.11-SNAPSHOT">
+ <feature name="sling-scripting-java" version="2.0.6">
<feature version="${project.version}">sling</feature>
<feature version="${project.version}">sling-scripting</feature>
- <bundle>mvn:org.apache.sling/org.apache.sling.scripting.java/2.0.11-SNAPSHOT</bundle>
+ <bundle>mvn:org.apache.sling/org.apache.sling.scripting.java/2.0.6</bundle>
<!-- bundle dependencies -->
- <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-atinject_1.0_spec/1.0</bundle>
<bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-servlet_3.0_spec/1.0</bundle>
</feature>
<feature name="sling-scripting-thymeleaf" version="0.0.2">
Modified: sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingScriptingJavaIT.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingScriptingJavaIT.java?rev=1625615&r1=1625614&r2=1625615&view=diff
==============================================================================
--- sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingScriptingJavaIT.java (original)
+++ sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingScriptingJavaIT.java Wed Sep 17 14:40:06 2014
@@ -51,13 +51,6 @@ public class SlingScriptingJavaIT extend
}
@Test
- public void testOrgApacheGeronimoSpecsGeronimoAtinject_1_0_Spec() {
- final Bundle bundle = findBundle("org.apache.geronimo.specs.geronimo-atinject_1.0_spec");
- assertNotNull(bundle);
- assertEquals(Bundle.ACTIVE, bundle.getState());
- }
-
- @Test
public void testOrgApacheGeronimoSpecsGeronimoServlet_3_0_Spec() {
final Bundle bundle = findBundle("org.apache.geronimo.specs.geronimo-servlet_3.0_spec");
assertNotNull(bundle);