You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ri...@apache.org on 2009/11/06 01:47:24 UTC
svn commit: r833265 - in /geronimo/server/trunk:
framework/bundles/castor/pom.xml framework/bundles/ehcache/
plugins/webservices/webservices-common/src/main/history/dependencies.xml
Author: rickmcguire
Date: Fri Nov 6 00:47:24 2009
New Revision: 833265
URL: http://svn.apache.org/viewvc?rev=833265&view=rev
Log:
make castor bundle use of ehcache optional and delete ehcache bundle
Removed:
geronimo/server/trunk/framework/bundles/ehcache/
Modified:
geronimo/server/trunk/framework/bundles/castor/pom.xml
geronimo/server/trunk/plugins/webservices/webservices-common/src/main/history/dependencies.xml
Modified: geronimo/server/trunk/framework/bundles/castor/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/bundles/castor/pom.xml?rev=833265&r1=833264&r2=833265&view=diff
==============================================================================
--- geronimo/server/trunk/framework/bundles/castor/pom.xml (original)
+++ geronimo/server/trunk/framework/bundles/castor/pom.xml Fri Nov 6 00:47:24 2009
@@ -51,11 +51,6 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.bundles</groupId>
- <artifactId>ehcache</artifactId>
- <version>1.2.3-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.bundles</groupId>
<artifactId>ldapsdk</artifactId>
<version>4.1-SNAPSHOT</version>
</dependency>
@@ -70,7 +65,7 @@
<configuration>
<instructions>
<Export-Package>org.exolab*;version="1.0.5",org.castor*;version="1.0.5"</Export-Package>
- <Import-Package>org*;resolution:=optional,weblogic*;resolution:=optional,javax*;resolution:=optional,*</Import-Package>
+ <Import-Package>net.sf.ehcache*org;resolution:=optional,*;resolution:=optional,weblogic*;resolution:=optional,javax*;resolution:=optional,*</Import-Package>
<!--<_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>-->
</instructions>
</configuration>
Modified: geronimo/server/trunk/plugins/webservices/webservices-common/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/webservices/webservices-common/src/main/history/dependencies.xml?rev=833265&r1=833264&r2=833265&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/webservices/webservices-common/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/webservices/webservices-common/src/main/history/dependencies.xml Fri Nov 6 00:47:24 2009
@@ -18,11 +18,6 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.bundles</groupId>
- <artifactId>ehcache</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.bundles</groupId>
<artifactId>ldapsdk</artifactId>
<type>jar</type>
</dependency>