directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From seelm...@apache.org
Subject svn commit: r1070303 - in /directory/shared/trunk: distribution/pom.xml pom.xml
Date Sun, 13 Feb 2011 21:39:02 GMT
Author: seelmann
Date: Sun Feb 13 21:39:02 2011
New Revision: 1070303

URL: http://svn.apache.org/viewvc?rev=1070303&view=rev
Log:
Activate distribution module by default to ensure new version number is set during release.
Instead activate the long-running plugin executions only in apache-release profile

Modified:
    directory/shared/trunk/distribution/pom.xml
    directory/shared/trunk/pom.xml

Modified: directory/shared/trunk/distribution/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/trunk/distribution/pom.xml?rev=1070303&r1=1070302&r2=1070303&view=diff
==============================================================================
--- directory/shared/trunk/distribution/pom.xml (original)
+++ directory/shared/trunk/distribution/pom.xml Sun Feb 13 21:39:02 2011
@@ -36,65 +36,70 @@
     </dependency>
   </dependencies>
 
-  <build>
-    <plugins>
-      <plugin>
-        <artifactId>maven-dependency-plugin</artifactId>
-        <executions>
-          <!-- Package additional jars that are no runtime dependencies -->
-          <execution>
-            <id>additional-jars</id>
-            <phase>package</phase>
-            <goals>
-              <goal>copy</goal>
-            </goals>
-            <configuration>
-              <artifactItems>
-                <artifactItem>
-                  <groupId>org.slf4j</groupId>
-                  <artifactId>slf4j-log4j12</artifactId>
-                  <outputDirectory>${project.build.directory}/additional-jars</outputDirectory>
-                </artifactItem>
-              </artifactItems>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <artifactId>maven-assembly-plugin</artifactId>
-        <executions>
-          <execution>
-            <phase>package</phase>
-            <configuration>
-              <tarLongFileMode>gnu</tarLongFileMode>
-              <descriptors>
-                <descriptor>src/main/assembly/bin.xml</descriptor>
-                <descriptor>src/main/assembly/src.xml</descriptor>
-              </descriptors>
-            </configuration>
-            <goals>
-              <goal>single</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.geronimo.genesis.plugins</groupId>
-        <artifactId>tools-maven-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>verify-legal-files</id>
-            <phase>verify</phase>
-            <goals>
-              <goal>verify-legal-files</goal>
-            </goals>
-            <configuration>
-              <!-- avoid false positive, as we add a '-bin' or '-src' to the base directory
-->
-              <strict>false</strict>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
+  <profiles>
+    <profile>
+      <id>apache-release</id>
+      <build>
+        <plugins>
+          <plugin>
+            <artifactId>maven-dependency-plugin</artifactId>
+            <executions>
+              <!-- Package additional jars that are no runtime dependencies -->
+              <execution>
+                <id>additional-jars</id>
+                <phase>package</phase>
+                <goals>
+                  <goal>copy</goal>
+                </goals>
+                <configuration>
+                  <artifactItems>
+                    <artifactItem>
+                      <groupId>org.slf4j</groupId>
+                      <artifactId>slf4j-log4j12</artifactId>
+                      <outputDirectory>${project.build.directory}/additional-jars</outputDirectory>
+                    </artifactItem>
+                  </artifactItems>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+          <plugin>
+            <artifactId>maven-assembly-plugin</artifactId>
+            <executions>
+              <execution>
+                <phase>package</phase>
+                <configuration>
+                  <tarLongFileMode>gnu</tarLongFileMode>
+                  <descriptors>
+                    <descriptor>src/main/assembly/bin.xml</descriptor>
+                    <descriptor>src/main/assembly/src.xml</descriptor>
+                  </descriptors>
+                </configuration>
+                <goals>
+                  <goal>single</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
+          <plugin>
+            <groupId>org.apache.geronimo.genesis.plugins</groupId>
+            <artifactId>tools-maven-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>verify-legal-files</id>
+                <phase>verify</phase>
+                <goals>
+                  <goal>verify-legal-files</goal>
+                </goals>
+                <configuration>
+                  <!-- avoid false positive, as we add a '-bin' or '-src' to the base
directory -->
+                  <strict>false</strict>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
 </project>

Modified: directory/shared/trunk/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/trunk/pom.xml?rev=1070303&r1=1070302&r2=1070303&view=diff
==============================================================================
--- directory/shared/trunk/pom.xml (original)
+++ directory/shared/trunk/pom.xml Sun Feb 13 21:39:02 2011
@@ -85,6 +85,7 @@
     <module>ldap-client-api</module>
     <module>dsml-parser</module>
     <module>dsml-engine</module>
+    <module>distribution</module>
   </modules>
 
   <build>
@@ -570,9 +571,6 @@
   <profiles>
     <profile>
       <id>apache-release</id>
-      <modules>
-        <module>distribution</module>
-      </modules>
       <build>
         <plugins>
           <plugin>



Mime
View raw message