sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From o...@apache.org
Subject svn commit: r1625622 - 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/
Date Wed, 17 Sep 2014 15:03:24 GMT
Author: olli
Date: Wed Sep 17 15:03:24 2014
New Revision: 1625622

URL: http://svn.apache.org/r1625622
Log:
SLING-3027 SLING-3017 use latest release (Sling Scripting Thymeleaf)

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/SlingScriptingThymeleafIT.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=1625622&r1=1625621&r2=1625622&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 15:03:24 2014
@@ -302,13 +302,12 @@
     <!-- bundle dependencies -->
     <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">
+  <feature name="sling-scripting-thymeleaf" version="0.0.4">
     <feature version="${project.version}">sling</feature>
     <feature version="${project.version}">sling-scripting</feature>
     <feature version="2.2.10">sling-extension-i18n</feature>
-    <bundle>mvn:org.apache.sling/org.apache.sling.scripting.thymeleaf/0.0.2</bundle>
+    <bundle>mvn:org.apache.sling/org.apache.sling.scripting.thymeleaf/0.0.4</bundle>
     <!-- bundle dependencies -->
-    <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ognl/3.0.8_1</bundle>
     <bundle dependency="true">mvn:org.javassist/javassist/3.18.2-GA</bundle>
     <bundle dependency="true">mvn:commons-io/commons-io/2.4</bundle>
   </feature>

Modified: sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingScriptingThymeleafIT.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/SlingScriptingThymeleafIT.java?rev=1625622&r1=1625621&r2=1625622&view=diff
==============================================================================
--- sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingScriptingThymeleafIT.java
(original)
+++ sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingScriptingThymeleafIT.java
Wed Sep 17 15:03:24 2014
@@ -51,13 +51,6 @@ public class SlingScriptingThymeleafIT e
     }
 
     @Test
-    public void testOrgApacheServicemixBundlesOgnl() {
-        final Bundle bundle = findBundle("org.apache.servicemix.bundles.ognl");
-        assertNotNull(bundle);
-        assertEquals(Bundle.ACTIVE, bundle.getState());
-    }
-
-    @Test
     public void testJavassist() {
         final Bundle bundle = findBundle("javassist");
         assertNotNull(bundle);



Mime
View raw message