You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by fm...@apache.org on 2008/03/12 13:29:54 UTC
svn commit: r636299 - in /incubator/sling/trunk: launchpad/app/pom.xml
sling/core/pom.xml
Author: fmeschbe
Date: Wed Mar 12 05:29:50 2008
New Revision: 636299
URL: http://svn.apache.org/viewvc?rev=636299&view=rev
Log:
Integrate commons-fileupload into core module and remove from launchpadd/app
Modified:
incubator/sling/trunk/launchpad/app/pom.xml
incubator/sling/trunk/sling/core/pom.xml
Modified: incubator/sling/trunk/launchpad/app/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/app/pom.xml?rev=636299&r1=636298&r2=636299&view=diff
==============================================================================
--- incubator/sling/trunk/launchpad/app/pom.xml (original)
+++ incubator/sling/trunk/launchpad/app/pom.xml Wed Mar 12 05:29:50 2008
@@ -455,14 +455,6 @@
<dependency>
<groupId>org.apache.felix.commons</groupId>
<artifactId>
- org.apache.felix.commons.commons-fileupload
- </artifactId>
- <version>1.1.1-0001-SNAPSHOT</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>org.apache.felix.commons</groupId>
- <artifactId>
org.apache.felix.commons.commons-collections
</artifactId>
<version>3.2.0-0001-SNAPSHOT</version>
Modified: incubator/sling/trunk/sling/core/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/sling/core/pom.xml?rev=636299&r1=636298&r2=636299&view=diff
==============================================================================
--- incubator/sling/trunk/sling/core/pom.xml (original)
+++ incubator/sling/trunk/sling/core/pom.xml Wed Mar 12 05:29:50 2008
@@ -93,6 +93,13 @@
org.apache.sling.core.impl,
org.apache.sling.core.impl.*
</Private-Package>
+ <Import-Package>
+ javax.portlet;resolution:=optional,
+ *
+ </Import-Package>
+ <Embed-Dependency>
+ commons-fileupload
+ </Embed-Dependency>
<Sling-Nodetypes>
SLING-INF/nodetypes/selection.cnd,SLING-INF/nodetypes/references.cnd
</Sling-Nodetypes>