You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@turbine.apache.org by sg...@apache.org on 2011/10/22 21:04:15 UTC

svn commit: r1187752 - /turbine/fulcrum/trunk/parent/pom.xml

Author: sgoeschl
Date: Sat Oct 22 19:04:15 2011
New Revision: 1187752

URL: http://svn.apache.org/viewvc?rev=1187752&view=rev
Log:
Updated plugins and configurations according to Apache Commons parent pom

Modified:
    turbine/fulcrum/trunk/parent/pom.xml

Modified: turbine/fulcrum/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/parent/pom.xml?rev=1187752&r1=1187751&r2=1187752&view=diff
==============================================================================
--- turbine/fulcrum/trunk/parent/pom.xml (original)
+++ turbine/fulcrum/trunk/parent/pom.xml Sat Oct 22 19:04:15 2011
@@ -22,22 +22,24 @@
   <parent>
     <groupId>org.apache</groupId>
     <artifactId>apache</artifactId>
+    <!-- Version 10 is broken; see https://issues.apache.org/jira/browse/MPOM-32 -->
     <version>9</version>
   </parent>
   <groupId>org.apache.fulcrum</groupId>
   <artifactId>fulcrum-parent</artifactId>
   <packaging>pom</packaging>
+
   <!-- TODO: dummy version. In Maven 2.1, this will be auto-versioned being a generic parent -->
   <version>2-SNAPSHOT</version>
   <name>Fulcrum Component Library</name>
   <url>http://turbine.apache.org/fulcrum</url>
   <inceptionYear>2001</inceptionYear>
-  
+
   <issueManagement>
-    <system>jira</system>    
+    <system>jira</system>
     <url>http://issues.apache.org/jira/browse/TRB</url>
   </issueManagement>
-  
+
   <distributionManagement>
     <!--
       This POM's parent POM (the Apache root POM) provides repositories. Unfortunately,
@@ -48,10 +50,10 @@
     <repository>
       <id>dummy</id>
       <name>Dummy to avoid accidental deploys</name>
-      <url />
+      <url/>
     </repository>
   </distributionManagement>
-  
+
   <!--
     This section *must* be overwritten by subprojects. It is only to allow
     a release of the fulcrum-parent POM.
@@ -78,7 +80,7 @@
       <archive>http://mail-archives.apache.org/mod_mbox/turbine-user/</archive>
     </mailingList>
   </mailingLists>
-  
+
   <build>
     <resources>
       <resource>
@@ -90,51 +92,118 @@
         </includes>
       </resource>
     </resources>
-    <plugins>
-      <!-- TODO: later use toolchain support to do compilation on an external JDK 1.3+ compiler -->
-      <plugin>
-        <artifactId>maven-compiler-plugin</artifactId>
+    <pluginManagement>
+      <plugins>
+        <!-- org.apache.maven.plugins, alpha order by artifact id -->
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-antrun-plugin</artifactId>
+          <version>1.6</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-assembly-plugin</artifactId>
+          <version>2.2.1</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-clean-plugin</artifactId>
+          <version>2.4.1</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-compiler-plugin</artifactId>
+          <version>2.3.2</version>
           <configuration>
             <source>${maven.compile.source}</source>
             <target>${maven.compile.target}</target>
             <encoding>${fulcrum.encoding}</encoding>
-          </configuration>        
-      </plugin>
-      <plugin>
-        <artifactId>maven-jar-plugin</artifactId>
-        <configuration>
-          <archive>
-            <manifestEntries>
-              <Specification-Title>${project.name}</Specification-Title>
-              <Specification-Version>${project.version}</Specification-Version>
-              <Specification-Vendor>${project.organization.name}</Specification-Vendor>
-              <Implementation-Title>${project.name}</Implementation-Title>
-              <Implementation-Version>${project.version}</Implementation-Version>
-              <Implementation-Vendor>${project.organization.name}</Implementation-Vendor>
-              <Implementation-Vendor-Id>org.apache</Implementation-Vendor-Id>
-              <X-Compile-Source-JDK>${maven.compile.source}</X-Compile-Source-JDK>
-              <X-Compile-Target-JDK>${maven.compile.target}</X-Compile-Target-JDK>
-            </manifestEntries>
-          </archive>
-        </configuration>
-      </plugin>      
-      <plugin>
-        <!-- generate the IntelliJ project files -->
-        <artifactId>maven-idea-plugin</artifactId>
-        <configuration>
-          <jdkLevel>${maven.compile.source}</jdkLevel>
-          <downloadSources>true</downloadSources>
-        </configuration>
-      </plugin>      
-      <plugin>
-        <!-- generate the Eclipse project files -->
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-eclipse-plugin</artifactId>
-        <configuration>
-          <downloadSources>true</downloadSources>
-          <downloadJavadocs>false</downloadJavadocs>
+            <fork>${fulcrum.compiler.fork}</fork>
+            <compilerVersion>${fulcrum.compiler.compilerVersion}</compilerVersion>
+            <executable>${fulcrum.compiler.javac}</executable>
+          </configuration>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-deploy-plugin</artifactId>
+          <version>2.7</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-gpg-plugin</artifactId>
+          <version>1.4</version>
+        </plugin>        
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-install-plugin</artifactId>
+          <version>2.3.1</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-jar-plugin</artifactId>
+          <version>2.3.2</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-javadoc-plugin</artifactId>
+          <version>${fulcrum.javadoc.version}</version>
+          <configuration>
+            <!-- keep only errors and warnings -->
+            <quiet>true</quiet>
+            <encoding>${fulcrum.encoding}</encoding>
+            <docEncoding>${fulcrum.docEncoding}</docEncoding>
+            <links>
+              <link>${fulcrum.javadoc.java.link}</link>
+              <link>${fulcrum.javadoc.javaee.link}</link>
+            </links>
+            <archive>
+              <manifest>
+                <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+                <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+              </manifest>
+            </archive>
         </configuration>
-      </plugin>      
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-release-plugin</artifactId>
+          <version>2.2.1</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-resources-plugin</artifactId>
+          <version>2.5</version>
+          <configuration>
+            <encoding>${fulcrum.resourceEncoding}</encoding>
+          </configuration>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-site-plugin</artifactId>
+          <version>3.0</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-source-plugin</artifactId>
+          <version>2.1.2</version>
+          <configuration>
+            <archive>
+              <manifest>
+                  <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+                  <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+              </manifest>
+            </archive>
+          </configuration>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-surefire-plugin</artifactId>
+          <version>${fulcrum.surefire.version}</version>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+    <plugins>
+      <!-- org.apache.maven.plugins, alpha order by artifact id -->
       <plugin>
         <!--
           - Copy LICENSE.txt and NOTICE.txt so that they are included
@@ -150,20 +219,69 @@
               <goal>run</goal>
             </goals>
             <configuration>
-              <tasks>
+              <target>
                 <copy todir="${project.build.directory}/apidocs/META-INF">
                   <fileset dir="${basedir}">
-                    <include name="LICENSE.txt" />
-                    <include name="NOTICE.txt" />
+                    <include name="LICENSE.txt"/>
+                    <include name="NOTICE.txt"/>
                   </fileset>
                 </copy>
-              </tasks>
+              </target>
             </configuration>
           </execution>
         </executions>
       </plugin>
       <plugin>
-        <!-- attach the source code when building a jar -->
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+      </plugin>
+      <plugin>
+        <!-- generate the Eclipse project files -->
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-eclipse-plugin</artifactId>
+        <configuration>
+          <downloadSources>true</downloadSources>
+          <downloadJavadocs>false</downloadJavadocs>
+        </configuration>
+      </plugin>
+      <plugin>
+        <!-- generate the IntelliJ project files -->
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-idea-plugin</artifactId>
+        <configuration>
+          <jdkLevel>${maven.compile.source}</jdkLevel>
+          <downloadSources>true</downloadSources>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <configuration>
+          <archive>
+            <manifestEntries>
+              <Specification-Title>${project.name}</Specification-Title>
+              <Specification-Version>${project.version}</Specification-Version>
+              <Specification-Vendor>${project.organization.name}</Specification-Vendor>
+              <Implementation-Title>${project.name}</Implementation-Title>
+              <Implementation-Version>${project.version}</Implementation-Version>
+              <Implementation-Vendor>${project.organization.name}</Implementation-Vendor>
+              <Implementation-Vendor-Id>org.apache</Implementation-Vendor-Id>
+              <Implementation-Build>${implementation.build}</Implementation-Build>              
+              <X-Compile-Source-JDK>${maven.compile.source}</X-Compile-Source-JDK>
+              <X-Compile-Target-JDK>${maven.compile.target}</X-Compile-Target-JDK>
+            </manifestEntries>
+          </archive>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <jvm>${fulcrum.surefire.java}</jvm>
+        </configuration>
+      </plugin>
+      <plugin>
+        <!-- attach the source code fulcrum.n building a jar -->
         <artifactId>maven-source-plugin</artifactId>
         <executions>
           <execution>
@@ -174,60 +292,106 @@
             <phase>package</phase>
           </execution>
         </executions>
-      </plugin>      
+      </plugin>
       <plugin>
         <!-- build the source and binary distribution packages -->
         <artifactId>maven-assembly-plugin</artifactId>
         <configuration>
           <descriptorRefs>
             <descriptorRef>bin</descriptorRef>
-            <descriptorRef>project</descriptorRef>            
+            <descriptorRef>project</descriptorRef>
             <descriptorRef>src</descriptorRef>
-          </descriptorRefs>        
+          </descriptorRefs>
           <tarLongFileMode>gnu</tarLongFileMode>
         </configuration>
-      </plugin>     
+      </plugin>
     </plugins>
   </build>
 
   <reporting>
+    <!-- N.B. plugins defined here in the <reporting> section ignore what's defined in <pluginManagement>
+         in the <build> section above, so we have to define the versions here. -->
     <plugins>
+      <!-- org.apache.maven.plugins, alpha order by artifact id -->
       <plugin>
+        <!-- generate the changes report from changes.xml -->
         <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-project-info-reports-plugin</artifactId>
-        <version>2.0.1</version>
+        <artifactId>maven-changes-plugin</artifactId>
+        <version>2.0-beta-3</version>
+        <configuration>
+          <xmlPath>${basedir}/xdocs/changes.xml</xmlPath>
+        </configuration>
+        <reportSets>
+          <reportSet>
+            <reports>
+              <report>changes-report</report>
+            </reports>
+          </reportSet>
+        </reportSets>
+      </plugin>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>findbugs-maven-plugin</artifactId>
+        <version>2.3.2</version>
+        <configuration>
+          <threshold>Normal</threshold>
+        </configuration>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>
-        <version>2.3</version>
-        <configuration> 
-          <aggregate>false</aggregate>
+        <version>${fulcrum.javadoc.version}</version>
+        <configuration>
+          <!-- keep only errors and warnings -->
+          <quiet>true</quiet>
           <source>${maven.compile.source}</source>
           <encoding>${fulcrum.encoding}</encoding>
           <docEncoding>${fulcrum.docEncoding}</docEncoding>
           <linksource>true</linksource>
           <links>
-            <link>http://java.sun.com/javase/6/docs/api/</link>
+            <link>${fulcrum.javadoc.java.link}</link>
+            <link>${fulcrum.javadoc.javaee.link}</link>
           </links>
-        </configuration> 
+        </configuration>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jxr-plugin</artifactId>
-        <version>2.1</version>
-        <configuration> 
-          <aggregate>false</aggregate>
-        </configuration> 
+        <version>${fulcrum.jxr.version}</version>
+      </plugin>
+      <plugin>
+        <!-- generate the PMD reports -->
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-pmd-plugin</artifactId>
+        <version>2.5</version>
+        <configuration>
+          <minimumTokens>200</minimumTokens>
+          <targetJdk>${maven.compile.source}</targetJdk>
+          <rulesets>
+            <ruleset>/rulesets/basic.xml</ruleset>
+            <ruleset>/rulesets/finalizers.xml</ruleset>
+            <ruleset>/rulesets/imports.xml</ruleset>
+            <ruleset>/rulesets/unusedcode.xml</ruleset>
+          </rulesets>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-project-info-reports-plugin</artifactId>
+        <version>${fulcrum.project-info.version}</version>
+        <configuration>
+          <dependencyDetailsEnabled>false</dependencyDetailsEnabled>
+          <dependencyLocationsEnabled>false</dependencyLocationsEnabled>
+        </configuration>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-site-plugin</artifactId>
-        <version>2.0</version>
+        <version>3.0</version>
         <configuration>
           <!-- Exclude the navigation file for Maven 1 sites
-               and the changes file used by the changes-plugin,
-               as they interfere with the site generation. -->
+                   and the changes file used by the changes-plugin,
+                   as they interfere with the site generation. -->
           <moduleExcludes>
             <xdoc>navigation.xml,changes.xml</xdoc>
           </moduleExcludes>
@@ -236,63 +400,31 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-report-plugin</artifactId>
-        <version>2.4.3</version>
+        <version>${fulcrum.surefire.version}</version>
+      </plugin>
+      <plugin>
+        <!-- get test coverage for regression tests -->
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>cobertura-maven-plugin</artifactId>
+        <version>2.5.1</version>
       </plugin>
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>jdepend-maven-plugin</artifactId>
-        <version>2.0-beta-1</version>
+        <version>2.0-beta-2</version>
       </plugin>
       <plugin>
         <!-- check the Apache Licence in all source files -->
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>rat-maven-plugin</artifactId>
         <version>1.0-alpha-3</version>
-      </plugin>      
-      <plugin>
-        <!-- get test coverage for regression tests -->
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>cobertura-maven-plugin</artifactId>
-        <version>2.2</version>
-      </plugin>      
-      <plugin>
-        <!-- generate the changes report from changes.xml -->
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-changes-plugin</artifactId>
-        <version>2.0-beta-3</version>
-      	<configuration>
-      		<xmlPath>${basedir}/xdocs/changes.xml</xmlPath>
-      	</configuration>              	      
-        <reportSets>
-          <reportSet>
-            <reports>
-              <report>changes-report</report>
-            </reports>
-          </reportSet>
-        </reportSets>
-      </plugin>            
-      <plugin>
-        <!-- generate the PMD reports -->
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-pmd-plugin</artifactId>
-        <version>2.3</version>
-        <configuration>
-          <minimumTokens>200</minimumTokens>
-          <targetJdk>${maven.compile.source}</targetJdk>
-          <rulesets>
-            <ruleset>/rulesets/basic.xml</ruleset>
-            <ruleset>/rulesets/finalizers.xml</ruleset>            
-            <ruleset>/rulesets/imports.xml</ruleset>
-            <ruleset>/rulesets/unusedcode.xml</ruleset>
-          </rulesets>
-        </configuration>
-      </plugin>      
+      </plugin>
       <plugin>
         <!-- generate the tag list report -->
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>taglist-maven-plugin</artifactId>
         <version>2.1</version>
-      </plugin>    
+      </plugin>
     </plugins>
   </reporting>
 
@@ -391,6 +523,7 @@
           <!-- We want to sign the artifact, the POM, and all attached artifacts -->
           <plugin>
             <artifactId>maven-gpg-plugin</artifactId>
+            <version>1.4</version>
             <configuration>
               <passphrase>${gpg.passphrase}</passphrase>
             </configuration>
@@ -434,14 +567,15 @@
               <execution>
                 <id>create-javadoc-jar</id>
                 <goals>
+                  <goal>javadoc</goal>
                   <goal>jar</goal>
                 </goals>
                 <phase>package</phase>
-                <configuration>
-                  <source>${maven.compile.source}</source>
-                </configuration>
               </execution>
             </executions>
+            <configuration>
+              <source>${maven.compile.source}</source>
+             </configuration>            
           </plugin>
           <plugin>
             <artifactId>maven-assembly-plugin</artifactId>
@@ -456,32 +590,42 @@
           </plugin>
         </plugins>
       </build>
-    </profile>    
+    </profile>
   </profiles>
-     
+
   <properties>
-  
+    <!-- configuration bits for cutting a release candidate, must be overridden by components -->
+    <!-- must agree with project.version above -->
+    <fulcrum.release.version>2</fulcrum.release.version>
+    <fulcrum.rc.version>RC1</fulcrum.rc.version>
+
     <!-- Default configuration for compiler source and target JVM -->
-  	<maven.compile.source>1.6</maven.compile.source>
-  	<maven.compile.target>1.6</maven.compile.target>
-    
-  	<!-- Default values for the download-page generation by commons-build-plugin -->
-    <commons.release.name>${project.artifactId}-${fulcrum.release.version}</commons.release.name>
-    <commons.binary.suffix>-bin</commons.binary.suffix>
+    <maven.compile.source>1.6</maven.compile.source>
+    <maven.compile.target>1.6</maven.compile.target>
+
+    <!-- Compiler and surefire plugin settings for "java" profiles -->
+    <fulcrum.compiler.fork>false</fulcrum.compiler.fork>
+    <fulcrum.compiler.compilerVersion>1.6</fulcrum.compiler.compilerVersion>
+    <fulcrum.compiler.javac>${JAVA_HOME}/bin/javac</fulcrum.compiler.javac>
+    <fulcrum.surefire.java>${JAVA_HOME}/bin/java</fulcrum.surefire.java>
+
+    <!-- Plugin versions (allows same value in reporting and build sections) -->
+    <fulcrum.surefire.version>2.9</fulcrum.surefire.version>
+    <fulcrum.surefire-report.version>2.9</fulcrum.surefire-report.version>
+    <fulcrum.javadoc.version>2.8</fulcrum.javadoc.version>
+    <fulcrum.changes.version>2.6</fulcrum.changes.version>   
+    <fulcrum.jxr.version>2.3</fulcrum.jxr.version>
+    <fulcrum.project-info.version>2.4</fulcrum.project-info.version>
 
     <!-- Fulcrum Component Id -->
     <fulcrum.componentid>${project.artifactId}</fulcrum.componentid>
-    
-    <!-- The RC version used in the staging repository URL. -->
-    <fulcrum.release.version>${project.version}</fulcrum.release.version>
-    <fulcrum.rc.version>RC1</fulcrum.rc.version>
 
     <!--
       Make the deployment protocol pluggable. This allows to switch to
-      other protocols like scpexe, which some users prefer over scp.
+      other protocols like scpexe, fulcrum.ch some users prefer over scp.
     -->
-    <fulcrum.deployment.protocol>scpexe</fulcrum.deployment.protocol>
-    
+    <fulcrum.deployment.protocol>scp</fulcrum.deployment.protocol>
+
     <!--
       Encoding of Java source files: Make sure, that the compiler and
       the javadoc generator use the right encoding. Subprojects may
@@ -489,9 +633,23 @@
     -->
     <fulcrum.encoding>UTF-8</fulcrum.encoding>
     <fulcrum.docEncoding>${fulcrum.encoding}</fulcrum.docEncoding>
+    <fulcrum.resourceEncoding>${fulcrum.encoding}</fulcrum.resourceEncoding>
+
+    <!-- Define encoding for filtering -->
+    <project.build.sourceEncoding>${fulcrum.encoding}</project.build.sourceEncoding>
+    <project.reporting.outputEncoding>${fulcrum.encoding}</project.reporting.outputEncoding>
+
+    <!-- Javadoc link to Java API.  Default is Java 1.6; components can override to other versions -->
+    <fulcrum.javadoc.java.link>http://download.oracle.com/javase/6/docs/api/</fulcrum.javadoc.java.link>
+    <fulcrum.javadoc.javaee.link>http://download.oracle.com/javaee/6/api/</fulcrum.javadoc.javaee.link>
+
+    <!-- build meta inf -->
+    <maven.build.timestamp.format>yyyy-MM-dd HH:mm:ssZ</maven.build.timestamp.format>
+    <implementation.build>${scmBranch}@r${buildNumber};${maven.build.timestamp}</implementation.build>
 
     <!-- maven-surefire-plugin -->
     <test>**/*Test</test>
+
   </properties>
 
 </project>