maven git commit: new JDK 8 name on Windows [Forced Update!]

2017-03-24 Thread hboutemy 
Repository: maven
Updated Branches:
  refs/heads/embedded-ITs 3ff148b76 -> f92a82788 (forced update)


new JDK 8 name on Windows

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

Branch: refs/heads/embedded-ITs
Commit: f92a827886cd29385b3974393a632b4b2e7f5e28
Parents: 11efda6
Author: Hervé Boutemy 
Authored: Fri Mar 24 04:59:59 2017 +0100
Committer: Hervé Boutemy 
Committed: Fri Mar 24 08:16:16 2017 +0100

--
 Jenkinsfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/f92a8278/Jenkinsfile
--
diff --git a/Jenkinsfile b/Jenkinsfile
index 44a7073..8dedea3 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -126,7 +126,7 @@ parallel linuxJava7:{
 MAVEN_WIN_J8=pwd()
 }
 echo "Driving integration tests using Maven $MAVEN_WIN_J8"
-def JAVA_WIN_J8=tool name: 'JDK 1.8 (unlimited security) 64-bit 
Windows only', type: 'hudson.model.JDK'
+def JAVA_WIN_J8=tool name: 'JDK 1.8.0_92 (unlimited security) 
64-bit Windows only', type: 'hudson.model.JDK'
 dir(JAVA_WIN_J8) {
 JAVA_WIN_J8=pwd()
 }

svn commit: r18891 - in /dev/maven/maven-3/3.5.0-beta-1: ./ binaries/ source/

2017-03-24 Thread stephenc 
Author: stephenc
Date: Fri Mar 24 10:31:04 2017
New Revision: 18891

Log:
Add 3.5.0-beta-1 release

Added:
dev/maven/maven-3/3.5.0-beta-1/
dev/maven/maven-3/3.5.0-beta-1/binaries/

dev/maven/maven-3/3.5.0-beta-1/binaries/apache-maven-3.5.0-beta-1-bin.tar.gz   
(with props)

dev/maven/maven-3/3.5.0-beta-1/binaries/apache-maven-3.5.0-beta-1-bin.tar.gz.asc

dev/maven/maven-3/3.5.0-beta-1/binaries/apache-maven-3.5.0-beta-1-bin.tar.gz.md5

dev/maven/maven-3/3.5.0-beta-1/binaries/apache-maven-3.5.0-beta-1-bin.tar.gz.sha1
dev/maven/maven-3/3.5.0-beta-1/binaries/apache-maven-3.5.0-beta-1-bin.zip   
(with props)

dev/maven/maven-3/3.5.0-beta-1/binaries/apache-maven-3.5.0-beta-1-bin.zip.asc

dev/maven/maven-3/3.5.0-beta-1/binaries/apache-maven-3.5.0-beta-1-bin.zip.md5

dev/maven/maven-3/3.5.0-beta-1/binaries/apache-maven-3.5.0-beta-1-bin.zip.sha1
dev/maven/maven-3/3.5.0-beta-1/source/
dev/maven/maven-3/3.5.0-beta-1/source/apache-maven-3.5.0-beta-1-src.tar.gz  
 (with props)

dev/maven/maven-3/3.5.0-beta-1/source/apache-maven-3.5.0-beta-1-src.tar.gz.asc

dev/maven/maven-3/3.5.0-beta-1/source/apache-maven-3.5.0-beta-1-src.tar.gz.md5

dev/maven/maven-3/3.5.0-beta-1/source/apache-maven-3.5.0-beta-1-src.tar.gz.sha1
dev/maven/maven-3/3.5.0-beta-1/source/apache-maven-3.5.0-beta-1-src.zip   
(with props)
dev/maven/maven-3/3.5.0-beta-1/source/apache-maven-3.5.0-beta-1-src.zip.asc
dev/maven/maven-3/3.5.0-beta-1/source/apache-maven-3.5.0-beta-1-src.zip.md5
dev/maven/maven-3/3.5.0-beta-1/source/apache-maven-3.5.0-beta-1-src.zip.sha1

Added: 
dev/maven/maven-3/3.5.0-beta-1/binaries/apache-maven-3.5.0-beta-1-bin.tar.gz
==
Binary file - no diff available.

Propchange: 
dev/maven/maven-3/3.5.0-beta-1/binaries/apache-maven-3.5.0-beta-1-bin.tar.gz
--
svn:mime-type = application/octet-stream

Added: 
dev/maven/maven-3/3.5.0-beta-1/binaries/apache-maven-3.5.0-beta-1-bin.tar.gz.asc
==
--- 
dev/maven/maven-3/3.5.0-beta-1/binaries/apache-maven-3.5.0-beta-1-bin.tar.gz.asc
 (added)
+++ 
dev/maven/maven-3/3.5.0-beta-1/binaries/apache-maven-3.5.0-beta-1-bin.tar.gz.asc
 Fri Mar 24 10:31:04 2017
@@ -0,0 +1,7 @@
+-BEGIN PGP SIGNATURE-
+Comment: GPGTools - https://gpgtools.org
+
+iEYEABECAAYFAljQCqQACgkQx8oZt7Yg14faTgCbBdgilRD692Yc7Jl2w1SUUOVc
+qz8An3iggQ0vhPecKRo/LfucDffflXL8
+=ptUj
+-END PGP SIGNATURE-

Added: 
dev/maven/maven-3/3.5.0-beta-1/binaries/apache-maven-3.5.0-beta-1-bin.tar.gz.md5
==
--- 
dev/maven/maven-3/3.5.0-beta-1/binaries/apache-maven-3.5.0-beta-1-bin.tar.gz.md5
 (added)
+++ 
dev/maven/maven-3/3.5.0-beta-1/binaries/apache-maven-3.5.0-beta-1-bin.tar.gz.md5
 Fri Mar 24 10:31:04 2017
@@ -0,0 +1 @@
+31b825624e6655c486b82cc00aebbb5b
\ No newline at end of file

Added: 
dev/maven/maven-3/3.5.0-beta-1/binaries/apache-maven-3.5.0-beta-1-bin.tar.gz.sha1
==
--- 
dev/maven/maven-3/3.5.0-beta-1/binaries/apache-maven-3.5.0-beta-1-bin.tar.gz.sha1
 (added)
+++ 
dev/maven/maven-3/3.5.0-beta-1/binaries/apache-maven-3.5.0-beta-1-bin.tar.gz.sha1
 Fri Mar 24 10:31:04 2017
@@ -0,0 +1 @@
+742788c3e7325ffd1f333fd6c9d4c8c640d0f10a
\ No newline at end of file

Added: dev/maven/maven-3/3.5.0-beta-1/binaries/apache-maven-3.5.0-beta-1-bin.zip
==
Binary file - no diff available.

Propchange: 
dev/maven/maven-3/3.5.0-beta-1/binaries/apache-maven-3.5.0-beta-1-bin.zip
--
svn:mime-type = application/octet-stream

Added: 
dev/maven/maven-3/3.5.0-beta-1/binaries/apache-maven-3.5.0-beta-1-bin.zip.asc
==
--- 
dev/maven/maven-3/3.5.0-beta-1/binaries/apache-maven-3.5.0-beta-1-bin.zip.asc 
(added)
+++ 
dev/maven/maven-3/3.5.0-beta-1/binaries/apache-maven-3.5.0-beta-1-bin.zip.asc 
Fri Mar 24 10:31:04 2017
@@ -0,0 +1,7 @@
+-BEGIN PGP SIGNATURE-
+Comment: GPGTools - https://gpgtools.org
+
+iEYEABECAAYFAljQCqQACgkQx8oZt7Yg14cm4QCfc2FKzYRaaz1JTtiE9QUGOYuI
+WTMAn35LjTxum4d6DTX7QkzxHoO0WzDV
+=WDzq
+-END PGP SIGNATURE-

Added: 
dev/maven/maven-3/3.5.0-beta-1/binaries/apache-maven-3.5.0-beta-1-bin.zip.md5
==
--- 
dev/maven/maven-3/3.5.0-beta-1/binaries/apache-maven-3.5.0-beta-1-bin.zip.md5 
(added)
+++ 
dev/maven/maven-3/3.5.0-beta-1/binaries/apache-maven-3.5.0-beta-1-bin.zip.md5 
Fri Mar 24 10:31:04 2017
@@ -0,0 +1 @@
+b66b87d49109d0cabbae0efd81cb5955
\ No newline at end of file

Added:

svn commit: r1788404 - in /maven/site/trunk/content/markdown/docs: 3.5.0-beta-1/release-notes.md history.md.vm

2017-03-24 Thread stephenc 
Author: stephenc
Date: Fri Mar 24 10:52:28 2017
New Revision: 1788404

URL: http://svn.apache.org/viewvc?rev=1788404=rev
Log:
prepare to update the site (just need the sync to mirrors so I can send the ANN 
mail so I can get the link to the mail archives)

Modified:
maven/site/trunk/content/markdown/docs/3.5.0-beta-1/release-notes.md
maven/site/trunk/content/markdown/docs/history.md.vm

Modified: maven/site/trunk/content/markdown/docs/3.5.0-beta-1/release-notes.md
URL: 
http://svn.apache.org/viewvc/maven/site/trunk/content/markdown/docs/3.5.0-beta-1/release-notes.md?rev=1788404=1788403=1788404=diff
==
--- maven/site/trunk/content/markdown/docs/3.5.0-beta-1/release-notes.md 
(original)
+++ maven/site/trunk/content/markdown/docs/3.5.0-beta-1/release-notes.md Fri 
Mar 24 10:52:28 2017
@@ -48,6 +48,11 @@ We hope you enjoy using Maven! If you ha
 
 The following issues were identified during release testing of this _BETA_ 
release but have not been deemed as release blockers:
 
+* [MNG-6190] maven-resolver-provider's `DefaultArtifactDescriptorReader` has 
mismatched constructor and initService methods (this issue does not affect 
normal usage of Maven)
+* [MNG-6191] `mvn -f` complains about illegal `readlink` option under macOS
+* [MNG-6192] The distribution zip file has unordered entries and some tools - 
most notably Maven wrapper - will fail to unzip the distribution
+
+
 ## Why not Maven 3.4.0?
 
 After Maven 3.3.9 was released, the Eclipse Aether project was retired and the 
code base was migrated to the Apache Maven project.
@@ -128,10 +133,10 @@ Thank you also for your time and feedbac
  * Replaced Eclipse Aether with [Maven Resolver][maven-resolver]
[MNG-6110], [MNG-6140].
 
- * Using of CI friendly versions via `${revision}`, `${sha1}` and/or 
`${changelist}` 
+ * Using of CI friendly versions via `${revision}`, `${sha1}` and/or 
`${changelist}`
has been fixed [MNG-6057], [MNG-6090] and [MNG-5895]. It is very important 
to
-   know if you are using the previously named properties for a version in your 
-   pom you have to use [flatten-maven-plugin] if you like to do an `mvn 
install` 
+   know if you are using the previously named properties for a version in your
+   pom you have to use [flatten-maven-plugin] if you like to do an `mvn 
install`
or `mvn deploy` more details can be found at [Maven CI 
Friendly](/maven-ci-friendly.html).
 
  * The two known issues from 3.5.0-alpha-1 have been fixed [MNG-6177], 
[MNG-6115]
@@ -210,5 +215,8 @@ See [complete release notes for all vers
 [MNG-6182]: https://issues.apache.org/jira/browse/MNG-6182
 [MNG-6183]: https://issues.apache.org/jira/browse/MNG-6183
 [MNG-6189]: https://issues.apache.org/jira/browse/MNG-6189
+[MNG-6190]: https://issues.apache.org/jira/browse/MNG-6190
+[MNG-6191]: https://issues.apache.org/jira/browse/MNG-6191
+[MNG-6192]: https://issues.apache.org/jira/browse/MNG-6192
 
 [flatten-maven-plugin]: http://www.mojohaus.org/flatten-maven-plugin/

Modified: maven/site/trunk/content/markdown/docs/history.md.vm
URL: 
http://svn.apache.org/viewvc/maven/site/trunk/content/markdown/docs/history.md.vm?rev=1788404=1788403=1788404=diff
==
--- maven/site/trunk/content/markdown/docs/history.md.vm (original)
+++ maven/site/trunk/content/markdown/docs/history.md.vm Fri Mar 24 10:52:28 
2017
@@ -1,6 +1,6 @@
 # Maven Releases History

svn commit: r18892 - /dev/maven/maven-3/3.5.0-beta-1/ /release/maven/maven-3/3.5.0-beta-1/

2017-03-24 Thread stephenc 
Author: stephenc
Date: Fri Mar 24 10:34:10 2017
New Revision: 18892

Log:
Publish 3.5.0-beta-1

Added:
release/maven/maven-3/3.5.0-beta-1/
  - copied from r18891, dev/maven/maven-3/3.5.0-beta-1/
Removed:
dev/maven/maven-3/3.5.0-beta-1/

maven git commit: [MNG-6168] Fix unclosed streams

2017-03-24 Thread schulte 
Repository: maven
Updated Branches:
  refs/heads/MNG-6168 [created] 0931bb2cc


[MNG-6168] Fix unclosed streams


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

Branch: refs/heads/MNG-6168
Commit: 0931bb2cc7630cc79adb98407db13315b4a709ee
Parents: f0535a4
Author: Christian Schulte 
Authored: Fri Mar 24 22:04:37 2017 +0100
Committer: Christian Schulte 
Committed: Fri Mar 24 22:04:37 2017 +0100

--
 .../metadata/io/DefaultMetadataReader.java  | 19 ++---
 .../toolchain/io/DefaultToolchainsReader.java   | 19 ++---
 .../maven/model/io/DefaultModelReader.java  | 18 +++--
 .../maven/model/io/DefaultModelWriter.java  | 27 +
 .../internal/DefaultVersionRangeResolver.java   | 18 +++--
 .../internal/DefaultVersionResolver.java| 42 
 .../settings/io/DefaultSettingsReader.java  | 19 ++---
 .../settings/io/DefaultSettingsWriter.java  | 27 +
 8 files changed, 58 insertions(+), 131 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/0931bb2c/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/io/DefaultMetadataReader.java
--
diff --git 
a/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/io/DefaultMetadataReader.java
 
b/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/io/DefaultMetadataReader.java
index c769f89..51a2849 100644
--- 
a/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/io/DefaultMetadataReader.java
+++ 
b/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/io/DefaultMetadataReader.java
@@ -29,7 +29,6 @@ import org.apache.commons.lang3.Validate;
 import org.apache.maven.artifact.repository.metadata.Metadata;
 import 
org.apache.maven.artifact.repository.metadata.io.xpp3.MetadataXpp3Reader;
 import org.codehaus.plexus.component.annotations.Component;
-import org.codehaus.plexus.util.IOUtil;
 import org.codehaus.plexus.util.ReaderFactory;
 import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
 
@@ -58,19 +57,14 @@ public class DefaultMetadataReader
 {
 Validate.notNull( input, "input cannot be null" );
 
-try
+try ( final Reader in = input )
 {
-MetadataXpp3Reader r = new MetadataXpp3Reader();
-return r.read( input, isStrict( options ) );
+return new MetadataXpp3Reader().read( in, isStrict( options ) );
 }
 catch ( XmlPullParserException e )
 {
 throw new MetadataParseException( e.getMessage(), 
e.getLineNumber(), e.getColumnNumber(), e );
 }
-finally
-{
-IOUtil.close( input );
-}
 }
 
 public Metadata read( InputStream input, Map options )
@@ -78,19 +72,14 @@ public class DefaultMetadataReader
 {
 Validate.notNull( input, "input cannot be null" );
 
-try
+try ( final InputStream in = input )
 {
-MetadataXpp3Reader r = new MetadataXpp3Reader();
-return r.read( input, isStrict( options ) );
+return new MetadataXpp3Reader().read( in, isStrict( options ) );
 }
 catch ( XmlPullParserException e )
 {
 throw new MetadataParseException( e.getMessage(), 
e.getLineNumber(), e.getColumnNumber(), e );
 }
-finally
-{
-IOUtil.close( input );
-}
 }
 
 private boolean isStrict( Map options )

http://git-wip-us.apache.org/repos/asf/maven/blob/0931bb2c/maven-core/src/main/java/org/apache/maven/toolchain/io/DefaultToolchainsReader.java
--
diff --git 
a/maven-core/src/main/java/org/apache/maven/toolchain/io/DefaultToolchainsReader.java
 
b/maven-core/src/main/java/org/apache/maven/toolchain/io/DefaultToolchainsReader.java
index 9b5bdd7..86a1784 100644
--- 
a/maven-core/src/main/java/org/apache/maven/toolchain/io/DefaultToolchainsReader.java
+++ 
b/maven-core/src/main/java/org/apache/maven/toolchain/io/DefaultToolchainsReader.java
@@ -31,7 +31,6 @@ import javax.inject.Singleton;
 import org.apache.commons.lang3.Validate;
 import org.apache.maven.toolchain.model.PersistedToolchains;
 import org.apache.maven.toolchain.model.io.xpp3.MavenToolchainsXpp3Reader;
-import org.codehaus.plexus.util.IOUtil;
 import org.codehaus.plexus.util.ReaderFactory;
 import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
 
@@ -62,19 +61,14 @@ public class

maven-integration-testing git commit: force forked mode when hacking for JVM CLI issue

2017-03-24 Thread hboutemy 
Repository: maven-integration-testing
Updated Branches:
  refs/heads/master de754 -> 6d2ece6e3


force forked mode when hacking for JVM CLI issue

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/6d2ece6e
Tree: 
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/tree/6d2ece6e
Diff: 
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/diff/6d2ece6e

Branch: refs/heads/master
Commit: 6d2ece6e3ccb53b449808666ab8ddacf59f70bfc
Parents: de7
Author: Hervé Boutemy 
Authored: Sat Mar 25 06:03:07 2017 +0100
Committer: Hervé Boutemy 
Committed: Sat Mar 25 06:03:07 2017 +0100

--
 .../it/MavenITmng4625SettingsXmlInterpolationWithXmlMarkupTest.java | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/6d2ece6e/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4625SettingsXmlInterpolationWithXmlMarkupTest.java
--
diff --git 
a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4625SettingsXmlInterpolationWithXmlMarkupTest.java
 
b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4625SettingsXmlInterpolationWithXmlMarkupTest.java
index 570c9e7..16a89c8 100644
--- 
a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4625SettingsXmlInterpolationWithXmlMarkupTest.java
+++ 
b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4625SettingsXmlInterpolationWithXmlMarkupTest.java
@@ -59,6 +59,7 @@ public class 
MavenITmng4625SettingsXmlInterpolationWithXmlMarkupTest
 if( Os.isFamily( Os.FAMILY_WINDOWS ) && 
!System.getProperties().contains( "CLASSWORLDS_LAUNCHER" ) )
 {
 verifier.setSystemProperty( "test.prop", "\"=y<>\"" );
+verifier.setForkJvm( true ); // force forked JVM, since the 
workaround expects forked run 
 }
 else
 {

[maven] Git Push Summary

2017-03-24 Thread schulte 
Repository: maven
Updated Branches:
  refs/heads/MNG-6168 [deleted] 0931bb2cc

maven git commit: [MNG-6168] Fix unclosed streams

2017-03-24 Thread schulte 
Repository: maven
Updated Branches:
  refs/heads/master f0535a40e -> 0931bb2cc


[MNG-6168] Fix unclosed streams


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

Branch: refs/heads/master
Commit: 0931bb2cc7630cc79adb98407db13315b4a709ee
Parents: f0535a4
Author: Christian Schulte 
Authored: Fri Mar 24 22:04:37 2017 +0100
Committer: Christian Schulte 
Committed: Fri Mar 24 22:04:37 2017 +0100

--
 .../metadata/io/DefaultMetadataReader.java  | 19 ++---
 .../toolchain/io/DefaultToolchainsReader.java   | 19 ++---
 .../maven/model/io/DefaultModelReader.java  | 18 +++--
 .../maven/model/io/DefaultModelWriter.java  | 27 +
 .../internal/DefaultVersionRangeResolver.java   | 18 +++--
 .../internal/DefaultVersionResolver.java| 42 
 .../settings/io/DefaultSettingsReader.java  | 19 ++---
 .../settings/io/DefaultSettingsWriter.java  | 27 +
 8 files changed, 58 insertions(+), 131 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/0931bb2c/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/io/DefaultMetadataReader.java
--
diff --git 
a/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/io/DefaultMetadataReader.java
 
b/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/io/DefaultMetadataReader.java
index c769f89..51a2849 100644
--- 
a/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/io/DefaultMetadataReader.java
+++ 
b/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/io/DefaultMetadataReader.java
@@ -29,7 +29,6 @@ import org.apache.commons.lang3.Validate;
 import org.apache.maven.artifact.repository.metadata.Metadata;
 import 
org.apache.maven.artifact.repository.metadata.io.xpp3.MetadataXpp3Reader;
 import org.codehaus.plexus.component.annotations.Component;
-import org.codehaus.plexus.util.IOUtil;
 import org.codehaus.plexus.util.ReaderFactory;
 import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
 
@@ -58,19 +57,14 @@ public class DefaultMetadataReader
 {
 Validate.notNull( input, "input cannot be null" );
 
-try
+try ( final Reader in = input )
 {
-MetadataXpp3Reader r = new MetadataXpp3Reader();
-return r.read( input, isStrict( options ) );
+return new MetadataXpp3Reader().read( in, isStrict( options ) );
 }
 catch ( XmlPullParserException e )
 {
 throw new MetadataParseException( e.getMessage(), 
e.getLineNumber(), e.getColumnNumber(), e );
 }
-finally
-{
-IOUtil.close( input );
-}
 }
 
 public Metadata read( InputStream input, Map options )
@@ -78,19 +72,14 @@ public class DefaultMetadataReader
 {
 Validate.notNull( input, "input cannot be null" );
 
-try
+try ( final InputStream in = input )
 {
-MetadataXpp3Reader r = new MetadataXpp3Reader();
-return r.read( input, isStrict( options ) );
+return new MetadataXpp3Reader().read( in, isStrict( options ) );
 }
 catch ( XmlPullParserException e )
 {
 throw new MetadataParseException( e.getMessage(), 
e.getLineNumber(), e.getColumnNumber(), e );
 }
-finally
-{
-IOUtil.close( input );
-}
 }
 
 private boolean isStrict( Map options )

http://git-wip-us.apache.org/repos/asf/maven/blob/0931bb2c/maven-core/src/main/java/org/apache/maven/toolchain/io/DefaultToolchainsReader.java
--
diff --git 
a/maven-core/src/main/java/org/apache/maven/toolchain/io/DefaultToolchainsReader.java
 
b/maven-core/src/main/java/org/apache/maven/toolchain/io/DefaultToolchainsReader.java
index 9b5bdd7..86a1784 100644
--- 
a/maven-core/src/main/java/org/apache/maven/toolchain/io/DefaultToolchainsReader.java
+++ 
b/maven-core/src/main/java/org/apache/maven/toolchain/io/DefaultToolchainsReader.java
@@ -31,7 +31,6 @@ import javax.inject.Singleton;
 import org.apache.commons.lang3.Validate;
 import org.apache.maven.toolchain.model.PersistedToolchains;
 import org.apache.maven.toolchain.model.io.xpp3.MavenToolchainsXpp3Reader;
-import org.codehaus.plexus.util.IOUtil;
 import org.codehaus.plexus.util.ReaderFactory;
 import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
 
@@ -62,19 +61,14 @@ public class

svn commit: r1008905 [2/4] - in /websites/staging/maven/trunk/content: ./ apache-resource-bundles/ archetypes/ archives/maven-2.x/ background/ developers/ developers/conventions/ developers/release/ d

2017-03-24 Thread buildbot 
Modified: websites/staging/maven/trunk/content/docs/2.0.7/release-notes.html
==
--- websites/staging/maven/trunk/content/docs/2.0.7/release-notes.html 
(original)
+++ websites/staging/maven/trunk/content/docs/2.0.7/release-notes.html Fri Mar 
24 10:53:57 2017
@@ -1,6 +1,6 @@
 
 
 http://www.w3.org/1999/xhtml; xml:lang="en" lang="en">
@@ -9,7 +9,7 @@
 
 
 
-
+
 
 Maven  Release Notes - Maven 2.0.7
 
@@ -41,7 +41,7 @@
 https://www.apache.org/; class="externalLink" 
title="Apache">Apache/
   Maven/
 Release Notes - Maven 2.0.7
-Last Published: 2017-03-20
+Last Published: 2017-03-24
 
   
   

Modified: websites/staging/maven/trunk/content/docs/2.0.8/release-notes.html
==
--- websites/staging/maven/trunk/content/docs/2.0.8/release-notes.html 
(original)
+++ websites/staging/maven/trunk/content/docs/2.0.8/release-notes.html Fri Mar 
24 10:53:57 2017
@@ -1,6 +1,6 @@
 
 
 http://www.w3.org/1999/xhtml; xml:lang="en" lang="en">
@@ -9,7 +9,7 @@
 
 
 
-
+
 
 Maven  Release Notes - Maven 2.0.8
 
@@ -41,7 +41,7 @@
 https://www.apache.org/; class="externalLink" 
title="Apache">Apache/
   Maven/
 Release Notes - Maven 2.0.8
-Last Published: 2017-03-20
+Last Published: 2017-03-24
 
   
   

Modified: websites/staging/maven/trunk/content/docs/2.0.9/release-notes.html
==
--- websites/staging/maven/trunk/content/docs/2.0.9/release-notes.html 
(original)
+++ websites/staging/maven/trunk/content/docs/2.0.9/release-notes.html Fri Mar 
24 10:53:57 2017
@@ -1,6 +1,6 @@
 
 
 http://www.w3.org/1999/xhtml; xml:lang="en" lang="en">
@@ -9,7 +9,7 @@
 
 
 
-
+
 
 Maven  Release Notes - Maven 2.0.9
 
@@ -41,7 +41,7 @@
 https://www.apache.org/; class="externalLink" 
title="Apache">Apache/
   Maven/
 Release Notes - Maven 2.0.9
-Last Published: 2017-03-20
+Last Published: 2017-03-24
 
   
   

Modified: websites/staging/maven/trunk/content/docs/2.0/release-notes.html
==
--- websites/staging/maven/trunk/content/docs/2.0/release-notes.html (original)
+++ websites/staging/maven/trunk/content/docs/2.0/release-notes.html Fri Mar 24 
10:53:57 2017
@@ -1,6 +1,6 @@
 
 
 http://www.w3.org/1999/xhtml; xml:lang="en" lang="en">
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 Maven  Release Notes - Maven 2.0
 
@@ -40,7 +40,7 @@
 https://www.apache.org/; class="externalLink" 
title="Apache">Apache/
   Maven/
 Release Notes - Maven 2.0
-Last Published: 2017-03-20
+Last Published: 2017-03-24
 
   
   

Modified: websites/staging/maven/trunk/content/docs/2.1.0/release-notes.html
==
--- websites/staging/maven/trunk/content/docs/2.1.0/release-notes.html 
(original)
+++ websites/staging/maven/trunk/content/docs/2.1.0/release-notes.html Fri Mar 
24 10:53:57 2017
@@ -1,6 +1,6 @@
 
 
 http://www.w3.org/1999/xhtml; xml:lang="en" lang="en">
@@ -11,7 +11,7 @@
 Jason van Zyl
 Brian Fox" />
 
-
+
 
 Maven  Release Notes - Maven 2.1.0
 
@@ -43,7 +43,7 @@ Brian Fox" />
 https://www.apache.org/; class="externalLink" 
title="Apache">Apache/
   Maven/
 Release Notes - Maven 2.1.0
-Last Published: 2017-03-20
+Last Published: 2017-03-24
 
   
   

Modified: websites/staging/maven/trunk/content/docs/2.2.0/release-notes.html
==
--- websites/staging/maven/trunk/content/docs/2.2.0/release-notes.html 
(original)
+++ websites/staging/maven/trunk/content/docs/2.2.0/release-notes.html Fri Mar 
24 10:53:57 2017
@@ -1,6 +1,6 @@
 
 
 http://www.w3.org/1999/xhtml; xml:lang="en" lang="en">
@@ -12,7 +12,7 @@ Jason van Zyl
 Brian Fox
 John Casey" />
 
-
+
 
 Maven  Release Notes - Maven 2.2.0
 
@@ -44,7 +44,7 @@ John Casey" />
 https://www.apache.org/; class="externalLink" 
title="Apache">Apache/
   Maven/
 Release Notes - Maven 2.2.0
-Last Published: 2017-03-20
+Last Published: 2017-03-24
 
   
   

Modified: websites/staging/maven/trunk/content/docs/2.2.1/release-notes.html
==
--- websites/staging/maven/trunk/content/docs/2.2.1/release-notes.html 
(original)
+++ websites/staging/maven/trunk/content/docs/2.2.1/release-notes.html Fri Mar 
24 10:53:57 2017
@@ -1,6 +1,6 @@
 
 
 http://www.w3.org/1999/xhtml; xml:lang="en" lang="en">

svn commit: r1008905 [4/4] - in /websites/staging/maven/trunk/content: ./ apache-resource-bundles/ archetypes/ archives/maven-2.x/ background/ developers/ developers/conventions/ developers/release/ d

2017-03-24 Thread buildbot 
Modified: 
websites/staging/maven/trunk/content/guides/mini/guide-wagon-providers.html
==
--- websites/staging/maven/trunk/content/guides/mini/guide-wagon-providers.html 
(original)
+++ websites/staging/maven/trunk/content/guides/mini/guide-wagon-providers.html 
Fri Mar 24 10:53:57 2017
@@ -1,6 +1,6 @@
 
 
 http://www.w3.org/1999/xhtml; xml:lang="en" lang="en">
@@ -9,7 +9,7 @@
 
 
 
-
+
 
 Maven  Guide to Selecting Alternative Wagon 
Providers
 
@@ -41,7 +41,7 @@
 https://www.apache.org/; class="externalLink" 
title="Apache">Apache/
   Maven/
 Guide to Selecting Alternative Wagon Providers
-Last Published: 2017-03-20
+Last Published: 2017-03-24
 
   
   

Modified: websites/staging/maven/trunk/content/guides/mini/index.html
==
--- websites/staging/maven/trunk/content/guides/mini/index.html (original)
+++ websites/staging/maven/trunk/content/guides/mini/index.html Fri Mar 24 
10:53:57 2017
@@ -1,6 +1,6 @@
 
 
 http://www.w3.org/1999/xhtml; xml:lang="en" lang="en">
@@ -9,7 +9,7 @@
 
 
 
-
+
 
 Maven  Maven Mini Guides
 
@@ -41,7 +41,7 @@
 https://www.apache.org/; class="externalLink" 
title="Apache">Apache/
   Maven/
 Maven Mini Guides
-Last Published: 2017-03-20
+Last Published: 2017-03-24
 
   
   

Modified: 
websites/staging/maven/trunk/content/guides/plugin/guide-java-plugin-development.html
==
--- 
websites/staging/maven/trunk/content/guides/plugin/guide-java-plugin-development.html
 (original)
+++ 
websites/staging/maven/trunk/content/guides/plugin/guide-java-plugin-development.html
 Fri Mar 24 10:53:57 2017
@@ -1,6 +1,6 @@
 
 
 http://www.w3.org/1999/xhtml; xml:lang="en" lang="en">
@@ -11,7 +11,7 @@
 Vincent Siveton
 Olivier Lamy" />
 
-
+
 
 Maven  Guide to Developing Java Plugins
 
@@ -43,7 +43,7 @@ Olivier Lamy" />
 https://www.apache.org/; class="externalLink" 
title="Apache">Apache/
   Maven/
 Guide to Developing Java Plugins
-Last Published: 2017-03-20
+Last Published: 2017-03-24
 
   
   

Modified: websites/staging/maven/trunk/content/ide.html
==
--- websites/staging/maven/trunk/content/ide.html (original)
+++ websites/staging/maven/trunk/content/ide.html Fri Mar 24 10:53:57 2017
@@ -1,13 +1,13 @@
 
 
 http://www.w3.org/1999/xhtml; xml:lang="en" lang="en">
   
 
 
-
+
 
 Maven  Apache Maven IDE Integration
 
@@ -39,7 +39,7 @@
 https://www.apache.org/; class="externalLink" 
title="Apache">Apache/
   Maven/
 Apache Maven IDE Integration
-Last Published: 2017-03-20
+Last Published: 2017-03-24
 
   
   

Modified: websites/staging/maven/trunk/content/index.html
==
--- websites/staging/maven/trunk/content/index.html (original)
+++ websites/staging/maven/trunk/content/index.html Fri Mar 24 10:53:57 2017
@@ -1,6 +1,6 @@
 
 
 http://www.w3.org/1999/xhtml; xml:lang="en" lang="en">
@@ -10,7 +10,7 @@
 
 
 
-
+
 
 Maven  Welcome to Apache Maven
 
@@ -42,7 +42,7 @@
 https://www.apache.org/; class="externalLink" 
title="Apache">Apache/
   Maven/
 Welcome to Apache Maven
-Last Published: 2017-03-20
+Last Published: 2017-03-24
 
   
   

Modified: websites/staging/maven/trunk/content/install.html
==
--- websites/staging/maven/trunk/content/install.html (original)
+++ websites/staging/maven/trunk/content/install.html Fri Mar 24 10:53:57 2017
@@ -1,13 +1,13 @@
 
 
 http://www.w3.org/1999/xhtml; xml:lang="en" lang="en">
   
 
 
-
+
 
 Maven  Installing Apache Maven
 
@@ -39,7 +39,7 @@
 https://www.apache.org/; class="externalLink" 
title="Apache">Apache/
   Maven/
 Installing Apache Maven
-Last Published: 2017-03-20
+Last Published: 2017-03-24
 
   
   

Modified: websites/staging/maven/trunk/content/integration.html
==
--- websites/staging/maven/trunk/content/integration.html (original)
+++ websites/staging/maven/trunk/content/integration.html Fri Mar 24 10:53:57 
2017
@@ -1,13 +1,13 @@
 
 
 http://www.w3.org/1999/xhtml; xml:lang="en" lang="en">
   
 
 
-
+
 
 Maven  CI Management
 
@@ -39,7 +39,7 @@
 https://www.apache.org/; class="externalLink" 
title="Apache">Apache/
   Maven/
 CI

svn commit: r1008905 [1/4] - in /websites/staging/maven/trunk/content: ./ apache-resource-bundles/ archetypes/ archives/maven-2.x/ background/ developers/ developers/conventions/ developers/release/ d

2017-03-24 Thread buildbot 
Author: buildbot
Date: Fri Mar 24 10:53:57 2017
New Revision: 1008905

Log:
Staging update by buildbot for maven

Modified:
websites/staging/maven/trunk/content/   (props changed)
websites/staging/maven/trunk/content/about.html
websites/staging/maven/trunk/content/aether.html
websites/staging/maven/trunk/content/apache-resource-bundles/index.html
websites/staging/maven/trunk/content/archetypes/index.html
websites/staging/maven/trunk/content/archives/maven-2.x/index.html
websites/staging/maven/trunk/content/articles.html
websites/staging/maven/trunk/content/background/history-of-maven.html
websites/staging/maven/trunk/content/background/philosophy-of-maven.html
websites/staging/maven/trunk/content/code-quality-management.html
websites/staging/maven/trunk/content/community.html
websites/staging/maven/trunk/content/configure.html
websites/staging/maven/trunk/content/continuous-integration.html
websites/staging/maven/trunk/content/developers/committer-environment.html
websites/staging/maven/trunk/content/developers/committer-settings.html
websites/staging/maven/trunk/content/developers/conventions/code.html
websites/staging/maven/trunk/content/developers/conventions/git.html
websites/staging/maven/trunk/content/developers/conventions/jira.html
websites/staging/maven/trunk/content/developers/conventions/svn.html
websites/staging/maven/trunk/content/developers/dependency-policies.html
websites/staging/maven/trunk/content/developers/index.html
websites/staging/maven/trunk/content/developers/java5.html
websites/staging/maven/trunk/content/developers/java6.html
websites/staging/maven/trunk/content/developers/mojo-api-specification.html
websites/staging/maven/trunk/content/developers/release/index.html

websites/staging/maven/trunk/content/developers/release/maven-core-release.html

websites/staging/maven/trunk/content/developers/release/maven-project-release-procedure.html

websites/staging/maven/trunk/content/developers/release/parent-pom-release.html
websites/staging/maven/trunk/content/developers/release/pmc-gpg-keys.html
websites/staging/maven/trunk/content/developers/retirement-plan-plugins.html

websites/staging/maven/trunk/content/developers/website/component-reference-documentation-helper.html

websites/staging/maven/trunk/content/developers/website/deploy-component-reference-documentation.html

websites/staging/maven/trunk/content/developers/website/deploy-maven-website.html
websites/staging/maven/trunk/content/developers/website/index.html

websites/staging/maven/trunk/content/developers/website/website-overview.html

websites/staging/maven/trunk/content/developers/welcome-to-new-committers.html
websites/staging/maven/trunk/content/docs-required.html
websites/staging/maven/trunk/content/docs/2.0.1/release-notes.html
websites/staging/maven/trunk/content/docs/2.0.10/release-notes.html
websites/staging/maven/trunk/content/docs/2.0.11/release-notes.html
websites/staging/maven/trunk/content/docs/2.0.2/release-notes.html
websites/staging/maven/trunk/content/docs/2.0.3/release-notes.html
websites/staging/maven/trunk/content/docs/2.0.4/release-notes.html
websites/staging/maven/trunk/content/docs/2.0.5/release-notes.html
websites/staging/maven/trunk/content/docs/2.0.6/release-notes.html
websites/staging/maven/trunk/content/docs/2.0.7/release-notes.html
websites/staging/maven/trunk/content/docs/2.0.8/release-notes.html
websites/staging/maven/trunk/content/docs/2.0.9/release-notes.html
websites/staging/maven/trunk/content/docs/2.0/release-notes.html
websites/staging/maven/trunk/content/docs/2.1.0/release-notes.html
websites/staging/maven/trunk/content/docs/2.2.0/release-notes.html
websites/staging/maven/trunk/content/docs/2.2.1/release-notes.html
websites/staging/maven/trunk/content/docs/3.0-alpha-3/release-notes.html
websites/staging/maven/trunk/content/docs/3.0-alpha-4/release-notes.html
websites/staging/maven/trunk/content/docs/3.0-alpha-5/release-notes.html
websites/staging/maven/trunk/content/docs/3.0-alpha-6/release-notes.html
websites/staging/maven/trunk/content/docs/3.0-alpha-7/release-notes.html
websites/staging/maven/trunk/content/docs/3.0-beta-1/release-notes.html
websites/staging/maven/trunk/content/docs/3.0-beta-2/release-notes.html
websites/staging/maven/trunk/content/docs/3.0-beta-3/release-notes.html
websites/staging/maven/trunk/content/docs/3.0.1/release-notes.html
websites/staging/maven/trunk/content/docs/3.0.2/release-notes.html
websites/staging/maven/trunk/content/docs/3.0.3/release-notes.html
websites/staging/maven/trunk/content/docs/3.0.4/release-notes.html
websites/staging/maven/trunk/content/docs/3.0.5/release-notes.html
websites/staging/maven/trunk/content/docs/3.0/release-notes.html

svn commit: r1008905 [3/4] - in /websites/staging/maven/trunk/content: ./ apache-resource-bundles/ archetypes/ archives/maven-2.x/ background/ developers/ developers/conventions/ developers/release/ d

2017-03-24 Thread buildbot 
Modified: 
websites/staging/maven/trunk/content/guides/getting-started/maven-in-five-minutes.html
==
--- 
websites/staging/maven/trunk/content/guides/getting-started/maven-in-five-minutes.html
 (original)
+++ 
websites/staging/maven/trunk/content/guides/getting-started/maven-in-five-minutes.html
 Fri Mar 24 10:53:57 2017
@@ -1,6 +1,6 @@
 
 
 http://www.w3.org/1999/xhtml; xml:lang="en" lang="en">
@@ -9,7 +9,7 @@
 
 
 
-
+
 
 Maven  Maven in 5 Minutes
 
@@ -41,7 +41,7 @@
 https://www.apache.org/; class="externalLink" 
title="Apache">Apache/
   Maven/
 Maven in 5 Minutes
-Last Published: 2017-03-20
+Last Published: 2017-03-24
 
   
   

Modified: 
websites/staging/maven/trunk/content/guides/getting-started/windows-prerequisites.html
==
--- 
websites/staging/maven/trunk/content/guides/getting-started/windows-prerequisites.html
 (original)
+++ 
websites/staging/maven/trunk/content/guides/getting-started/windows-prerequisites.html
 Fri Mar 24 10:53:57 2017
@@ -1,6 +1,6 @@
 
 
 http://www.w3.org/1999/xhtml; xml:lang="en" lang="en">
@@ -9,7 +9,7 @@
 
 
 
-
+
 
 Maven  Maven on Windows
 
@@ -41,7 +41,7 @@
 https://www.apache.org/; class="externalLink" 
title="Apache">Apache/
   Maven/
 Maven on Windows
-Last Published: 2017-03-20
+Last Published: 2017-03-24
 
   
   

Modified: websites/staging/maven/trunk/content/guides/index.html
==
--- websites/staging/maven/trunk/content/guides/index.html (original)
+++ websites/staging/maven/trunk/content/guides/index.html Fri Mar 24 10:53:57 
2017
@@ -1,6 +1,6 @@
 
 
 http://www.w3.org/1999/xhtml; xml:lang="en" lang="en">
@@ -10,7 +10,7 @@
 
 
-
+
 
 Maven  Maven Documentation
 
@@ -42,7 +42,7 @@ Eric Redmond" />
 https://www.apache.org/; class="externalLink" 
title="Apache">Apache/
   Maven/
 Maven Documentation
-Last Published: 2017-03-20
+Last Published: 2017-03-24
 
   
   

Modified: 
websites/staging/maven/trunk/content/guides/introduction/introduction-to-archetypes.html
==
--- 
websites/staging/maven/trunk/content/guides/introduction/introduction-to-archetypes.html
 (original)
+++ 
websites/staging/maven/trunk/content/guides/introduction/introduction-to-archetypes.html
 Fri Mar 24 10:53:57 2017
@@ -1,6 +1,6 @@
 
 
 http://www.w3.org/1999/xhtml; xml:lang="en" lang="en">
@@ -9,7 +9,7 @@
 
 
 
-
+
 
 Maven  Introduction to Archetypes
 
@@ -41,7 +41,7 @@
 https://www.apache.org/; class="externalLink" 
title="Apache">Apache/
   Maven/
 Introduction to Archetypes
-Last Published: 2017-03-20
+Last Published: 2017-03-24
 
   
   

Modified: 
websites/staging/maven/trunk/content/guides/introduction/introduction-to-dependency-mechanism.html
==
--- 
websites/staging/maven/trunk/content/guides/introduction/introduction-to-dependency-mechanism.html
 (original)
+++ 
websites/staging/maven/trunk/content/guides/introduction/introduction-to-dependency-mechanism.html
 Fri Mar 24 10:53:57 2017
@@ -1,6 +1,6 @@
 
 
 http://www.w3.org/1999/xhtml; xml:lang="en" lang="en">
@@ -11,7 +11,7 @@
 Trygve Laugstol
 Karl Heinz Marbaise" />
 
-
+
 
 Maven  Introduction to the Dependency Mechanism
 
@@ -43,7 +43,7 @@ Karl Heinz Marbaise" />
 https://www.apache.org/; class="externalLink" 
title="Apache">Apache/
   Maven/
 Introduction to the Dependency Mechanism
-Last Published: 2017-03-20
+Last Published: 2017-03-24
 
   
   

Modified: 
websites/staging/maven/trunk/content/guides/introduction/introduction-to-optional-and-excludes-dependencies.html
==
--- 
websites/staging/maven/trunk/content/guides/introduction/introduction-to-optional-and-excludes-dependencies.html
 (original)
+++ 
websites/staging/maven/trunk/content/guides/introduction/introduction-to-optional-and-excludes-dependencies.html
 Fri Mar 24 10:53:57 2017
@@ -1,6 +1,6 @@
 
 
 http://www.w3.org/1999/xhtml; xml:lang="en" lang="en">
@@ -9,7 +9,7 @@
 
 
 
-
+
 
 Maven  Optional Dependencies and Dependency 
Exclusions
 
@@ -41,7 +41,7 @@
 https://www.apache.org/; class="externalLink" 
title="Apache">Apache/
   Maven/
 Optional Dependencies and Dependency Exclusions
-Last Published: 2017-03-20
+Last Published: 2017-03-24

svn commit: r1008903 - /websites/production/maven/components/ref/3.5.0-beta-1/

2017-03-24 Thread stephenc 
Author: stephenc
Date: Fri Mar 24 10:32:16 2017
New Revision: 1008903

Log:
Deploy site

Added:
websites/production/maven/components/ref/3.5.0-beta-1/
  - copied from r1008902, websites/production/maven/components/ref/3-LATEST/