commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ggreg...@apache.org
Subject svn commit: r1061085 - in /commons/proper/codec/trunk: checkstyle.xml pom.xml
Date Thu, 20 Jan 2011 01:06:35 GMT
Author: ggregory
Date: Thu Jan 20 01:06:34 2011
New Revision: 1061085

URL: http://svn.apache.org/viewvc?rev=1061085&view=rev
Log:
[CODEC-109] Allow the build to run with Maven 2 and Maven 3. https://issues.apache.org/jira/browse/CODEC-109.


Modified:
    commons/proper/codec/trunk/checkstyle.xml
    commons/proper/codec/trunk/pom.xml

Modified: commons/proper/codec/trunk/checkstyle.xml
URL: http://svn.apache.org/viewvc/commons/proper/codec/trunk/checkstyle.xml?rev=1061085&r1=1061084&r2=1061085&view=diff
==============================================================================
--- commons/proper/codec/trunk/checkstyle.xml (original)
+++ commons/proper/codec/trunk/checkstyle.xml Thu Jan 20 01:06:34 2011
@@ -24,11 +24,12 @@ limitations under the License.
 <module name="Checker">
   <property name="localeLanguage" value="en"/>
 
+  <!-- Verify that EVERY source file has the appropriate license -->
+  <module name="Header">
+    <property name="headerFile" value="${checkstyle.header.file}"/>
+  </module>
+
   <module name="TreeWalker">
-    <!-- Verify that EVERY source file has the appropriate license -->
-    <module name="Header">
-      <property name="headerFile" value="${checkstyle.header.file}"/>
-    </module>
 
     <module name="OperatorWrap">
       <property name="option" value="eol"/>

Modified: commons/proper/codec/trunk/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/codec/trunk/pom.xml?rev=1061085&r1=1061084&r2=1061085&view=diff
==============================================================================
--- commons/proper/codec/trunk/pom.xml (original)
+++ commons/proper/codec/trunk/pom.xml Thu Jan 20 01:06:34 2011
@@ -51,6 +51,46 @@
     <url>http://svn.apache.org/viewvc/commons/proper/codec/trunk</url>
   </scm>
 
+  <profiles>
+	<!-- 
+	  Use maven-site-plugin 2.x with Maven 2.x and maven-site-plugin 3.x with Maven 3.x  
+	  See http://maven.apache.org/plugins/maven-site-plugin-3.0-beta-3/maven-3.html 
+	-->
+    <profile>
+      <id>maven-3</id>
+      <activation>
+        <file>
+          <!--  The basedir expression is only recognized by Maven 3.x (see MNG-2363)
-->
+          <exists>${basedir}</exists>
+        </file>
+      </activation>
+      <build>
+        <pluginManagement>
+          <plugins>
+            <plugin>
+              <groupId>org.apache.maven.plugins</groupId>
+              <artifactId>maven-site-plugin</artifactId>
+              <version>3.0-beta-3</version>
+            </plugin>
+          </plugins>
+        </pluginManagement>
+        <plugins>
+          <plugin>
+            <artifactId>maven-site-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>attach-descriptor</id>
+                <goals>
+                  <goal>attach-descriptor</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>    
+  </profiles>
+  
     <developers>
         <developer>
             <name>Henri Yandell</name>
@@ -237,7 +277,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-checkstyle-plugin</artifactId>
-          <version>2.3</version>
+          <version>2.6</version>
           <configuration>
             <configLocation>${basedir}/checkstyle.xml</configLocation>
             <enableRulesSummary>false</enableRulesSummary>
@@ -257,21 +297,21 @@
         <plugin>
           <groupId>org.codehaus.mojo</groupId>
           <artifactId>findbugs-maven-plugin</artifactId>
-          <version>2.0.1</version>
+          <version>2.3.1</version>
         </plugin>
         <plugin>
           <groupId>org.codehaus.mojo</groupId>
           <artifactId>clirr-maven-plugin</artifactId>
           <version>2.2.2</version>
           <configuration>
-            <comparisonVersion>1.3</comparisonVersion>
+            <comparisonVersion>1.4</comparisonVersion>
             <minSeverity>info</minSeverity>
           </configuration>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-javadoc-plugin</artifactId>
-          <version>2.5</version>
+          <version>2.7</version>
           <configuration>
             <linksource>true</linksource>
             <links>



Mime
View raw message