directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r1061314 - in /directory: apacheds/trunk/ apacheds/trunk/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/ apacheds/trunk/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/sol...
Date Thu, 20 Jan 2011 14:30:54 GMT
Author: elecharny
Date: Thu Jan 20 14:30:53 2011
New Revision: 1061314

URL: http://svn.apache.org/viewvc?rev=1061314&view=rev
Log:
 removed deps on springframework and spring-xbean. Upgraded to more rcent versions of commons-*
libs

Modified:
    directory/apacheds/trunk/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/NOTICE
    directory/apacheds/trunk/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/log4j.properties
    directory/apacheds/trunk/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/solarispkg/Prototype
    directory/apacheds/trunk/pom.xml
    directory/shared/trunk/pom.xml

Modified: directory/apacheds/trunk/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/NOTICE
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/NOTICE?rev=1061314&r1=1061313&r2=1061314&view=diff
==============================================================================
--- directory/apacheds/trunk/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/NOTICE
(original)
+++ directory/apacheds/trunk/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/NOTICE
Thu Jan 20 14:30:53 2011
@@ -29,19 +29,3 @@ OpenSymphony (http://www.opensymphony.co
 
     This product also includes software developed by
     Clinton Begin (http://www.ibatis.com).
-
-    The end-user documentation included with a redistribution, if any,
-    must include the following acknowledgement:
-
-      "This product includes software developed by the Spring Framework
-       Project (http://www.springframework.org)."
-
-    Alternatively, this acknowledgement may appear in the software itself,
-    if and wherever such third-party acknowledgements normally appear.
-
-    The names "Spring" and "Spring Framework" must not be used to
-    endorse or promote products derived from this software without
-    prior written permission. For written permission, please contact
-    rod.johnson@interface21.com or juergen.hoeller@interface21.com.
-
-

Modified: directory/apacheds/trunk/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/log4j.properties
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/log4j.properties?rev=1061314&r1=1061313&r2=1061314&view=diff
==============================================================================
--- directory/apacheds/trunk/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/log4j.properties
(original)
+++ directory/apacheds/trunk/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/log4j.properties
Thu Jan 20 14:30:53 2011
@@ -33,7 +33,6 @@ log4j.appender.stdout.layout.ConversionP
 
 # with these we'll not get innundated when switching to DEBUG
 log4j.logger.org.apache.directory.shared.ldap.name=WARN
-log4j.logger.org.springframework=WARN
 log4j.logger.org.apache.directory.shared.codec=WARN
 log4j.logger.org.apache.directory.shared.asn1=WARN
 

Modified: directory/apacheds/trunk/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/solarispkg/Prototype
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/solarispkg/Prototype?rev=1061314&r1=1061313&r2=1061314&view=diff
==============================================================================
--- directory/apacheds/trunk/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/solarispkg/Prototype
(original)
+++ directory/apacheds/trunk/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/solarispkg/Prototype
Thu Jan 20 14:30:53 2011
@@ -49,8 +49,10 @@ f none /opt/apacheds/lib/bootstrapper.ja
 f none /opt/apacheds/lib/commons-cli-1.2.jar 0644 apacheds apacheds
 f none /opt/apacheds/lib/commons-collections-3.2.1.jar 0644 apacheds apacheds
 f none /opt/apacheds/lib/commons-daemon-1.0.1.jar 0644 apacheds apacheds
-f none /opt/apacheds/lib/commons-io-1.4.jar 0644 apacheds apacheds
-f none /opt/apacheds/lib/commons-lang-2.5.jar 0644 apacheds apacheds
+f none /opt/apacheds/lib/commons-io-2.0.1.jar 0644 apacheds apacheds
+f none /opt/apacheds/lib/commons-lang-2.6.jar 0644 apacheds apacheds
+f none /opt/apacheds/lib/commons-net-2.2.jar 0644 apacheds apacheds
+f none /opt/apacheds/lib/commons-pool-1.5.r56.jar 0644 apacheds apacheds
 f none /opt/apacheds/lib/dom4j-1.6.1.jar 0644 apacheds apacheds
 d none /opt/apacheds/lib/ext 0744 apacheds apacheds
 f none /opt/apacheds/lib/jcl-over-slf4j-1.5.11.jar 0644 apacheds apacheds

Modified: directory/apacheds/trunk/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/pom.xml?rev=1061314&r1=1061313&r2=1061314&view=diff
==============================================================================
--- directory/apacheds/trunk/pom.xml (original)
+++ directory/apacheds/trunk/pom.xml Thu Jan 20 14:30:53 2011
@@ -57,10 +57,10 @@
     <commons.collections.version>3.2.1</commons.collections.version>
     <commons.daemon.version>1.0.1</commons.daemon.version>
     <commons.dbcp.version>1.4</commons.dbcp.version>
-    <commons.io.version>1.4</commons.io.version>
-    <commons.lang.version>2.5</commons.lang.version>
-    <commons.net.version>2.0</commons.net.version>
-    <commons.pool.version>1.5.4</commons.pool.version>
+    <commons.io.version>2.0.1</commons.io.version>
+    <commons.lang.version>2.6</commons.lang.version>
+    <commons.net.version>2.2</commons.net.version>
+    <commons.pool.version>1.5.5</commons.pool.version>
     <derby.version>10.4.2.0</derby.version>
     <dnsjava.version>2.0.1</dnsjava.version>
     <jetty.version>6.1.14</jetty.version>
@@ -77,12 +77,8 @@
     <quartz.version>1.6.0</quartz.version>
     <slf4j.api.version>1.5.11</slf4j.api.version>
     <slf4j.log4j12.version>1.5.11</slf4j.log4j12.version>
-    <spring.beans.version>2.5.6.SEC01</spring.beans.version>
-    <spring.context.version>2.5.6.SEC01</spring.context.version>
-    <spring.core.version>2.5.6.SEC01</spring.core.version>
     <velocity.version>1.5</velocity.version>
     <wrapper.version>3.2.3</wrapper.version>
-    <xbean.spring.version>3.6</xbean.spring.version>
     <xercesImpl.version>2.9.1</xercesImpl.version>
     <findbugs.annotations.version>1.0.0</findbugs.annotations.version>
   </properties>
@@ -402,12 +398,6 @@
       
       <dependency>
         <groupId>${project.groupId}</groupId>
-        <artifactId>apacheds-xbean-spring</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-      
-      <dependency>
-        <groupId>${project.groupId}</groupId>
         <artifactId>apacheds-xdbm-partition</artifactId>
         <version>${project.version}</version>
       </dependency>
@@ -630,30 +620,6 @@
       </dependency>
 
       <dependency>
-        <groupId>org.apache.xbean</groupId>
-        <artifactId>xbean-spring</artifactId>
-        <version>${xbean.spring.version}</version>
-      </dependency>
-
-      <dependency>
-        <groupId>org.springframework</groupId>
-        <artifactId>spring-core</artifactId>
-        <version>${spring.core.version}</version>
-      </dependency>
-
-      <dependency>
-        <groupId>org.springframework</groupId>
-        <artifactId>spring-beans</artifactId>
-        <version>${spring.beans.version}</version>
-      </dependency>
-
-      <dependency>
-        <groupId>org.springframework</groupId>
-        <artifactId>spring-context</artifactId>
-        <version>${spring.context.version}</version>
-      </dependency>
-
-      <dependency>
         <groupId>org.apache.maven</groupId>
         <artifactId>maven-plugin-api</artifactId>
         <version>${maven.plugin.api.version}</version>

Modified: directory/shared/trunk/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/trunk/pom.xml?rev=1061314&r1=1061313&r2=1061314&view=diff
==============================================================================
--- directory/shared/trunk/pom.xml (original)
+++ directory/shared/trunk/pom.xml Thu Jan 20 14:30:53 2011
@@ -43,9 +43,9 @@
     <!-- Set versions for depending jars -->
     <antlr.version>2.7.7</antlr.version>
     <commons.collections.version>3.2.1</commons.collections.version>
-    <commons.io.version>1.4</commons.io.version>
-    <commons.lang.version>2.5</commons.lang.version>
-    <commons.pool.version>1.5.4</commons.pool.version>
+    <commons.io.version>2.0.1</commons.io.version>
+    <commons.lang.version>2.6</commons.lang.version>
+    <commons.pool.version>1.5.5</commons.pool.version>
     <dom4j.version>1.6.1</dom4j.version>
     <junit.version>4.8.1</junit.version>
     <log4j.version>1.2.16</log4j.version>



Mime
View raw message