cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From reinh...@apache.org
Subject svn commit: r697669 - /cocoon/cocoon3/trunk/parent/pom.xml
Date Mon, 22 Sep 2008 06:25:19 GMT
Author: reinhard
Date: Sun Sep 21 23:25:18 2008
New Revision: 697669

URL: http://svn.apache.org/viewvc?rev=697669&view=rev
Log:
. add new modules to the build
. adding the buildnumber became an explicit step
. add NOTICE.txt and LICENSE.txt to META-INF of the JAR (but only for the 'release' profile)

Modified:
    cocoon/cocoon3/trunk/parent/pom.xml

Modified: cocoon/cocoon3/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/parent/pom.xml?rev=697669&r1=697668&r2=697669&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/parent/pom.xml (original)
+++ cocoon/cocoon3/trunk/parent/pom.xml Sun Sep 21 23:25:18 2008
@@ -37,6 +37,9 @@
 
   <modules>
     <module>../cocoon-archetype-block</module>
+    <module>../cocoon-archetype-parent</module>    
+    <module>../cocoon-archetype-sample</module>    
+    <module>../cocoon-archetype-webapp</module>    
     <module>../cocoon-controller</module>        
     <module>../cocoon-pipeline</module>
     <module>../cocoon-rest</module>
@@ -297,6 +300,7 @@
       </plugin>      
       <plugin>
         <artifactId>maven-compiler-plugin</artifactId>
+        <version>2.0.2</version>
         <configuration>
           <source>1.5</source>
           <target>1.5</target>
@@ -309,17 +313,9 @@
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>buildnumber-maven-plugin</artifactId>
-        <executions>
-          <execution>
-            <phase>validate</phase>
-            <goals>
-              <goal>create</goal>
-            </goals>
-          </execution>
-        </executions>
         <configuration>
-          <doCheck>true</doCheck>
-          <doUpdate>true</doUpdate>
+          <doCheck>false</doCheck>
+          <doUpdate>false</doUpdate>
         </configuration>
       </plugin>
       <plugin>
@@ -331,11 +327,11 @@
               <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
             </manifest>
             <manifestEntries>
-              <Implementation-Build>${buildNumber}</Implementation-Build>
+              <Implementation-Build>na</Implementation-Build>
             </manifestEntries>
           </archive>
         </configuration>
-      </plugin>
+      </plugin>      
     </plugins>
     <pluginManagement>
       <plugins>
@@ -369,7 +365,7 @@
         <plugin>
           <artifactId>maven-antrun-plugin</artifactId>
           <version>1.1</version>
-        </plugin>
+        </plugin>      
         <plugin>
           <artifactId>maven-site-plugin</artifactId>
           <version>2.0-beta-5</version>
@@ -403,7 +399,12 @@
           <groupId>org.codehaus.mojo</groupId>
           <artifactId>rat-maven-plugin</artifactId>
           <version>1.0-alpha-3</version>
-        </plugin>        
+        </plugin>  
+        <plugin>
+          <groupId>org.codehaus.groovy.maven</groupId>
+          <artifactId>gmaven-plugin</artifactId>
+          <version>1.0-rc-3</version>        
+        </plugin>                
       </plugins>
     </pluginManagement>
   </build>
@@ -425,15 +426,23 @@
 
   <profiles>
     <profile>
-      <id>skip-buildnumber</id>
+      <id>buildnumber</id>
       <build>
         <plugins>
           <plugin>
             <groupId>org.codehaus.mojo</groupId>
             <artifactId>buildnumber-maven-plugin</artifactId>
+            <executions>
+              <execution>
+                <phase>validate</phase>
+                <goals>
+                  <goal>create</goal>
+                </goals>
+              </execution>
+            </executions>
             <configuration>
-              <doCheck>false</doCheck>
-              <doUpdate>false</doUpdate>
+              <doCheck>true</doCheck>
+              <doUpdate>true</doUpdate>
             </configuration>
           </plugin>
           <plugin>
@@ -445,7 +454,7 @@
                   <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
                 </manifest>
                 <manifestEntries>
-                  <Implementation-Build>na</Implementation-Build>
+                  <Implementation-Build>${buildNumber}</Implementation-Build>
                 </manifestEntries>
               </archive>
             </configuration>
@@ -456,6 +465,19 @@
     <profile>
       <id>release</id>
       <build>
+        <resources>
+          <resource>
+            <directory>src/main/resources</directory>
+          </resource>
+          <resource>
+            <directory>.</directory>
+            <targetPath>META-INF</targetPath>
+            <includes>
+              <include>LICENSE.txt</include>
+              <include>NOTICE.txt</include>
+            </includes>
+          </resource>
+        </resources>    
         <plugins>
           <plugin>
             <artifactId>maven-gpg-plugin</artifactId>



Mime
View raw message