svn commit: r1768625 - /maven/plugins/trunk/maven-assembly-plugin/pom.xml

2016-11-07 Thread olamy 
Author: olamy
Date: Tue Nov  8 03:14:15 2016
New Revision: 1768625

URL: http://svn.apache.org/viewvc?rev=1768625=rev
Log:
use plexus-interpolation 1.24-SNAPSHOT

Signed-off-by: olivier lamy 

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

Modified: maven/plugins/trunk/maven-assembly-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/pom.xml?rev=1768625=1768624=1768625=diff
==
--- maven/plugins/trunk/maven-assembly-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/pom.xml Tue Nov  8 03:14:15 2016
@@ -126,7 +126,7 @@ under the License.
 
   org.codehaus.plexus
   plexus-interpolation
-  1.21
+  1.24-SNAPSHOT
 
 
   org.codehaus.plexus
@@ -353,6 +353,19 @@ under the License.
 
   
 
+  
+
+  plexus-snapshots
+  https://oss.sonatype.org/content/repositories/plexus-snapshots
+  
+false
+  
+  
+true
+  
+
+  
+
   
 
   run-its

svn commit: r1768624 - in /maven/plugins/trunk/maven-assembly-plugin/src/site: apt/features.apt site.xml

2016-11-07 Thread olamy 
Author: olamy
Date: Tue Nov  8 03:14:09 2016
New Revision: 1768624

URL: http://svn.apache.org/viewvc?rev=1768624=rev
Log:
[MASSEMBLY-837] remove non up to date features page

Removed:
maven/plugins/trunk/maven-assembly-plugin/src/site/apt/features.apt
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/site/site.xml

Modified: maven/plugins/trunk/maven-assembly-plugin/src/site/site.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/site/site.xml?rev=1768624=1768623=1768624=diff
==
--- maven/plugins/trunk/maven-assembly-plugin/src/site/site.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/site/site.xml Tue Nov  8 
03:14:09 2016
@@ -26,7 +26,6 @@ under the License.
 
   
 
-

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

2016-11-07 Thread hboutemy 
Author: hboutemy
Date: Tue Nov  8 02:26:23 2016
New Revision: 1768622

URL: http://svn.apache.org/viewvc?rev=1768622=rev
Log:
cancelled

Removed:
maven/plugins/tags/maven-site-plugin-3.6/

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

2016-11-07 Thread hboutemy 
Author: hboutemy
Date: Tue Nov  8 02:21:22 2016
New Revision: 1768621

URL: http://svn.apache.org/viewvc?rev=1768621=rev
Log:
release cancelled to fix DOXIASITETOOLS-171

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=1768621=1768620=1768621=diff
==
--- maven/plugins/trunk/maven-site-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-site-plugin/pom.xml Tue Nov  8 02:21:22 2016
@@ -30,7 +30,7 @@ under the License.
   
 
   maven-site-plugin
-  3.7-SNAPSHOT
+  3.6-SNAPSHOT
   maven-plugin
 
   Apache Maven Site Plugin

maven-resolver git commit: Remove empty statement

2016-11-07 Thread michaelo 
Repository: maven-resolver
Updated Branches:
  refs/heads/master da8bb35eb -> 7b3bf5796


Remove empty statement


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

Branch: refs/heads/master
Commit: 7b3bf5796eb9d290d188ce9730092405a99215df
Parents: da8bb35
Author: Michael Osipov 
Authored: Mon Nov 7 23:25:23 2016 +0100
Committer: Michael Osipov 
Committed: Mon Nov 7 23:25:23 2016 +0100

--
 .../eclipse/aether/connector/basic/BasicRepositoryConnector.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/7b3bf579/maven-resolver-connector-basic/src/main/java/org/eclipse/aether/connector/basic/BasicRepositoryConnector.java
--
diff --git 
a/maven-resolver-connector-basic/src/main/java/org/eclipse/aether/connector/basic/BasicRepositoryConnector.java
 
b/maven-resolver-connector-basic/src/main/java/org/eclipse/aether/connector/basic/BasicRepositoryConnector.java
index 51eca65..d92fc0a 100644
--- 
a/maven-resolver-connector-basic/src/main/java/org/eclipse/aether/connector/basic/BasicRepositoryConnector.java
+++ 
b/maven-resolver-connector-basic/src/main/java/org/eclipse/aether/connector/basic/BasicRepositoryConnector.java
@@ -502,7 +502,7 @@ final class BasicRepositoryConnector
   TransferTransportListener listener )
 {
 super( path, listener );
-this.file = Objects.requireNonNull( file, "source file cannot be 
null" );;
+this.file = Objects.requireNonNull( file, "source file cannot be 
null" );
 this.checksums = safe( checksums );
 }

maven-resolver git commit: Turn some IllegalArgumentExceptions into IllegalStateExceptions

2016-11-07 Thread michaelo 
Repository: maven-resolver
Updated Branches:
  refs/heads/master c5aaff390 -> da8bb35eb


Turn some IllegalArgumentExceptions into IllegalStateExceptions

The rationale is that the values in question were valid when they were
passed or for themselves, but in combination with others they do not
add up, an illegal state has been reached.


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

Branch: refs/heads/master
Commit: da8bb35ebbabe6b7cc6e86c3aee9ff8093949001
Parents: c5aaff3
Author: Michael Osipov 
Authored: Mon Nov 7 23:08:31 2016 +0100
Committer: Michael Osipov 
Committed: Mon Nov 7 23:08:31 2016 +0100

--
 .../java/org/eclipse/aether/graph/DefaultDependencyNode.java   | 6 +++---
 .../org/eclipse/aether/internal/impl/DefaultInstaller.java | 4 ++--
 .../aether/internal/test/util/DependencyGraphParser.java   | 6 +++---
 .../aether/transport/wagon/AbstractWagonTransporterTest.java   | 2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/da8bb35e/maven-resolver-api/src/main/java/org/eclipse/aether/graph/DefaultDependencyNode.java
--
diff --git 
a/maven-resolver-api/src/main/java/org/eclipse/aether/graph/DefaultDependencyNode.java
 
b/maven-resolver-api/src/main/java/org/eclipse/aether/graph/DefaultDependencyNode.java
index 61724dd..daf373d 100644
--- 
a/maven-resolver-api/src/main/java/org/eclipse/aether/graph/DefaultDependencyNode.java
+++ 
b/maven-resolver-api/src/main/java/org/eclipse/aether/graph/DefaultDependencyNode.java
@@ -178,7 +178,7 @@ public final class DefaultDependencyNode
 {
 if ( dependency == null )
 {
-throw new UnsupportedOperationException( "node does not have a 
dependency" );
+throw new IllegalStateException( "node does not have a dependency" 
);
 }
 dependency = dependency.setArtifact( artifact );
 this.artifact = dependency.getArtifact();
@@ -262,7 +262,7 @@ public final class DefaultDependencyNode
 {
 if ( dependency == null )
 {
-throw new UnsupportedOperationException( "node does not have a 
dependency" );
+throw new IllegalStateException( "node does not have a dependency" 
);
 }
 dependency = dependency.setScope( scope );
 }
@@ -271,7 +271,7 @@ public final class DefaultDependencyNode
 {
 if ( dependency == null )
 {
-throw new UnsupportedOperationException( "node does not have a 
dependency" );
+throw new IllegalStateException( "node does not have a dependency" 
);
 }
 dependency = dependency.setOptional( optional );
 }

http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/da8bb35e/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultInstaller.java
--
diff --git 
a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultInstaller.java
 
b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultInstaller.java
index 6016b77..ede49ed 100644
--- 
a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultInstaller.java
+++ 
b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultInstaller.java
@@ -255,7 +255,7 @@ public class DefaultInstaller
 {
 if ( dstFile.equals( srcFile ) )
 {
-throw new IllegalArgumentException( "Cannot install " + 
dstFile + " to same path" );
+throw new IllegalStateException( "cannot install " + dstFile + 
" to same path" );
 }
 
 boolean copy =
@@ -305,7 +305,7 @@ public class DefaultInstaller
 {
 if ( dstFile.equals( metadata.getFile() ) )
 {
-throw new IllegalArgumentException( "Cannot install " + 
dstFile + " to same path" );
+throw new IllegalStateException( "cannot install " + 
dstFile + " to same path" );
 }
 fileProcessor.copy( metadata.getFile(), dstFile );
 }

http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/da8bb35e/maven-resolver-test-util/src/main/java/org/eclipse/aether/internal/test/util/DependencyGraphParser.java
--
diff --git 
a/maven-resolver-test-util/src/main/java/org/eclipse/aether/internal/test/util/DependencyGraphParser.java

svn commit: r1768595 - in /maven/plugins/trunk/maven-assembly-plugin/src/site: apt/ apt/examples/multimodule/ fml/

2016-11-07 Thread andham 
Author: andham
Date: Mon Nov  7 22:04:40 2016
New Revision: 1768595

URL: http://svn.apache.org/viewvc?rev=1768595=rev
Log:
[MASSEMBLY-794] more updates to site docs for 3.0.0 release

Modified:

maven/plugins/trunk/maven-assembly-plugin/src/site/apt/advanced-descriptor-topics.apt.vm

maven/plugins/trunk/maven-assembly-plugin/src/site/apt/advanced-module-set-topics.apt.vm

maven/plugins/trunk/maven-assembly-plugin/src/site/apt/descriptor-refs.apt.vm

maven/plugins/trunk/maven-assembly-plugin/src/site/apt/examples/multimodule/module-binary-inclusion-simple.apt.vm
maven/plugins/trunk/maven-assembly-plugin/src/site/apt/usage.apt.vm
maven/plugins/trunk/maven-assembly-plugin/src/site/fml/faq.fml

Modified: 
maven/plugins/trunk/maven-assembly-plugin/src/site/apt/advanced-descriptor-topics.apt.vm
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/site/apt/advanced-descriptor-topics.apt.vm?rev=1768595=1768594=1768595=diff
==
--- 
maven/plugins/trunk/maven-assembly-plugin/src/site/apt/advanced-descriptor-topics.apt.vm
 (original)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/site/apt/advanced-descriptor-topics.apt.vm
 Mon Nov  7 22:04:40 2016
@@ -205,8 +205,6 @@ Advanced Assembly-Descriptor Topics
 
 * Using Regular Expressions to Exclude Files
 
-  <>
-
   Sometimes, you may find you need to specify an extremely fine-grained 
inclusion or
   exclusion pattern for a <<>>. In these cases, you have the option 
of specifying
   your pattern in the form of a regular expression by using the 
<<<%regex[...]>>> syntax.

Modified: 
maven/plugins/trunk/maven-assembly-plugin/src/site/apt/advanced-module-set-topics.apt.vm
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/site/apt/advanced-module-set-topics.apt.vm?rev=1768595=1768594=1768595=diff
==
--- 
maven/plugins/trunk/maven-assembly-plugin/src/site/apt/advanced-module-set-topics.apt.vm
 (original)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/site/apt/advanced-module-set-topics.apt.vm
 Mon Nov  7 22:04:40 2016
@@ -37,7 +37,7 @@ Advanced Module-Set Topics
 
 * Including and Excluding Modules using a ModuleSet
 
-  As you are no doubt aware, Maven 2.0 introduces advanced handling of
+  As you are no doubt aware, Maven introduces advanced handling of
   multimodule builds. These are builds which contain multiple, often
   interrelated projects. In these builds, project hierarchy is established
   through use of the <<>> section of the POM, where parent POMs 
specify

Modified: 
maven/plugins/trunk/maven-assembly-plugin/src/site/apt/descriptor-refs.apt.vm
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/site/apt/descriptor-refs.apt.vm?rev=1768595=1768594=1768595=diff
==
--- 
maven/plugins/trunk/maven-assembly-plugin/src/site/apt/descriptor-refs.apt.vm 
(original)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/site/apt/descriptor-refs.apt.vm 
Mon Nov  7 22:04:40 2016
@@ -30,9 +30,8 @@
 
 Pre-defined Descriptor Files
 
-  As of version 2.2, there are four predefined descriptor formats available
-  for reuse, packaged within the Assembly Plugin, instead of the original 
three.
-  Their descriptorIds are:
+  There are four predefined descriptor formats available for reuse, packaged
+  within the Assembly Plugin. Their descriptorIds are:
   
 %{toc|fromDepth=2|toDepth=2}
 
@@ -81,8 +80,6 @@ Pre-defined Descriptor Files
 
 * project
 
-  (Since 2.2)
-
   Using the <<>> <<<\> directory. The resulting

Modified: 
maven/plugins/trunk/maven-assembly-plugin/src/site/apt/examples/multimodule/module-binary-inclusion-simple.apt.vm
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/site/apt/examples/multimodule/module-binary-inclusion-simple.apt.vm?rev=1768595=1768594=1768595=diff
==
--- 
maven/plugins/trunk/maven-assembly-plugin/src/site/apt/examples/multimodule/module-binary-inclusion-simple.apt.vm
 (original)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/site/apt/examples/multimodule/module-binary-inclusion-simple.apt.vm
 Mon Nov  7 22:04:40 2016
@@ -35,7 +35,7 @@ Including Module Binaries
   sorts and executes project builds within a multimodule context. Please
   read {{{../../faq.html#module-binaries}this FAQ entry}} if you decide to use 
them.
   
-  <> The new (since 2.2) <<>> flag in the 
<<>> section
+  <> The new <<>> flag in the <<>> 
section
   allows you to consume module binaries from child modules in a multimodule 
build. This
   is an important to

[1/2] maven-resolver git commit: Small exception message alignments

2016-11-07 Thread michaelo 
Repository: maven-resolver
Updated Branches:
  refs/heads/master 839840590 -> c5aaff390


Small exception message alignments


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

Branch: refs/heads/master
Commit: cb775bb05b78ecb9710ad8f57e1960b9885ccc5f
Parents: 8398405
Author: Michael Osipov 
Authored: Mon Nov 7 22:44:01 2016 +0100
Committer: Michael Osipov 
Committed: Mon Nov 7 22:44:01 2016 +0100

--
 .../java/org/eclipse/aether/transport/file/FileTransporter.java| 2 +-
 .../aether/internal/transport/wagon/PlexusWagonConfigurator.java   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/cb775bb0/maven-resolver-transport-file/src/main/java/org/eclipse/aether/transport/file/FileTransporter.java
--
diff --git 
a/maven-resolver-transport-file/src/main/java/org/eclipse/aether/transport/file/FileTransporter.java
 
b/maven-resolver-transport-file/src/main/java/org/eclipse/aether/transport/file/FileTransporter.java
index 5c5cfa4..02286c8 100644
--- 
a/maven-resolver-transport-file/src/main/java/org/eclipse/aether/transport/file/FileTransporter.java
+++ 
b/maven-resolver-transport-file/src/main/java/org/eclipse/aether/transport/file/FileTransporter.java
@@ -109,7 +109,7 @@ final class FileTransporter
 String path = task.getLocation().getPath();
 if ( path.contains( "../" ) )
 {
-throw new IllegalArgumentException( "Illegal resource path: " + 
path );
+throw new IllegalArgumentException( "illegal resource path: " + 
path );
 }
 File file = new File( basedir, path );
 if ( required && !file.exists() )

http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/cb775bb0/maven-resolver-transport-wagon/src/main/java/org/eclipse/aether/internal/transport/wagon/PlexusWagonConfigurator.java
--
diff --git 
a/maven-resolver-transport-wagon/src/main/java/org/eclipse/aether/internal/transport/wagon/PlexusWagonConfigurator.java
 
b/maven-resolver-transport-wagon/src/main/java/org/eclipse/aether/internal/transport/wagon/PlexusWagonConfigurator.java
index 119bf94..94647c7 100644
--- 
a/maven-resolver-transport-wagon/src/main/java/org/eclipse/aether/internal/transport/wagon/PlexusWagonConfigurator.java
+++ 
b/maven-resolver-transport-wagon/src/main/java/org/eclipse/aether/internal/transport/wagon/PlexusWagonConfigurator.java
@@ -86,7 +86,7 @@ public class PlexusWagonConfigurator
 }
 else
 {
-throw new IllegalArgumentException( "Unexpected configuration 
type: " + configuration.getClass().getName() );
+throw new IllegalArgumentException( "unexpected configuration 
type: " + configuration.getClass().getName() );
 }
 
 WagonComponentConfigurator configurator = new 
WagonComponentConfigurator();

[2/2] maven-resolver git commit: Even more Checkstyle fixes

2016-11-07 Thread michaelo 
Even more Checkstyle fixes


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

Branch: refs/heads/master
Commit: c5aaff3900887c5f729633595e257bf1e643a98d
Parents: cb775bb
Author: Michael Osipov 
Authored: Mon Nov 7 23:03:18 2016 +0100
Committer: Michael Osipov 
Committed: Mon Nov 7 23:03:18 2016 +0100

--
 .../basic/BasicRepositoryConnectorFactory.java|  4 ++--
 .../aether/internal/impl/DefaultRepositorySystem.java | 14 +++---
 .../internal/test/util/TestVersionConstraint.java |  4 ++--
 .../transport/wagon/PlexusWagonConfigurator.java  |  4 ++--
 .../internal/transport/wagon/PlexusWagonProvider.java |  4 ++--
 .../util/concurrency/RunnableErrorForwarder.java  |  4 ++--
 .../graph/visitor/FilteringDependencyVisitor.java |  4 ++--
 .../ConservativeAuthenticationSelector.java   |  4 ++--
 .../util/repository/ConservativeProxySelector.java|  4 ++--
 .../aether/util/version/GenericVersionConstraint.java |  4 ++--
 10 files changed, 25 insertions(+), 25 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/c5aaff39/maven-resolver-connector-basic/src/main/java/org/eclipse/aether/connector/basic/BasicRepositoryConnectorFactory.java
--
diff --git 
a/maven-resolver-connector-basic/src/main/java/org/eclipse/aether/connector/basic/BasicRepositoryConnectorFactory.java
 
b/maven-resolver-connector-basic/src/main/java/org/eclipse/aether/connector/basic/BasicRepositoryConnectorFactory.java
index f308d0c..006e4f5 100644
--- 
a/maven-resolver-connector-basic/src/main/java/org/eclipse/aether/connector/basic/BasicRepositoryConnectorFactory.java
+++ 
b/maven-resolver-connector-basic/src/main/java/org/eclipse/aether/connector/basic/BasicRepositoryConnectorFactory.java
@@ -1,7 +1,5 @@
 package org.eclipse.aether.connector.basic;
 
-import java.util.Objects;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -24,6 +22,8 @@ import java.util.Objects;
 import javax.inject.Inject;
 import javax.inject.Named;
 
+import java.util.Objects;
+
 import org.eclipse.aether.RepositorySystemSession;
 import org.eclipse.aether.repository.RemoteRepository;
 import org.eclipse.aether.spi.connector.RepositoryConnector;

http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/c5aaff39/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultRepositorySystem.java
--
diff --git 
a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultRepositorySystem.java
 
b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultRepositorySystem.java
index 9a321d9..777d149 100644
--- 
a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultRepositorySystem.java
+++ 
b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultRepositorySystem.java
@@ -429,13 +429,13 @@ public class DefaultRepositorySystem
 private void validateSession( RepositorySystemSession session )
 {
 Objects.requireNonNull( session, "repository system session cannot be 
null" );
-invalidSession(session.getLocalRepositoryManager(), "local repository 
manager" );
-invalidSession(session.getSystemProperties(), "system properties" );
-invalidSession(session.getConfigProperties(), "config properties" );
-invalidSession(session.getMirrorSelector(), "mirror selector" );
-invalidSession(session.getProxySelector(), "proxy selector" );
-invalidSession(session.getAuthenticationSelector(), "authentication 
selector" );
-invalidSession(session.getArtifactTypeRegistry(), "artifact type 
registry" );
+invalidSession( session.getLocalRepositoryManager(), "local repository 
manager" );
+invalidSession( session.getSystemProperties(), "system properties" );
+invalidSession( session.getConfigProperties(), "config properties" );
+invalidSession( session.getMirrorSelector(), "mirror selector" );
+invalidSession( session.getProxySelector(), "proxy selector" );
+invalidSession( session.getAuthenticationSelector(), "authentication 
selector" );
+invalidSession( session.getArtifactTypeRegistry(), "artifact type 
registry" );
 }
 
 private void invalidSession( Object obj, String name )

svn commit: r1768594 - /maven/plugins/trunk/maven-assembly-plugin/src/site/apt/advanced-module-set-topics.apt.vm

2016-11-07 Thread andham 
Author: andham
Date: Mon Nov  7 21:58:40 2016
New Revision: 1768594

URL: http://svn.apache.org/viewvc?rev=1768594=rev
Log:
Fixed some site formatting errors

Modified:

maven/plugins/trunk/maven-assembly-plugin/src/site/apt/advanced-module-set-topics.apt.vm

Modified: 
maven/plugins/trunk/maven-assembly-plugin/src/site/apt/advanced-module-set-topics.apt.vm
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/site/apt/advanced-module-set-topics.apt.vm?rev=1768594=1768593=1768594=diff
==
--- 
maven/plugins/trunk/maven-assembly-plugin/src/site/apt/advanced-module-set-topics.apt.vm
 (original)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/site/apt/advanced-module-set-topics.apt.vm
 Mon Nov  7 21:58:40 2016
@@ -128,9 +128,9 @@ ${module.groupId}-${module.artifactId}-$
   Will result in a file called <<>> being created
   within the assembly.
 
-  >> is mapped to the file 
extension
-  supplied by the ArtifactHandler for the type <<>>. It's important to
-  remember that the file extension <>.>
+   <<<$\{module.extension\}>>>  <<>>.  <><.>
 
 * {Including Module Sources}
 
@@ -362,7 +362,7 @@ ${module.groupId}-${module.artifactId}-$
 
 * {Including Module Binaries}
 
-  *WARNING!* Using the <<>> section of a <<>> definition
+  <> Using the <<>> section of a <<>> definition
   involves some tricky considerations that are a result of the way Maven
   sorts and executes project builds within a multimodule context. Please
   read {{{./faq.html#module-binaries}this FAQ entry}} if you decide to use 
them.
@@ -494,7 +494,7 @@ ${module.groupId}-${module.artifactId}-$
 
 ---
 
-  >> section still accommodates direct 
<<<\>>>
-  and <<<\>>> subsections, for specifying which module-dependencies
+   <<>>  
<<<\>>>
+   <<<\>>>

maven-resolver git commit: Rearrange imports to satisfy Checkstyle

2016-11-07 Thread michaelo 
Repository: maven-resolver
Updated Branches:
  refs/heads/master 6bb2207a7 -> 839840590


Rearrange imports to satisfy Checkstyle


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

Branch: refs/heads/master
Commit: 8398405906f1b8688ff6c5c58eea632310599c18
Parents: 6bb2207
Author: Michael Osipov 
Authored: Mon Nov 7 22:26:17 2016 +0100
Committer: Michael Osipov 
Committed: Mon Nov 7 22:26:17 2016 +0100

--
 .../src/main/java/org/eclipse/aether/DefaultSessionData.java | 4 ++--
 .../main/java/org/eclipse/aether/resolution/MetadataResult.java  | 4 ++--
 .../src/main/java/org/eclipse/aether/version/VersionRange.java   | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/83984059/maven-resolver-api/src/main/java/org/eclipse/aether/DefaultSessionData.java
--
diff --git 
a/maven-resolver-api/src/main/java/org/eclipse/aether/DefaultSessionData.java 
b/maven-resolver-api/src/main/java/org/eclipse/aether/DefaultSessionData.java
index 4e44166..db295a5 100644
--- 
a/maven-resolver-api/src/main/java/org/eclipse/aether/DefaultSessionData.java
+++ 
b/maven-resolver-api/src/main/java/org/eclipse/aether/DefaultSessionData.java
@@ -1,7 +1,5 @@
 package org.eclipse.aether;
 
-import java.util.Objects;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -21,6 +19,8 @@ import java.util.Objects;
  * under the License.
  */
 
+import java.util.Objects;
+
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 

http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/83984059/maven-resolver-api/src/main/java/org/eclipse/aether/resolution/MetadataResult.java
--
diff --git 
a/maven-resolver-api/src/main/java/org/eclipse/aether/resolution/MetadataResult.java
 
b/maven-resolver-api/src/main/java/org/eclipse/aether/resolution/MetadataResult.java
index 713eab2..07c3ea9 100644
--- 
a/maven-resolver-api/src/main/java/org/eclipse/aether/resolution/MetadataResult.java
+++ 
b/maven-resolver-api/src/main/java/org/eclipse/aether/resolution/MetadataResult.java
@@ -1,7 +1,5 @@
 package org.eclipse.aether.resolution;
 
-import java.util.Objects;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -21,6 +19,8 @@ import java.util.Objects;
  * under the License.
  */
 
+import java.util.Objects;
+
 import org.eclipse.aether.RepositorySystem;
 import org.eclipse.aether.RepositorySystemSession;
 import org.eclipse.aether.metadata.Metadata;

http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/83984059/maven-resolver-api/src/main/java/org/eclipse/aether/version/VersionRange.java
--
diff --git 
a/maven-resolver-api/src/main/java/org/eclipse/aether/version/VersionRange.java 
b/maven-resolver-api/src/main/java/org/eclipse/aether/version/VersionRange.java
index c747eeb..54a7d27 100644
--- 
a/maven-resolver-api/src/main/java/org/eclipse/aether/version/VersionRange.java
+++ 
b/maven-resolver-api/src/main/java/org/eclipse/aether/version/VersionRange.java
@@ -1,7 +1,5 @@
 package org.eclipse.aether.version;
 
-import java.util.Objects;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -21,6 +19,8 @@ import java.util.Objects;
  * under the License.
  */
 
+import java.util.Objects;
+
 /**
  * A range of versions.
  */

maven-resolver git commit: Remove unused imports

2016-11-07 Thread michaelo 
Repository: maven-resolver
Updated Branches:
  refs/heads/master f4a0ce151 -> 6bb2207a7


Remove unused imports


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

Branch: refs/heads/master
Commit: 6bb2207a7bc4e8fd253586d4ae580dfbc911cab7
Parents: f4a0ce1
Author: Michael Osipov 
Authored: Mon Nov 7 22:10:55 2016 +0100
Committer: Michael Osipov 
Committed: Mon Nov 7 22:10:55 2016 +0100

--
 .../org/eclipse/aether/connector/basic/ChecksumCalculatorTest.java  | 1 -
 .../main/java/org/eclipse/aether/internal/impl/SimpleDigest.java| 1 -
 .../java/org/eclipse/aether/spi/connector/transport/GetTask.java| 1 -
 .../java/org/eclipse/aether/spi/connector/transport/PutTask.java| 1 -
 4 files changed, 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/6bb2207a/maven-resolver-connector-basic/src/test/java/org/eclipse/aether/connector/basic/ChecksumCalculatorTest.java
--
diff --git 
a/maven-resolver-connector-basic/src/test/java/org/eclipse/aether/connector/basic/ChecksumCalculatorTest.java
 
b/maven-resolver-connector-basic/src/test/java/org/eclipse/aether/connector/basic/ChecksumCalculatorTest.java
index 616eb1d..993f94d 100644
--- 
a/maven-resolver-connector-basic/src/test/java/org/eclipse/aether/connector/basic/ChecksumCalculatorTest.java
+++ 
b/maven-resolver-connector-basic/src/test/java/org/eclipse/aether/connector/basic/ChecksumCalculatorTest.java
@@ -23,7 +23,6 @@ import static org.junit.Assert.*;
 
 import java.io.File;
 import java.io.IOException;
-import java.io.UnsupportedEncodingException;
 import java.net.URI;
 import java.nio.ByteBuffer;
 import java.nio.charset.StandardCharsets;

http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/6bb2207a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/SimpleDigest.java
--
diff --git 
a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/SimpleDigest.java
 
b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/SimpleDigest.java
index d948ac3..9d3d234 100644
--- 
a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/SimpleDigest.java
+++ 
b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/SimpleDigest.java
@@ -19,7 +19,6 @@ package org.eclipse.aether.internal.impl;
  * under the License.
  */
 
-import java.io.UnsupportedEncodingException;
 import java.nio.charset.StandardCharsets;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;

http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/6bb2207a/maven-resolver-spi/src/main/java/org/eclipse/aether/spi/connector/transport/GetTask.java
--
diff --git 
a/maven-resolver-spi/src/main/java/org/eclipse/aether/spi/connector/transport/GetTask.java
 
b/maven-resolver-spi/src/main/java/org/eclipse/aether/spi/connector/transport/GetTask.java
index cef6712..dd9c867 100644
--- 
a/maven-resolver-spi/src/main/java/org/eclipse/aether/spi/connector/transport/GetTask.java
+++ 
b/maven-resolver-spi/src/main/java/org/eclipse/aether/spi/connector/transport/GetTask.java
@@ -24,7 +24,6 @@ import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
-import java.io.UnsupportedEncodingException;
 import java.net.URI;
 import java.nio.charset.StandardCharsets;
 import java.util.Collections;

http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/6bb2207a/maven-resolver-spi/src/main/java/org/eclipse/aether/spi/connector/transport/PutTask.java
--
diff --git 
a/maven-resolver-spi/src/main/java/org/eclipse/aether/spi/connector/transport/PutTask.java
 
b/maven-resolver-spi/src/main/java/org/eclipse/aether/spi/connector/transport/PutTask.java
index a8416fa..1c30e07 100644
--- 
a/maven-resolver-spi/src/main/java/org/eclipse/aether/spi/connector/transport/PutTask.java
+++ 
b/maven-resolver-spi/src/main/java/org/eclipse/aether/spi/connector/transport/PutTask.java
@@ -24,7 +24,6 @@ import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.UnsupportedEncodingException;
 import java.net.URI;
 import java.nio.charset.StandardCharsets;

[2/2] maven-resolver git commit: [MRESOLVER-4] Use java.util.Objects#requireNonNull to intercept invalid input

2016-11-07 Thread michaelo 
[MRESOLVER-4] Use java.util.Objects#requireNonNull to intercept invalid input


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

Branch: refs/heads/master
Commit: f4a0ce151c3c3d7962e368567e4d7a1bffefcca4
Parents: 03d5748
Author: Michael Osipov 
Authored: Mon Nov 7 22:06:19 2016 +0100
Committer: Michael Osipov 
Committed: Mon Nov 7 22:06:19 2016 +0100

--
 .../aether/DefaultRepositorySystemSession.java  |   8 +-
 .../org/eclipse/aether/DefaultSessionData.java  |  17 +--
 .../org/eclipse/aether/RepositoryEvent.java |  17 +--
 .../aether/artifact/DefaultArtifactType.java|  13 +-
 .../aether/collection/CollectResult.java|  11 +-
 .../eclipse/aether/deployment/DeployResult.java |  11 +-
 .../aether/graph/DefaultDependencyNode.java |   6 +-
 .../org/eclipse/aether/graph/Dependency.java|   7 +-
 .../aether/installation/InstallResult.java  |  11 +-
 .../aether/metadata/DefaultMetadata.java|   7 +-
 .../repository/AuthenticationContext.java   |  21 ++--
 .../aether/repository/LocalArtifactResult.java  |  13 +-
 .../aether/repository/LocalMetadataResult.java  |  13 +-
 .../aether/repository/RemoteRepository.java |  11 +-
 .../resolution/ArtifactDescriptorResult.java|   9 +-
 .../aether/resolution/ArtifactResult.java   |  11 +-
 .../aether/resolution/DependencyResult.java |   9 +-
 .../aether/resolution/MetadataResult.java   |  12 +-
 .../aether/resolution/VersionRangeResult.java   |   9 +-
 .../aether/resolution/VersionResult.java|  11 +-
 .../eclipse/aether/transfer/TransferEvent.java  |  41 ++-
 .../eclipse/aether/version/VersionRange.java|  12 +-
 .../repository/RemoteRepositoryBuilderTest.java |   2 +-
 .../basic/BasicRepositoryConnector.java |  13 +-
 .../basic/BasicRepositoryConnectorFactory.java  |  34 ++
 .../aether/impl/DefaultServiceLocator.java  |  25 +---
 .../internal/impl/DefaultArtifactResolver.java  |  49 ++--
 .../impl/DefaultDependencyCollector.java|  19 +--
 ...ultDependencyGraphTransformationContext.java |  12 +-
 .../aether/internal/impl/DefaultDeployer.java   |  49 ++--
 .../aether/internal/impl/DefaultInstaller.java  |  25 +---
 .../impl/DefaultLocalRepositoryProvider.java|   7 +-
 .../internal/impl/DefaultMetadataResolver.java  |  37 ++
 .../impl/DefaultRemoteRepositoryManager.java|  13 +-
 .../DefaultRepositoryConnectorProvider.java |  12 +-
 .../impl/DefaultRepositoryEventDispatcher.java  |   7 +-
 .../impl/DefaultRepositoryLayoutProvider.java   |  12 +-
 .../internal/impl/DefaultRepositorySystem.java  | 121 ---
 .../impl/DefaultTransporterProvider.java|  12 +-
 .../impl/DefaultUpdateCheckManager.java |  19 +--
 .../impl/EnhancedLocalRepositoryManager.java|   7 +-
 .../impl/SimpleLocalRepositoryManager.java  |   6 +-
 .../impl/DefaultDependencyCollectorTest.java|   4 +-
 .../impl/DefaultUpdateCheckManagerTest.java |   2 +-
 .../spi/connector/layout/RepositoryLayout.java  |  11 +-
 .../spi/connector/transport/TransportTask.java  |  11 +-
 .../test/util/DependencyGraphParser.java|   2 +-
 ...estDependencyGraphTransformationContext.java |  12 +-
 .../test/util/TestVersionConstraint.java|  18 +--
 .../wagon/PlexusWagonConfigurator.java  |  10 +-
 .../transport/wagon/PlexusWagonProvider.java|  10 +-
 .../util/artifact/DelegatingArtifact.java   |  11 +-
 .../aether/util/artifact/SubArtifact.java   |   7 +-
 .../concurrency/RunnableErrorForwarder.java |   9 +-
 .../aether/util/filter/NotDependencyFilter.java |   9 +-
 .../graph/transformer/ConflictResolver.java |  25 +---
 .../visitor/FilteringDependencyVisitor.java |  10 +-
 .../graph/visitor/TreeDependencyVisitor.java|   9 +-
 .../repository/ComponentAuthentication.java |   7 +-
 .../ConservativeAuthenticationSelector.java |  10 +-
 .../repository/ConservativeProxySelector.java   |  10 +-
 .../util/repository/DefaultProxySelector.java   |   7 +-
 .../util/repository/SecretAuthentication.java   |   7 +-
 .../util/repository/StringAuthentication.java   |   7 +-
 .../util/version/GenericVersionConstraint.java  |  18 +--
 .../aether/util/artifact/SubArtifactTest.java   |   2 +-
 .../transformer/JavaScopeSelectorTest.java  |   4 +-
 67 files changed, 290 insertions(+), 703 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/f4a0ce15/maven-resolver-api/src/main/java/org/eclipse/aether/DefaultRepositorySystemSession.java

[1/2] maven-resolver git commit: [MRESOLVER-4] Use java.util.Objects#requireNonNull to intercept invalid input

2016-11-07 Thread michaelo 
Repository: maven-resolver
Updated Branches:
  refs/heads/master 03d574822 -> f4a0ce151


http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/f4a0ce15/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultRepositorySystem.java
--
diff --git 
a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultRepositorySystem.java
 
b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultRepositorySystem.java
index b2c453c..9a321d9 100644
--- 
a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultRepositorySystem.java
+++ 
b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultRepositorySystem.java
@@ -22,6 +22,7 @@ package org.eclipse.aether.internal.impl;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
+import java.util.Objects;
 
 import javax.inject.Inject;
 import javax.inject.Named;
@@ -166,111 +167,67 @@ public class DefaultRepositorySystem
 
 public DefaultRepositorySystem setVersionResolver( VersionResolver 
versionResolver )
 {
-if ( versionResolver == null )
-{
-throw new IllegalArgumentException( "version resolver has not been 
specified" );
-}
-this.versionResolver = versionResolver;
+this.versionResolver = Objects.requireNonNull( versionResolver, 
"version resolver cannot be null" );
 return this;
 }
 
 public DefaultRepositorySystem setVersionRangeResolver( 
VersionRangeResolver versionRangeResolver )
 {
-if ( versionRangeResolver == null )
-{
-throw new IllegalArgumentException( "version range resolver has 
not been specified" );
-}
-this.versionRangeResolver = versionRangeResolver;
+this.versionRangeResolver = Objects.requireNonNull( 
versionRangeResolver, "version range resolver cannot be null" );
 return this;
 }
 
 public DefaultRepositorySystem setArtifactResolver( ArtifactResolver 
artifactResolver )
 {
-if ( artifactResolver == null )
-{
-throw new IllegalArgumentException( "artifact resolver has not 
been specified" );
-}
-this.artifactResolver = artifactResolver;
+this.artifactResolver = Objects.requireNonNull( artifactResolver, 
"artifact resolver cannot be null" );
 return this;
 }
 
 public DefaultRepositorySystem setMetadataResolver( MetadataResolver 
metadataResolver )
 {
-if ( metadataResolver == null )
-{
-throw new IllegalArgumentException( "metadata resolver has not 
been specified" );
-}
-this.metadataResolver = metadataResolver;
+this.metadataResolver = Objects.requireNonNull( metadataResolver, 
"metadata resolver cannot be null" );
 return this;
 }
 
 public DefaultRepositorySystem setArtifactDescriptorReader( 
ArtifactDescriptorReader artifactDescriptorReader )
 {
-if ( artifactDescriptorReader == null )
-{
-throw new IllegalArgumentException( "artifact descriptor reader 
has not been specified" );
-}
-this.artifactDescriptorReader = artifactDescriptorReader;
+this.artifactDescriptorReader = Objects.requireNonNull( 
artifactDescriptorReader, "artifact descriptor reader cannot be null" );
 return this;
 }
 
 public DefaultRepositorySystem setDependencyCollector( DependencyCollector 
dependencyCollector )
 {
-if ( dependencyCollector == null )
-{
-throw new IllegalArgumentException( "dependency collector has not 
been specified" );
-}
-this.dependencyCollector = dependencyCollector;
+this.dependencyCollector = Objects.requireNonNull( 
dependencyCollector, "dependency collector cannot be null" );
 return this;
 }
 
 public DefaultRepositorySystem setInstaller( Installer installer )
 {
-if ( installer == null )
-{
-throw new IllegalArgumentException( "installer has not been 
specified" );
-}
-this.installer = installer;
+this.installer = Objects.requireNonNull( installer, "installer cannot 
be null" );
 return this;
 }
 
 public DefaultRepositorySystem setDeployer( Deployer deployer )
 {
-if ( deployer == null )
-{
-throw new IllegalArgumentException( "deployer has not been 
specified" );
-}
-this.deployer = deployer;
+this.deployer = Objects.requireNonNull( deployer, "deployer cannot be 
null" );
 return this;
 }
 
 public DefaultRepositorySystem setLocalRepositoryProvider( 
LocalRepositoryProvider localRepositoryProvider )
 {
-if ( localRepositoryProvider == null )
-{
-throw new IllegalArgumentException( "local repository provider has 
not been specified" );
-}
-