arrange plugin declarations to minimise need to release parent while maximising reuse...

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@642524 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/archiva-modules/pom.xml b/archiva-modules/pom.xml
index 1ae0b1d69f5fe8c7e80cf76473ad2ce2f5bb49a3..d62cad0ada873d4b4862985b82edc811a19bd7f3 100644 (file)
--- a/archiva-modules/pom.xml
+++ b/archiva-modules/pom.xml
@@ -36,4 +36,193 @@
     <module>archiva-scheduled</module>
     <module>archiva-web</module>
   </modules>
+  <reporting>
+    <plugins>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>cobertura-maven-plugin</artifactId>
+        <version>2.2</version>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-checkstyle-plugin</artifactId>
+        <version>2.1</version>
+        <configuration>
+          <includeTestSourceDirectory>true</includeTestSourceDirectory>
+          <configLocation>config/maven_checks.xml</configLocation>
+          <!-- TODO: enable when archiva-build-resources is active (released?)
+          <configLocation>checkstyle.xml</configLocation>
+          <headerLocation>header.txt</headerLocation>
+            -->
+        </configuration>
+      </plugin>
+<!-- TODO: OOME
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>findbugs-maven-plugin</artifactId>
+        <version>1.1.1</version>
+      </plugin>
+-->
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>changelog-maven-plugin</artifactId>
+      </plugin>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>taglist-maven-plugin</artifactId>
+      </plugin>
+      <plugin>
+        <artifactId>maven-jxr-plugin</artifactId>
+        <configuration>
+          <aggregate>true</aggregate>
+        </configuration>
+      </plugin>
+      <plugin>
+        <artifactId>maven-surefire-report-plugin</artifactId>
+        <version>2.4.2</version>
+      </plugin>
+      <plugin>
+        <artifactId>maven-javadoc-plugin</artifactId>
+        <version>2.4</version>
+        <configuration>
+          <source>1.5</source>
+          <aggregate>true</aggregate>
+          <doclet>gr.spinellis.umlgraph.doclet.UmlGraphDoc</doclet>
+          <docletArtifact>
+            <groupId>gr.spinellis</groupId>
+            <artifactId>UmlGraph</artifactId>
+            <version>4.6</version>
+          </docletArtifact>
+          <additionalparam>
+            -inferrel -inferdep -quiet -hide java.*
+            -collpackages java.util.* -qualify
+            -postfixpackage -nodefontsize 9
+            -nodefontpackagesize 7
+          </additionalparam>
+          <links>
+            <link>http://java.sun.com/j2se/1.4.2/docs/api</link>
+            <link>http://java.sun.com/j2ee/1.4/docs/api</link>
+            <link>http://java.sun.com/j2se/1.5.0/docs/api</link>
+            <link>http://commons.apache.org/collections/apidocs-COLLECTIONS_3_0/</link>
+            <link>http://commons.apache.org/dbcp/apidocs/</link>
+            <link>http://commons.apache.org/fileupload/apidocs/</link>
+            <link>http://commons.apache.org/httpclient/apidocs/</link>
+            <link>http://commons.apache.org/logging/apidocs/</link>
+            <link>http://commons.apache.org/pool/apidocs/</link>
+            <link>http://junit.sourceforge.net/javadoc/</link>
+            <link>http://logging.apache.org/log4j/1.2/apidocs/</link>
+            <link>http://jakarta.apache.org/regexp/apidocs/</link>
+            <link>http://velocity.apache.org/engine/releases/velocity-1.5/apidocs/</link>
+          </links>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-pmd-plugin</artifactId>
+        <!-- TODO: choose appropriate rulesets -->
+        <configuration>
+          <targetJdk>1.5</targetJdk>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>clirr-maven-plugin</artifactId>
+      </plugin>
+    </plugins>
+  </reporting>
+  <profiles>
+    <profile>
+      <id>ci</id>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-pmd-plugin</artifactId>
+            <executions>
+              <execution>
+                <goals>
+                  <!-- TODO: after rules are set
+                              <goal>check</goal>
+                           -->
+                  <goal>cpd-check</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-checkstyle-plugin</artifactId>
+            <executions>
+              <execution>
+                <goals>
+                  <!-- TODO: reformat first, and correct the checks (some are not consistent with the Maven style)
+                              <goal>check</goal>
+                           -->
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
+          <plugin>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>cobertura-maven-plugin</artifactId>
+            <version>2.2</version>
+            <configuration>
+              <check>
+                <!-- TODO: raise to 85/100 -->
+                <totalLineRate>77</totalLineRate>
+                <totalBranchRate>95</totalBranchRate>
+              </check>
+              <instrumentation>
+                <excludes>
+                  <exclude>**/*$*</exclude>
+                </excludes>
+              </instrumentation>
+            </configuration>
+            <executions>
+              <execution>
+                <id>clean</id>
+                <goals>
+                  <goal>clean</goal>
+                </goals>
+              </execution>
+              <execution>
+                <id>check</id>
+                <goals>
+                  <goal>check</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
+  <distributionManagement>
+    <site>
+      <id>apache.website</id>
+      <url>${siteBaseDeployment}/ref/${project.version}</url>
+    </site>
+  </distributionManagement>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.codehaus.modello</groupId>
+        <artifactId>modello-maven-plugin</artifactId>
+        <version>1.0-alpha-15</version>
+      </plugin>
+      <plugin>
+        <groupId>org.codehaus.plexus</groupId>
+        <artifactId>plexus-maven-plugin</artifactId>
+        <version>1.3.5</version>
+        <executions>
+          <execution>
+            <id>generate</id>
+            <goals>
+              <goal>descriptor</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
 </project>

diff --git a/pom.xml b/pom.xml
index aaf211e5f96bc8e147e12252dc5c97e801f6d102..315ca9be384ab81f72a666f8a1ba11184030c4d4 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -43,16 +43,20 @@
   <url>http://maven.apache.org/archiva/</url>
   <build>
     <plugins>
+      <!-- We want to package up license resources in the JARs produced -->
       <plugin>
-        <groupId>org.codehaus.plexus</groupId>
-        <artifactId>plexus-maven-plugin</artifactId>
-        <version>1.3.5</version>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-remote-resources-plugin</artifactId>
         <executions>
           <execution>
-            <id>generate</id>
             <goals>
-              <goal>descriptor</goal>
+              <goal>process</goal>
             </goals>
+            <configuration>
+              <resourceBundles>
+                <resourceBundle>org.apache:apache-jar-resource-bundle:1.3</resourceBundle>
+              </resourceBundles>
+            </configuration>
           </execution>
         </executions>
       </plugin>
@@ -76,102 +80,77 @@
               </executions>
             </plugin>
       -->
-      <plugin>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <configuration>
-          <source>1.5</source>
-          <target>1.5</target>
-        </configuration>
-      </plugin>
-      <plugin>
-        <artifactId>maven-idea-plugin</artifactId>
-        <configuration>
-          <jdkLevel>1.5</jdkLevel>
-        </configuration>
-      </plugin>
-      <plugin>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <version>2.4.2</version>
-      </plugin>
-      <plugin>
-        <artifactId>maven-checkstyle-plugin</artifactId>
-        <version>2.1</version>
-        <configuration>
-          <includeTestSourceDirectory>true</includeTestSourceDirectory>
-          <configLocation>config/maven_checks.xml</configLocation>
-          <!-- TODO: enable when archiva-build-resources is active (released?)
-          <configLocation>checkstyle.xml</configLocation>
-          <headerLocation>header.txt</headerLocation>
-            -->
-        </configuration>
-        <!--
-        <executions>
-          <execution>
-            <goals>
-              <goal>check</goal>
-            </goals>
-            <configuration>
-              <failOnViolation>true</failOnViolation>
-            </configuration>
-          </execution>
-        </executions>
-          -->
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-remote-resources-plugin</artifactId>
-        <version>1.0-alpha-6</version>
-        <executions>
-          <execution>
-            <goals>
-              <goal>process</goal>
-            </goals>
-            <configuration>
-              <resourceBundles>
-                <resourceBundle>org.apache:apache-jar-resource-bundle:1.3</resourceBundle>
-              </resourceBundles>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
     </plugins>
     <pluginManagement>
       <plugins>
         <plugin>
-          <artifactId>maven-idea-plugin</artifactId>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-compiler-plugin</artifactId>
+          <version>2.0.2</version>
           <configuration>
-            <jdkLevel>1.4</jdkLevel>
+            <source>1.5</source>
+            <target>1.5</target>
           </configuration>
         </plugin>
         <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-remote-resources-plugin</artifactId>
+          <version>1.0-beta-2</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-deploy-plugin</artifactId>
+          <version>2.3</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-gpg-plugin</artifactId>
+          <version>1.0-alpha-4</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-install-plugin</artifactId>
+          <version>2.2</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-jar-plugin</artifactId>
+          <version>2.2</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-release-plugin</artifactId>
+          <version>2.0-beta-7</version>
           <configuration>
             <tagBase>https://svn.apache.org/repos/asf/archiva/tags</tagBase>
+            <useReleaseProfile>false</useReleaseProfile>
+            <goals>deploy</goals>
             <preparationGoals>clean install</preparationGoals>
+            <arguments>-Prelease</arguments>
           </configuration>
         </plugin>
         <plugin>
-          <groupId>org.codehaus.modello</groupId>
-          <artifactId>modello-maven-plugin</artifactId>
-          <version>1.0-alpha-15</version>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-resources-plugin</artifactId>
+          <version>2.2</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-surefire-plugin</artifactId>
+          <version>2.4.2</version>
+        </plugin>
+        <plugin>
+          <artifactId>maven-idea-plugin</artifactId>
+          <configuration>
+            <jdkLevel>1.5</jdkLevel>
+          </configuration>
         </plugin>
       </plugins>
     </pluginManagement>
-    <!-- TODO: enable when archiva-build-resources is active (released?)
-    <extensions>
-      <extension>
-        <groupId>org.apache.maven.archiva</groupId>
-        <artifactId>archiva-build-resources</artifactId>
-        <version>1-SNAPSHOT</version>
-      </extension>
-    </extensions>
-     -->
   </build>
   <modules>
     <module>archiva-cli</module>
-    <!--
     <module>archiva-docs</module>
-    -->
     <module>archiva-jetty</module>
     <module>archiva-modules</module>
   </modules>
@@ -281,12 +260,6 @@
         <artifactId>archiva-model</artifactId>
         <version>1.1-SNAPSHOT</version>
       </dependency>
-      <dependency>
-        <groupId>org.apache.archiva</groupId>
-        <artifactId>archiva-plexus-application</artifactId>
-        <version>1.1-SNAPSHOT</version>
-        <type>plexus-application</type>
-      </dependency>
       <dependency>
         <groupId>org.apache.archiva</groupId>
         <artifactId>archiva-policies</artifactId>
@@ -763,174 +736,84 @@
       </dependency>
     </dependencies>
   </dependencyManagement>
-  <reporting>
-    <plugins>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>cobertura-maven-plugin</artifactId>
-        <version>2.2</version>
-      </plugin>
-      <plugin>
-        <artifactId>maven-checkstyle-plugin</artifactId>
-      </plugin>
-<!-- TODO: OOME
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>findbugs-maven-plugin</artifactId>
-        <version>1.1.1</version>
-      </plugin>
--->
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>changelog-maven-plugin</artifactId>
-      </plugin>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>taglist-maven-plugin</artifactId>
-      </plugin>
-      <plugin>
-        <artifactId>maven-jxr-plugin</artifactId>
-        <configuration>
-          <aggregate>true</aggregate>
-        </configuration>
-      </plugin>
-<!--
-  Disabled until we can make it not appear in the docs, since that causes brutal build recursion
-      <plugin>
-        <artifactId>maven-surefire-report-plugin</artifactId>
-        <version>2.4.1</version>
-      </plugin>
--->
-      <plugin>
-        <artifactId>maven-javadoc-plugin</artifactId>
-        <version>2.4</version>
-        <configuration>
-          <source>1.5</source>
-          <aggregate>true</aggregate>
-          <doclet>gr.spinellis.umlgraph.doclet.UmlGraphDoc</doclet>
-          <docletArtifact>
-            <groupId>gr.spinellis</groupId>
-            <artifactId>UmlGraph</artifactId>
-            <version>4.6</version>
-          </docletArtifact>
-          <additionalparam>
-            -inferrel -inferdep -quiet -hide java.*
-            -collpackages java.util.* -qualify
-            -postfixpackage -nodefontsize 9
-            -nodefontpackagesize 7
-          </additionalparam>
-        </configuration>
-      </plugin>
-      <plugin>
-        <artifactId>maven-pmd-plugin</artifactId>
-        <!-- TODO: choose appropriate rulesets -->
-        <configuration>
-          <targetJdk>1.5</targetJdk>
-        </configuration>
-      </plugin>
-    </plugins>
-  </reporting>
+  <properties>
+    <maven.version>2.0.5</maven.version>
+    <wagon.version>1.0-rc1-SNAPSHOT</wagon.version>
+    <redback.version>1.1-SNAPSHOT</redback.version>
+  </properties>
   <profiles>
     <profile>
-      <id>ci</id>
-      <activation>
-        <property>
-          <name>enableCiProfile</name>
-          <value>true</value>
-        </property>
-      </activation>
+      <id>release</id>
       <build>
         <plugins>
           <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-pmd-plugin</artifactId>
+            <artifactId>maven-assembly-plugin</artifactId>
+            <version>2.1</version>
+            <inherited>false</inherited>
+            <configuration>
+              <descriptors>
+                <descriptor>src/main/assembly/src.xml</descriptor>
+              </descriptors>
+              <tarLongFileMode>gnu</tarLongFileMode>
+              <appendAssemblyId>false</appendAssemblyId>
+              <finalName>apache-archiva-${project.version}-src</finalName>
+            </configuration>
             <executions>
               <execution>
-                <phase>process-sources</phase>
+                <id>make-assembly</id>
+                <phase>package</phase>
                 <goals>
-                  <!-- TODO: after rules are set
-                              <goal>check</goal>
-                           -->
-                  <goal>cpd-check</goal>
+                  <goal>single</goal>
                 </goals>
               </execution>
             </executions>
           </plugin>
+          <!-- We want to sign the artifact, the POM, and all attached artifacts -->
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-checkstyle-plugin</artifactId>
+            <artifactId>maven-gpg-plugin</artifactId>
+            <configuration>
+              <passphrase>${gpg.passphrase}</passphrase>
+            </configuration>
             <executions>
               <execution>
-                <phase>process-sources</phase>
                 <goals>
-                  <!-- TODO: reformat first, and correct the checks (some are not consistent with the Maven style)
-                              <goal>check</goal>
-                           -->
+                  <goal>sign</goal>
                 </goals>
               </execution>
             </executions>
           </plugin>
+          <!-- We want to deploy the artifact to a staging location for perusal -->
           <plugin>
-            <groupId>org.codehaus.mojo</groupId>
-            <artifactId>cobertura-maven-plugin</artifactId>
-            <version>2.2</version>
+            <inherited>true</inherited>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-deploy-plugin</artifactId>
             <configuration>
-              <check>
-                <!-- TODO: raise to 85/100 -->
-                <totalLineRate>77</totalLineRate>
-                <totalBranchRate>95</totalBranchRate>
-              </check>
-              <instrumentation>
-                <excludes>
-                  <exclude>**/*$*</exclude>
-                </excludes>
-              </instrumentation>
+              <altDeploymentRepository>${deploy.altRepository}</altDeploymentRepository>
+              <updateReleaseInfo>true</updateReleaseInfo>
             </configuration>
+          </plugin>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-source-plugin</artifactId>
+            <version>2.0.4</version>
             <executions>
               <execution>
-                <id>clean</id>
-                <goals>
-                  <goal>clean</goal>
-                </goals>
-              </execution>
-              <execution>
-                <id>check</id>
+                <id>attach-sources</id>
                 <goals>
-                  <goal>check</goal>
+                  <goal>jar</goal>
                 </goals>
               </execution>
             </executions>
           </plugin>
-        </plugins>
-      </build>
-    </profile>
-    <profile>
-      <id>release</id>
-      <build>
-        <plugins>
           <plugin>
-            <!-- TODO:  Remove after maven-parent v6 is released -->
-            <artifactId>maven-gpg-plugin</artifactId>
-            <version>1.0-alpha-3</version>
-          </plugin>
-          <plugin>
-            <artifactId>maven-assembly-plugin</artifactId>
-            <version>2.1</version>
-            <inherited>false</inherited>
-            <configuration>
-              <descriptors>
-                <descriptor>src/main/assembly/src.xml</descriptor>
-              </descriptors>
-              <tarLongFileMode>gnu</tarLongFileMode>
-              <appendAssemblyId>false</appendAssemblyId>
-              <finalName>apache-archiva-${project.version}-src</finalName>
-            </configuration>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-javadoc-plugin</artifactId>
             <executions>
               <execution>
-                <id>make-assembly</id>
-                <phase>package</phase>
+                <id>attach-javadocs</id>
                 <goals>
-                  <goal>single</goal>
+                  <goal>jar</goal>
                 </goals>
               </execution>
             </executions>
@@ -939,11 +822,6 @@
       </build>
     </profile>
   </profiles>
-  <properties>
-    <maven.version>2.0.5</maven.version>
-    <wagon.version>1.0-rc1-SNAPSHOT</wagon.version>
-    <redback.version>1.1-SNAPSHOT</redback.version>
-  </properties>
   <repositories>
     <repository>
       <id>snapshots.codehaus.org</id>
@@ -956,10 +834,4 @@
       </snapshots>
     </repository>
   </repositories>
-  <distributionManagement>
-    <site>
-      <id>apache.website</id>
-      <url>${siteBaseDeployment}/ref/${project.version}</url>
-    </site>
-  </distributionManagement>
 </project>