Author: sseifert
Date: Mon May 11 20:53:34 2015
New Revision: 1678823
URL: http://svn.apache.org/r1678823
Log:
SLING-4710 do not export javax.inject in sling models API bundle
add javax.inject dependency in launchpad from
org.apache.geronimo.specs/geronimo-atinject_1.0_spec/1.0 because the original
javax.inject jar is not an osgi bundle
Modified:
sling/trunk/bundles/extensions/models/api/pom.xml
sling/trunk/bundles/extensions/models/integration-tests/pom.xml
sling/trunk/launchpad/builder/src/main/provisioning/boot.txt
Modified: sling/trunk/bundles/extensions/models/api/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/models/api/pom.xml?rev=1678823&r1=1678822&r2=1678823&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/models/api/pom.xml (original)
+++ sling/trunk/bundles/extensions/models/api/pom.xml Mon May 11 20:53:34 2015
@@ -48,7 +48,7 @@
<extensions>true</extensions>
<configuration>
<instructions>
-
<Export-Package>org.apache.sling.models.*,javax.inject;version=0</Export-Package>
+
<Export-Package>org.apache.sling.models.*</Export-Package>
<DynamicImport-Package>org.apache.sling.validation.api.*</DynamicImport-Package>
</instructions>
</configuration>
Modified: sling/trunk/bundles/extensions/models/integration-tests/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/models/integration-tests/pom.xml?rev=1678823&r1=1678822&r2=1678823&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/models/integration-tests/pom.xml (original)
+++ sling/trunk/bundles/extensions/models/integration-tests/pom.xml Mon May 11
20:53:34 2015
@@ -329,8 +329,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.launchpad</artifactId>
- <classifier>standalone</classifier>
- <version>7</version>
+ <version>8-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
Modified: sling/trunk/launchpad/builder/src/main/provisioning/boot.txt
URL:
http://svn.apache.org/viewvc/sling/trunk/launchpad/builder/src/main/provisioning/boot.txt?rev=1678823&r1=1678822&r2=1678823&view=diff
==============================================================================
--- sling/trunk/launchpad/builder/src/main/provisioning/boot.txt (original)
+++ sling/trunk/launchpad/builder/src/main/provisioning/boot.txt Mon May 11
20:53:34 2015
@@ -45,3 +45,5 @@
org.apache.sling/org.apache.sling.installer.provider.file/1.1.0
org.apache.felix/org.apache.felix.configadmin/1.8.4
org.apache.felix/org.apache.felix.eventadmin/1.4.2
+ # dependency with javax.inject - required for Sling Models (SLING-4710)
+ org.apache.geronimo.specs/geronimo-atinject_1.0_spec/1.0
