You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by ch...@apache.org on 2018/07/02 16:42:05 UTC

svn commit: r1834867 - in /commons/proper/commons-parent/trunk: ./ RELEASE-NOTES.txt pom.xml src/changes/changes.xml

Author: chtompki
Date: Mon Jul  2 16:42:05 2018
New Revision: 1834867

URL: http://svn.apache.org/viewvc?rev=1834867&view=rev
Log:
Merge in 47 and upversion to 48-SNAPSHOT

Modified:
    commons/proper/commons-parent/trunk/   (props changed)
    commons/proper/commons-parent/trunk/RELEASE-NOTES.txt
    commons/proper/commons-parent/trunk/pom.xml
    commons/proper/commons-parent/trunk/src/changes/changes.xml

Propchange: commons/proper/commons-parent/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Jul  2 16:42:05 2018
@@ -0,0 +1 @@
+/commons/proper/commons-parent/branches/commons-parent-47:1834603-1834866

Modified: commons/proper/commons-parent/trunk/RELEASE-NOTES.txt
URL: http://svn.apache.org/viewvc/commons/proper/commons-parent/trunk/RELEASE-NOTES.txt?rev=1834867&r1=1834866&r2=1834867&view=diff
==============================================================================
--- commons/proper/commons-parent/trunk/RELEASE-NOTES.txt (original)
+++ commons/proper/commons-parent/trunk/RELEASE-NOTES.txt Mon Jul  2 16:42:05 2018
@@ -25,6 +25,7 @@ o maven-enforcer-plugin 3.0.0-M1 -> 3.0.
 o commons-release-plugin 1.2 -> 1.3
 o commons-build-plugin 1.8 -> 1.9
 o maven-surefire-plugin 2.21.0 -> 2.22.0
+o maven-project-info-reports-plugin 2.9 -> 3.0.0
 
 
 Historical list of changes: http://commons.apache.org/commons-parent-pom.html

Modified: commons/proper/commons-parent/trunk/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/commons-parent/trunk/pom.xml?rev=1834867&r1=1834866&r2=1834867&view=diff
==============================================================================
--- commons/proper/commons-parent/trunk/pom.xml (original)
+++ commons/proper/commons-parent/trunk/pom.xml Mon Jul  2 16:42:05 2018
@@ -28,7 +28,7 @@
   <groupId>org.apache.commons</groupId>
   <artifactId>commons-parent</artifactId>
   <packaging>pom</packaging>
-  <version>47-SNAPSHOT</version>
+  <version>48-SNAPSHOT</version>
   <name>Apache Commons Parent</name>
   <url>http://commons.apache.org/commons-parent-pom.html</url>
   <description>The Apache Commons Parent POM provides common settings for all Apache Commons components.</description>
@@ -925,15 +925,15 @@
               <report>summary</report>
               <report>modules</report>
               <!-- <report>license</report> site must link to ASF page instead -->
-              <report>project-team</report>
+              <report>team</report>
               <report>scm</report>
-              <report>issue-tracking</report>
-              <report>mailing-list</report>
+              <report>issue-management</report>
+              <report>mailing-lists</report>
               <report>dependency-info</report>
               <report>dependency-management</report>
               <report>dependencies</report>
               <report>dependency-convergence</report>
-              <report>cim</report>
+              <report>ci-management</report>
               <!-- <report>plugin-management</report> not very useful for end users -->
               <!-- <report>plugins</report> not very useful for end users -->
               <report>distribution-management</report>

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=1834867&r1=1834866&r2=1834867&view=diff
==============================================================================
--- commons/proper/commons-parent/trunk/src/changes/changes.xml (original)
+++ commons/proper/commons-parent/trunk/src/changes/changes.xml Mon Jul  2 16:42:05 2018
@@ -73,6 +73,7 @@ The <action> type attribute can be add,u
             <action type="update">commons-release-plugin 1.2 -> 1.3</action>
             <action type="update">commons-build-plugin 1.8 -> 1.9</action>
             <action type="update">maven-surefire-plugin 2.21.0 -> 2.22.0</action>
+            <action type="update">maven-project-info-reports-plugin 2.9 -> 3.0.0</action>
         </release>
 
         <release version="46" date="2018-04-07" description="Plugin updates