[maven] Git Push Summary

2017-01-15 Thread schulte
Repository: maven
Updated Branches:
  refs/heads/MNG-5629 [deleted] ca1179ce6


[1/2] maven git commit: [MNG-5629] ClosedChannelException from DefaultUpdateCheckManager.read

2017-01-15 Thread schulte
Repository: maven
Updated Branches:
  refs/heads/master a83296d79 -> c6c5192d4


[MNG-5629] ClosedChannelException from DefaultUpdateCheckManager.read

o Updated to stop producing 'ClosedChannelException's when reading tracking 
files.
o Updated to use 'Long.MAX_VALUE' as the size of any locked regions to prevent 
writing beyond locked regions.
o Updated to support shrinking of tracking files.


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

Branch: refs/heads/master
Commit: ca1179ce6ab6ed78fe755e2b97f7e0c01ea91361
Parents: e51fc87
Author: Christian Schulte 
Authored: Fri Dec 11 21:42:09 2015 +0100
Committer: Christian Schulte 
Committed: Mon Jan 9 16:07:28 2017 +0100

--
 .../legacy/DefaultUpdateCheckManager.java   | 61 
 1 file changed, 24 insertions(+), 37 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/ca1179ce/maven-compat/src/main/java/org/apache/maven/repository/legacy/DefaultUpdateCheckManager.java
--
diff --git 
a/maven-compat/src/main/java/org/apache/maven/repository/legacy/DefaultUpdateCheckManager.java
 
b/maven-compat/src/main/java/org/apache/maven/repository/legacy/DefaultUpdateCheckManager.java
index dfc463b..4839d68 100644
--- 
a/maven-compat/src/main/java/org/apache/maven/repository/legacy/DefaultUpdateCheckManager.java
+++ 
b/maven-compat/src/main/java/org/apache/maven/repository/legacy/DefaultUpdateCheckManager.java
@@ -28,15 +28,12 @@ import org.apache.maven.repository.Proxy;
 import org.codehaus.plexus.component.annotations.Component;
 import org.codehaus.plexus.logging.AbstractLogEnabled;
 import org.codehaus.plexus.logging.Logger;
-import org.codehaus.plexus.util.IOUtil;
 
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.RandomAccessFile;
-import java.nio.ByteBuffer;
+import java.nio.channels.Channels;
 import java.nio.channels.FileChannel;
 import java.nio.channels.FileLock;
 import java.util.Date;
@@ -242,18 +239,12 @@ public class DefaultUpdateCheckManager
 Properties props = new Properties();
 
 channel = new RandomAccessFile( touchfile, "rw" ).getChannel();
-lock = channel.lock( 0, channel.size(), false );
+lock = channel.lock();
 
 if ( touchfile.canRead() )
 {
 getLogger().debug( "Reading resolution-state from: " + 
touchfile );
-ByteBuffer buffer = ByteBuffer.allocate( (int) 
channel.size() );
-
-channel.read( buffer );
-buffer.flip();
-
-ByteArrayInputStream stream = new ByteArrayInputStream( 
buffer.array() );
-props.load( stream );
+props.load( Channels.newInputStream( channel ) );
 }
 
 props.setProperty( key, Long.toString( 
System.currentTimeMillis() ) );
@@ -267,18 +258,15 @@ public class DefaultUpdateCheckManager
 props.remove( key + ERROR_KEY_SUFFIX );
 }
 
-ByteArrayOutputStream stream = new ByteArrayOutputStream();
-
 getLogger().debug( "Writing resolution-state to: " + touchfile 
);
-props.store( stream, "Last modified on: " + new Date() );
+channel.truncate( 0 );
+props.store( Channels.newOutputStream( channel ), "Last 
modified on: " + new Date() );
 
-byte[] data = stream.toByteArray();
-ByteBuffer buffer = ByteBuffer.allocate( data.length );
-buffer.put( data );
-buffer.flip();
+lock.release();
+lock = null;
 
-channel.position( 0 );
-channel.write( buffer );
+channel.close();
+channel = null;
 }
 catch ( IOException e )
 {
@@ -359,27 +347,26 @@ public class DefaultUpdateCheckManager
 
 synchronized ( touchfile.getAbsolutePath().intern() )
 {
+FileInputStream in = null;
 FileLock lock = null;
-FileChannel channel = null;
+
 try
 {
 Properties props = new Properties();
 
-FileInputStream stream = new FileInputStream( touchfile );
-try
-{
-channel = stream.getChannel();
-lock = channel.lock( 0, 

[2/2] maven git commit: Merge branch 'MNG-5629'

2017-01-15 Thread schulte
Merge branch 'MNG-5629'


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

Branch: refs/heads/master
Commit: c6c5192d4bcb50c1aab6fade53dfb9c2f3d9b7e7
Parents: a83296d ca1179c
Author: Christian Schulte 
Authored: Mon Jan 16 03:16:49 2017 +0100
Committer: Christian Schulte 
Committed: Mon Jan 16 03:16:49 2017 +0100

--
 .../legacy/DefaultUpdateCheckManager.java   | 61 
 1 file changed, 24 insertions(+), 37 deletions(-)
--




[1/3] maven-integration-testing git commit: [MNG-3599] The upgrade of Wagon to 2.10 breaks the test using older versions of wagon [Forced Update!]

2017-01-15 Thread schulte
Repository: maven-integration-testing
Updated Branches:
  refs/heads/MNG-5958 1e4c7c36b -> 2fd74ac6d (forced update)


[MNG-3599] The upgrade of Wagon to 2.10 breaks the test using older versions of 
wagon

- Need to use `--legacy-local-repository` on newer maven versions
(noting workaround as MNG-6155)


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

Branch: refs/heads/MNG-5958
Commit: ad98af7e77d4d392f9c3f96656959f1957923082
Parents: f31241a
Author: Stephen Connolly 
Authored: Wed Jan 11 09:50:08 2017 +
Committer: Stephen Connolly 
Committed: Wed Jan 11 20:10:26 2017 +

--
 .../apache/maven/it/IntegrationTestSuite.java   |   1 +
 ...enITmng3599useHttpProxyForWebDAVMk2Test.java | 214 +++
 ...MavenITmng3599useHttpProxyForWebDAVTest.java |   4 +-
 .../test/resources/bootstrap/group-7/pom.xml|  50 +
 .../src/test/resources/bootstrap/pom.xml|   1 +
 .../src/test/resources/mng-3599-mk2/pom.xml |  23 ++
 .../mng-3599-mk2/settings-template.xml  |  18 ++
 7 files changed, 309 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/ad98af7e/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 48051c9..5536620 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
@@ -461,6 +461,7 @@ public class IntegrationTestSuite
 suite.addTestSuite( MavenITmng3607ClassLoadersUseValidUrlsTest.class );
 suite.addTestSuite( MavenITmng3600DeploymentModeDefaultsTest.class );
 suite.addTestSuite( MavenITmng3599useHttpProxyForWebDAVTest.class );
+suite.addTestSuite( MavenITmng3599useHttpProxyForWebDAVMk2Test.class );
 suite.addTestSuite( 
MavenITmng3586SystemScopePluginDependencyTest.class );
 suite.addTestSuite( MavenITmng3581PluginUsesWagonDependencyTest.class 
);
 suite.addTestSuite( 
MavenITmng3575HexadecimalOctalPluginParameterConfigTest.class );

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/ad98af7e/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3599useHttpProxyForWebDAVMk2Test.java
--
diff --git 
a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3599useHttpProxyForWebDAVMk2Test.java
 
b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3599useHttpProxyForWebDAVMk2Test.java
new file mode 100644
index 000..0377348
--- /dev/null
+++ 
b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3599useHttpProxyForWebDAVMk2Test.java
@@ -0,0 +1,214 @@
+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.io.IOException;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import org.apache.maven.it.util.ResourceExtractor;
+import org.apache.maven.shared.utils.StringUtils;
+import org.apache.maven.shared.utils.io.FileUtils;
+import org.mortbay.jetty.Handler;
+import org.mortbay.jetty.Request;
+import org.mortbay.jetty.Server;
+import org.mortbay.jetty.handler.AbstractHandler;
+
+/**
+ * This is a test set for https://issues.apache.org/jira/browse/MNG-3599;>MNG-3599.
+ *
+ * @author Brett Porter
+ * @author John Casey
+ * @version $Id$
+ */
+public class MavenITmng3599useHttpProxyForWebDAVMk2Test

[3/3] maven-integration-testing git commit: [MNG-5958] restore binary compatibility of Lifecycle.setPhases

2017-01-15 Thread schulte
[MNG-5958] restore binary compatibility of Lifecycle.setPhases

Modify tests for MNG-5805

This closes #13 #18


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

Branch: refs/heads/MNG-5958
Commit: 2fd74ac6d4747b11d50b78965f0d2c229fb46773
Parents: 6c86dc6
Author: Anton Tanasenko 
Authored: Thu Jan 7 04:01:28 2016 +0200
Committer: Christian Schulte 
Committed: Mon Jan 16 02:37:07 2017 +0100

--
 .../apache/maven/it/IntegrationTestSuite.java   |  2 +
 .../MavenITmng5805PkgTypeMojoConfiguration.java |  2 +-
 ...MavenITmng5805PkgTypeMojoConfiguration2.java | 30 +
 ...avenITmng5958LifecyclePhaseBinaryCompat.java | 45 +
 .../test/resources/bootstrap/group-3/pom.xml| 12 
 .../pom.xml | 40 +++
 .../mng-5958-lifecycle-phases/bad/pom.xml   | 53 +++
 .../mng-5958-lifecycle-phases/good/pom.xml  | 53 +++
 .../core-it-plugins/mng5805-extension2/pom.xml  | 37 ++
 .../resources/META-INF/plexus/components.xml| 71 
 .../core-it-plugins/mng5958-extension/pom.xml   | 45 +
 .../its/mng5958/AbstractLifecycleMapping.java   | 71 
 .../maven/its/mng5958/BadLifecycleMapping.java  | 45 +
 .../maven/its/mng5958/GoodLifecycleMapping.java | 40 +++
 .../resources/META-INF/plexus/components.xml| 62 +
 core-it-support/core-it-plugins/pom.xml |  2 +
 16 files changed, 609 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/2fd74ac6/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 5536620..a91eeb0 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,10 +106,12 @@ public class IntegrationTestSuite
 // 
-
 // suite.addTestSuite( MavenIT0108SnapshotUpdateTest.class ); -- 
MNG-3137
 
+suite.addTestSuite( MavenITmng5958LifecyclePhaseBinaryCompat.class );
 suite.addTestSuite( 
MavenITmng5898BuildMultimoduleWithEARFailsToResolveWARTest.class );
 suite.addTestSuite( MavenITmng5840ParentVersionRanges.class );
 suite.addTestSuite( MavenITmng5840RelativePathReactorMatching.class );
 suite.addTestSuite( MavenITmng5805PkgTypeMojoConfiguration.class );
+suite.addTestSuite( MavenITmng5805PkgTypeMojoConfiguration2.class );
 suite.addTestSuite( MavenITmng5783PluginDependencyFiltering.class );
 suite.addTestSuite( MavenITmng5774ConfigurationProcessorsTest.class );
 suite.addTestSuite( MavenITmng5771CoreExtensionsTest.class );

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/2fd74ac6/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5805PkgTypeMojoConfiguration.java
--
diff --git 
a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5805PkgTypeMojoConfiguration.java
 
b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5805PkgTypeMojoConfiguration.java
index ada7448..5335677 100644
--- 
a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5805PkgTypeMojoConfiguration.java
+++ 
b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5805PkgTypeMojoConfiguration.java
@@ -10,7 +10,7 @@ public class MavenITmng5805PkgTypeMojoConfiguration
 
 public MavenITmng5805PkgTypeMojoConfiguration()
 {
-super( "(3.3.3,)" );
+super( "(3.3.3,3.5.0)" );
 }
 
 public void testPkgTypeMojoConfiguration()

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/2fd74ac6/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5805PkgTypeMojoConfiguration2.java
--
diff --git 
a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5805PkgTypeMojoConfiguration2.java
 
b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5805PkgTypeMojoConfiguration2.java
new file mode 100644
index 000..ca1c0e3
--- /dev/null
+++ 

[2/3] maven-integration-testing git commit: [MNG-6155] The mirror's id is used when comparing the origin so use the same id as when resolving the extension

2017-01-15 Thread schulte
[MNG-6155] The mirror's id is used when comparing the origin so use the same id 
as when resolving the extension


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

Branch: refs/heads/MNG-5958
Commit: 6c86dc6fe8bad24950fa76d295910e7d7e145a21
Parents: ad98af7
Author: Stephen Connolly 
Authored: Fri Jan 13 13:27:41 2017 +
Committer: Stephen Connolly 
Committed: Fri Jan 13 13:27:41 2017 +

--
 .../maven/it/MavenITmng3599useHttpProxyForWebDAVMk2Test.java   | 2 --
 .../src/test/resources/mng-3599-mk2/settings-template.xml  | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/6c86dc6f/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3599useHttpProxyForWebDAVMk2Test.java
--
diff --git 
a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3599useHttpProxyForWebDAVMk2Test.java
 
b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3599useHttpProxyForWebDAVMk2Test.java
index 0377348..6e9954b 100644
--- 
a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3599useHttpProxyForWebDAVMk2Test.java
+++ 
b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3599useHttpProxyForWebDAVMk2Test.java
@@ -152,7 +152,6 @@ public class MavenITmng3599useHttpProxyForWebDAVMk2Test
 
 verifier = newVerifier( testDir.getAbsolutePath() );
 
-verifier.addCliOption( "--legacy-local-repository" ); // FIXME this is 
a temporary band-aid MNG-6155
 verifier.addCliOption( "--settings" );
 verifier.addCliOption( "settings.xml" );
 verifier.addCliOption( "-X" );
@@ -195,7 +194,6 @@ public class MavenITmng3599useHttpProxyForWebDAVMk2Test
 
 verifier = newVerifier( testDir.getAbsolutePath() );
 
-verifier.addCliOption( "--legacy-local-repository" ); // FIXME this is 
a temporary band-aid MNG-6155
 verifier.addCliOption( "--settings" );
 verifier.addCliOption( "settings.xml" );
 verifier.addCliOption( "-X" );

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/6c86dc6f/core-it-suite/src/test/resources/mng-3599-mk2/settings-template.xml
--
diff --git 
a/core-it-suite/src/test/resources/mng-3599-mk2/settings-template.xml 
b/core-it-suite/src/test/resources/mng-3599-mk2/settings-template.xml
index 809db8f..257b399 100644
--- a/core-it-suite/src/test/resources/mng-3599-mk2/settings-template.xml
+++ b/core-it-suite/src/test/resources/mng-3599-mk2/settings-template.xml
@@ -1,7 +1,7 @@
 
   
 
-  test-mirror
+  central
   @protocol@://www.example.com/
   *
 



maven-integration-testing git commit: [MNG-5958] restore binary compatibility of Lifecycle.setPhases

2017-01-15 Thread schulte
Repository: maven-integration-testing
Updated Branches:
  refs/heads/MNG-5958 885253820 -> 1e4c7c36b


[MNG-5958] restore binary compatibility of Lifecycle.setPhases

Modify tests for MNG-5805

This closes #18


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

Branch: refs/heads/MNG-5958
Commit: 1e4c7c36bd1d7fb4bc0a1a6335c4778ee58a664e
Parents: 8852538
Author: Anton Tanasenko 
Authored: Mon Jan 16 01:01:28 2017 +0200
Committer: Christian Schulte 
Committed: Mon Jan 16 02:35:46 2017 +0100

--
 .../apache/maven/it/IntegrationTestSuite.java   |  1 +
 .../MavenITmng5805PkgTypeMojoConfiguration.java |  2 +-
 ...MavenITmng5805PkgTypeMojoConfiguration2.java | 30 +
 .../test/resources/bootstrap/group-3/pom.xml|  6 ++
 .../pom.xml | 40 +++
 .../resources/META-INF/plexus/components.xml|  4 +-
 .../core-it-plugins/mng5805-extension2/pom.xml  | 37 ++
 .../resources/META-INF/plexus/components.xml| 71 
 core-it-support/core-it-plugins/pom.xml |  1 +
 9 files changed, 189 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/1e4c7c36/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 c4fdbd5..7171aee 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
@@ -111,6 +111,7 @@ public class IntegrationTestSuite
 suite.addTestSuite( MavenITmng5840ParentVersionRanges.class );
 suite.addTestSuite( MavenITmng5840RelativePathReactorMatching.class );
 suite.addTestSuite( MavenITmng5805PkgTypeMojoConfiguration.class );
+suite.addTestSuite( MavenITmng5805PkgTypeMojoConfiguration2.class );
 suite.addTestSuite( MavenITmng5783PluginDependencyFiltering.class );
 suite.addTestSuite( MavenITmng5774ConfigurationProcessorsTest.class );
 suite.addTestSuite( MavenITmng5771CoreExtensionsTest.class );

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/1e4c7c36/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5805PkgTypeMojoConfiguration.java
--
diff --git 
a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5805PkgTypeMojoConfiguration.java
 
b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5805PkgTypeMojoConfiguration.java
index ada7448..5335677 100644
--- 
a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5805PkgTypeMojoConfiguration.java
+++ 
b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5805PkgTypeMojoConfiguration.java
@@ -10,7 +10,7 @@ public class MavenITmng5805PkgTypeMojoConfiguration
 
 public MavenITmng5805PkgTypeMojoConfiguration()
 {
-super( "(3.3.3,)" );
+super( "(3.3.3,3.5.0)" );
 }
 
 public void testPkgTypeMojoConfiguration()

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/1e4c7c36/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5805PkgTypeMojoConfiguration2.java
--
diff --git 
a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5805PkgTypeMojoConfiguration2.java
 
b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5805PkgTypeMojoConfiguration2.java
new file mode 100644
index 000..ca1c0e3
--- /dev/null
+++ 
b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5805PkgTypeMojoConfiguration2.java
@@ -0,0 +1,30 @@
+package org.apache.maven.it;
+
+import java.io.File;
+
+import org.apache.maven.it.util.ResourceExtractor;
+
+public class MavenITmng5805PkgTypeMojoConfiguration2
+extends AbstractMavenIntegrationTestCase
+{
+
+public MavenITmng5805PkgTypeMojoConfiguration2()
+{
+super( "(3.3.3,)" );
+}
+
+public void testPkgTypeMojoConfiguration()
+throws Exception
+{
+File testDir = ResourceExtractor.simpleExtractResources( getClass(), 
"/mng-5805-pkg-type-mojo-configuration2" );
+
+Verifier verifier;
+
+
+verifier = newVerifier( testDir.getAbsolutePath() );
+verifier.executeGoal( "validate" );
+

[1/2] maven-resolver git commit: Add Jenkinsfile

2017-01-15 Thread stephenc
Repository: maven-resolver
Updated Branches:
  refs/heads/MNG-6007 8bd8c539d -> 61af1948b


Add Jenkinsfile


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

Branch: refs/heads/MNG-6007
Commit: 5779a35721bc982053086bb44acec267d1887935
Parents: 8bd8c53
Author: Stephen Connolly 
Authored: Sun Jan 15 20:41:01 2017 +
Committer: Stephen Connolly 
Committed: Sun Jan 15 21:05:50 2017 +

--
 Jenkinsfile | 50 ++
 1 file changed, 50 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/5779a357/Jenkinsfile
--
diff --git a/Jenkinsfile b/Jenkinsfile
new file mode 100644
index 000..95d2967
--- /dev/null
+++ b/Jenkinsfile
@@ -0,0 +1,50 @@
+/*
+ * 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.
+ */
+
+properties([buildDiscarder(logRotator(artifactNumToKeepStr: '5', numToKeepStr: 
env.BRANCH_NAME=='master'?'10':'5'))])
+
+node('ubuntu') {
+try {
+stage('Checkout') 
+def MAVEN_BUILD=tool name: 'Maven 3.3.9', type: 
'hudson.tasks.Maven$MavenInstallation'
+echo "Driving build and unit tests using Maven $MAVEN_BUILD"
+def JAVA7_HOME=tool name: 'JDK 1.7 (latest)', type: 
'hudson.model.JDK'
+echo "Running build and unit tests with Java $JAVA7_HOME"
+dir('build') {
+deleteDir()
+}
+dir('build') {
+checkout scm
+}
+stage('Build/Test')
+def WORK_DIR=pwd()
+dir('build') {
+try {
+
withEnv(["PATH+MAVEN=$MAVEN_BUILD/bin","PATH+JDK=$JAVA7_HOME/bin"]) {
+sh "mvn clean verify -B -U -e -fae -V 
-Dmaven.test.failure.ignore=true -Dmaven.repo.local=$WORK_DIR/.repository"
+}
+} finally {
+junit allowEmptyResults: true, 
testResults:'**/target/*-reports/*.xml'
+archiveArtifacts allowEmptyArchive: true, artifacts: 
'**/target/rat.txt'
+}
+}
+} finally {
+emailext body: "See ${env.BUILD_URL}", recipientProviders: [[$class: 
'CulpritsRecipientProvider'], [$class: 'FailingTestSuspectsRecipientProvider'], 
[$class: 'FirstFailingBuildSuspectsRecipientProvider']], replyTo: 
'd...@maven.apache.org', subject: "Maven Resolver Jenkinsfile finished with 
${currentBuild.result}", to: 'notificati...@maven.apache.org'
+}
+}



[2/2] maven-resolver git commit: Add binary files to rat ignores as it is inconsistent in ignoring them

2017-01-15 Thread stephenc
Add binary files to rat ignores as it is inconsistent in ignoring them


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

Branch: refs/heads/MNG-6007
Commit: 61af1948bb77d7c592f78bab524f78c287d7bd73
Parents: 5779a35
Author: Stephen Connolly 
Authored: Sun Jan 15 21:09:49 2017 +
Committer: Stephen Connolly 
Committed: Sun Jan 15 21:16:12 2017 +

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


http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/61af1948/pom.xml
--
diff --git a/pom.xml b/pom.xml
index a1ded5c..32509b8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -309,6 +309,7 @@
 
   src/test/resources/**/*.ini
   src/test/resources/**/*.txt
+  src/test/resources/ssl/*-store
 
   
 



[maven-resolver] Git Push Summary

2017-01-15 Thread stephenc
Repository: maven-resolver
Updated Branches:
  refs/heads/jenkinsfile [deleted] 61af1948b


maven-resolver git commit: Add binary files to rat ignores as it is inconsistent in ignoring them [Forced Update!]

2017-01-15 Thread stephenc
Repository: maven-resolver
Updated Branches:
  refs/heads/jenkinsfile 0152d063c -> 61af1948b (forced update)


Add binary files to rat ignores as it is inconsistent in ignoring them


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

Branch: refs/heads/jenkinsfile
Commit: 61af1948bb77d7c592f78bab524f78c287d7bd73
Parents: 5779a35
Author: Stephen Connolly 
Authored: Sun Jan 15 21:09:49 2017 +
Committer: Stephen Connolly 
Committed: Sun Jan 15 21:16:12 2017 +

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


http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/61af1948/pom.xml
--
diff --git a/pom.xml b/pom.xml
index a1ded5c..32509b8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -309,6 +309,7 @@
 
   src/test/resources/**/*.ini
   src/test/resources/**/*.txt
+  src/test/resources/ssl/*-store
 
   
 



maven-resolver git commit: Add binary files to rat ignores as it is inconsistent in ignoring them [Forced Update!]

2017-01-15 Thread stephenc
Repository: maven-resolver
Updated Branches:
  refs/heads/jenkinsfile 0467da231 -> 0152d063c (forced update)


Add binary files to rat ignores as it is inconsistent in ignoring them


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

Branch: refs/heads/jenkinsfile
Commit: 0152d063c46597610ee01e7b6277227321cb76b5
Parents: 5779a35
Author: Stephen Connolly 
Authored: Sun Jan 15 21:09:49 2017 +
Committer: Stephen Connolly 
Committed: Sun Jan 15 21:13:21 2017 +

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


http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/0152d063/pom.xml
--
diff --git a/pom.xml b/pom.xml
index a1ded5c..a901f4d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -309,6 +309,7 @@
 
   src/test/resources/**/*.ini
   src/test/resources/**/*.txt
+  src/test/resources/*-store
 
   
 



maven-resolver git commit: Add binary files to rat ignores as it is inconsistent in ignoring them

2017-01-15 Thread stephenc
Repository: maven-resolver
Updated Branches:
  refs/heads/jenkinsfile 5779a3572 -> 0467da231


Add binary files to rat ignores as it is inconsistent in ignoring them


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

Branch: refs/heads/jenkinsfile
Commit: 0467da231ccf15e22ce1fdc9f02523e2f9d407f0
Parents: 5779a35
Author: Stephen Connolly 
Authored: Sun Jan 15 21:09:49 2017 +
Committer: Stephen Connolly 
Committed: Sun Jan 15 21:09:49 2017 +

--
 maven-resolver-transport-http/pom.xml | 9 +
 1 file changed, 9 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/0467da23/maven-resolver-transport-http/pom.xml
--
diff --git a/maven-resolver-transport-http/pom.xml 
b/maven-resolver-transport-http/pom.xml
index e4c31d9..d333258 100644
--- a/maven-resolver-transport-http/pom.xml
+++ b/maven-resolver-transport-http/pom.xml
@@ -113,6 +113,15 @@
 org.eclipse.sisu
 sisu-maven-plugin
   
+
+  org.apache.rat
+  apache-rat-plugin
+  
+
+  src/test/resources/*-store
+
+  
+
 
   
 



maven-resolver git commit: Add Jenkinsfile [Forced Update!]

2017-01-15 Thread stephenc
Repository: maven-resolver
Updated Branches:
  refs/heads/jenkinsfile f721684a5 -> 5779a3572 (forced update)


Add Jenkinsfile


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

Branch: refs/heads/jenkinsfile
Commit: 5779a35721bc982053086bb44acec267d1887935
Parents: 8bd8c53
Author: Stephen Connolly 
Authored: Sun Jan 15 20:41:01 2017 +
Committer: Stephen Connolly 
Committed: Sun Jan 15 21:05:50 2017 +

--
 Jenkinsfile | 50 ++
 1 file changed, 50 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/5779a357/Jenkinsfile
--
diff --git a/Jenkinsfile b/Jenkinsfile
new file mode 100644
index 000..95d2967
--- /dev/null
+++ b/Jenkinsfile
@@ -0,0 +1,50 @@
+/*
+ * 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.
+ */
+
+properties([buildDiscarder(logRotator(artifactNumToKeepStr: '5', numToKeepStr: 
env.BRANCH_NAME=='master'?'10':'5'))])
+
+node('ubuntu') {
+try {
+stage('Checkout') 
+def MAVEN_BUILD=tool name: 'Maven 3.3.9', type: 
'hudson.tasks.Maven$MavenInstallation'
+echo "Driving build and unit tests using Maven $MAVEN_BUILD"
+def JAVA7_HOME=tool name: 'JDK 1.7 (latest)', type: 
'hudson.model.JDK'
+echo "Running build and unit tests with Java $JAVA7_HOME"
+dir('build') {
+deleteDir()
+}
+dir('build') {
+checkout scm
+}
+stage('Build/Test')
+def WORK_DIR=pwd()
+dir('build') {
+try {
+
withEnv(["PATH+MAVEN=$MAVEN_BUILD/bin","PATH+JDK=$JAVA7_HOME/bin"]) {
+sh "mvn clean verify -B -U -e -fae -V 
-Dmaven.test.failure.ignore=true -Dmaven.repo.local=$WORK_DIR/.repository"
+}
+} finally {
+junit allowEmptyResults: true, 
testResults:'**/target/*-reports/*.xml'
+archiveArtifacts allowEmptyArchive: true, artifacts: 
'**/target/rat.txt'
+}
+}
+} finally {
+emailext body: "See ${env.BUILD_URL}", recipientProviders: [[$class: 
'CulpritsRecipientProvider'], [$class: 'FailingTestSuspectsRecipientProvider'], 
[$class: 'FirstFailingBuildSuspectsRecipientProvider']], replyTo: 
'd...@maven.apache.org', subject: "Maven Resolver Jenkinsfile finished with 
${currentBuild.result}", to: 'notificati...@maven.apache.org'
+}
+}



maven-resolver git commit: Add Jenkinsfile [Forced Update!]

2017-01-15 Thread stephenc
Repository: maven-resolver
Updated Branches:
  refs/heads/jenkinsfile dafc4bcaf -> f721684a5 (forced update)


Add Jenkinsfile


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

Branch: refs/heads/jenkinsfile
Commit: f721684a51baf2dba9f2e3adadf3fb6802c0ae95
Parents: 8bd8c53
Author: Stephen Connolly 
Authored: Sun Jan 15 20:41:01 2017 +
Committer: Stephen Connolly 
Committed: Sun Jan 15 21:02:26 2017 +

--
 Jenkinsfile | 47 +++
 1 file changed, 47 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/f721684a/Jenkinsfile
--
diff --git a/Jenkinsfile b/Jenkinsfile
new file mode 100644
index 000..acaba9b
--- /dev/null
+++ b/Jenkinsfile
@@ -0,0 +1,47 @@
+/*
+ * 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.
+ */
+
+properties([buildDiscarder(logRotator(artifactNumToKeepStr: '5', numToKeepStr: 
env.BRANCH_NAME=='master'?'10':'5'))])
+
+node('ubuntu') {
+try {
+stage('Checkout') 
+def MAVEN_BUILD=tool name: 'Maven 3.3.9', type: 
'hudson.tasks.Maven$MavenInstallation'
+echo "Driving build and unit tests using Maven $MAVEN_BUILD"
+def JAVA7_HOME=tool name: 'JDK 1.7 (latest)', type: 
'hudson.model.JDK'
+echo "Running build and unit tests with Java $JAVA7_HOME"
+dir('build') {
+deleteDir()
+}
+dir('build') {
+checkout scm
+}
+stage('Build/Test')
+def WORK_DIR=pwd()
+dir('build') {
+
withEnv(["PATH+MAVEN=$MAVEN_BUILD/bin","PATH+JDK=$JAVA7_HOME/bin"]) {
+sh "mvn clean verify -B -U -e -fae -V 
-Dmaven.test.failure.ignore=true -Dmaven.repo.local=$WORK_DIR/.repository"
+}
+junit allowEmptyResults: true, 
testResults:'**/target/*-reports/*.xml'
+archiveArtifacts allowEmptyArchive: true, artifacts: 
'target/rat.txt'
+}
+} finally {
+emailext body: "See ${env.BUILD_URL}", recipientProviders: [[$class: 
'CulpritsRecipientProvider'], [$class: 'FailingTestSuspectsRecipientProvider'], 
[$class: 'FirstFailingBuildSuspectsRecipientProvider']], replyTo: 
'd...@maven.apache.org', subject: "Maven Resolver Jenkinsfile finished with 
${currentBuild.result}", to: 'notificati...@maven.apache.org'
+}
+}



maven-resolver git commit: Add Jenkinsfile [Forced Update!]

2017-01-15 Thread stephenc
Repository: maven-resolver
Updated Branches:
  refs/heads/jenkinsfile 25d1e9663 -> dafc4bcaf (forced update)


Add Jenkinsfile


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

Branch: refs/heads/jenkinsfile
Commit: dafc4bcaf69376b1001d558887cc5dad3d8299bb
Parents: 8bd8c53
Author: Stephen Connolly 
Authored: Sun Jan 15 20:41:01 2017 +
Committer: Stephen Connolly 
Committed: Sun Jan 15 20:48:21 2017 +

--
 Jenkinsfile | 43 +++
 1 file changed, 43 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/dafc4bca/Jenkinsfile
--
diff --git a/Jenkinsfile b/Jenkinsfile
new file mode 100644
index 000..e843069
--- /dev/null
+++ b/Jenkinsfile
@@ -0,0 +1,43 @@
+/*
+ * 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.
+ */
+
+properties([buildDiscarder(logRotator(artifactNumToKeepStr: '5', numToKeepStr: 
env.BRANCH_NAME=='master'?'10':'5'))])
+
+node('ubuntu') {
+try {
+stage('Checkout') 
+def MAVEN_BUILD=tool name: 'Maven 3.3.9', type: 
'hudson.tasks.Maven$MavenInstallation'
+echo "Driving build and unit tests using Maven $MAVEN_BUILD"
+def JAVA7_HOME=tool name: 'JDK 1.7 (latest)', type: 
'hudson.model.JDK'
+echo "Running build and unit tests with Java $JAVA7_HOME"
+dir('build') {
+checkout scm
+}
+stage('Build/Test')
+dir('build') {
+def WORK_DIR=pwd()
+
withEnv(["PATH+MAVEN=$MAVEN_BUILD/bin","PATH+JDK=$JAVA7_HOME/bin"]) {
+sh "mvn clean verify -B -U -e -fae -V 
-Dmaven.test.failure.ignore=true -Dmaven.repo.local=$WORK_DIR/.repository"
+}
+junit allowEmptyResults: true, 
testResults:'**/target/*-reports/*.xml'
+}
+} finally {
+emailext body: "See ${env.BUILD_URL}", recipientProviders: [[$class: 
'CulpritsRecipientProvider'], [$class: 'FailingTestSuspectsRecipientProvider'], 
[$class: 'FirstFailingBuildSuspectsRecipientProvider']], replyTo: 
'd...@maven.apache.org', subject: "Maven Resolver Jenkinsfile finished with 
${currentBuild.result}", to: 'notificati...@maven.apache.org'
+}
+}



maven-resolver git commit: Add Jenkinsfile

2017-01-15 Thread stephenc
Repository: maven-resolver
Updated Branches:
  refs/heads/jenkinsfile [created] 25d1e9663


Add Jenkinsfile


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

Branch: refs/heads/jenkinsfile
Commit: 25d1e9663e1e005772cb83e9b55328e66fd988b1
Parents: 8bd8c53
Author: Stephen Connolly 
Authored: Sun Jan 15 20:41:01 2017 +
Committer: Stephen Connolly 
Committed: Sun Jan 15 20:41:01 2017 +

--
 Jenkinsfile | 23 +++
 1 file changed, 23 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/25d1e966/Jenkinsfile
--
diff --git a/Jenkinsfile b/Jenkinsfile
new file mode 100644
index 000..50cba44
--- /dev/null
+++ b/Jenkinsfile
@@ -0,0 +1,23 @@
+/*
+ * 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.
+ */
+
+properties([buildDiscarder(logRotator(artifactNumToKeepStr: '5', numToKeepStr: 
env.BRANCH_NAME=='master'?'10':'5'))])
+
+node('ubuntu') {
+}



[maven-resolver] Git Push Summary [forced push!] [Forced Update!]

2017-01-15 Thread stephenc
Repository: maven-resolver
Updated Branches:
  refs/heads/MNG-6007 c190f7b16 -> 8bd8c539d (forced update)


maven-resolver git commit: Add a Jenkinsfile [Forced Update!]

2017-01-15 Thread stephenc
Repository: maven-resolver
Updated Branches:
  refs/heads/MNG-6007 1d6e0549a -> c190f7b16 (forced update)


Add a Jenkinsfile


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

Branch: refs/heads/MNG-6007
Commit: c190f7b1603f39691c7c09a3169180bf0120454d
Parents: 8bd8c53
Author: Stephen Connolly 
Authored: Sun Jan 15 20:23:22 2017 +
Committer: Stephen Connolly 
Committed: Sun Jan 15 20:37:51 2017 +

--
 Jenkinsfile | 45 +
 1 file changed, 45 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/c190f7b1/Jenkinsfile
--
diff --git a/Jenkinsfile b/Jenkinsfile
new file mode 100644
index 000..50121ac
--- /dev/null
+++ b/Jenkinsfile
@@ -0,0 +1,45 @@
+/*
+ * 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.
+ */
+
+properties([buildDiscarder(logRotator(artifactNumToKeepStr: '5', numToKeepStr: 
env.BRANCH_NAME=='master'?'10':'5'))])
+
+try {
+node('ubuntu') {
+stage 'Checkout'
+def MAVEN_BUILD=tool name: 'Maven 3.3.9', type: 
'hudson.tasks.Maven$MavenInstallation'
+echo "Driving build and unit tests using Maven $MAVEN_BUILD"
+def JAVA7_HOME=tool name: 'JDK 1.7 (latest)', type: 'hudson.model.JDK'
+echo "Running build and unit tests with Java $JAVA7_HOME"
+dir('build') {
+checkout scm
+def WORK_DIR=pwd()
+stage 'Build / Unit Test'
+withEnv(["PATH+MAVEN=$MAVEN_BUILD/bin","PATH+JDK=$JAVA7_HOME/bin"]) {
+sh "mvn clean verify -B -U -e -fae -V 
-Dmaven.test.failure.ignore=true -Dmaven.repo.local=$WORK_DIR/.repository"
+}
+junit allowEmptyResults: true, testResults:'**/target/*-reports/*.xml'
+}
+}
+
+} finally {}
+node('ubuntu') {
+emailext body: "See ${env.BUILD_URL}", recipientProviders: [[$class: 
'CulpritsRecipientProvider'], [$class: 'FailingTestSuspectsRecipientProvider'], 
[$class: 'FirstFailingBuildSuspectsRecipientProvider']], replyTo: 
'd...@maven.apache.org', subject: "Maven Resolver Jenkinsfile finished with 
${currentBuild.result}", to: 'notificati...@maven.apache.org'
+}
+}
+



maven-resolver git commit: Add a Jenkinsfile [Forced Update!]

2017-01-15 Thread stephenc
Repository: maven-resolver
Updated Branches:
  refs/heads/MNG-6007 3dd571219 -> 1d6e0549a (forced update)


Add a Jenkinsfile


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

Branch: refs/heads/MNG-6007
Commit: 1d6e0549a3fdf2a9129e539e3b5b97ac5285f4a3
Parents: 8bd8c53
Author: Stephen Connolly 
Authored: Sun Jan 15 20:23:22 2017 +
Committer: Stephen Connolly 
Committed: Sun Jan 15 20:36:05 2017 +

--
 Jenkinsfile | 45 +
 1 file changed, 45 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/1d6e0549/Jenkinsfile
--
diff --git a/Jenkinsfile b/Jenkinsfile
new file mode 100644
index 000..50121ac
--- /dev/null
+++ b/Jenkinsfile
@@ -0,0 +1,45 @@
+/*
+ * 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.
+ */
+
+properties([buildDiscarder(logRotator(artifactNumToKeepStr: '5', numToKeepStr: 
env.BRANCH_NAME=='master'?'10':'5'))])
+
+try {
+node('ubuntu') {
+stage 'Checkout'
+def MAVEN_BUILD=tool name: 'Maven 3.3.9', type: 
'hudson.tasks.Maven$MavenInstallation'
+echo "Driving build and unit tests using Maven $MAVEN_BUILD"
+def JAVA7_HOME=tool name: 'JDK 1.7 (latest)', type: 'hudson.model.JDK'
+echo "Running build and unit tests with Java $JAVA7_HOME"
+dir('build') {
+checkout scm
+def WORK_DIR=pwd()
+stage 'Build / Unit Test'
+withEnv(["PATH+MAVEN=$MAVEN_BUILD/bin","PATH+JDK=$JAVA7_HOME/bin"]) {
+sh "mvn clean verify -B -U -e -fae -V 
-Dmaven.test.failure.ignore=true -Dmaven.repo.local=$WORK_DIR/.repository"
+}
+junit allowEmptyResults: true, testResults:'**/target/*-reports/*.xml'
+}
+}
+
+} finally {}
+node('ubuntu') {
+emailext body: "See ${env.BUILD_URL}", recipientProviders: [[$class: 
'CulpritsRecipientProvider'], [$class: 'FailingTestSuspectsRecipientProvider'], 
[$class: 'FirstFailingBuildSuspectsRecipientProvider']], replyTo: 
'd...@maven.apache.org', subject: "Maven Resolver Jenkinsfile finished with 
${currentBuild.result}", to: 'notificati...@maven.apache.org'
+}
+}
+



maven-resolver git commit: Add a Jenkinsfile [Forced Update!]

2017-01-15 Thread stephenc
Repository: maven-resolver
Updated Branches:
  refs/heads/MNG-6007 5b0befa07 -> 3dd571219 (forced update)


Add a Jenkinsfile


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

Branch: refs/heads/MNG-6007
Commit: 3dd571219d8e1d49de0c8555309db63f447787a2
Parents: 8bd8c53
Author: Stephen Connolly 
Authored: Sun Jan 15 20:23:22 2017 +
Committer: Stephen Connolly 
Committed: Sun Jan 15 20:34:19 2017 +

--
 Jenkinsfile | 45 +
 1 file changed, 45 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/3dd57121/Jenkinsfile
--
diff --git a/Jenkinsfile b/Jenkinsfile
new file mode 100644
index 000..50121ac
--- /dev/null
+++ b/Jenkinsfile
@@ -0,0 +1,45 @@
+/*
+ * 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.
+ */
+
+properties([buildDiscarder(logRotator(artifactNumToKeepStr: '5', numToKeepStr: 
env.BRANCH_NAME=='master'?'10':'5'))])
+
+try {
+node('ubuntu') {
+stage 'Checkout'
+def MAVEN_BUILD=tool name: 'Maven 3.3.9', type: 
'hudson.tasks.Maven$MavenInstallation'
+echo "Driving build and unit tests using Maven $MAVEN_BUILD"
+def JAVA7_HOME=tool name: 'JDK 1.7 (latest)', type: 'hudson.model.JDK'
+echo "Running build and unit tests with Java $JAVA7_HOME"
+dir('build') {
+checkout scm
+def WORK_DIR=pwd()
+stage 'Build / Unit Test'
+withEnv(["PATH+MAVEN=$MAVEN_BUILD/bin","PATH+JDK=$JAVA7_HOME/bin"]) {
+sh "mvn clean verify -B -U -e -fae -V 
-Dmaven.test.failure.ignore=true -Dmaven.repo.local=$WORK_DIR/.repository"
+}
+junit allowEmptyResults: true, testResults:'**/target/*-reports/*.xml'
+}
+}
+
+} finally {}
+node('ubuntu') {
+emailext body: "See ${env.BUILD_URL}", recipientProviders: [[$class: 
'CulpritsRecipientProvider'], [$class: 'FailingTestSuspectsRecipientProvider'], 
[$class: 'FirstFailingBuildSuspectsRecipientProvider']], replyTo: 
'd...@maven.apache.org', subject: "Maven Resolver Jenkinsfile finished with 
${currentBuild.result}", to: 'notificati...@maven.apache.org'
+}
+}
+



maven-resolver git commit: Add a Jenkinsfile [Forced Update!]

2017-01-15 Thread stephenc
Repository: maven-resolver
Updated Branches:
  refs/heads/MNG-6007 81ce0c1f3 -> 5b0befa07 (forced update)


Add a Jenkinsfile


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

Branch: refs/heads/MNG-6007
Commit: 5b0befa07da5552f43255dbeb5742479bf300b14
Parents: 8bd8c53
Author: Stephen Connolly 
Authored: Sun Jan 15 20:23:22 2017 +
Committer: Stephen Connolly 
Committed: Sun Jan 15 20:33:21 2017 +

--
 Jenkinsfile | 45 +
 1 file changed, 45 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/5b0befa0/Jenkinsfile
--
diff --git a/Jenkinsfile b/Jenkinsfile
new file mode 100644
index 000..50121ac
--- /dev/null
+++ b/Jenkinsfile
@@ -0,0 +1,45 @@
+/*
+ * 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.
+ */
+
+properties([buildDiscarder(logRotator(artifactNumToKeepStr: '5', numToKeepStr: 
env.BRANCH_NAME=='master'?'10':'5'))])
+
+try {
+node('ubuntu') {
+stage 'Checkout'
+def MAVEN_BUILD=tool name: 'Maven 3.3.9', type: 
'hudson.tasks.Maven$MavenInstallation'
+echo "Driving build and unit tests using Maven $MAVEN_BUILD"
+def JAVA7_HOME=tool name: 'JDK 1.7 (latest)', type: 'hudson.model.JDK'
+echo "Running build and unit tests with Java $JAVA7_HOME"
+dir('build') {
+checkout scm
+def WORK_DIR=pwd()
+stage 'Build / Unit Test'
+withEnv(["PATH+MAVEN=$MAVEN_BUILD/bin","PATH+JDK=$JAVA7_HOME/bin"]) {
+sh "mvn clean verify -B -U -e -fae -V 
-Dmaven.test.failure.ignore=true -Dmaven.repo.local=$WORK_DIR/.repository"
+}
+junit allowEmptyResults: true, testResults:'**/target/*-reports/*.xml'
+}
+}
+
+} finally {}
+node('ubuntu') {
+emailext body: "See ${env.BUILD_URL}", recipientProviders: [[$class: 
'CulpritsRecipientProvider'], [$class: 'FailingTestSuspectsRecipientProvider'], 
[$class: 'FirstFailingBuildSuspectsRecipientProvider']], replyTo: 
'd...@maven.apache.org', subject: "Maven Resolver Jenkinsfile finished with 
${currentBuild.result}", to: 'notificati...@maven.apache.org'
+}
+}
+



maven-resolver git commit: Add a Jenkinsfile [Forced Update!]

2017-01-15 Thread stephenc
Repository: maven-resolver
Updated Branches:
  refs/heads/MNG-6007 1e9e2c86a -> 81ce0c1f3 (forced update)


Add a Jenkinsfile


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

Branch: refs/heads/MNG-6007
Commit: 81ce0c1f32238d1ac654aad32e70eada645987b5
Parents: 8bd8c53
Author: Stephen Connolly 
Authored: Sun Jan 15 20:23:22 2017 +
Committer: Stephen Connolly 
Committed: Sun Jan 15 20:32:23 2017 +

--
 Jenkinsfile | 45 +
 1 file changed, 45 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/81ce0c1f/Jenkinsfile
--
diff --git a/Jenkinsfile b/Jenkinsfile
new file mode 100644
index 000..50121ac
--- /dev/null
+++ b/Jenkinsfile
@@ -0,0 +1,45 @@
+/*
+ * 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.
+ */
+
+properties([buildDiscarder(logRotator(artifactNumToKeepStr: '5', numToKeepStr: 
env.BRANCH_NAME=='master'?'10':'5'))])
+
+try {
+node('ubuntu') {
+stage 'Checkout'
+def MAVEN_BUILD=tool name: 'Maven 3.3.9', type: 
'hudson.tasks.Maven$MavenInstallation'
+echo "Driving build and unit tests using Maven $MAVEN_BUILD"
+def JAVA7_HOME=tool name: 'JDK 1.7 (latest)', type: 'hudson.model.JDK'
+echo "Running build and unit tests with Java $JAVA7_HOME"
+dir('build') {
+checkout scm
+def WORK_DIR=pwd()
+stage 'Build / Unit Test'
+withEnv(["PATH+MAVEN=$MAVEN_BUILD/bin","PATH+JDK=$JAVA7_HOME/bin"]) {
+sh "mvn clean verify -B -U -e -fae -V 
-Dmaven.test.failure.ignore=true -Dmaven.repo.local=$WORK_DIR/.repository"
+}
+junit allowEmptyResults: true, testResults:'**/target/*-reports/*.xml'
+}
+}
+
+} finally {}
+node('ubuntu') {
+emailext body: "See ${env.BUILD_URL}", recipientProviders: [[$class: 
'CulpritsRecipientProvider'], [$class: 'FailingTestSuspectsRecipientProvider'], 
[$class: 'FirstFailingBuildSuspectsRecipientProvider']], replyTo: 
'd...@maven.apache.org', subject: "Maven Resolver Jenkinsfile finished with 
${currentBuild.result}", to: 'notificati...@maven.apache.org'
+}
+}
+



maven-resolver git commit: Add a Jenkinsfile [Forced Update!]

2017-01-15 Thread stephenc
Repository: maven-resolver
Updated Branches:
  refs/heads/MNG-6007 eda9fc018 -> 1e9e2c86a (forced update)


Add a Jenkinsfile


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

Branch: refs/heads/MNG-6007
Commit: 1e9e2c86a1331797e8f905a6f8cfdbb38d7e49f0
Parents: 8bd8c53
Author: Stephen Connolly 
Authored: Sun Jan 15 20:23:22 2017 +
Committer: Stephen Connolly 
Committed: Sun Jan 15 20:30:49 2017 +

--
 Jenkinsfile | 45 +
 1 file changed, 45 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/1e9e2c86/Jenkinsfile
--
diff --git a/Jenkinsfile b/Jenkinsfile
new file mode 100644
index 000..50121ac
--- /dev/null
+++ b/Jenkinsfile
@@ -0,0 +1,45 @@
+/*
+ * 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.
+ */
+
+properties([buildDiscarder(logRotator(artifactNumToKeepStr: '5', numToKeepStr: 
env.BRANCH_NAME=='master'?'10':'5'))])
+
+try {
+node('ubuntu') {
+stage 'Checkout'
+def MAVEN_BUILD=tool name: 'Maven 3.3.9', type: 
'hudson.tasks.Maven$MavenInstallation'
+echo "Driving build and unit tests using Maven $MAVEN_BUILD"
+def JAVA7_HOME=tool name: 'JDK 1.7 (latest)', type: 'hudson.model.JDK'
+echo "Running build and unit tests with Java $JAVA7_HOME"
+dir('build') {
+checkout scm
+def WORK_DIR=pwd()
+stage 'Build / Unit Test'
+withEnv(["PATH+MAVEN=$MAVEN_BUILD/bin","PATH+JDK=$JAVA7_HOME/bin"]) {
+sh "mvn clean verify -B -U -e -fae -V 
-Dmaven.test.failure.ignore=true -Dmaven.repo.local=$WORK_DIR/.repository"
+}
+junit allowEmptyResults: true, testResults:'**/target/*-reports/*.xml'
+}
+}
+
+} finally {}
+node('ubuntu') {
+emailext body: "See ${env.BUILD_URL}", recipientProviders: [[$class: 
'CulpritsRecipientProvider'], [$class: 'FailingTestSuspectsRecipientProvider'], 
[$class: 'FirstFailingBuildSuspectsRecipientProvider']], replyTo: 
'd...@maven.apache.org', subject: "Maven Resolver Jenkinsfile finished with 
${currentBuild.result}", to: 'notificati...@maven.apache.org'
+}
+}
+



maven-resolver git commit: Add a Jenkinsfile [Forced Update!]

2017-01-15 Thread stephenc
Repository: maven-resolver
Updated Branches:
  refs/heads/MNG-6007 d37aade9d -> eda9fc018 (forced update)


Add a Jenkinsfile


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

Branch: refs/heads/MNG-6007
Commit: eda9fc018015b2e8da40318033ac3ccc7652ceb2
Parents: 8bd8c53
Author: Stephen Connolly 
Authored: Sun Jan 15 20:23:22 2017 +
Committer: Stephen Connolly 
Committed: Sun Jan 15 20:25:47 2017 +

--
 Jenkinsfile | 45 +
 1 file changed, 45 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/eda9fc01/Jenkinsfile
--
diff --git a/Jenkinsfile b/Jenkinsfile
new file mode 100644
index 000..50121ac
--- /dev/null
+++ b/Jenkinsfile
@@ -0,0 +1,45 @@
+/*
+ * 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.
+ */
+
+properties([buildDiscarder(logRotator(artifactNumToKeepStr: '5', numToKeepStr: 
env.BRANCH_NAME=='master'?'10':'5'))])
+
+try {
+node('ubuntu') {
+stage 'Checkout'
+def MAVEN_BUILD=tool name: 'Maven 3.3.9', type: 
'hudson.tasks.Maven$MavenInstallation'
+echo "Driving build and unit tests using Maven $MAVEN_BUILD"
+def JAVA7_HOME=tool name: 'JDK 1.7 (latest)', type: 'hudson.model.JDK'
+echo "Running build and unit tests with Java $JAVA7_HOME"
+dir('build') {
+checkout scm
+def WORK_DIR=pwd()
+stage 'Build / Unit Test'
+withEnv(["PATH+MAVEN=$MAVEN_BUILD/bin","PATH+JDK=$JAVA7_HOME/bin"]) {
+sh "mvn clean verify -B -U -e -fae -V 
-Dmaven.test.failure.ignore=true -Dmaven.repo.local=$WORK_DIR/.repository"
+}
+junit allowEmptyResults: true, testResults:'**/target/*-reports/*.xml'
+}
+}
+
+} finally {}
+node('ubuntu') {
+emailext body: "See ${env.BUILD_URL}", recipientProviders: [[$class: 
'CulpritsRecipientProvider'], [$class: 'FailingTestSuspectsRecipientProvider'], 
[$class: 'FirstFailingBuildSuspectsRecipientProvider']], replyTo: 
'd...@maven.apache.org', subject: "Maven Resolver Jenkinsfile finished with 
${currentBuild.result}", to: 'notificati...@maven.apache.org'
+}
+}
+



maven-resolver git commit: Add a Jenkinsfile

2017-01-15 Thread stephenc
Repository: maven-resolver
Updated Branches:
  refs/heads/MNG-6007 8bd8c539d -> d37aade9d


Add a Jenkinsfile


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

Branch: refs/heads/MNG-6007
Commit: d37aade9d72ffc570d39d15c33c5db3173a08928
Parents: 8bd8c53
Author: Stephen Connolly 
Authored: Sun Jan 15 20:23:22 2017 +
Committer: Stephen Connolly 
Committed: Sun Jan 15 20:23:22 2017 +

--
 Jenkinsfile | 45 +
 1 file changed, 45 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/d37aade9/Jenkinsfile
--
diff --git a/Jenkinsfile b/Jenkinsfile
new file mode 100644
index 000..50121ac
--- /dev/null
+++ b/Jenkinsfile
@@ -0,0 +1,45 @@
+/*
+ * 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.
+ */
+
+properties([buildDiscarder(logRotator(artifactNumToKeepStr: '5', numToKeepStr: 
env.BRANCH_NAME=='master'?'10':'5'))])
+
+try {
+node('ubuntu') {
+stage 'Checkout'
+def MAVEN_BUILD=tool name: 'Maven 3.3.9', type: 
'hudson.tasks.Maven$MavenInstallation'
+echo "Driving build and unit tests using Maven $MAVEN_BUILD"
+def JAVA7_HOME=tool name: 'JDK 1.7 (latest)', type: 'hudson.model.JDK'
+echo "Running build and unit tests with Java $JAVA7_HOME"
+dir('build') {
+checkout scm
+def WORK_DIR=pwd()
+stage 'Build / Unit Test'
+withEnv(["PATH+MAVEN=$MAVEN_BUILD/bin","PATH+JDK=$JAVA7_HOME/bin"]) {
+sh "mvn clean verify -B -U -e -fae -V 
-Dmaven.test.failure.ignore=true -Dmaven.repo.local=$WORK_DIR/.repository"
+}
+junit allowEmptyResults: true, testResults:'**/target/*-reports/*.xml'
+}
+}
+
+} finally {}
+node('ubuntu') {
+emailext body: "See ${env.BUILD_URL}", recipientProviders: [[$class: 
'CulpritsRecipientProvider'], [$class: 'FailingTestSuspectsRecipientProvider'], 
[$class: 'FirstFailingBuildSuspectsRecipientProvider']], replyTo: 
'd...@maven.apache.org', subject: "Maven Resolver Jenkinsfile finished with 
${currentBuild.result}", to: 'notificati...@maven.apache.org'
+}
+}
+



[03/53] [abbrv] [partial] maven-resolver git commit: [MNG-6007] renamed Aether to Maven Artifact Resolver

2017-01-15 Thread hboutemy
http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/3a1b8ae0/maven-resolver-api/src/main/java/org/eclipse/aether/repository/LocalRepositoryManager.java
--
diff --git 
a/maven-resolver-api/src/main/java/org/eclipse/aether/repository/LocalRepositoryManager.java
 
b/maven-resolver-api/src/main/java/org/eclipse/aether/repository/LocalRepositoryManager.java
new file mode 100644
index 000..649707c
--- /dev/null
+++ 
b/maven-resolver-api/src/main/java/org/eclipse/aether/repository/LocalRepositoryManager.java
@@ -0,0 +1,127 @@
+package org.eclipse.aether.repository;
+
+/*
+ * 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 org.eclipse.aether.RepositorySystemSession;
+import org.eclipse.aether.artifact.Artifact;
+import org.eclipse.aether.metadata.Metadata;
+
+/**
+ * Manages access to a local repository.
+ * 
+ * @see RepositorySystemSession#getLocalRepositoryManager()
+ * @see 
org.eclipse.aether.RepositorySystem#newLocalRepositoryManager(RepositorySystemSession,
 LocalRepository)
+ */
+public interface LocalRepositoryManager
+{
+
+/**
+ * Gets the description of the local repository being managed.
+ * 
+ * @return The description of the local repository, never {@code null}.
+ */
+LocalRepository getRepository();
+
+/**
+ * Gets the relative path for a locally installed artifact. Note that the 
artifact need not actually exist yet at
+ * the returned location, the path merely indicates where the artifact 
would eventually be stored. The path uses the
+ * forward slash as directory separator regardless of the underlying file 
system.
+ * 
+ * @param artifact The artifact for which to determine the path, must not 
be {@code null}.
+ * @return The path, relative to the local repository's base directory.
+ */
+String getPathForLocalArtifact( Artifact artifact );
+
+/**
+ * Gets the relative path for an artifact cached from a remote repository. 
Note that the artifact need not actually
+ * exist yet at the returned location, the path merely indicates where the 
artifact would eventually be stored. The
+ * path uses the forward slash as directory separator regardless of the 
underlying file system.
+ * 
+ * @param artifact The artifact for which to determine the path, must not 
be {@code null}.
+ * @param repository The source repository of the artifact, must not be 
{@code null}.
+ * @param context The resolution context in which the artifact is being 
requested, may be {@code null}.
+ * @return The path, relative to the local repository's base directory.
+ */
+String getPathForRemoteArtifact( Artifact artifact, RemoteRepository 
repository, String context );
+
+/**
+ * Gets the relative path for locally installed metadata. Note that the 
metadata need not actually exist yet at the
+ * returned location, the path merely indicates where the metadata would 
eventually be stored. The path uses the
+ * forward slash as directory separator regardless of the underlying file 
system.
+ * 
+ * @param metadata The metadata for which to determine the path, must not 
be {@code null}.
+ * @return The path, relative to the local repository's base directory.
+ */
+String getPathForLocalMetadata( Metadata metadata );
+
+/**
+ * Gets the relative path for metadata cached from a remote repository. 
Note that the metadata need not actually
+ * exist yet at the returned location, the path merely indicates where the 
metadata would eventually be stored. The
+ * path uses the forward slash as directory separator regardless of the 
underlying file system.
+ * 
+ * @param metadata The metadata for which to determine the path, must not 
be {@code null}.
+ * @param repository The source repository of the metadata, must not be 
{@code null}.
+ * @param context The resolution context in which the metadata is being 
requested, may be {@code null}.
+ * @return The path, relative to the local repository's base directory.
+ */
+String getPathForRemoteMetadata( Metadata metadata, RemoteRepository 
repository, String context 

[53/53] [abbrv] maven-resolver git commit: [MNG-6008] git repository renamed to maven-resolver.git

2017-01-15 Thread hboutemy
[MNG-6008] git repository renamed to maven-resolver.git

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

Branch: refs/heads/MNG-6007
Commit: 8bd8c539dbeb65937c766dcea2c4340f405e46a7
Parents: 656749d
Author: Hervé Boutemy 
Authored: Thu Sep 15 00:34:59 2016 +0200
Committer: Hervé Boutemy 
Committed: Sun Jan 15 20:22:26 2017 +0100

--
 pom.xml | 13 +++--
 1 file changed, 7 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/8bd8c539/pom.xml
--
diff --git a/pom.xml b/pom.xml
index c8b6d0b..a1ded5c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -42,18 +42,19 @@
   2010
 
   
-
scm:git:https://git-wip-us.apache.org/repos/asf/maven-aether.git
-
scm:git:https://git-wip-us.apache.org/repos/asf/maven-aether.git
-https://git-wip-us.apache.org/repos/asf/maven-aether.git
+
scm:git:https://git-wip-us.apache.org/repos/asf/maven-resolver.git
+
scm:git:https://git-wip-us.apache.org/repos/asf/maven-resolver.git
+https://github.com/apache/maven-resolver/tree/${project.scm.tag}
+master
   
   
 jira
 https://issues.apache.org/jira/browse/MRESOLVER
   
-  
+https://builds.apache.org/job/maven-resolver/
+  
   
 
   apache.website



[27/53] [abbrv] [partial] maven-resolver git commit: [MNG-6007] renamed Aether to Maven Artifact Resolver

2017-01-15 Thread hboutemy
http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/3a1b8ae0/aether-impl/src/test/resources/artifact-descriptions/cycle-big/10_351_4.0-SNAPSHOT.ini
--
diff --git 
a/aether-impl/src/test/resources/artifact-descriptions/cycle-big/10_351_4.0-SNAPSHOT.ini
 
b/aether-impl/src/test/resources/artifact-descriptions/cycle-big/10_351_4.0-SNAPSHOT.ini
deleted file mode 100644
index 8282eae..000
--- 
a/aether-impl/src/test/resources/artifact-descriptions/cycle-big/10_351_4.0-SNAPSHOT.ini
+++ /dev/null
@@ -1,46 +0,0 @@
-[dependencies]
-1:352:pom:6.1-SNAPSHOT
-1:13:pom:1.7.0-SNAPSHOT
-1:353:pom:1.2.3-SNAPSHOT
-1:63:pom:1.1-SNAPSHOT
-1:63:pom:1.3-SNAPSHOT
-1:44:pom:1.3-SNAPSHOT
-1:45:pom:3.1-SNAPSHOT
-1:23:pom:1.2.6_sap.1-SNAPSHOT
-1:248:pom:5.5-SNAPSHOT
-1:50:pom:3.4.1-SNAPSHOT
-1:354:pom:1.6.2-SNAPSHOT
-1:355:pom:3.0.5-SNAPSHOT
-1:9:pom:3.1-SNAPSHOT
-1:93:pom:10.0-SNAPSHOT
-1:6:pom:1.5.8-SNAPSHOT
-1:7:pom:5.8.8-SNAPSHOT
-1:267:pom:3.0-SNAPSHOT
-1:108:pom:4.0-SNAPSHOT
-1:5:pom:1.5-SNAPSHOT
-1:5:pom:1.6-SNAPSHOT
-1:344:pom:1.6.0-SNAPSHOT
-1:61:pom:1.1-SNAPSHOT
-1:75:pom:26-SNAPSHOT
-1:71:pom:1.1.3.8-SNAPSHOT
-1:289:pom:2.2.0-SNAPSHOT
-1:250:pom:1.0_sap.1-SNAPSHOT
-1:89:pom:2.3-SNAPSHOT
-10:173:pom:4.0-SNAPSHOT
-10:189:pom:4.0-SNAPSHOT
-10:202:pom:4.0-SNAPSHOT
-10:174:pom:4.0-SNAPSHOT
-10:22:pom:4.0-SNAPSHOT
-10:246:pom:4.0-SNAPSHOT
-10:167:pom:4.0-SNAPSHOT
-10:247:pom:4.0-SNAPSHOT
-10:251:pom:4.0-SNAPSHOT
-10:180:pom:3.1-SNAPSHOT
-10:121:pom:3.0-SNAPSHOT
-10:11:pom:4.0-SNAPSHOT
-10:152:pom:4.0-SNAPSHOT
-10:331:pom:4.0-SNAPSHOT
-10:149:pom:4.0-SNAPSHOT
-10:148:pom:4.0-SNAPSHOT
-10:161:pom:4.0-SNAPSHOT
-10:242:pom:4.0-SNAPSHOT

http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/3a1b8ae0/aether-impl/src/test/resources/artifact-descriptions/cycle-big/10_351_4.1-SNAPSHOT.ini
--
diff --git 
a/aether-impl/src/test/resources/artifact-descriptions/cycle-big/10_351_4.1-SNAPSHOT.ini
 
b/aether-impl/src/test/resources/artifact-descriptions/cycle-big/10_351_4.1-SNAPSHOT.ini
deleted file mode 100644
index eb1cfa4..000
--- 
a/aether-impl/src/test/resources/artifact-descriptions/cycle-big/10_351_4.1-SNAPSHOT.ini
+++ /dev/null
@@ -1,50 +0,0 @@
-[dependencies]
-1:352:pom:6.1-SNAPSHOT
-1:358:pom:1.1.2-SNAPSHOT
-1:13:pom:1.7.0-SNAPSHOT
-1:353:pom:1.2.3-SNAPSHOT
-1:63:pom:1.1-SNAPSHOT
-1:63:pom:1.3-SNAPSHOT
-1:44:pom:1.3-SNAPSHOT
-1:45:pom:3.1-SNAPSHOT
-1:260:pom:2.3.3-SNAPSHOT
-1:23:pom:1.2.6_sap.1-SNAPSHOT
-1:248:pom:5.5-SNAPSHOT
-1:50:pom:3.4.1-SNAPSHOT
-1:354:pom:1.6.2-SNAPSHOT
-1:355:pom:3.0.5-SNAPSHOT
-1:9:pom:3.1-SNAPSHOT
-1:93:pom:10.0-SNAPSHOT
-1:6:pom:1.5.8-SNAPSHOT
-1:7:pom:5.8.8-SNAPSHOT
-1:267:pom:3.0-SNAPSHOT
-1:108:pom:4.0-SNAPSHOT
-1:5:pom:1.5-SNAPSHOT
-1:5:pom:1.6-SNAPSHOT
-1:344:pom:1.6.0-SNAPSHOT
-1:61:pom:1.1-SNAPSHOT
-1:75:pom:26-SNAPSHOT
-1:71:pom:1.1.3.8-SNAPSHOT
-1:289:pom:2.2.0-SNAPSHOT
-1:250:pom:1.0_sap.1-SNAPSHOT
-1:89:pom:2.3-SNAPSHOT
-10:173:pom:4.1-SNAPSHOT
-10:189:pom:4.1-SNAPSHOT
-10:202:pom:4.1-SNAPSHOT
-10:174:pom:4.1-SNAPSHOT
-10:22:pom:4.1-SNAPSHOT
-10:246:pom:4.1-SNAPSHOT
-10:167:pom:4.1-SNAPSHOT
-10:247:pom:4.1-SNAPSHOT
-10:251:pom:4.1-SNAPSHOT
-10:180:pom:3.2-SNAPSHOT
-10:121:pom:3.1-SNAPSHOT
-10:11:pom:4.1-SNAPSHOT
-10:152:pom:4.1-SNAPSHOT
-10:331:pom:4.1-SNAPSHOT
-10:149:pom:4.1-SNAPSHOT
-10:148:pom:4.1-SNAPSHOT
-10:161:pom:4.1-SNAPSHOT
-10:242:pom:4.1-SNAPSHOT
-10:363:pom:4.1-SNAPSHOT
-10:160:pom:4.1-SNAPSHOT

http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/3a1b8ae0/aether-impl/src/test/resources/artifact-descriptions/cycle-big/10_356_4.0-SNAPSHOT.ini
--
diff --git 
a/aether-impl/src/test/resources/artifact-descriptions/cycle-big/10_356_4.0-SNAPSHOT.ini
 
b/aether-impl/src/test/resources/artifact-descriptions/cycle-big/10_356_4.0-SNAPSHOT.ini
deleted file mode 100644
index 67ffd1f..000
--- 
a/aether-impl/src/test/resources/artifact-descriptions/cycle-big/10_356_4.0-SNAPSHOT.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[dependencies]
-1:13:pom:1.7.0-SNAPSHOT
-1:53:pom:2.3.0.677-SNAPSHOT
-1:5:pom:1.5-SNAPSHOT

http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/3a1b8ae0/aether-impl/src/test/resources/artifact-descriptions/cycle-big/10_356_4.1-SNAPSHOT.ini
--
diff --git 
a/aether-impl/src/test/resources/artifact-descriptions/cycle-big/10_356_4.1-SNAPSHOT.ini
 
b/aether-impl/src/test/resources/artifact-descriptions/cycle-big/10_356_4.1-SNAPSHOT.ini
deleted file mode 100644
index 67ffd1f..000
--- 
a/aether-impl/src/test/resources/artifact-descriptions/cycle-big/10_356_4.1-SNAPSHOT.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[dependencies]
-1:13:pom:1.7.0-SNAPSHOT
-1:53:pom:2.3.0.677-SNAPSHOT
-1:5:pom:1.5-SNAPSHOT


[02/53] [abbrv] [partial] maven-resolver git commit: [MNG-6007] renamed Aether to Maven Artifact Resolver

2017-01-15 Thread hboutemy
http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/3a1b8ae0/maven-resolver-api/src/main/java/org/eclipse/aether/resolution/ArtifactRequest.java
--
diff --git 
a/maven-resolver-api/src/main/java/org/eclipse/aether/resolution/ArtifactRequest.java
 
b/maven-resolver-api/src/main/java/org/eclipse/aether/resolution/ArtifactRequest.java
new file mode 100644
index 000..a220207
--- /dev/null
+++ 
b/maven-resolver-api/src/main/java/org/eclipse/aether/resolution/ArtifactRequest.java
@@ -0,0 +1,232 @@
+package org.eclipse.aether.resolution;
+
+/*
+ * 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.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import org.eclipse.aether.RepositorySystem;
+import org.eclipse.aether.RepositorySystemSession;
+import org.eclipse.aether.RequestTrace;
+import org.eclipse.aether.artifact.Artifact;
+import org.eclipse.aether.graph.DependencyNode;
+import org.eclipse.aether.repository.RemoteRepository;
+
+/**
+ * A request to resolve an artifact.
+ * 
+ * @see RepositorySystem#resolveArtifacts(RepositorySystemSession, 
java.util.Collection)
+ * @see Artifact#getFile()
+ */
+public final class ArtifactRequest
+{
+
+private Artifact artifact;
+
+private DependencyNode node;
+
+private List repositories = Collections.emptyList();
+
+private String context = "";
+
+private RequestTrace trace;
+
+/**
+ * Creates an uninitialized request.
+ */
+public ArtifactRequest()
+{
+// enables default constructor
+}
+
+/**
+ * Creates a request with the specified properties.
+ * 
+ * @param artifact The artifact to resolve, may be {@code null}.
+ * @param repositories The repositories to resolve the artifact from, may 
be {@code null}.
+ * @param context The context in which this request is made, may be {@code 
null}.
+ */
+public ArtifactRequest( Artifact artifact, List 
repositories, String context )
+{
+setArtifact( artifact );
+setRepositories( repositories );
+setRequestContext( context );
+}
+
+/**
+ * Creates a request from the specified dependency node.
+ * 
+ * @param node The dependency node to resolve, may be {@code null}.
+ */
+public ArtifactRequest( DependencyNode node )
+{
+setDependencyNode( node );
+setRepositories( node.getRepositories() );
+setRequestContext( node.getRequestContext() );
+}
+
+/**
+ * Gets the artifact to resolve.
+ * 
+ * @return The artifact to resolve or {@code null}.
+ */
+public Artifact getArtifact()
+{
+return artifact;
+}
+
+/**
+ * Sets the artifact to resolve.
+ * 
+ * @param artifact The artifact to resolve, may be {@code null}.
+ * @return This request for chaining, never {@code null}.
+ */
+public ArtifactRequest setArtifact( Artifact artifact )
+{
+this.artifact = artifact;
+return this;
+}
+
+/**
+ * Gets the dependency node (if any) for which to resolve the artifact.
+ * 
+ * @return The dependency node to resolve or {@code null} if unknown.
+ */
+public DependencyNode getDependencyNode()
+{
+return node;
+}
+
+/**
+ * Sets the dependency node to resolve.
+ * 
+ * @param node The dependency node to resolve, may be {@code null}.
+ * @return This request for chaining, never {@code null}.
+ */
+public ArtifactRequest setDependencyNode( DependencyNode node )
+{
+this.node = node;
+if ( node != null )
+{
+setArtifact( node.getDependency().getArtifact() );
+}
+return this;
+}
+
+/**
+ * Gets the repositories to resolve the artifact from.
+ * 
+ * @return The repositories, never {@code null}.
+ */
+public List getRepositories()
+{
+return repositories;
+}
+
+/**
+ * Sets the repositories to resolve the artifact from.
+ * 
+ * @param repositories The repositories, may be {@code null}.
+ * @return This request for chaining, never {@code null}.
+

[35/53] [abbrv] [partial] maven-resolver git commit: [MNG-6007] renamed Aether to Maven Artifact Resolver

2017-01-15 Thread hboutemy
http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/3a1b8ae0/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultUpdatePolicyAnalyzer.java
--
diff --git 
a/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultUpdatePolicyAnalyzer.java
 
b/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultUpdatePolicyAnalyzer.java
deleted file mode 100644
index c2cdd83..000
--- 
a/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultUpdatePolicyAnalyzer.java
+++ /dev/null
@@ -1,158 +0,0 @@
-package org.eclipse.aether.internal.impl;
-
-/*
- * 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.util.Calendar;
-
-import javax.inject.Inject;
-import javax.inject.Named;
-
-import org.eclipse.aether.RepositorySystemSession;
-import org.eclipse.aether.impl.UpdatePolicyAnalyzer;
-import org.eclipse.aether.repository.RepositoryPolicy;
-import org.eclipse.aether.spi.locator.Service;
-import org.eclipse.aether.spi.locator.ServiceLocator;
-import org.eclipse.aether.spi.log.Logger;
-import org.eclipse.aether.spi.log.LoggerFactory;
-import org.eclipse.aether.spi.log.NullLoggerFactory;
-
-/**
- */
-@Named
-public class DefaultUpdatePolicyAnalyzer
-implements UpdatePolicyAnalyzer, Service
-{
-
-private Logger logger = NullLoggerFactory.LOGGER;
-
-public DefaultUpdatePolicyAnalyzer()
-{
-// enables default constructor
-}
-
-@Inject
-DefaultUpdatePolicyAnalyzer( LoggerFactory loggerFactory )
-{
-setLoggerFactory( loggerFactory );
-}
-
-public void initService( ServiceLocator locator )
-{
-setLoggerFactory( locator.getService( LoggerFactory.class ) );
-}
-
-public DefaultUpdatePolicyAnalyzer setLoggerFactory( LoggerFactory 
loggerFactory )
-{
-this.logger = NullLoggerFactory.getSafeLogger( loggerFactory, 
getClass() );
-return this;
-}
-
-public String getEffectiveUpdatePolicy( RepositorySystemSession session, 
String policy1, String policy2 )
-{
-return ordinalOfUpdatePolicy( policy1 ) < ordinalOfUpdatePolicy( 
policy2 ) ? policy1 : policy2;
-}
-
-private int ordinalOfUpdatePolicy( String policy )
-{
-if ( RepositoryPolicy.UPDATE_POLICY_DAILY.equals( policy ) )
-{
-return 1440;
-}
-else if ( RepositoryPolicy.UPDATE_POLICY_ALWAYS.equals( policy ) )
-{
-return 0;
-}
-else if ( policy != null && policy.startsWith( 
RepositoryPolicy.UPDATE_POLICY_INTERVAL ) )
-{
-return getMinutes( policy );
-}
-else
-{
-// assume "never"
-return Integer.MAX_VALUE;
-}
-}
-
-public boolean isUpdatedRequired( RepositorySystemSession session, long 
lastModified, String policy )
-{
-boolean checkForUpdates;
-
-if ( policy == null )
-{
-policy = "";
-}
-
-if ( RepositoryPolicy.UPDATE_POLICY_ALWAYS.equals( policy ) )
-{
-checkForUpdates = true;
-}
-else if ( RepositoryPolicy.UPDATE_POLICY_DAILY.equals( policy ) )
-{
-Calendar cal = Calendar.getInstance();
-cal.set( Calendar.HOUR_OF_DAY, 0 );
-cal.set( Calendar.MINUTE, 0 );
-cal.set( Calendar.SECOND, 0 );
-cal.set( Calendar.MILLISECOND, 0 );
-
-checkForUpdates = cal.getTimeInMillis() > lastModified;
-}
-else if ( policy.startsWith( RepositoryPolicy.UPDATE_POLICY_INTERVAL ) 
)
-{
-int minutes = getMinutes( policy );
-
-Calendar cal = Calendar.getInstance();
-cal.add( Calendar.MINUTE, -minutes );
-
-checkForUpdates = cal.getTimeInMillis() > lastModified;
-}
-else
-{
-// assume "never"
-checkForUpdates = false;
-
-if ( !RepositoryPolicy.UPDATE_POLICY_NEVER.equals( policy ) )
-{
-logger.warn( "Unknown repository update policy '" + policy + 
"', assuming '"
-+ 

[36/53] [abbrv] [partial] maven-resolver git commit: [MNG-6007] renamed Aether to Maven Artifact Resolver

2017-01-15 Thread hboutemy
http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/3a1b8ae0/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultRemoteRepositoryManager.java
--
diff --git 
a/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultRemoteRepositoryManager.java
 
b/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultRemoteRepositoryManager.java
deleted file mode 100644
index 148bf4d..000
--- 
a/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultRemoteRepositoryManager.java
+++ /dev/null
@@ -1,398 +0,0 @@
-package org.eclipse.aether.internal.impl;
-
-/*
- * 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.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.ListIterator;
-
-import javax.inject.Inject;
-import javax.inject.Named;
-
-import org.eclipse.aether.RepositoryCache;
-import org.eclipse.aether.RepositorySystemSession;
-import org.eclipse.aether.impl.RemoteRepositoryManager;
-import org.eclipse.aether.impl.UpdatePolicyAnalyzer;
-import org.eclipse.aether.repository.Authentication;
-import org.eclipse.aether.repository.AuthenticationSelector;
-import org.eclipse.aether.repository.MirrorSelector;
-import org.eclipse.aether.repository.Proxy;
-import org.eclipse.aether.repository.ProxySelector;
-import org.eclipse.aether.repository.RemoteRepository;
-import org.eclipse.aether.repository.RepositoryPolicy;
-import org.eclipse.aether.spi.connector.checksum.ChecksumPolicyProvider;
-import org.eclipse.aether.spi.locator.Service;
-import org.eclipse.aether.spi.locator.ServiceLocator;
-import org.eclipse.aether.spi.log.Logger;
-import org.eclipse.aether.spi.log.LoggerFactory;
-import org.eclipse.aether.spi.log.NullLoggerFactory;
-import org.eclipse.aether.util.StringUtils;
-
-/**
- */
-@Named
-public class DefaultRemoteRepositoryManager
-implements RemoteRepositoryManager, Service
-{
-
-private static final class LoggedMirror
-{
-
-private final Object[] keys;
-
-public LoggedMirror( RemoteRepository original, RemoteRepository 
mirror )
-{
-keys = new Object[] { mirror.getId(), mirror.getUrl(), 
original.getId(), original.getUrl() };
-}
-
-@Override
-public boolean equals( Object obj )
-{
-if ( this == obj )
-{
-return true;
-}
-else if ( !( obj instanceof LoggedMirror ) )
-{
-return false;
-}
-LoggedMirror that = (LoggedMirror) obj;
-return Arrays.equals( keys, that.keys );
-}
-
-@Override
-public int hashCode()
-{
-return Arrays.hashCode( keys );
-}
-
-}
-
-private Logger logger = NullLoggerFactory.LOGGER;
-
-private UpdatePolicyAnalyzer updatePolicyAnalyzer;
-
-private ChecksumPolicyProvider checksumPolicyProvider;
-
-public DefaultRemoteRepositoryManager()
-{
-// enables default constructor
-}
-
-@Inject
-DefaultRemoteRepositoryManager( UpdatePolicyAnalyzer updatePolicyAnalyzer,
-ChecksumPolicyProvider 
checksumPolicyProvider, LoggerFactory loggerFactory )
-{
-setUpdatePolicyAnalyzer( updatePolicyAnalyzer );
-setChecksumPolicyProvider( checksumPolicyProvider );
-setLoggerFactory( loggerFactory );
-}
-
-public void initService( ServiceLocator locator )
-{
-setLoggerFactory( locator.getService( LoggerFactory.class ) );
-setUpdatePolicyAnalyzer( locator.getService( 
UpdatePolicyAnalyzer.class ) );
-setChecksumPolicyProvider( locator.getService( 
ChecksumPolicyProvider.class ) );
-}
-
-public DefaultRemoteRepositoryManager setLoggerFactory( LoggerFactory 
loggerFactory )
-{
-this.logger = NullLoggerFactory.getSafeLogger( loggerFactory, 
getClass() );
-return this;
-}
-
-public DefaultRemoteRepositoryManager setUpdatePolicyAnalyzer( 
UpdatePolicyAnalyzer updatePolicyAnalyzer )
-{
-if ( updatePolicyAnalyzer == null )
-{
-throw new 

[13/53] [abbrv] [partial] maven-resolver git commit: [MNG-6007] renamed Aether to Maven Artifact Resolver

2017-01-15 Thread hboutemy
http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/3a1b8ae0/aether-util/src/main/java/org/eclipse/aether/util/graph/traverser/AndDependencyTraverser.java
--
diff --git 
a/aether-util/src/main/java/org/eclipse/aether/util/graph/traverser/AndDependencyTraverser.java
 
b/aether-util/src/main/java/org/eclipse/aether/util/graph/traverser/AndDependencyTraverser.java
deleted file mode 100644
index fb08b3b..000
--- 
a/aether-util/src/main/java/org/eclipse/aether/util/graph/traverser/AndDependencyTraverser.java
+++ /dev/null
@@ -1,207 +0,0 @@
-package org.eclipse.aether.util.graph.traverser;
-
-/*
- * 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.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.LinkedHashSet;
-import java.util.Set;
-
-import org.eclipse.aether.collection.DependencyCollectionContext;
-import org.eclipse.aether.collection.DependencyTraverser;
-import org.eclipse.aether.graph.Dependency;
-
-/**
- * A dependency traverser that combines zero or more other traversers using a 
logical {@code AND}. The resulting
- * traverser enables processing of child dependencies if and only if all 
constituent traversers request traversal.
- */
-public final class AndDependencyTraverser
-implements DependencyTraverser
-{
-
-private final Set traversers;
-
-private int hashCode;
-
-/**
- * Creates a new traverser from the specified traversers. Prefer
- * {@link #newInstance(DependencyTraverser, DependencyTraverser)} if any 
of the input traversers might be
- * {@code null}.
- * 
- * @param traversers The traversers to combine, may be {@code null} but 
must not contain {@code null} elements.
- */
-public AndDependencyTraverser( DependencyTraverser... traversers )
-{
-if ( traversers != null && traversers.length > 0 )
-{
-this.traversers = new LinkedHashSet( 
Arrays.asList( traversers ) );
-}
-else
-{
-this.traversers = Collections.emptySet();
-}
-}
-
-/**
- * Creates a new traverser from the specified traversers.
- * 
- * @param traversers The traversers to combine, may be {@code null} but 
must not contain {@code null} elements.
- */
-public AndDependencyTraverser( Collection 
traversers )
-{
-if ( traversers != null && !traversers.isEmpty() )
-{
-this.traversers = new LinkedHashSet( 
traversers );
-}
-else
-{
-this.traversers = Collections.emptySet();
-}
-}
-
-private AndDependencyTraverser( Set traversers )
-{
-if ( traversers != null && !traversers.isEmpty() )
-{
-this.traversers = traversers;
-}
-else
-{
-this.traversers = Collections.emptySet();
-}
-}
-
-/**
- * Creates a new traverser from the specified traversers.
- * 
- * @param traverser1 The first traverser to combine, may be {@code null}.
- * @param traverser2 The second traverser to combine, may be {@code null}.
- * @return The combined traverser or {@code null} if both traversers were 
{@code null}.
- */
-public static DependencyTraverser newInstance( DependencyTraverser 
traverser1, DependencyTraverser traverser2 )
-{
-if ( traverser1 == null )
-{
-return traverser2;
-}
-else if ( traverser2 == null || traverser2.equals( traverser1 ) )
-{
-return traverser1;
-}
-return new AndDependencyTraverser( traverser1, traverser2 );
-}
-
-public boolean traverseDependency( Dependency dependency )
-{
-for ( DependencyTraverser traverser : traversers )
-{
-if ( !traverser.traverseDependency( dependency ) )
-{
-return false;
-}
-}
-return true;
-}
-
-public DependencyTraverser deriveChildTraverser( 
DependencyCollectionContext context )
-{
-int seen = 0;
-Set childTraversers = null;
-
-for ( DependencyTraverser traverser : 

[17/53] [abbrv] [partial] maven-resolver git commit: [MNG-6007] renamed Aether to Maven Artifact Resolver

2017-01-15 Thread hboutemy
http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/3a1b8ae0/aether-transport-wagon/src/test/java/org/eclipse/aether/transport/wagon/MemStreamWagon.java
--
diff --git 
a/aether-transport-wagon/src/test/java/org/eclipse/aether/transport/wagon/MemStreamWagon.java
 
b/aether-transport-wagon/src/test/java/org/eclipse/aether/transport/wagon/MemStreamWagon.java
deleted file mode 100644
index 35efca1..000
--- 
a/aether-transport-wagon/src/test/java/org/eclipse/aether/transport/wagon/MemStreamWagon.java
+++ /dev/null
@@ -1,143 +0,0 @@
-package org.eclipse.aether.transport.wagon;
-
-/*
- * 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.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.UnsupportedEncodingException;
-import java.net.URI;
-import java.util.Map;
-import java.util.Properties;
-
-import org.apache.maven.wagon.ConnectionException;
-import org.apache.maven.wagon.InputData;
-import org.apache.maven.wagon.OutputData;
-import org.apache.maven.wagon.ResourceDoesNotExistException;
-import org.apache.maven.wagon.StreamWagon;
-import org.apache.maven.wagon.TransferFailedException;
-import org.apache.maven.wagon.authentication.AuthenticationException;
-import org.apache.maven.wagon.authorization.AuthorizationException;
-import org.apache.maven.wagon.resource.Resource;
-
-/**
- */
-public class MemStreamWagon
-extends StreamWagon
-implements Configurable
-{
-
-private Map fs;
-
-private Properties headers;
-
-private Object config;
-
-public void setConfiguration( Object config )
-{
-this.config = config;
-}
-
-public Object getConfiguration()
-{
-return config;
-}
-
-public void setHttpHeaders( Properties httpHeaders )
-{
-headers = httpHeaders;
-}
-
-@Override
-protected void openConnectionInternal()
-throws ConnectionException, AuthenticationException
-{
-fs =
-MemWagonUtils.openConnection( this, getAuthenticationInfo(),
-  getProxyInfo( "mem", 
getRepository().getHost() ), headers );
-}
-
-@Override
-public void closeConnection()
-throws ConnectionException
-{
-fs = null;
-}
-
-private String getData( String resource )
-{
-return fs.get( URI.create( resource ).getSchemeSpecificPart() );
-}
-
-@Override
-public boolean resourceExists( String resourceName )
-throws TransferFailedException, AuthorizationException
-{
-String data = getData( resourceName );
-return data != null;
-}
-
-@Override
-public void fillInputData( InputData inputData )
-throws TransferFailedException, ResourceDoesNotExistException, 
AuthorizationException
-{
-String data = getData( inputData.getResource().getName() );
-if ( data == null )
-{
-throw new ResourceDoesNotExistException( "Missing resource: " + 
inputData.getResource().getName() );
-}
-byte[] bytes;
-try
-{
-bytes = data.getBytes( "UTF-8" );
-}
-catch ( UnsupportedEncodingException e )
-{
-throw new TransferFailedException( e.getMessage(), e );
-}
-inputData.getResource().setContentLength( bytes.length );
-inputData.setInputStream( new ByteArrayInputStream( bytes ) );
-}
-
-@Override
-public void fillOutputData( OutputData outputData )
-throws TransferFailedException
-{
-outputData.setOutputStream( new ByteArrayOutputStream() );
-}
-
-@Override
-protected void finishPutTransfer( Resource resource, InputStream input, 
OutputStream output )
-throws TransferFailedException, AuthorizationException, 
ResourceDoesNotExistException
-{
-String data;
-try
-{
-data = ( (ByteArrayOutputStream) output ).toString( "UTF-8" );
-}
-catch ( UnsupportedEncodingException e )
-{
-throw new TransferFailedException( 

[31/53] [abbrv] [partial] maven-resolver git commit: [MNG-6007] renamed Aether to Maven Artifact Resolver

2017-01-15 Thread hboutemy
http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/3a1b8ae0/aether-impl/src/test/java/org/eclipse/aether/internal/impl/PrioritizedComponentsTest.java
--
diff --git 
a/aether-impl/src/test/java/org/eclipse/aether/internal/impl/PrioritizedComponentsTest.java
 
b/aether-impl/src/test/java/org/eclipse/aether/internal/impl/PrioritizedComponentsTest.java
deleted file mode 100644
index 3f5a093..000
--- 
a/aether-impl/src/test/java/org/eclipse/aether/internal/impl/PrioritizedComponentsTest.java
+++ /dev/null
@@ -1,115 +0,0 @@
-package org.eclipse.aether.internal.impl;
-
-/*
- * 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 static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertSame;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.ThreadFactory;
-
-import org.eclipse.aether.ConfigurationProperties;
-import org.junit.Test;
-
-public class PrioritizedComponentsTest
-{
-
-@Test
-public void testGetConfigKeys()
-{
-String[] keys =
-{ ConfigurationProperties.PREFIX_PRIORITY + "java.lang.String",
-ConfigurationProperties.PREFIX_PRIORITY + "String" };
-assertArrayEquals( keys, PrioritizedComponents.getConfigKeys( 
String.class ) );
-
-keys =
-new String[] { ConfigurationProperties.PREFIX_PRIORITY + 
"java.util.concurrent.ThreadFactory",
-ConfigurationProperties.PREFIX_PRIORITY + "ThreadFactory",
-ConfigurationProperties.PREFIX_PRIORITY + "Thread" };
-assertArrayEquals( keys, PrioritizedComponents.getConfigKeys( 
ThreadFactory.class ) );
-}
-
-@Test
-public void testAdd_PriorityOverride()
-{
-Exception comp1 = new IllegalArgumentException();
-Exception comp2 = new NullPointerException();
-Map config = new HashMap();
-config.put( ConfigurationProperties.PREFIX_PRIORITY + 
comp1.getClass().getName(), 6 );
-config.put( ConfigurationProperties.PREFIX_PRIORITY + 
comp2.getClass().getName(), 7 );
-PrioritizedComponents components = new 
PrioritizedComponents( config );
-components.add( comp1, 1 );
-components.add( comp2, 0 );
-List sorted = components.getEnabled();
-assertEquals( 2, sorted.size() );
-assertSame( comp2, sorted.get( 0 ).getComponent() );
-assertEquals( 7, sorted.get( 0 ).getPriority(), 0.1f );
-assertSame( comp1, sorted.get( 1 ).getComponent() );
-assertEquals( 6, sorted.get( 1 ).getPriority(), 0.1f );
-}
-
-@Test
-public void testAdd_ImplicitPriority()
-{
-Exception comp1 = new IllegalArgumentException();
-Exception comp2 = new NullPointerException();
-Map config = new HashMap();
-config.put( ConfigurationProperties.IMPLICIT_PRIORITIES, true );
-PrioritizedComponents components = new 
PrioritizedComponents( config );
-components.add( comp1, 1 );
-components.add( comp2, 2 );
-List sorted = components.getEnabled();
-assertEquals( 2, sorted.size() );
-assertSame( comp1, sorted.get( 0 ).getComponent() );
-assertSame( comp2, sorted.get( 1 ).getComponent() );
-}
-
-@Test
-public void testAdd_Disabled()
-{
-Exception comp1 = new IllegalArgumentException();
-Exception comp2 = new NullPointerException();
-Map config = new HashMap();
-PrioritizedComponents components = new 
PrioritizedComponents( config );
-
-components.add( new UnsupportedOperationException(), Float.NaN );
-List sorted = components.getEnabled();
-assertEquals( 0, sorted.size() );
-
-components.add( comp1, 1 );
-sorted = components.getEnabled();
-assertEquals( 1, sorted.size() );
-assertSame( comp1, sorted.get( 0 ).getComponent() );
-
-components.add( new Exception(), 

[42/53] [abbrv] [partial] maven-resolver git commit: [MNG-6007] renamed Aether to Maven Artifact Resolver

2017-01-15 Thread hboutemy
http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/3a1b8ae0/aether-api/src/test/java/org/eclipse/aether/DefaultRepositorySystemSessionTest.java
--
diff --git 
a/aether-api/src/test/java/org/eclipse/aether/DefaultRepositorySystemSessionTest.java
 
b/aether-api/src/test/java/org/eclipse/aether/DefaultRepositorySystemSessionTest.java
deleted file mode 100644
index 91afeb5..000
--- 
a/aether-api/src/test/java/org/eclipse/aether/DefaultRepositorySystemSessionTest.java
+++ /dev/null
@@ -1,127 +0,0 @@
-package org.eclipse.aether;
-
-/*
- * 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 static org.junit.Assert.*;
-
-import java.util.Map;
-
-import org.eclipse.aether.repository.Authentication;
-import org.eclipse.aether.repository.AuthenticationContext;
-import org.eclipse.aether.repository.AuthenticationDigest;
-import org.eclipse.aether.repository.Proxy;
-import org.eclipse.aether.repository.RemoteRepository;
-import org.junit.Test;
-
-/**
- */
-public class DefaultRepositorySystemSessionTest
-{
-
-@Test
-public void testDefaultProxySelectorUsesExistingProxy()
-{
-DefaultRepositorySystemSession session = new 
DefaultRepositorySystemSession();
-
-RemoteRepository repo = new RemoteRepository.Builder( "id", "default", 
"void" ).build();
-assertSame( null, session.getProxySelector().getProxy( repo ) );
-
-Proxy proxy = new Proxy( "http", "localhost", 8080, null );
-repo = new RemoteRepository.Builder( repo ).setProxy( proxy ).build();
-assertSame( proxy, session.getProxySelector().getProxy( repo ) );
-}
-
-@Test
-public void testDefaultAuthenticationSelectorUsesExistingAuth()
-{
-DefaultRepositorySystemSession session = new 
DefaultRepositorySystemSession();
-
-RemoteRepository repo = new RemoteRepository.Builder( "id", "default", 
"void" ).build();
-assertSame( null, 
session.getAuthenticationSelector().getAuthentication( repo ) );
-
-Authentication auth = new Authentication()
-{
-public void fill( AuthenticationContext context, String key, 
Map data )
-{
-}
-
-public void digest( AuthenticationDigest digest )
-{
-}
-};
-repo = new RemoteRepository.Builder( repo ).setAuthentication( auth 
).build();
-assertSame( auth, 
session.getAuthenticationSelector().getAuthentication( repo ) );
-}
-
-@Test
-public void testCopyConstructorCopiesPropertiesDeep()
-{
-DefaultRepositorySystemSession session1 = new 
DefaultRepositorySystemSession();
-session1.setUserProperties( System.getProperties() );
-session1.setSystemProperties( System.getProperties() );
-session1.setConfigProperties( System.getProperties() );
-
-DefaultRepositorySystemSession session2 = new 
DefaultRepositorySystemSession( session1 );
-session2.setUserProperty( "key", "test" );
-session2.setSystemProperty( "key", "test" );
-session2.setConfigProperty( "key", "test" );
-
-assertEquals( null, session1.getUserProperties().get( "key" ) );
-assertEquals( null, session1.getSystemProperties().get( "key" ) );
-assertEquals( null, session1.getConfigProperties().get( "key" ) );
-}
-
-@Test
-public void testReadOnlyProperties()
-{
-DefaultRepositorySystemSession session = new 
DefaultRepositorySystemSession();
-
-try
-{
-session.getUserProperties().put( "key", "test" );
-fail( "user properties are modifiable" );
-}
-catch ( UnsupportedOperationException e )
-{
-// expected
-}
-
-try
-{
-session.getSystemProperties().put( "key", "test" );
-fail( "system properties are modifiable" );
-}
-catch ( UnsupportedOperationException e )
-{
-// expected
-}
-
-try
-{
-session.getConfigProperties().put( "key", "test" );
-fail( "config properties are modifiable" );
-}
-

[09/53] [abbrv] [partial] maven-resolver git commit: [MNG-6007] renamed Aether to Maven Artifact Resolver

2017-01-15 Thread hboutemy
http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/3a1b8ae0/aether-util/src/test/java/org/eclipse/aether/util/graph/versions/AbstractVersionFilterTest.java
--
diff --git 
a/aether-util/src/test/java/org/eclipse/aether/util/graph/versions/AbstractVersionFilterTest.java
 
b/aether-util/src/test/java/org/eclipse/aether/util/graph/versions/AbstractVersionFilterTest.java
deleted file mode 100644
index 13fd4b0..000
--- 
a/aether-util/src/test/java/org/eclipse/aether/util/graph/versions/AbstractVersionFilterTest.java
+++ /dev/null
@@ -1,96 +0,0 @@
-package org.eclipse.aether.util.graph.versions;
-
-/*
- * 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 static org.junit.Assert.*;
-
-import java.util.Iterator;
-
-import org.eclipse.aether.DefaultRepositorySystemSession;
-import org.eclipse.aether.artifact.DefaultArtifact;
-import org.eclipse.aether.collection.VersionFilter;
-import org.eclipse.aether.graph.Dependency;
-import org.eclipse.aether.internal.test.util.TestUtils;
-import org.eclipse.aether.resolution.VersionRangeRequest;
-import org.eclipse.aether.resolution.VersionRangeResult;
-import org.eclipse.aether.util.version.GenericVersionScheme;
-import org.eclipse.aether.version.InvalidVersionSpecificationException;
-import org.eclipse.aether.version.Version;
-import org.eclipse.aether.version.VersionScheme;
-import org.junit.After;
-import org.junit.Before;
-
-public abstract class AbstractVersionFilterTest
-{
-
-protected DefaultRepositorySystemSession session;
-
-@Before
-public void setUp()
-{
-session = TestUtils.newSession();
-}
-
-@After
-public void tearDown()
-{
-session = null;
-}
-
-protected VersionFilter.VersionFilterContext newContext( String gav, 
String... versions )
-{
-VersionRangeRequest request = new VersionRangeRequest();
-request.setArtifact( new DefaultArtifact( gav ) );
-VersionRangeResult result = new VersionRangeResult( request );
-VersionScheme scheme = new GenericVersionScheme();
-try
-{
-result.setVersionConstraint( scheme.parseVersionConstraint( 
request.getArtifact().getVersion() ) );
-for ( String version : versions )
-{
-result.addVersion( scheme.parseVersion( version ) );
-}
-}
-catch ( InvalidVersionSpecificationException e )
-{
-throw new IllegalArgumentException( e );
-}
-return TestUtils.newVersionFilterContext( session, result );
-}
-
-protected VersionFilter derive( VersionFilter filter, String gav )
-{
-return filter.deriveChildFilter( TestUtils.newCollectionContext( 
session,
- new 
Dependency( new DefaultArtifact( gav ), "" ),
- null 
) );
-}
-
-protected void assertVersions( VersionFilter.VersionFilterContext context, 
String... versions )
-{
-assertEquals( versions.length, context.getCount() );
-Iterator it = context.iterator();
-for ( String version : versions )
-{
-assertTrue( it.hasNext() );
-assertEquals( version, it.next().toString() );
-}
-}
-
-}

http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/3a1b8ae0/aether-util/src/test/java/org/eclipse/aether/util/graph/versions/ChainedVersionFilterTest.java
--
diff --git 
a/aether-util/src/test/java/org/eclipse/aether/util/graph/versions/ChainedVersionFilterTest.java
 
b/aether-util/src/test/java/org/eclipse/aether/util/graph/versions/ChainedVersionFilterTest.java
deleted file mode 100644
index 1e8a5bd..000
--- 
a/aether-util/src/test/java/org/eclipse/aether/util/graph/versions/ChainedVersionFilterTest.java
+++ /dev/null
@@ -1,85 +0,0 @@
-package org.eclipse.aether.util.graph.versions;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed 

[22/53] [abbrv] [partial] maven-resolver git commit: [MNG-6007] renamed Aether to Maven Artifact Resolver

2017-01-15 Thread hboutemy
http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/3a1b8ae0/aether-test-util/src/main/java/org/eclipse/aether/internal/test/util/NodeBuilder.java
--
diff --git 
a/aether-test-util/src/main/java/org/eclipse/aether/internal/test/util/NodeBuilder.java
 
b/aether-test-util/src/main/java/org/eclipse/aether/internal/test/util/NodeBuilder.java
deleted file mode 100644
index fdd988a..000
--- 
a/aether-test-util/src/main/java/org/eclipse/aether/internal/test/util/NodeBuilder.java
+++ /dev/null
@@ -1,164 +0,0 @@
-package org.eclipse.aether.internal.test.util;
-
-/*
- * 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.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.aether.artifact.Artifact;
-import org.eclipse.aether.artifact.DefaultArtifact;
-import org.eclipse.aether.graph.DefaultDependencyNode;
-import org.eclipse.aether.graph.Dependency;
-import org.eclipse.aether.graph.DependencyNode;
-import org.eclipse.aether.version.InvalidVersionSpecificationException;
-import org.eclipse.aether.version.VersionScheme;
-
-/**
- * A builder to create dependency nodes for unit testing.
- */
-public class NodeBuilder
-{
-
-private String groupId = "test";
-
-private String artifactId = "";
-
-private String version = "0.1";
-
-private String range;
-
-private String ext = "jar";
-
-private String classifier = "";
-
-private String scope = "compile";
-
-private boolean optional = false;
-
-private String context;
-
-private List relocations = new ArrayList();
-
-private VersionScheme versionScheme = new TestVersionScheme();
-
-private Map properties = new HashMap( 0 );
-
-public NodeBuilder artifactId( String artifactId )
-{
-this.artifactId = artifactId;
-return this;
-}
-
-public NodeBuilder groupId( String groupId )
-{
-this.groupId = groupId;
-return this;
-
-}
-
-public NodeBuilder ext( String ext )
-{
-this.ext = ext;
-return this;
-}
-
-public NodeBuilder version( String version )
-{
-this.version = version;
-this.range = null;
-return this;
-}
-
-public NodeBuilder range( String range )
-{
-this.range = range;
-return this;
-}
-
-public NodeBuilder scope( String scope )
-{
-this.scope = scope;
-return this;
-}
-
-public NodeBuilder optional( boolean optional )
-{
-this.optional = optional;
-return this;
-}
-
-public NodeBuilder context( String context )
-{
-this.context = context;
-return this;
-}
-
-public NodeBuilder reloc( String artifactId )
-{
-Artifact relocation = new DefaultArtifact( groupId, artifactId, 
classifier, ext, version );
-relocations.add( relocation );
-return this;
-}
-
-public NodeBuilder reloc( String groupId, String artifactId, String 
version )
-{
-Artifact relocation = new DefaultArtifact( groupId, artifactId, 
classifier, ext, version );
-relocations.add( relocation );
-return this;
-}
-
-public NodeBuilder properties( Map properties )
-{
-this.properties = properties != null ? properties : 
Collections.emptyMap();
-return this;
-}
-
-public DependencyNode build()
-{
-Dependency dependency = null;
-if ( artifactId != null && artifactId.length() > 0 )
-{
-Artifact artifact =
-new DefaultArtifact( groupId, artifactId, classifier, ext, 
version, properties, (File) null );
-dependency = new Dependency( artifact, scope, optional );
-}
-DefaultDependencyNode node = new DefaultDependencyNode( dependency );
-if ( artifactId != null && artifactId.length() > 0 )
-{
-try
-{
-node.setVersion( versionScheme.parseVersion( version ) );
-

[18/53] [abbrv] [partial] maven-resolver git commit: [MNG-6007] renamed Aether to Maven Artifact Resolver

2017-01-15 Thread hboutemy
http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/3a1b8ae0/aether-transport-http/src/test/java/org/eclipse/aether/transport/http/UriUtilsTest.java
--
diff --git 
a/aether-transport-http/src/test/java/org/eclipse/aether/transport/http/UriUtilsTest.java
 
b/aether-transport-http/src/test/java/org/eclipse/aether/transport/http/UriUtilsTest.java
deleted file mode 100644
index e3ea9fa..000
--- 
a/aether-transport-http/src/test/java/org/eclipse/aether/transport/http/UriUtilsTest.java
+++ /dev/null
@@ -1,137 +0,0 @@
-package org.eclipse.aether.transport.http;
-
-/*
- * 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 static org.junit.Assert.*;
-
-import java.net.URI;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import org.junit.Test;
-
-public class UriUtilsTest
-{
-
-private String resolve( URI base, String ref )
-{
-return UriUtils.resolve( base, URI.create( ref ) ).toString();
-}
-
-@Test
-public void testResolve_BaseEmptyPath()
-{
-URI base = URI.create( "http://host; );
-assertEquals( "http://host/file.jar;, resolve( base, "file.jar" ) );
-assertEquals( "http://host/dir/file.jar;, resolve( base, 
"dir/file.jar" ) );
-assertEquals( "http://host?arg=val;, resolve( base, "?arg=val" ) );
-assertEquals( "http://host/file?arg=val;, resolve( base, 
"file?arg=val" ) );
-assertEquals( "http://host/dir/file?arg=val;, resolve( base, 
"dir/file?arg=val" ) );
-}
-
-@Test
-public void testResolve_BaseRootPath()
-{
-URI base = URI.create( "http://host/; );
-assertEquals( "http://host/file.jar;, resolve( base, "file.jar" ) );
-assertEquals( "http://host/dir/file.jar;, resolve( base, 
"dir/file.jar" ) );
-assertEquals( "http://host/?arg=val;, resolve( base, "?arg=val" ) );
-assertEquals( "http://host/file?arg=val;, resolve( base, 
"file?arg=val" ) );
-assertEquals( "http://host/dir/file?arg=val;, resolve( base, 
"dir/file?arg=val" ) );
-}
-
-@Test
-public void testResolve_BasePathTrailingSlash()
-{
-URI base = URI.create( "http://host/sub/dir/; );
-assertEquals( "http://host/sub/dir/file.jar;, resolve( base, 
"file.jar" ) );
-assertEquals( "http://host/sub/dir/dir/file.jar;, resolve( base, 
"dir/file.jar" ) );
-assertEquals( "http://host/sub/dir/?arg=val;, resolve( base, 
"?arg=val" ) );
-assertEquals( "http://host/sub/dir/file?arg=val;, resolve( base, 
"file?arg=val" ) );
-assertEquals( "http://host/sub/dir/dir/file?arg=val;, resolve( base, 
"dir/file?arg=val" ) );
-}
-
-@Test
-public void testResolve_BasePathNoTrailingSlash()
-{
-URI base = URI.create( "http://host/sub/d%20r; );
-assertEquals( "http://host/sub/d%20r/file.jar;, resolve( base, 
"file.jar" ) );
-assertEquals( "http://host/sub/d%20r/dir/file.jar;, resolve( base, 
"dir/file.jar" ) );
-assertEquals( "http://host/sub/d%20r?arg=val;, resolve( base, 
"?arg=val" ) );
-assertEquals( "http://host/sub/d%20r/file?arg=val;, resolve( base, 
"file?arg=val" ) );
-assertEquals( "http://host/sub/d%20r/dir/file?arg=val;, resolve( base, 
"dir/file?arg=val" ) );
-}
-
-private List getDirs( String base, String uri )
-{
-return UriUtils.getDirectories( ( base != null ) ? URI.create( base ) 
: null, URI.create( uri ) );
-}
-
-private void assertUris( List actual, String... expected )
-{
-List uris = new ArrayList( actual.size() );
-for ( URI uri : actual )
-{
-uris.add( uri.toString() );
-}
-assertEquals( Arrays.asList( expected ), uris );
-}
-
-@Test
-public void testGetDirectories_NoBase()
-{
-List parents = getDirs( null, "http://host/repo/sub/dir/file.jar; 
);
-assertUris( parents, "http://host/repo/sub/dir/;, 
"http://host/repo/sub/;, "http://host/repo/; );
-
-parents = getDirs( null, "http://host/repo/sub/dir/?file.jar; );
-assertUris( parents, "http://host/repo/sub/dir/;, 
"http://host/repo/sub/;, 

[20/53] [abbrv] [partial] maven-resolver git commit: [MNG-6007] renamed Aether to Maven Artifact Resolver

2017-01-15 Thread hboutemy
http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/3a1b8ae0/aether-transport-file/src/test/java/org/eclipse/aether/transport/file/FileTransporterTest.java
--
diff --git 
a/aether-transport-file/src/test/java/org/eclipse/aether/transport/file/FileTransporterTest.java
 
b/aether-transport-file/src/test/java/org/eclipse/aether/transport/file/FileTransporterTest.java
deleted file mode 100644
index 6c4e361..000
--- 
a/aether-transport-file/src/test/java/org/eclipse/aether/transport/file/FileTransporterTest.java
+++ /dev/null
@@ -1,554 +0,0 @@
-package org.eclipse.aether.transport.file;
-
-/*
- * 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 static org.junit.Assert.*;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.net.URI;
-
-import org.eclipse.aether.DefaultRepositorySystemSession;
-import org.eclipse.aether.internal.test.util.TestFileUtils;
-import org.eclipse.aether.internal.test.util.TestLoggerFactory;
-import org.eclipse.aether.internal.test.util.TestUtils;
-import org.eclipse.aether.repository.RemoteRepository;
-import org.eclipse.aether.spi.connector.transport.GetTask;
-import org.eclipse.aether.spi.connector.transport.PeekTask;
-import org.eclipse.aether.spi.connector.transport.PutTask;
-import org.eclipse.aether.spi.connector.transport.Transporter;
-import org.eclipse.aether.spi.connector.transport.TransporterFactory;
-import org.eclipse.aether.transfer.NoTransporterException;
-import org.eclipse.aether.transfer.TransferCancelledException;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-/**
- */
-public class FileTransporterTest
-{
-
-private DefaultRepositorySystemSession session;
-
-private TransporterFactory factory;
-
-private Transporter transporter;
-
-private File repoDir;
-
-private RemoteRepository newRepo( String url )
-{
-return new RemoteRepository.Builder( "test", "default", url ).build();
-}
-
-private void newTransporter( String url )
-throws Exception
-{
-if ( transporter != null )
-{
-transporter.close();
-transporter = null;
-}
-transporter = factory.newInstance( session, newRepo( url ) );
-}
-
-@Before
-public void setUp()
-throws Exception
-{
-session = TestUtils.newSession();
-factory = new FileTransporterFactory( new TestLoggerFactory() );
-repoDir = TestFileUtils.createTempDir();
-TestFileUtils.writeString( new File( repoDir, "file.txt" ), "test" );
-TestFileUtils.writeString( new File( repoDir, "empty.txt" ), "" );
-TestFileUtils.writeString( new File( repoDir, "some space.txt" ), 
"space" );
-newTransporter( repoDir.toURI().toString() );
-}
-
-@After
-public void tearDown()
-{
-if ( transporter != null )
-{
-transporter.close();
-transporter = null;
-}
-factory = null;
-session = null;
-}
-
-@Test
-public void testClassify()
-throws Exception
-{
-assertEquals( Transporter.ERROR_OTHER, transporter.classify( new 
FileNotFoundException() ) );
-assertEquals( Transporter.ERROR_NOT_FOUND, transporter.classify( new 
ResourceNotFoundException( "test" ) ) );
-}
-
-@Test
-public void testPeek()
-throws Exception
-{
-transporter.peek( new PeekTask( URI.create( "file.txt" ) ) );
-}
-
-@Test
-public void testPeek_NotFound()
-throws Exception
-{
-try
-{
-transporter.peek( new PeekTask( URI.create( "missing.txt" ) ) );
-fail( "Expected error" );
-}
-catch ( ResourceNotFoundException e )
-{
-assertEquals( Transporter.ERROR_NOT_FOUND, transporter.classify( e 
) );
-}
-}
-
-@Test
-public void testPeek_Closed()
-throws Exception
-{
-transporter.close();
-try
-{
-transporter.peek( new PeekTask( URI.create( "missing.txt" ) ) );
-fail( "Expected error" );
-}
-catch ( 

[45/53] [abbrv] [partial] maven-resolver git commit: [MNG-6007] renamed Aether to Maven Artifact Resolver

2017-01-15 Thread hboutemy
http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/3a1b8ae0/aether-api/src/main/java/org/eclipse/aether/repository/RemoteRepository.java
--
diff --git 
a/aether-api/src/main/java/org/eclipse/aether/repository/RemoteRepository.java 
b/aether-api/src/main/java/org/eclipse/aether/repository/RemoteRepository.java
deleted file mode 100644
index 31259ca..000
--- 
a/aether-api/src/main/java/org/eclipse/aether/repository/RemoteRepository.java
+++ /dev/null
@@ -1,582 +0,0 @@
-package org.eclipse.aether.repository;
-
-/*
- * 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.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-/**
- * A repository on a remote server.
- */
-public final class RemoteRepository
-implements ArtifactRepository
-{
-
-private static final Pattern URL_PATTERN =
-Pattern.compile( 
"([^:/]+(:[^:/]{2,}+(?=://))?):(//([^@/]*@)?([^/:]+))?.*" );
-
-private final String id;
-
-private final String type;
-
-private final String url;
-
-private final String host;
-
-private final String protocol;
-
-private final RepositoryPolicy releasePolicy;
-
-private final RepositoryPolicy snapshotPolicy;
-
-private final Proxy proxy;
-
-private final Authentication authentication;
-
-private final List mirroredRepositories;
-
-private final boolean repositoryManager;
-
-RemoteRepository( Builder builder )
-{
-if ( builder.prototype != null )
-{
-id = ( builder.delta & Builder.ID ) != 0 ? builder.id : 
builder.prototype.id;
-type = ( builder.delta & Builder.TYPE ) != 0 ? builder.type : 
builder.prototype.type;
-url = ( builder.delta & Builder.URL ) != 0 ? builder.url : 
builder.prototype.url;
-releasePolicy =
-( builder.delta & Builder.RELEASES ) != 0 ? 
builder.releasePolicy : builder.prototype.releasePolicy;
-snapshotPolicy =
-( builder.delta & Builder.SNAPSHOTS ) != 0 ? 
builder.snapshotPolicy : builder.prototype.snapshotPolicy;
-proxy = ( builder.delta & Builder.PROXY ) != 0 ? builder.proxy : 
builder.prototype.proxy;
-authentication =
-( builder.delta & Builder.AUTH ) != 0 ? builder.authentication 
: builder.prototype.authentication;
-repositoryManager =
-( builder.delta & Builder.REPOMAN ) != 0 ? 
builder.repositoryManager
-: builder.prototype.repositoryManager;
-mirroredRepositories =
-( builder.delta & Builder.MIRRORED ) != 0 ? copy( 
builder.mirroredRepositories )
-: builder.prototype.mirroredRepositories;
-}
-else
-{
-id = builder.id;
-type = builder.type;
-url = builder.url;
-releasePolicy = builder.releasePolicy;
-snapshotPolicy = builder.snapshotPolicy;
-proxy = builder.proxy;
-authentication = builder.authentication;
-repositoryManager = builder.repositoryManager;
-mirroredRepositories = copy( builder.mirroredRepositories );
-}
-
-Matcher m = URL_PATTERN.matcher( url );
-if ( m.matches() )
-{
-protocol = m.group( 1 );
-String host = m.group( 5 );
-this.host = ( host != null ) ? host : "";
-}
-else
-{
-protocol = host = "";
-}
-}
-
-private static List copy( List repos )
-{
-if ( repos == null || repos.isEmpty() )
-{
-return Collections.emptyList();
-}
-return Collections.unmodifiableList( Arrays.asList( repos.toArray( new 
RemoteRepository[repos.size()] ) ) );
-}
-
-public String getId()
-{
-return id;
-}
-
-public String getContentType()
-{
-return type;
-}
-
-/**
- * Gets the (base) URL of this repository.
- * 
- * @return The (base) URL of this 

[33/53] [abbrv] [partial] maven-resolver git commit: [MNG-6007] renamed Aether to Maven Artifact Resolver

2017-01-15 Thread hboutemy
http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/3a1b8ae0/aether-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultDependencyCollectorTest.java
--
diff --git 
a/aether-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultDependencyCollectorTest.java
 
b/aether-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultDependencyCollectorTest.java
deleted file mode 100644
index b78838a..000
--- 
a/aether-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultDependencyCollectorTest.java
+++ /dev/null
@@ -1,569 +0,0 @@
-package org.eclipse.aether.internal.impl;
-
-/*
- * 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 static org.junit.Assert.*;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.aether.DefaultRepositorySystemSession;
-import org.eclipse.aether.RepositorySystemSession;
-import org.eclipse.aether.artifact.Artifact;
-import org.eclipse.aether.artifact.ArtifactProperties;
-import org.eclipse.aether.artifact.DefaultArtifact;
-import org.eclipse.aether.collection.CollectRequest;
-import org.eclipse.aether.collection.CollectResult;
-import org.eclipse.aether.collection.DependencyCollectionContext;
-import org.eclipse.aether.collection.DependencyCollectionException;
-import org.eclipse.aether.collection.DependencyManagement;
-import org.eclipse.aether.collection.DependencyManager;
-import org.eclipse.aether.graph.Dependency;
-import org.eclipse.aether.graph.DependencyCycle;
-import org.eclipse.aether.graph.DependencyNode;
-import org.eclipse.aether.graph.Exclusion;
-import org.eclipse.aether.impl.ArtifactDescriptorReader;
-import org.eclipse.aether.internal.test.util.DependencyGraphParser;
-import org.eclipse.aether.internal.test.util.TestLoggerFactory;
-import org.eclipse.aether.internal.test.util.TestUtils;
-import org.eclipse.aether.repository.RemoteRepository;
-import org.eclipse.aether.resolution.ArtifactDescriptorException;
-import org.eclipse.aether.resolution.ArtifactDescriptorRequest;
-import org.eclipse.aether.resolution.ArtifactDescriptorResult;
-import org.eclipse.aether.util.artifact.ArtifactIdUtils;
-import org.eclipse.aether.util.graph.manager.ClassicDependencyManager;
-import org.eclipse.aether.util.graph.manager.DependencyManagerUtils;
-import org.eclipse.aether.util.graph.version.HighestVersionFilter;
-import org.junit.Before;
-import org.junit.Test;
-
-/**
- */
-public class DefaultDependencyCollectorTest
-{
-
-private DefaultDependencyCollector collector;
-
-private DefaultRepositorySystemSession session;
-
-private DependencyGraphParser parser;
-
-private RemoteRepository repository;
-
-private IniArtifactDescriptorReader newReader( String prefix )
-{
-return new IniArtifactDescriptorReader( "artifact-descriptions/" + 
prefix );
-}
-
-private Dependency newDep( String coords )
-{
-return newDep( coords, "" );
-}
-
-private Dependency newDep( String coords, String scope )
-{
-return new Dependency( new DefaultArtifact( coords ), scope );
-}
-
-@Before
-public void setup()
-throws IOException
-{
-session = TestUtils.newSession();
-
-collector = new DefaultDependencyCollector();
-collector.setArtifactDescriptorReader( newReader( "" ) );
-collector.setVersionRangeResolver( new StubVersionRangeResolver() );
-collector.setRemoteRepositoryManager( new 
StubRemoteRepositoryManager() );
-collector.setLoggerFactory( new TestLoggerFactory() );
-
-parser = new DependencyGraphParser( "artifact-descriptions/" );
-
-repository = new RemoteRepository.Builder( "id", "default", "file:///" 
).build();
-}
-
-private static void assertEqualSubtree( DependencyNode expected, 
DependencyNode actual )
-{
-assertEqualSubtree( expected, actual, new LinkedList() 
);
-}
-
-private static void assertEqualSubtree( 

[07/53] [abbrv] [partial] maven-resolver git commit: [MNG-6007] renamed Aether to Maven Artifact Resolver

2017-01-15 Thread hboutemy
http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/3a1b8ae0/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
new file mode 100644
index 000..e78df3a
--- /dev/null
+++ 
b/maven-resolver-api/src/main/java/org/eclipse/aether/DefaultSessionData.java
@@ -0,0 +1,91 @@
+package org.eclipse.aether;
+
+/*
+ * 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.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+
+/**
+ * A simple session data storage backed by a thread-safe map.
+ */
+public final class DefaultSessionData
+implements SessionData
+{
+
+private final ConcurrentMap data;
+
+public DefaultSessionData()
+{
+data = new ConcurrentHashMap();
+}
+
+public void set( Object key, Object value )
+{
+if ( key == null )
+{
+throw new IllegalArgumentException( "key must not be null" );
+}
+
+if ( value != null )
+{
+data.put( key, value );
+}
+else
+{
+data.remove( key );
+}
+}
+
+public boolean set( Object key, Object oldValue, Object newValue )
+{
+if ( key == null )
+{
+throw new IllegalArgumentException( "key must not be null" );
+}
+
+if ( newValue != null )
+{
+if ( oldValue == null )
+{
+return data.putIfAbsent( key, newValue ) == null;
+}
+return data.replace( key, oldValue, newValue );
+}
+else
+{
+if ( oldValue == null )
+{
+return !data.containsKey( key );
+}
+return data.remove( key, oldValue );
+}
+}
+
+public Object get( Object key )
+{
+if ( key == null )
+{
+throw new IllegalArgumentException( "key must not be null" );
+}
+
+return data.get( key );
+}
+
+}

http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/3a1b8ae0/maven-resolver-api/src/main/java/org/eclipse/aether/RepositoryCache.java
--
diff --git 
a/maven-resolver-api/src/main/java/org/eclipse/aether/RepositoryCache.java 
b/maven-resolver-api/src/main/java/org/eclipse/aether/RepositoryCache.java
new file mode 100644
index 000..6f9f114
--- /dev/null
+++ b/maven-resolver-api/src/main/java/org/eclipse/aether/RepositoryCache.java
@@ -0,0 +1,59 @@
+package org.eclipse.aether;
+
+/*
+ * 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.
+ */
+
+/**
+ * Caches auxiliary data used during repository access like already processed 
metadata. The data in the cache is meant
+ * for exclusive consumption by the repository system and is opaque to the 
cache implementation. Note:
+ * Actual cache implementations must be thread-safe.
+ * 
+ * @see RepositorySystemSession#getCache()
+ */
+public interface RepositoryCache
+{
+
+/**
+ * Puts the specified data into the cache. It is entirely up to the cache 
implementation how long this data will be
+ * kept before being purged, i.e. callers must not make 

[14/53] [abbrv] [partial] maven-resolver git commit: [MNG-6007] renamed Aether to Maven Artifact Resolver

2017-01-15 Thread hboutemy
http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/3a1b8ae0/aether-util/src/main/java/org/eclipse/aether/util/graph/transformer/ConflictResolver.java
--
diff --git 
a/aether-util/src/main/java/org/eclipse/aether/util/graph/transformer/ConflictResolver.java
 
b/aether-util/src/main/java/org/eclipse/aether/util/graph/transformer/ConflictResolver.java
deleted file mode 100644
index 5f9d8e0..000
--- 
a/aether-util/src/main/java/org/eclipse/aether/util/graph/transformer/ConflictResolver.java
+++ /dev/null
@@ -1,1327 +0,0 @@
-package org.eclipse.aether.util.graph.transformer;
-
-/*
- * 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.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.IdentityHashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.ListIterator;
-import java.util.Map;
-
-import org.eclipse.aether.RepositoryException;
-import org.eclipse.aether.RepositorySystemSession;
-import org.eclipse.aether.artifact.Artifact;
-import org.eclipse.aether.collection.DependencyGraphTransformationContext;
-import org.eclipse.aether.collection.DependencyGraphTransformer;
-import org.eclipse.aether.graph.DefaultDependencyNode;
-import org.eclipse.aether.graph.Dependency;
-import org.eclipse.aether.graph.DependencyNode;
-import org.eclipse.aether.util.ConfigUtils;
-
-/**
- * A dependency graph transformer that resolves version and scope conflicts 
among dependencies. For a given set of
- * conflicting nodes, one node will be chosen as the winner and the other 
nodes are removed from the dependency graph.
- * The exact rules by which a winning node and its effective scope are 
determined are controlled by user-supplied
- * implementations of {@link VersionSelector}, {@link ScopeSelector}, {@link 
OptionalitySelector} and
- * {@link ScopeDeriver}.
- * 
- * By default, this graph transformer will turn the dependency graph into a 
tree without duplicate artifacts. Using the
- * configuration property {@link #CONFIG_PROP_VERBOSE}, a verbose mode can be 
enabled where the graph is still turned
- * into a tree but all nodes participating in a conflict are retained. The 
nodes that were rejected during conflict
- * resolution have no children and link back to the winner node via the {@link 
#NODE_DATA_WINNER} key in their custom
- * data. Additionally, the keys {@link #NODE_DATA_ORIGINAL_SCOPE} and {@link 
#NODE_DATA_ORIGINAL_OPTIONALITY} are used
- * to store the original scope and optionality of each node. Obviously, the 
resulting dependency tree is not suitable
- * for artifact resolution unless a filter is employed to exclude the 
duplicate dependencies.
- * 
- * This transformer will query the keys {@link 
TransformationContextKeys#CONFLICT_IDS},
- * {@link TransformationContextKeys#SORTED_CONFLICT_IDS}, {@link 
TransformationContextKeys#CYCLIC_CONFLICT_IDS} for
- * existing information about conflict ids. In absence of this information, it 
will automatically invoke the
- * {@link ConflictIdSorter} to calculate it.
- */
-public final class ConflictResolver
-implements DependencyGraphTransformer
-{
-
-/**
- * The key in the repository session's {@link 
RepositorySystemSession#getConfigProperties() configuration
- * properties} used to store a {@link Boolean} flag controlling the 
transformer's verbose mode.
- */
-public static final String CONFIG_PROP_VERBOSE = 
"aether.conflictResolver.verbose";
-
-/**
- * The key in the dependency node's {@link DependencyNode#getData() custom 
data} under which a reference to the
- * {@link DependencyNode} which has won the conflict is stored.
- */
-public static final String NODE_DATA_WINNER = "conflict.winner";
-
-/**
- * The key in the dependency node's {@link DependencyNode#getData() custom 
data} under which the scope of the
- * dependency before scope derivation and conflict resolution is stored.
- */
-public static final String NODE_DATA_ORIGINAL_SCOPE = 
"conflict.originalScope";
-
-/**
- * The key in the 

[32/53] [abbrv] [partial] maven-resolver git commit: [MNG-6007] renamed Aether to Maven Artifact Resolver

2017-01-15 Thread hboutemy
http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/3a1b8ae0/aether-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultRepositorySystemTest.java
--
diff --git 
a/aether-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultRepositorySystemTest.java
 
b/aether-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultRepositorySystemTest.java
deleted file mode 100644
index 65acfdb..000
--- 
a/aether-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultRepositorySystemTest.java
+++ /dev/null
@@ -1,115 +0,0 @@
-package org.eclipse.aether.internal.impl;
-
-/*
- * 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 static org.junit.Assert.*;
-
-import java.util.Arrays;
-import java.util.List;
-
-import org.eclipse.aether.DefaultRepositorySystemSession;
-import org.eclipse.aether.internal.test.util.TestUtils;
-import org.eclipse.aether.repository.Authentication;
-import org.eclipse.aether.repository.Proxy;
-import org.eclipse.aether.repository.RemoteRepository;
-import org.eclipse.aether.util.repository.AuthenticationBuilder;
-import org.eclipse.aether.util.repository.DefaultAuthenticationSelector;
-import org.eclipse.aether.util.repository.DefaultMirrorSelector;
-import org.eclipse.aether.util.repository.DefaultProxySelector;
-import org.junit.Before;
-import org.junit.Test;
-
-public class DefaultRepositorySystemTest
-{
-
-private DefaultRepositorySystem system;
-
-private DefaultRepositorySystemSession session;
-
-@Before
-public void init()
-{
-DefaultRemoteRepositoryManager remoteRepoManager = new 
DefaultRemoteRepositoryManager();
-system = new DefaultRepositorySystem();
-system.setRemoteRepositoryManager( remoteRepoManager );
-session = TestUtils.newSession();
-}
-
-@Test
-public void testNewResolutionRepositories()
-{
-Proxy proxy = new Proxy( "http", "localhost", 8080 );
-DefaultProxySelector proxySelector = new DefaultProxySelector();
-proxySelector.add( proxy, null );
-session.setProxySelector( proxySelector );
-
-Authentication auth = new AuthenticationBuilder().addUsername( "user" 
).build();
-DefaultAuthenticationSelector authSelector = new 
DefaultAuthenticationSelector();
-authSelector.add( "mirror", auth );
-authSelector.add( "test-2", auth );
-session.setAuthenticationSelector( authSelector );
-
-DefaultMirrorSelector mirrorSelector = new DefaultMirrorSelector();
-mirrorSelector.add( "mirror", "http:void", "default", false, "test-1", 
null );
-session.setMirrorSelector( mirrorSelector );
-
-RemoteRepository rawRepo1 = new RemoteRepository.Builder( "test-1", 
"default", "http://void; ).build();
-RemoteRepository rawRepo2 = new RemoteRepository.Builder( "test-2", 
"default", "http://null; ).build();
-List resolveRepos =
-system.newResolutionRepositories( session, Arrays.asList( 
rawRepo1, rawRepo2 ) );
-assertNotNull( resolveRepos );
-assertEquals( 2, resolveRepos.size() );
-RemoteRepository resolveRepo = resolveRepos.get( 0 );
-assertNotNull( resolveRepo );
-assertEquals( "mirror", resolveRepo.getId() );
-assertSame( proxy, resolveRepo.getProxy() );
-assertSame( auth, resolveRepo.getAuthentication() );
-resolveRepo = resolveRepos.get( 1 );
-assertNotNull( resolveRepo );
-assertEquals( "test-2", resolveRepo.getId() );
-assertSame( proxy, resolveRepo.getProxy() );
-assertSame( auth, resolveRepo.getAuthentication() );
-}
-
-@Test
-public void testNewDeploymentRepository()
-{
-Proxy proxy = new Proxy( "http", "localhost", 8080 );
-DefaultProxySelector proxySelector = new DefaultProxySelector();
-proxySelector.add( proxy, null );
-session.setProxySelector( proxySelector );
-
-Authentication auth = new AuthenticationBuilder().addUsername( "user" 
).build();
-DefaultAuthenticationSelector authSelector = new 
DefaultAuthenticationSelector();
-authSelector.add( "test", auth );
-  

[01/53] [abbrv] [partial] maven-resolver git commit: [MNG-6007] renamed Aether to Maven Artifact Resolver

2017-01-15 Thread hboutemy
Repository: maven-resolver
Updated Branches:
  refs/heads/MNG-6007 [created] 8bd8c539d


http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/3a1b8ae0/maven-resolver-api/src/main/java/org/eclipse/aether/resolution/VersionResolutionException.java
--
diff --git 
a/maven-resolver-api/src/main/java/org/eclipse/aether/resolution/VersionResolutionException.java
 
b/maven-resolver-api/src/main/java/org/eclipse/aether/resolution/VersionResolutionException.java
new file mode 100644
index 000..1aca861
--- /dev/null
+++ 
b/maven-resolver-api/src/main/java/org/eclipse/aether/resolution/VersionResolutionException.java
@@ -0,0 +1,105 @@
+package org.eclipse.aether.resolution;
+
+/*
+ * 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 org.eclipse.aether.RepositoryException;
+
+/**
+ * Thrown in case of an unresolvable metaversion.
+ */
+public class VersionResolutionException
+extends RepositoryException
+{
+
+private final transient VersionResult result;
+
+/**
+ * Creates a new exception with the specified result.
+ * 
+ * @param result The version result at the point the exception occurred, 
may be {@code null}.
+ */
+public VersionResolutionException( VersionResult result )
+{
+super( getMessage( result ), getCause( result ) );
+this.result = result;
+}
+
+private static String getMessage( VersionResult result )
+{
+StringBuilder buffer = new StringBuilder( 256 );
+buffer.append( "Failed to resolve version" );
+if ( result != null )
+{
+buffer.append( " for " ).append( result.getRequest().getArtifact() 
);
+if ( !result.getExceptions().isEmpty() )
+{
+buffer.append( ": " ).append( 
result.getExceptions().iterator().next().getMessage() );
+}
+}
+return buffer.toString();
+}
+
+private static Throwable getCause( VersionResult result )
+{
+Throwable cause = null;
+if ( result != null && !result.getExceptions().isEmpty() )
+{
+cause = result.getExceptions().get( 0 );
+}
+return cause;
+}
+
+/**
+ * Creates a new exception with the specified result and detail message.
+ * 
+ * @param result The version result at the point the exception occurred, 
may be {@code null}.
+ * @param message The detail message, may be {@code null}.
+ */
+public VersionResolutionException( VersionResult result, String message )
+{
+super( message, getCause( result ) );
+this.result = result;
+}
+
+/**
+ * Creates a new exception with the specified result, detail message and 
cause.
+ * 
+ * @param result The version result at the point the exception occurred, 
may be {@code null}.
+ * @param message The detail message, may be {@code null}.
+ * @param cause The exception that caused this one, may be {@code null}.
+ */
+public VersionResolutionException( VersionResult result, String message, 
Throwable cause )
+{
+super( message, cause );
+this.result = result;
+}
+
+/**
+ * Gets the version result at the point the exception occurred. Despite 
being incomplete, callers might want to use
+ * this result to fail gracefully and continue their operation with 
whatever interim data has been gathered.
+ * 
+ * @return The version result or {@code null} if unknown.
+ */
+public VersionResult getResult()
+{
+return result;
+}
+
+}



[24/53] [abbrv] [partial] maven-resolver git commit: [MNG-6007] renamed Aether to Maven Artifact Resolver

2017-01-15 Thread hboutemy
http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/3a1b8ae0/aether-spi/src/main/java/org/eclipse/aether/spi/connector/MetadataTransfer.java
--
diff --git 
a/aether-spi/src/main/java/org/eclipse/aether/spi/connector/MetadataTransfer.java
 
b/aether-spi/src/main/java/org/eclipse/aether/spi/connector/MetadataTransfer.java
deleted file mode 100644
index 94eb46e..000
--- 
a/aether-spi/src/main/java/org/eclipse/aether/spi/connector/MetadataTransfer.java
+++ /dev/null
@@ -1,115 +0,0 @@
-package org.eclipse.aether.spi.connector;
-
-/*
- * 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 org.eclipse.aether.metadata.Metadata;
-import org.eclipse.aether.transfer.MetadataTransferException;
-
-/**
- * A download/upload of metadata.
- * 
- * @noextend This class is not intended to be extended by clients.
- */
-public abstract class MetadataTransfer
-extends Transfer
-{
-
-private Metadata metadata;
-
-private File file;
-
-private MetadataTransferException exception;
-
-MetadataTransfer()
-{
-// hide
-}
-
-/**
- * Gets the metadata being transferred.
- * 
- * @return The metadata being transferred or {@code null} if not set.
- */
-public Metadata getMetadata()
-{
-return metadata;
-}
-
-/**
- * Sets the metadata to transfer.
- * 
- * @param metadata The metadata, may be {@code null}.
- * @return This transfer for chaining, never {@code null}.
- */
-public MetadataTransfer setMetadata( Metadata metadata )
-{
-this.metadata = metadata;
-return this;
-}
-
-/**
- * Gets the local file the metadata is downloaded to or uploaded from. In 
case of a download, a connector should
- * first transfer the bytes to a temporary file and only overwrite the 
target file once the entire download is
- * completed such that an interrupted/failed download does not corrupt the 
current file contents.
- * 
- * @return The local file or {@code null} if not set.
- */
-public File getFile()
-{
-return file;
-}
-
-/**
- * Sets the local file the metadata is downloaded to or uploaded from.
- * 
- * @param file The local file, may be {@code null}.
- * @return This transfer for chaining, never {@code null}.
- */
-public MetadataTransfer setFile( File file )
-{
-this.file = file;
-return this;
-}
-
-/**
- * Gets the exception that occurred during the transfer (if any).
- * 
- * @return The exception or {@code null} if the transfer was successful.
- */
-public MetadataTransferException getException()
-{
-return exception;
-}
-
-/**
- * Sets the exception that occurred during the transfer.
- * 
- * @param exception The exception, may be {@code null} to denote a 
successful transfer.
- * @return This transfer for chaining, never {@code null}.
- */
-public MetadataTransfer setException( MetadataTransferException exception )
-{
-this.exception = exception;
-return this;
-}
-
-}

http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/3a1b8ae0/aether-spi/src/main/java/org/eclipse/aether/spi/connector/MetadataUpload.java
--
diff --git 
a/aether-spi/src/main/java/org/eclipse/aether/spi/connector/MetadataUpload.java 
b/aether-spi/src/main/java/org/eclipse/aether/spi/connector/MetadataUpload.java
deleted file mode 100644
index d992757..000
--- 
a/aether-spi/src/main/java/org/eclipse/aether/spi/connector/MetadataUpload.java
+++ /dev/null
@@ -1,98 +0,0 @@
-package org.eclipse.aether.spi.connector;
-
-/*
- * 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 

[40/53] [abbrv] [partial] maven-resolver git commit: [MNG-6007] renamed Aether to Maven Artifact Resolver

2017-01-15 Thread hboutemy
http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/3a1b8ae0/aether-connector-basic/src/test/java/org/eclipse/aether/connector/basic/ChecksumValidatorTest.java
--
diff --git 
a/aether-connector-basic/src/test/java/org/eclipse/aether/connector/basic/ChecksumValidatorTest.java
 
b/aether-connector-basic/src/test/java/org/eclipse/aether/connector/basic/ChecksumValidatorTest.java
deleted file mode 100644
index 6d67768..000
--- 
a/aether-connector-basic/src/test/java/org/eclipse/aether/connector/basic/ChecksumValidatorTest.java
+++ /dev/null
@@ -1,465 +0,0 @@
-package org.eclipse.aether.connector.basic;
-
-/*
- * 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 static org.junit.Assert.*;
-
-import java.io.File;
-import java.io.IOException;
-import java.net.URI;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.aether.internal.test.util.TestFileProcessor;
-import org.eclipse.aether.internal.test.util.TestFileUtils;
-import org.eclipse.aether.internal.test.util.TestLoggerFactory;
-import org.eclipse.aether.spi.connector.checksum.ChecksumPolicy;
-import org.eclipse.aether.spi.connector.layout.RepositoryLayout;
-import org.eclipse.aether.transfer.ChecksumFailureException;
-import org.junit.Before;
-import org.junit.Test;
-
-public class ChecksumValidatorTest
-{
-
-private static class StubChecksumPolicy
-implements ChecksumPolicy
-{
-
-boolean inspectAll;
-
-boolean tolerateFailure;
-
-private List callbacks = new ArrayList();
-
-private Object conclusion;
-
-public boolean onChecksumMatch( String algorithm, int kind )
-{
-callbacks.add( String.format( "match(%s, %04x)", algorithm, kind ) 
);
-if ( inspectAll )
-{
-if ( conclusion == null )
-{
-conclusion = true;
-}
-return false;
-}
-return true;
-}
-
-public void onChecksumMismatch( String algorithm, int kind, 
ChecksumFailureException exception )
-throws ChecksumFailureException
-{
-callbacks.add( String.format( "mismatch(%s, %04x)", algorithm, 
kind ) );
-if ( inspectAll )
-{
-conclusion = exception;
-return;
-}
-throw exception;
-}
-
-public void onChecksumError( String algorithm, int kind, 
ChecksumFailureException exception )
-throws ChecksumFailureException
-{
-callbacks.add( String.format( "error(%s, %04x, %s)", algorithm, 
kind, exception.getCause().getMessage() ) );
-}
-
-public void onNoMoreChecksums()
-throws ChecksumFailureException
-{
-callbacks.add( String.format( "noMore()" ) );
-if ( conclusion instanceof ChecksumFailureException )
-{
-throw (ChecksumFailureException) conclusion;
-}
-else if ( !Boolean.TRUE.equals( conclusion ) )
-{
-throw new ChecksumFailureException( "no checksums" );
-}
-}
-
-public void onTransferRetry()
-{
-callbacks.add( String.format( "retry()" ) );
-}
-
-public boolean onTransferChecksumFailure( ChecksumFailureException 
exception )
-{
-callbacks.add( String.format( "fail(%s)", exception.getMessage() ) 
);
-return tolerateFailure;
-}
-
-void assertCallbacks( String... callbacks )
-{
-assertEquals( Arrays.asList( callbacks ), this.callbacks );
-}
-
-}
-
-private static class StubChecksumFetcher
-implements ChecksumValidator.ChecksumFetcher
-{
-
-Map checksums = new HashMap();
-
-List checksumFiles = new ArrayList();
-
-private List fetchedFiles = new ArrayList();
-
-public boolean fetchChecksum( URI remote, File local )
- 

[30/53] [abbrv] [partial] maven-resolver git commit: [MNG-6007] renamed Aether to Maven Artifact Resolver

2017-01-15 Thread hboutemy
http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/3a1b8ae0/aether-impl/src/test/resources/artifact-descriptions/cycle-big/10_150_4.1-SNAPSHOT.ini
--
diff --git 
a/aether-impl/src/test/resources/artifact-descriptions/cycle-big/10_150_4.1-SNAPSHOT.ini
 
b/aether-impl/src/test/resources/artifact-descriptions/cycle-big/10_150_4.1-SNAPSHOT.ini
deleted file mode 100644
index dd9141e..000
--- 
a/aether-impl/src/test/resources/artifact-descriptions/cycle-big/10_150_4.1-SNAPSHOT.ini
+++ /dev/null
@@ -1,45 +0,0 @@
-[dependencies]
-1:13:pom:1.7.0-SNAPSHOT
-1:44:pom:1.3-SNAPSHOT
-1:45:pom:3.1-SNAPSHOT
-1:48:pom:1.3-SNAPSHOT
-1:83:pom:1.10.0-SNAPSHOT
-1:8:pom:2.1.0-SNAPSHOT
-1:8:pom:2.7.0-SNAPSHOT
-1:15:pom:1.36.0-SNAPSHOT
-1:49:pom:6.0.5.25-SNAPSHOT
-1:16:pom:1.8.0-SNAPSHOT
-1:67:pom:1.6.5-SNAPSHOT
-1:17:pom:1.2.3-SNAPSHOT
-1:26:pom:3.0.1-SNAPSHOT
-1:2:pom:5.50-SNAPSHOT
-1:55:pom:4.8.2-SNAPSHOT
-1:18:pom:5.1.1.41-SNAPSHOT
-1:9:pom:3.1-SNAPSHOT
-1:35:pom:1.0-SNAPSHOT
-1:20:pom:3.3.2-SNAPSHOT
-1:57:pom:4.0.5-SNAPSHOT
-1:6:pom:1.5.8-SNAPSHOT
-1:7:pom:5.8.8-SNAPSHOT
-1:38:pom:1.3.6-SNAPSHOT
-1:21:pom:3.2.1.2-SNAPSHOT
-1:28:pom:4.1-SNAPSHOT
-1:5:pom:1.5-SNAPSHOT
-1:41:pom:5.0-SNAPSHOT
-1:151:pom:3.7.1-SNAPSHOT
-10:22:pom:4.1-SNAPSHOT
-10:11:pom:4.1-SNAPSHOT
-10:141:pom:4.1-SNAPSHOT
-10:145:pom:4.1-SNAPSHOT
-10:152:pom:4.1-SNAPSHOT
-10:156:pom:4.1-SNAPSHOT
-10:42:pom:4.1-SNAPSHOT
-10:12:pom:4.1-SNAPSHOT
-10:146:pom:4.1-SNAPSHOT
-10:147:pom:4.1-SNAPSHOT
-10:148:pom:4.1-SNAPSHOT
-10:149:pom:4.1-SNAPSHOT
-10:160:pom:4.1-SNAPSHOT
-10:43:pom:4.1-SNAPSHOT
-10:162:pom:4.1-SNAPSHOT
-10:161:pom:4.1-SNAPSHOT

http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/3a1b8ae0/aether-impl/src/test/resources/artifact-descriptions/cycle-big/10_152_4.0-SNAPSHOT.ini
--
diff --git 
a/aether-impl/src/test/resources/artifact-descriptions/cycle-big/10_152_4.0-SNAPSHOT.ini
 
b/aether-impl/src/test/resources/artifact-descriptions/cycle-big/10_152_4.0-SNAPSHOT.ini
deleted file mode 100644
index 2fa7c3b..000
--- 
a/aether-impl/src/test/resources/artifact-descriptions/cycle-big/10_152_4.0-SNAPSHOT.ini
+++ /dev/null
@@ -1,32 +0,0 @@
-[dependencies]
-1:13:pom:1.7.0-SNAPSHOT
-1:44:pom:1.3-SNAPSHOT
-1:45:pom:3.1-SNAPSHOT
-1:118:pom:10.2.2.0-SNAPSHOT
-1:153:pom:1.1.1-SNAPSHOT
-1:23:pom:1.2.6_sap.1-SNAPSHOT
-1:48:pom:1.3-SNAPSHOT
-1:140:pom:6.0.24-SNAPSHOT
-1:67:pom:1.6.5-SNAPSHOT
-1:52:pom:1.8-SNAPSHOT
-1:2:pom:5.50-SNAPSHOT
-1:55:pom:4.4-SNAPSHOT
-1:18:pom:5.1.1-SNAPSHOT
-1:9:pom:3.1-SNAPSHOT
-1:57:pom:4.0.5-SNAPSHOT
-1:6:pom:1.5.8-SNAPSHOT
-1:7:pom:5.8.8-SNAPSHOT
-1:28:pom:4.1-SNAPSHOT
-1:31:pom:2.2-SNAPSHOT
-1:5:pom:1.5-SNAPSHOT
-1:154:pom:3.3-SNAPSHOT
-1:71:pom:1.1.3.8-SNAPSHOT
-10:22:pom:4.0-SNAPSHOT
-10:139:pom:3.0-SNAPSHOT
-10:155:pom:4.0-SNAPSHOT
-10:42:pom:4.0-SNAPSHOT
-10:11:pom:4.0-SNAPSHOT
-10:160:pom:4.0-SNAPSHOT
-10:43:pom:4.0-SNAPSHOT
-10:161:pom:4.0-SNAPSHOT
-1:158:pom:3.5-SNAPSHOT

http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/3a1b8ae0/aether-impl/src/test/resources/artifact-descriptions/cycle-big/10_152_4.1-SNAPSHOT.ini
--
diff --git 
a/aether-impl/src/test/resources/artifact-descriptions/cycle-big/10_152_4.1-SNAPSHOT.ini
 
b/aether-impl/src/test/resources/artifact-descriptions/cycle-big/10_152_4.1-SNAPSHOT.ini
deleted file mode 100644
index 945ce3a..000
--- 
a/aether-impl/src/test/resources/artifact-descriptions/cycle-big/10_152_4.1-SNAPSHOT.ini
+++ /dev/null
@@ -1,34 +0,0 @@
-[dependencies]
-1:13:pom:1.7.0-SNAPSHOT
-1:44:pom:1.3-SNAPSHOT
-1:45:pom:3.1-SNAPSHOT
-1:118:pom:10.2.2.0-SNAPSHOT
-1:153:pom:1.1.1-SNAPSHOT
-1:23:pom:1.2.6_sap.1-SNAPSHOT
-1:48:pom:1.3-SNAPSHOT
-1:140:pom:6.0.24-SNAPSHOT
-1:67:pom:1.6.5-SNAPSHOT
-1:2:pom:5.50-SNAPSHOT
-1:55:pom:4.8.2-SNAPSHOT
-1:18:pom:5.1.1.41-SNAPSHOT
-1:9:pom:3.1-SNAPSHOT
-1:57:pom:4.0.5-SNAPSHOT
-1:6:pom:1.5.8-SNAPSHOT
-1:7:pom:5.8.8-SNAPSHOT
-1:28:pom:4.1-SNAPSHOT
-1:31:pom:2.2-SNAPSHOT
-1:5:pom:1.5-SNAPSHOT
-1:154:pom:3.3-SNAPSHOT
-1:71:pom:1.1.3.8-SNAPSHOT
-10:22:pom:4.1-SNAPSHOT
-10:357:pom:4.1-SNAPSHOT
-10:139:pom:3.1-SNAPSHOT
-10:155:pom:4.1-SNAPSHOT
-10:42:pom:4.1-SNAPSHOT
-10:11:pom:4.1-SNAPSHOT
-10:160:pom:4.1-SNAPSHOT
-10:43:pom:4.1-SNAPSHOT
-10:161:pom:4.1-SNAPSHOT
-1:158:pom:3.5-SNAPSHOT
-10:363:pom:4.1-SNAPSHOT
-1:29:pom:3.0.5-SNAPSHOT

http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/3a1b8ae0/aether-impl/src/test/resources/artifact-descriptions/cycle-big/10_155_4.0-SNAPSHOT.ini
--
diff --git 
a/aether-impl/src/test/resources/artifact-descriptions/cycle-big/10_155_4.0-SNAPSHOT.ini
 
b/aether-impl/src/test/resources/artifact-descriptions/cycle-big/10_155_4.0-SNAPSHOT.ini
deleted file mode 100644
index 3861a88..000
--- 

[05/53] [abbrv] [partial] maven-resolver git commit: [MNG-6007] renamed Aether to Maven Artifact Resolver

2017-01-15 Thread hboutemy
http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/3a1b8ae0/maven-resolver-api/src/main/java/org/eclipse/aether/collection/package-info.java
--
diff --git 
a/maven-resolver-api/src/main/java/org/eclipse/aether/collection/package-info.java
 
b/maven-resolver-api/src/main/java/org/eclipse/aether/collection/package-info.java
new file mode 100644
index 000..414629f
--- /dev/null
+++ 
b/maven-resolver-api/src/main/java/org/eclipse/aether/collection/package-info.java
@@ -0,0 +1,25 @@
+// CHECKSTYLE_OFF: RegexpHeader
+/*
+ * 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.
+ */
+/**
+ * The types and extension points for collecting the transitive dependencies 
of an artifact and building a dependency
+ * graph.
+ */
+package org.eclipse.aether.collection;
+

http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/3a1b8ae0/maven-resolver-api/src/main/java/org/eclipse/aether/deployment/DeployRequest.java
--
diff --git 
a/maven-resolver-api/src/main/java/org/eclipse/aether/deployment/DeployRequest.java
 
b/maven-resolver-api/src/main/java/org/eclipse/aether/deployment/DeployRequest.java
new file mode 100644
index 000..637f47d
--- /dev/null
+++ 
b/maven-resolver-api/src/main/java/org/eclipse/aether/deployment/DeployRequest.java
@@ -0,0 +1,202 @@
+package org.eclipse.aether.deployment;
+
+/*
+ * 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.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+
+import org.eclipse.aether.RepositorySystem;
+import org.eclipse.aether.RepositorySystemSession;
+import org.eclipse.aether.RequestTrace;
+import org.eclipse.aether.artifact.Artifact;
+import org.eclipse.aether.metadata.Metadata;
+import org.eclipse.aether.repository.RemoteRepository;
+
+/**
+ * A request to deploy artifacts and their accompanying metadata into the a 
remote repository.
+ * 
+ * @see RepositorySystem#deploy(RepositorySystemSession, DeployRequest)
+ */
+public final class DeployRequest
+{
+
+private Collection artifacts = Collections.emptyList();
+
+private Collection metadata = Collections.emptyList();
+
+private RemoteRepository repository;
+
+private RequestTrace trace;
+
+/**
+ * Creates an uninitialized request.
+ */
+public DeployRequest()
+{
+}
+
+/**
+ * Gets the artifact to deploy.
+ * 
+ * @return The artifacts to deploy, never {@code null}.
+ */
+public Collection getArtifacts()
+{
+return artifacts;
+}
+
+/**
+ * Sets the artifacts to deploy.
+ * 
+ * @param artifacts The artifacts to deploy, may be {@code null}.
+ * @return This request for chaining, never {@code null}.
+ */
+public DeployRequest setArtifacts( Collection artifacts )
+{
+if ( artifacts == null )
+{
+this.artifacts = Collections.emptyList();
+}
+else
+{
+this.artifacts = artifacts;
+}
+return this;
+}
+
+/**
+ * Adds the specified artifacts for deployment.
+ * 
+ * @param artifact The artifact to add, may be {@code null}.
+ * @return This request for chaining, never {@code null}.
+ */
+public DeployRequest addArtifact( Artifact artifact )
+{
+if ( artifact != null )
+{
+if ( 

[44/53] [abbrv] [partial] maven-resolver git commit: [MNG-6007] renamed Aether to Maven Artifact Resolver

2017-01-15 Thread hboutemy
http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/3a1b8ae0/aether-api/src/main/java/org/eclipse/aether/resolution/DependencyRequest.java
--
diff --git 
a/aether-api/src/main/java/org/eclipse/aether/resolution/DependencyRequest.java 
b/aether-api/src/main/java/org/eclipse/aether/resolution/DependencyRequest.java
deleted file mode 100644
index 138304a..000
--- 
a/aether-api/src/main/java/org/eclipse/aether/resolution/DependencyRequest.java
+++ /dev/null
@@ -1,187 +0,0 @@
-package org.eclipse.aether.resolution;
-
-/*
- * 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 org.eclipse.aether.RepositorySystem;
-import org.eclipse.aether.RepositorySystemSession;
-import org.eclipse.aether.RequestTrace;
-import org.eclipse.aether.artifact.Artifact;
-import org.eclipse.aether.collection.CollectRequest;
-import org.eclipse.aether.graph.DependencyFilter;
-import org.eclipse.aether.graph.DependencyNode;
-
-/**
- * A request to resolve transitive dependencies. This request can either be 
supplied with a {@link CollectRequest} to
- * calculate the transitive dependencies or with an already resolved 
dependency graph.
- * 
- * @see RepositorySystem#resolveDependencies(RepositorySystemSession, 
DependencyRequest)
- * @see Artifact#getFile()
- */
-public final class DependencyRequest
-{
-
-private DependencyNode root;
-
-private CollectRequest collectRequest;
-
-private DependencyFilter filter;
-
-private RequestTrace trace;
-
-/**
- * Creates an uninitialized request. Note that either {@link 
#setRoot(DependencyNode)} or
- * {@link #setCollectRequest(CollectRequest)} must eventually be called to 
create a valid request.
- */
-public DependencyRequest()
-{
-// enables default constructor
-}
-
-/**
- * Creates a request for the specified dependency graph and with the given 
resolution filter.
- * 
- * @param node The root node of the dependency graph whose artifacts 
should be resolved, may be {@code null}.
- * @param filter The resolution filter to use, may be {@code null}.
- */
-public DependencyRequest( DependencyNode node, DependencyFilter filter )
-{
-setRoot( node );
-setFilter( filter );
-}
-
-/**
- * Creates a request for the specified collect request and with the given 
resolution filter.
- * 
- * @param request The collect request used to calculate the dependency 
graph whose artifacts should be resolved, may
- *be {@code null}.
- * @param filter The resolution filter to use, may be {@code null}.
- */
-public DependencyRequest( CollectRequest request, DependencyFilter filter )
-{
-setCollectRequest( request );
-setFilter( filter );
-}
-
-/**
- * Gets the root node of the dependency graph whose artifacts should be 
resolved.
- * 
- * @return The root node of the dependency graph or {@code null} if none.
- */
-public DependencyNode getRoot()
-{
-return root;
-}
-
-/**
- * Sets the root node of the dependency graph whose artifacts should be 
resolved. When this request is processed,
- * the nodes of the given dependency graph will be updated to refer to the 
resolved artifacts. Eventually, either
- * {@link #setRoot(DependencyNode)} or {@link 
#setCollectRequest(CollectRequest)} must be called to create a valid
- * request.
- * 
- * @param root The root node of the dependency graph, may be {@code null}.
- * @return This request for chaining, never {@code null}.
- */
-public DependencyRequest setRoot( DependencyNode root )
-{
-this.root = root;
-return this;
-}
-
-/**
- * Gets the collect request used to calculate the dependency graph whose 
artifacts should be resolved.
- * 
- * @return The collect request or {@code null} if none.
- */
-public CollectRequest getCollectRequest()
-{
-return collectRequest;
-}
-
-/**
- * Sets the collect request used to calculate the dependency graph whose 
artifacts should be resolved. Eventually,
- * either {@link 

[48/53] [abbrv] [partial] maven-resolver git commit: [MNG-6007] renamed Aether to Maven Artifact Resolver

2017-01-15 Thread hboutemy
http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/3a1b8ae0/aether-api/src/main/java/org/eclipse/aether/collection/CollectRequest.java
--
diff --git 
a/aether-api/src/main/java/org/eclipse/aether/collection/CollectRequest.java 
b/aether-api/src/main/java/org/eclipse/aether/collection/CollectRequest.java
deleted file mode 100644
index d9c2527..000
--- a/aether-api/src/main/java/org/eclipse/aether/collection/CollectRequest.java
+++ /dev/null
@@ -1,356 +0,0 @@
-package org.eclipse.aether.collection;
-
-/*
- * 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.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.aether.RepositorySystem;
-import org.eclipse.aether.RepositorySystemSession;
-import org.eclipse.aether.RequestTrace;
-import org.eclipse.aether.artifact.Artifact;
-import org.eclipse.aether.graph.Dependency;
-import org.eclipse.aether.repository.RemoteRepository;
-
-/**
- * A request to collect the transitive dependencies and to build a dependency 
graph from them. There are three ways to
- * create a dependency graph. First, only the root dependency can be given. 
Second, a root dependency and direct
- * dependencies can be specified in which case the specified direct 
dependencies are merged with the direct dependencies
- * retrieved from the artifact descriptor of the root dependency. And last, 
only direct dependencies can be specified in
- * which case the root node of the resulting graph has no associated 
dependency.
- * 
- * @see RepositorySystem#collectDependencies(RepositorySystemSession, 
CollectRequest)
- */
-public final class CollectRequest
-{
-
-private Artifact rootArtifact;
-
-private Dependency root;
-
-private List dependencies = Collections.emptyList();
-
-private List managedDependencies = Collections.emptyList();
-
-private List repositories = Collections.emptyList();
-
-private String context = "";
-
-private RequestTrace trace;
-
-/**
- * Creates an uninitialized request.
- */
-public CollectRequest()
-{
-// enables default constructor
-}
-
-/**
- * Creates a request with the specified properties.
- * 
- * @param root The root dependency whose transitive dependencies should be 
collected, may be {@code null}.
- * @param repositories The repositories to use for the collection, may be 
{@code null}.
- */
-public CollectRequest( Dependency root, List 
repositories )
-{
-setRoot( root );
-setRepositories( repositories );
-}
-
-/**
- * Creates a new request with the specified properties.
- * 
- * @param root The root dependency whose transitive dependencies should be 
collected, may be {@code null}.
- * @param dependencies The direct dependencies to merge with the direct 
dependencies from the root dependency's
- *artifact descriptor.
- * @param repositories The repositories to use for the collection, may be 
{@code null}.
- */
-public CollectRequest( Dependency root, List dependencies, 
List repositories )
-{
-setRoot( root );
-setDependencies( dependencies );
-setRepositories( repositories );
-}
-
-/**
- * Creates a new request with the specified properties.
- * 
- * @param dependencies The direct dependencies of some imaginary root, may 
be {@code null}.
- * @param managedDependencies The dependency management information to 
apply to the transitive dependencies, may be
- *{@code null}.
- * @param repositories The repositories to use for the collection, may be 
{@code null}.
- */
-public CollectRequest( List dependencies, List 
managedDependencies,
-   List repositories )
-{
-setDependencies( dependencies );
-setManagedDependencies( managedDependencies );
-setRepositories( repositories );
-}
-
-/**
- * Gets the root artifact for the dependency graph.
- * 
- * @return The root artifact for the dependency graph or {@code null} if 
none.
- */
-public Artifact getRootArtifact()
-

[16/53] [abbrv] [partial] maven-resolver git commit: [MNG-6007] renamed Aether to Maven Artifact Resolver

2017-01-15 Thread hboutemy
http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/3a1b8ae0/aether-util/src/main/java/org/eclipse/aether/util/artifact/SubArtifact.java
--
diff --git 
a/aether-util/src/main/java/org/eclipse/aether/util/artifact/SubArtifact.java 
b/aether-util/src/main/java/org/eclipse/aether/util/artifact/SubArtifact.java
deleted file mode 100644
index ed4d55b..000
--- 
a/aether-util/src/main/java/org/eclipse/aether/util/artifact/SubArtifact.java
+++ /dev/null
@@ -1,233 +0,0 @@
-package org.eclipse.aether.util.artifact;
-
-/*
- * 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.Map;
-
-import org.eclipse.aether.artifact.AbstractArtifact;
-import org.eclipse.aether.artifact.Artifact;
-
-/**
- * An artifact whose identity is derived from another artifact. Note: 
Instances of this class are immutable and
- * the exposed mutators return new objects rather than changing the current 
instance.
- */
-public final class SubArtifact
-extends AbstractArtifact
-{
-
-private final Artifact mainArtifact;
-
-private final String classifier;
-
-private final String extension;
-
-private final File file;
-
-private final Map properties;
-
-/**
- * Creates a new sub artifact. The classifier and extension specified for 
this artifact may use the asterisk
- * character "*" to refer to the corresponding property of the main 
artifact. For instance, the classifier
- * "*-sources" can be used to refer to the source attachment of an 
artifact. Likewise, the extension "*.asc" can be
- * used to refer to the GPG signature of an artifact.
- * 
- * @param mainArtifact The artifact from which to derive the identity, 
must not be {@code null}.
- * @param classifier The classifier for this artifact, may be {@code null} 
if none.
- * @param extension The extension for this artifact, may be {@code null} 
if none.
- */
-public SubArtifact( Artifact mainArtifact, String classifier, String 
extension )
-{
-this( mainArtifact, classifier, extension, (File) null );
-}
-
-/**
- * Creates a new sub artifact. The classifier and extension specified for 
this artifact may use the asterisk
- * character "*" to refer to the corresponding property of the main 
artifact. For instance, the classifier
- * "*-sources" can be used to refer to the source attachment of an 
artifact. Likewise, the extension "*.asc" can be
- * used to refer to the GPG signature of an artifact.
- * 
- * @param mainArtifact The artifact from which to derive the identity, 
must not be {@code null}.
- * @param classifier The classifier for this artifact, may be {@code null} 
if none.
- * @param extension The extension for this artifact, may be {@code null} 
if none.
- * @param file The file for this artifact, may be {@code null} if 
unresolved.
- */
-public SubArtifact( Artifact mainArtifact, String classifier, String 
extension, File file )
-{
-this( mainArtifact, classifier, extension, null, file );
-}
-
-/**
- * Creates a new sub artifact. The classifier and extension specified for 
this artifact may use the asterisk
- * character "*" to refer to the corresponding property of the main 
artifact. For instance, the classifier
- * "*-sources" can be used to refer to the source attachment of an 
artifact. Likewise, the extension "*.asc" can be
- * used to refer to the GPG signature of an artifact.
- * 
- * @param mainArtifact The artifact from which to derive the identity, 
must not be {@code null}.
- * @param classifier The classifier for this artifact, may be {@code null} 
if none.
- * @param extension The extension for this artifact, may be {@code null} 
if none.
- * @param properties The properties of the artifact, may be {@code null}.
- */
-public SubArtifact( Artifact mainArtifact, String classifier, String 
extension, Map properties )
-{
-this( mainArtifact, classifier, extension, properties, null );
-}
-
-/**
- * Creates a new sub artifact. The classifier and 

[12/53] [abbrv] [partial] maven-resolver git commit: [MNG-6007] renamed Aether to Maven Artifact Resolver

2017-01-15 Thread hboutemy
http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/3a1b8ae0/aether-util/src/main/java/org/eclipse/aether/util/repository/AuthenticationBuilder.java
--
diff --git 
a/aether-util/src/main/java/org/eclipse/aether/util/repository/AuthenticationBuilder.java
 
b/aether-util/src/main/java/org/eclipse/aether/util/repository/AuthenticationBuilder.java
deleted file mode 100644
index bc69e85..000
--- 
a/aether-util/src/main/java/org/eclipse/aether/util/repository/AuthenticationBuilder.java
+++ /dev/null
@@ -1,231 +0,0 @@
-package org.eclipse.aether.util.repository;
-
-/*
- * 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.util.ArrayList;
-import java.util.List;
-
-import javax.net.ssl.HostnameVerifier;
-
-import org.eclipse.aether.repository.Authentication;
-import org.eclipse.aether.repository.AuthenticationContext;
-
-/**
- * A utility class to build authentication info for repositories and proxies.
- */
-public final class AuthenticationBuilder
-{
-
-private final List authentications;
-
-/**
- * Creates a new authentication builder.
- */
-public AuthenticationBuilder()
-{
-authentications = new ArrayList();
-}
-
-/**
- * Builds a new authentication object from the current data of this 
builder. The state of the builder itself remains
- * unchanged.
- * 
- * @return The authentication or {@code null} if no authentication data 
was supplied to the builder.
- */
-public Authentication build()
-{
-if ( authentications.isEmpty() )
-{
-return null;
-}
-if ( authentications.size() == 1 )
-{
-return authentications.get( 0 );
-}
-return new ChainedAuthentication( authentications );
-}
-
-/**
- * Adds username data to the authentication.
- * 
- * @param username The username, may be {@code null}.
- * @return This builder for chaining, never {@code null}.
- */
-public AuthenticationBuilder addUsername( String username )
-{
-return addString( AuthenticationContext.USERNAME, username );
-}
-
-/**
- * Adds password data to the authentication.
- * 
- * @param password The password, may be {@code null}.
- * @return This builder for chaining, never {@code null}.
- */
-public AuthenticationBuilder addPassword( String password )
-{
-return addSecret( AuthenticationContext.PASSWORD, password );
-}
-
-/**
- * Adds password data to the authentication. The resulting authentication 
object uses an encrypted copy of the
- * supplied character data and callers are advised to clear the input 
array soon after this method returns.
- * 
- * @param password The password, may be {@code null}.
- * @return This builder for chaining, never {@code null}.
- */
-public AuthenticationBuilder addPassword( char[] password )
-{
-return addSecret( AuthenticationContext.PASSWORD, password );
-}
-
-/**
- * Adds NTLM data to the authentication.
- * 
- * @param workstation The NTLM workstation name, may be {@code null}.
- * @param domain The NTLM domain name, may be {@code null}.
- * @return This builder for chaining, never {@code null}.
- */
-public AuthenticationBuilder addNtlm( String workstation, String domain )
-{
-addString( AuthenticationContext.NTLM_WORKSTATION, workstation );
-return addString( AuthenticationContext.NTLM_DOMAIN, domain );
-}
-
-/**
- * Adds private key data to the authentication.
- * 
- * @param pathname The (absolute) path to the private key file, may be 
{@code null}.
- * @param passphrase The passphrase protecting the private key, may be 
{@code null}.
- * @return This builder for chaining, never {@code null}.
- */
-public AuthenticationBuilder addPrivateKey( String pathname, String 
passphrase )
-{
-if ( pathname != null )
-{
-addString( AuthenticationContext.PRIVATE_KEY_PATH, pathname );
-addSecret( AuthenticationContext.PRIVATE_KEY_PASSPHRASE, 
passphrase );
-  

[19/53] [abbrv] [partial] maven-resolver git commit: [MNG-6007] renamed Aether to Maven Artifact Resolver

2017-01-15 Thread hboutemy
http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/3a1b8ae0/aether-transport-http/src/main/java/org/eclipse/aether/transport/http/SslConfig.java
--
diff --git 
a/aether-transport-http/src/main/java/org/eclipse/aether/transport/http/SslConfig.java
 
b/aether-transport-http/src/main/java/org/eclipse/aether/transport/http/SslConfig.java
deleted file mode 100644
index d991796..000
--- 
a/aether-transport-http/src/main/java/org/eclipse/aether/transport/http/SslConfig.java
+++ /dev/null
@@ -1,117 +0,0 @@
-package org.eclipse.aether.transport.http;
-
-/*
- * 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.util.Arrays;
-
-import javax.net.ssl.HostnameVerifier;
-import javax.net.ssl.SSLContext;
-
-import org.eclipse.aether.RepositorySystemSession;
-import org.eclipse.aether.repository.AuthenticationContext;
-import org.eclipse.aether.util.ConfigUtils;
-
-/**
- * SSL-related configuration and cache key for connection pools (whose scheme 
registries are derived from this config).
- */
-final class SslConfig
-{
-
-private static final String CIPHER_SUITES = "https.cipherSuites";
-
-private static final String PROTOCOLS = "https.protocols";
-
-final SSLContext context;
-
-final HostnameVerifier verifier;
-
-final String[] cipherSuites;
-
-final String[] protocols;
-
-public SslConfig( RepositorySystemSession session, AuthenticationContext 
authContext )
-{
-context =
-( authContext != null ) ? authContext.get( 
AuthenticationContext.SSL_CONTEXT, SSLContext.class ) : null;
-verifier =
-( authContext != null ) ? authContext.get( 
AuthenticationContext.SSL_HOSTNAME_VERIFIER,
-   HostnameVerifier.class 
) : null;
-
-cipherSuites = split( get( session, CIPHER_SUITES ) );
-protocols = split( get( session, PROTOCOLS ) );
-}
-
-private static String get( RepositorySystemSession session, String key )
-{
-String value = ConfigUtils.getString( session, null, 
"aether.connector." + key, key );
-if ( value == null )
-{
-value = System.getProperty( key );
-}
-return value;
-}
-
-private static String[] split( String value )
-{
-if ( value == null || value.length() <= 0 )
-{
-return null;
-}
-return value.split( ",+" );
-}
-
-@Override
-public boolean equals( Object obj )
-{
-if ( this == obj )
-{
-return true;
-}
-if ( obj == null || !getClass().equals( obj.getClass() ) )
-{
-return false;
-}
-SslConfig that = (SslConfig) obj;
-return eq( context, that.context ) && eq( verifier, that.verifier )
-&& Arrays.equals( cipherSuites, that.cipherSuites ) && 
Arrays.equals( protocols, that.protocols );
-}
-
-private static  boolean eq( T s1, T s2 )
-{
-return s1 != null ? s1.equals( s2 ) : s2 == null;
-}
-
-@Override
-public int hashCode()
-{
-int hash = 17;
-hash = hash * 31 + hash( context );
-hash = hash * 31 + hash( verifier );
-hash = hash * 31 + Arrays.hashCode( cipherSuites );
-hash = hash * 31 + Arrays.hashCode( protocols );
-return hash;
-}
-
-private static int hash( Object obj )
-{
-return obj != null ? obj.hashCode() : 0;
-}
-
-}

http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/3a1b8ae0/aether-transport-http/src/main/java/org/eclipse/aether/transport/http/SslSocketFactory.java
--
diff --git 
a/aether-transport-http/src/main/java/org/eclipse/aether/transport/http/SslSocketFactory.java
 
b/aether-transport-http/src/main/java/org/eclipse/aether/transport/http/SslSocketFactory.java
deleted file mode 100644
index 5189c87..000
--- 
a/aether-transport-http/src/main/java/org/eclipse/aether/transport/http/SslSocketFactory.java
+++ /dev/null
@@ -1,87 +0,0 @@
-package org.eclipse.aether.transport.http;
-
-/*
- * Licensed to the Apache 

[43/53] [abbrv] [partial] maven-resolver git commit: [MNG-6007] renamed Aether to Maven Artifact Resolver

2017-01-15 Thread hboutemy
http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/3a1b8ae0/aether-api/src/main/java/org/eclipse/aether/transfer/ChecksumFailureException.java
--
diff --git 
a/aether-api/src/main/java/org/eclipse/aether/transfer/ChecksumFailureException.java
 
b/aether-api/src/main/java/org/eclipse/aether/transfer/ChecksumFailureException.java
deleted file mode 100644
index 1dbc6b0..000
--- 
a/aether-api/src/main/java/org/eclipse/aether/transfer/ChecksumFailureException.java
+++ /dev/null
@@ -1,131 +0,0 @@
-package org.eclipse.aether.transfer;
-
-/*
- * 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 org.eclipse.aether.RepositoryException;
-
-/**
- * Thrown in case of a checksum failure during an artifact/metadata download.
- */
-public class ChecksumFailureException
-extends RepositoryException
-{
-
-private final String expected;
-
-private final String actual;
-
-private final boolean retryWorthy;
-
-/**
- * Creates a new exception with the specified expected and actual 
checksum. The resulting exception is
- * {@link #isRetryWorthy() retry-worthy}.
- * 
- * @param expected The expected checksum as declared by the hosting 
repository, may be {@code null}.
- * @param actual The actual checksum as computed from the local bytes, may 
be {@code null}.
- */
-public ChecksumFailureException( String expected, String actual )
-{
-super( "Checksum validation failed, expected " + expected + " but is " 
+ actual );
-this.expected = expected;
-this.actual = actual;
-retryWorthy = true;
-}
-
-/**
- * Creates a new exception with the specified detail message. The 
resulting exception is not
- * {@link #isRetryWorthy() retry-worthy}.
- * 
- * @param message The detail message, may be {@code null}.
- */
-public ChecksumFailureException( String message )
-{
-this( false, message, null );
-}
-
-/**
- * Creates a new exception with the specified cause. The resulting 
exception is not {@link #isRetryWorthy()
- * retry-worthy}.
- * 
- * @param cause The exception that caused this one, may be {@code null}.
- */
-public ChecksumFailureException( Throwable cause )
-{
-this( "Checksum validation failed" + getMessage( ": ", cause ), cause 
);
-}
-
-/**
- * Creates a new exception with the specified detail message and cause. 
The resulting exception is not
- * {@link #isRetryWorthy() retry-worthy}.
- * 
- * @param message The detail message, may be {@code null}.
- * @param cause The exception that caused this one, may be {@code null}.
- */
-public ChecksumFailureException( String message, Throwable cause )
-{
-this( false, message, cause );
-}
-
-/**
- * Creates a new exception with the specified retry flag, detail message 
and cause.
- * 
- * @param retryWorthy {@code true} if the exception is retry-worthy, 
{@code false} otherwise.
- * @param message The detail message, may be {@code null}.
- * @param cause The exception that caused this one, may be {@code null}.
- */
-public ChecksumFailureException( boolean retryWorthy, String message, 
Throwable cause )
-{
-super( message, cause );
-expected = actual = "";
-this.retryWorthy = retryWorthy;
-}
-
-/**
- * Gets the expected checksum for the downloaded artifact/metadata.
- * 
- * @return The expected checksum as declared by the hosting repository or 
{@code null} if unknown.
- */
-public String getExpected()
-{
-return expected;
-}
-
-/**
- * Gets the actual checksum for the downloaded artifact/metadata.
- * 
- * @return The actual checksum as computed from the local bytes or {@code 
null} if unknown.
- */
-public String getActual()
-{
-return actual;
-}
-
-/**
- * Indicates whether the corresponding download is retry-worthy.
- * 
- * @return {@code true} if retrying the download might solve the checksum 
failure, {@code false} if the checksum
- * failure is 

[46/53] [abbrv] [partial] maven-resolver git commit: [MNG-6007] renamed Aether to Maven Artifact Resolver

2017-01-15 Thread hboutemy
http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/3a1b8ae0/aether-api/src/main/java/org/eclipse/aether/repository/AuthenticationContext.java
--
diff --git 
a/aether-api/src/main/java/org/eclipse/aether/repository/AuthenticationContext.java
 
b/aether-api/src/main/java/org/eclipse/aether/repository/AuthenticationContext.java
deleted file mode 100644
index bd248a0..000
--- 
a/aether-api/src/main/java/org/eclipse/aether/repository/AuthenticationContext.java
+++ /dev/null
@@ -1,389 +0,0 @@
-package org.eclipse.aether.repository;
-
-/*
- * 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.Closeable;
-import java.io.File;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.aether.RepositorySystemSession;
-
-/**
- * A glorified map of key value pairs holding (cleartext) authentication data. 
Authentication contexts are used
- * internally when network operations need to access secured repositories or 
proxies. Each authentication context
- * manages the credentials required to access a single host. Unlike {@link 
Authentication} callbacks which exist for a
- * potentially long time like the duration of a repository system session, an 
authentication context has a supposedly
- * short lifetime and should be {@link #close() closed} as soon as the 
corresponding network operation has finished:
- * 
- * 
- * AuthenticationContext context = AuthenticationContext.forRepository( 
session, repository );
- * try {
- * // get credentials
- * char[] password = context.get( AuthenticationContext.PASSWORD, 
char[].class );
- * // perform network operation using retrieved credentials
- * ...
- * } finally {
- * // erase confidential authentication data from heap memory
- * AuthenticationContext.close( context );
- * }
- * 
- * 
- * The same authentication data can often be presented using different data 
types, e.g. a password can be presented
- * using a character array or (less securely) using a string. For ease of use, 
an authentication context treats the
- * following groups of data types as equivalent and converts values 
automatically during retrieval:
- * 
- * {@code String}, {@code char[]}
- * {@code String}, {@code File}
- * 
- * An authentication context is thread-safe.
- */
-public final class AuthenticationContext
-implements Closeable
-{
-
-/**
- * The key used to store the username. The corresponding authentication 
data should be of type {@link String}.
- */
-public static final String USERNAME = "username";
-
-/**
- * The key used to store the password. The corresponding authentication 
data should be of type {@code char[]} or
- * {@link String}.
- */
-public static final String PASSWORD = "password";
-
-/**
- * The key used to store the NTLM domain. The corresponding authentication 
data should be of type {@link String}.
- */
-public static final String NTLM_DOMAIN = "ntlm.domain";
-
-/**
- * The key used to store the NTML workstation. The corresponding 
authentication data should be of type
- * {@link String}.
- */
-public static final String NTLM_WORKSTATION = "ntlm.workstation";
-
-/**
- * The key used to store the pathname to a private key file. The 
corresponding authentication data should be of type
- * {@link String} or {@link File}.
- */
-public static final String PRIVATE_KEY_PATH = "privateKey.path";
-
-/**
- * The key used to store the passphrase protecting the private key. The 
corresponding authentication data should be
- * of type {@code char[]} or {@link String}.
- */
-public static final String PRIVATE_KEY_PASSPHRASE = 
"privateKey.passphrase";
-
-/**
- * The key used to store the acceptance policy for unknown host keys. The 
corresponding authentication data should
- * be of type {@link Boolean}. When querying this authentication data, the 
extra data should provide
- * {@link #HOST_KEY_REMOTE} and {@link #HOST_KEY_LOCAL}, e.g. to enable a 
well-founded decision of the user during
- * an interactive prompt.
- */
-public static 

[15/53] [abbrv] [partial] maven-resolver git commit: [MNG-6007] renamed Aether to Maven Artifact Resolver

2017-01-15 Thread hboutemy
http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/3a1b8ae0/aether-util/src/main/java/org/eclipse/aether/util/graph/selector/AndDependencySelector.java
--
diff --git 
a/aether-util/src/main/java/org/eclipse/aether/util/graph/selector/AndDependencySelector.java
 
b/aether-util/src/main/java/org/eclipse/aether/util/graph/selector/AndDependencySelector.java
deleted file mode 100644
index f2a7e38..000
--- 
a/aether-util/src/main/java/org/eclipse/aether/util/graph/selector/AndDependencySelector.java
+++ /dev/null
@@ -1,206 +0,0 @@
-package org.eclipse.aether.util.graph.selector;
-
-/*
- * 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.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.LinkedHashSet;
-import java.util.Set;
-
-import org.eclipse.aether.collection.DependencyCollectionContext;
-import org.eclipse.aether.collection.DependencySelector;
-import org.eclipse.aether.graph.Dependency;
-
-/**
- * A dependency selector that combines zero or more other selectors using a 
logical {@code AND}. The resulting selector
- * selects a given dependency if and only if all constituent selectors do so.
- */
-public final class AndDependencySelector
-implements DependencySelector
-{
-
-private final Set selectors;
-
-private int hashCode;
-
-/**
- * Creates a new selector from the specified selectors. Prefer
- * {@link #newInstance(DependencySelector, DependencySelector)} if any of 
the input selectors might be {@code null}.
- * 
- * @param selectors The selectors to combine, may be {@code null} but must 
not contain {@code null} elements.
- */
-public AndDependencySelector( DependencySelector... selectors )
-{
-if ( selectors != null && selectors.length > 0 )
-{
-this.selectors = new LinkedHashSet( 
Arrays.asList( selectors ) );
-}
-else
-{
-this.selectors = Collections.emptySet();
-}
-}
-
-/**
- * Creates a new selector from the specified selectors.
- * 
- * @param selectors The selectors to combine, may be {@code null} but must 
not contain {@code null} elements.
- */
-public AndDependencySelector( Collection 
selectors )
-{
-if ( selectors != null && !selectors.isEmpty() )
-{
-this.selectors = new LinkedHashSet( selectors 
);
-}
-else
-{
-this.selectors = Collections.emptySet();
-}
-}
-
-private AndDependencySelector( Set selectors )
-{
-if ( selectors != null && !selectors.isEmpty() )
-{
-this.selectors = selectors;
-}
-else
-{
-this.selectors = Collections.emptySet();
-}
-}
-
-/**
- * Creates a new selector from the specified selectors.
- * 
- * @param selector1 The first selector to combine, may be {@code null}.
- * @param selector2 The second selector to combine, may be {@code null}.
- * @return The combined selector or {@code null} if both selectors were 
{@code null}.
- */
-public static DependencySelector newInstance( DependencySelector 
selector1, DependencySelector selector2 )
-{
-if ( selector1 == null )
-{
-return selector2;
-}
-else if ( selector2 == null || selector2.equals( selector1 ) )
-{
-return selector1;
-}
-return new AndDependencySelector( selector1, selector2 );
-}
-
-public boolean selectDependency( Dependency dependency )
-{
-for ( DependencySelector selector : selectors )
-{
-if ( !selector.selectDependency( dependency ) )
-{
-return false;
-}
-}
-return true;
-}
-
-public DependencySelector deriveChildSelector( DependencyCollectionContext 
context )
-{
-int seen = 0;
-Set childSelectors = null;
-
-for ( DependencySelector selector : selectors )
-{
-DependencySelector childSelector = selector.deriveChildSelector( 
context );
-  

[37/53] [abbrv] [partial] maven-resolver git commit: [MNG-6007] renamed Aether to Maven Artifact Resolver

2017-01-15 Thread hboutemy
http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/3a1b8ae0/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultDeployer.java
--
diff --git 
a/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultDeployer.java
 
b/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultDeployer.java
deleted file mode 100644
index 56951fa..000
--- 
a/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultDeployer.java
+++ /dev/null
@@ -1,663 +0,0 @@
-package org.eclipse.aether.internal.impl;
-
-/*
- * 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.io.IOException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.IdentityHashMap;
-import java.util.List;
-import java.util.Set;
-
-import javax.inject.Inject;
-import javax.inject.Named;
-
-import org.eclipse.aether.RepositoryEvent;
-import org.eclipse.aether.RepositoryEvent.EventType;
-import org.eclipse.aether.RepositoryException;
-import org.eclipse.aether.RepositorySystemSession;
-import org.eclipse.aether.RequestTrace;
-import org.eclipse.aether.SyncContext;
-import org.eclipse.aether.artifact.Artifact;
-import org.eclipse.aether.deployment.DeployRequest;
-import org.eclipse.aether.deployment.DeployResult;
-import org.eclipse.aether.deployment.DeploymentException;
-import org.eclipse.aether.impl.Deployer;
-import org.eclipse.aether.impl.MetadataGenerator;
-import org.eclipse.aether.impl.MetadataGeneratorFactory;
-import org.eclipse.aether.impl.OfflineController;
-import org.eclipse.aether.impl.RemoteRepositoryManager;
-import org.eclipse.aether.impl.RepositoryConnectorProvider;
-import org.eclipse.aether.impl.RepositoryEventDispatcher;
-import org.eclipse.aether.impl.SyncContextFactory;
-import org.eclipse.aether.impl.UpdateCheck;
-import org.eclipse.aether.impl.UpdateCheckManager;
-import org.eclipse.aether.metadata.MergeableMetadata;
-import org.eclipse.aether.metadata.Metadata;
-import org.eclipse.aether.repository.LocalRepositoryManager;
-import org.eclipse.aether.repository.RemoteRepository;
-import org.eclipse.aether.repository.RepositoryPolicy;
-import org.eclipse.aether.spi.connector.ArtifactUpload;
-import org.eclipse.aether.spi.connector.MetadataDownload;
-import org.eclipse.aether.spi.connector.MetadataUpload;
-import org.eclipse.aether.spi.connector.RepositoryConnector;
-import org.eclipse.aether.spi.io.FileProcessor;
-import org.eclipse.aether.spi.locator.Service;
-import org.eclipse.aether.spi.locator.ServiceLocator;
-import org.eclipse.aether.spi.log.Logger;
-import org.eclipse.aether.spi.log.LoggerFactory;
-import org.eclipse.aether.spi.log.NullLoggerFactory;
-import org.eclipse.aether.transfer.ArtifactTransferException;
-import org.eclipse.aether.transfer.MetadataNotFoundException;
-import org.eclipse.aether.transfer.MetadataTransferException;
-import org.eclipse.aether.transfer.NoRepositoryConnectorException;
-import org.eclipse.aether.transfer.RepositoryOfflineException;
-import org.eclipse.aether.transfer.TransferCancelledException;
-import org.eclipse.aether.transfer.TransferEvent;
-
-/**
- */
-@Named
-public class DefaultDeployer
-implements Deployer, Service
-{
-
-private Logger logger = NullLoggerFactory.LOGGER;
-
-private FileProcessor fileProcessor;
-
-private RepositoryEventDispatcher repositoryEventDispatcher;
-
-private RepositoryConnectorProvider repositoryConnectorProvider;
-
-private RemoteRepositoryManager remoteRepositoryManager;
-
-private UpdateCheckManager updateCheckManager;
-
-private Collection metadataFactories = new 
ArrayList();
-
-private SyncContextFactory syncContextFactory;
-
-private OfflineController offlineController;
-
-public DefaultDeployer()
-{
-// enables default constructor
-}
-
-@Inject
-DefaultDeployer( FileProcessor fileProcessor, RepositoryEventDispatcher 
repositoryEventDispatcher,
- RepositoryConnectorProvider repositoryConnectorProvider,
- RemoteRepositoryManager remoteRepositoryManager, 
UpdateCheckManager updateCheckManager,
-   

[10/53] [abbrv] [partial] maven-resolver git commit: [MNG-6007] renamed Aether to Maven Artifact Resolver

2017-01-15 Thread hboutemy
http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/3a1b8ae0/aether-util/src/test/java/org/eclipse/aether/util/filter/PatternInclusionsDependencyFilterTest.java
--
diff --git 
a/aether-util/src/test/java/org/eclipse/aether/util/filter/PatternInclusionsDependencyFilterTest.java
 
b/aether-util/src/test/java/org/eclipse/aether/util/filter/PatternInclusionsDependencyFilterTest.java
deleted file mode 100644
index cb85431..000
--- 
a/aether-util/src/test/java/org/eclipse/aether/util/filter/PatternInclusionsDependencyFilterTest.java
+++ /dev/null
@@ -1,184 +0,0 @@
-package org.eclipse.aether.util.filter;
-
-/*
- * 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 static org.junit.Assert.*;
-
-import java.util.LinkedList;
-import java.util.List;
-
-import org.eclipse.aether.graph.DependencyNode;
-import org.eclipse.aether.internal.test.util.NodeBuilder;
-import org.eclipse.aether.util.filter.PatternInclusionsDependencyFilter;
-import org.eclipse.aether.util.version.GenericVersionScheme;
-import org.eclipse.aether.version.VersionScheme;
-import org.junit.Test;
-
-public class PatternInclusionsDependencyFilterTest
-extends AbstractDependencyFilterTest
-{
-
-@Test
-public void acceptTestCornerCases()
-{
-NodeBuilder builder = new NodeBuilder();
-builder.artifactId( "testArtifact" );
-DependencyNode node = builder.build();
-List parents = new LinkedList();
-
-// Empty String, Empty List
-assertTrue( accept( node, "" ) );
-assertFalse( new PatternInclusionsDependencyFilter( new 
LinkedList() ).accept( node, parents ) );
-assertFalse( new PatternInclusionsDependencyFilter( (String[]) null 
).accept( node, parents ) );
-assertFalse( new PatternInclusionsDependencyFilter( (VersionScheme) 
null, "[1,10]" ).accept( node, parents ) );
-}
-
-@Test
-public void acceptTestMatches()
-{
-NodeBuilder builder = new NodeBuilder();
-builder.groupId( "com.example.test" ).artifactId( "testArtifact" 
).ext( "jar" ).version( "1.0.3" );
-DependencyNode node = builder.build();
-
-// full match
-assertEquals( "com.example.test:testArtifact:jar:1.0.3", true,
-  accept( node, "com.example.test:testArtifact:jar:1.0.3" 
) );
-
-// single wildcard
-assertEquals( "*:testArtifact:jar:1.0.3", true, accept( node, 
"*:testArtifact:jar:1.0.3" ) );
-assertEquals( "com.example.test:*:jar:1.0.3", true, accept( node, 
"com.example.test:*:jar:1.0.3" ) );
-assertEquals( "com.example.test:testArtifact:*:1.0.3", true,
-  accept( node, "com.example.test:testArtifact:*:1.0.3" ) 
);
-assertEquals( "com.example.test:testArtifact:*:1.0.3", true,
-  accept( node, "com.example.test:testArtifact:*:1.0.3" ) 
);
-
-// implicit wildcard
-assertEquals( ":testArtifact:jar:1.0.3", true, accept( node, 
":testArtifact:jar:1.0.3" ) );
-assertEquals( "com.example.test::jar:1.0.3", true, accept( node, 
"com.example.test::jar:1.0.3" ) );
-assertEquals( "com.example.test:testArtifact::1.0.3", true,
-  accept( node, "com.example.test:testArtifact::1.0.3" ) );
-assertEquals( "com.example.test:testArtifact:jar:", true, accept( 
node, "com.example.test:testArtifact:jar:" ) );
-
-// multi wildcards
-assertEquals( "*:*:jar:1.0.3", true, accept( node, "*:*:jar:1.0.3" ) );
-assertEquals( "com.example.test:*:*:1.0.3", true, accept( node, 
"com.example.test:*:*:1.0.3" ) );
-assertEquals( "com.example.test:testArtifact:*:*", true, accept( node, 
"com.example.test:testArtifact:*:*" ) );
-assertEquals( "*:testArtifact:jar:*", true, accept( node, 
"*:testArtifact:jar:*" ) );
-assertEquals( "*:*:jar:*", true, accept( node, "*:*:jar:*" ) );
-assertEquals( ":*:jar:", true, accept( node, ":*:jar:" ) );
-
-// partial wildcards
-assertEquals( "*.example.test:testArtifact:jar:1.0.3", true,
-  accept( node, "*.example.test:testArtifact:jar:1.0.3" ) 
);
-

[41/53] [abbrv] [partial] maven-resolver git commit: [MNG-6007] renamed Aether to Maven Artifact Resolver

2017-01-15 Thread hboutemy
http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/3a1b8ae0/aether-connector-basic/src/main/java/org/eclipse/aether/connector/basic/BasicRepositoryConnector.java
--
diff --git 
a/aether-connector-basic/src/main/java/org/eclipse/aether/connector/basic/BasicRepositoryConnector.java
 
b/aether-connector-basic/src/main/java/org/eclipse/aether/connector/basic/BasicRepositoryConnector.java
deleted file mode 100644
index 27f2285..000
--- 
a/aether-connector-basic/src/main/java/org/eclipse/aether/connector/basic/BasicRepositoryConnector.java
+++ /dev/null
@@ -1,595 +0,0 @@
-package org.eclipse.aether.connector.basic;
-
-/*
- * 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.io.IOException;
-import java.net.URI;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.Executor;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.LinkedBlockingQueue;
-import java.util.concurrent.ThreadPoolExecutor;
-import java.util.concurrent.TimeUnit;
-
-import org.eclipse.aether.ConfigurationProperties;
-import org.eclipse.aether.RepositorySystemSession;
-import org.eclipse.aether.RequestTrace;
-import org.eclipse.aether.repository.RemoteRepository;
-import org.eclipse.aether.spi.connector.ArtifactDownload;
-import org.eclipse.aether.spi.connector.ArtifactUpload;
-import org.eclipse.aether.spi.connector.MetadataDownload;
-import org.eclipse.aether.spi.connector.MetadataUpload;
-import org.eclipse.aether.spi.connector.RepositoryConnector;
-import org.eclipse.aether.spi.connector.checksum.ChecksumPolicy;
-import org.eclipse.aether.spi.connector.checksum.ChecksumPolicyProvider;
-import org.eclipse.aether.spi.connector.layout.RepositoryLayout;
-import org.eclipse.aether.spi.connector.layout.RepositoryLayoutProvider;
-import org.eclipse.aether.spi.connector.transport.GetTask;
-import org.eclipse.aether.spi.connector.transport.PeekTask;
-import org.eclipse.aether.spi.connector.transport.PutTask;
-import org.eclipse.aether.spi.connector.transport.Transporter;
-import org.eclipse.aether.spi.connector.transport.TransporterProvider;
-import org.eclipse.aether.spi.io.FileProcessor;
-import org.eclipse.aether.spi.log.Logger;
-import org.eclipse.aether.transfer.ChecksumFailureException;
-import org.eclipse.aether.transfer.NoRepositoryConnectorException;
-import org.eclipse.aether.transfer.NoRepositoryLayoutException;
-import org.eclipse.aether.transfer.NoTransporterException;
-import org.eclipse.aether.transfer.TransferEvent;
-import org.eclipse.aether.transfer.TransferResource;
-import org.eclipse.aether.util.ChecksumUtils;
-import org.eclipse.aether.util.ConfigUtils;
-import org.eclipse.aether.util.concurrency.RunnableErrorForwarder;
-import org.eclipse.aether.util.concurrency.WorkerThreadFactory;
-
-/**
- */
-final class BasicRepositoryConnector
-implements RepositoryConnector
-{
-
-private static final String CONFIG_PROP_THREADS = 
"aether.connector.basic.threads";
-
-private static final String CONFIG_PROP_RESUME = 
"aether.connector.resumeDownloads";
-
-private static final String CONFIG_PROP_RESUME_THRESHOLD = 
"aether.connector.resumeThreshold";
-
-private static final String CONFIG_PROP_SMART_CHECKSUMS = 
"aether.connector.smartChecksums";
-
-private final Logger logger;
-
-private final FileProcessor fileProcessor;
-
-private final RemoteRepository repository;
-
-private final RepositorySystemSession session;
-
-private final Transporter transporter;
-
-private final RepositoryLayout layout;
-
-private final ChecksumPolicyProvider checksumPolicyProvider;
-
-private final PartialFile.Factory partialFileFactory;
-
-private final int maxThreads;
-
-private final boolean smartChecksums;
-
-private final boolean persistedChecksums;
-
-private Executor executor;
-
-private boolean closed;
-
-public BasicRepositoryConnector( RepositorySystemSession session, 
RemoteRepository repository,
- TransporterProvider 

[39/53] [abbrv] [partial] maven-resolver git commit: [MNG-6007] renamed Aether to Maven Artifact Resolver

2017-01-15 Thread hboutemy
http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/3a1b8ae0/aether-impl/src/main/java/org/eclipse/aether/impl/SyncContextFactory.java
--
diff --git 
a/aether-impl/src/main/java/org/eclipse/aether/impl/SyncContextFactory.java 
b/aether-impl/src/main/java/org/eclipse/aether/impl/SyncContextFactory.java
deleted file mode 100644
index 95086d1..000
--- a/aether-impl/src/main/java/org/eclipse/aether/impl/SyncContextFactory.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package org.eclipse.aether.impl;
-
-/*
- * 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 org.eclipse.aether.RepositorySystem;
-import org.eclipse.aether.RepositorySystemSession;
-import org.eclipse.aether.SyncContext;
-
-/**
- * A factory to create synchronization contexts. A synchronization context is 
used to coordinate concurrent access to
- * artifacts or metadata.
- * 
- * @provisional This type is provisional and can be changed, moved or removed 
without prior notice.
- */
-public interface SyncContextFactory
-{
-
-/**
- * Creates a new synchronization context.
- * 
- * @param session The repository session during which the context will be 
used, must not be {@code null}.
- * @param shared A flag indicating whether access to the 
artifacts/metadata associated with the new context can be
- *shared among concurrent readers or whether access needs to 
be exclusive to the calling thread.
- * @return The synchronization context, never {@code null}.
- * @see RepositorySystem#newSyncContext(RepositorySystemSession, boolean)
- */
-SyncContext newInstance( RepositorySystemSession session, boolean shared );
-
-}

http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/3a1b8ae0/aether-impl/src/main/java/org/eclipse/aether/impl/UpdateCheck.java
--
diff --git a/aether-impl/src/main/java/org/eclipse/aether/impl/UpdateCheck.java 
b/aether-impl/src/main/java/org/eclipse/aether/impl/UpdateCheck.java
deleted file mode 100644
index b77d2bc..000
--- a/aether-impl/src/main/java/org/eclipse/aether/impl/UpdateCheck.java
+++ /dev/null
@@ -1,285 +0,0 @@
-package org.eclipse.aether.impl;
-
-/*
- * 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 org.eclipse.aether.RepositoryException;
-import org.eclipse.aether.repository.RemoteRepository;
-
-/**
- * A request to check if an update of an artifact/metadata from a remote 
repository is needed.
- * 
- * @param 
- * @param 
- * @see UpdateCheckManager
- * @provisional This type is provisional and can be changed, moved or removed 
without prior notice.
- */
-public final class UpdateCheck
-{
-
-private long localLastUpdated;
-
-private T item;
-
-private File file;
-
-private boolean fileValid = true;
-
-private String policy;
-
-private RemoteRepository repository;
-
-private RemoteRepository authoritativeRepository;
-
-private boolean required;
-
-private E exception;
-
-/**
- * Creates an uninitialized update check request.
- */
-public UpdateCheck()
-{
-}
-
-/**
- * Gets the last-modified timestamp of the corresponding item produced by 
a local installation. If non-zero, a
- * remote update will be surpressed if the local item is up-to-date, even 
if the remote 

[50/53] [abbrv] [partial] maven-resolver git commit: [MNG-6007] renamed Aether to Maven Artifact Resolver

2017-01-15 Thread hboutemy
http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/3a1b8ae0/aether-api/pom.xml
--
diff --git a/aether-api/pom.xml b/aether-api/pom.xml
deleted file mode 100644
index 949aae9..000
--- a/aether-api/pom.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-
-
-
-
-http://maven.apache.org/POM/4.0.0; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
-   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
-  4.0.0
-
-  
-org.apache.maven.aether
-aether
-1.0.3-SNAPSHOT
-  
-
-  aether-api
-
-  Aether API
-  
-The application programming interface for the repository system.
-  
-
-  
-
-  junit
-  junit
-  test
-
-
-  org.hamcrest
-  hamcrest-library
-  test
-
-  
-

http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/3a1b8ae0/aether-api/src/main/java/org/eclipse/aether/AbstractForwardingRepositorySystemSession.java
--
diff --git 
a/aether-api/src/main/java/org/eclipse/aether/AbstractForwardingRepositorySystemSession.java
 
b/aether-api/src/main/java/org/eclipse/aether/AbstractForwardingRepositorySystemSession.java
deleted file mode 100644
index 20df431..000
--- 
a/aether-api/src/main/java/org/eclipse/aether/AbstractForwardingRepositorySystemSession.java
+++ /dev/null
@@ -1,189 +0,0 @@
-package org.eclipse.aether;
-
-/*
- * 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.util.Map;
-
-import org.eclipse.aether.artifact.ArtifactTypeRegistry;
-import org.eclipse.aether.collection.DependencyGraphTransformer;
-import org.eclipse.aether.collection.DependencyManager;
-import org.eclipse.aether.collection.DependencySelector;
-import org.eclipse.aether.collection.DependencyTraverser;
-import org.eclipse.aether.collection.VersionFilter;
-import org.eclipse.aether.repository.AuthenticationSelector;
-import org.eclipse.aether.repository.LocalRepository;
-import org.eclipse.aether.repository.LocalRepositoryManager;
-import org.eclipse.aether.repository.MirrorSelector;
-import org.eclipse.aether.repository.ProxySelector;
-import org.eclipse.aether.repository.WorkspaceReader;
-import org.eclipse.aether.resolution.ArtifactDescriptorPolicy;
-import org.eclipse.aether.resolution.ResolutionErrorPolicy;
-import org.eclipse.aether.transfer.TransferListener;
-
-/**
- * A special repository system session to enable decorating or proxying 
another session. To do so, clients have to
- * create a subclass and implement {@link #getSession()}.
- */
-public abstract class AbstractForwardingRepositorySystemSession
-implements RepositorySystemSession
-{
-
-/**
- * Creates a new forwarding session.
- */
-protected AbstractForwardingRepositorySystemSession()
-{
-}
-
-/**
- * Gets the repository system session to which this instance forwards 
calls. It's worth noting that this class does
- * not save/cache the returned reference but queries this method before 
each forwarding. Hence, the session
- * forwarded to may change over time or depending on the context (e.g. 
calling thread).
- * 
- * @return The repository system session to forward calls to, never {@code 
null}.
- */
-protected abstract RepositorySystemSession getSession();
-
-public boolean isOffline()
-{
-return getSession().isOffline();
-}
-
-public boolean isIgnoreArtifactDescriptorRepositories()
-{
-return getSession().isIgnoreArtifactDescriptorRepositories();
-}
-
-public ResolutionErrorPolicy getResolutionErrorPolicy()
-{
-return getSession().getResolutionErrorPolicy();
-}
-
-public ArtifactDescriptorPolicy getArtifactDescriptorPolicy()
-{
-return getSession().getArtifactDescriptorPolicy();
-}
-
-public String getChecksumPolicy()
-{
-return getSession().getChecksumPolicy();
-}
-
-public String getUpdatePolicy()
-{
-return getSession().getUpdatePolicy();
-}
-
-public LocalRepository getLocalRepository()
-{
-return getSession().getLocalRepository();
-}
-
-public 

[29/53] [abbrv] [partial] maven-resolver git commit: [MNG-6007] renamed Aether to Maven Artifact Resolver

2017-01-15 Thread hboutemy
http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/3a1b8ae0/aether-impl/src/test/resources/artifact-descriptions/cycle-big/10_229_4.1-SNAPSHOT.ini
--
diff --git 
a/aether-impl/src/test/resources/artifact-descriptions/cycle-big/10_229_4.1-SNAPSHOT.ini
 
b/aether-impl/src/test/resources/artifact-descriptions/cycle-big/10_229_4.1-SNAPSHOT.ini
deleted file mode 100644
index 0ae9cd0..000
--- 
a/aether-impl/src/test/resources/artifact-descriptions/cycle-big/10_229_4.1-SNAPSHOT.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-[dependencies]
-1:13:pom:1.7.0-SNAPSHOT
-1:44:pom:1.3-SNAPSHOT
-1:45:pom:3.1-SNAPSHOT
-1:23:pom:1.2.6_sap.1-SNAPSHOT
-1:46:pom:1.0.2-SNAPSHOT
-1:140:pom:6.0.24-SNAPSHOT
-1:67:pom:1.6.5-SNAPSHOT
-1:50:pom:3.3-SNAPSHOT
-1:50:pom:3.4-SNAPSHOT
-1:50:pom:3.5-SNAPSHOT
-1:185:pom:1.0_sap.2-SNAPSHOT
-1:68:pom:3.8.1-SNAPSHOT
-1:2:pom:5.50-SNAPSHOT
-1:217:pom:1.0_sap.1-SNAPSHOT
-1:9:pom:3.1-SNAPSHOT
-1:57:pom:4.0.5-SNAPSHOT
-1:6:pom:1.5.8-SNAPSHOT
-1:7:pom:5.8.8-SNAPSHOT
-1:28:pom:4.1-SNAPSHOT
-1:31:pom:2.2-SNAPSHOT
-1:5:pom:1.5-SNAPSHOT
-1:61:pom:1.1-SNAPSHOT
-1:154:pom:3.3-SNAPSHOT
-1:219:pom:2.3.4-SNAPSHOT
-10:22:pom:4.1-SNAPSHOT
-10:11:pom:4.1-SNAPSHOT
-10:230:pom:4.1-SNAPSHOT
-10:226:pom:4.1-SNAPSHOT
-10:232:pom:4.1-SNAPSHOT
-10:152:pom:4.1-SNAPSHOT

http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/3a1b8ae0/aether-impl/src/test/resources/artifact-descriptions/cycle-big/10_22_4.0-SNAPSHOT.ini
--
diff --git 
a/aether-impl/src/test/resources/artifact-descriptions/cycle-big/10_22_4.0-SNAPSHOT.ini
 
b/aether-impl/src/test/resources/artifact-descriptions/cycle-big/10_22_4.0-SNAPSHOT.ini
deleted file mode 100644
index 2e07aa7..000
--- 
a/aether-impl/src/test/resources/artifact-descriptions/cycle-big/10_22_4.0-SNAPSHOT.ini
+++ /dev/null
@@ -1,23 +0,0 @@
-[dependencies]
-1:13:pom:1.7.0-SNAPSHOT
-1:23:pom:1.2.6_sap.1-SNAPSHOT
-1:24:pom:1.2.10-SNAPSHOT
-1:4:pom:2.5.4-SNAPSHOT
-1:3:pom:1.28-SNAPSHOT
-1:26:pom:3.0.1-SNAPSHOT
-1:2:pom:5.50-SNAPSHOT
-1:9:pom:3.1-SNAPSHOT
-1:27:pom:6.0-SNAPSHOT
-1:25:pom:0.86-beta1-SNAPSHOT
-1:6:pom:1.5.8-SNAPSHOT
-1:7:pom:5.8.8-SNAPSHOT
-1:21:pom:3.2.1.2-SNAPSHOT
-1:28:pom:4.1-SNAPSHOT
-1:29:pom:3.0.5-SNAPSHOT
-1:30:pom:0.7.0-SNAPSHOT
-1:31:pom:2.2-SNAPSHOT
-1:32:pom:720-SNAPSHOT
-1:33:pom:711-SNAPSHOT
-1:5:pom:1.5-SNAPSHOT
-10:11:pom:4.0-SNAPSHOT
-10:43:pom:4.0-SNAPSHOT

http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/3a1b8ae0/aether-impl/src/test/resources/artifact-descriptions/cycle-big/10_22_4.1-SNAPSHOT.ini
--
diff --git 
a/aether-impl/src/test/resources/artifact-descriptions/cycle-big/10_22_4.1-SNAPSHOT.ini
 
b/aether-impl/src/test/resources/artifact-descriptions/cycle-big/10_22_4.1-SNAPSHOT.ini
deleted file mode 100644
index 61d2cfd..000
--- 
a/aether-impl/src/test/resources/artifact-descriptions/cycle-big/10_22_4.1-SNAPSHOT.ini
+++ /dev/null
@@ -1,24 +0,0 @@
-[dependencies]
-1:13:pom:1.7.0-SNAPSHOT
-1:23:pom:1.2.6_sap.1-SNAPSHOT
-1:24:pom:1.2.10-SNAPSHOT
-1:4:pom:2.5.4-SNAPSHOT
-1:3:pom:1.28-SNAPSHOT
-1:26:pom:3.0.1-SNAPSHOT
-1:2:pom:5.50-SNAPSHOT
-1:9:pom:3.1-SNAPSHOT
-1:27:pom:6.0-SNAPSHOT
-1:25:pom:0.86-beta1-SNAPSHOT
-1:6:pom:1.5.8-SNAPSHOT
-1:7:pom:5.8.8-SNAPSHOT
-1:21:pom:3.2.1.2-SNAPSHOT
-1:28:pom:4.1-SNAPSHOT
-1:29:pom:3.0.5-SNAPSHOT
-1:30:pom:0.7.0-SNAPSHOT
-1:31:pom:2.2-SNAPSHOT
-1:32:pom:720-SNAPSHOT
-1:33:pom:711-SNAPSHOT
-1:5:pom:1.5-SNAPSHOT
-10:11:pom:4.1-SNAPSHOT
-10:43:pom:4.1-SNAPSHOT
-10:160:pom:4.1-SNAPSHOT

http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/3a1b8ae0/aether-impl/src/test/resources/artifact-descriptions/cycle-big/10_230_4.0-SNAPSHOT.ini
--
diff --git 
a/aether-impl/src/test/resources/artifact-descriptions/cycle-big/10_230_4.0-SNAPSHOT.ini
 
b/aether-impl/src/test/resources/artifact-descriptions/cycle-big/10_230_4.0-SNAPSHOT.ini
deleted file mode 100644
index 65e3aa0..000
--- 
a/aether-impl/src/test/resources/artifact-descriptions/cycle-big/10_230_4.0-SNAPSHOT.ini
+++ /dev/null
@@ -1,41 +0,0 @@
-[dependencies]
-1:13:pom:1.7.0-SNAPSHOT
-1:44:pom:1.3-SNAPSHOT
-1:45:pom:3.1-SNAPSHOT
-1:23:pom:1.2.6_sap.1-SNAPSHOT
-1:46:pom:1.0.2-SNAPSHOT
-1:140:pom:6.0.24-SNAPSHOT
-1:67:pom:1.6.5-SNAPSHOT
-1:50:pom:3.3-SNAPSHOT
-1:50:pom:3.4-SNAPSHOT
-1:50:pom:3.5-SNAPSHOT
-1:185:pom:1.0_sap.1-SNAPSHOT
-1:68:pom:3.8.1-SNAPSHOT
-1:2:pom:5.50-SNAPSHOT
-1:217:pom:1.0_sap.1-SNAPSHOT
-1:9:pom:3.1-SNAPSHOT
-1:57:pom:4.0.5-SNAPSHOT
-1:59:pom:1.0.1-SNAPSHOT
-1:6:pom:1.5.8-SNAPSHOT
-1:7:pom:5.8.8-SNAPSHOT
-1:28:pom:4.1-SNAPSHOT
-1:31:pom:2.2-SNAPSHOT
-1:227:pom:7.0-SNAPSHOT
-1:5:pom:1.5-SNAPSHOT
-1:61:pom:1.1-SNAPSHOT
-1:154:pom:3.3-SNAPSHOT
-1:218:pom:2.2.1-SNAPSHOT
-1:219:pom:2.3.4-SNAPSHOT
-10:22:pom:4.0-SNAPSHOT
-10:11:pom:4.0-SNAPSHOT

[49/53] [abbrv] [partial] maven-resolver git commit: [MNG-6007] renamed Aether to Maven Artifact Resolver

2017-01-15 Thread hboutemy
http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/3a1b8ae0/aether-api/src/main/java/org/eclipse/aether/RepositorySystem.java
--
diff --git a/aether-api/src/main/java/org/eclipse/aether/RepositorySystem.java 
b/aether-api/src/main/java/org/eclipse/aether/RepositorySystem.java
deleted file mode 100644
index 8706f89..000
--- a/aether-api/src/main/java/org/eclipse/aether/RepositorySystem.java
+++ /dev/null
@@ -1,277 +0,0 @@
-package org.eclipse.aether;
-
-/*
- * 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.util.Collection;
-import java.util.List;
-
-import org.eclipse.aether.artifact.Artifact;
-import org.eclipse.aether.collection.CollectRequest;
-import org.eclipse.aether.collection.CollectResult;
-import org.eclipse.aether.collection.DependencyCollectionException;
-import org.eclipse.aether.deployment.DeployRequest;
-import org.eclipse.aether.deployment.DeployResult;
-import org.eclipse.aether.deployment.DeploymentException;
-import org.eclipse.aether.installation.InstallRequest;
-import org.eclipse.aether.installation.InstallResult;
-import org.eclipse.aether.installation.InstallationException;
-import org.eclipse.aether.metadata.Metadata;
-import org.eclipse.aether.repository.LocalRepository;
-import org.eclipse.aether.repository.LocalRepositoryManager;
-import org.eclipse.aether.repository.RemoteRepository;
-import org.eclipse.aether.resolution.ArtifactDescriptorException;
-import org.eclipse.aether.resolution.ArtifactDescriptorRequest;
-import org.eclipse.aether.resolution.ArtifactDescriptorResult;
-import org.eclipse.aether.resolution.ArtifactRequest;
-import org.eclipse.aether.resolution.ArtifactResolutionException;
-import org.eclipse.aether.resolution.ArtifactResult;
-import org.eclipse.aether.resolution.DependencyRequest;
-import org.eclipse.aether.resolution.DependencyResolutionException;
-import org.eclipse.aether.resolution.DependencyResult;
-import org.eclipse.aether.resolution.MetadataRequest;
-import org.eclipse.aether.resolution.MetadataResult;
-import org.eclipse.aether.resolution.VersionRangeRequest;
-import org.eclipse.aether.resolution.VersionRangeResolutionException;
-import org.eclipse.aether.resolution.VersionRangeResult;
-import org.eclipse.aether.resolution.VersionRequest;
-import org.eclipse.aether.resolution.VersionResolutionException;
-import org.eclipse.aether.resolution.VersionResult;
-
-/**
- * The main entry point to the repository system and its functionality. Note 
that obtaining a concrete implementation of
- * this interface (e.g. via dependency injection, service locator, etc.) is 
dependent on the application and its
- * specific needs, please consult the online documentation for examples and 
directions on booting the system.
- * 
- * @noimplement This interface is not intended to be implemented by clients.
- * @noextend This interface is not intended to be extended by clients.
- */
-public interface RepositorySystem
-{
-
-/**
- * Expands a version range to a list of matching versions, in ascending 
order. For example, resolves "[3.8,4.0)" to
- * "3.8", "3.8.1", "3.8.2". Note that the returned list of versions is 
only dependent on the configured repositories
- * and their contents, the list is not processed by the {@link 
RepositorySystemSession#getVersionFilter() session's
- * version filter}.
- * 
- * The supplied request may also refer to a single concrete version rather 
than a version range. In this case
- * though, the result contains simply the (parsed) input version, 
regardless of the repositories and their contents.
- * 
- * @param session The repository session, must not be {@code null}.
- * @param request The version range request, must not be {@code null}.
- * @return The version range result, never {@code null}.
- * @throws VersionRangeResolutionException If the requested range could 
not be parsed. Note that an empty range does
- * not raise an exception.
- * @see #newResolutionRepositories(RepositorySystemSession, List)
- */
-VersionRangeResult resolveVersionRange( RepositorySystemSession session, 
VersionRangeRequest 

[34/53] [abbrv] [partial] maven-resolver git commit: [MNG-6007] renamed Aether to Maven Artifact Resolver

2017-01-15 Thread hboutemy
http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/3a1b8ae0/aether-impl/src/main/java/org/eclipse/aether/internal/impl/package-info.java
--
diff --git 
a/aether-impl/src/main/java/org/eclipse/aether/internal/impl/package-info.java 
b/aether-impl/src/main/java/org/eclipse/aether/internal/impl/package-info.java
deleted file mode 100644
index 813b21d..000
--- 
a/aether-impl/src/main/java/org/eclipse/aether/internal/impl/package-info.java
+++ /dev/null
@@ -1,24 +0,0 @@
-// CHECKSTYLE_OFF: RegexpHeader
-/*
- * 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.
- */
-/**
- * The various sub components that collectively implement the repository 
system. 
- */
-package org.eclipse.aether.internal.impl;
-

http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/3a1b8ae0/aether-impl/src/main/java/org/eclipse/aether/internal/impl/slf4j/Slf4jLoggerFactory.java
--
diff --git 
a/aether-impl/src/main/java/org/eclipse/aether/internal/impl/slf4j/Slf4jLoggerFactory.java
 
b/aether-impl/src/main/java/org/eclipse/aether/internal/impl/slf4j/Slf4jLoggerFactory.java
deleted file mode 100644
index 840fe21..000
--- 
a/aether-impl/src/main/java/org/eclipse/aether/internal/impl/slf4j/Slf4jLoggerFactory.java
+++ /dev/null
@@ -1,201 +0,0 @@
-package org.eclipse.aether.internal.impl.slf4j;
-
-/*
- * 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 javax.inject.Inject;
-import javax.inject.Named;
-
-import org.eclipse.aether.spi.locator.Service;
-import org.eclipse.aether.spi.locator.ServiceLocator;
-import org.eclipse.aether.spi.log.Logger;
-import org.eclipse.aether.spi.log.LoggerFactory;
-import org.eclipse.sisu.Nullable;
-import org.slf4j.ILoggerFactory;
-import org.slf4j.spi.LocationAwareLogger;
-
-/**
- * A logger factory that delegates to http://www.slf4j.org/; 
target="_blank">SLF4J logging.
- */
-@Named( "slf4j" )
-public class Slf4jLoggerFactory
-implements LoggerFactory, Service
-{
-
-private static final boolean AVAILABLE;
-
-static
-{
-boolean available;
-try
-{
-Slf4jLoggerFactory.class.getClassLoader().loadClass( 
"org.slf4j.ILoggerFactory" );
-available = true;
-}
-catch ( Exception e )
-{
-available = false;
-}
-catch ( LinkageError e )
-{
-available = false;
-}
-AVAILABLE = available;
-}
-
-public static boolean isSlf4jAvailable()
-{
-return AVAILABLE;
-}
-
-private ILoggerFactory factory;
-
-/**
- * Creates an instance of this logger factory.
- */
-public Slf4jLoggerFactory()
-{
-// enables no-arg constructor
-}
-
-@Inject
-Slf4jLoggerFactory( @Nullable ILoggerFactory factory )
-{
-setLoggerFactory( factory );
-}
-
-public void initService( ServiceLocator locator )
-{
-setLoggerFactory( locator.getService( ILoggerFactory.class ) );
-}
-
-public Slf4jLoggerFactory setLoggerFactory( ILoggerFactory factory )
-{
-this.factory = factory;
-return this;
-}
-
-public Logger getLogger( String name )
-{
-org.slf4j.Logger logger = getFactory().getLogger( name );
-if ( logger instanceof LocationAwareLogger )
-{
-return new Slf4jLoggerEx( 

[26/53] [abbrv] [partial] maven-resolver git commit: [MNG-6007] renamed Aether to Maven Artifact Resolver

2017-01-15 Thread hboutemy
http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/3a1b8ae0/aether-impl/src/test/resources/artifact-descriptions/cycle-big/1_182_3.2-SNAPSHOT.ini
--
diff --git 
a/aether-impl/src/test/resources/artifact-descriptions/cycle-big/1_182_3.2-SNAPSHOT.ini
 
b/aether-impl/src/test/resources/artifact-descriptions/cycle-big/1_182_3.2-SNAPSHOT.ini
deleted file mode 100644
index 61a252c..000
--- 
a/aether-impl/src/test/resources/artifact-descriptions/cycle-big/1_182_3.2-SNAPSHOT.ini
+++ /dev/null
@@ -1 +0,0 @@
-[dependencies]

http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/3a1b8ae0/aether-impl/src/test/resources/artifact-descriptions/cycle-big/1_183_0.9-SNAPSHOT.ini
--
diff --git 
a/aether-impl/src/test/resources/artifact-descriptions/cycle-big/1_183_0.9-SNAPSHOT.ini
 
b/aether-impl/src/test/resources/artifact-descriptions/cycle-big/1_183_0.9-SNAPSHOT.ini
deleted file mode 100644
index 61a252c..000
--- 
a/aether-impl/src/test/resources/artifact-descriptions/cycle-big/1_183_0.9-SNAPSHOT.ini
+++ /dev/null
@@ -1 +0,0 @@
-[dependencies]

http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/3a1b8ae0/aether-impl/src/test/resources/artifact-descriptions/cycle-big/1_184_20080807-SNAPSHOT.ini
--
diff --git 
a/aether-impl/src/test/resources/artifact-descriptions/cycle-big/1_184_20080807-SNAPSHOT.ini
 
b/aether-impl/src/test/resources/artifact-descriptions/cycle-big/1_184_20080807-SNAPSHOT.ini
deleted file mode 100644
index 05b1294..000
--- 
a/aether-impl/src/test/resources/artifact-descriptions/cycle-big/1_184_20080807-SNAPSHOT.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[dependencies]
-1:13:pom:1.7.0-SNAPSHOT
-1:5:pom:1.5-SNAPSHOT

http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/3a1b8ae0/aether-impl/src/test/resources/artifact-descriptions/cycle-big/1_185_1.0_sap.1-SNAPSHOT.ini
--
diff --git 
a/aether-impl/src/test/resources/artifact-descriptions/cycle-big/1_185_1.0_sap.1-SNAPSHOT.ini
 
b/aether-impl/src/test/resources/artifact-descriptions/cycle-big/1_185_1.0_sap.1-SNAPSHOT.ini
deleted file mode 100644
index b9f2329..000
--- 
a/aether-impl/src/test/resources/artifact-descriptions/cycle-big/1_185_1.0_sap.1-SNAPSHOT.ini
+++ /dev/null
@@ -1,15 +0,0 @@
-[dependencies]
-1:13:pom:1.7.0-SNAPSHOT
-1:45:pom:3.1-SNAPSHOT
-1:23:pom:1.2.6_sap.1-SNAPSHOT
-1:140:pom:6.0.24-SNAPSHOT
-1:140:pom:5.5.28-SNAPSHOT
-1:50:pom:3.3-SNAPSHOT
-1:50:pom:3.5-SNAPSHOT
-1:2:pom:5.50-SNAPSHOT
-1:9:pom:3.1-SNAPSHOT
-1:6:pom:1.5.8-SNAPSHOT
-1:7:pom:5.8.8-SNAPSHOT
-1:31:pom:2.2-SNAPSHOT
-1:5:pom:1.5-SNAPSHOT
-10:11:pom:4.0-SNAPSHOT

http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/3a1b8ae0/aether-impl/src/test/resources/artifact-descriptions/cycle-big/1_185_1.0_sap.2-SNAPSHOT.ini
--
diff --git 
a/aether-impl/src/test/resources/artifact-descriptions/cycle-big/1_185_1.0_sap.2-SNAPSHOT.ini
 
b/aether-impl/src/test/resources/artifact-descriptions/cycle-big/1_185_1.0_sap.2-SNAPSHOT.ini
deleted file mode 100644
index 58c3546..000
--- 
a/aether-impl/src/test/resources/artifact-descriptions/cycle-big/1_185_1.0_sap.2-SNAPSHOT.ini
+++ /dev/null
@@ -1,15 +0,0 @@
-[dependencies]
-1:13:pom:1.7.0-SNAPSHOT
-1:45:pom:3.1-SNAPSHOT
-1:23:pom:1.2.6_sap.1-SNAPSHOT
-1:140:pom:6.0.24-SNAPSHOT
-1:140:pom:5.5.28-SNAPSHOT
-1:50:pom:3.3-SNAPSHOT
-1:50:pom:3.5-SNAPSHOT
-1:2:pom:5.50-SNAPSHOT
-1:9:pom:3.1-SNAPSHOT
-1:6:pom:1.5.8-SNAPSHOT
-1:7:pom:5.8.8-SNAPSHOT
-1:31:pom:2.2-SNAPSHOT
-1:5:pom:1.5-SNAPSHOT
-10:11:pom:4.1-SNAPSHOT

http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/3a1b8ae0/aether-impl/src/test/resources/artifact-descriptions/cycle-big/1_186_4.1-SNAPSHOT.ini
--
diff --git 
a/aether-impl/src/test/resources/artifact-descriptions/cycle-big/1_186_4.1-SNAPSHOT.ini
 
b/aether-impl/src/test/resources/artifact-descriptions/cycle-big/1_186_4.1-SNAPSHOT.ini
deleted file mode 100644
index 61a252c..000
--- 
a/aether-impl/src/test/resources/artifact-descriptions/cycle-big/1_186_4.1-SNAPSHOT.ini
+++ /dev/null
@@ -1 +0,0 @@
-[dependencies]

http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/3a1b8ae0/aether-impl/src/test/resources/artifact-descriptions/cycle-big/1_187_4.3-SNAPSHOT.ini
--
diff --git 
a/aether-impl/src/test/resources/artifact-descriptions/cycle-big/1_187_4.3-SNAPSHOT.ini
 
b/aether-impl/src/test/resources/artifact-descriptions/cycle-big/1_187_4.3-SNAPSHOT.ini
deleted file mode 100644
index 61a252c..000
--- 
a/aether-impl/src/test/resources/artifact-descriptions/cycle-big/1_187_4.3-SNAPSHOT.ini
+++ /dev/null
@@ -1 +0,0 @@

[38/53] [abbrv] [partial] maven-resolver git commit: [MNG-6007] renamed Aether to Maven Artifact Resolver

2017-01-15 Thread hboutemy
http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/3a1b8ae0/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultArtifactResolver.java
--
diff --git 
a/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultArtifactResolver.java
 
b/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultArtifactResolver.java
deleted file mode 100644
index 37d296e..000
--- 
a/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultArtifactResolver.java
+++ /dev/null
@@ -1,773 +0,0 @@
-package org.eclipse.aether.internal.impl;
-
-/*
- * 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.io.IOException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-import java.util.concurrent.atomic.AtomicBoolean;
-
-import javax.inject.Inject;
-import javax.inject.Named;
-
-import org.eclipse.aether.RepositoryEvent;
-import org.eclipse.aether.RepositoryEvent.EventType;
-import org.eclipse.aether.RepositorySystemSession;
-import org.eclipse.aether.RequestTrace;
-import org.eclipse.aether.SyncContext;
-import org.eclipse.aether.artifact.Artifact;
-import org.eclipse.aether.artifact.ArtifactProperties;
-import org.eclipse.aether.impl.ArtifactResolver;
-import org.eclipse.aether.impl.OfflineController;
-import org.eclipse.aether.impl.RemoteRepositoryManager;
-import org.eclipse.aether.impl.RepositoryConnectorProvider;
-import org.eclipse.aether.impl.RepositoryEventDispatcher;
-import org.eclipse.aether.impl.SyncContextFactory;
-import org.eclipse.aether.impl.UpdateCheck;
-import org.eclipse.aether.impl.UpdateCheckManager;
-import org.eclipse.aether.impl.VersionResolver;
-import org.eclipse.aether.repository.ArtifactRepository;
-import org.eclipse.aether.repository.LocalArtifactRegistration;
-import org.eclipse.aether.repository.LocalArtifactRequest;
-import org.eclipse.aether.repository.LocalArtifactResult;
-import org.eclipse.aether.repository.LocalRepository;
-import org.eclipse.aether.repository.LocalRepositoryManager;
-import org.eclipse.aether.repository.RemoteRepository;
-import org.eclipse.aether.repository.RepositoryPolicy;
-import org.eclipse.aether.repository.WorkspaceReader;
-import org.eclipse.aether.resolution.ArtifactRequest;
-import org.eclipse.aether.resolution.ArtifactResolutionException;
-import org.eclipse.aether.resolution.ArtifactResult;
-import org.eclipse.aether.resolution.ResolutionErrorPolicy;
-import org.eclipse.aether.resolution.VersionRequest;
-import org.eclipse.aether.resolution.VersionResolutionException;
-import org.eclipse.aether.resolution.VersionResult;
-import org.eclipse.aether.spi.connector.ArtifactDownload;
-import org.eclipse.aether.spi.connector.RepositoryConnector;
-import org.eclipse.aether.spi.io.FileProcessor;
-import org.eclipse.aether.spi.locator.Service;
-import org.eclipse.aether.spi.locator.ServiceLocator;
-import org.eclipse.aether.spi.log.Logger;
-import org.eclipse.aether.spi.log.LoggerFactory;
-import org.eclipse.aether.spi.log.NullLoggerFactory;
-import org.eclipse.aether.transfer.ArtifactNotFoundException;
-import org.eclipse.aether.transfer.ArtifactTransferException;
-import org.eclipse.aether.transfer.NoRepositoryConnectorException;
-import org.eclipse.aether.transfer.RepositoryOfflineException;
-import org.eclipse.aether.util.ConfigUtils;
-
-/**
- */
-@Named
-public class DefaultArtifactResolver
-implements ArtifactResolver, Service
-{
-
-private static final String CONFIG_PROP_SNAPSHOT_NORMALIZATION = 
"aether.artifactResolver.snapshotNormalization";
-
-private Logger logger = NullLoggerFactory.LOGGER;
-
-private FileProcessor fileProcessor;
-
-private RepositoryEventDispatcher repositoryEventDispatcher;
-
-private VersionResolver versionResolver;
-
-private UpdateCheckManager updateCheckManager;
-
-private RepositoryConnectorProvider repositoryConnectorProvider;
-
-private RemoteRepositoryManager remoteRepositoryManager;
-
-private SyncContextFactory syncContextFactory;
-
-private OfflineController offlineController;
-
-public 

[51/53] [abbrv] [partial] maven-resolver git commit: [MNG-6007] renamed Aether to Maven Artifact Resolver

2017-01-15 Thread hboutemy
[MNG-6007] renamed Aether to Maven Artifact Resolver

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

Branch: refs/heads/MNG-6007
Commit: 3a1b8ae00e584129d4e97c50b02758f2f193f17d
Parents: 99dee4f
Author: Hervé Boutemy 
Authored: Sat Sep 3 22:23:01 2016 +0200
Committer: Hervé Boutemy 
Committed: Sun Jan 15 20:22:26 2017 +0100

--
 aether-api/pom.xml  |   51 -
 ...stractForwardingRepositorySystemSession.java |  189 ---
 .../aether/AbstractRepositoryListener.java  |  112 --
 .../eclipse/aether/ConfigurationProperties.java |  152 --
 .../eclipse/aether/DefaultRepositoryCache.java  |   52 -
 .../aether/DefaultRepositorySystemSession.java  |  834 ---
 .../org/eclipse/aether/DefaultSessionData.java  |   91 --
 .../org/eclipse/aether/RepositoryCache.java |   59 -
 .../org/eclipse/aether/RepositoryEvent.java |  442 --
 .../org/eclipse/aether/RepositoryException.java |   69 -
 .../org/eclipse/aether/RepositoryListener.java  |  222 ---
 .../org/eclipse/aether/RepositorySystem.java|  277 
 .../eclipse/aether/RepositorySystemSession.java |  263 
 .../java/org/eclipse/aether/RequestTrace.java   |  117 --
 .../java/org/eclipse/aether/SessionData.java|   66 -
 .../java/org/eclipse/aether/SyncContext.java|   76 -
 .../aether/artifact/AbstractArtifact.java   |  230 ---
 .../org/eclipse/aether/artifact/Artifact.java   |  143 --
 .../aether/artifact/ArtifactProperties.java |   74 -
 .../eclipse/aether/artifact/ArtifactType.java   |   67 -
 .../aether/artifact/ArtifactTypeRegistry.java   |   38 -
 .../aether/artifact/DefaultArtifact.java|  285 
 .../aether/artifact/DefaultArtifactType.java|  146 --
 .../eclipse/aether/artifact/package-info.java   |   24 -
 .../aether/collection/CollectRequest.java   |  356 -
 .../aether/collection/CollectResult.java|  159 ---
 .../collection/DependencyCollectionContext.java |   75 -
 .../DependencyCollectionException.java  |  111 --
 .../DependencyGraphTransformationContext.java   |   58 -
 .../collection/DependencyGraphTransformer.java  |   51 -
 .../aether/collection/DependencyManagement.java |  177 ---
 .../aether/collection/DependencyManager.java|   57 -
 .../aether/collection/DependencySelector.java   |   58 -
 .../aether/collection/DependencyTraverser.java  |   59 -
 .../UnsolvableVersionConflictException.java |  142 --
 .../aether/collection/VersionFilter.java|  135 --
 .../eclipse/aether/collection/package-info.java |   25 -
 .../aether/deployment/DeployRequest.java|  202 ---
 .../eclipse/aether/deployment/DeployResult.java |  174 ---
 .../aether/deployment/DeploymentException.java  |   52 -
 .../eclipse/aether/deployment/package-info.java |   24 -
 .../aether/graph/DefaultDependencyNode.java |  368 -
 .../org/eclipse/aether/graph/Dependency.java|  330 -
 .../eclipse/aether/graph/DependencyCycle.java   |   53 -
 .../eclipse/aether/graph/DependencyFilter.java  |   42 -
 .../eclipse/aether/graph/DependencyNode.java|  232 ---
 .../eclipse/aether/graph/DependencyVisitor.java |   47 -
 .../org/eclipse/aether/graph/Exclusion.java |  131 --
 .../org/eclipse/aether/graph/package-info.java  |   24 -
 .../aether/installation/InstallRequest.java |  177 ---
 .../aether/installation/InstallResult.java  |  174 ---
 .../installation/InstallationException.java |   52 -
 .../aether/installation/package-info.java   |   24 -
 .../aether/metadata/AbstractMetadata.java   |  160 ---
 .../aether/metadata/DefaultMetadata.java|  192 ---
 .../aether/metadata/MergeableMetadata.java  |   51 -
 .../org/eclipse/aether/metadata/Metadata.java   |  138 --
 .../eclipse/aether/metadata/package-info.java   |   24 -
 .../java/org/eclipse/aether/package-info.java   |   24 -
 .../aether/repository/ArtifactRepository.java   |   45 -
 .../aether/repository/Authentication.java   |   55 -
 .../repository/AuthenticationContext.java   |  389 -
 .../aether/repository/AuthenticationDigest.java |  219 ---
 .../repository/AuthenticationSelector.java  |   38 -
 .../repository/LocalArtifactRegistration.java   |  149 --
 .../aether/repository/LocalArtifactRequest.java |  145 --
 .../aether/repository/LocalArtifactResult.java  |  147 --
 .../repository/LocalMetadataRegistration.java   |  148 --
 .../aether/repository/LocalMetadataRequest.java |  133 --
 .../aether/repository/LocalMetadataResult.java  |  114 --
 .../aether/repository/LocalRepository.java  |  132 --
 .../repository/LocalRepositoryManager.java  |  127 --
 .../aether/repository/MirrorSelector.java  

[04/53] [abbrv] [partial] maven-resolver git commit: [MNG-6007] renamed Aether to Maven Artifact Resolver

2017-01-15 Thread hboutemy
http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/3a1b8ae0/maven-resolver-api/src/main/java/org/eclipse/aether/metadata/DefaultMetadata.java
--
diff --git 
a/maven-resolver-api/src/main/java/org/eclipse/aether/metadata/DefaultMetadata.java
 
b/maven-resolver-api/src/main/java/org/eclipse/aether/metadata/DefaultMetadata.java
new file mode 100644
index 000..1efbb72
--- /dev/null
+++ 
b/maven-resolver-api/src/main/java/org/eclipse/aether/metadata/DefaultMetadata.java
@@ -0,0 +1,192 @@
+package org.eclipse.aether.metadata;
+
+/*
+ * 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.Map;
+
+/**
+ * A basic metadata instance. Note: Instances of this class are 
immutable and the exposed mutators return new
+ * objects rather than changing the current instance.
+ */
+public final class DefaultMetadata
+extends AbstractMetadata
+{
+
+private final String groupId;
+
+private final String artifactId;
+
+private final String version;
+
+private final String type;
+
+private final Nature nature;
+
+private final File file;
+
+private final Map properties;
+
+/**
+ * Creates a new metadata for the repository root with the specific type 
and nature.
+ * 
+ * @param type The type of the metadata, e.g. "maven-metadata.xml", may be 
{@code null}.
+ * @param nature The nature of the metadata, must not be {@code null}.
+ */
+public DefaultMetadata( String type, Nature nature )
+{
+this( "", "", "", type, nature, null, (File) null );
+}
+
+/**
+ * Creates a new metadata for the groupId level with the specific type and 
nature.
+ * 
+ * @param groupId The group identifier to which this metadata applies, may 
be {@code null}.
+ * @param type The type of the metadata, e.g. "maven-metadata.xml", may be 
{@code null}.
+ * @param nature The nature of the metadata, must not be {@code null}.
+ */
+public DefaultMetadata( String groupId, String type, Nature nature )
+{
+this( groupId, "", "", type, nature, null, (File) null );
+}
+
+/**
+ * Creates a new metadata for the groupId:artifactId level with the 
specific type and nature.
+ * 
+ * @param groupId The group identifier to which this metadata applies, may 
be {@code null}.
+ * @param artifactId The artifact identifier to which this metadata 
applies, may be {@code null}.
+ * @param type The type of the metadata, e.g. "maven-metadata.xml", may be 
{@code null}.
+ * @param nature The nature of the metadata, must not be {@code null}.
+ */
+public DefaultMetadata( String groupId, String artifactId, String type, 
Nature nature )
+{
+this( groupId, artifactId, "", type, nature, null, (File) null );
+}
+
+/**
+ * Creates a new metadata for the groupId:artifactId:version level with 
the specific type and nature.
+ * 
+ * @param groupId The group identifier to which this metadata applies, may 
be {@code null}.
+ * @param artifactId The artifact identifier to which this metadata 
applies, may be {@code null}.
+ * @param version The version to which this metadata applies, may be 
{@code null}.
+ * @param type The type of the metadata, e.g. "maven-metadata.xml", may be 
{@code null}.
+ * @param nature The nature of the metadata, must not be {@code null}.
+ */
+public DefaultMetadata( String groupId, String artifactId, String version, 
String type, Nature nature )
+{
+this( groupId, artifactId, version, type, nature, null, (File) null );
+}
+
+/**
+ * Creates a new metadata for the groupId:artifactId:version level with 
the specific type and nature.
+ * 
+ * @param groupId The group identifier to which this metadata applies, may 
be {@code null}.
+ * @param artifactId The artifact identifier to which this metadata 
applies, may be {@code null}.
+ * @param version The version to which this metadata applies, may be 
{@code null}.
+ * @param type The type of the metadata, e.g. "maven-metadata.xml", may be 
{@code null}.
+ * @param nature The 

[11/53] [abbrv] [partial] maven-resolver git commit: [MNG-6007] renamed Aether to Maven Artifact Resolver

2017-01-15 Thread hboutemy
http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/3a1b8ae0/aether-util/src/main/java/org/eclipse/aether/util/version/GenericVersionRange.java
--
diff --git 
a/aether-util/src/main/java/org/eclipse/aether/util/version/GenericVersionRange.java
 
b/aether-util/src/main/java/org/eclipse/aether/util/version/GenericVersionRange.java
deleted file mode 100644
index 832dd94..000
--- 
a/aether-util/src/main/java/org/eclipse/aether/util/version/GenericVersionRange.java
+++ /dev/null
@@ -1,242 +0,0 @@
-package org.eclipse.aether.util.version;
-
-/*
- * 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 org.eclipse.aether.version.InvalidVersionSpecificationException;
-import org.eclipse.aether.version.Version;
-import org.eclipse.aether.version.VersionRange;
-
-/**
- * A version range inspired by mathematical range syntax. For example, 
"[1.0,2.0)", "[1.0,)" or "[1.0]".
- */
-final class GenericVersionRange
-implements VersionRange
-{
-
-private final Bound lowerBound;
-
-private final Bound upperBound;
-
-/**
- * Creates a version range from the specified range specification.
- * 
- * @param range The range specification to parse, must not be {@code null}.
- * @throws InvalidVersionSpecificationException If the range could not be 
parsed.
- */
-public GenericVersionRange( String range )
-throws InvalidVersionSpecificationException
-{
-String process = range;
-
-boolean lowerBoundInclusive, upperBoundInclusive;
-Version lowerBound, upperBound;
-
-if ( range.startsWith( "[" ) )
-{
-lowerBoundInclusive = true;
-}
-else if ( range.startsWith( "(" ) )
-{
-lowerBoundInclusive = false;
-}
-else
-{
-throw new InvalidVersionSpecificationException( range, "Invalid 
version range " + range
-+ ", a range must start with either [ or (" );
-}
-
-if ( range.endsWith( "]" ) )
-{
-upperBoundInclusive = true;
-}
-else if ( range.endsWith( ")" ) )
-{
-upperBoundInclusive = false;
-}
-else
-{
-throw new InvalidVersionSpecificationException( range, "Invalid 
version range " + range
-+ ", a range must end with either [ or (" );
-}
-
-process = process.substring( 1, process.length() - 1 );
-
-int index = process.indexOf( "," );
-
-if ( index < 0 )
-{
-if ( !lowerBoundInclusive || !upperBoundInclusive )
-{
-throw new InvalidVersionSpecificationException( range, 
"Invalid version range " + range
-+ ", single version must be surrounded by []" );
-}
-
-String version = process.trim();
-if ( version.endsWith( ".*" ) )
-{
-String prefix = version.substring( 0, version.length() - 1 );
-lowerBound = parse( prefix + "min" );
-upperBound = parse( prefix + "max" );
-}
-else
-{
-lowerBound = upperBound = parse( version );
-}
-}
-else
-{
-String parsedLowerBound = process.substring( 0, index ).trim();
-String parsedUpperBound = process.substring( index + 1 ).trim();
-
-// more than two bounds, e.g. (1,2,3)
-if ( parsedUpperBound.contains( "," ) )
-{
-throw new InvalidVersionSpecificationException( range, 
"Invalid version range " + range
-+ ", bounds may not contain additional ','" );
-}
-
-lowerBound = parsedLowerBound.length() > 0 ? parse( 
parsedLowerBound ) : null;
-upperBound = parsedUpperBound.length() > 0 ? parse( 
parsedUpperBound ) : null;
-
-if ( upperBound != null && lowerBound != null )
-{
-if ( upperBound.compareTo( lowerBound ) < 0 )
-{
-throw new InvalidVersionSpecificationException( range, 
"Invalid 

[52/53] [abbrv] maven-resolver git commit: [MNG-6040] configured Jira project

2017-01-15 Thread hboutemy
[MNG-6040] configured Jira project

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

Branch: refs/heads/MNG-6007
Commit: 656749d8517bba43a47cf4d24333e4bc6213d0f9
Parents: 3a1b8ae
Author: Hervé Boutemy 
Authored: Wed Sep 14 00:24:51 2016 +0200
Committer: Hervé Boutemy 
Committed: Sun Jan 15 20:22:26 2017 +0100

--
 pom.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/656749d8/pom.xml
--
diff --git a/pom.xml b/pom.xml
index ee993b5..c8b6d0b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -46,11 +46,11 @@
 
scm:git:https://git-wip-us.apache.org/repos/asf/maven-aether.git
 https://git-wip-us.apache.org/repos/asf/maven-aether.git
   
-  



[28/53] [abbrv] [partial] maven-resolver git commit: [MNG-6007] renamed Aether to Maven Artifact Resolver

2017-01-15 Thread hboutemy
http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/3a1b8ae0/aether-impl/src/test/resources/artifact-descriptions/cycle-big/10_291_4.0-SNAPSHOT.ini
--
diff --git 
a/aether-impl/src/test/resources/artifact-descriptions/cycle-big/10_291_4.0-SNAPSHOT.ini
 
b/aether-impl/src/test/resources/artifact-descriptions/cycle-big/10_291_4.0-SNAPSHOT.ini
deleted file mode 100644
index a3dfe58..000
--- 
a/aether-impl/src/test/resources/artifact-descriptions/cycle-big/10_291_4.0-SNAPSHOT.ini
+++ /dev/null
@@ -1,69 +0,0 @@
-[dependencies]
-1:181:pom:1.0-SNAPSHOT
-1:13:pom:1.7.0-SNAPSHOT
-1:44:pom:1.3-SNAPSHOT
-1:45:pom:3.1-SNAPSHOT
-1:153:pom:1.1.1-SNAPSHOT
-1:23:pom:1.2.6_sap.1-SNAPSHOT
-1:46:pom:1.0.2-SNAPSHOT
-1:140:pom:6.0.24-SNAPSHOT
-1:83:pom:1.10.0-SNAPSHOT
-1:14:pom:2.5.2-SNAPSHOT
-1:65:pom:2.1.0-SNAPSHOT
-1:8:pom:2.1.0-SNAPSHOT
-1:8:pom:2.7.0-SNAPSHOT
-1:47:pom:2.6.2-SNAPSHOT
-1:15:pom:1.36.0-SNAPSHOT
-1:67:pom:1.6.5-SNAPSHOT
-1:50:pom:3.3-SNAPSHOT
-1:185:pom:1.0_sap.1-SNAPSHOT
-1:4:pom:2.5.4-SNAPSHOT
-1:3:pom:1.28-SNAPSHOT
-1:17:pom:1.2.3-SNAPSHOT
-1:26:pom:3.0.1-SNAPSHOT
-1:68:pom:3.8.1-SNAPSHOT
-1:2:pom:5.50-SNAPSHOT
-1:55:pom:4.4-SNAPSHOT
-1:36:pom:2.0-SNAPSHOT
-1:9:pom:3.1-SNAPSHOT
-1:27:pom:6.0-SNAPSHOT
-1:20:pom:3.3.2-SNAPSHOT
-1:57:pom:4.0.5-SNAPSHOT
-1:69:pom:8.1.7-SNAPSHOT
-1:6:pom:1.5.8-SNAPSHOT
-1:7:pom:5.8.8-SNAPSHOT
-1:38:pom:1.3.6-SNAPSHOT
-1:115:pom:4.2.1-SNAPSHOT
-1:30:pom:0.7.0-SNAPSHOT
-1:31:pom:2.2-SNAPSHOT
-1:32:pom:720-SNAPSHOT
-1:33:pom:711-SNAPSHOT
-1:5:pom:1.5-SNAPSHOT
-1:5:pom:1.6-SNAPSHOT
-1:61:pom:1.1-SNAPSHOT
-1:71:pom:1.1.3.8-SNAPSHOT
-1:21:pom:3.2.1.2-SNAPSHOT
-1:41:pom:5.0-SNAPSHOT
-1:197:pom:5.1.3-SNAPSHOT
-10:121:pom:3.0-SNAPSHOT
-10:22:pom:4.0-SNAPSHOT
-10:172:pom:4.0-SNAPSHOT
-10:117:pom:4.0-SNAPSHOT
-10:139:pom:3.0-SNAPSHOT
-10:205:pom:4.0-SNAPSHOT
-10:62:pom:4.0-SNAPSHOT
-10:81:pom:4.0-SNAPSHOT
-10:243:pom:4.0-SNAPSHOT
-10:11:pom:4.0-SNAPSHOT
-10:226:pom:4.0-SNAPSHOT
-10:232:pom:4.0-SNAPSHOT
-10:141:pom:4.0-SNAPSHOT
-10:145:pom:4.0-SNAPSHOT
-10:152:pom:4.0-SNAPSHOT
-10:261:pom:4.0-SNAPSHOT
-10:42:pom:4.0-SNAPSHOT
-10:12:pom:4.0-SNAPSHOT
-10:146:pom:4.0-SNAPSHOT
-10:147:pom:4.0-SNAPSHOT
-10:148:pom:4.0-SNAPSHOT
-10:233:pom:4.0-SNAPSHOT

http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/3a1b8ae0/aether-impl/src/test/resources/artifact-descriptions/cycle-big/10_291_4.1-SNAPSHOT.ini
--
diff --git 
a/aether-impl/src/test/resources/artifact-descriptions/cycle-big/10_291_4.1-SNAPSHOT.ini
 
b/aether-impl/src/test/resources/artifact-descriptions/cycle-big/10_291_4.1-SNAPSHOT.ini
deleted file mode 100644
index db6e739..000
--- 
a/aether-impl/src/test/resources/artifact-descriptions/cycle-big/10_291_4.1-SNAPSHOT.ini
+++ /dev/null
@@ -1,74 +0,0 @@
-[dependencies]
-10:242:pom:4.1-SNAPSHOT
-1:181:pom:1.0-SNAPSHOT
-1:13:pom:1.7.0-SNAPSHOT
-1:63:pom:1.3-SNAPSHOT
-1:44:pom:1.3-SNAPSHOT
-1:45:pom:3.1-SNAPSHOT
-1:153:pom:1.1.1-SNAPSHOT
-1:23:pom:1.2.6_sap.1-SNAPSHOT
-1:46:pom:1.0.2-SNAPSHOT
-1:140:pom:6.0.24-SNAPSHOT
-1:83:pom:1.10.0-SNAPSHOT
-1:14:pom:2.5.2-SNAPSHOT
-1:65:pom:2.1.0-SNAPSHOT
-1:8:pom:2.1.0-SNAPSHOT
-1:8:pom:2.7.0-SNAPSHOT
-1:47:pom:2.6.2-SNAPSHOT
-1:15:pom:1.36.0-SNAPSHOT
-1:67:pom:1.6.5-SNAPSHOT
-1:50:pom:3.3-SNAPSHOT
-1:365:pom:3.4.1-SNAPSHOT
-1:185:pom:1.0_sap.2-SNAPSHOT
-1:4:pom:2.5.4-SNAPSHOT
-1:3:pom:1.28-SNAPSHOT
-1:17:pom:1.2.3-SNAPSHOT
-1:68:pom:3.8.1-SNAPSHOT
-1:2:pom:5.50-SNAPSHOT
-1:55:pom:4.8.2-SNAPSHOT
-1:36:pom:2.0-SNAPSHOT
-1:9:pom:3.1-SNAPSHOT
-1:27:pom:6.0-SNAPSHOT
-1:20:pom:3.3.2-SNAPSHOT
-1:57:pom:4.0.5-SNAPSHOT
-1:69:pom:8.1.7-SNAPSHOT
-1:6:pom:1.5.8-SNAPSHOT
-1:7:pom:5.8.8-SNAPSHOT
-1:38:pom:1.3.6-SNAPSHOT
-1:115:pom:4.2.1-SNAPSHOT
-1:30:pom:0.7.0-SNAPSHOT
-1:31:pom:2.2-SNAPSHOT
-1:32:pom:720-SNAPSHOT
-1:33:pom:711-SNAPSHOT
-1:5:pom:1.5-SNAPSHOT
-1:5:pom:1.6-SNAPSHOT
-1:61:pom:1.1-SNAPSHOT
-1:71:pom:1.1.3.8-SNAPSHOT
-1:21:pom:3.2.1.2-SNAPSHOT
-1:41:pom:5.0-SNAPSHOT
-1:197:pom:5.1.3-SNAPSHOT
-10:121:pom:3.1-SNAPSHOT
-10:22:pom:4.1-SNAPSHOT
-10:172:pom:4.1-SNAPSHOT
-10:117:pom:4.1-SNAPSHOT
-10:139:pom:3.1-SNAPSHOT
-10:205:pom:4.1-SNAPSHOT
-10:62:pom:4.1-SNAPSHOT
-10:81:pom:4.1-SNAPSHOT
-10:243:pom:4.1-SNAPSHOT
-10:11:pom:4.1-SNAPSHOT
-10:226:pom:4.1-SNAPSHOT
-10:232:pom:4.1-SNAPSHOT
-10:141:pom:4.1-SNAPSHOT
-10:145:pom:4.1-SNAPSHOT
-10:152:pom:4.1-SNAPSHOT
-10:261:pom:4.1-SNAPSHOT
-10:42:pom:4.1-SNAPSHOT
-10:12:pom:4.1-SNAPSHOT
-10:146:pom:4.1-SNAPSHOT
-10:147:pom:4.1-SNAPSHOT
-10:148:pom:4.1-SNAPSHOT
-10:233:pom:4.1-SNAPSHOT
-1:365:pom:3.4.1-SNAPSHOT
-10:366:pom:4.1-SNAPSHOT
-1:260:pom:2.3.3-SNAPSHOT

http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/3a1b8ae0/aether-impl/src/test/resources/artifact-descriptions/cycle-big/10_292_4.0-SNAPSHOT.ini
--
diff --git 

[06/53] [abbrv] [partial] maven-resolver git commit: [MNG-6007] renamed Aether to Maven Artifact Resolver

2017-01-15 Thread hboutemy
http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/3a1b8ae0/maven-resolver-api/src/main/java/org/eclipse/aether/artifact/ArtifactProperties.java
--
diff --git 
a/maven-resolver-api/src/main/java/org/eclipse/aether/artifact/ArtifactProperties.java
 
b/maven-resolver-api/src/main/java/org/eclipse/aether/artifact/ArtifactProperties.java
new file mode 100644
index 000..1108086
--- /dev/null
+++ 
b/maven-resolver-api/src/main/java/org/eclipse/aether/artifact/ArtifactProperties.java
@@ -0,0 +1,74 @@
+package org.eclipse.aether.artifact;
+
+/*
+ * 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.
+ */
+
+/**
+ * The keys for common properties of artifacts.
+ * 
+ * @see Artifact#getProperties()
+ */
+public final class ArtifactProperties
+{
+
+/**
+ * A high-level characterization of the artifact, e.g. "maven-plugin" or 
"test-jar".
+ * 
+ * @see ArtifactType#getId()
+ */
+public static final String TYPE = "type";
+
+/**
+ * The programming language this artifact is relevant for, e.g. "java" or 
"none".
+ */
+public static final String LANGUAGE = "language";
+
+/**
+ * The (expected) path to the artifact on the local filesystem. An 
artifact which has this property set is assumed
+ * to be not present in any regular repository and likewise has no 
artifact descriptor. Artifact resolution will
+ * verify the path and resolve the artifact if the path actually denotes 
an existing file. If the path isn't valid,
+ * resolution will fail and no attempts to search local/remote 
repositories are made.
+ */
+public static final String LOCAL_PATH = "localPath";
+
+/**
+ * A boolean flag indicating whether the artifact presents some kind of 
bundle that physically includes its
+ * dependencies, e.g. a fat WAR.
+ */
+public static final String INCLUDES_DEPENDENCIES = "includesDependencies";
+
+/**
+ * A boolean flag indicating whether the artifact is meant to be used for 
the compile/runtime/test build path of a
+ * consumer project.
+ */
+public static final String CONSTITUTES_BUILD_PATH = "constitutesBuildPath";
+
+/**
+ * The URL to a web page from which the artifact can be manually 
downloaded. This URL is not contacted by the
+ * repository system but serves as a pointer for the end user to assist in 
getting artifacts that are not published
+ * in a proper repository.
+ */
+public static final String DOWNLOAD_URL = "downloadUrl";
+
+private ArtifactProperties()
+{
+// hide constructor
+}
+
+}

http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/3a1b8ae0/maven-resolver-api/src/main/java/org/eclipse/aether/artifact/ArtifactType.java
--
diff --git 
a/maven-resolver-api/src/main/java/org/eclipse/aether/artifact/ArtifactType.java
 
b/maven-resolver-api/src/main/java/org/eclipse/aether/artifact/ArtifactType.java
new file mode 100644
index 000..5f87217
--- /dev/null
+++ 
b/maven-resolver-api/src/main/java/org/eclipse/aether/artifact/ArtifactType.java
@@ -0,0 +1,67 @@
+package org.eclipse.aether.artifact;
+
+/*
+ * 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.util.Map;
+
+/**
+ * An artifact type describing artifact characteristics/properties that are 
common for certain artifacts. Artifact types

[47/53] [abbrv] [partial] maven-resolver git commit: [MNG-6007] renamed Aether to Maven Artifact Resolver

2017-01-15 Thread hboutemy
http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/3a1b8ae0/aether-api/src/main/java/org/eclipse/aether/graph/Dependency.java
--
diff --git a/aether-api/src/main/java/org/eclipse/aether/graph/Dependency.java 
b/aether-api/src/main/java/org/eclipse/aether/graph/Dependency.java
deleted file mode 100644
index b9e7cb4..000
--- a/aether-api/src/main/java/org/eclipse/aether/graph/Dependency.java
+++ /dev/null
@@ -1,330 +0,0 @@
-package org.eclipse.aether.graph;
-
-/*
- * 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.util.AbstractSet;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.LinkedHashSet;
-import java.util.NoSuchElementException;
-import java.util.Set;
-
-import org.eclipse.aether.artifact.Artifact;
-
-/**
- * A dependency to some artifact. Note: Instances of this class are 
immutable and the exposed mutators return
- * new objects rather than changing the current instance.
- */
-public final class Dependency
-{
-
-private final Artifact artifact;
-
-private final String scope;
-
-private final Boolean optional;
-
-private final Set exclusions;
-
-/**
- * Creates a mandatory dependency on the specified artifact with the given 
scope.
- * 
- * @param artifact The artifact being depended on, must not be {@code 
null}.
- * @param scope The scope of the dependency, may be {@code null}.
- */
-public Dependency( Artifact artifact, String scope )
-{
-this( artifact, scope, false );
-}
-
-/**
- * Creates a dependency on the specified artifact with the given scope.
- * 
- * @param artifact The artifact being depended on, must not be {@code 
null}.
- * @param scope The scope of the dependency, may be {@code null}.
- * @param optional A flag whether the dependency is optional or mandatory, 
may be {@code null}.
- */
-public Dependency( Artifact artifact, String scope, Boolean optional )
-{
-this( artifact, scope, optional, null );
-}
-
-/**
- * Creates a dependency on the specified artifact with the given scope and 
exclusions.
- * 
- * @param artifact The artifact being depended on, must not be {@code 
null}.
- * @param scope The scope of the dependency, may be {@code null}.
- * @param optional A flag whether the dependency is optional or mandatory, 
may be {@code null}.
- * @param exclusions The exclusions that apply to transitive dependencies, 
may be {@code null} if none.
- */
-public Dependency( Artifact artifact, String scope, Boolean optional, 
Collection exclusions )
-{
-this( artifact, scope, Exclusions.copy( exclusions ), optional );
-}
-
-private Dependency( Artifact artifact, String scope, Set 
exclusions, Boolean optional )
-{
-// NOTE: This constructor assumes immutability of the provided 
exclusion collection, for internal use only
-if ( artifact == null )
-{
-throw new IllegalArgumentException( "no artifact specified for 
dependency" );
-}
-this.artifact = artifact;
-this.scope = ( scope != null ) ? scope : "";
-this.optional = optional;
-this.exclusions = exclusions;
-}
-
-/**
- * Gets the artifact being depended on.
- * 
- * @return The artifact, never {@code null}.
- */
-public Artifact getArtifact()
-{
-return artifact;
-}
-
-/**
- * Sets the artifact being depended on.
- * 
- * @param artifact The artifact, must not be {@code null}.
- * @return The new dependency, never {@code null}.
- */
-public Dependency setArtifact( Artifact artifact )
-{
-if ( this.artifact.equals( artifact ) )
-{
-return this;
-}
-return new Dependency( artifact, scope, exclusions, optional );
-}
-
-/**
- * Gets the scope of the dependency. The scope defines in which context 
this dependency is relevant.
- * 
- * @return The scope or an empty string if not set, never {@code null}.
- */
-public String getScope()
-{
-

[08/53] [abbrv] [partial] maven-resolver git commit: [MNG-6007] renamed Aether to Maven Artifact Resolver

2017-01-15 Thread hboutemy
http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/3a1b8ae0/aether-util/src/test/java/org/eclipse/aether/util/version/UnionVersionRangeTest.java
--
diff --git 
a/aether-util/src/test/java/org/eclipse/aether/util/version/UnionVersionRangeTest.java
 
b/aether-util/src/test/java/org/eclipse/aether/util/version/UnionVersionRangeTest.java
deleted file mode 100644
index 570b6b7..000
--- 
a/aether-util/src/test/java/org/eclipse/aether/util/version/UnionVersionRangeTest.java
+++ /dev/null
@@ -1,105 +0,0 @@
-package org.eclipse.aether.util.version;
-
-/*
- * 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 static org.junit.Assert.*;
-
-import java.util.Collections;
-
-import org.eclipse.aether.version.InvalidVersionSpecificationException;
-import org.eclipse.aether.version.VersionRange;
-import org.junit.Test;
-
-public class UnionVersionRangeTest
-{
-
-private VersionRange newRange( String range )
-{
-try
-{
-return new GenericVersionScheme().parseVersionRange( range );
-}
-catch ( InvalidVersionSpecificationException e )
-{
-throw new IllegalArgumentException( e );
-}
-}
-
-private void assertBound( String version, boolean inclusive, 
VersionRange.Bound bound )
-{
-if ( version == null )
-{
-assertNull( bound );
-}
-else
-{
-assertNotNull( bound );
-assertNotNull( bound.getVersion() );
-assertEquals( inclusive, bound.isInclusive() );
-try
-{
-assertEquals( new GenericVersionScheme().parseVersion( version 
), bound.getVersion() );
-}
-catch ( InvalidVersionSpecificationException e )
-{
-throw new IllegalArgumentException( e );
-}
-}
-}
-
-@Test
-public void testGetLowerBound()
-{
-VersionRange range = UnionVersionRange.from( 
Collections. emptySet() );
-assertBound( null, false, range.getLowerBound() );
-
-range = UnionVersionRange.from( newRange( "[1,2]" ), newRange( "[3,4]" 
) );
-assertBound( "1", true, range.getLowerBound() );
-
-range = UnionVersionRange.from( newRange( "[1,2]" ), newRange( "(,4]" 
) );
-assertBound( null, false, range.getLowerBound() );
-
-range = UnionVersionRange.from( newRange( "[1,2]" ), newRange( "(1,4]" 
) );
-assertBound( "1", true, range.getLowerBound() );
-
-range = UnionVersionRange.from( newRange( "[1,2]" ), newRange( "(0,4]" 
) );
-assertBound( "0", false, range.getLowerBound() );
-}
-
-@Test
-public void testGetUpperBound()
-{
-VersionRange range = UnionVersionRange.from( 
Collections. emptySet() );
-assertBound( null, false, range.getUpperBound() );
-
-range = UnionVersionRange.from( newRange( "[1,2]" ), newRange( "[3,4]" 
) );
-assertBound( "4", true, range.getUpperBound() );
-
-range = UnionVersionRange.from( newRange( "[1,2]" ), newRange( "[3,)" 
) );
-assertBound( null, false, range.getUpperBound() );
-
-range = UnionVersionRange.from( newRange( "[1,2]" ), newRange( "[1,2)" 
) );
-assertBound( "2", true, range.getUpperBound() );
-
-range = UnionVersionRange.from( newRange( "[1,2]" ), newRange( "[1,3)" 
) );
-assertBound( "3", false, range.getUpperBound() );
-}
-
-}

http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/3a1b8ae0/aether-util/src/test/resources/transformer/conflict-id-sorter/cycle.txt
--
diff --git 
a/aether-util/src/test/resources/transformer/conflict-id-sorter/cycle.txt 
b/aether-util/src/test/resources/transformer/conflict-id-sorter/cycle.txt
deleted file mode 100644
index 1c200b9..000
--- a/aether-util/src/test/resources/transformer/conflict-id-sorter/cycle.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-(null)
-+- gid:aid:ver
-|  \- gid2:aid:ver
-\- gid2:aid:ver
-   \- gid:aid:ver


[23/53] [abbrv] [partial] maven-resolver git commit: [MNG-6007] renamed Aether to Maven Artifact Resolver

2017-01-15 Thread hboutemy
http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/3a1b8ae0/aether-spi/src/main/java/org/eclipse/aether/spi/connector/transport/TransporterFactory.java
--
diff --git 
a/aether-spi/src/main/java/org/eclipse/aether/spi/connector/transport/TransporterFactory.java
 
b/aether-spi/src/main/java/org/eclipse/aether/spi/connector/transport/TransporterFactory.java
deleted file mode 100644
index 08a..000
--- 
a/aether-spi/src/main/java/org/eclipse/aether/spi/connector/transport/TransporterFactory.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package org.eclipse.aether.spi.connector.transport;
-
-/*
- * 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 org.eclipse.aether.RepositorySystemSession;
-import org.eclipse.aether.repository.RemoteRepository;
-import org.eclipse.aether.transfer.NoTransporterException;
-
-/**
- * A factory to create transporters. A transporter is responsible for 
uploads/downloads to/from a remote repository
- * using a particular transport protocol. When the repository system needs a 
transporter for a given remote repository,
- * it iterates the registered factories in descending order of their priority 
and calls
- * {@link #newInstance(RepositorySystemSession, RemoteRepository)} on them. 
The first transporter returned by a factory
- * will then be used for the transfer.
- */
-public interface TransporterFactory
-{
-
-/**
- * Tries to create a transporter for the specified remote repository. 
Typically, a factory will inspect
- * {@link RemoteRepository#getProtocol()} to determine whether it can 
handle a repository.
- * 
- * @param session The repository system session from which to configure 
the transporter, must not be {@code null}.
- *In particular, a transporter should obey the timeouts 
configured for the session.
- * @param repository The remote repository to create a transporter for, 
must not be {@code null}.
- * @return The transporter for the given repository, never {@code null}.
- * @throws NoTransporterException If the factory cannot create a 
transporter for the specified remote repository.
- */
-Transporter newInstance( RepositorySystemSession session, RemoteRepository 
repository )
-throws NoTransporterException;
-
-/**
- * The priority of this factory. When multiple factories can handle a 
given repository, factories with higher
- * priority are preferred over those with lower priority.
- * 
- * @return The priority of this factory.
- */
-float getPriority();
-
-}

http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/3a1b8ae0/aether-spi/src/main/java/org/eclipse/aether/spi/connector/transport/TransporterProvider.java
--
diff --git 
a/aether-spi/src/main/java/org/eclipse/aether/spi/connector/transport/TransporterProvider.java
 
b/aether-spi/src/main/java/org/eclipse/aether/spi/connector/transport/TransporterProvider.java
deleted file mode 100644
index b855042..000
--- 
a/aether-spi/src/main/java/org/eclipse/aether/spi/connector/transport/TransporterProvider.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package org.eclipse.aether.spi.connector.transport;
-
-/*
- * 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 org.eclipse.aether.RepositorySystemSession;
-import org.eclipse.aether.repository.RemoteRepository;

[21/53] [abbrv] [partial] maven-resolver git commit: [MNG-6007] renamed Aether to Maven Artifact Resolver

2017-01-15 Thread hboutemy
http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/3a1b8ae0/aether-test-util/src/test/java/org/eclipse/aether/internal/test/util/IniArtifactDataReaderTest.java
--
diff --git 
a/aether-test-util/src/test/java/org/eclipse/aether/internal/test/util/IniArtifactDataReaderTest.java
 
b/aether-test-util/src/test/java/org/eclipse/aether/internal/test/util/IniArtifactDataReaderTest.java
deleted file mode 100644
index 4864b32..000
--- 
a/aether-test-util/src/test/java/org/eclipse/aether/internal/test/util/IniArtifactDataReaderTest.java
+++ /dev/null
@@ -1,232 +0,0 @@
-package org.eclipse.aether.internal.test.util;
-
-/*
- * 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 static org.junit.Assert.*;
-
-import java.io.IOException;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.aether.artifact.Artifact;
-import org.eclipse.aether.graph.Dependency;
-import org.eclipse.aether.graph.Exclusion;
-import org.eclipse.aether.internal.test.util.ArtifactDescription;
-import org.eclipse.aether.internal.test.util.IniArtifactDataReader;
-import org.eclipse.aether.repository.RemoteRepository;
-import org.junit.Before;
-import org.junit.Test;
-
-/**
- */
-public class IniArtifactDataReaderTest
-{
-
-private IniArtifactDataReader parser;
-
-@Before
-public void setup()
-throws Exception
-{
-this.parser = new IniArtifactDataReader( 
"org/eclipse/aether/internal/test/util/" );
-}
-
-@Test
-public void testRelocation()
-throws IOException
-{
-String def = "[relocation]\ngid:aid:ext:ver";
-
-ArtifactDescription description = parser.parseLiteral( def );
-
-Artifact artifact = description.getRelocation();
-assertNotNull( artifact );
-assertEquals( "aid", artifact.getArtifactId() );
-assertEquals( "gid", artifact.getGroupId() );
-assertEquals( "ver", artifact.getVersion() );
-assertEquals( "ext", artifact.getExtension() );
-}
-
-@Test
-public void testDependencies()
-throws IOException
-{
-String def = 
"[dependencies]\ngid:aid:ext:ver\n-exclusion:aid\ngid2:aid2:ext2:ver2";
-
-ArtifactDescription description = parser.parseLiteral( def );
-
-List dependencies = description.getDependencies();
-assertNotNull( dependencies );
-assertEquals( 2, dependencies.size() );
-
-Dependency dependency = dependencies.get( 0 );
-assertEquals( "compile", dependency.getScope() );
-
-Artifact artifact = dependency.getArtifact();
-assertNotNull( artifact );
-assertEquals( "aid", artifact.getArtifactId() );
-assertEquals( "gid", artifact.getGroupId() );
-assertEquals( "ver", artifact.getVersion() );
-assertEquals( "ext", artifact.getExtension() );
-
-Collection exclusions = dependency.getExclusions();
-assertNotNull( exclusions );
-assertEquals( 1, exclusions.size() );
-Exclusion exclusion = exclusions.iterator().next();
-assertEquals( "exclusion", exclusion.getGroupId() );
-assertEquals( "aid", exclusion.getArtifactId() );
-assertEquals( "*", exclusion.getClassifier() );
-assertEquals( "*", exclusion.getExtension() );
-
-dependency = dependencies.get( 1 );
-
-artifact = dependency.getArtifact();
-assertNotNull( artifact );
-assertEquals( "aid2", artifact.getArtifactId() );
-assertEquals( "gid2", artifact.getGroupId() );
-assertEquals( "ver2", artifact.getVersion() );
-assertEquals( "ext2", artifact.getExtension() );
-}
-
-@Test
-public void testManagedDependencies()
-throws IOException
-{
-String def = 
"[managed-dependencies]\ngid:aid:ext:ver\n-exclusion:aid\ngid2:aid2:ext2:ver2:runtime";
-
-ArtifactDescription description = parser.parseLiteral( def );
-
-List dependencies = description.getManagedDependencies();
-assertNotNull( dependencies );
-assertEquals( 2, dependencies.size() );
-
-Dependency dependency = dependencies.get( 0 

[25/53] [abbrv] [partial] maven-resolver git commit: [MNG-6007] renamed Aether to Maven Artifact Resolver

2017-01-15 Thread hboutemy
http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/3a1b8ae0/aether-impl/src/test/resources/artifact-descriptions/cycle-big/1_50_3.5-SNAPSHOT.ini
--
diff --git 
a/aether-impl/src/test/resources/artifact-descriptions/cycle-big/1_50_3.5-SNAPSHOT.ini
 
b/aether-impl/src/test/resources/artifact-descriptions/cycle-big/1_50_3.5-SNAPSHOT.ini
deleted file mode 100644
index 115875c..000
--- 
a/aether-impl/src/test/resources/artifact-descriptions/cycle-big/1_50_3.5-SNAPSHOT.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[dependencies]
-1:50:pom:3.4-SNAPSHOT
-1:2:pom:5.50-SNAPSHOT
-1:9:pom:3.1-SNAPSHOT
-1:6:pom:1.5.8-SNAPSHOT
-1:7:pom:5.8.8-SNAPSHOT
-10:11:pom:4.0-SNAPSHOT

http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/3a1b8ae0/aether-impl/src/test/resources/artifact-descriptions/cycle-big/1_51_1.6.2-SNAPSHOT.ini
--
diff --git 
a/aether-impl/src/test/resources/artifact-descriptions/cycle-big/1_51_1.6.2-SNAPSHOT.ini
 
b/aether-impl/src/test/resources/artifact-descriptions/cycle-big/1_51_1.6.2-SNAPSHOT.ini
deleted file mode 100644
index 678ce19..000
--- 
a/aether-impl/src/test/resources/artifact-descriptions/cycle-big/1_51_1.6.2-SNAPSHOT.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[dependencies]
-1:2:pom:5.50-SNAPSHOT
-1:9:pom:3.1-SNAPSHOT
-1:6:pom:1.5.8-SNAPSHOT
-1:7:pom:5.8.8-SNAPSHOT
-10:11:pom:4.0-SNAPSHOT

http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/3a1b8ae0/aether-impl/src/test/resources/artifact-descriptions/cycle-big/1_52_1.8-SNAPSHOT.ini
--
diff --git 
a/aether-impl/src/test/resources/artifact-descriptions/cycle-big/1_52_1.8-SNAPSHOT.ini
 
b/aether-impl/src/test/resources/artifact-descriptions/cycle-big/1_52_1.8-SNAPSHOT.ini
deleted file mode 100644
index 61a252c..000
--- 
a/aether-impl/src/test/resources/artifact-descriptions/cycle-big/1_52_1.8-SNAPSHOT.ini
+++ /dev/null
@@ -1 +0,0 @@
-[dependencies]

http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/3a1b8ae0/aether-impl/src/test/resources/artifact-descriptions/cycle-big/1_52_2.5-SNAPSHOT.ini
--
diff --git 
a/aether-impl/src/test/resources/artifact-descriptions/cycle-big/1_52_2.5-SNAPSHOT.ini
 
b/aether-impl/src/test/resources/artifact-descriptions/cycle-big/1_52_2.5-SNAPSHOT.ini
deleted file mode 100644
index 61a252c..000
--- 
a/aether-impl/src/test/resources/artifact-descriptions/cycle-big/1_52_2.5-SNAPSHOT.ini
+++ /dev/null
@@ -1 +0,0 @@
-[dependencies]

http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/3a1b8ae0/aether-impl/src/test/resources/artifact-descriptions/cycle-big/1_53_2.3.0.677-SNAPSHOT.ini
--
diff --git 
a/aether-impl/src/test/resources/artifact-descriptions/cycle-big/1_53_2.3.0.677-SNAPSHOT.ini
 
b/aether-impl/src/test/resources/artifact-descriptions/cycle-big/1_53_2.3.0.677-SNAPSHOT.ini
deleted file mode 100644
index 61a252c..000
--- 
a/aether-impl/src/test/resources/artifact-descriptions/cycle-big/1_53_2.3.0.677-SNAPSHOT.ini
+++ /dev/null
@@ -1 +0,0 @@
-[dependencies]

http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/3a1b8ae0/aether-impl/src/test/resources/artifact-descriptions/cycle-big/1_54_0.1.36-SNAPSHOT.ini
--
diff --git 
a/aether-impl/src/test/resources/artifact-descriptions/cycle-big/1_54_0.1.36-SNAPSHOT.ini
 
b/aether-impl/src/test/resources/artifact-descriptions/cycle-big/1_54_0.1.36-SNAPSHOT.ini
deleted file mode 100644
index 61a252c..000
--- 
a/aether-impl/src/test/resources/artifact-descriptions/cycle-big/1_54_0.1.36-SNAPSHOT.ini
+++ /dev/null
@@ -1 +0,0 @@
-[dependencies]

http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/3a1b8ae0/aether-impl/src/test/resources/artifact-descriptions/cycle-big/1_55_3.8.1-SNAPSHOT.ini
--
diff --git 
a/aether-impl/src/test/resources/artifact-descriptions/cycle-big/1_55_3.8.1-SNAPSHOT.ini
 
b/aether-impl/src/test/resources/artifact-descriptions/cycle-big/1_55_3.8.1-SNAPSHOT.ini
deleted file mode 100644
index 61a252c..000
--- 
a/aether-impl/src/test/resources/artifact-descriptions/cycle-big/1_55_3.8.1-SNAPSHOT.ini
+++ /dev/null
@@ -1 +0,0 @@
-[dependencies]

http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/3a1b8ae0/aether-impl/src/test/resources/artifact-descriptions/cycle-big/1_55_4.4-SNAPSHOT.ini
--
diff --git 
a/aether-impl/src/test/resources/artifact-descriptions/cycle-big/1_55_4.4-SNAPSHOT.ini
 
b/aether-impl/src/test/resources/artifact-descriptions/cycle-big/1_55_4.4-SNAPSHOT.ini
deleted file mode 100644
index 61a252c..000
--- 

svn commit: r1778915 - /maven/plugin-tools/trunk/maven-plugin-plugin/src/site/apt/examples/using-annotations.apt.vm

2017-01-15 Thread rfscholte
Author: rfscholte
Date: Sun Jan 15 13:21:08 2017
New Revision: 1778915

URL: http://svn.apache.org/viewvc?rev=1778915=rev
Log:
[MPLUGIN-321] improve documentation on maven-plugin-annotations telling that 
optional=true is sufficient

Modified:

maven/plugin-tools/trunk/maven-plugin-plugin/src/site/apt/examples/using-annotations.apt.vm

Modified: 
maven/plugin-tools/trunk/maven-plugin-plugin/src/site/apt/examples/using-annotations.apt.vm
URL: 
http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-plugin/src/site/apt/examples/using-annotations.apt.vm?rev=1778915=1778914=1778915=diff
==
--- 
maven/plugin-tools/trunk/maven-plugin-plugin/src/site/apt/examples/using-annotations.apt.vm
 (original)
+++ 
maven/plugin-tools/trunk/maven-plugin-plugin/src/site/apt/examples/using-annotations.apt.vm
 Sun Jan 15 13:21:08 2017
@@ -94,7 +94,7 @@ Using Plugin Tools Java5 Annotations
   org.apache.maven.plugin-tools
   maven-plugin-annotations
   ${project.version}
-  provided
+  true 
 
   
   ...




svn commit: r1778912 - in /maven/plugin-tools/trunk/maven-plugin-tools-java/src/test: java/org/apache/maven/tools/plugin/extractor/javadoc/ resources/MPLUGIN-290/

2017-01-15 Thread gboue
Author: gboue
Date: Sun Jan 15 13:08:04 2017
New Revision: 1778912

URL: http://svn.apache.org/viewvc?rev=1778912=rev
Log:
[MPLUGIN-290] Version 3.4 fails to parse enums with Regex patterns

Already fixed by the upgrade of QDox to 2.0-M5 done in r1778362. Test added to 
prevent regressions.

Added:

maven/plugin-tools/trunk/maven-plugin-tools-java/src/test/resources/MPLUGIN-290/

maven/plugin-tools/trunk/maven-plugin-tools-java/src/test/resources/MPLUGIN-290/Test.java
   (with props)

maven/plugin-tools/trunk/maven-plugin-tools-java/src/test/resources/MPLUGIN-290/plugin-expected.xml
   (with props)
Modified:

maven/plugin-tools/trunk/maven-plugin-tools-java/src/test/java/org/apache/maven/tools/plugin/extractor/javadoc/JavaMojoDescriptorExtractorTest.java

Modified: 
maven/plugin-tools/trunk/maven-plugin-tools-java/src/test/java/org/apache/maven/tools/plugin/extractor/javadoc/JavaMojoDescriptorExtractorTest.java
URL: 
http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-tools-java/src/test/java/org/apache/maven/tools/plugin/extractor/javadoc/JavaMojoDescriptorExtractorTest.java?rev=1778912=1778911=1778912=diff
==
--- 
maven/plugin-tools/trunk/maven-plugin-tools-java/src/test/java/org/apache/maven/tools/plugin/extractor/javadoc/JavaMojoDescriptorExtractorTest.java
 (original)
+++ 
maven/plugin-tools/trunk/maven-plugin-tools-java/src/test/java/org/apache/maven/tools/plugin/extractor/javadoc/JavaMojoDescriptorExtractorTest.java
 Sun Jan 15 13:08:04 2017
@@ -249,4 +249,12 @@ public class JavaMojoDescriptorExtractor
 assertNull( results );
 }
 
+public void testEnumWithRegexPattern()
+throws Exception
+{
+List results = extract( "MPLUGIN-290" );
+
+assertNull( results );
+}
+
 }

Added: 
maven/plugin-tools/trunk/maven-plugin-tools-java/src/test/resources/MPLUGIN-290/Test.java
URL: 
http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-tools-java/src/test/resources/MPLUGIN-290/Test.java?rev=1778912=auto
==
--- 
maven/plugin-tools/trunk/maven-plugin-tools-java/src/test/resources/MPLUGIN-290/Test.java
 (added)
+++ 
maven/plugin-tools/trunk/maven-plugin-tools-java/src/test/resources/MPLUGIN-290/Test.java
 Sun Jan 15 13:08:04 2017
@@ -0,0 +1,32 @@
+/*
+ * 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.util.regex.Pattern;
+
+public enum Test
+{
+
+Test( Pattern.compile( "a" ) );
+
+private Test( Pattern p )
+{
+
+}
+
+}

Propchange: 
maven/plugin-tools/trunk/maven-plugin-tools-java/src/test/resources/MPLUGIN-290/Test.java
--
svn:eol-style = native

Propchange: 
maven/plugin-tools/trunk/maven-plugin-tools-java/src/test/resources/MPLUGIN-290/Test.java
--
svn:keywords = Author Date Id Revision

Added: 
maven/plugin-tools/trunk/maven-plugin-tools-java/src/test/resources/MPLUGIN-290/plugin-expected.xml
URL: 
http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-tools-java/src/test/resources/MPLUGIN-290/plugin-expected.xml?rev=1778912=auto
==
--- 
maven/plugin-tools/trunk/maven-plugin-tools-java/src/test/resources/MPLUGIN-290/plugin-expected.xml
 (added)
+++ 
maven/plugin-tools/trunk/maven-plugin-tools-java/src/test/resources/MPLUGIN-290/plugin-expected.xml
 Sun Jan 15 13:08:04 2017
@@ -0,0 +1,33 @@
+
+
+
+
+
+  
+  
+  
+  
+  
+  test
+  false
+  true
+  
+  
+
\ No newline at end of file

Propchange: 
maven/plugin-tools/trunk/maven-plugin-tools-java/src/test/resources/MPLUGIN-290/plugin-expected.xml
--
svn:eol-style = native

Propchange: 
maven/plugin-tools/trunk/maven-plugin-tools-java/src/test/resources/MPLUGIN-290/plugin-expected.xml
--
svn:keywords = Author Date Id Revision




svn commit: r1778908 - in /maven/plugin-tools/trunk: ./ maven-plugin-annotations/ maven-plugin-plugin/ maven-plugin-tools-annotations/ maven-plugin-tools-api/ maven-plugin-tools-generators/ maven-plug

2017-01-15 Thread gboue
Author: gboue
Date: Sun Jan 15 12:19:50 2017
New Revision: 1778908

URL: http://svn.apache.org/viewvc?rev=1778908=rev
Log:
Updating the version from 3.6-SNAPSHOT to 3.5.1-SNAPSHOT as per 
http://mail-archives.apache.org/mod_mbox/maven-dev/201701.mbox/%3Cop.ytya62tukdkhrr%40desktop-2khsk44%3E.

Modified:
maven/plugin-tools/trunk/maven-plugin-annotations/pom.xml
maven/plugin-tools/trunk/maven-plugin-plugin/pom.xml
maven/plugin-tools/trunk/maven-plugin-tools-annotations/pom.xml
maven/plugin-tools/trunk/maven-plugin-tools-api/pom.xml
maven/plugin-tools/trunk/maven-plugin-tools-generators/pom.xml
maven/plugin-tools/trunk/maven-plugin-tools-java/pom.xml
maven/plugin-tools/trunk/maven-plugin-tools-javadoc/pom.xml
maven/plugin-tools/trunk/maven-script/maven-plugin-tools-ant/pom.xml
maven/plugin-tools/trunk/maven-script/maven-plugin-tools-beanshell/pom.xml
maven/plugin-tools/trunk/maven-script/maven-plugin-tools-model/pom.xml
maven/plugin-tools/trunk/maven-script/maven-script-ant/pom.xml
maven/plugin-tools/trunk/maven-script/maven-script-beanshell/pom.xml
maven/plugin-tools/trunk/maven-script/pom.xml
maven/plugin-tools/trunk/pom.xml

Modified: maven/plugin-tools/trunk/maven-plugin-annotations/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-annotations/pom.xml?rev=1778908=1778907=1778908=diff
==
--- maven/plugin-tools/trunk/maven-plugin-annotations/pom.xml (original)
+++ maven/plugin-tools/trunk/maven-plugin-annotations/pom.xml Sun Jan 15 
12:19:50 2017
@@ -23,7 +23,7 @@
   
 maven-plugin-tools
 org.apache.maven.plugin-tools
-3.6-SNAPSHOT
+3.5.1-SNAPSHOT
   
 
   maven-plugin-annotations

Modified: maven/plugin-tools/trunk/maven-plugin-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-plugin/pom.xml?rev=1778908=1778907=1778908=diff
==
--- maven/plugin-tools/trunk/maven-plugin-plugin/pom.xml (original)
+++ maven/plugin-tools/trunk/maven-plugin-plugin/pom.xml Sun Jan 15 12:19:50 
2017
@@ -23,7 +23,7 @@
   
 maven-plugin-tools
 org.apache.maven.plugin-tools
-3.6-SNAPSHOT
+3.5.1-SNAPSHOT
   
 
   org.apache.maven.plugins

Modified: maven/plugin-tools/trunk/maven-plugin-tools-annotations/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-tools-annotations/pom.xml?rev=1778908=1778907=1778908=diff
==
--- maven/plugin-tools/trunk/maven-plugin-tools-annotations/pom.xml (original)
+++ maven/plugin-tools/trunk/maven-plugin-tools-annotations/pom.xml Sun Jan 15 
12:19:50 2017
@@ -22,7 +22,7 @@
   
 org.apache.maven.plugin-tools
 maven-plugin-tools
-3.6-SNAPSHOT
+3.5.1-SNAPSHOT
   
 
   maven-plugin-tools-annotations

Modified: maven/plugin-tools/trunk/maven-plugin-tools-api/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-tools-api/pom.xml?rev=1778908=1778907=1778908=diff
==
--- maven/plugin-tools/trunk/maven-plugin-tools-api/pom.xml (original)
+++ maven/plugin-tools/trunk/maven-plugin-tools-api/pom.xml Sun Jan 15 12:19:50 
2017
@@ -25,7 +25,7 @@
   
 org.apache.maven.plugin-tools
 maven-plugin-tools
-3.6-SNAPSHOT
+3.5.1-SNAPSHOT
   
 
   maven-plugin-tools-api

Modified: maven/plugin-tools/trunk/maven-plugin-tools-generators/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-tools-generators/pom.xml?rev=1778908=1778907=1778908=diff
==
--- maven/plugin-tools/trunk/maven-plugin-tools-generators/pom.xml (original)
+++ maven/plugin-tools/trunk/maven-plugin-tools-generators/pom.xml Sun Jan 15 
12:19:50 2017
@@ -25,7 +25,7 @@
   
 org.apache.maven.plugin-tools
 maven-plugin-tools
-3.6-SNAPSHOT
+3.5.1-SNAPSHOT
   
 
   maven-plugin-tools-generators

Modified: maven/plugin-tools/trunk/maven-plugin-tools-java/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-tools-java/pom.xml?rev=1778908=1778907=1778908=diff
==
--- maven/plugin-tools/trunk/maven-plugin-tools-java/pom.xml (original)
+++ maven/plugin-tools/trunk/maven-plugin-tools-java/pom.xml Sun Jan 15 
12:19:50 2017
@@ -25,7 +25,7 @@
   
 org.apache.maven.plugin-tools
 maven-plugin-tools
-3.6-SNAPSHOT
+3.5.1-SNAPSHOT
   
 
   maven-plugin-tools-java

Modified: maven/plugin-tools/trunk/maven-plugin-tools-javadoc/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-tools-javadoc/pom.xml?rev=1778908=1778907=1778908=diff