directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pamarce...@apache.org
Subject svn commit: r1437889 - in /directory/studio/trunk: ./ libraries/ libraries/org.apache.commons.io/ libraries/org.apache.commons.pool/ libraries/org.apache.directory.server.config/ libraries/org.apache.directory.server.core.api/ libraries/org.apache.dire...
Date Thu, 24 Jan 2013 08:17:30 GMT
Author: pamarcelot
Date: Thu Jan 24 08:17:29 2013
New Revision: 1437889

URL: http://svn.apache.org/viewvc?rev=1437889&view=rev
Log:
After release cleanup in pom.xml files.

Modified:
    directory/studio/trunk/libraries/org.apache.commons.io/pom.xml
    directory/studio/trunk/libraries/org.apache.commons.pool/pom.xml
    directory/studio/trunk/libraries/org.apache.directory.server.config/pom.xml
    directory/studio/trunk/libraries/org.apache.directory.server.core.api/pom.xml
    directory/studio/trunk/libraries/org.apache.directory.server.core.avl/pom.xml
    directory/studio/trunk/libraries/org.apache.directory.server.core.constants/pom.xml
    directory/studio/trunk/libraries/org.apache.directory.server.core/pom.xml
    directory/studio/trunk/libraries/org.apache.directory.server.i18n/pom.xml
    directory/studio/trunk/libraries/org.apache.directory.server.ldif.partition/pom.xml
    directory/studio/trunk/libraries/org.apache.directory.server.xdbm.partition/pom.xml
    directory/studio/trunk/libraries/org.apache.logging.log4j/pom.xml
    directory/studio/trunk/libraries/org.apache.mina.core/pom.xml
    directory/studio/trunk/libraries/org.slf4j.api/pom.xml
    directory/studio/trunk/libraries/org.slf4j.log4j12/pom.xml
    directory/studio/trunk/libraries/pom.xml
    directory/studio/trunk/pom.xml

Modified: directory/studio/trunk/libraries/org.apache.commons.io/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/libraries/org.apache.commons.io/pom.xml?rev=1437889&r1=1437888&r2=1437889&view=diff
==============================================================================
--- directory/studio/trunk/libraries/org.apache.commons.io/pom.xml (original)
+++ directory/studio/trunk/libraries/org.apache.commons.io/pom.xml Thu Jan 24 08:17:29 2013
@@ -27,7 +27,7 @@
   </parent>
 
   <artifactId>org.apache.commons.io</artifactId>
-  <version>2.0.0-SNAPSHOT</version>
+  <version>${org.apache.commons.io.version}</version>
   
   <name>Apache Commons IO (for Apache Directory Studio)</name>
   <packaging>jar</packaging>

Modified: directory/studio/trunk/libraries/org.apache.commons.pool/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/libraries/org.apache.commons.pool/pom.xml?rev=1437889&r1=1437888&r2=1437889&view=diff
==============================================================================
--- directory/studio/trunk/libraries/org.apache.commons.pool/pom.xml (original)
+++ directory/studio/trunk/libraries/org.apache.commons.pool/pom.xml Thu Jan 24 08:17:29 2013
@@ -27,7 +27,7 @@
   </parent>
 
   <artifactId>org.apache.commons.pool</artifactId>
-  <version>2.0.0-SNAPSHOT</version>
+  <version>${org.apache.commons.pool.version}</version>
   
   <name>Apache Commons Pool (for Apache Directory Studio)</name>
   <packaging>jar</packaging>

Modified: directory/studio/trunk/libraries/org.apache.directory.server.config/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/libraries/org.apache.directory.server.config/pom.xml?rev=1437889&r1=1437888&r2=1437889&view=diff
==============================================================================
--- directory/studio/trunk/libraries/org.apache.directory.server.config/pom.xml (original)
+++ directory/studio/trunk/libraries/org.apache.directory.server.config/pom.xml Thu Jan 24
08:17:29 2013
@@ -27,7 +27,7 @@
   </parent>
 
   <artifactId>org.apache.directory.server.config</artifactId>
-  <version>2.0.0-SNAPSHOT</version>
+  <version>${org.apache.directory.server.version}</version>
   
   <name>ApacheDS Server Config (for Apache Directory Studio)</name>
   <packaging>jar</packaging>

Modified: directory/studio/trunk/libraries/org.apache.directory.server.core.api/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/libraries/org.apache.directory.server.core.api/pom.xml?rev=1437889&r1=1437888&r2=1437889&view=diff
==============================================================================
--- directory/studio/trunk/libraries/org.apache.directory.server.core.api/pom.xml (original)
+++ directory/studio/trunk/libraries/org.apache.directory.server.core.api/pom.xml Thu Jan
24 08:17:29 2013
@@ -27,7 +27,7 @@
   </parent>
 
   <artifactId>org.apache.directory.server.core.api</artifactId>
-  <version>2.0.0-SNAPSHOT</version>
+  <version>${org.apache.directory.server.version}</version>
   
   <name>ApacheDS Core API (for Apache Directory Studio)</name>
   <packaging>jar</packaging>

Modified: directory/studio/trunk/libraries/org.apache.directory.server.core.avl/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/libraries/org.apache.directory.server.core.avl/pom.xml?rev=1437889&r1=1437888&r2=1437889&view=diff
==============================================================================
--- directory/studio/trunk/libraries/org.apache.directory.server.core.avl/pom.xml (original)
+++ directory/studio/trunk/libraries/org.apache.directory.server.core.avl/pom.xml Thu Jan
24 08:17:29 2013
@@ -27,7 +27,7 @@
   </parent>
 
   <artifactId>org.apache.directory.server.core.avl</artifactId>
-  <version>2.0.0-SNAPSHOT</version>
+  <version>${org.apache.directory.server.version}</version>
   
   <name>ApacheDS Core AVL (for Apache Directory Studio)</name>
   <packaging>jar</packaging>

Modified: directory/studio/trunk/libraries/org.apache.directory.server.core.constants/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/libraries/org.apache.directory.server.core.constants/pom.xml?rev=1437889&r1=1437888&r2=1437889&view=diff
==============================================================================
--- directory/studio/trunk/libraries/org.apache.directory.server.core.constants/pom.xml (original)
+++ directory/studio/trunk/libraries/org.apache.directory.server.core.constants/pom.xml Thu
Jan 24 08:17:29 2013
@@ -27,7 +27,7 @@
   </parent>
 
   <artifactId>org.apache.directory.server.core.constants</artifactId>
-  <version>2.0.0-SNAPSHOT</version>
+  <version>${org.apache.directory.server.version}</version>
   
   <name>ApacheDS Core Constants (for Apache Directory Studio)</name>
   <packaging>jar</packaging>

Modified: directory/studio/trunk/libraries/org.apache.directory.server.core/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/libraries/org.apache.directory.server.core/pom.xml?rev=1437889&r1=1437888&r2=1437889&view=diff
==============================================================================
--- directory/studio/trunk/libraries/org.apache.directory.server.core/pom.xml (original)
+++ directory/studio/trunk/libraries/org.apache.directory.server.core/pom.xml Thu Jan 24 08:17:29
2013
@@ -27,7 +27,7 @@
   </parent>
 
   <artifactId>org.apache.directory.server.core</artifactId>
-  <version>2.0.0-SNAPSHOT</version>
+  <version>${org.apache.directory.server.version}</version>
   
   <name>ApacheDS Core (for Apache Directory Studio)</name>
   <packaging>jar</packaging>

Modified: directory/studio/trunk/libraries/org.apache.directory.server.i18n/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/libraries/org.apache.directory.server.i18n/pom.xml?rev=1437889&r1=1437888&r2=1437889&view=diff
==============================================================================
--- directory/studio/trunk/libraries/org.apache.directory.server.i18n/pom.xml (original)
+++ directory/studio/trunk/libraries/org.apache.directory.server.i18n/pom.xml Thu Jan 24 08:17:29
2013
@@ -27,7 +27,7 @@
   </parent>
 
   <artifactId>org.apache.directory.server.i18n</artifactId>
-  <version>2.0.0-SNAPSHOT</version>
+  <version>${org.apache.directory.server.version}</version>
   
   <name>ApacheDS I18n (for Apache Directory Studio)</name>
   <packaging>jar</packaging>

Modified: directory/studio/trunk/libraries/org.apache.directory.server.ldif.partition/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/libraries/org.apache.directory.server.ldif.partition/pom.xml?rev=1437889&r1=1437888&r2=1437889&view=diff
==============================================================================
--- directory/studio/trunk/libraries/org.apache.directory.server.ldif.partition/pom.xml (original)
+++ directory/studio/trunk/libraries/org.apache.directory.server.ldif.partition/pom.xml Thu
Jan 24 08:17:29 2013
@@ -27,7 +27,7 @@
   </parent>
 
   <artifactId>org.apache.directory.server.ldif.partition</artifactId>
-  <version>2.0.0-SNAPSHOT</version>
+  <version>${org.apache.directory.server.version}</version>
   
   <name>ApacheDS LDIF Partition (for Apache Directory Studio)</name>
   <packaging>jar</packaging>

Modified: directory/studio/trunk/libraries/org.apache.directory.server.xdbm.partition/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/libraries/org.apache.directory.server.xdbm.partition/pom.xml?rev=1437889&r1=1437888&r2=1437889&view=diff
==============================================================================
--- directory/studio/trunk/libraries/org.apache.directory.server.xdbm.partition/pom.xml (original)
+++ directory/studio/trunk/libraries/org.apache.directory.server.xdbm.partition/pom.xml Thu
Jan 24 08:17:29 2013
@@ -27,7 +27,7 @@
   </parent>
 
   <artifactId>org.apache.directory.server.xdbm.partition</artifactId>
-  <version>2.0.0-SNAPSHOT</version>
+  <version>${org.apache.directory.server.version}</version>
   
   <name>ApacheDS Generalized (X) DBM Partition (for Apache Directory Studio)</name>
   <packaging>jar</packaging>

Modified: directory/studio/trunk/libraries/org.apache.logging.log4j/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/libraries/org.apache.logging.log4j/pom.xml?rev=1437889&r1=1437888&r2=1437889&view=diff
==============================================================================
--- directory/studio/trunk/libraries/org.apache.logging.log4j/pom.xml (original)
+++ directory/studio/trunk/libraries/org.apache.logging.log4j/pom.xml Thu Jan 24 08:17:29
2013
@@ -27,7 +27,7 @@
   </parent>
 
   <artifactId>org.apache.logging.log4j</artifactId>
-  <version>2.0.0-SNAPSHOT</version>
+  <version>${org.apache.logging.log4j.version}</version>
   
   <name>Log4j (for Apache Directory Studio)</name>
   <packaging>jar</packaging>

Modified: directory/studio/trunk/libraries/org.apache.mina.core/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/libraries/org.apache.mina.core/pom.xml?rev=1437889&r1=1437888&r2=1437889&view=diff
==============================================================================
--- directory/studio/trunk/libraries/org.apache.mina.core/pom.xml (original)
+++ directory/studio/trunk/libraries/org.apache.mina.core/pom.xml Thu Jan 24 08:17:29 2013
@@ -27,7 +27,7 @@
   </parent>
 
   <artifactId>org.apache.mina.core</artifactId>
-  <version>2.0.0-SNAPSHOT</version>
+  <version>${org.apache.mina.core.version}</version>
   
   <name>Apache MINA Core (for Apache Directory Studio)</name>
   <packaging>jar</packaging>

Modified: directory/studio/trunk/libraries/org.slf4j.api/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/libraries/org.slf4j.api/pom.xml?rev=1437889&r1=1437888&r2=1437889&view=diff
==============================================================================
--- directory/studio/trunk/libraries/org.slf4j.api/pom.xml (original)
+++ directory/studio/trunk/libraries/org.slf4j.api/pom.xml Thu Jan 24 08:17:29 2013
@@ -27,7 +27,7 @@
   </parent>
 
   <artifactId>org.slf4j.api</artifactId>
-  <version>2.0.0-SNAPSHOT</version>
+  <version>${org.slf4j.version}</version>
   
   <name>SLF4J API Module (for Apache Directory Studio)</name>
   <packaging>jar</packaging>

Modified: directory/studio/trunk/libraries/org.slf4j.log4j12/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/libraries/org.slf4j.log4j12/pom.xml?rev=1437889&r1=1437888&r2=1437889&view=diff
==============================================================================
--- directory/studio/trunk/libraries/org.slf4j.log4j12/pom.xml (original)
+++ directory/studio/trunk/libraries/org.slf4j.log4j12/pom.xml Thu Jan 24 08:17:29 2013
@@ -27,7 +27,7 @@
   </parent>
 
   <artifactId>org.slf4j.log4j12</artifactId>
-  <version>2.0.0-SNAPSHOT</version>
+  <version>${org.slf4j.version}</version>
   
   <name>SLF4J LOG4J-12 Binding (for Apache Directory Studio)</name>
   <packaging>jar</packaging>

Modified: directory/studio/trunk/libraries/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/libraries/pom.xml?rev=1437889&r1=1437888&r2=1437889&view=diff
==============================================================================
--- directory/studio/trunk/libraries/pom.xml (original)
+++ directory/studio/trunk/libraries/pom.xml Thu Jan 24 08:17:29 2013
@@ -31,13 +31,13 @@
   <packaging>pom</packaging>
 
   <modules>
-    <!-- <module>net.sf.ehcache.core</module> -->
-    <!-- <module>org.antlr.antlr</module> -->
-    <!-- <module>org.apache.commons.codec</module> -->
-    <!-- <module>org.apache.commons.collections</module> -->
+    <module>net.sf.ehcache.core</module>
+    <module>org.antlr.antlr</module>
+    <module>org.apache.commons.codec</module>
+    <module>org.apache.commons.collections</module>
     <module>org.apache.commons.io</module>
-    <!-- <module>org.apache.commons.lang</module> -->
-    <!-- <module>org.apache.commons.logging</module> -->
+    <module>org.apache.commons.lang</module>
+    <module>org.apache.commons.logging</module>
     <module>org.apache.commons.pool</module>
     <module>org.apache.directory.server.config</module>
     <module>org.apache.directory.server.core</module>
@@ -47,32 +47,29 @@
     <module>org.apache.directory.server.i18n</module>
     <module>org.apache.directory.server.ldif.partition</module>
     <module>org.apache.directory.server.xdbm.partition</module>
-    <!-- <module>org.apache.httpcomponents.httpclient</module> -->
-    <!-- <module>org.apache.httpcomponents.httpcore</module> -->
+    <module>org.apache.httpcomponents.httpclient</module>
+    <module>org.apache.httpcomponents.httpcore</module>
     <module>org.apache.logging.log4j</module>
     <module>org.apache.mina.core</module>
-    <!-- <module>org.bouncycastle.bcprov.jdk15</module> -->
-    <!-- <module>org.dom4j.dom4j</module> -->
+    <module>org.bouncycastle.bcprov.jdk15</module>
+    <module>org.dom4j.dom4j</module>
     <module>org.slf4j.api</module>
     <module>org.slf4j.log4j12</module>
-    <!-- <module>org.xpp3.xpp3</module> -->
+    <module>org.xpp3.xpp3</module>
   </modules>
   
-  <!-- NOTE:
-    This profile has been disabled for the release, and needs to be 
-    enabled again after the release is over.
   <build>
-    <plugins>-->
+    <plugins>
        <!-- Skip deployment of 3rd party plugins. This causes problems when 
             deploying snapshots because the 3rd party plugins don't have a 
             snapshot version. -->
-       <!--<plugin>
+       <plugin>
          <artifactId>maven-deploy-plugin</artifactId>
          <configuration>
            <skip>true</skip>
         </configuration>
       </plugin>
     </plugins>
-  </build>-->
+  </build>
 
 </project>

Modified: directory/studio/trunk/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/pom.xml?rev=1437889&r1=1437888&r2=1437889&view=diff
==============================================================================
--- directory/studio/trunk/pom.xml (original)
+++ directory/studio/trunk/pom.xml Thu Jan 24 08:17:29 2013
@@ -67,21 +67,21 @@
     <org.antlr.version>2.7.7</org.antlr.version>
     <org.apache.commons.codec.version>1.6</org.apache.commons.codec.version>
     <org.apache.commons.collections.version>3.2.1</org.apache.commons.collections.version>
-    <org.apache.commons.io.version>2.0.0-SNAPSHOT</org.apache.commons.io.version>
+    <org.apache.commons.io.version>2.4</org.apache.commons.io.version>
     <org.apache.commons.lang.version>2.6</org.apache.commons.lang.version>
     <org.apache.commons.logging.version>1.1.1</org.apache.commons.logging.version>
-    <org.apache.commons.pool.version>2.0.0-SNAPSHOT</org.apache.commons.pool.version>
+    <org.apache.commons.pool.version>1.6</org.apache.commons.pool.version>
     <org.apache.directory.api.validversion>1.0.0.M15</org.apache.directory.api.validversion>
     <org.apache.directory.api.version>1.0.0-M15</org.apache.directory.api.version>
     <org.apache.directory.server.validversion>2.0.0.M10</org.apache.directory.server.validversion>
-    <org.apache.directory.server.version>2.0.0-SNAPSHOT</org.apache.directory.server.version>
+    <org.apache.directory.server.version>2.0.0-M10</org.apache.directory.server.version>
     <org.apache.httpcomponents.version>4.1.2</org.apache.httpcomponents.version>
-    <org.apache.logging.log4j.version>2.0.0-SNAPSHOT</org.apache.logging.log4j.version>
-    <org.apache.mina.core.version>2.0.0-SNAPSHOT</org.apache.mina.core.version>
+    <org.apache.logging.log4j.version>1.2.17</org.apache.logging.log4j.version>
+    <org.apache.mina.core.version>2.0.7</org.apache.mina.core.version>
     <org.apache.xmlgraphics.fop.version>1.0</org.apache.xmlgraphics.fop.version>
     <org.bouncycastle.bcprov.jdk15.version>140</org.bouncycastle.bcprov.jdk15.version>
     <org.dom4j.version>1.6.1</org.dom4j.version>
-    <org.slf4j.version>2.0.0-SNAPSHOT</org.slf4j.version>
+    <org.slf4j.version>1.7.1</org.slf4j.version>
     <org.xpp3.validversion>1.1.4.c</org.xpp3.validversion>
     <org.xpp3.version>1.1.4c</org.xpp3.version>
     <org.apache.poi.version>3.7</org.apache.poi.version>
@@ -142,9 +142,6 @@
       -P-libraries
       to the commandline to exclude it from the build.
     -->
-    <!-- NOTE:
-      This profile has been disabled for the release, and needs to be 
-      enabled again after the release is over.
     <profile>
       <id>repository</id>
       <activation>
@@ -155,7 +152,7 @@
       <modules>
         <module>repository</module>
       </modules>
-    </profile>-->
+    </profile>
 
     <!-- 
       Building libraries module is enabled by default. Add 
@@ -230,24 +227,18 @@
       -Pintegration-tests
       to the commandline to launch them.
     -->
-    <!-- NOTE:
-      This profile has been disabled for the release, and needs to be 
-      enabled again after the release is over.
     <profile>
       <id>integration-tests</id>
       <modules>
         <module>tests</module>
       </modules>
-    </profile>-->
+    </profile>
 
     <!-- 
       Building application module is enabled by default. Add 
       -P-application
       to the commandline to exclude it from the build.
     -->
-    <!-- NOTE:
-      This profile has been disabled for the release, and needs to be 
-      enabled again after the release is over.
     <profile>
       <id>application</id>
       <activation>
@@ -258,7 +249,7 @@
       <modules>
         <module>application</module>
       </modules>
-    </profile>-->
+    </profile>
   </profiles>
 
   <dependencyManagement>



Mime
View raw message