geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ga...@apache.org
Subject svn commit: r885833 - in /geronimo/server/trunk: framework/bundles/castor/pom.xml framework/bundles/pom.xml plugins/webservices/webservices-common/src/main/history/dependencies.xml
Date Tue, 01 Dec 2009 16:59:58 GMT
Author: gawor
Date: Tue Dec  1 16:59:56 2009
New Revision: 885833

URL: http://svn.apache.org/viewvc?rev=885833&view=rev
Log:
ldapsdk is not required

Modified:
    geronimo/server/trunk/framework/bundles/castor/pom.xml
    geronimo/server/trunk/framework/bundles/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=885833&r1=885832&r2=885833&view=diff
==============================================================================
--- geronimo/server/trunk/framework/bundles/castor/pom.xml (original)
+++ geronimo/server/trunk/framework/bundles/castor/pom.xml Tue Dec  1 16:59:56 2009
@@ -49,11 +49,6 @@
             <version>${pkgVersion}</version>
             <optional>true</optional>
         </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.bundles</groupId>
-            <artifactId>ldapsdk</artifactId>
-            <version>4.1-SNAPSHOT</version>
-        </dependency>
     </dependencies>
 
     <build>
@@ -61,11 +56,20 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
-                <!--<version>2.0.1-SNAPSHOT</version>-->
                 <configuration>
                     <instructions>
-                        <Export-Package>org.exolab*;version="1.0.5",org.castor*;version="1.0.5"</Export-Package>
-                        <Import-Package>net.sf.ehcache*;resolution:=optional,org*;resolution:=optional,weblogic*;resolution:=optional,javax*;resolution:=optional,*</Import-Package>
+                        <Export-Package>
+                            org.exolab*;version="1.0.5",
+                            org.castor*;version="1.0.5"
+                        </Export-Package>
+                        <Import-Package>
+                            net.sf.ehcache*;resolution:=optional,
+                            org*;resolution:=optional,
+                            weblogic*;resolution:=optional,
+                            javax*;resolution:=optional,
+                            netscape.ldap*;resolution:=optional,
+                            *
+                        </Import-Package>
                         <!--<_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>-->
                     </instructions>
                 </configuration>

Modified: geronimo/server/trunk/framework/bundles/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/bundles/pom.xml?rev=885833&r1=885832&r2=885833&view=diff
==============================================================================
--- geronimo/server/trunk/framework/bundles/pom.xml (original)
+++ geronimo/server/trunk/framework/bundles/pom.xml Tue Dec  1 16:59:56 2009
@@ -44,7 +44,6 @@
         <module>commons-discovery</module>
         <module>derby-all</module>
         <module>jstl</module>
-        <module>ldapsdk</module>
         <!-- todo remove -->
         <module>log4j</module>
         <module>sxc-jaxb</module>

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=885833&r1=885832&r2=885833&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
Tue Dec  1 16:59:56 2009
@@ -17,11 +17,6 @@
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.bundles</groupId>
-        <artifactId>ldapsdk</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
         <groupId>org.apache.geronimo.configs</groupId>
         <artifactId>j2ee-server</artifactId>
         <type>car</type>



Mime
View raw message