svn commit: r1769452 - /maven/project/KEYS

[hboutemy]

Author: hboutemy
Date: Sat Nov 12 23:34:37 2016
New Revision: 1769452

URL: http://svn.apache.org/viewvc?rev=1769452=rev
Log:
added new key

Modified:
maven/project/KEYS

Modified: maven/project/KEYS
URL: 
http://svn.apache.org/viewvc/maven/project/KEYS?rev=1769452=1769451=1769452=diff
==
--- maven/project/KEYS (original)
+++ maven/project/KEYS Sat Nov 12 23:34:37 2016
@@ -2991,3 +2991,40 @@ DAHwD80IXAi3LV2AKb81
 =I9Tv
 -END PGP PUBLIC KEY BLOCK-
 
+pub   rsa2048 2016-11-12 [SC]
+  FA77DCFEF2EE6EB2DEBEDD2C012579464D01C06A
+uid  [  ultime ] Herve Boutemy 
+sig 3012579464D01C06A 2016-11-12  Herve Boutemy 
+sub   rsa2048 2016-11-12 [E]
+sig  012579464D01C06A 2016-11-12  Herve Boutemy 
+
+-BEGIN PGP PUBLIC KEY BLOCK-
+
+mQENBFgnlA8BCACVtx3oLXcanfvwtMRwal6pLQ8IVMG9+fr4xGdbSHXCRNbosDa5
+agU7WeQMPhusSxJGaA3w7NOdjAwD/LeHADhDPeI6llJg1Fb3EyqH0NZaODKU/Or/
+dID/i1onAX1dE914J4lf3XvIAxGiAjmr3UvWO9RiFxRUkecMAMlCBp2FuHuvxkcn
+Mk8q9dP9Ef360wu8X5rj0kgP6vPhgl9/RhuPsUxlazb2Kn9Zxi/RmDKDiH/vDuwy
+WdRGFOR1OPV7l3Ws01nrs4vKd2v5rsUmsjvQ8ldxdrA1xzX4IszHRDgSC9PI8ItZ
+1VlbaKjE0L03acPfFTg/wRFSF5zsrGNbTmq1ABEBAAG0I0hlcnZlIEJvdXRlbXkg
+PGhib3V0ZW15QGFwYWNoZS5vcmc+iQE3BBMBCgAhBQJYJ5QPAhsDBQsJCAcDBRUK
+CQgLBRYCAwEAAh4BAheAAAoJEAEleUZNAcBqo5MH/1RQy2ogQHqOZggHXKSdFSyh
+N15+Th9MQ6pU2S8Fx14NHzRU8OdQigca5IpFF47At55eLorLDWByxCtE4gWVmwNo
+GlvfH8hWep0gYibL628/mmI3lM27QCaoAqCnjdc63ig+aGH+JDHgQIQ1Po0lDTLF
+FL3cgSQJhuWw0GnJehVy51iR6kQ7Pphwfz2RuSW0Bv1SVu0lholZwgi1dgGhNHWd
+e7jygZC1Yl5veJMjnpFbwtn0L3cqh1yA8g1GD8Gyvvm8a9KH5XGMVjdKnIsvPBbc
+5ind6+0Or+ei3LjZummtUtbFLiDS2tdKZ5uPGfYZulg+/xCjznSj73iu3Bsloj25
+AQ0EWCeUDwEIAMGWqQT5ccT/Q1OypoOQGEZn+oRkgEdnzt8mjo7aOXd6pkNTkt3+
+LCkmb8Pp3/a3iYEfvSvBZbb2JbY9xnmM8jBucWnow1iwEPxGhUuu3jlIpRsCwLk+
+utLkMALRkooXqanDoVRWxuVeFYN0as8nndgWiJT30innN4vfaR3x3E6/nS57zp5I
+ggxZYsXTRHb25kaof9lglHyXeypW7quKOP4SeES70PVVUnYZBlLpnX8a2msRtJio
+uWxCv/kHnYsjW62vc7nqvWAsSsfBT61TVx7yI9CckVFBnkpG1I8C9WpfcR+j9yau
+ptgUMfrfDTFg3Aip7czMSoL4Jpu7jBcXy9UAEQEAAYkBHwQYAQoACQUCWCeUDwIb
+DAAKCRABJXlGTQHAapGTB/oCoCsuJ7617gpcuEAXxWTBfcXKo4z8ObBek2RUh0AY
+9aXjRYSzwwbtVFRC01Esr7R9b5ScY7W1TDQBKL0OSRZ3jwy7/hA7k8P7xAp3mC4+
+FdHaHMH8nGz2IbUjGWl3Yp01NRn4jc8gcnHnqcUff7PXsRMUtJ3dnbsIYOrBAbWK
+ld07RVEQUyafgUfdF9cxe6P/slSZxATJrlIPveB5bgcVDMMw1UQNqJL9LWP2IM7x
+cljOBHY7jqwqnQ4pRER92VzhLdtsdwF0H1SuERpDxBAuibchMoCfQ3HER+K2mTUo
+J04xog7MQs2aaMwSbem1LMvNBZ/mfF7QMYfMV2n7rbIk
+=dlid
+-END PGP PUBLIC KEY BLOCK-
+

svn commit: r1769451 - /maven/plugins/trunk/maven-resources-plugin/pom.xml

[schulte]

Author: schulte
Date: Sat Nov 12 23:29:04 2016
New Revision: 1769451

URL: http://svn.apache.org/viewvc?rev=1769451=rev
Log:
[MRESOURCES-234] Upgrade of commons-io to 2.5 and correction of invalid scope.

Modified:
maven/plugins/trunk/maven-resources-plugin/pom.xml

Modified: maven/plugins/trunk/maven-resources-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-resources-plugin/pom.xml?rev=1769451=1769450=1769451=diff
==
--- maven/plugins/trunk/maven-resources-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-resources-plugin/pom.xml Sat Nov 12 23:29:04 2016
@@ -109,6 +109,13 @@ under the License.
   maven-filtering
   ${mavenFilteringVersion}
 
+
+
+  commons-io
+  commons-io
+  2.5
+  compile
+
 
 
   org.codehaus.plexus
@@ -129,12 +136,6 @@ under the License.
   test
 
 
-  commons-io
-  commons-io
-  2.5
-  test
-
-
   junit
   junit
   4.12

svn commit: r1001032 [2/4] - in /websites/production/maven/components/plugins-archives/maven-site-plugin-LATEST: ./ apidocs/ apidocs/org/apache/maven/plugins/site/ apidocs/org/apache/maven/plugins/sit

[hboutemy]

Modified: 
websites/production/maven/components/plugins-archives/maven-site-plugin-LATEST/apidocs/org/apache/maven/plugins/site/run/class-use/SiteRunMojo.html
==
--- 
websites/production/maven/components/plugins-archives/maven-site-plugin-LATEST/apidocs/org/apache/maven/plugins/site/run/class-use/SiteRunMojo.html
 (original)
+++ 
websites/production/maven/components/plugins-archives/maven-site-plugin-LATEST/apidocs/org/apache/maven/plugins/site/run/class-use/SiteRunMojo.html
 Sat Nov 12 23:24:49 2016
@@ -2,7 +2,7 @@
 
 
 
-
+
 Uses of Class org.apache.maven.plugins.site.run.SiteRunMojo (Apache 
Maven Site Plugin 3.6 API)
 
 

Modified: 
websites/production/maven/components/plugins-archives/maven-site-plugin-LATEST/apidocs/org/apache/maven/plugins/site/run/package-frame.html
==
--- 
websites/production/maven/components/plugins-archives/maven-site-plugin-LATEST/apidocs/org/apache/maven/plugins/site/run/package-frame.html
 (original)
+++ 
websites/production/maven/components/plugins-archives/maven-site-plugin-LATEST/apidocs/org/apache/maven/plugins/site/run/package-frame.html
 Sat Nov 12 23:24:49 2016
@@ -2,7 +2,7 @@
 
 
 
-
+
 org.apache.maven.plugins.site.run (Apache Maven Site Plugin 3.6 
API)
 
 

Modified: 
websites/production/maven/components/plugins-archives/maven-site-plugin-LATEST/apidocs/org/apache/maven/plugins/site/run/package-summary.html
==
--- 
websites/production/maven/components/plugins-archives/maven-site-plugin-LATEST/apidocs/org/apache/maven/plugins/site/run/package-summary.html
 (original)
+++ 
websites/production/maven/components/plugins-archives/maven-site-plugin-LATEST/apidocs/org/apache/maven/plugins/site/run/package-summary.html
 Sat Nov 12 23:24:49 2016
@@ -2,7 +2,7 @@
 
 
 
-
+
 org.apache.maven.plugins.site.run (Apache Maven Site Plugin 3.6 
API)
 
 

Modified: 
websites/production/maven/components/plugins-archives/maven-site-plugin-LATEST/apidocs/org/apache/maven/plugins/site/run/package-tree.html
==
--- 
websites/production/maven/components/plugins-archives/maven-site-plugin-LATEST/apidocs/org/apache/maven/plugins/site/run/package-tree.html
 (original)
+++ 
websites/production/maven/components/plugins-archives/maven-site-plugin-LATEST/apidocs/org/apache/maven/plugins/site/run/package-tree.html
 Sat Nov 12 23:24:49 2016
@@ -2,7 +2,7 @@
 
 
 
-
+
 org.apache.maven.plugins.site.run Class Hierarchy (Apache Maven Site 
Plugin 3.6 API)
 
 

Modified: 
websites/production/maven/components/plugins-archives/maven-site-plugin-LATEST/apidocs/org/apache/maven/plugins/site/run/package-use.html
==
--- 
websites/production/maven/components/plugins-archives/maven-site-plugin-LATEST/apidocs/org/apache/maven/plugins/site/run/package-use.html
 (original)
+++ 
websites/production/maven/components/plugins-archives/maven-site-plugin-LATEST/apidocs/org/apache/maven/plugins/site/run/package-use.html
 Sat Nov 12 23:24:49 2016
@@ -2,7 +2,7 @@
 
 
 
-
+
 Uses of Package org.apache.maven.plugins.site.run (Apache Maven Site 
Plugin 3.6 API)
 
 

Modified: 
websites/production/maven/components/plugins-archives/maven-site-plugin-LATEST/apidocs/overview-frame.html
==
--- 
websites/production/maven/components/plugins-archives/maven-site-plugin-LATEST/apidocs/overview-frame.html
 (original)
+++ 
websites/production/maven/components/plugins-archives/maven-site-plugin-LATEST/apidocs/overview-frame.html
 Sat Nov 12 23:24:49 2016
@@ -2,7 +2,7 @@
 
 
 
-
+
 Overview List (Apache Maven Site Plugin 3.6 API)
 
 

Modified: 
websites/production/maven/components/plugins-archives/maven-site-plugin-LATEST/apidocs/overview-summary.html
==
--- 
websites/production/maven/components/plugins-archives/maven-site-plugin-LATEST/apidocs/overview-summary.html
 (original)
+++ 
websites/production/maven/components/plugins-archives/maven-site-plugin-LATEST/apidocs/overview-summary.html
 Sat Nov 12 23:24:49 2016
@@ -2,7 +2,7 @@
 
 
 
-
+
 Overview (Apache Maven Site Plugin 3.6 API)
 
 

Modified: 
websites/production/maven/components/plugins-archives/maven-site-plugin-LATEST/apidocs/overview-tree.html
==
--- 
websites/production/maven/components/plugins-archives/maven-site-plugin-LATEST/apidocs/overview-tree.html
 (original)
+++ 
websites/production/maven/components/plugins-archives/maven-site-plugin-LATEST/apidocs/overview-tree.html
 Sat Nov 12 23:24:49 2016
@@ -2,7 +2,7 @@
 
 
 
-
+
 Class Hierarchy (Apache Maven Site Plugin 3.6 API)
 
 

svn commit: r1001032 [3/4] - in /websites/production/maven/components/plugins-archives/maven-site-plugin-LATEST: ./ apidocs/ apidocs/org/apache/maven/plugins/site/ apidocs/org/apache/maven/plugins/sit

[hboutemy]

Modified: 
websites/production/maven/components/plugins-archives/maven-site-plugin-LATEST/examples/configuring-reports.html
==
--- 
websites/production/maven/components/plugins-archives/maven-site-plugin-LATEST/examples/configuring-reports.html
 (original)
+++ 
websites/production/maven/components/plugins-archives/maven-site-plugin-LATEST/examples/configuring-reports.html
 Sat Nov 12 23:24:49 2016
@@ -1,6 +1,6 @@
 
 
 http://www.w3.org/1999/xhtml; xml:lang="en" lang="en">
@@ -10,7 +10,7 @@
 
 
-
+
 
 Apache Maven Site Plugin  Configuring Reports
 
@@ -80,7 +80,7 @@ Hervé Boutemy" />
 Configuring Reports
 
   
-  | Last Published: 2016-11-06
+  | Last Published: 2016-11-13
   
 Version: 3.6
 

Modified: 
websites/production/maven/components/plugins-archives/maven-site-plugin-LATEST/examples/creating-content.html
==
--- 
websites/production/maven/components/plugins-archives/maven-site-plugin-LATEST/examples/creating-content.html
 (original)
+++ 
websites/production/maven/components/plugins-archives/maven-site-plugin-LATEST/examples/creating-content.html
 Sat Nov 12 23:24:49 2016
@@ -1,6 +1,6 @@
 
 
 http://www.w3.org/1999/xhtml; xml:lang="en" lang="en">
@@ -9,7 +9,7 @@
 
 
 
-
+
 
 Apache Maven Site Plugin  Creating Content
 
@@ -79,7 +79,7 @@
 Creating Content
 
   
-  | Last Published: 2016-11-06
+  | Last Published: 2016-11-13
   
 Version: 3.6
 

Modified: 
websites/production/maven/components/plugins-archives/maven-site-plugin-LATEST/examples/creatingskins.html
==
--- 
websites/production/maven/components/plugins-archives/maven-site-plugin-LATEST/examples/creatingskins.html
 (original)
+++ 
websites/production/maven/components/plugins-archives/maven-site-plugin-LATEST/examples/creatingskins.html
 Sat Nov 12 23:24:49 2016
@@ -1,6 +1,6 @@
 
 
 http://www.w3.org/1999/xhtml; xml:lang="en" lang="en">
@@ -10,7 +10,7 @@
 
 
-
+
 
 Apache Maven Site Plugin  Creating Skins
 
@@ -80,7 +80,7 @@ Dennis Lundberg" />
 Creating Skins
 
   
-  | Last Published: 2016-11-06
+  | Last Published: 2016-11-13
   
 Version: 3.6
 

Modified: 
websites/production/maven/components/plugins-archives/maven-site-plugin-LATEST/examples/moduleexcludes.html
==
--- 
websites/production/maven/components/plugins-archives/maven-site-plugin-LATEST/examples/moduleexcludes.html
 (original)
+++ 
websites/production/maven/components/plugins-archives/maven-site-plugin-LATEST/examples/moduleexcludes.html
 Sat Nov 12 23:24:49 2016
@@ -1,6 +1,6 @@
 
 
 http://www.w3.org/1999/xhtml; xml:lang="en" lang="en">
@@ -9,7 +9,7 @@
 
 
 
-
+
 
 Apache Maven Site Plugin  Excluding Document Formats
 
@@ -79,7 +79,7 @@
 Excluding Document Formats
 
   
-  | Last Published: 2016-11-06
+  | Last Published: 2016-11-13
   
 Version: 3.6
 

Modified: 
websites/production/maven/components/plugins-archives/maven-site-plugin-LATEST/examples/multimodule.html
==
--- 
websites/production/maven/components/plugins-archives/maven-site-plugin-LATEST/examples/multimodule.html
 (original)
+++ 
websites/production/maven/components/plugins-archives/maven-site-plugin-LATEST/examples/multimodule.html
 Sat Nov 12 23:24:49 2016
@@ -1,6 +1,6 @@
 
 
 http://www.w3.org/1999/xhtml; xml:lang="en" lang="en">
@@ -13,7 +13,7 @@ Maria Odea Ching
 Dennis Lundberg
 Lukas Theussl" />
 
-
+
 
 Apache Maven Site Plugin  Multi-module Sites
 
@@ -83,7 +83,7 @@ Lukas Theussl" />
 Multi-module Sites
 
   
-  | Last Published: 2016-11-06
+  | Last Published: 2016-11-13
   
 Version: 3.6
 

Modified: 
websites/production/maven/components/plugins-archives/maven-site-plugin-LATEST/examples/site-deploy-to-sourceforge.net.html
==
--- 
websites/production/maven/components/plugins-archives/maven-site-plugin-LATEST/examples/site-deploy-to-sourceforge.net.html
 (original)
+++ 
websites/production/maven/components/plugins-archives/maven-site-plugin-LATEST/examples/site-deploy-to-sourceforge.net.html
 Sat Nov 12 23:24:49 2016
@@ 

svn commit: r1001032 [1/4] - in /websites/production/maven/components/plugins-archives/maven-site-plugin-LATEST: ./ apidocs/ apidocs/org/apache/maven/plugins/site/ apidocs/org/apache/maven/plugins/sit

[hboutemy]

Author: hboutemy
Date: Sat Nov 12 23:24:49 2016
New Revision: 1001032

Log:
maven-site-plugin 3.6

Modified:

websites/production/maven/components/plugins-archives/maven-site-plugin-LATEST/apidocs/allclasses-frame.html

websites/production/maven/components/plugins-archives/maven-site-plugin-LATEST/apidocs/allclasses-noframe.html

websites/production/maven/components/plugins-archives/maven-site-plugin-LATEST/apidocs/constant-values.html

websites/production/maven/components/plugins-archives/maven-site-plugin-LATEST/apidocs/deprecated-list.html

websites/production/maven/components/plugins-archives/maven-site-plugin-LATEST/apidocs/help-doc.html

websites/production/maven/components/plugins-archives/maven-site-plugin-LATEST/apidocs/index-all.html

websites/production/maven/components/plugins-archives/maven-site-plugin-LATEST/apidocs/index.html

websites/production/maven/components/plugins-archives/maven-site-plugin-LATEST/apidocs/org/apache/maven/plugins/site/AbstractSiteMojo.html

websites/production/maven/components/plugins-archives/maven-site-plugin-LATEST/apidocs/org/apache/maven/plugins/site/class-use/AbstractSiteMojo.html

websites/production/maven/components/plugins-archives/maven-site-plugin-LATEST/apidocs/org/apache/maven/plugins/site/deploy/AbstractDeployMojo.html

websites/production/maven/components/plugins-archives/maven-site-plugin-LATEST/apidocs/org/apache/maven/plugins/site/deploy/AbstractStagingMojo.html

websites/production/maven/components/plugins-archives/maven-site-plugin-LATEST/apidocs/org/apache/maven/plugins/site/deploy/HelpMojo.html

websites/production/maven/components/plugins-archives/maven-site-plugin-LATEST/apidocs/org/apache/maven/plugins/site/deploy/SiteDeployMojo.html

websites/production/maven/components/plugins-archives/maven-site-plugin-LATEST/apidocs/org/apache/maven/plugins/site/deploy/SiteStageDeployMojo.html

websites/production/maven/components/plugins-archives/maven-site-plugin-LATEST/apidocs/org/apache/maven/plugins/site/deploy/SiteStageMojo.html

websites/production/maven/components/plugins-archives/maven-site-plugin-LATEST/apidocs/org/apache/maven/plugins/site/deploy/class-use/AbstractDeployMojo.html

websites/production/maven/components/plugins-archives/maven-site-plugin-LATEST/apidocs/org/apache/maven/plugins/site/deploy/class-use/AbstractStagingMojo.html

websites/production/maven/components/plugins-archives/maven-site-plugin-LATEST/apidocs/org/apache/maven/plugins/site/deploy/class-use/HelpMojo.html

websites/production/maven/components/plugins-archives/maven-site-plugin-LATEST/apidocs/org/apache/maven/plugins/site/deploy/class-use/SiteDeployMojo.html

websites/production/maven/components/plugins-archives/maven-site-plugin-LATEST/apidocs/org/apache/maven/plugins/site/deploy/class-use/SiteStageDeployMojo.html

websites/production/maven/components/plugins-archives/maven-site-plugin-LATEST/apidocs/org/apache/maven/plugins/site/deploy/class-use/SiteStageMojo.html

websites/production/maven/components/plugins-archives/maven-site-plugin-LATEST/apidocs/org/apache/maven/plugins/site/deploy/package-frame.html

websites/production/maven/components/plugins-archives/maven-site-plugin-LATEST/apidocs/org/apache/maven/plugins/site/deploy/package-summary.html

websites/production/maven/components/plugins-archives/maven-site-plugin-LATEST/apidocs/org/apache/maven/plugins/site/deploy/package-tree.html

websites/production/maven/components/plugins-archives/maven-site-plugin-LATEST/apidocs/org/apache/maven/plugins/site/deploy/package-use.html

websites/production/maven/components/plugins-archives/maven-site-plugin-LATEST/apidocs/org/apache/maven/plugins/site/deploy/wagon/BugFixedRepository.html

websites/production/maven/components/plugins-archives/maven-site-plugin-LATEST/apidocs/org/apache/maven/plugins/site/deploy/wagon/PathUtils.html

websites/production/maven/components/plugins-archives/maven-site-plugin-LATEST/apidocs/org/apache/maven/plugins/site/deploy/wagon/class-use/BugFixedRepository.html

websites/production/maven/components/plugins-archives/maven-site-plugin-LATEST/apidocs/org/apache/maven/plugins/site/deploy/wagon/class-use/PathUtils.html

websites/production/maven/components/plugins-archives/maven-site-plugin-LATEST/apidocs/org/apache/maven/plugins/site/deploy/wagon/package-frame.html

websites/production/maven/components/plugins-archives/maven-site-plugin-LATEST/apidocs/org/apache/maven/plugins/site/deploy/wagon/package-summary.html

websites/production/maven/components/plugins-archives/maven-site-plugin-LATEST/apidocs/org/apache/maven/plugins/site/deploy/wagon/package-tree.html

websites/production/maven/components/plugins-archives/maven-site-plugin-LATEST/apidocs/org/apache/maven/plugins/site/deploy/wagon/package-use.html

svn commit: r1001032 [4/4] - in /websites/production/maven/components/plugins-archives/maven-site-plugin-LATEST: ./ apidocs/ apidocs/org/apache/maven/plugins/site/ apidocs/org/apache/maven/plugins/sit

[hboutemy]

Modified: 
websites/production/maven/components/plugins-archives/maven-site-plugin-LATEST/testapidocs/org/apache/maven/plugins/site/deploy/class-use/SimpleDavServerHandler.html
==
--- 
websites/production/maven/components/plugins-archives/maven-site-plugin-LATEST/testapidocs/org/apache/maven/plugins/site/deploy/class-use/SimpleDavServerHandler.html
 (original)
+++ 
websites/production/maven/components/plugins-archives/maven-site-plugin-LATEST/testapidocs/org/apache/maven/plugins/site/deploy/class-use/SimpleDavServerHandler.html
 Sat Nov 12 23:24:49 2016
@@ -2,7 +2,7 @@
 
 
 
-
+
 Uses of Class 
org.apache.maven.plugins.site.deploy.SimpleDavServerHandler (Apache Maven Site 
Plugin 3.6 Test API)
 
 

Modified: 
websites/production/maven/components/plugins-archives/maven-site-plugin-LATEST/testapidocs/org/apache/maven/plugins/site/deploy/class-use/SiteDeployMojoTest.html
==
--- 
websites/production/maven/components/plugins-archives/maven-site-plugin-LATEST/testapidocs/org/apache/maven/plugins/site/deploy/class-use/SiteDeployMojoTest.html
 (original)
+++ 
websites/production/maven/components/plugins-archives/maven-site-plugin-LATEST/testapidocs/org/apache/maven/plugins/site/deploy/class-use/SiteDeployMojoTest.html
 Sat Nov 12 23:24:49 2016
@@ -2,7 +2,7 @@
 
 
 
-
+
 Uses of Class org.apache.maven.plugins.site.deploy.SiteDeployMojoTest 
(Apache Maven Site Plugin 3.6 Test API)
 
 

Modified: 
websites/production/maven/components/plugins-archives/maven-site-plugin-LATEST/testapidocs/org/apache/maven/plugins/site/deploy/class-use/SiteDeployWebDavTest.html
==
--- 
websites/production/maven/components/plugins-archives/maven-site-plugin-LATEST/testapidocs/org/apache/maven/plugins/site/deploy/class-use/SiteDeployWebDavTest.html
 (original)
+++ 
websites/production/maven/components/plugins-archives/maven-site-plugin-LATEST/testapidocs/org/apache/maven/plugins/site/deploy/class-use/SiteDeployWebDavTest.html
 Sat Nov 12 23:24:49 2016
@@ -2,7 +2,7 @@
 
 
 
-
+
 Uses of Class org.apache.maven.plugins.site.deploy.SiteDeployWebDavTest 
(Apache Maven Site Plugin 3.6 Test API)
 
 

Modified: 
websites/production/maven/components/plugins-archives/maven-site-plugin-LATEST/testapidocs/org/apache/maven/plugins/site/deploy/package-frame.html
==
--- 
websites/production/maven/components/plugins-archives/maven-site-plugin-LATEST/testapidocs/org/apache/maven/plugins/site/deploy/package-frame.html
 (original)
+++ 
websites/production/maven/components/plugins-archives/maven-site-plugin-LATEST/testapidocs/org/apache/maven/plugins/site/deploy/package-frame.html
 Sat Nov 12 23:24:49 2016
@@ -2,7 +2,7 @@
 
 
 
-
+
 org.apache.maven.plugins.site.deploy (Apache Maven Site Plugin 3.6 Test 
API)
 
 

Modified: 
websites/production/maven/components/plugins-archives/maven-site-plugin-LATEST/testapidocs/org/apache/maven/plugins/site/deploy/package-summary.html
==
--- 
websites/production/maven/components/plugins-archives/maven-site-plugin-LATEST/testapidocs/org/apache/maven/plugins/site/deploy/package-summary.html
 (original)
+++ 
websites/production/maven/components/plugins-archives/maven-site-plugin-LATEST/testapidocs/org/apache/maven/plugins/site/deploy/package-summary.html
 Sat Nov 12 23:24:49 2016
@@ -2,7 +2,7 @@
 
 
 
-
+
 org.apache.maven.plugins.site.deploy (Apache Maven Site Plugin 3.6 Test 
API)
 
 

Modified: 
websites/production/maven/components/plugins-archives/maven-site-plugin-LATEST/testapidocs/org/apache/maven/plugins/site/deploy/package-tree.html
==
--- 
websites/production/maven/components/plugins-archives/maven-site-plugin-LATEST/testapidocs/org/apache/maven/plugins/site/deploy/package-tree.html
 (original)
+++ 
websites/production/maven/components/plugins-archives/maven-site-plugin-LATEST/testapidocs/org/apache/maven/plugins/site/deploy/package-tree.html
 Sat Nov 12 23:24:49 2016
@@ -2,7 +2,7 @@
 
 
 
-
+
 org.apache.maven.plugins.site.deploy Class Hierarchy (Apache Maven Site 
Plugin 3.6 Test API)
 
 

Modified: 
websites/production/maven/components/plugins-archives/maven-site-plugin-LATEST/testapidocs/org/apache/maven/plugins/site/deploy/package-use.html
==
--- 
websites/production/maven/components/plugins-archives/maven-site-plugin-LATEST/testapidocs/org/apache/maven/plugins/site/deploy/package-use.html
 (original)
+++ 
websites/production/maven/components/plugins-archives/maven-site-plugin-LATEST/testapidocs/org/apache/maven/plugins/site/deploy/package-use.html
 Sat Nov 12 23:24:49 2016
@@ -2,7 +2,7 

svn commit: r1769450 - /maven/plugins/trunk/maven-war-plugin/pom.xml

[schulte]

Author: schulte
Date: Sat Nov 12 23:21:55 2016
New Revision: 1769450

URL: http://svn.apache.org/viewvc?rev=1769450=rev
Log:
[MWAR-398] Upgrade of plexus-interpolation to 1.24 to correct escaping issue.

Modified:
maven/plugins/trunk/maven-war-plugin/pom.xml

Modified: maven/plugins/trunk/maven-war-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/pom.xml?rev=1769450=1769449=1769450=diff
==
--- maven/plugins/trunk/maven-war-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-war-plugin/pom.xml Sat Nov 12 23:21:55 2016
@@ -108,7 +108,7 @@
 
   org.codehaus.plexus
   plexus-interpolation
-  1.22
+  1.24
 
 
 

svn commit: r1769449 - /maven/plugins/trunk/maven-resources-plugin/pom.xml

[schulte]

Author: schulte
Date: Sat Nov 12 23:20:11 2016
New Revision: 1769449

URL: http://svn.apache.org/viewvc?rev=1769449=rev
Log:
[MRESOURCES-233] Upgrade of plexus-interpolation 1.24 to correct escaping issue.

Modified:
maven/plugins/trunk/maven-resources-plugin/pom.xml

Modified: maven/plugins/trunk/maven-resources-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-resources-plugin/pom.xml?rev=1769449=1769448=1769449=diff
==
--- maven/plugins/trunk/maven-resources-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-resources-plugin/pom.xml Sat Nov 12 23:20:11 2016
@@ -113,7 +113,7 @@ under the License.
 
   org.codehaus.plexus
   plexus-interpolation
-  1.22
+  1.24
 
 
 

svn commit: r1769448 - /maven/plugins/trunk/maven-remote-resources-plugin/pom.xml

[schulte]

Author: schulte
Date: Sat Nov 12 23:18:06 2016
New Revision: 1769448

URL: http://svn.apache.org/viewvc?rev=1769448=rev
Log:
[MRRESOURCES-99] Upgrade of plexus-interpolation to 1.24.

Modified:
maven/plugins/trunk/maven-remote-resources-plugin/pom.xml

Modified: maven/plugins/trunk/maven-remote-resources-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-remote-resources-plugin/pom.xml?rev=1769448=1769447=1769448=diff
==
--- maven/plugins/trunk/maven-remote-resources-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-remote-resources-plugin/pom.xml Sat Nov 12 
23:18:06 2016
@@ -136,7 +136,7 @@ under the License.
 
   org.codehaus.plexus
   plexus-interpolation
-  1.21
+  1.24
 
 
   org.codehaus.plexus

svn commit: r1769447 - /maven/plugins/trunk/maven-rar-plugin/pom.xml

[schulte]

Author: schulte
Date: Sat Nov 12 23:16:51 2016
New Revision: 1769447

URL: http://svn.apache.org/viewvc?rev=1769447=rev
Log:
[MRAR-66] Upgrade of plexus-interpolation to 1.24.

Modified:
maven/plugins/trunk/maven-rar-plugin/pom.xml

Modified: maven/plugins/trunk/maven-rar-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-rar-plugin/pom.xml?rev=1769447=1769446=1769447=diff
==
--- maven/plugins/trunk/maven-rar-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-rar-plugin/pom.xml Sat Nov 12 23:16:51 2016
@@ -94,7 +94,7 @@ under the License.
 
   org.codehaus.plexus
   plexus-interpolation
-  1.22
+  1.24
 
 
   org.codehaus.plexus

svn commit: r1769446 - in /maven/plugins/trunk/maven-help-plugin/src: it/effective-pom-from-lifecycle/ it/effective-pom-from-lifecycle/module/ it/effective-pom-multimodule-unlink-parent/ it/effective-

[gboue]

Author: gboue
Date: Sat Nov 12 23:16:20 2016
New Revision: 1769446

URL: http://svn.apache.org/viewvc?rev=1769446=rev
Log:
[MPH-105] Effective pom aggregation is not triggered

When the plugin is invoked from the command-line, always show all effective 
POMs for all projects in the reactor. When it is invoked from the lifecycle, 
only show all effective POMs for the head project in the reactor (see commit 
497785 and resolution of MPH-21); otherwise, show the effective POM for the 
current project only.

Added:
maven/plugins/trunk/maven-help-plugin/src/it/effective-pom-from-lifecycle/

maven/plugins/trunk/maven-help-plugin/src/it/effective-pom-from-lifecycle/module/

maven/plugins/trunk/maven-help-plugin/src/it/effective-pom-from-lifecycle/module/pom.xml
   (with props)

maven/plugins/trunk/maven-help-plugin/src/it/effective-pom-from-lifecycle/pom.xml
   (with props)

maven/plugins/trunk/maven-help-plugin/src/it/effective-pom-from-lifecycle/verify.groovy
   (with props)
maven/plugins/trunk/maven-help-plugin/src/it/effective-pom-multimodule/

maven/plugins/trunk/maven-help-plugin/src/it/effective-pom-multimodule-unlink-parent/

maven/plugins/trunk/maven-help-plugin/src/it/effective-pom-multimodule-unlink-parent/invoker.properties
   (with props)

maven/plugins/trunk/maven-help-plugin/src/it/effective-pom-multimodule-unlink-parent/module/

maven/plugins/trunk/maven-help-plugin/src/it/effective-pom-multimodule-unlink-parent/module/pom.xml
   (with props)

maven/plugins/trunk/maven-help-plugin/src/it/effective-pom-multimodule-unlink-parent/pom.xml
   (with props)

maven/plugins/trunk/maven-help-plugin/src/it/effective-pom-multimodule-unlink-parent/verify.groovy
   (with props)

maven/plugins/trunk/maven-help-plugin/src/it/effective-pom-multimodule/invoker.properties
   (with props)

maven/plugins/trunk/maven-help-plugin/src/it/effective-pom-multimodule/module/

maven/plugins/trunk/maven-help-plugin/src/it/effective-pom-multimodule/module/pom.xml
   (with props)

maven/plugins/trunk/maven-help-plugin/src/it/effective-pom-multimodule/pom.xml  
 (with props)

maven/plugins/trunk/maven-help-plugin/src/it/effective-pom-multimodule/verify.groovy
   (with props)
Modified:

maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/EffectivePomMojo.java

Added: 
maven/plugins/trunk/maven-help-plugin/src/it/effective-pom-from-lifecycle/module/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-help-plugin/src/it/effective-pom-from-lifecycle/module/pom.xml?rev=1769446=auto
==
--- 
maven/plugins/trunk/maven-help-plugin/src/it/effective-pom-from-lifecycle/module/pom.xml
 (added)
+++ 
maven/plugins/trunk/maven-help-plugin/src/it/effective-pom-from-lifecycle/module/pom.xml
 Sat Nov 12 23:16:20 2016
@@ -0,0 +1,23 @@
+
+
+
+
+
+  4.0.0
+  
+org.apache.maven.its.help
+test
+1.0
+  
+  pom
+  module
+

Propchange: 
maven/plugins/trunk/maven-help-plugin/src/it/effective-pom-from-lifecycle/module/pom.xml
--
svn:eol-style = native

Propchange: 
maven/plugins/trunk/maven-help-plugin/src/it/effective-pom-from-lifecycle/module/pom.xml
--
svn:keywords = Author Date Id Revision

Added: 
maven/plugins/trunk/maven-help-plugin/src/it/effective-pom-from-lifecycle/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-help-plugin/src/it/effective-pom-from-lifecycle/pom.xml?rev=1769446=auto
==
--- 
maven/plugins/trunk/maven-help-plugin/src/it/effective-pom-from-lifecycle/pom.xml
 (added)
+++ 
maven/plugins/trunk/maven-help-plugin/src/it/effective-pom-from-lifecycle/pom.xml
 Sat Nov 12 23:16:20 2016
@@ -0,0 +1,59 @@
+
+
+
+
+
+  4.0.0
+
+  org.apache.maven.its.help
+  test
+  1.0
+  pom
+  https://issues.apache.org/jira/browse/MPH-21
+  
+Tests that the effective POM goal, bound to a phase of the lifecycle in a 
project of a multi-module build, prints 
+all the effective POMs in the reactor for the head project, and only 
prints their effective POM for the other projects.
+  
+  
+module
+  
+
+  
+
+  
+org.apache.maven.plugins
+maven-help-plugin
+@project.version@
+
+  
+print-effective-pom
+package
+
+  effective-pom
+
+
+  result.txt
+
+  
+
+  
+
+  
+

Propchange: 
maven/plugins/trunk/maven-help-plugin/src/it/effective-pom-from-lifecycle/pom.xml
--
svn:eol-style = native

Propchange: 

svn commit: r1769445 - /maven/plugins/trunk/maven-project-info-reports-plugin/pom.xml

[schulte]

Author: schulte
Date: Sat Nov 12 23:15:38 2016
New Revision: 1769445

URL: http://svn.apache.org/viewvc?rev=1769445=rev
Log:
[MPIR-350] Upgrade of plexus-interpolation to 1.24.

Modified:
maven/plugins/trunk/maven-project-info-reports-plugin/pom.xml

Modified: maven/plugins/trunk/maven-project-info-reports-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/pom.xml?rev=1769445=1769444=1769445=diff
==
--- maven/plugins/trunk/maven-project-info-reports-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-project-info-reports-plugin/pom.xml Sat Nov 12 
23:15:38 2016
@@ -341,7 +341,7 @@ under the License.
 
   org.codehaus.plexus
   plexus-interpolation
-  1.21
+  1.24
 
 
   org.codehaus.plexus

svn commit: r1769444 - /maven/plugins/trunk/maven-pdf-plugin/pom.xml

[schulte]

Author: schulte
Date: Sat Nov 12 23:13:51 2016
New Revision: 1769444

URL: http://svn.apache.org/viewvc?rev=1769444=rev
Log:
[MPDF-79] Upgrade of plexus-interpolation to 1.24.

Modified:
maven/plugins/trunk/maven-pdf-plugin/pom.xml

Modified: maven/plugins/trunk/maven-pdf-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pdf-plugin/pom.xml?rev=1769444=1769443=1769444=diff
==
--- maven/plugins/trunk/maven-pdf-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-pdf-plugin/pom.xml Sat Nov 12 23:13:51 2016
@@ -212,7 +212,7 @@ under the License.
 
   org.codehaus.plexus
   plexus-interpolation
-  1.21
+  1.24
 
 
   org.codehaus.plexus

svn commit: r1769443 - /maven/plugins/trunk/maven-invoker-plugin/pom.xml

[schulte]

Author: schulte
Date: Sat Nov 12 23:12:32 2016
New Revision: 1769443

URL: http://svn.apache.org/viewvc?rev=1769443=rev
Log:
[MINVOKER-212] Upgrade of plexus-interpolation to 1.24.

Modified:
maven/plugins/trunk/maven-invoker-plugin/pom.xml

Modified: maven/plugins/trunk/maven-invoker-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/pom.xml?rev=1769443=1769442=1769443=diff
==
--- maven/plugins/trunk/maven-invoker-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-invoker-plugin/pom.xml Sat Nov 12 23:12:32 2016
@@ -187,7 +187,7 @@ under the License.
 
   org.codehaus.plexus
   plexus-interpolation
-  1.21
+  1.24
 
 
   org.codehaus.plexus

svn commit: r1769442 - /maven/plugins/trunk/maven-ejb-plugin/pom.xml

[schulte]

Author: schulte
Date: Sat Nov 12 23:11:10 2016
New Revision: 1769442

URL: http://svn.apache.org/viewvc?rev=1769442=rev
Log:
[MEJB-107] Upgrade of plexus-interpolation to 1.24.

Modified:
maven/plugins/trunk/maven-ejb-plugin/pom.xml

Modified: maven/plugins/trunk/maven-ejb-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ejb-plugin/pom.xml?rev=1769442=1769441=1769442=diff
==
--- maven/plugins/trunk/maven-ejb-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-ejb-plugin/pom.xml Sat Nov 12 23:11:10 2016
@@ -106,7 +106,7 @@ under the License.
 
   org.codehaus.plexus
   plexus-interpolation
-  1.22
+  1.24
 
 
   commons-io

svn commit: r1769441 - /maven/plugins/trunk/maven-ear-plugin/pom.xml

[schulte]

Author: schulte
Date: Sat Nov 12 23:09:53 2016
New Revision: 1769441

URL: http://svn.apache.org/viewvc?rev=1769441=rev
Log:
[MEAR-245] Upgrade of plexus-interpolation to 1.24.

Modified:
maven/plugins/trunk/maven-ear-plugin/pom.xml

Modified: maven/plugins/trunk/maven-ear-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/pom.xml?rev=1769441=1769440=1769441=diff
==
--- maven/plugins/trunk/maven-ear-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-ear-plugin/pom.xml Sat Nov 12 23:09:53 2016
@@ -124,7 +124,7 @@
 
   org.codehaus.plexus
   plexus-interpolation
-  1.22
+  1.24
 
 
   org.apache.maven.shared

svn commit: r1769440 - /maven/plugins/trunk/maven-doap-plugin/pom.xml

[schulte]

Author: schulte
Date: Sat Nov 12 23:08:38 2016
New Revision: 1769440

URL: http://svn.apache.org/viewvc?rev=1769440=rev
Log:
[MDOAP-48] Upgrade of plexus-interpolation to 1.24.

Modified:
maven/plugins/trunk/maven-doap-plugin/pom.xml

Modified: maven/plugins/trunk/maven-doap-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-doap-plugin/pom.xml?rev=1769440=1769439=1769440=diff
==
--- maven/plugins/trunk/maven-doap-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-doap-plugin/pom.xml Sat Nov 12 23:08:38 2016
@@ -127,7 +127,7 @@ under the License.
 
   org.codehaus.plexus
   plexus-interpolation
-  1.21
+  1.24
 
 
   org.codehaus.plexus

svn commit: r1769439 - /maven/plugins/trunk/maven-changes-plugin/pom.xml

[schulte]

Author: schulte
Date: Sat Nov 12 23:07:10 2016
New Revision: 1769439

URL: http://svn.apache.org/viewvc?rev=1769439=rev
Log:
[MCHANGES-377] Upgrade of plexus-interpolation to 1.24.

Modified:
maven/plugins/trunk/maven-changes-plugin/pom.xml

Modified: maven/plugins/trunk/maven-changes-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/pom.xml?rev=1769439=1769438=1769439=diff
==
--- maven/plugins/trunk/maven-changes-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-changes-plugin/pom.xml Sat Nov 12 23:07:10 2016
@@ -134,7 +134,7 @@ under the License.
 
   org.codehaus.plexus
   plexus-interpolation
-  1.21
+  1.24
 
 
 

svn commit: r1769438 - /maven/plugins/trunk/maven-dependency-plugin/pom.xml

[schulte]

Author: schulte
Date: Sat Nov 12 23:05:20 2016
New Revision: 1769438

URL: http://svn.apache.org/viewvc?rev=1769438=rev
Log:
[MDEP-544] Upgrade of plexus-interpolation to 1.24.


Modified:
maven/plugins/trunk/maven-dependency-plugin/pom.xml

Modified: maven/plugins/trunk/maven-dependency-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/pom.xml?rev=1769438=1769437=1769438=diff
==
--- maven/plugins/trunk/maven-dependency-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-dependency-plugin/pom.xml Sat Nov 12 23:05:20 2016
@@ -274,7 +274,7 @@ under the License.

   org.codehaus.plexus
   plexus-interpolation
-  1.21
+  1.24
   test
 
 

svn commit: r1769437 - /maven/plugins/trunk/maven-checkstyle-plugin/pom.xml

[schulte]

Author: schulte
Date: Sat Nov 12 23:03:24 2016
New Revision: 1769437

URL: http://svn.apache.org/viewvc?rev=1769437=rev
Log:
[MCHECKSTYLE-331] Upgrade of plexus-interpolation to 1.24.


Modified:
maven/plugins/trunk/maven-checkstyle-plugin/pom.xml

Modified: maven/plugins/trunk/maven-checkstyle-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/pom.xml?rev=1769437=1769436=1769437=diff
==
--- maven/plugins/trunk/maven-checkstyle-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-checkstyle-plugin/pom.xml Sat Nov 12 23:03:24 2016
@@ -180,7 +180,7 @@ under the License.
 
   org.codehaus.plexus
   plexus-interpolation
-  1.21
+  1.24
 
 
   org.codehaus.plexus

svn commit: r1769435 - /maven/plugins/trunk/maven-acr-plugin/pom.xml

[schulte]

Author: schulte
Date: Sat Nov 12 23:00:49 2016
New Revision: 1769435

URL: http://svn.apache.org/viewvc?rev=1769435=rev
Log:
[MACR-41] Upgrade of plexus-interpolation 1.24 to correct escaping issue.


Modified:
maven/plugins/trunk/maven-acr-plugin/pom.xml

Modified: maven/plugins/trunk/maven-acr-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-acr-plugin/pom.xml?rev=1769435=1769434=1769435=diff
==
--- maven/plugins/trunk/maven-acr-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-acr-plugin/pom.xml Sat Nov 12 23:00:49 2016
@@ -94,7 +94,7 @@ under the License.
 
   org.codehaus.plexus
   plexus-interpolation
-  1.22
+  1.24
 
 
   org.codehaus.plexus

svn commit: r1769427 - /maven/plugins/trunk/maven-site-plugin/pom.xml

[hboutemy]

Author: hboutemy
Date: Sat Nov 12 21:09:35 2016
New Revision: 1769427

URL: http://svn.apache.org/viewvc?rev=1769427=rev
Log:
[maven-release-plugin] prepare for next development iteration

Modified:
maven/plugins/trunk/maven-site-plugin/pom.xml

Modified: maven/plugins/trunk/maven-site-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/pom.xml?rev=1769427=1769426=1769427=diff
==
--- maven/plugins/trunk/maven-site-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-site-plugin/pom.xml Sat Nov 12 21:09:35 2016
@@ -30,7 +30,7 @@ under the License.
   
 
   maven-site-plugin
-  3.6
+  3.7-SNAPSHOT
   maven-plugin
 
   Apache Maven Site Plugin
@@ -174,9 +174,9 @@ under the License.
   
 
   
-
scm:svn:http://svn.apache.org/repos/asf/maven/plugins/tags/maven-site-plugin-3.6
-
scm:svn:https://svn.apache.org/repos/asf/maven/plugins/tags/maven-site-plugin-3.6
-
http://svn.apache.org/viewvc/maven/plugins/tags/maven-site-plugin-3.6
+
scm:svn:http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-site-plugin/
+
scm:svn:https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-site-plugin/
+
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/
   
   
 JIRA

svn commit: r1769426 - /maven/plugins/tags/maven-site-plugin-3.6/

[hboutemy]

Author: hboutemy
Date: Sat Nov 12 21:09:27 2016
New Revision: 1769426

URL: http://svn.apache.org/viewvc?rev=1769426=rev
Log:
[maven-release-plugin] copy for tag maven-site-plugin-3.6

Added:
maven/plugins/tags/maven-site-plugin-3.6/   (props changed)
  - copied from r1769425, maven/plugins/trunk/maven-site-plugin/

Propchange: maven/plugins/tags/maven-site-plugin-3.6/
--
bugtraq:logregex = MSITE-\d+

Propchange: maven/plugins/tags/maven-site-plugin-3.6/
--
bugtraq:url = http://jira.codehaus.org/browse/%BUGID%

Propchange: maven/plugins/tags/maven-site-plugin-3.6/
--
bugtraq:warnifnoissue = false

Propchange: maven/plugins/tags/maven-site-plugin-3.6/
--
--- svn:ignore (added)
+++ svn:ignore Sat Nov 12 21:09:27 2016
@@ -0,0 +1,17 @@
+*.log
+dependency-reduced-pom.xml
+target
+.classpath
+.project
+default.lst
+test.out
+default.ajsym
+*.ipr
+*.iws
+*.iml
+.wtpmodules
+cobertura.ser
+.settings
+bin
+build
+.idea

Propchange: maven/plugins/tags/maven-site-plugin-3.6/
--
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sat Nov 12 21:09:27 2016
@@ -0,0 +1 @@
+/maven/plugins/trunk/maven-site-plugin:801155,801171,801470,806898-806906,807943-808180,809252,810298,884137,886844,886847,890094,890124,891014,891688,920027,920041,942622,943455,944145,950463,956681,984466,984960,984991,984996,1029307,1033379,1037476,1039137,1039143,1039748-1039749,1049020,1051139-1051449,1055019,1055033,1055047,1055089,1060289,1063639,1064626,1065576,1065582,1066038,1067103,1067120,1070079-1070080,1070100,1070104,1074118,1075018,1075782,1075810,1075995,1076167,1076195,1077911,1077924,1078235,1079474,1079529,1079698,1080781,1081676,1081837,1081887,1082091,1082242,1082274,1082877,1083147,1083251,1083473,1084564,1086313,1086338-1086339,1086533,1087455,1088584,1089802,1089852,1091331,1098168,1098170,1099591,1126420,1126918-1126945,1132936,1145546,114,1145947,1147048

svn commit: r1769425 - /maven/plugins/trunk/maven-site-plugin/pom.xml

[hboutemy]

Author: hboutemy
Date: Sat Nov 12 21:09:05 2016
New Revision: 1769425

URL: http://svn.apache.org/viewvc?rev=1769425=rev
Log:
[maven-release-plugin] prepare release maven-site-plugin-3.6

Modified:
maven/plugins/trunk/maven-site-plugin/pom.xml

Modified: maven/plugins/trunk/maven-site-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/pom.xml?rev=1769425=1769424=1769425=diff
==
--- maven/plugins/trunk/maven-site-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-site-plugin/pom.xml Sat Nov 12 21:09:05 2016
@@ -30,7 +30,7 @@ under the License.
   
 
   maven-site-plugin
-  3.6-SNAPSHOT
+  3.6
   maven-plugin
 
   Apache Maven Site Plugin
@@ -174,9 +174,9 @@ under the License.
   
 
   
-
scm:svn:http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-site-plugin/
-
scm:svn:https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-site-plugin/
-
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/
+
scm:svn:http://svn.apache.org/repos/asf/maven/plugins/tags/maven-site-plugin-3.6
+
scm:svn:https://svn.apache.org/repos/asf/maven/plugins/tags/maven-site-plugin-3.6
+
http://svn.apache.org/viewvc/maven/plugins/tags/maven-site-plugin-3.6
   
   
 JIRA

svn commit: r1769424 - /maven/plugins/trunk/maven-site-plugin/pom.xml

[hboutemy]

Author: hboutemy
Date: Sat Nov 12 21:08:13 2016
New Revision: 1769424

URL: http://svn.apache.org/viewvc?rev=1769424=rev
Log:
updated classworlds version

Modified:
maven/plugins/trunk/maven-site-plugin/pom.xml

Modified: maven/plugins/trunk/maven-site-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/pom.xml?rev=1769424=1769423=1769424=diff
==
--- maven/plugins/trunk/maven-site-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-site-plugin/pom.xml Sat Nov 12 21:08:13 2016
@@ -304,7 +304,7 @@ under the License.
 
   org.codehaus.plexus
   plexus-classworlds
-  2.2.3
+  2.5.2
 
 
 

svn commit: r1769413 - /maven/plugins/trunk/maven-site-plugin/pom.xml

[hboutemy]

Author: hboutemy
Date: Sat Nov 12 20:35:32 2016
New Revision: 1769413

URL: http://svn.apache.org/viewvc?rev=1769413=rev
Log:
updated plexus-i18n

Modified:
maven/plugins/trunk/maven-site-plugin/pom.xml

Modified: maven/plugins/trunk/maven-site-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/pom.xml?rev=1769413=1769412=1769413=diff
==
--- maven/plugins/trunk/maven-site-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-site-plugin/pom.xml Sat Nov 12 20:35:32 2016
@@ -287,7 +287,7 @@ under the License.
 
   org.codehaus.plexus
   plexus-i18n
-  1.0-beta-7
+  1.0-beta-10
   
 
   org.codehaus.plexus

maven git commit: [MNG-6054] Removal of super pom plugin management.

[schulte]

Repository: maven
Updated Branches:
  refs/heads/master c145eb5b2 -> a6f8bd171


[MNG-6054] Removal of super pom plugin management.


Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/a6f8bd17
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/a6f8bd17
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/a6f8bd17

Branch: refs/heads/master
Commit: a6f8bd1712a5ae30068424651bac35d2909dc4c1
Parents: c145eb5
Author: Christian Schulte 
Authored: Sat Nov 12 21:18:31 2016 +0100
Committer: Christian Schulte 
Committed: Sat Nov 12 21:18:31 2016 +0100

--
 .../test/java/org/apache/maven/project/PomConstructionTest.java| 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/a6f8bd17/maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java
--
diff --git 
a/maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java 
b/maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java
index 988df76..23b1a1b 100644
--- a/maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java
+++ b/maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java
@@ -1482,7 +1482,7 @@ public class PomConstructionTest
throws Exception
{
 PomTestWrapper pom = this.buildPom( "plugin-management-duplicate/sub" 
);
-assertEquals( 12, ( (List) pom.getValue( 
"build/pluginManagement/plugins" ) ).size() );
+assertEquals( 8, ( (List) pom.getValue( 
"build/pluginManagement/plugins" ) ).size() );
}
 
 public void testDistributionManagement()

maven git commit: [MNG-6114] Profiles from the global settings should be ordered before profiles from the user settings.

[schulte]

Repository: maven
Updated Branches:
  refs/heads/master 57fde44be -> c145eb5b2


[MNG-6114] Profiles from the global settings should be ordered before profiles 
from the user settings.


Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/c145eb5b
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/c145eb5b
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/c145eb5b

Branch: refs/heads/master
Commit: c145eb5b219b89c306f9e4fa777e517ea87d8f27
Parents: 57fde44
Author: Christian Schulte 
Authored: Sat Nov 12 21:06:19 2016 +0100
Committer: Christian Schulte 
Committed: Sat Nov 12 21:07:31 2016 +0100

--
 .../org/apache/maven/settings/merge/MavenSettingsMerger.java| 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/c145eb5b/maven-settings-builder/src/main/java/org/apache/maven/settings/merge/MavenSettingsMerger.java
--
diff --git 
a/maven-settings-builder/src/main/java/org/apache/maven/settings/merge/MavenSettingsMerger.java
 
b/maven-settings-builder/src/main/java/org/apache/maven/settings/merge/MavenSettingsMerger.java
index 8d9f67b..cb5f6c1 100644
--- 
a/maven-settings-builder/src/main/java/org/apache/maven/settings/merge/MavenSettingsMerger.java
+++ 
b/maven-settings-builder/src/main/java/org/apache/maven/settings/merge/MavenSettingsMerger.java
@@ -111,6 +111,7 @@ public class MavenSettingsMerger
String 
recessiveSourceLevel )
 {
 Map dominantById = mapById( dominant );
+final List identifiables = new ArrayList<>( recessive.size() );
 
 for ( T identifiable : recessive )
 {
@@ -118,9 +119,11 @@ public class MavenSettingsMerger
 {
 identifiable.setSourceLevel( recessiveSourceLevel );
 
-dominant.add( identifiable );
+identifiables.add( identifiable );
 }
 }
+
+dominant.addAll( 0, identifiables );
 }
 
 /**

maven git commit: upgrade m-assembly-p to 3.0.0

[rfscholte]

Repository: maven
Updated Branches:
  refs/heads/master 33791993a -> 57fde44be


upgrade m-assembly-p to 3.0.0


Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/57fde44b
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/57fde44b
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/57fde44b

Branch: refs/heads/master
Commit: 57fde44be0068a6975af3312702d10d065999ada
Parents: 3379199
Author: rfscholte 
Authored: Sat Nov 12 20:44:11 2016 +0100
Committer: rfscholte 
Committed: Sat Nov 12 20:45:36 2016 +0100

--
 pom.xml | 5 +
 1 file changed, 5 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/57fde44b/pom.xml
--
diff --git a/pom.xml b/pom.xml
index ec82598..0ae8eb2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -478,6 +478,11 @@ under the License.
 
 
   org.apache.maven.plugins
+  maven-assembly-plugin
+   3.0.0
+
+
+  org.apache.maven.plugins
   maven-release-plugin
   
 true

svn commit: r1769402 - in /maven/plugins/trunk/maven-help-plugin/src: it/describe-plugin-in-plugin-management/ main/java/org/apache/maven/plugins/help/ test/java/org/apache/maven/plugins/help/

[gboue]

Author: gboue
Date: Sat Nov 12 19:43:02 2016
New Revision: 1769402

URL: http://svn.apache.org/viewvc?rev=1769402=rev
Log:
[MPH-53] mvn help:describe returns the version that is specified in metadata 
instead of the one in the parent pom

Set the POM to use in the plugin version requuest, so that plugin versions 
declared in it are correctly used.

Added:

maven/plugins/trunk/maven-help-plugin/src/it/describe-plugin-in-plugin-management/

maven/plugins/trunk/maven-help-plugin/src/it/describe-plugin-in-plugin-management/invoker.properties
   (with props)

maven/plugins/trunk/maven-help-plugin/src/it/describe-plugin-in-plugin-management/pom.xml
   (with props)

maven/plugins/trunk/maven-help-plugin/src/it/describe-plugin-in-plugin-management/test.properties
   (with props)

maven/plugins/trunk/maven-help-plugin/src/it/describe-plugin-in-plugin-management/verify.groovy
   (with props)
Modified:

maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/DescribeMojo.java

maven/plugins/trunk/maven-help-plugin/src/test/java/org/apache/maven/plugins/help/DescribeMojoTest.java

Added: 
maven/plugins/trunk/maven-help-plugin/src/it/describe-plugin-in-plugin-management/invoker.properties
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-help-plugin/src/it/describe-plugin-in-plugin-management/invoker.properties?rev=1769402=auto
==
--- 
maven/plugins/trunk/maven-help-plugin/src/it/describe-plugin-in-plugin-management/invoker.properties
 (added)
+++ 
maven/plugins/trunk/maven-help-plugin/src/it/describe-plugin-in-plugin-management/invoker.properties
 Sat Nov 12 19:43:02 2016
@@ -0,0 +1,18 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+invoker.goals = 
${project.groupId}:${project.artifactId}:${project.version}:describe

Propchange: 
maven/plugins/trunk/maven-help-plugin/src/it/describe-plugin-in-plugin-management/invoker.properties
--
svn:eol-style = native

Propchange: 
maven/plugins/trunk/maven-help-plugin/src/it/describe-plugin-in-plugin-management/invoker.properties
--
svn:keywords = Author Date Id Revision

Added: 
maven/plugins/trunk/maven-help-plugin/src/it/describe-plugin-in-plugin-management/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-help-plugin/src/it/describe-plugin-in-plugin-management/pom.xml?rev=1769402=auto
==
--- 
maven/plugins/trunk/maven-help-plugin/src/it/describe-plugin-in-plugin-management/pom.xml
 (added)
+++ 
maven/plugins/trunk/maven-help-plugin/src/it/describe-plugin-in-plugin-management/pom.xml
 Sat Nov 12 19:43:02 2016
@@ -0,0 +1,43 @@
+
+
+
+
+
+  4.0.0
+
+  org.apache.maven.its.help
+  test
+  1.0
+  https://issues.apache.org/jira/browse/MPH-53
+  
+Tests that the describe goal correctly resolves the version of the plugin 
to describe from the POM, if defined.
+  
+
+  
+
+  
+
+  maven-surefire-plugin
+  2.4.3
+
+  
+
+  
+

Propchange: 
maven/plugins/trunk/maven-help-plugin/src/it/describe-plugin-in-plugin-management/pom.xml
--
svn:eol-style = native

Propchange: 
maven/plugins/trunk/maven-help-plugin/src/it/describe-plugin-in-plugin-management/pom.xml
--
svn:keywords = Author Date Id Revision

Added: 
maven/plugins/trunk/maven-help-plugin/src/it/describe-plugin-in-plugin-management/test.properties
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-help-plugin/src/it/describe-plugin-in-plugin-management/test.properties?rev=1769402=auto
==
--- 
maven/plugins/trunk/maven-help-plugin/src/it/describe-plugin-in-plugin-management/test.properties
 (added)
+++ 
maven/plugins/trunk/maven-help-plugin/src/it/describe-plugin-in-plugin-management/test.properties
 Sat 

[3/3] maven git commit: [MNG-6054] Removal of super pom plugin management.

[schulte]

[MNG-6054] Removal of super pom plugin management.


Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/6cca5643
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/6cca5643
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/6cca5643

Branch: refs/heads/master
Commit: 6cca5643a82bdbe6545895a83bc3f16a0d3b4658
Parents: 0eb1e93
Author: Christian Schulte 
Authored: Sat Nov 12 20:20:11 2016 +0100
Committer: Christian Schulte 
Committed: Sat Nov 12 20:35:52 2016 +0100

--
 .../org/apache/maven/model/pom-4.0.0.xml| 22 
 1 file changed, 22 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/6cca5643/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.0.0.xml
--
diff --git 
a/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.0.0.xml 
b/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.0.0.xml
index c9770b0..5ca4ce3 100644
--- 
a/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.0.0.xml
+++ 
b/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.0.0.xml
@@ -71,28 +71,6 @@ under the License.
 ${project.basedir}/src/test/resources
   
 
-
-  
-  
-  
-
-  maven-antrun-plugin
-  1.3
-
-
-  maven-assembly-plugin
-  2.2-beta-5
-
-
-  maven-dependency-plugin
-  2.8
-
-
-  maven-release-plugin
-  2.3.2
-
-  
-
   
 
   

[2/3] maven git commit: [MNG-5940] Change the maven-source-plugin jar goal into jar-no-fork in Maven Super POM

[schulte]

[MNG-5940] Change the maven-source-plugin jar goal into jar-no-fork in Maven 
Super POM


Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/8dab4440
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/8dab4440
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/8dab4440

Branch: refs/heads/master
Commit: 8dab4440f0925ea4e4e0f7afe5fd28469b29257e
Parents: 6cca564
Author: Christian Schulte 
Authored: Sat Nov 12 20:23:46 2016 +0100
Committer: Christian Schulte 
Committed: Sat Nov 12 20:35:52 2016 +0100

--
 .../src/main/resources/org/apache/maven/model/pom-4.0.0.xml| 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/8dab4440/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.0.0.xml
--
diff --git 
a/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.0.0.xml 
b/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.0.0.xml
index 5ca4ce3..c060e31 100644
--- 
a/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.0.0.xml
+++ 
b/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.0.0.xml
@@ -98,7 +98,7 @@ under the License.
   
 attach-sources
 
-  jar
+  jar-no-fork
 
   
 

[1/3] maven git commit: [MNG-2478] add "resources-filtered" filtered resource directories to super POM

[schulte]

Repository: maven
Updated Branches:
  refs/heads/master 0eb1e937b -> 33791993a


[MNG-2478] add "resources-filtered" filtered resource directories to super POM


Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/33791993
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/33791993
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/33791993

Branch: refs/heads/master
Commit: 33791993ae407eaabd075c407f93680f38b3b501
Parents: 8dab444
Author: Christian Schulte 
Authored: Sat Nov 12 20:28:22 2016 +0100
Committer: Christian Schulte 
Committed: Sat Nov 12 20:35:52 2016 +0100

--
 .../src/main/resources/org/apache/maven/model/pom-4.0.0.xml  | 8 
 1 file changed, 8 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/33791993/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.0.0.xml
--
diff --git 
a/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.0.0.xml 
b/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.0.0.xml
index c060e31..b120962 100644
--- 
a/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.0.0.xml
+++ 
b/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.0.0.xml
@@ -65,11 +65,19 @@ under the License.
   
 ${project.basedir}/src/main/resources
   
+  
+${project.basedir}/src/main/resources-filtered
+true
+  
 
 
   
 ${project.basedir}/src/test/resources
   
+  
+${project.basedir}/src/test/resources-filtered
+true
+  
 
   
 

maven-integration-testing git commit: [MNG-2478] add filtered resource directories to super POM

[schulte]

Repository: maven-integration-testing
Updated Branches:
  refs/heads/master ee10d9991 -> 06e3a23ae


[MNG-2478] add filtered resource directories to super POM

This reverts commit 3ffb28978eb4e2522e8a7700e196677df5ccc76c.
Will be part of 3.4.


Project: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/commit/06e3a23a
Tree: 
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/tree/06e3a23a
Diff: 
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/diff/06e3a23a

Branch: refs/heads/master
Commit: 06e3a23aed5f00a6f8a7bce0b564e650f512ae46
Parents: ee10d99
Author: Christian Schulte 
Authored: Sat Nov 12 20:31:57 2016 +0100
Committer: Christian Schulte 
Committed: Sat Nov 12 20:31:57 2016 +0100

--
 .../it/MavenITmng3843PomInheritanceTest.java| 35 +---
 1 file changed, 30 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/06e3a23a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3843PomInheritanceTest.java
--
diff --git 
a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3843PomInheritanceTest.java
 
b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3843PomInheritanceTest.java
index b6e7fd1..5011360 100644
--- 
a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3843PomInheritanceTest.java
+++ 
b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3843PomInheritanceTest.java
@@ -95,11 +95,36 @@ public class MavenITmng3843PomInheritanceTest
 assertPathEquals( basedir, "src/main/java", props.getProperty( 
"project.build.sourceDirectory" ) );
 assertPathEquals( basedir, "src/test/java", props.getProperty( 
"project.build.testSourceDirectory" ) );
 assertPathEquals( basedir, "src/main/scripts", props.getProperty( 
"project.build.scriptSourceDirectory" ) );
-assertEquals( "1", props.getProperty( "project.build.resources" ) );
-assertPathEquals( basedir, "src/main/resources", props.getProperty( 
"project.build.resources.0.directory" ) );
-assertEquals( "1", props.getProperty( "project.build.testResources" ) 
);
-assertPathEquals( basedir, "src/test/resources",
-  props.getProperty( 
"project.build.testResources.0.directory" ) );
+
+if ( matchesVersionRange( "[3.4,)" ) )
+{
+assertEquals( "2", props.getProperty( "project.build.resources" ) 
);
+assertPathEquals( basedir, "src/main/resources",
+  props.getProperty( 
"project.build.resources.0.directory" ) );
+
+assertPathEquals( basedir, "src/main/resources-filtered",
+  props.getProperty( 
"project.build.resources.1.directory" ) );
+
+assertEquals( "2", props.getProperty( 
"project.build.testResources" ) );
+assertPathEquals( basedir, "src/test/resources",
+  props.getProperty( 
"project.build.testResources.0.directory" ) );
+
+assertPathEquals( basedir, "src/test/resources-filtered",
+  props.getProperty( 
"project.build.testResources.1.directory" ) );
+
+}
+else
+{
+assertEquals( "1", props.getProperty( "project.build.resources" ) 
);
+assertPathEquals( basedir, "src/main/resources",
+  props.getProperty( 
"project.build.resources.0.directory" ) );
+
+assertEquals( "1", props.getProperty( 
"project.build.testResources" ) );
+assertPathEquals( basedir, "src/test/resources",
+  props.getProperty( 
"project.build.testResources.0.directory" ) );
+
+}
+
 assertPathEquals( basedir, "target", props.getProperty( 
"project.build.directory" ) );
 assertPathEquals( basedir, "target/classes", props.getProperty( 
"project.build.outputDirectory" ) );
 assertPathEquals( basedir, "target/test-classes", props.getProperty( 
"project.build.testOutputDirectory" ) );

[1/2] maven git commit: Remove trailing whitespace

[michaelo]

Repository: maven
Updated Branches:
  refs/heads/master 6b0b7a932 -> 0eb1e937b


http://git-wip-us.apache.org/repos/asf/maven/blob/0eb1e937/maven-core/src/test/java/org/apache/maven/execution/DefaultMavenExecutionRequestPopulatorTest.java
--
diff --git 
a/maven-core/src/test/java/org/apache/maven/execution/DefaultMavenExecutionRequestPopulatorTest.java
 
b/maven-core/src/test/java/org/apache/maven/execution/DefaultMavenExecutionRequestPopulatorTest.java
index 15a7a7b..bcc5895 100644
--- 
a/maven-core/src/test/java/org/apache/maven/execution/DefaultMavenExecutionRequestPopulatorTest.java
+++ 
b/maven-core/src/test/java/org/apache/maven/execution/DefaultMavenExecutionRequestPopulatorTest.java
@@ -34,7 +34,7 @@ public class DefaultMavenExecutionRequestPopulatorTest
 {
 @Inject
 MavenExecutionRequestPopulator testee;
-
+
 public void testPluginRepositoryInjection()
 throws Exception
 {

http://git-wip-us.apache.org/repos/asf/maven/blob/0eb1e937/maven-core/src/test/java/org/apache/maven/lifecycle/LifecycleExecutorTest.java
--
diff --git 
a/maven-core/src/test/java/org/apache/maven/lifecycle/LifecycleExecutorTest.java
 
b/maven-core/src/test/java/org/apache/maven/lifecycle/LifecycleExecutorTest.java
index 951f133..dfa1817 100644
--- 
a/maven-core/src/test/java/org/apache/maven/lifecycle/LifecycleExecutorTest.java
+++ 
b/maven-core/src/test/java/org/apache/maven/lifecycle/LifecycleExecutorTest.java
@@ -409,7 +409,7 @@ public class LifecycleExecutorTest
 {
 return Collections.emptyList();
 }
-
+
 public java.util.List getAllSortedProjects()
 {
 return Collections.emptyList();

http://git-wip-us.apache.org/repos/asf/maven/blob/0eb1e937/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/AboutTheStubs.html
--
diff --git 
a/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/AboutTheStubs.html
 
b/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/AboutTheStubs.html
index 8ad74b9..0233282 100644
--- 
a/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/AboutTheStubs.html
+++ 
b/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/AboutTheStubs.html
@@ -36,7 +36,7 @@ You can change/extend these stubs, and tests should not be 
breaking too much, si
 assert using expected values from the stubs. Normally, when you try to use 
data from the stubs that
 have not been properly populated, you'll get a nullpointer in your test and 
you then have to
 identify which stub creates that specific piece of data.
-
+
 The most important stubs are:
 LifecycleExecutionPlanCalculatorStub
 ProjectDependencyGraphStub

http://git-wip-us.apache.org/repos/asf/maven/blob/0eb1e937/maven-core/src/test/java/org/apache/maven/lifecycle/mapping/LifecyclePhaseTest.java
--
diff --git 
a/maven-core/src/test/java/org/apache/maven/lifecycle/mapping/LifecyclePhaseTest.java
 
b/maven-core/src/test/java/org/apache/maven/lifecycle/mapping/LifecyclePhaseTest.java
index 0d8cbdc..f60eace 100644
--- 
a/maven-core/src/test/java/org/apache/maven/lifecycle/mapping/LifecyclePhaseTest.java
+++ 
b/maven-core/src/test/java/org/apache/maven/lifecycle/mapping/LifecyclePhaseTest.java
@@ -33,38 +33,38 @@ public class LifecyclePhaseTest
 {
 LifecyclePhase phase = new LifecyclePhase();
 assertEquals( "", phase.toString() );
-
+
 LifecycleMojo mojo1 = new LifecycleMojo();
 mojo1.setGoal( "jar:jar" );
 phase.setMojos( Arrays.asList( mojo1 ) );
 assertEquals( "jar:jar", phase.toString()  );
-
+
 LifecycleMojo mojo2 = new LifecycleMojo();
 mojo2.setGoal( "war:war" );
 phase.setMojos( Arrays.asList( mojo1, mojo2 ) );
 assertEquals( "jar:jar,war:war", phase.toString() );
 }
-
+
 @Test
 public void testSet()
 {
 LifecyclePhase phase = new LifecyclePhase();
 assertNull( phase.getMojos() );
-
+
 phase.set( "" );
 assertNotNull( phase.getMojos() );
 assertEquals( 0, phase.getMojos().size() );
-
+
 phase.set( "jar:jar, war:war" );
-
+
 List mojos = phase.getMojos();
 assertNotNull( mojos );
 assertEquals( 2, mojos.size() );
-
+
 LifecycleMojo mojo1 = mojos.get(0);
 assertNotNull( mojo1 );
 assertEquals( "jar:jar", mojo1.getGoal() );
-
+
 LifecycleMojo mojo2 = mojos.get(1);
 assertNotNull( mojo2 );
 assertEquals( "war:war", mojo2.getGoal() );

[2/2] maven git commit: Remove trailing whitespace

[michaelo]

Remove trailing whitespace


Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/0eb1e937
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/0eb1e937
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/0eb1e937

Branch: refs/heads/master
Commit: 0eb1e937bf377b1c81193da3d9fca7ef344511b6
Parents: 6b0b7a9
Author: Michael Osipov 
Authored: Sat Nov 12 20:29:20 2016 +0100
Committer: Michael Osipov 
Committed: Sat Nov 12 20:29:20 2016 +0100

--
 apache-maven/src/conf/toolchains.xml| 40 +++
 .../main/appended-resources/META-INF/LICENSE.vm | 10 ++--
 .../ArtifactDescriptorReaderDelegate.java   |  2 +-
 .../internal/MavenRepositorySystemUtils.java|  2 +-
 .../artifact/versioning/ComparableVersion.java  |  2 +-
 .../apache/maven/building/ProblemCollector.java |  8 +--
 .../maven/building/ProblemCollectorFactory.java |  6 +--
 .../building/DefaultProblemCollectorTest.java   |  8 +--
 .../maven/building/DefaultProblemTest.java  | 20 
 .../building/ProblemCollectorFactoryTest.java   |  4 +-
 .../repository/legacy/DefaultWagonManager.java  |  2 +-
 .../DefaultLegacyArtifactCollector.java |  2 +-
 .../org/apache/maven/its/a/0.1/a-0.1.pom|  2 +-
 .../org/apache/maven/its/b/0.1/b-0.1.pom|  2 +-
 .../t12scm/maven/p0/1.0/p0-1.0.pom  |  4 +-
 .../t12scm/maven/p1/1.0/p1-1.0.pom  |  2 +-
 .../org/apache/maven/ArtifactFilterManager.java |  4 +-
 .../DefaultProjectDependenciesResolver.java |  2 +-
 .../org/apache/maven/ProjectCycleException.java |  2 +-
 .../maven/bridge/MavenRepositorySystem.java | 22 -
 .../DefaultMavenExecutionRequestPopulator.java  | 20 
 .../maven/execution/MavenExecutionRequest.java  | 20 
 .../MavenExecutionRequestPopulator.java |  2 +-
 .../apache/maven/execution/MavenSession.java| 28 +--
 .../maven/extension/internal/CoreExports.java   |  2 +-
 .../apache/maven/graph/DefaultGraphBuilder.java |  4 +-
 .../org/apache/maven/lifecycle/Lifecycle.java   |  2 +-
 .../lifecycle/MojoExecutionConfigurator.java|  4 +-
 .../internal/LifecycleDependencyResolver.java   | 10 ++--
 .../lifecycle/internal/LifecycleStarter.java|  2 +-
 .../internal/ProjectArtifactFactory.java|  2 +-
 .../multithreaded/MultiThreadedBuilder.java |  2 +-
 .../mapping/DefaultLifecycleMapping.java|  2 +-
 .../maven/lifecycle/mapping/Lifecycle.java  |  6 +--
 .../maven/lifecycle/mapping/LifecycleMojo.java  | 14 +++---
 .../maven/lifecycle/mapping/LifecyclePhase.java | 26 +-
 .../plugin/DefaultProjectArtifactsCache.java| 32 ++--
 .../apache/maven/plugin/MavenPluginManager.java |  2 +-
 .../PluginParameterExpressionEvaluator.java |  6 +--
 .../maven/plugin/ProjectArtifactsCache.java |  2 +-
 .../maven/project/DefaultProjectBuilder.java|  2 +-
 .../org/apache/maven/project/MavenProject.java  |  2 +-
 .../project/RepositorySessionDecorator.java |  2 +-
 .../properties/internal/SystemProperties.java   |  4 +-
 .../maven/toolchain/DefaultToolchain.java   | 10 ++--
 .../toolchain/DefaultToolchainManager.java  |  6 +--
 .../DefaultToolchainManagerPrivate.java |  2 +-
 .../toolchain/RequirementMatcherFactory.java|  4 +-
 .../maven/toolchain/ToolchainManager.java   |  4 +-
 .../toolchain/ToolchainManagerPrivate.java  |  2 +-
 .../maven/toolchain/ToolchainPrivate.java   |  2 +-
 .../building/DefaultToolchainsBuilder.java  | 16 +++---
 .../DefaultToolchainsBuildingRequest.java   |  2 +-
 .../DefaultToolchainsBuildingResult.java| 10 ++--
 .../building/ToolchainsBuildingResult.java  |  2 +-
 .../toolchain/java/DefaultJavaToolChain.java|  2 +-
 .../toolchain/merge/MavenToolchainMerger.java   |  6 +--
 maven-core/src/main/mdo/toolchains.mdo  |  8 +--
 .../main/resources/META-INF/maven/extension.xml |  6 +--
 ...faultMavenExecutionRequestPopulatorTest.java |  2 +-
 .../maven/lifecycle/LifecycleExecutorTest.java  |  2 +-
 .../lifecycle/internal/stub/AboutTheStubs.html  |  2 +-
 .../lifecycle/mapping/LifecyclePhaseTest.java   | 16 +++---
 .../apache/maven/plugin/PluginManagerTest.java  |  2 +-
 .../DefaultToolchainManagerPrivateTest.java |  8 +--
 .../building/DefaultToolchainsBuilderTest.java  | 16 +++---
 .../org/apache/maven/its/a/0.1/a-0.1.pom|  2 +-
 .../org/apache/maven/its/b/0.1/b-0.1.pom|  2 +-
 .../junit/junit/3.8.1/junit-3.8.1.pom   |  2 +-
 .../maven-artifact-3.0-SNAPSHOT.pom | 52 ++--
 .../test/test-extension/1/test-extension-1.pom  |  6 +--
 .../1/test-lifecycle-and-artifactHandler-1.pom  |  4 +-
 .../maven/maven-parent/5/maven-parent-5.pom | 10 ++--
 .../plexus-classworlds-1.2-alpha-10.pom |  2 +-
 

svn commit: r16977 - in /release/maven/plugins: maven-assembly-plugin-2.6-source-release.zip maven-assembly-plugin-2.6-source-release.zip.asc maven-assembly-plugin-2.6-source-release.zip.md5

[olamy]

Author: olamy
Date: Sat Nov 12 10:57:31 2016
New Revision: 16977

Log:
remove assembly plugin 2.6

Removed:
release/maven/plugins/maven-assembly-plugin-2.6-source-release.zip
release/maven/plugins/maven-assembly-plugin-2.6-source-release.zip.asc
release/maven/plugins/maven-assembly-plugin-2.6-source-release.zip.md5

svn commit: r16976 - in /release/maven/plugins: maven-assembly-plugin-3.0.0-source-release.zip maven-assembly-plugin-3.0.0-source-release.zip.asc maven-assembly-plugin-3.0.0-source-release.zip.md5

[olamy]

Author: olamy
Date: Sat Nov 12 10:46:38 2016
New Revision: 16976

Log:
assembly plugin 3.0.0

Added:
release/maven/plugins/maven-assembly-plugin-3.0.0-source-release.zip   
(with props)
release/maven/plugins/maven-assembly-plugin-3.0.0-source-release.zip.asc
release/maven/plugins/maven-assembly-plugin-3.0.0-source-release.zip.md5

Added: release/maven/plugins/maven-assembly-plugin-3.0.0-source-release.zip
==
Binary file - no diff available.

Propchange: release/maven/plugins/maven-assembly-plugin-3.0.0-source-release.zip
--
svn:mime-type = application/octet-stream

Added: release/maven/plugins/maven-assembly-plugin-3.0.0-source-release.zip.asc
==
--- release/maven/plugins/maven-assembly-plugin-3.0.0-source-release.zip.asc 
(added)
+++ release/maven/plugins/maven-assembly-plugin-3.0.0-source-release.zip.asc 
Sat Nov 12 10:46:38 2016
@@ -0,0 +1,7 @@
+-BEGIN PGP SIGNATURE-
+Version: GnuPG v1
+
+iEYEABECAAYFAlgijToACgkQhzqOhrQ3IUbMAgCeM7rvSZBnrReQ569TxMaIfVG8
+CcgAmgO9IzoAQZmTNMZa5jE+OpnqRqr/
+=mfny
+-END PGP SIGNATURE-

Added: release/maven/plugins/maven-assembly-plugin-3.0.0-source-release.zip.md5
==
--- release/maven/plugins/maven-assembly-plugin-3.0.0-source-release.zip.md5 
(added)
+++ release/maven/plugins/maven-assembly-plugin-3.0.0-source-release.zip.md5 
Sat Nov 12 10:46:38 2016
@@ -0,0 +1 @@
+4bf4d9bdddb50a2d588d9a54aa3ffbca
\ No newline at end of file