commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r1650830 - in /commons/proper/commons-parent/trunk: pom.xml src/changes/changes.xml
Date Sat, 10 Jan 2015 23:31:14 GMT
Author: sebb
Date: Sat Jan 10 23:31:14 2015
New Revision: 1650830

URL: http://svn.apache.org/r1650830
Log:
merged maven-3 profile into main body (Maven 2 is no longer supported)

Modified:
    commons/proper/commons-parent/trunk/pom.xml
    commons/proper/commons-parent/trunk/src/changes/changes.xml

Modified: commons/proper/commons-parent/trunk/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/commons-parent/trunk/pom.xml?rev=1650830&r1=1650829&r2=1650830&view=diff
==============================================================================
--- commons/proper/commons-parent/trunk/pom.xml (original)
+++ commons/proper/commons-parent/trunk/pom.xml Sat Jan 10 23:31:14 2015
@@ -38,6 +38,7 @@ Version 37:
 - Update org.apache:apache 15 to 16 (nop for Commons, maven-compiler-plugin already contained
source/target)
 - Adjust Maven prerequisite 3.0 -> 3.0.1 as required by Findbugs
 - Update Maven Project Info Reports Plugin : 2.7 => 2.8
+- merged maven-3 profile into main body (Maven 2 is no longer supported)
 
  -->
 
@@ -328,6 +329,22 @@ Version 37:
             <!-- don't deploy site with maven-site-plugin -->
             <skipDeploy>true</skipDeploy>
           </configuration>
+          <dependencies>
+            <dependency>
+                <!-- add support for ssh/scp -->
+              <groupId>org.apache.maven.wagon</groupId>
+              <artifactId>wagon-ssh</artifactId>
+              <version>${commons.wagon-ssh.version}</version>
+            </dependency>
+          </dependencies>
+          <executions>
+            <execution>
+              <id>attach-descriptor</id>
+              <goals>
+                <goal>attach-descriptor</goal>
+              </goals>
+            </execution>
+          </executions>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
@@ -1177,43 +1194,6 @@ Version 37:
       </modules>
     </profile>
 
-    <!--
-        Configure site plugin to support both Maven2 and Maven3, see:
-        http://maven.apache.org/plugins/maven-site-plugin/maven-3.html#Using_the_same_version_of_maven-site-plugin_for_both_Maven_2_and_Maven_3
-    -->
-    <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>
-        <plugins>
-          <plugin>
-            <artifactId>maven-site-plugin</artifactId>
-            <dependencies>
-              <dependency>
-                  <!-- add support for ssh/scp -->
-                <groupId>org.apache.maven.wagon</groupId>
-                <artifactId>wagon-ssh</artifactId>
-                <version>${commons.wagon-ssh.version}</version>
-              </dependency>
-            </dependencies>
-            <executions>
-              <execution>
-                <id>attach-descriptor</id>
-                <goals>
-                  <goal>attach-descriptor</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-
     <profile>
       <!--
           Generate release notes in top-level directory from src/changes/changes.xml

Modified: commons/proper/commons-parent/trunk/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/commons/proper/commons-parent/trunk/src/changes/changes.xml?rev=1650830&r1=1650829&r2=1650830&view=diff
==============================================================================
--- commons/proper/commons-parent/trunk/src/changes/changes.xml (original)
+++ commons/proper/commons-parent/trunk/src/changes/changes.xml Sat Jan 10 23:31:14 2015
@@ -65,6 +65,7 @@ The <action> type attribute can be add,u
             <action type="update">Update minimum Maven prerequisite (as defined by
Findbugs) 3.0 -> 3.0.1</action>
             <action type="update">Update org.apache:apache 15 to 16 (nop for Commons:
maven-compiler-plugin already contained source/target)</action>
             <action type="update">Update Maven Project Info Reports Plugin : 2.7 =>
2.8</action>
+            <action type="update">merged maven-3 profile into main body (Maven 2 is
no longer supported)</action>
         </release>
 
 	<release version="36" date="2014-12-21" description="Update plugins, fix release-notes
profile.">



Mime
View raw message