directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r1209077 - /directory/apacheds/branches/apacheds-txns/pom.xml
Date Thu, 01 Dec 2011 13:48:45 GMT
Author: elecharny
Date: Thu Dec  1 13:48:44 2011
New Revision: 1209077

URL: http://svn.apache.org/viewvc?rev=1209077&view=rev
Log:
merged back pom.xml from trunks to branch

Modified:
    directory/apacheds/branches/apacheds-txns/pom.xml

Modified: directory/apacheds/branches/apacheds-txns/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/pom.xml?rev=1209077&r1=1209076&r2=1209077&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-txns/pom.xml (original)
+++ directory/apacheds/branches/apacheds-txns/pom.xml Thu Dec  1 13:48:44 2011
@@ -56,18 +56,18 @@
     <bcprov.version>140</bcprov.version>
     <commons.cli.version>1.2</commons.cli.version>
     <commons.collections.version>3.2.1</commons.collections.version>
-    <commons.daemon.version>1.0.5</commons.daemon.version>
+    <commons.daemon.version>1.0.7</commons.daemon.version>
     <commons.dbcp.version>1.4</commons.dbcp.version>
-    <commons.io.version>2.0.1</commons.io.version>
+    <commons.io.version>2.1</commons.io.version>
     <commons.lang.version>2.6</commons.lang.version>
     <commons.net.version>3.0.1</commons.net.version>
     <commons.pool.version>1.5.6</commons.pool.version>
-    <derby.version>10.8.1.2</derby.version>
+    <derby.version>10.8.2.2</derby.version>
     <dnsjava.version>2.1.1</dnsjava.version>
     <ehcache.version>2.4.4</ehcache.version>
     <jetty.version>6.1.14</jetty.version>
     <jug.asl.version>2.0.0.RC1</jug.asl.version>
-    <junit.version>4.9</junit.version>
+    <junit.version>4.10</junit.version>
     <ldapsdk.version>4.1</ldapsdk.version>
     <log4j.version>1.2.16</log4j.version>
     <maven.archiver.version>2.4.2</maven.archiver.version>
@@ -77,8 +77,8 @@
     <mina.core.version>2.0.4</mina.core.version>
     <plexus.utils.version>3.0</plexus.utils.version>
     <quartz.version>1.6.3</quartz.version>
-    <slf4j.api.version>1.6.2</slf4j.api.version>
-    <slf4j.log4j12.version>1.6.2</slf4j.log4j12.version>
+    <slf4j.api.version>1.6.4</slf4j.api.version>
+    <slf4j.log4j12.version>1.6.4</slf4j.log4j12.version>
     <velocity.version>1.7-beta1</velocity.version>
     <wrapper.version>3.2.3</wrapper.version>
     <xercesImpl.version>2.10.0</xercesImpl.version>
@@ -151,6 +151,7 @@
     <module>apache-felix</module>
     <module>dependencies</module>
     <module>service-osgi</module>
+    <module>component-hub</module>
   </modules>
 
   <build>
@@ -481,7 +482,7 @@
       </plugin>
     </plugins>
   </build>
-  
+
   <dependencyManagement>
     <dependencies>
       <!-- Project sub-modules dependencies -->
@@ -913,13 +914,19 @@
       
       <dependency>
         <groupId>org.apache.directory.shared</groupId>
-        <artifactId>shared-ldap-extras-sp</artifactId>
+        <artifactId>shared-ldap-codec-core</artifactId>
         <version>${org.apache.directory.shared.version}</version>
       </dependency>
       
       <dependency>
         <groupId>org.apache.directory.shared</groupId>
-        <artifactId>shared-ldap-codec-core</artifactId>
+        <artifactId>shared-ldap-codec-standalone</artifactId>
+        <version>${org.apache.directory.shared.version}</version>
+      </dependency>
+      
+      <dependency>
+        <groupId>org.apache.directory.shared</groupId>
+        <artifactId>shared-ldap-extras-aci</artifactId>
         <version>${org.apache.directory.shared.version}</version>
       </dependency>
       
@@ -931,37 +938,37 @@
       
       <dependency>
         <groupId>org.apache.directory.shared</groupId>
-        <artifactId>shared-ldap-codec-standalone</artifactId>
+        <artifactId>shared-ldap-extras-codec-api</artifactId>
         <version>${org.apache.directory.shared.version}</version>
       </dependency>
       
       <dependency>
         <groupId>org.apache.directory.shared</groupId>
-        <artifactId>shared-ldap-model</artifactId>
+        <artifactId>shared-ldap-extras-sp</artifactId>
         <version>${org.apache.directory.shared.version}</version>
       </dependency>
       
       <dependency>
         <groupId>org.apache.directory.shared</groupId>
-        <artifactId>shared-ldap-schema-data</artifactId>
+        <artifactId>shared-ldap-extras-trigger</artifactId>
         <version>${org.apache.directory.shared.version}</version>
       </dependency>
       
       <dependency>
         <groupId>org.apache.directory.shared</groupId>
-        <artifactId>shared-ldap-extras-aci</artifactId>
+        <artifactId>shared-ldap-extras-util</artifactId>
         <version>${org.apache.directory.shared.version}</version>
       </dependency>
       
       <dependency>
         <groupId>org.apache.directory.shared</groupId>
-        <artifactId>shared-ldap-extras-trigger</artifactId>
+        <artifactId>shared-ldap-model</artifactId>
         <version>${org.apache.directory.shared.version}</version>
       </dependency>
       
       <dependency>
         <groupId>org.apache.directory.shared</groupId>
-        <artifactId>shared-ldap-extras-util</artifactId>
+        <artifactId>shared-ldap-schema-data</artifactId>
         <version>${org.apache.directory.shared.version}</version>
       </dependency>
       



Mime
View raw message