svn commit: r1294156 - in /directory/studio/trunk: libraries/pom.xml pom.xml

[pa...@apache.org]

Author: pamarcelot
Date: Mon Feb 27 13:51:30 2012
New Revision: 1294156

URL: http://svn.apache.org/viewvc?rev=1294156&view=rev
Log:
Removed comments on unreleased modules and profiles. (after release cleaning)

Modified:
    directory/studio/trunk/libraries/pom.xml
    directory/studio/trunk/pom.xml

Modified: directory/studio/trunk/libraries/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/libraries/pom.xml?rev=1294156&r1=1294155&r2=1294156&view=diff
==============================================================================
--- directory/studio/trunk/libraries/pom.xml (original)
+++ directory/studio/trunk/libraries/pom.xml Mon Feb 27 13:51:30 2012
@@ -32,13 +32,13 @@
 
   <modules>
     <module>net.sf.ehcache.core</module>
-    <!--<module>org.antlr.antlr</module>-->
+    <module>org.antlr.antlr</module>
     <module>org.apache.commons.codec</module>
-    <!--<module>org.apache.commons.collections</module>-->
+    <module>org.apache.commons.collections</module>
     <module>org.apache.commons.io</module>
-    <!--<module>org.apache.commons.lang</module>
+    <module>org.apache.commons.lang</module>
     <module>org.apache.commons.logging</module>
-    <module>org.apache.commons.pool</module>-->
+    <module>org.apache.commons.pool</module>
     <module>org.apache.directory.server.config</module>
     <module>org.apache.directory.server.core</module>
     <module>org.apache.directory.server.core.api</module>
@@ -50,29 +50,26 @@
     <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.apache.mina.core</module>
     <module>org.bouncycastle.bcprov.jdk15</module>
-    <module>org.dom4j.dom4j</module>-->
+    <module>org.dom4j.dom4j</module>
     <module>org.slf4j.api</module>
     <module>org.slf4j.log4j12</module>
     <module>org.xpp3.xpp3</module>
   </modules>
   
-  <!-- NOTE:
-      This section 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=1294156&r1=1294155&r2=1294156&view=diff
==============================================================================
--- directory/studio/trunk/pom.xml (original)
+++ directory/studio/trunk/pom.xml Mon Feb 27 13:51:30 2012
@@ -206,23 +206,17 @@
       -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>
@@ -233,7 +227,7 @@
       <modules>
         <module>application</module>
       </modules>
-    </profile>-->
+    </profile>
   </profiles>
 
   <dependencyManagement>