Author: cziegeler
Date: Mon May 26 08:06:55 2008
New Revision: 660208
URL: http://svn.apache.org/viewvc?rev=660208&view=rev
Log:
SLING-442: Clean up exports, imports, dependencies and used plugins.
Modified:
incubator/sling/trunk/extensions/event/pom.xml
incubator/sling/trunk/extensions/httpauth/pom.xml
incubator/sling/trunk/extensions/i18n/pom.xml
incubator/sling/trunk/jcr/classloader/pom.xml
incubator/sling/trunk/jcr/jackrabbit-server/pom.xml
incubator/sling/trunk/jcr/webdav/pom.xml
incubator/sling/trunk/samples/simple-demo/pom.xml
incubator/sling/trunk/samples/webloader/service/pom.xml
incubator/sling/trunk/scripting/jsp-taglib/pom.xml
incubator/sling/trunk/servlets/get/pom.xml
incubator/sling/trunk/servlets/post/pom.xml
incubator/sling/trunk/servlets/resolver/pom.xml
Modified: incubator/sling/trunk/extensions/event/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/extensions/event/pom.xml?rev=660208&r1=660207&r2=660208&view=diff
==============================================================================
--- incubator/sling/trunk/extensions/event/pom.xml (original)
+++ incubator/sling/trunk/extensions/event/pom.xml Mon May 26 08:06:55 2008
@@ -61,12 +61,13 @@
<configuration>
<instructions>
<Export-Package>
- org.apache.sling.event
+ org.apache.sling.event;version=${pom.version}
</Export-Package>
<Private-Package>
org.apache.sling.event.impl,
org.apache.jackrabbit.util
</Private-Package>
+ <!-- We need the dynamic import as events can contain
any classes -->
<DynamicImport-Package>*</DynamicImport-Package>
<Sling-Nodetypes>
SLING-INF/nodetypes/event.cnd
Modified: incubator/sling/trunk/extensions/httpauth/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/extensions/httpauth/pom.xml?rev=660208&r1=660207&r2=660208&view=diff
==============================================================================
--- incubator/sling/trunk/extensions/httpauth/pom.xml (original)
+++ incubator/sling/trunk/extensions/httpauth/pom.xml Mon May 26 08:06:55 2008
@@ -103,7 +103,7 @@
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
+ <artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
<groupId>junit</groupId>
Modified: incubator/sling/trunk/extensions/i18n/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/extensions/i18n/pom.xml?rev=660208&r1=660207&r2=660208&view=diff
==============================================================================
--- incubator/sling/trunk/extensions/i18n/pom.xml (original)
+++ incubator/sling/trunk/extensions/i18n/pom.xml Mon May 26 08:06:55 2008
@@ -62,7 +62,7 @@
<configuration>
<instructions>
<Export-Package>
- org.apache.sling.i18n
+ org.apache.sling.i18n;version=${pom.version}
</Export-Package>
<Private-Package>
org.apache.sling.i18n.impl.*
@@ -82,19 +82,19 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.api</artifactId>
- <version>2.0.0-incubator-SNAPSHOT</version>
+ <version>2.0.0-incubator-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.jcr.api</artifactId>
- <version>2.0.0-incubator-SNAPSHOT</version>
+ <version>2.0.0-incubator-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.jcr.resource</artifactId>
- <version>2.0.0-incubator-SNAPSHOT</version>
-</dependency>
+ <version>2.0.0-incubator-SNAPSHOT</version>
+ </dependency>
<dependency>
<groupId>javax.jcr</groupId>
<artifactId>jcr</artifactId>
Modified: incubator/sling/trunk/jcr/classloader/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/jcr/classloader/pom.xml?rev=660208&r1=660207&r2=660208&view=diff
==============================================================================
--- incubator/sling/trunk/jcr/classloader/pom.xml (original)
+++ incubator/sling/trunk/jcr/classloader/pom.xml Mon May 26 08:06:55 2008
@@ -98,7 +98,7 @@
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
+ <artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
<groupId>junit</groupId>
Modified: incubator/sling/trunk/jcr/jackrabbit-server/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/jcr/jackrabbit-server/pom.xml?rev=660208&r1=660207&r2=660208&view=diff
==============================================================================
--- incubator/sling/trunk/jcr/jackrabbit-server/pom.xml (original)
+++ incubator/sling/trunk/jcr/jackrabbit-server/pom.xml Mon May 26 08:06:55 2008
@@ -189,7 +189,7 @@
<!-- Testing -->
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
+ <artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
Modified: incubator/sling/trunk/jcr/webdav/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/jcr/webdav/pom.xml?rev=660208&r1=660207&r2=660208&view=diff
==============================================================================
--- incubator/sling/trunk/jcr/webdav/pom.xml (original)
+++ incubator/sling/trunk/jcr/webdav/pom.xml Mon May 26 08:06:55 2008
@@ -146,7 +146,7 @@
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
+ <artifactId>slf4j-api</artifactId>
</dependency>
<!-- OSGi Libraries -->
Modified: incubator/sling/trunk/samples/simple-demo/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/samples/simple-demo/pom.xml?rev=660208&r1=660207&r2=660208&view=diff
==============================================================================
--- incubator/sling/trunk/samples/simple-demo/pom.xml (original)
+++ incubator/sling/trunk/samples/simple-demo/pom.xml Mon May 26 08:06:55 2008
@@ -155,16 +155,13 @@
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
- <artifactId>
- org.apache.sling.scripting.jsp.taglib
- </artifactId>
+ <artifactId>org.apache.sling.scripting.jsp.taglib</artifactId>
<version>2.0.0-incubator-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <scope>provided</scope>
+ <artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
Modified: incubator/sling/trunk/samples/webloader/service/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/samples/webloader/service/pom.xml?rev=660208&r1=660207&r2=660208&view=diff
==============================================================================
--- incubator/sling/trunk/samples/webloader/service/pom.xml (original)
+++ incubator/sling/trunk/samples/webloader/service/pom.xml Mon May 26 08:06:55
2008
@@ -63,11 +63,10 @@
<configuration>
<instructions>
<Export-Package>
- !org.apache.sling.samples.webloader.internal,
- org.apache.sling.samples.webloader.*
+
org.apache.sling.samples.webloader;version=${pom.version}
</Export-Package>
<Private-Package>
- org.apache.sling.samples.webloader.*
+ org.apache.sling.samples.webloader.internal
</Private-Package>
</instructions>
</configuration>
@@ -96,7 +95,7 @@
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
+ <artifactId>slf4j-api</artifactId>
</dependency>
</dependencies>
</project>
Modified: incubator/sling/trunk/scripting/jsp-taglib/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/scripting/jsp-taglib/pom.xml?rev=660208&r1=660207&r2=660208&view=diff
==============================================================================
--- incubator/sling/trunk/scripting/jsp-taglib/pom.xml (original)
+++ incubator/sling/trunk/scripting/jsp-taglib/pom.xml Mon May 26 08:06:55 2008
@@ -57,7 +57,7 @@
<configuration>
<instructions>
<Export-Package>
- org.apache.sling.scripting.jsp.taglib.*
+
org.apache.sling.scripting.jsp.taglib.*;version=${pom.version}
</Export-Package>
</instructions>
</configuration>
Modified: incubator/sling/trunk/servlets/get/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/servlets/get/pom.xml?rev=660208&r1=660207&r2=660208&view=diff
==============================================================================
--- incubator/sling/trunk/servlets/get/pom.xml (original)
+++ incubator/sling/trunk/servlets/get/pom.xml Mon May 26 08:06:55 2008
@@ -107,7 +107,7 @@
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
+ <artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
<groupId>junit</groupId>
Modified: incubator/sling/trunk/servlets/post/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/servlets/post/pom.xml?rev=660208&r1=660207&r2=660208&view=diff
==============================================================================
--- incubator/sling/trunk/servlets/post/pom.xml (original)
+++ incubator/sling/trunk/servlets/post/pom.xml Mon May 26 08:06:55 2008
@@ -61,7 +61,7 @@
<configuration>
<instructions>
<Export-Package>
- org.apache.sling.servlets.post
+
org.apache.sling.servlets.post;version=${pom.version}
</Export-Package>
<Private-Package>
org.apache.sling.servlets.post.impl.*
Modified: incubator/sling/trunk/servlets/resolver/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/servlets/resolver/pom.xml?rev=660208&r1=660207&r2=660208&view=diff
==============================================================================
--- incubator/sling/trunk/servlets/resolver/pom.xml (original)
+++ incubator/sling/trunk/servlets/resolver/pom.xml Mon May 26 08:06:55 2008
@@ -103,7 +103,7 @@
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
+ <artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
@@ -115,5 +115,10 @@
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
