You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by cz...@apache.org on 2008/05/26 16:44:01 UTC
svn commit: r660202 - in /incubator/sling/trunk: commons/osgi/
commons/scheduler/ commons/threads/ engine/ extensions/adapter/
extensions/apt/parser/ extensions/apt/servlet/ extensions/bundleresource/
Author: cziegeler
Date: Mon May 26 07:43:58 2008
New Revision: 660202
URL: http://svn.apache.org/viewvc?rev=660202&view=rev
Log:
SLING-442: Clean up exports, imports, dependencies and used plugins.
Modified:
incubator/sling/trunk/commons/osgi/pom.xml
incubator/sling/trunk/commons/scheduler/pom.xml
incubator/sling/trunk/commons/threads/pom.xml
incubator/sling/trunk/engine/pom.xml
incubator/sling/trunk/extensions/adapter/pom.xml
incubator/sling/trunk/extensions/apt/parser/pom.xml
incubator/sling/trunk/extensions/apt/servlet/pom.xml
incubator/sling/trunk/extensions/bundleresource/pom.xml
Modified: incubator/sling/trunk/commons/osgi/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/commons/osgi/pom.xml?rev=660202&r1=660201&r2=660202&view=diff
==============================================================================
--- incubator/sling/trunk/commons/osgi/pom.xml (original)
+++ incubator/sling/trunk/commons/osgi/pom.xml Mon May 26 07:43:58 2008
@@ -50,10 +50,6 @@
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
- <artifactId>maven-scr-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<extensions>true</extensions>
<configuration>
Modified: incubator/sling/trunk/commons/scheduler/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/commons/scheduler/pom.xml?rev=660202&r1=660201&r2=660202&view=diff
==============================================================================
--- incubator/sling/trunk/commons/scheduler/pom.xml (original)
+++ incubator/sling/trunk/commons/scheduler/pom.xml Mon May 26 07:43:58 2008
@@ -64,7 +64,7 @@
org.apache.commons.collections,*
</Import-Package>
<Export-Package>
- org.apache.sling.commons.scheduler
+ org.apache.sling.commons.scheduler;version=${pom.version}
</Export-Package>
<Private-Package>
org.apache.sling.commons.scheduler.impl,
Modified: incubator/sling/trunk/commons/threads/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/commons/threads/pom.xml?rev=660202&r1=660201&r2=660202&view=diff
==============================================================================
--- incubator/sling/trunk/commons/threads/pom.xml (original)
+++ incubator/sling/trunk/commons/threads/pom.xml Mon May 26 07:43:58 2008
@@ -61,7 +61,7 @@
<configuration>
<instructions>
<Export-Package>
- org.apache.sling.commons.threads
+ org.apache.sling.commons.threads;version=${pom.version}
</Export-Package>
<Private-Package>
org.apache.sling.commons.threads.impl
Modified: incubator/sling/trunk/engine/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/engine/pom.xml?rev=660202&r1=660201&r2=660202&view=diff
==============================================================================
--- incubator/sling/trunk/engine/pom.xml (original)
+++ incubator/sling/trunk/engine/pom.xml Mon May 26 07:43:58 2008
@@ -106,11 +106,6 @@
<version>2.0.0-incubator-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.jcr.ocm</artifactId>
- <version>2.0.0-incubator-SNAPSHOT</version>
- </dependency>
- <dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
</dependency>
Modified: incubator/sling/trunk/extensions/adapter/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/extensions/adapter/pom.xml?rev=660202&r1=660201&r2=660202&view=diff
==============================================================================
--- incubator/sling/trunk/extensions/adapter/pom.xml (original)
+++ incubator/sling/trunk/extensions/adapter/pom.xml Mon May 26 07:43:58 2008
@@ -53,19 +53,6 @@
<build>
<plugins>
<plugin>
- <groupId>org.apache.sling</groupId>
- <artifactId>maven-jcrocm-plugin</artifactId>
- <version>2.0.0-incubator-SNAPSHOT</version>
- <executions>
- <execution>
- <id>generate-JCR-OCM-descriptor</id>
- <goals>
- <goal>ocm</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-scr-plugin</artifactId>
</plugin>
@@ -107,7 +94,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/apt/parser/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/extensions/apt/parser/pom.xml?rev=660202&r1=660201&r2=660202&view=diff
==============================================================================
--- incubator/sling/trunk/extensions/apt/parser/pom.xml (original)
+++ incubator/sling/trunk/extensions/apt/parser/pom.xml Mon May 26 07:43:58 2008
@@ -62,8 +62,7 @@
<configuration>
<instructions>
<Export-Package>
- !org.apache.sling.apt.parser.internal,
- org.apache.sling.apt.parser.*
+ org.apache.sling.apt.parser;version=${pom.version}
</Export-Package>
<Private-Package>
org.apache.sling.apt.parser.internal,
Modified: incubator/sling/trunk/extensions/apt/servlet/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/extensions/apt/servlet/pom.xml?rev=660202&r1=660201&r2=660202&view=diff
==============================================================================
--- incubator/sling/trunk/extensions/apt/servlet/pom.xml (original)
+++ incubator/sling/trunk/extensions/apt/servlet/pom.xml Mon May 26 07:43:58 2008
@@ -52,7 +52,7 @@
<extensions>true</extensions>
<configuration>
<instructions>
- <Export-Package>org.apache.sling.apt.servlet.*</Export-Package>
+ <Export-Package>org.apache.sling.apt.servlet.*;version=${pom.version}</Export-Package>
</instructions>
</configuration>
</plugin>
@@ -75,7 +75,6 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
- <scope>provided</scope>
</dependency>
</dependencies>
</project>
Modified: incubator/sling/trunk/extensions/bundleresource/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/extensions/bundleresource/pom.xml?rev=660202&r1=660201&r2=660202&view=diff
==============================================================================
--- incubator/sling/trunk/extensions/bundleresource/pom.xml (original)
+++ incubator/sling/trunk/extensions/bundleresource/pom.xml Mon May 26 07:43:58 2008
@@ -87,11 +87,6 @@
<version>2.0.0-incubator-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.commons.json</artifactId>
- <version>2.0.0-incubator-SNAPSHOT</version>
- </dependency>
- <dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.osgi.core</artifactId>
</dependency>
@@ -101,7 +96,7 @@
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
+ <artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
<groupId>junit</groupId>