svn commit: r1749808 - /maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/PropertyUtils.java

2016-06-22 Thread schulte 
Author: schulte
Date: Thu Jun 23 03:20:32 2016
New Revision: 1749808

URL: http://svn.apache.org/viewvc?rev=1749808=rev
Log:
[MSHARED-564] Exceptions thrown on closing resources should not be suppressed 
silently.


Modified:

maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/PropertyUtils.java

Modified: 
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/PropertyUtils.java
URL: 
http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/PropertyUtils.java?rev=1749808=1749807=1749808=diff
==
--- 
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/PropertyUtils.java
 (original)
+++ 
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/PropertyUtils.java
 Thu Jun 23 03:20:32 2016
@@ -51,8 +51,8 @@ public class PropertyUtils
  * @return The loaded properties.
  *
  * @deprecated As of 3.1.0, please use method {@link 
#loadOptionalProperties(java.net.URL)}. This method should not
- * be used as it suppresses exceptions when loading properties fails and 
returns {@code null} instead of an empty
- * {@code Properties} instance when the given {@code URL} is {@code null}.
+ * be used as it suppresses exceptions silently when loading properties 
fails and returns {@code null} instead of an
+ * empty {@code Properties} instance when the given {@code URL} is {@code 
null}.
  */
 @Deprecated
 public static java.util.Properties loadProperties( @Nonnull URL url )
@@ -74,8 +74,8 @@ public class PropertyUtils
  * @return The loaded properties.
  *
  * @deprecated As of 3.1.0, please use method {@link 
#loadOptionalProperties(java.io.File)}. This method should not
- * be used as it suppresses exceptions when loading properties fails and 
returns {@code null} instead of an empty
- * {@code Properties} instance when the given {@code File} is {@code null}.
+ * be used as it suppresses exceptions silently when loading properties 
fails and returns {@code null} instead of an
+ * empty {@code Properties} instance when the given {@code File} is {@code 
null}.
  */
 @Deprecated
 public static Properties loadProperties( @Nonnull File file )
@@ -97,7 +97,7 @@ public class PropertyUtils
  * @return The loaded properties.
  *
  * @deprecated As of 3.1.0, please use method {@link 
#loadOptionalProperties(java.io.InputStream)}. This method
- * should not be used as it suppresses exceptions when loading properties 
fails.
+ * should not be used as it suppresses exceptions silently when loading 
properties fails.
  */
 @Deprecated
 public static Properties loadProperties( @Nullable InputStream is )
@@ -132,17 +132,18 @@ public class PropertyUtils
 
 /**
  * Loads {@code Properties} from a given {@code URL}.
+ * 
+ * If the given {@code URL} is not {@code null}, it is asserted to 
represent a valid and loadable properties
+ * resource.
+ * 
  *
  * @param url The {@code URL} of the properties resource to load or {@code 
null}.
  *
  * @return The loaded properties or an empty {@code Properties} instance 
if {@code url} is {@code null}.
  *
- * @throws IOException if loading properties fails.
- *
  * @since 3.1.0
  */
 @Nonnull public static Properties loadOptionalProperties( final @Nullable 
URL url )
-throws IOException
 {
 InputStream in = null;
 try
@@ -159,6 +160,10 @@ public class PropertyUtils
 
 return properties;
 }
+catch ( final IOException e )
+{
+throw new AssertionError( e );
+}
 finally
 {
 IOUtil.close( in );
@@ -167,17 +172,18 @@ public class PropertyUtils
 
 /**
  * Loads {@code Properties} from a given {@code File}.
+ * 
+ * If the given {@code File} is not {@code null}, it is asserted to 
represent a valid and loadable properties
+ * resource.
+ * 
  *
  * @param file The {@code File} of the properties resource to load or 
{@code null}.
  *
  * @return The loaded properties or an empty {@code Properties} instance 
if {@code file} is {@code null}.
  *
- * @throws IOException if loading properties fails.
- *
  * @since 3.1.0
  */
 @Nonnull public static Properties loadOptionalProperties( final @Nullable 
File file )
-throws IOException
 {
 InputStream in = null;
 try
@@ -194,6 +200,10 @@ public class PropertyUtils
 
 return properties;
 }
+catch ( final IOException e )
+{
+throw new AssertionError( e );
+}
 finally
 {
 IOUtil.close( in );
@@ -202,17 +212,18 @@ public class PropertyUtils
 
 /**
  * Loads

[4/4] maven git commit: [MNG-5761] Dependency management is not transitive.

2016-06-22 Thread schulte 
[MNG-5761] Dependency management is not transitive.


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

Branch: refs/heads/MNG-6006
Commit: a36e7e7e8b3b8332cb35519296413a2785cb77d5
Parents: 36ab263
Author: Christian Schulte 
Authored: Fri Jun 10 16:55:30 2016 +0200
Committer: Christian Schulte 
Committed: Thu Jun 23 02:55:08 2016 +0200

--
 .../maven/repository/internal/MavenRepositorySystemUtils.java| 4 ++--
 .../apache/maven/artifact/AbstractArtifactComponentTestCase.java | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/a36e7e7e/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/MavenRepositorySystemUtils.java
--
diff --git 
a/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/MavenRepositorySystemUtils.java
 
b/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/MavenRepositorySystemUtils.java
index 3a98b2a..b0b0a8d 100644
--- 
a/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/MavenRepositorySystemUtils.java
+++ 
b/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/MavenRepositorySystemUtils.java
@@ -33,7 +33,7 @@ import org.eclipse.aether.impl.MetadataGeneratorFactory;
 import org.eclipse.aether.impl.VersionRangeResolver;
 import org.eclipse.aether.impl.VersionResolver;
 import org.eclipse.aether.util.artifact.DefaultArtifactTypeRegistry;
-import org.eclipse.aether.util.graph.manager.ClassicDependencyManager;
+import org.eclipse.aether.util.graph.manager.TransitiveDependencyManager;
 import org.eclipse.aether.util.graph.selector.AndDependencySelector;
 import org.eclipse.aether.util.graph.selector.ExclusionDependencySelector;
 import org.eclipse.aether.util.graph.selector.OptionalDependencySelector;
@@ -95,7 +95,7 @@ public final class MavenRepositorySystemUtils
 DependencyTraverser depTraverser = new FatArtifactTraverser();
 session.setDependencyTraverser( depTraverser );
 
-DependencyManager depManager = new ClassicDependencyManager();
+DependencyManager depManager = new TransitiveDependencyManager();
 session.setDependencyManager( depManager );
 
 DependencySelector depFilter =

http://git-wip-us.apache.org/repos/asf/maven/blob/a36e7e7e/maven-compat/src/test/java/org/apache/maven/artifact/AbstractArtifactComponentTestCase.java
--
diff --git 
a/maven-compat/src/test/java/org/apache/maven/artifact/AbstractArtifactComponentTestCase.java
 
b/maven-compat/src/test/java/org/apache/maven/artifact/AbstractArtifactComponentTestCase.java
index 365acc4..73780c1 100644
--- 
a/maven-compat/src/test/java/org/apache/maven/artifact/AbstractArtifactComponentTestCase.java
+++ 
b/maven-compat/src/test/java/org/apache/maven/artifact/AbstractArtifactComponentTestCase.java
@@ -39,7 +39,7 @@ import org.eclipse.aether.collection.DependencySelector;
 import org.eclipse.aether.collection.DependencyTraverser;
 import org.eclipse.aether.internal.impl.SimpleLocalRepositoryManagerFactory;
 import org.eclipse.aether.repository.LocalRepository;
-import org.eclipse.aether.util.graph.manager.ClassicDependencyManager;
+import org.eclipse.aether.util.graph.manager.TransitiveDependencyManager;
 import org.eclipse.aether.util.graph.selector.AndDependencySelector;
 import org.eclipse.aether.util.graph.selector.ExclusionDependencySelector;
 import org.eclipse.aether.util.graph.selector.OptionalDependencySelector;
@@ -349,7 +349,7 @@ public abstract class AbstractArtifactComponentTestCase
 DependencyTraverser depTraverser = new FatArtifactTraverser();
 session.setDependencyTraverser( depTraverser );
 
-DependencyManager depManager = new ClassicDependencyManager();
+DependencyManager depManager = new TransitiveDependencyManager();
 session.setDependencyManager( depManager );
 
 DependencySelector depFilter = new AndDependencySelector( new 
ScopeDependencySelector( "test", "provided" ),

[2/4] maven git commit: [MNG-3507] ANSI Color logging for improved output visibility.

2016-06-22 Thread schulte 
[MNG-3507] ANSI Color logging for improved output visibility.

o Updated to add missing 'reset' calls.


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

Branch: refs/heads/MNG-6006
Commit: 521e07cfb053f802b478e4406ce19c89e954ad3c
Parents: 1b2451e
Author: Christian Schulte 
Authored: Thu Jun 23 02:28:09 2016 +0200
Committer: Christian Schulte 
Committed: Thu Jun 23 02:28:09 2016 +0200

--
 .../org/apache/maven/lifecycle/LifecycleExecutionException.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/521e07cf/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleExecutionException.java
--
diff --git 
a/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleExecutionException.java
 
b/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleExecutionException.java
index 5645abd..ef6fd1d 100644
--- 
a/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleExecutionException.java
+++ 
b/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleExecutionException.java
@@ -93,12 +93,12 @@ public class LifecycleExecutionException
 if ( project != null )
 {
 buffer.a( " on project " );
-buffer.project( project.getArtifactId() );
+buffer.project( project.getArtifactId() ).reset();
 }
 
 if ( cause != null )
 {
-buffer.a( ": " ).failure( cause.getMessage() );
+buffer.a( ": " ).failure( cause.getMessage() ).reset();
 }
 
 return buffer.toString();

[3/4] maven git commit: [MNG-6006] Import Aether to Maven codebase

2016-06-22 Thread schulte 
[MNG-6006] Import Aether to Maven codebase


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

Branch: refs/heads/MNG-6006
Commit: 36ab263a91bbf9d0d083e97fd44aca17f6286ffb
Parents: 521e07c
Author: Christian Schulte 
Authored: Fri Jun 10 16:50:33 2016 +0200
Committer: Christian Schulte 
Committed: Thu Jun 23 02:55:08 2016 +0200

--
 apache-maven/pom.xml  |  4 ++--
 maven-aether-provider/pom.xml | 12 ++--
 maven-compat/pom.xml  |  4 ++--
 maven-core/pom.xml|  6 +++---
 pom.xml   | 14 +++---
 5 files changed, 20 insertions(+), 20 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/36ab263a/apache-maven/pom.xml
--
diff --git a/apache-maven/pom.xml b/apache-maven/pom.xml
index 37751cc..3f8a05a 100644
--- a/apache-maven/pom.xml
+++ b/apache-maven/pom.xml
@@ -84,11 +84,11 @@ under the License.
   wagon-file
 
 
-  org.eclipse.aether
+  org.apache.maven.aether
   aether-connector-basic
 
 
-  org.eclipse.aether
+  org.apache.maven.aether
   aether-transport-wagon
 
 

http://git-wip-us.apache.org/repos/asf/maven/blob/36ab263a/maven-aether-provider/pom.xml
--
diff --git a/maven-aether-provider/pom.xml b/maven-aether-provider/pom.xml
index 4c36ebd..87119ea 100644
--- a/maven-aether-provider/pom.xml
+++ b/maven-aether-provider/pom.xml
@@ -47,19 +47,19 @@ under the License.
   maven-repository-metadata
 
 
-  org.eclipse.aether
+  org.apache.maven.aether
   aether-api
 
 
-  org.eclipse.aether
+  org.apache.maven.aether
   aether-spi
 
 
-  org.eclipse.aether
+  org.apache.maven.aether
   aether-util
 
 
-  org.eclipse.aether
+  org.apache.maven.aether
   aether-impl
 
 
@@ -92,12 +92,12 @@ under the License.
 
 
 
-  org.eclipse.aether
+  org.apache.maven.aether
   aether-connector-basic
   test
 
 
-  org.eclipse.aether
+  org.apache.maven.aether
   aether-transport-wagon
   test
 

http://git-wip-us.apache.org/repos/asf/maven/blob/36ab263a/maven-compat/pom.xml
--
diff --git a/maven-compat/pom.xml b/maven-compat/pom.xml
index f828d6e..6ca061e 100644
--- a/maven-compat/pom.xml
+++ b/maven-compat/pom.xml
@@ -85,12 +85,12 @@ under the License.
   test
 
 
-  org.eclipse.aether
+  org.apache.maven.aether
   aether-connector-basic
   test
 
 
-  org.eclipse.aether
+  org.apache.maven.aether
   aether-transport-wagon
   test
 

http://git-wip-us.apache.org/repos/asf/maven/blob/36ab263a/maven-core/pom.xml
--
diff --git a/maven-core/pom.xml b/maven-core/pom.xml
index f03eead..640758d 100644
--- a/maven-core/pom.xml
+++ b/maven-core/pom.xml
@@ -73,15 +73,15 @@ under the License.
   maven-aether-provider
 
 
-  org.eclipse.aether
+  org.apache.maven.aether
   aether-impl
 
 
-  org.eclipse.aether
+  org.apache.maven.aether
   aether-api
 
 
-  org.eclipse.aether
+  org.apache.maven.aether
   aether-util
 
 

http://git-wip-us.apache.org/repos/asf/maven/blob/36ab263a/pom.xml
--
diff --git a/pom.xml b/pom.xml
index e53a2ee..9c324d0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -64,7 +64,7 @@ under the License.
 1.7
 1.8.3
 1.3
-1.0.2.v20150114
+1.2.0-SNAPSHOT
 
 
 
@@ -328,32 +328,32 @@ under the License.
   
   
   
-org.eclipse.aether
+org.apache.maven.aether
 aether-api
 ${aetherVersion}
   
   
-org.eclipse.aether
+org.apache.maven.aether
 aether-spi
 ${aetherVersion}
   
   
-org.eclipse.aether
+org.apache.maven.aether
 aether-impl
 ${aetherVersion}
   
   
-org.eclipse.aether
+org.apache.maven.aether
 aether-util
 ${aetherVersion}
   
   
-org.eclipse.aether
+org.apache.maven.aether
 aether-connector-basic
 ${aetherVersion}
   
   
-org.eclipse.aether
+org.apache.maven.aether
 aether-transport-wagon
 ${aetherVersion}

[1/4] maven git commit: [MNG-6049] Add behavior to filter resolved version ranges of an artifact [Forced Update!]

2016-06-22 Thread schulte 
Repository: maven
Updated Branches:
  refs/heads/MNG-6006 7a5e8827b -> a36e7e7e8 (forced update)


[MNG-6049] Add behavior to filter resolved version ranges of an artifact

The DefaultVersionRangeResolver will be extended with a filter for
version range results.

This commit adds a new interface VersionRangeResultFilter and a
non-filtering DefaultVersionRangeResultFilter.

This closes #70


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

Branch: refs/heads/MNG-6006
Commit: 1b2451e7949dbb68df5bb973742d9a9a0e84f629
Parents: 4e7088f
Author: barthel 
Authored: Thu Apr 30 14:37:52 2015 +0200
Committer: Michael Osipov 
Committed: Wed Jun 22 21:36:09 2016 +0200

--
 maven-aether-provider/pom.xml   |   9 +-
 .../internal/DefaultVersionRangeResolver.java   |  31 +-
 .../DefaultVersionRangeResultFilter.java|  45 ++
 .../internal/VersionRangeResultFilter.java  |  45 ++
 .../DefaultVersionRangeResolverTest.java| 455 +++
 .../maven/its/mng-3092/maven-metadata.xml   | 104 +
 6 files changed, 680 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/1b2451e7/maven-aether-provider/pom.xml
--
diff --git a/maven-aether-provider/pom.xml b/maven-aether-provider/pom.xml
index 6306d4f..4c36ebd 100644
--- a/maven-aether-provider/pom.xml
+++ b/maven-aether-provider/pom.xml
@@ -71,6 +71,10 @@ under the License.
   plexus-utils
 
 
+  org.eclipse.sisu
+  org.eclipse.sisu.plexus
+
+
   com.google.inject
   guice
   no_aop
@@ -103,11 +107,6 @@ under the License.
   test
 
 
-  org.eclipse.sisu
-  org.eclipse.sisu.plexus
-  test
-
-
   org.mockito
   mockito-core
   1.10.19

http://git-wip-us.apache.org/repos/asf/maven/blob/1b2451e7/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionRangeResolver.java
--
diff --git 
a/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionRangeResolver.java
 
b/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionRangeResolver.java
index 43f5d3c..8e53c74 100644
--- 
a/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionRangeResolver.java
+++ 
b/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionRangeResolver.java
@@ -53,9 +53,11 @@ import 
org.eclipse.aether.version.InvalidVersionSpecificationException;
 import org.eclipse.aether.version.Version;
 import org.eclipse.aether.version.VersionConstraint;
 import org.eclipse.aether.version.VersionScheme;
+import org.eclipse.sisu.Nullable;
 
 import javax.inject.Inject;
 import javax.inject.Named;
+import javax.inject.Singleton;
 import java.io.FileInputStream;
 import java.io.InputStream;
 import java.util.ArrayList;
@@ -68,7 +70,8 @@ import java.util.Map;
  * @author Benjamin Bentmann
  */
 @Named
-@Component( role = VersionRangeResolver.class )
+@Singleton
+@Component( role = VersionRangeResolver.class, hint = "default" )
 public class DefaultVersionRangeResolver
 implements VersionRangeResolver, Service
 {
@@ -88,6 +91,9 @@ public class DefaultVersionRangeResolver
 @Requirement
 private RepositoryEventDispatcher repositoryEventDispatcher;
 
+@Requirement( role = VersionRangeResultFilter.class, optional = true )
+private VersionRangeResultFilter versionRangeResultFilter = new 
DefaultVersionRangeResultFilter();
+
 public DefaultVersionRangeResolver()
 {
 // enable default constructor
@@ -95,12 +101,17 @@ public class DefaultVersionRangeResolver
 
 @Inject
 DefaultVersionRangeResolver( MetadataResolver metadataResolver, 
SyncContextFactory syncContextFactory,
- RepositoryEventDispatcher 
repositoryEventDispatcher, LoggerFactory loggerFactory )
+ RepositoryEventDispatcher 
repositoryEventDispatcher, LoggerFactory loggerFactory,
+ @Nullable VersionRangeResultFilter 
versionRangeResultFilter )
 {
 setMetadataResolver( metadataResolver );
 setSyncContextFactory( syncContextFactory );
 setLoggerFactory( loggerFactory );
 setRepositoryEventDispatcher( repositoryEventDispatcher );
+if ( versionRangeResultFilter != null )
+{
+setVersionRangeResultFilter( versionRangeResultFilter );
+}

svn commit: r1749804 - /maven/shared/trunk/maven-shared-utils/pom.xml

2016-06-22 Thread schulte 
Author: schulte
Date: Thu Jun 23 00:50:24 2016
New Revision: 1749804

URL: http://svn.apache.org/viewvc?rev=1749804=rev
Log:
[MSHARED-565] Upgrade of commons-io to 2.5.


Modified:
maven/shared/trunk/maven-shared-utils/pom.xml

Modified: maven/shared/trunk/maven-shared-utils/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils/pom.xml?rev=1749804=1749803=1749804=diff
==
--- maven/shared/trunk/maven-shared-utils/pom.xml (original)
+++ maven/shared/trunk/maven-shared-utils/pom.xml Thu Jun 23 00:50:24 2016
@@ -76,7 +76,7 @@
 
   commons-io
   commons-io
-  2.4
+  2.5
 
 
   org.apache.commons

svn commit: r1749803 - /maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/PropertyUtils.java

2016-06-22 Thread schulte 
Author: schulte
Date: Thu Jun 23 00:47:40 2016
New Revision: 1749803

URL: http://svn.apache.org/viewvc?rev=1749803=rev
Log:
[MSHARED-564] Exceptions thrown on closing resources should not be suppressed 
silently.


Modified:

maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/PropertyUtils.java

Modified: 
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/PropertyUtils.java
URL: 
http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/PropertyUtils.java?rev=1749803=1749802=1749803=diff
==
--- 
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/PropertyUtils.java
 (original)
+++ 
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/PropertyUtils.java
 Thu Jun 23 00:47:40 2016
@@ -75,7 +75,7 @@ public class PropertyUtils
  *
  * @deprecated As of 3.1.0, please use method {@link 
#loadOptionalProperties(java.io.File)}. This method should not
  * be used as it suppresses exceptions when loading properties fails and 
returns {@code null} instead of an empty
- * {@code Properties} instance when the given {@code URL} is {@code null}.
+ * {@code Properties} instance when the given {@code File} is {@code null}.
  */
 @Deprecated
 public static Properties loadProperties( @Nonnull File file )

svn commit: r1749802 - in /maven/shared/trunk/maven-shared-utils: ./ src/main/java/org/apache/maven/shared/utils/ src/main/java/org/apache/maven/shared/utils/io/ src/main/java/org/apache/maven/shared/

2016-06-22 Thread schulte 
Author: schulte
Date: Thu Jun 23 00:37:53 2016
New Revision: 1749802

URL: http://svn.apache.org/viewvc?rev=1749802=rev
Log:
[MSHARED-564] Exceptions thrown on closing resources should not be suppressed 
silently.


Modified:
maven/shared/trunk/maven-shared-utils/pom.xml

maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/Expand.java

maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/PropertyUtils.java

maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/io/FileUtils.java

maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/io/IOUtil.java

maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/xml/Xpp3DomBuilder.java

maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/PropertyUtilsTest.java

maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/io/FileUtilsTest.java

maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/testhelpers/FileTestHelper.java

Modified: maven/shared/trunk/maven-shared-utils/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils/pom.xml?rev=1749802=1749801=1749802=diff
==
--- maven/shared/trunk/maven-shared-utils/pom.xml (original)
+++ maven/shared/trunk/maven-shared-utils/pom.xml Thu Jun 23 00:37:53 2016
@@ -28,7 +28,7 @@
   
 
   maven-shared-utils
-  3.0.2-SNAPSHOT
+  3.1.0-SNAPSHOT
 
   Apache Maven Shared Utils
   Shared utils without any further dependencies

Modified: 
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/Expand.java
URL: 
http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/Expand.java?rev=1749802=1749801=1749802=diff
==
--- 
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/Expand.java
 (original)
+++ 
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/Expand.java
 Thu Jun 23 00:37:53 2016
@@ -24,10 +24,13 @@ import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.OutputStream;
 import java.util.Date;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipInputStream;
+
 import org.apache.maven.shared.utils.io.FileUtils;
+import org.apache.maven.shared.utils.io.IOUtil;
 
 /**
  * Expand will unpack the given zip archive.
@@ -123,31 +126,25 @@ class Expand
 destDir = new File( System.getProperty( "user.dir" ) );
 }
 
-FileInputStream fileInputStream = new FileInputStream( srcFile );
+ZipInputStream in = null;
 try
 {
-ZipInputStream zipInputStream = new ZipInputStream( 
fileInputStream );
-
-ZipEntry zipEntry;
+in = new ZipInputStream( new FileInputStream( srcFile ) );
 
-while ( ( zipEntry = zipInputStream.getNextEntry() ) != null )
+for ( ZipEntry zipEntry = in.getNextEntry(); zipEntry != null; 
zipEntry = in.getNextEntry() )
 {
 String zipEntryName = zipEntry.getName();
 Date zipEntryDate = new Date( zipEntry.getTime() );
 
-extractFile( source, destDir, zipInputStream, zipEntryName, 
zipEntryDate, zipEntry.isDirectory() );
+extractFile( source, destDir, in, zipEntryName, zipEntryDate, 
zipEntry.isDirectory() );
 }
+
+in.close();
+in = null;
 }
 finally
 {
-try
-{
-fileInputStream.close();
-}
-catch ( IOException ioe )
-{
-// no worries, all is ok ...
-}
+IOUtil.close( in );
 }
 }
 
@@ -191,25 +188,23 @@ class Expand
 else
 {
 byte[] buffer = new byte[BUFFER_SIZE];
-FileOutputStream fileOutputStream = new FileOutputStream( 
targetFile );
+OutputStream out = null;
 try
 {
+out = new FileOutputStream( targetFile );
+
 int len;
-while ( ( len = compressedInputStream.read( buffer ) ) > 0 
)
+while ( ( len = compressedInputStream.read( buffer ) ) >= 
0 )
 {
-fileOutputStream.write( buffer, 0, len );
+out.write( buffer, 0, len );
 }
+
+out.close();
+out = null;
 }
 finally
 {
-try
-{
-

svn commit: r1749800 - /maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/Expand.java

2016-06-22 Thread schulte 
Author: schulte
Date: Thu Jun 23 00:33:34 2016
New Revision: 1749800

URL: http://svn.apache.org/viewvc?rev=1749800=rev
Log:
[MSHARED-563] Directory traversal in org.apache.maven.shared.utils.Expand


Modified:

maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/Expand.java

Modified: 
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/Expand.java
URL: 
http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/Expand.java?rev=1749800=1749799=1749800=diff
==
--- 
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/Expand.java
 (original)
+++ 
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/Expand.java
 Thu Jun 23 00:33:34 2016
@@ -170,6 +170,11 @@ class Expand
 {
 File targetFile = new File( destDir, entryName );
 
+if ( !targetFile.getAbsolutePath().startsWith( 
destDir.getAbsolutePath() ) )
+{
+throw new IOException( "Entry '" + entryName + "' outside the 
target directory." );
+}
+
 // if overwrite is specified and the file type
 // of the existing file does not match, then delete it
 if ( overwrite && targetFile.exists() && targetFile.isDirectory() != 
isDirectory )

maven git commit: [MNG-3507] ANSI Color logging for improved output visibility.

2016-06-22 Thread schulte 
Repository: maven
Updated Branches:
  refs/heads/master 1b2451e79 -> 521e07cfb


[MNG-3507] ANSI Color logging for improved output visibility.

o Updated to add missing 'reset' calls.


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

Branch: refs/heads/master
Commit: 521e07cfb053f802b478e4406ce19c89e954ad3c
Parents: 1b2451e
Author: Christian Schulte 
Authored: Thu Jun 23 02:28:09 2016 +0200
Committer: Christian Schulte 
Committed: Thu Jun 23 02:28:09 2016 +0200

--
 .../org/apache/maven/lifecycle/LifecycleExecutionException.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/521e07cf/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleExecutionException.java
--
diff --git 
a/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleExecutionException.java
 
b/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleExecutionException.java
index 5645abd..ef6fd1d 100644
--- 
a/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleExecutionException.java
+++ 
b/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleExecutionException.java
@@ -93,12 +93,12 @@ public class LifecycleExecutionException
 if ( project != null )
 {
 buffer.a( " on project " );
-buffer.project( project.getArtifactId() );
+buffer.project( project.getArtifactId() ).reset();
 }
 
 if ( cause != null )
 {
-buffer.a( ": " ).failure( cause.getMessage() );
+buffer.a( ": " ).failure( cause.getMessage() ).reset();
 }
 
 return buffer.toString();

maven-integration-testing git commit: [MNG-5527] Dependency management import should support relocations.

2016-06-22 Thread schulte 
Repository: maven-integration-testing
Updated Branches:
  refs/heads/master a2777f151 -> 08d73855f


[MNG-5527] Dependency management import should support relocations.


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

Branch: refs/heads/master
Commit: 08d73855f3f43f8a2dcb5bdae9d72c3876c5ab7f
Parents: a2777f1
Author: Christian Schulte 
Authored: Wed Jun 22 23:52:48 2016 +0200
Committer: Christian Schulte 
Committed: Wed Jun 22 23:54:49 2016 +0200

--
 .../MavenITmng5527DependencyManagementImportRelocationsTest.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/08d73855/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5527DependencyManagementImportRelocationsTest.java
--
diff --git 
a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5527DependencyManagementImportRelocationsTest.java
 
b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5527DependencyManagementImportRelocationsTest.java
index 1ce7b8f..368f2e7 100644
--- 
a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5527DependencyManagementImportRelocationsTest.java
+++ 
b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5527DependencyManagementImportRelocationsTest.java
@@ -42,7 +42,7 @@ public class 
MavenITmng5527DependencyManagementImportRelocationsTest
 super( "[3.4,)" );
 }
 
-public void testCanExcludeDependenciesFromImport()
+public void testCanRelocateDependencyManagementImport()
 throws Exception
 {
 final File testDir = ResourceExtractor.simpleExtractResources( 
getClass(), "/mng-5527/relocations" );

svn commit: r14093 - /release/maven/plugins/

2016-06-22 Thread khmarbaise 
Author: khmarbaise
Date: Wed Jun 22 20:10:16 2016
New Revision: 14093

Log:
Added Maven Jar Plugin 3.0.2 / Maven Source Plugin 3.0.1

Added:
release/maven/plugins/maven-jar-plugin-3.0.2-source-release.zip   (with 
props)
release/maven/plugins/maven-jar-plugin-3.0.2-source-release.zip.asc
release/maven/plugins/maven-jar-plugin-3.0.2-source-release.zip.md5
release/maven/plugins/maven-source-plugin-3.0.1-source-release.zip   (with 
props)
release/maven/plugins/maven-source-plugin-3.0.1-source-release.zip.asc
release/maven/plugins/maven-source-plugin-3.0.1-source-release.zip.md5
Removed:
release/maven/plugins/maven-jar-plugin-3.0.1-source-release.zip
release/maven/plugins/maven-jar-plugin-3.0.1-source-release.zip.asc
release/maven/plugins/maven-jar-plugin-3.0.1-source-release.zip.md5
release/maven/plugins/maven-source-plugin-3.0.0-source-release.zip
release/maven/plugins/maven-source-plugin-3.0.0-source-release.zip.asc
release/maven/plugins/maven-source-plugin-3.0.0-source-release.zip.md5

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

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

Added: release/maven/plugins/maven-jar-plugin-3.0.2-source-release.zip.asc
==
--- release/maven/plugins/maven-jar-plugin-3.0.2-source-release.zip.asc (added)
+++ release/maven/plugins/maven-jar-plugin-3.0.2-source-release.zip.asc Wed Jun 
22 20:10:16 2016
@@ -0,0 +1,28 @@
+-BEGIN PGP SIGNATURE-
+Version: GnuPG/MacGPG2 v2.0.19 (Darwin)
+Comment: GPGTools - http://gpgtools.org
+
+iQQcBAABCgAGBQJXZVZ1AAoJEL8VGOAWB4iitkQf/jv5mundDLVIs6Jqcb951EuW
+aglNNr7f6hKRvi6yJcI5Ihc5Gf+DGzxARwYLqpvkT368Vfrzd/y4wsKAiJcDlKaO
+vrvICckSU10QKu2zECOebfDAHBNeqclmGgCEdJ+xI8gYsV81KwgKRQy08xzx6/WR
+pK9cDNU8AVULAVM4UzeUzXYHO4IFUoaxx+JnJqrxqXuD3AeUN8Z+xcfmptcUYj/r
+bvUOJxeKkOlN8MNnJ02aWegaMh5+NV4Fr6woYlL09gCZr/LXlGrZjWs0EbHBALnz
+CvhkrEuh+V2tuSlXlPRc+njVfjyHEwk+0W69toA8YlAuxPczH22lDIPuWtdy0Q28
+DrpFXYkOXn5XxzLH82Y2tL8MCUWcvcozuaPDhJjkppHztncUgGe2xble5fqObHkV
+DEtkC3O2n5kIM9PuAShRgpSgGK2nMNKBW3osnwfyQYrvzDl0OlAedO24xvHGHL+Q
+Xk6vHshUFe/JCRx6HV3o/SIE/tKwBpxcrQT6U3lsBoowFArOVqJeb+qxyy7vwtM9
+KP/vbtD0+ohQ9sYxYg77kao8/FtgXkS5jVDF6mFYG3ZFVr+KGTSfnIMdF3qEleT8
+h7zl8XQfagUOHT3nMGZ/WDDiPsO8pj8NC/XlsCKX1e4cbnm++UEIOpSU8GtSqeYz
+H9fg305rB8ARWwQF4a87G/2eTQwcNjN4Au2Vdv1nxEn+hLrTOohDDpIkT6ua9cR+
+B9L3XL6dFroN0h50SSQa1Zz73RoUSHPv/7ARwy5g1PZZrxElaqiz5hLTOdH+ksCB
+WZaLr55TyPm95hTxycwvEoq9n6xvWnT4cTvRKF3ijj/gebPs/jv8YA/dx4F6VA7+
+8ZjfVGxLs6qoK2TNQS1XP07ERXy/qs6R1kHoxh67WDwg3/9xlWHjQma/S9ucRcoQ
+5vLNYFtFhz5ViGGpOIrQFZV1njKAkZKxVQB3zkKPhuqOZiOfcMuvgO42GHj34bPn
+AyaJlxdR9Y+TZcOQ0CKStte0VHzzfQ8GSY4SaXTw6rjYg1frQkqfpt9KFfOP87j5
+IX0K5xHbgtfMt101QIqbCoXDLsg5OLTULNaMBnXz4TLZpWPmoOF+cAsivESXfLWf
+TATpolnxK1RkBCShf023iTETK1NpNxre9ru/u+Q4JYhoSDVsM7ZkMpMoLWTjuN0U
+nejYJqIVSSDi55zScKOQagd7d2+Ev1L64PbEiALa5rW5m+7wBZ1vhACnzObV2729
+XBb6qMUf+FphOjpQ7Ms7ZxcnYaJjILsIj7sSFD3V94ovouXi4JlZ9rCgXw5P4i00
+d/fdtySwNNJhRK6UCGatI1IVs2aqDTLnJPrRUm40ks1WDAfQqzVmvOekLkJvRx4=
+=QdmF
+-END PGP SIGNATURE-

Added: release/maven/plugins/maven-jar-plugin-3.0.2-source-release.zip.md5
==
--- release/maven/plugins/maven-jar-plugin-3.0.2-source-release.zip.md5 (added)
+++ release/maven/plugins/maven-jar-plugin-3.0.2-source-release.zip.md5 Wed Jun 
22 20:10:16 2016
@@ -0,0 +1 @@
+8243c4efd75ad84891e41fb951866d70
\ No newline at end of file

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

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

Added: release/maven/plugins/maven-source-plugin-3.0.1-source-release.zip.asc
==
--- release/maven/plugins/maven-source-plugin-3.0.1-source-release.zip.asc 
(added)
+++ release/maven/plugins/maven-source-plugin-3.0.1-source-release.zip.asc Wed 
Jun 22 20:10:16 2016
@@ -0,0 +1,28 @@
+-BEGIN PGP SIGNATURE-
+Version: GnuPG/MacGPG2 v2.0.19 (Darwin)
+Comment: GPGTools - http://gpgtools.org
+
+iQQcBAABCgAGBQJXZV0mAAoJEL8VGOAWB4ii4X4f/RzPqojyW7Td6eV3Fe44UjZU
+XTJVZXqeCDqVq01+KgZuI+XkOV0kSzbQP+E0qCuDpJHPyOA4cM2ltOcG9LIskENE
+Pv+Pnxj1FWTSXfw6gQteBPJ2MAeM4mrNjb3MyqZTlca4cTj2e8R5EHU5qArlOWmZ
+8nJ9h9QiAHhRsGiY9hj5SpOX/0dBQ0453WK6txNHtqfgCyDPZuB5IdcGpOb7x1y+
+L8eWVTLNpiHuU2/YXfwBZbZE1bfseutOQwTt1e0X/0IL+p9ukhBWsHUthck+o7b/

svn commit: r14092 - /release/maven/shared/

2016-06-22 Thread khmarbaise 
Author: khmarbaise
Date: Wed Jun 22 20:08:54 2016
New Revision: 14092

Log:
Added Maven Archiver 3.1.1

Added:
release/maven/shared/maven-archiver-3.1.1-source-release.zip   (with props)
release/maven/shared/maven-archiver-3.1.1-source-release.zip.asc
release/maven/shared/maven-archiver-3.1.1-source-release.zip.md5
Removed:
release/maven/shared/maven-archiver-3.1.0-source-release.zip
release/maven/shared/maven-archiver-3.1.0-source-release.zip.asc
release/maven/shared/maven-archiver-3.1.0-source-release.zip.md5

Added: release/maven/shared/maven-archiver-3.1.1-source-release.zip
==
Binary file - no diff available.

Propchange: release/maven/shared/maven-archiver-3.1.1-source-release.zip
--
svn:mime-type = application/octet-stream

Added: release/maven/shared/maven-archiver-3.1.1-source-release.zip.asc
==
--- release/maven/shared/maven-archiver-3.1.1-source-release.zip.asc (added)
+++ release/maven/shared/maven-archiver-3.1.1-source-release.zip.asc Wed Jun 22 
20:08:54 2016
@@ -0,0 +1,28 @@
+-BEGIN PGP SIGNATURE-
+Version: GnuPG/MacGPG2 v2.0.19 (Darwin)
+Comment: GPGTools - http://gpgtools.org
+
+iQQcBAABCgAGBQJXYF5fAAoJEL8VGOAWB4iiz18f/iBL5XWE3Xvg5XvMAF/j5zgk
+IxS4xcu2zRKzLtWvOEYTspHTJ09XHSPe+2u2iAopAwIL7cPpHmiEA6FPnsG5ozdh
+kwBX4+S8ICXA+/nLoCYvIGi6kdYngxLRsfqeHfr8Q+QwrQqVo0Zpx5JN7DlRUEK3
+bHheFmgHovDzoMsGXxQmzdINH4fj1srQhZHa+eImOMa6RpKZGAJiPGnerxqhfQ4f
+CLArt5dgOMCZmwAFAbiQo5lVQZIn7yWOWxzXe2dZh4W3mjXBRsTqlNj8FZfW9wLH
+vTNp2OdQwbcXMSnKBhVohQT0Xso8m1czPW+v9RyTl+P+rzUy8NgsEqEk4eW/P3um
+vNDGzLgHM6vyBC+2I7QHQ4nHZnBJ58pOpKffmE7M5L3V0SYuq34zY06JL/jbr6Nz
+eTOmgQZtm+hUqWrUHhEu+zPmJM1WjxtKdwV2vqe37eQStPyL6oqeA9zMsJhJ9TeV
+Nq3GXFfdWDWh7XmD0N6MzHwQRaHXGghHdIBLsVKG+mlHh3ZWV0TLm/R0bH1pKxd3
+1JJJknmvsDTszo1Puj/TiCXYF0ROuo2BnDLL3CSVeepMf4Xh66aV1HH6TT+KxCbx
+L+sUCGR/aWPpTLu+NBKKhJWBYY3TaWFI7cu5xMC0JlL5LL1DEDr2sf47+SnK3vWQ
+7eJH/wvPlZ/OXYfJPnyy3/xaICU0iaGwgmi3tuqA1rsK0kSPhEp9Mo76hzzZy7vl
+iLLq5vX3TTlyBi49ql2kUH1eW7VPS7xiK36uOB8vxR5bhSZOQsyaY7vgmwYrn2In
+QopzrVGeokRZCTFjTwKwx9Ej6ScKgkkEjQwl12Y/YbSXS25fcNR0kliMjPK8nf7c
+29J2sXOHU3Y/5w+4hljk9J07H3rKym3YoRoKRZIRzD8Yg9FZeE01/KpdcUEyiUrr
+kruzpry86q+E/UcgArXiQugOyCqeQPp0ZxltaETWRPRoN0ldd+tApOE57csg4sWU
+4VVSfPyHgjrwlygYCKK5UAAZjagscu2XUkExoz8Z72tg43cUi5Ik7B+qUY3lBoZQ
+l+IjiZ5aZtdU8dH+BohKubx+87oKfdcCwaWKolvPuF1bTc3cZIz0A+qwo3C5u5wQ
+YFtZXN5dGhmpg95TEryd7HffVTEHBo7o0Xd8KfkEaaJVisRH/GFAgosIVVXr851n
+bdV/a8AurVZfJklINZUzMz+T2W7jfYSIiSXVsbRNBTW9GfgzcBvoj/icuPOGvyrq
+CkxIgywOCTiVMbj72sYKuR04BanCQYm97yhSuDHxcBWv2TErj2UEdl8htDh9NNdf
+tTFwSwtfbSBrVriupomRurWZumpboIjduzackcDsY305jlMo0VQxD8HDCRSm+uc=
+=6gd2
+-END PGP SIGNATURE-

Added: release/maven/shared/maven-archiver-3.1.1-source-release.zip.md5
==
--- release/maven/shared/maven-archiver-3.1.1-source-release.zip.md5 (added)
+++ release/maven/shared/maven-archiver-3.1.1-source-release.zip.md5 Wed Jun 22 
20:08:54 2016
@@ -0,0 +1 @@
+4e02cb59d739ea0b1dd21a8988b10036
\ No newline at end of file

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

2016-06-22 Thread buildbot 
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 Wed Jun 
22 20:06:22 2016
@@ -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: 2016-06-21
+Last Published: 2016-06-22
 
   
   

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 Wed Jun 
22 20:06:22 2016
@@ -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: 2016-06-21
+Last Published: 2016-06-22
 
   
   

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 Wed Jun 22 
20:06:22 2016
@@ -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: 2016-06-21
+Last Published: 2016-06-22
 
   
   

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 Wed Jun 
22 20:06:22 2016
@@ -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: 2016-06-21
+Last Published: 2016-06-22
 
   
   

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 Wed Jun 
22 20:06:22 2016
@@ -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: 2016-06-21
+Last Published: 2016-06-22
 
   
   

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 Wed Jun 
22 20:06:22 2016
@@ -1,6 +1,6 @@
 
 
 http://www.w3.org/1999/xhtml; xml:lang="en" lang="en">
@@ -9,7 +9,7 @@
 
 
 
-
+
 
 Maven  Release Notes - Maven 2.2.1
 
@@ -41,7 +41,7 @@
 https://www.apache.org/; class="externalLink" 
title="Apache">Apache/
   Maven/
 Release Notes - Maven 2.2.1
-Last Published: 2016-06-21
+Last Published: 2016-06-22
 
   
   

Modified: 
websites/staging/maven/trunk/content/docs/3.0-alpha-3/release-notes.html
==
--- websites/staging/maven/trunk/content/docs/3.0-alpha-3/release-notes.html 
(original)
+++ websites/staging/maven/trunk/content/docs/3.0-alpha-3/release-notes.html 
Wed Jun 22 20:06:22 2016
@@ -1,6 +1,6 @@
 
 
 http://www.w3.org/1999/xhtml;

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

2016-06-22 Thread buildbot 
Modified: websites/staging/maven/trunk/content/issue-tracking.html
==
--- websites/staging/maven/trunk/content/issue-tracking.html (original)
+++ websites/staging/maven/trunk/content/issue-tracking.html Wed Jun 22 
20:06:22 2016
@@ -1,13 +1,13 @@
 
 
 http://www.w3.org/1999/xhtml; xml:lang="en" lang="en">
   
 
 
-
+
 
 Maven  Overview
 
@@ -39,7 +39,7 @@
 https://www.apache.org/; class="externalLink" 
title="Apache">Apache/
   Maven/
 Overview
-Last Published: 2016-06-21
+Last Published: 2016-06-22
 
   
   

Modified: websites/staging/maven/trunk/content/mail-lists.html
==
--- websites/staging/maven/trunk/content/mail-lists.html (original)
+++ websites/staging/maven/trunk/content/mail-lists.html Wed Jun 22 20:06:22 
2016
@@ -1,13 +1,13 @@
 
 
 http://www.w3.org/1999/xhtml; xml:lang="en" lang="en">
   
 
 
-
+
 
 Maven  Project Mailing Lists
 
@@ -39,7 +39,7 @@
 https://www.apache.org/; class="externalLink" 
title="Apache">Apache/
   Maven/
 Project Mailing Lists
-Last Published: 2016-06-21
+Last Published: 2016-06-22
 
   
   

Modified: websites/staging/maven/trunk/content/maven-1.x-eol.html
==
--- websites/staging/maven/trunk/content/maven-1.x-eol.html (original)
+++ websites/staging/maven/trunk/content/maven-1.x-eol.html Wed Jun 22 20:06:22 
2016
@@ -1,13 +1,13 @@
 
 
 http://www.w3.org/1999/xhtml; xml:lang="en" lang="en">
   
 
 
-
+
 
 Maven  End Of Life Apache Maven 1.x
 
@@ -39,7 +39,7 @@
 https://www.apache.org/; class="externalLink" 
title="Apache">Apache/
   Maven/
 End Of Life Apache Maven 1.x
-Last Published: 2016-06-21
+Last Published: 2016-06-22
 
   
   

Modified: websites/staging/maven/trunk/content/maven-2.x-eol.html
==
--- websites/staging/maven/trunk/content/maven-2.x-eol.html (original)
+++ websites/staging/maven/trunk/content/maven-2.x-eol.html Wed Jun 22 20:06:22 
2016
@@ -1,6 +1,6 @@
 
 
 http://www.w3.org/1999/xhtml; xml:lang="en" lang="en">
@@ -9,7 +9,7 @@
 
 
 
-
+
 
 Maven  End Of Life of Maven 2.x
 
@@ -41,7 +41,7 @@
 https://www.apache.org/; class="externalLink" 
title="Apache">Apache/
   Maven/
 End Of Life of Maven 2.x
-Last Published: 2016-06-21
+Last Published: 2016-06-22
 
   
   

Modified: websites/staging/maven/trunk/content/maven-conventions.html
==
--- websites/staging/maven/trunk/content/maven-conventions.html (original)
+++ websites/staging/maven/trunk/content/maven-conventions.html Wed Jun 22 
20:06:22 2016
@@ -1,13 +1,13 @@
 
 
 http://www.w3.org/1999/xhtml; xml:lang="en" lang="en">
   
 
 
-
+
 
 Maven  Maven Conventions
 
@@ -39,7 +39,7 @@
 https://www.apache.org/; class="externalLink" 
title="Apache">Apache/
   Maven/
 Maven Conventions
-Last Published: 2016-06-21
+Last Published: 2016-06-22
 
   
   

Modified: websites/staging/maven/trunk/content/maven-features.html
==
--- websites/staging/maven/trunk/content/maven-features.html (original)
+++ websites/staging/maven/trunk/content/maven-features.html Wed Jun 22 
20:06:22 2016
@@ -1,6 +1,6 @@
 
 
 http://www.w3.org/1999/xhtml; xml:lang="en" lang="en">
@@ -9,7 +9,7 @@
 
 
 
-
+
 
 Maven  Maven Features
 
@@ -41,7 +41,7 @@
 https://www.apache.org/; class="externalLink" 
title="Apache">Apache/
   Maven/
 Maven Features
-Last Published: 2016-06-21
+Last Published: 2016-06-22
 
   
   

Modified: websites/staging/maven/trunk/content/maven-jsr330.html
==
--- websites/staging/maven/trunk/content/maven-jsr330.html (original)
+++ websites/staging/maven/trunk/content/maven-jsr330.html Wed Jun 22 20:06:22 
2016
@@ -1,13 +1,13 @@
 
 
 http://www.w3.org/1999/xhtml; xml:lang="en" lang="en">
   
 
 
-
+
 
 Maven  Maven & JSR-330
 
@@ -39,7 +39,7 @@
 https://www.apache.org/; class="externalLink" 
title="Apache">Apache/
   Maven/
 Maven & JSR-330
-Last Published: 2016-06-21
+Last Published: 2016-06-22
 
   
   

Modified: websites/staging/maven/trunk/content/maven-logging.html
==
---

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

2016-06-22 Thread buildbot 
Author: buildbot
Date: Wed Jun 22 20:06:22 2016
New Revision: 991212

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/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
websites/staging/maven/trunk/content/docs/3.1.0-alpha-1/release-notes.html

svn commit: r991211 - in /websites/production/maven/components: plugins-archives/maven-source-plugin-3.0.1/ plugins/maven-source-plugin/

2016-06-22 Thread khmarbaise 
Author: khmarbaise
Date: Wed Jun 22 20:05:49 2016
New Revision: 991211

Log:
Publish Maven Source Plugin Version 3.0.1

Added:

websites/production/maven/components/plugins-archives/maven-source-plugin-3.0.1/
  - copied from r991210, 
websites/production/maven/components/plugins-archives/maven-source-plugin-LATEST/
websites/production/maven/components/plugins/maven-source-plugin/
  - copied from r991210, 
websites/production/maven/components/plugins-archives/maven-source-plugin-LATEST/

svn commit: r1749776 - /maven/site/trunk/content/apt/plugins/index.apt

2016-06-22 Thread khmarbaise 
Author: khmarbaise
Date: Wed Jun 22 20:05:18 2016
New Revision: 1749776

URL: http://svn.apache.org/viewvc?rev=1749776=rev
Log:
Added Maven JAR Plugin 3.0.2 / Maven Source Plugin 3.0.1

Modified:
maven/site/trunk/content/apt/plugins/index.apt

Modified: maven/site/trunk/content/apt/plugins/index.apt
URL: 
http://svn.apache.org/viewvc/maven/site/trunk/content/apt/plugins/index.apt?rev=1749776=1749775=1749776=diff
==
--- maven/site/trunk/content/apt/plugins/index.apt (original)
+++ maven/site/trunk/content/apt/plugins/index.apt Wed Jun 22 20:05:18 2016
@@ -91,7 +91,7 @@ Available Plugins
 
*--++--++--+++
 | {{{/plugins/maven-ejb-plugin/} <<>>}}   | B  | 
2.5.1| 2015-06-20 | Build an EJB (and optional client) from the current 
project. | 
{{{https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-ejb-plugin}SVN}} 
| {{{https://issues.apache.org/jira/browse/MEJB}JIRA}}
 
*--++--++--+++
-| {{{/plugins/maven-jar-plugin/} <<>>}}   | B  | 
3.0.1| 2016-06-06 | Build a JAR from the current project. | 
{{{https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-jar-plugin}SVN}} 
| {{{https://issues.apache.org/jira/browse/MJAR}JIRA}}
+| {{{/plugins/maven-jar-plugin/} <<>>}}   | B  | 
3.0.2| 2016-06-18 | Build a JAR from the current project. | 
{{{https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-jar-plugin}SVN}} 
| {{{https://issues.apache.org/jira/browse/MJAR}JIRA}}
 
*--++--++--+++
 | {{{/plugins/maven-rar-plugin/} <<>>}}   | B  | 
2.4  | 2014-09-08 | Build a RAR from the current project. | 
{{{https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-rar-plugin}SVN}} 
| {{{https://issues.apache.org/jira/browse/MRAR}JIRA}}
 
*--++--++--+++
@@ -101,7 +101,7 @@ Available Plugins
 
*--++--++--+++
 | {{{/plugins/maven-shade-plugin/} <<>>}}   | B  | 
2.4.3| 2016-01-10 | Build an Uber-JAR from the current project, 
including dependencies. | 
{{{https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-shade-plugin}SVN}}
 | {{{https://issues.apache.org/jira/browse/MSHADE}JIRA}}
 
*--++--++--+++
-| {{{/plugins/maven-source-plugin/} <<>>}} | B  | 
3.0.0| 2016-02-10 | Build a source-JAR from the current project. | 
{{{https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-source-plugin}SVN}}
 | {{{https://issues.apache.org/jira/browse/MSOURCES}JIRA}}
+| {{{/plugins/maven-source-plugin/} <<>>}} | B  | 
3.0.1| 2016-06-18 | Build a source-JAR from the current project. | 
{{{https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-source-plugin}SVN}}
 | {{{https://issues.apache.org/jira/browse/MSOURCES}JIRA}}
 
*--++--++--+++
 | <>||  
|| <> | |
 
*--++--++--+++

maven-integration-testing git commit: [MNG-6049] Add behavior to filter resolved version ranges of an artifact

2016-06-22 Thread michaelo 
Repository: maven-integration-testing
Updated Branches:
  refs/heads/master cfc6098c1 -> a2777f151


[MNG-6049] Add behavior to filter resolved version ranges of an artifact

Appropriate IT for the issue.

This closes #14


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

Branch: refs/heads/master
Commit: a2777f15199514c32862e96f22d8e6e2864f149d
Parents: cfc6098
Author: barthel 
Authored: Mon Feb 15 18:31:38 2016 +0100
Committer: Michael Osipov <1983-01...@gmx.net>
Committed: Wed Jun 22 21:34:43 2016 +0200

--
 .../apache/maven/it/IntegrationTestSuite.java   |   2 +-
 ...92SnapshotsExcludedFromVersionRangeTest.java |  68 --
 ...49VersionRangeResultFilterExtensionTest.java | 130 +++
 .../src/test/resources/mng-3092/pom.xml |  75 ---
 .../apache/maven/its/mng3092/a/1.1/a-1.1.jar| Bin 1933 -> 0 bytes
 .../apache/maven/its/mng3092/a/1.1/a-1.1.pom|  36 -
 .../a/1.2-SNAPSHOT/a-1.2-20100408.111215-1.jar  | Bin 1950 -> 0 bytes
 .../a/1.2-SNAPSHOT/a-1.2-20100408.111215-1.pom  |  36 -
 .../mng3092/a/1.2-SNAPSHOT/maven-metadata.xml   |  13 --
 .../maven/its/mng3092/a/maven-metadata.xml  |  13 --
 .../b/1.0-SNAPSHOT/b-1.0-20100408.111303-1.jar  | Bin 1949 -> 0 bytes
 .../b/1.0-SNAPSHOT/b-1.0-20100408.111303-1.pom  |  36 -
 .../mng3092/b/1.0-SNAPSHOT/maven-metadata.xml   |  13 --
 .../maven/its/mng3092/b/maven-metadata.xml  |  12 --
 .../c/1.1-SNAPSHOT/c-1.1-20100408.111330-1.jar  | Bin 1950 -> 0 bytes
 .../c/1.1-SNAPSHOT/c-1.1-20100408.111330-1.pom  |  36 -
 .../mng3092/c/1.1-SNAPSHOT/maven-metadata.xml   |  13 --
 .../maven/its/mng3092/c/maven-metadata.xml  |  12 --
 .../resources/mng-3092/settings-template.xml|  43 --
 .../src/test/resources/mng-6049/extension.xml   |  29 +
 .../resources/mng-6049/filter-extension/pom.xml |  66 ++
 .../MavenITVersionRangeResultFilter.java|  77 +++
 .../test/resources/mng-6049/pom-mng-6049.xml|  63 +
 .../apache/maven/its/mng6049/a/1.1/a-1.1.jar| Bin 0 -> 1933 bytes
 .../apache/maven/its/mng6049/a/1.1/a-1.1.pom|  36 +
 .../a/1.2-SNAPSHOT/a-1.2-20100408.111215-1.jar  | Bin 0 -> 1950 bytes
 .../a/1.2-SNAPSHOT/a-1.2-20100408.111215-1.pom  |  36 +
 .../mng6049/a/1.2-SNAPSHOT/maven-metadata.xml   |  13 ++
 .../apache/maven/its/mng6049/a/1.2/a-1.2.jar| Bin 0 -> 1933 bytes
 .../apache/maven/its/mng6049/a/1.2/a-1.2.pom|  36 +
 .../a/2.0-SNAPSHOT/a-2.0-20100408.111215-1.jar  | Bin 0 -> 1933 bytes
 .../a/2.0-SNAPSHOT/a-2.0-20100408.111215-1.pom  |  36 +
 .../mng6049/a/2.0-SNAPSHOT/maven-metadata.xml   |  13 ++
 .../apache/maven/its/mng6049/a/2.0/a-2.0.jar| Bin 0 -> 1933 bytes
 .../apache/maven/its/mng6049/a/2.0/a-2.0.pom|  36 +
 .../maven/its/mng6049/a/maven-metadata.xml  |  16 +++
 .../resources/mng-6049/settings-template.xml|  59 +
 37 files changed, 647 insertions(+), 407 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/a2777f15/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java
--
diff --git 
a/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java 
b/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java
index 706297c..86abcbc 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java
@@ -96,7 +96,6 @@ public class IntegrationTestSuite
 // 
-
 // suite.addTestSuite( 
MavenITmng4148DepPomInterpWithSettingsProfilesTest.class );
 // suite.addTestSuite( 
MavenITmng3890TransitiveDependencyScopeUpdateTest.class );
-// suite.addTestSuite( 
MavenITmng3092SnapshotsExcludedFromVersionRangeTest.class );
 // suite.addTestSuite( MavenITmng3038TransitiveDepManVersionTest.class 
);
 // suite.addTestSuite( 
MavenITmng2771PomExtensionComponentOverrideTest.class );
 // suite.addTestSuite( MavenITmng0612NewestConflictResolverTest.class 
);
@@ -106,6 +105,7 @@ public class IntegrationTestSuite
 // 
-
 // suite.addTestSuite( MavenIT0108SnapshotUpdateTest.class ); -- 
MNG-3137
 
+suite.addTestSuite(

maven git commit: [MNG-6049] Add behavior to filter resolved version ranges of an artifact

2016-06-22 Thread michaelo 
Repository: maven
Updated Branches:
  refs/heads/master 4e7088ffe -> 1b2451e79


[MNG-6049] Add behavior to filter resolved version ranges of an artifact

The DefaultVersionRangeResolver will be extended with a filter for
version range results.

This commit adds a new interface VersionRangeResultFilter and a
non-filtering DefaultVersionRangeResultFilter.

This closes #70


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

Branch: refs/heads/master
Commit: 1b2451e7949dbb68df5bb973742d9a9a0e84f629
Parents: 4e7088f
Author: barthel 
Authored: Thu Apr 30 14:37:52 2015 +0200
Committer: Michael Osipov 
Committed: Wed Jun 22 21:36:09 2016 +0200

--
 maven-aether-provider/pom.xml   |   9 +-
 .../internal/DefaultVersionRangeResolver.java   |  31 +-
 .../DefaultVersionRangeResultFilter.java|  45 ++
 .../internal/VersionRangeResultFilter.java  |  45 ++
 .../DefaultVersionRangeResolverTest.java| 455 +++
 .../maven/its/mng-3092/maven-metadata.xml   | 104 +
 6 files changed, 680 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/1b2451e7/maven-aether-provider/pom.xml
--
diff --git a/maven-aether-provider/pom.xml b/maven-aether-provider/pom.xml
index 6306d4f..4c36ebd 100644
--- a/maven-aether-provider/pom.xml
+++ b/maven-aether-provider/pom.xml
@@ -71,6 +71,10 @@ under the License.
   plexus-utils
 
 
+  org.eclipse.sisu
+  org.eclipse.sisu.plexus
+
+
   com.google.inject
   guice
   no_aop
@@ -103,11 +107,6 @@ under the License.
   test
 
 
-  org.eclipse.sisu
-  org.eclipse.sisu.plexus
-  test
-
-
   org.mockito
   mockito-core
   1.10.19

http://git-wip-us.apache.org/repos/asf/maven/blob/1b2451e7/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionRangeResolver.java
--
diff --git 
a/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionRangeResolver.java
 
b/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionRangeResolver.java
index 43f5d3c..8e53c74 100644
--- 
a/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionRangeResolver.java
+++ 
b/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionRangeResolver.java
@@ -53,9 +53,11 @@ import 
org.eclipse.aether.version.InvalidVersionSpecificationException;
 import org.eclipse.aether.version.Version;
 import org.eclipse.aether.version.VersionConstraint;
 import org.eclipse.aether.version.VersionScheme;
+import org.eclipse.sisu.Nullable;
 
 import javax.inject.Inject;
 import javax.inject.Named;
+import javax.inject.Singleton;
 import java.io.FileInputStream;
 import java.io.InputStream;
 import java.util.ArrayList;
@@ -68,7 +70,8 @@ import java.util.Map;
  * @author Benjamin Bentmann
  */
 @Named
-@Component( role = VersionRangeResolver.class )
+@Singleton
+@Component( role = VersionRangeResolver.class, hint = "default" )
 public class DefaultVersionRangeResolver
 implements VersionRangeResolver, Service
 {
@@ -88,6 +91,9 @@ public class DefaultVersionRangeResolver
 @Requirement
 private RepositoryEventDispatcher repositoryEventDispatcher;
 
+@Requirement( role = VersionRangeResultFilter.class, optional = true )
+private VersionRangeResultFilter versionRangeResultFilter = new 
DefaultVersionRangeResultFilter();
+
 public DefaultVersionRangeResolver()
 {
 // enable default constructor
@@ -95,12 +101,17 @@ public class DefaultVersionRangeResolver
 
 @Inject
 DefaultVersionRangeResolver( MetadataResolver metadataResolver, 
SyncContextFactory syncContextFactory,
- RepositoryEventDispatcher 
repositoryEventDispatcher, LoggerFactory loggerFactory )
+ RepositoryEventDispatcher 
repositoryEventDispatcher, LoggerFactory loggerFactory,
+ @Nullable VersionRangeResultFilter 
versionRangeResultFilter )
 {
 setMetadataResolver( metadataResolver );
 setSyncContextFactory( syncContextFactory );
 setLoggerFactory( loggerFactory );
 setRepositoryEventDispatcher( repositoryEventDispatcher );
+if ( versionRangeResultFilter != null )
+{
+setVersionRangeResultFilter( versionRangeResultFilter );
+}
 }
 
 public

svn commit: r991210 - in /websites/production/maven/components: plugins-archives/maven-jar-plugin-3.0.2/ plugins/maven-jar-plugin/

2016-06-22 Thread khmarbaise 
Author: khmarbaise
Date: Wed Jun 22 19:52:35 2016
New Revision: 991210

Log:
Publish Maven JAR Plugin Version 3.0.2

Added:

websites/production/maven/components/plugins-archives/maven-jar-plugin-3.0.2/
  - copied from r991209, 
websites/production/maven/components/plugins-archives/maven-jar-plugin-LATEST/
websites/production/maven/components/plugins/maven-jar-plugin/
  - copied from r991209, 
websites/production/maven/components/plugins-archives/maven-jar-plugin-LATEST/

maven-integration-testing git commit: [MNG-5527] Dependency management import should support relocations.

2016-06-22 Thread schulte 
Repository: maven-integration-testing
Updated Branches:
  refs/heads/master 422fef9e4 -> cfc6098c1


[MNG-5527] Dependency management import should support relocations.


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

Branch: refs/heads/master
Commit: cfc6098c1f65027f1245c74dd353ade1c2ad3d1a
Parents: 422fef9
Author: Christian Schulte 
Authored: Wed Jun 22 17:41:42 2016 +0200
Committer: Christian Schulte 
Committed: Wed Jun 22 17:55:30 2016 +0200

--
 .../apache/maven/it/IntegrationTestSuite.java   |  1 +
 ...pendencyManagementImportRelocationsTest.java | 74 
 .../test/resources/mng-5527/relocations/pom.xml | 72 +++
 .../its/mng5527/relocated1/bom/0/bom-0.pom  | 48 +
 .../its/mng5527/relocated2/bom/0/bom-0.pom  | 48 +
 .../its/mng5527/relocated3/bom/0/bom-0.pom  | 39 +++
 .../resources/mng-5527/settings-template.xml| 43 
 7 files changed, 325 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/cfc6098c/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java
--
diff --git 
a/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java 
b/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java
index 504b028..706297c 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java
@@ -106,6 +106,7 @@ public class IntegrationTestSuite
 // 
-
 // suite.addTestSuite( MavenIT0108SnapshotUpdateTest.class ); -- 
MNG-3137
 
+suite.addTestSuite( 
MavenITmng5527DependencyManagementImportRelocationsTest.class );
 suite.addTestSuite( 
MavenITmng5600DependencyManagementImportExclusionsTest.class );
 suite.addTestSuite( MavenITmng5971HierarchicalImportScopeTest.class );
 suite.addTestSuite( MavenITmng5958LifecyclePhaseBinaryCompat.class );

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/cfc6098c/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5527DependencyManagementImportRelocationsTest.java
--
diff --git 
a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5527DependencyManagementImportRelocationsTest.java
 
b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5527DependencyManagementImportRelocationsTest.java
new file mode 100644
index 000..1ce7b8f
--- /dev/null
+++ 
b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5527DependencyManagementImportRelocationsTest.java
@@ -0,0 +1,74 @@
+package org.apache.maven.it;
+
+/*
+ * 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.
+ */
+
+import java.io.File;
+import java.util.Arrays;
+import java.util.Map;
+import java.util.Properties;
+
+import org.apache.maven.it.util.ResourceExtractor;
+
+import static junit.framework.Assert.assertEquals;
+
+/**
+ * [MNG-5527] Dependency management import should support relocations.
+ *
+ * @author Christian Schulte
+ */
+public class MavenITmng5527DependencyManagementImportRelocationsTest
+extends AbstractMavenIntegrationTestCase
+{
+
+public MavenITmng5527DependencyManagementImportRelocationsTest()
+{
+super( "[3.4,)" );
+}
+
+public void testCanExcludeDependenciesFromImport()
+throws Exception
+{
+final File testDir = ResourceExtractor.simpleExtractResources( 
getClass(), "/mng-5527/relocations" );
+
+final Verifier verifier = newVerifier(