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 15:30:53 UTC
svn commit: r636337 - in /incubator/sling/trunk: jcr/ocm/pom.xml
launchpad/app/pom.xml
Author: fmeschbe
Date: Wed Mar 12 07:30:49 2008
New Revision: 636337
URL: http://svn.apache.org/viewvc?rev=636337&view=rev
Log:
Integrate commons-beanutils and cglib into jcr/ocm module and remove from launchpadd/app
Modified:
incubator/sling/trunk/jcr/ocm/pom.xml
incubator/sling/trunk/launchpad/app/pom.xml
Modified: incubator/sling/trunk/jcr/ocm/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/jcr/ocm/pom.xml?rev=636337&r1=636336&r2=636337&view=diff
==============================================================================
--- incubator/sling/trunk/jcr/ocm/pom.xml (original)
+++ incubator/sling/trunk/jcr/ocm/pom.xml Wed Mar 12 07:30:49 2008
@@ -108,9 +108,17 @@
</Private-Package>
<Import-Package>
!org.apache.jackrabbit.ocm.mapper.impl.digester,
+ !org.apache.tools.ant,
+ !org.apache.tools.ant.types,
+ !org.codehaus.aspectwerkz.hook,
+ !org.objectweb.asm,
+ !org.objectweb.asm.attrs,
+ !org.objectweb.asm.util,
*
</Import-Package>
-
+ <Embed-Dependency>
+ commons-beanutils,cglib
+ </Embed-Dependency>
<Sling-Namespaces>
ocm=http://jackrabbit.apache.org/ocm
</Sling-Namespaces>
@@ -161,6 +169,21 @@
<groupId>org.apache.jackrabbit</groupId>
<artifactId>jackrabbit-ocm</artifactId>
</dependency>
+ <dependency>
+ <groupId>commons-beanutils</groupId>
+ <artifactId>commons-beanutils</artifactId>
+ <version>1.7.0</version>
+ <scope>provided</scope>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>cglib</groupId>
+ <artifactId>cglib</artifactId>
+ <version>2.1_3</version>
+ <scope>provided</scope>
+ <optional>true</optional>
+ </dependency>
+
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>jackrabbit-jcr-commons</artifactId>
Modified: incubator/sling/trunk/launchpad/app/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/app/pom.xml?rev=636337&r1=636336&r2=636337&view=diff
==============================================================================
--- incubator/sling/trunk/launchpad/app/pom.xml (original)
+++ incubator/sling/trunk/launchpad/app/pom.xml Wed Mar 12 07:30:49 2008
@@ -460,22 +460,6 @@
<version>3.2.0-0001-SNAPSHOT</version>
<optional>true</optional>
</dependency>
- <dependency>
- <groupId>org.apache.felix.commons</groupId>
- <artifactId>
- org.apache.felix.commons.commons-beanutils
- </artifactId>
- <version>1.7.0-0001-SNAPSHOT</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>org.apache.felix.commons</groupId>
- <artifactId>
- org.apache.felix.commons.cglib-full
- </artifactId>
- <version>2.0.2-0001-SNAPSHOT</version>
- <optional>true</optional>
- </dependency>
</dependencies>