Author: olli
Date: Fri Mar 31 10:14:42 2017
New Revision: 1789650
URL: http://svn.apache.org/viewvc?rev=1789650&view=rev
Log:
SLING-3027 Improve Launchpad Karaf Features
* prepare switch from org.apache.sling.commons.json to
org.apache.sling.commons.johnzon
* remove javax.jcr from feature sling
Modified:
sling/trunk/karaf/org.apache.sling.karaf-features/src/main/feature/feature.xml
sling/trunk/karaf/org.apache.sling.karaf-integration-tests/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingIT.java
sling/trunk/karaf/org.apache.sling.karaf-launchpad-oak-tar-integration-tests/src/test/java/org/apache/sling/karaf/tests/configuration/SlingLaunchpadOakTarConfiguration.java
Modified:
sling/trunk/karaf/org.apache.sling.karaf-features/src/main/feature/feature.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/karaf/org.apache.sling.karaf-features/src/main/feature/feature.xml?rev=1789650&r1=1789649&r2=1789650&view=diff
==============================================================================
---
sling/trunk/karaf/org.apache.sling.karaf-features/src/main/feature/feature.xml
(original)
+++
sling/trunk/karaf/org.apache.sling.karaf-features/src/main/feature/feature.xml
Fri Mar 31 10:14:42 2017
@@ -28,8 +28,7 @@
<bundle>mvn:org.apache.sling/org.apache.sling.serviceusermapper/1.2.6</bundle>
<bundle>mvn:org.apache.sling/org.apache.sling.settings/1.3.8</bundle>
<!-- Apache Sling Commons -->
- <!-- org.apache.sling.commons.json requires jcr -->
- <bundle>mvn:org.apache.sling/org.apache.sling.commons.json/2.0.20</bundle>
+
<bundle>mvn:org.apache.sling/org.apache.sling.commons.johnzon/0.1.0-SNAPSHOT</bundle>
<bundle>mvn:org.apache.sling/org.apache.sling.commons.mime/2.1.10</bundle>
<bundle>mvn:org.apache.sling/org.apache.sling.commons.osgi/2.4.0</bundle>
<!-- dependencies -->
@@ -42,7 +41,6 @@
<feature version="${project.version}">sling-commons-classloader</feature>
<feature version="${project.version}">sling-commons-scheduler</feature>
<feature version="${project.version}">sling-commons-threads</feature>
- <bundle dependency="true">mvn:javax.jcr/jcr/2.0</bundle>
<bundle dependency="true">mvn:commons-codec/commons-codec/1.10</bundle>
<bundle
dependency="true">mvn:commons-collections/commons-collections/3.2.2</bundle>
<bundle
dependency="true">mvn:commons-fileupload/commons-fileupload/1.3.2</bundle>
@@ -50,13 +48,13 @@
<bundle dependency="true">mvn:commons-lang/commons-lang/2.6</bundle>
<bundle dependency="true">mvn:org.apache.commons/commons-lang3/3.5</bundle>
<bundle dependency="true">mvn:org.apache.commons/commons-math/2.2</bundle>
- <bundle
dependency="true">mvn:org.apache.geronimo.bundles/json/20090211_1</bundle>
</feature>
<!-- Apache Sling Auth -->
<feature name="sling-auth-form" version="${project.version}">
<bundle>mvn:org.apache.sling/org.apache.sling.auth.form/1.0.8</bundle>
<!-- dependencies -->
<feature version="${project.version}">sling</feature>
+ <bundle dependency="true">mvn:javax.jcr/jcr/2.0</bundle>
</feature>
<feature name="sling-auth-openid" version="${project.version}">
<bundle>mvn:org.apache.sling/org.apache.sling.auth.openid/1.0.4</bundle>
@@ -125,7 +123,7 @@
</feature>
<!-- Apache Sling Extensions -->
<feature name="sling-extension-adapter" version="${project.version}">
- <bundle>mvn:org.apache.sling/org.apache.sling.adapter/2.1.8</bundle>
+
<bundle>mvn:org.apache.sling/org.apache.sling.adapter/2.1.9-SNAPSHOT</bundle>
<!-- dependencies -->
<feature version="${project.version}">sling</feature>
</feature>
@@ -136,23 +134,24 @@
</feature>
<feature name="sling-extension-discovery" version="${project.version}">
<bundle>mvn:org.apache.sling/org.apache.sling.discovery.api/1.0.4</bundle>
- <bundle>mvn:org.apache.sling/org.apache.sling.discovery.base/1.1.6</bundle>
-
<bundle>mvn:org.apache.sling/org.apache.sling.discovery.commons/1.0.18</bundle>
+
<bundle>mvn:org.apache.sling/org.apache.sling.discovery.base/1.1.7-SNAPSHOT</bundle>
+
<bundle>mvn:org.apache.sling/org.apache.sling.discovery.commons/1.0.19-SNAPSHOT</bundle>
<bundle>mvn:org.apache.sling/org.apache.sling.discovery.support/1.0.0</bundle>
<!-- dependencies -->
<feature version="${project.version}">sling</feature>
+ <bundle dependency="true">mvn:javax.jcr/jcr/2.0</bundle>
<bundle
dependency="true">mvn:org.apache.httpcomponents/httpcore-osgi/4.4.6</bundle>
<bundle
dependency="true">mvn:org.apache.httpcomponents/httpclient-osgi/4.5.3</bundle>
</feature>
<feature name="sling-extension-discovery-impl" version="${project.version}">
-
<bundle>mvn:org.apache.sling/org.apache.sling.discovery.impl/1.2.10</bundle>
+
<bundle>mvn:org.apache.sling/org.apache.sling.discovery.impl/1.2.11-SNAPSHOT</bundle>
<!-- dependencies -->
<feature>webconsole</feature>
<feature version="${project.version}">sling-extension-discovery</feature>
</feature>
<feature name="sling-extension-discovery-oak" version="${project.version}">
<configfile
finalname="/etc/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-discovery.config">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-discovery</configfile>
- <bundle>mvn:org.apache.sling/org.apache.sling.discovery.oak/1.2.16</bundle>
+
<bundle>mvn:org.apache.sling/org.apache.sling.discovery.oak/1.2.17-SNAPSHOT</bundle>
<!-- dependencies -->
<feature>webconsole</feature>
<feature version="${project.version}">sling-extension-discovery</feature>
@@ -174,6 +173,8 @@
<bundle
dependency="true">mvn:org.apache.httpcomponents/httpcore-osgi/4.4.6</bundle>
<bundle
dependency="true">mvn:org.apache.httpcomponents/httpclient-osgi/4.5.3</bundle>
<bundle
dependency="true">mvn:org.apache.jackrabbit.vault/org.apache.jackrabbit.vault/3.1.38</bundle>
+ <!-- TODO -->
+ <bundle
dependency="true">mvn:org.apache.sling/org.apache.sling.commons.json/2.0.20</bundle>
</feature>
<feature name="sling-extension-event" version="${project.version}">
<configfile
finalname="/etc/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-event.config">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-event</configfile>
@@ -206,7 +207,7 @@
<bundle dependency="true">mvn:com.google.guava/guava/15.0</bundle>
</feature>
<feature name="sling-extension-healthcheck" version="${project.version}">
- <bundle>mvn:org.apache.sling/org.apache.sling.hc.core/1.2.6</bundle>
+
<bundle>mvn:org.apache.sling/org.apache.sling.hc.core/1.2.7-SNAPSHOT</bundle>
<bundle>mvn:org.apache.sling/org.apache.sling.hc.support/1.0.4</bundle>
<bundle>mvn:org.apache.sling/org.apache.sling.hc.webconsole/1.1.2</bundle>
<!-- dependencies -->
@@ -238,17 +239,22 @@
<feature version="${project.version}">sling</feature>
<feature version="${project.version}">jackrabbit-sling</feature>
<feature version="${project.version}">sling-extension-query</feature>
+ <!-- TODO -->
+ <bundle
dependency="true">mvn:org.apache.sling/org.apache.sling.commons.json/2.0.20</bundle>
</feature>
<feature name="sling-extension-query" version="${project.version}">
<bundle>mvn:org.apache.sling/org.apache.sling.query/3.0.0</bundle>
<!-- dependencies -->
<feature version="${project.version}">sling</feature>
+ <bundle dependency="true">mvn:javax.jcr/jcr/2.0</bundle>
</feature>
<feature name="sling-extension-resource-inventory"
version="${project.version}">
<bundle>mvn:org.apache.sling/org.apache.sling.resource.inventory/1.0.6</bundle>
<!-- dependencies -->
<feature version="${project.version}">sling</feature>
<bundle
dependency="true">mvn:org.apache.felix/org.apache.felix.inventory/1.0.4</bundle>
+ <!-- TODO -->
+ <bundle
dependency="true">mvn:org.apache.sling/org.apache.sling.commons.json/2.0.20</bundle>
</feature>
<feature name="sling-extension-resource-presence"
version="${project.version}">
<configfile
finalname="/etc/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-resource_presence.config">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-resource_presence</configfile>
@@ -293,7 +299,7 @@
</feature>
<feature name="sling-extension-xss" version="${project.version}">
<configfile
finalname="/etc/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-xss.config">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-xss</configfile>
- <bundle>mvn:org.apache.sling/org.apache.sling.xss/1.0.18</bundle>
+ <bundle>mvn:org.apache.sling/org.apache.sling.xss/1.0.19-SNAPSHOT</bundle>
<!-- dependencies -->
<feature version="${project.version}">sling</feature>
<bundle
dependency="true">mvn:org.apache.geronimo.bundles/commons-httpclient/3.1_2</bundle>
@@ -331,7 +337,7 @@
<bundle>mvn:org.apache.sling/org.apache.sling.jcr.api/2.4.0</bundle>
<bundle>mvn:org.apache.sling/org.apache.sling.jcr.base/3.0.0</bundle>
<bundle>mvn:org.apache.sling/org.apache.sling.jcr.classloader/3.2.2</bundle>
-
<bundle>mvn:org.apache.sling/org.apache.sling.jcr.contentloader/2.1.10</bundle>
+
<bundle>mvn:org.apache.sling/org.apache.sling.jcr.contentloader/2.1.11-SNAPSHOT</bundle>
<bundle>mvn:org.apache.sling/org.apache.sling.jcr.davex/1.3.8</bundle>
<!-- (not using org.apache.sling.jcr.jcr-wrapper) -->
<bundle>mvn:org.apache.sling/org.apache.sling.jcr.registration/1.0.2</bundle>
@@ -353,7 +359,7 @@
<feature version="${project.version}">sling-commons-compiler</feature>
</feature>
<feature name="sling-jcr-jackrabbit-security" version="${project.version}">
-
<bundle>mvn:org.apache.sling/org.apache.sling.jcr.jackrabbit.accessmanager/2.1.2</bundle>
+
<bundle>mvn:org.apache.sling/org.apache.sling.jcr.jackrabbit.accessmanager/3.0.1-SNAPSHOT</bundle>
<bundle>mvn:org.apache.sling/org.apache.sling.jcr.jackrabbit.usermanager/2.2.4</bundle>
<!-- dependencies -->
<feature version="${project.version}">sling-jcr</feature>
@@ -488,6 +494,7 @@
<bundle>mvn:org.apache.sling/org.apache.sling.scripting.javascript/2.0.31-SNAPSHOT</bundle>
<!-- dependencies -->
<feature version="${project.version}">sling-scripting</feature>
+ <bundle dependency="true">mvn:javax.jcr/jcr/2.0</bundle>
<bundle
dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.rhino/1.7.7.1_1</bundle>
</feature>
<feature name="sling-scripting-jsp" version="${project.version}">
@@ -499,11 +506,11 @@
</feature>
<feature name="sling-scripting-sightly" version="${project.version}">
<configfile
finalname="/etc/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-scripting_sightly.config">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-scripting_sightly</configfile>
-
<bundle>mvn:org.apache.sling/org.apache.sling.scripting.sightly/1.0.32</bundle>
-
<bundle>mvn:org.apache.sling/org.apache.sling.scripting.sightly.compiler/1.0.8</bundle>
-
<bundle>mvn:org.apache.sling/org.apache.sling.scripting.sightly.compiler.java/1.0.8</bundle>
-
<bundle>mvn:org.apache.sling/org.apache.sling.scripting.sightly.js.provider/1.0.20</bundle>
-
<bundle>mvn:org.apache.sling/org.apache.sling.scripting.sightly.models.provider/1.0.6</bundle>
+
<bundle>mvn:org.apache.sling/org.apache.sling.scripting.sightly/1.0.33-SNAPSHOT</bundle>
+
<bundle>mvn:org.apache.sling/org.apache.sling.scripting.sightly.compiler/1.0.9-SNAPSHOT</bundle>
+
<bundle>mvn:org.apache.sling/org.apache.sling.scripting.sightly.compiler.java/1.0.9-SNAPSHOT</bundle>
+
<bundle>mvn:org.apache.sling/org.apache.sling.scripting.sightly.js.provider/1.0.21-SNAPSHOT</bundle>
+
<bundle>mvn:org.apache.sling/org.apache.sling.scripting.sightly.models.provider/1.0.7-SNAPSHOT</bundle>
<!-- dependencies -->
<feature version="${project.version}">sling</feature>
<feature version="${project.version}">sling-jcr</feature>
@@ -530,8 +537,8 @@
<!-- Apache Sling Servlets -->
<feature name="sling-servlets" version="${project.version}">
<configfile
finalname="/etc/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-servlets.config">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-servlets</configfile>
- <bundle>mvn:org.apache.sling/org.apache.sling.servlets.get/2.1.22</bundle>
- <bundle>mvn:org.apache.sling/org.apache.sling.servlets.post/2.3.14</bundle>
+
<bundle>mvn:org.apache.sling/org.apache.sling.servlets.get/2.1.23-SNAPSHOT</bundle>
+
<bundle>mvn:org.apache.sling/org.apache.sling.servlets.post/2.3.15-SNAPSHOT</bundle>
<bundle>mvn:org.apache.sling/org.apache.sling.servlets.resolver/2.4.10</bundle>
<!-- dependencies -->
<feature version="${project.version}">sling</feature>
Modified:
sling/trunk/karaf/org.apache.sling.karaf-integration-tests/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingIT.java
URL:
http://svn.apache.org/viewvc/sling/trunk/karaf/org.apache.sling.karaf-integration-tests/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingIT.java?rev=1789650&r1=1789649&r2=1789650&view=diff
==============================================================================
---
sling/trunk/karaf/org.apache.sling.karaf-integration-tests/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingIT.java
(original)
+++
sling/trunk/karaf/org.apache.sling.karaf-integration-tests/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingIT.java
Fri Mar 31 10:14:42 2017
@@ -101,8 +101,8 @@ public class SlingIT extends KarafTestSu
}
@Test
- public void testOrgApacheSlingCommonsJson() {
- final Bundle bundle = findBundle("org.apache.sling.commons.json");
+ public void testOrgApacheSlingCommonsJohnzon() {
+ final Bundle bundle = findBundle("org.apache.sling.commons.johnzon");
assertNotNull(bundle);
assertEquals(Bundle.ACTIVE, bundle.getState());
}
@@ -134,13 +134,6 @@ public class SlingIT extends KarafTestSu
assertNotNull(bundle);
assertEquals(Bundle.ACTIVE, bundle.getState());
}
-
- @Test
- public void testJavaxJcr() {
- final Bundle bundle = findBundle("javax.jcr");
- assertNotNull(bundle);
- assertEquals(Bundle.ACTIVE, bundle.getState());
- }
@Test
public void testSlingRequestProcessor() throws Exception {
Modified:
sling/trunk/karaf/org.apache.sling.karaf-launchpad-oak-tar-integration-tests/src/test/java/org/apache/sling/karaf/tests/configuration/SlingLaunchpadOakTarConfiguration.java
URL:
http://svn.apache.org/viewvc/sling/trunk/karaf/org.apache.sling.karaf-launchpad-oak-tar-integration-tests/src/test/java/org/apache/sling/karaf/tests/configuration/SlingLaunchpadOakTarConfiguration.java?rev=1789650&r1=1789649&r2=1789650&view=diff
==============================================================================
---
sling/trunk/karaf/org.apache.sling.karaf-launchpad-oak-tar-integration-tests/src/test/java/org/apache/sling/karaf/tests/configuration/SlingLaunchpadOakTarConfiguration.java
(original)
+++
sling/trunk/karaf/org.apache.sling.karaf-launchpad-oak-tar-integration-tests/src/test/java/org/apache/sling/karaf/tests/configuration/SlingLaunchpadOakTarConfiguration.java
Fri Mar 31 10:14:42 2017
@@ -96,7 +96,9 @@ public class SlingLaunchpadOakTarConfigu
mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.launchpad.test-fragment").versionAsInProject(),
mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.testing.tools").versionAsInProject(),
mavenBundle().groupId("org.apache.httpcomponents").artifactId("httpcore-osgi").versionAsInProject(),
-
mavenBundle().groupId("org.apache.httpcomponents").artifactId("httpclient-osgi").versionAsInProject()
+
mavenBundle().groupId("org.apache.httpcomponents").artifactId("httpclient-osgi").versionAsInProject(),
+ // TODO remove (required by org.apache.sling.junit.core)
+
mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.commons.json").version("2.0.20")
);
}
