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 2015/04/03 15:13:19 UTC
svn commit: r1671061 - 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: Fri Apr 3 13:13:19 2015
New Revision: 1671061
URL: http://svn.apache.org/r1671061
Log:
SLING-4411 provide Oak features
* fix Tika feature
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/TikaSlingIT.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=1671061&r1=1671060&r2=1671061&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 Fri Apr 3 13:13:19 2015
@@ -312,8 +312,8 @@
</feature>
<!-- Apache Tika -->
<feature name="tika-sling" version="${project.version}">
- <bundle dependency="true">mvn:org.apache.tika/tika-core/1.7</bundle>
- <bundle dependency="true">mvn:org.apache.tika/tika-parsers/1.7</bundle>
+ <bundle dependency="true">mvn:org.apache.tika/tika-core/1.6</bundle>
+ <bundle dependency="true">mvn:org.apache.tika/tika-bundle/1.6</bundle>
</feature>
<!-- Apache Sling Auth (contrib) -->
<feature name="sling-auth-openid" version="${project.version}">
@@ -411,7 +411,7 @@
<feature version="${project.version}">sling-extension-i18n</feature>
<feature version="${project.version}">sling-extension-xss</feature>
<feature version="${project.version}">sling-jcr-compiler</feature>
- <bundle>mvn:org.apache.sling/org.apache.sling.scripting.sightly/1.0.0</bundle>
+ <bundle>mvn:org.apache.sling/org.apache.sling.scripting.sightly/1.0.2</bundle>
<bundle>mvn:org.apache.sling/org.apache.sling.scripting.sightly.js.provider/1.0.0</bundle>
<!-- bundle dependencies -->
<bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.rhino/1.7R2_4</bundle>
Modified: sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/TikaSlingIT.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/TikaSlingIT.java?rev=1671061&r1=1671060&r2=1671061&view=diff
==============================================================================
--- sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/TikaSlingIT.java (original)
+++ sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/TikaSlingIT.java Fri Apr 3 13:13:19 2015
@@ -52,8 +52,8 @@ public class TikaSlingIT extends KarafTe
}
@Test
- public void testOrgApacheTikaParsers() {
- final Bundle bundle = findBundle("org.apache.tika.parsers");
+ public void testOrgApacheTikaBundle() {
+ final Bundle bundle = findBundle("org.apache.tika.bundle");
assertNotNull(bundle);
assertEquals(Bundle.ACTIVE, bundle.getState());
}