[1/4] maven-surefire git commit: [SUREFIRE] refactoring
Repository: maven-surefire
Updated Branches:
refs/heads/master d7bf6ce49 -> f841a16e4
[SUREFIRE] refactoring
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/68246e2f
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/68246e2f
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/68246e2f
Branch: refs/heads/master
Commit: 68246e2f93daeee0cbcbaf342fa4a4a485c72899
Parents: d7bf6ce
Author: Tibor17
Authored: Sun Dec 11 09:51:41 2016 +0100
Committer: Tibor17
Committed: Sun Dec 11 09:51:41 2016 +0100
--
.../plugin/surefire/AbstractSurefireMojo.java | 8 ---
.../maven/surefire/util/UrlUtilsTest.java | 25
2 files changed, 10 insertions(+), 23 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/68246e2f/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
--
diff --git
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
index 127ec82..3606be2 100644
---
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
+++
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
@@ -101,6 +101,8 @@ import static
org.apache.maven.shared.utils.StringUtils.capitalizeFirstLetter;
import static org.apache.maven.shared.utils.StringUtils.isEmpty;
import static org.apache.maven.shared.utils.StringUtils.isNotBlank;
import static org.apache.maven.shared.utils.StringUtils.split;
+import static org.apache.maven.surefire.suite.RunResult.failure;
+import static org.apache.maven.surefire.suite.RunResult.noTestsRun;
/**
* Abstract base class for running tests using Surefire.
@@ -774,7 +776,7 @@ public abstract class AbstractSurefireMojo
throw new MojoFailureException(
"No tests were executed! (Set -DfailIfNoTests=false
to ignore this error.)" );
}
-handleSummary( RunResult.noTestsRun(), null );
+handleSummary( noTestsRun(), null );
return;
}
logReportsDirectory();
@@ -893,7 +895,7 @@ public abstract class AbstractSurefireMojo
{
List providers = createProviders();
-RunResult current = RunResult.noTestsRun();
+RunResult current = noTestsRun();
Exception firstForkException = null;
for ( ProviderInfo provider : providers )
@@ -927,7 +929,7 @@ public abstract class AbstractSurefireMojo
if ( firstForkException != null )
{
-current = RunResult.failure( current, firstForkException );
+current = failure( current, firstForkException );
}
handleSummary( current, firstForkException );
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/68246e2f/surefire-api/src/test/java/org/apache/maven/surefire/util/UrlUtilsTest.java
--
diff --git
a/surefire-api/src/test/java/org/apache/maven/surefire/util/UrlUtilsTest.java
b/surefire-api/src/test/java/org/apache/maven/surefire/util/UrlUtilsTest.java
index 3d9a07f..964fa10 100644
---
a/surefire-api/src/test/java/org/apache/maven/surefire/util/UrlUtilsTest.java
+++
b/surefire-api/src/test/java/org/apache/maven/surefire/util/UrlUtilsTest.java
@@ -22,8 +22,7 @@ package org.apache.maven.surefire.util;
import junit.framework.TestCase;
import java.io.File;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Method;
+import java.net.URI;
import java.net.URL;
import static org.apache.maven.surefire.util.internal.UrlUtils.toURL;
@@ -58,27 +57,13 @@ public class UrlUtilsTest
{
File f = new File( homeDir, fileName );
URL u = toURL( f );
+URI uri = u.toURI();
+File urlFile = new File( uri );
String url = u.toString();
+
assertStartsWith( url, "file:" );
assertEndsWith( url, expectedFileName );
-
-try
-{
-// use reflection to do "URI uri = u.toURI()" if JDK 1.5+
-Method toURI = URL.class.getMethod( "toURI", null );
-Object uri = toURI.invoke( u, null );
-
-// use reflection to do "File urlFile = new File( uri )" if JDK
1.4+
-Constructor newFile = File.class.getConstructor( new Class[]{
uri.getClass() } );
-File urlFile = (File) newFile.newInstance( uri );
-
-assertEquals( f, urlFile );
-}
-catch ( NoSuchMethodException e )
-{
-
[4/4] maven-surefire git commit: [SUREFIRE-1313] Unify console report result in SurefirePlugin and VerifyMojo
[SUREFIRE-1313] Unify console report result in SurefirePlugin and VerifyMojo
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/f841a16e
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/f841a16e
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/f841a16e
Branch: refs/heads/master
Commit: f841a16e4f85ffc28a39baa3f01454c08092f79d
Parents: 9478990
Author: Tibor17
Authored: Sun Dec 11 13:38:42 2016 +0100
Committer: Tibor17
Committed: Sun Dec 11 13:38:42 2016 +0100
--
.../maven/plugin/failsafe/VerifyMojo.java | 2 +-
.../maven/plugin/surefire/SurefireHelper.java | 94 +---
.../maven/plugin/surefire/SurefirePlugin.java | 13 +--
.../apache/maven/surefire/suite/RunResult.java | 3 +-
4 files changed, 65 insertions(+), 47 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/f841a16e/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/VerifyMojo.java
--
diff --git
a/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/VerifyMojo.java
b/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/VerifyMojo.java
index 37199a3..5d0b035 100644
---
a/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/VerifyMojo.java
+++
b/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/VerifyMojo.java
@@ -209,7 +209,7 @@ public class VerifyMojo
throw new MojoExecutionException( e.getMessage(), e );
}
-reportExecution( this, summary, getConsoleLogger() );
+reportExecution( this, summary, getConsoleLogger(), null );
}
}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/f841a16e/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/SurefireHelper.java
--
diff --git
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/SurefireHelper.java
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/SurefireHelper.java
index 3f87c3c..e4b340a 100644
---
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/SurefireHelper.java
+++
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/SurefireHelper.java
@@ -26,6 +26,7 @@ import org.apache.maven.plugin.MojoFailureException;
import org.apache.maven.plugin.surefire.log.PluginConsoleLogger;
import org.apache.maven.surefire.cli.CommandLineOption;
import org.apache.maven.surefire.suite.RunResult;
+import org.apache.maven.surefire.testset.TestSetFailedException;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
@@ -34,10 +35,10 @@ import java.util.Collection;
import java.util.List;
import static java.util.Collections.unmodifiableList;
+import static
org.apache.maven.surefire.cli.CommandLineOption.LOGGING_LEVEL_DEBUG;
import static
org.apache.maven.surefire.cli.CommandLineOption.LOGGING_LEVEL_ERROR;
-import static
org.apache.maven.surefire.cli.CommandLineOption.LOGGING_LEVEL_WARN;
import static
org.apache.maven.surefire.cli.CommandLineOption.LOGGING_LEVEL_INFO;
-import static
org.apache.maven.surefire.cli.CommandLineOption.LOGGING_LEVEL_DEBUG;
+import static
org.apache.maven.surefire.cli.CommandLineOption.LOGGING_LEVEL_WARN;
import static org.apache.maven.surefire.cli.CommandLineOption.SHOW_ERRORS;
/**
@@ -55,48 +56,26 @@ public final class SurefireHelper
}
public static void reportExecution( SurefireReportParameters
reportParameters, RunResult result,
-PluginConsoleLogger log )
+PluginConsoleLogger log, Exception
firstForkException )
throws MojoFailureException, MojoExecutionException
{
-boolean timeoutOrOtherFailure = result.isFailureOrTimeout();
-
-if ( !timeoutOrOtherFailure )
+if ( firstForkException == null && !result.isTimeout() &&
result.isErrorFree() )
{
-if ( result.getCompletedCount() == 0 )
+if ( result.getCompletedCount() == 0 && failIfNoTests(
reportParameters ) )
{
-if ( reportParameters.getFailIfNoTests() == null ||
!reportParameters.getFailIfNoTests() )
-{
-return;
-}
-throw new MojoFailureException(
-"No tests were executed! (Set -DfailIfNoTests=false to
ignore this error.)" );
-}
-
-if ( result.isErrorFree() )
-{
-return;
+throw new MojoFailureException( "No tests were executed! "
+
[3/4] maven-surefire git commit: [SUREFIRE-1312] Classpath containing url special characters with Reflections not working
[SUREFIRE-1312] Classpath containing url special characters with Reflections
not working
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/9478990e
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/9478990e
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/9478990e
Branch: refs/heads/master
Commit: 9478990e1e6f5ccb1c25cd3ba92e97a8b57c8228
Parents: fd293d8
Author: Tibor17
Authored: Sun Dec 11 13:32:27 2016 +0100
Committer: Tibor17
Committed: Sun Dec 11 13:32:27 2016 +0100
--
.../plugin/surefire/booterclient/ForkConfiguration.java | 8
.../java/org/apache/maven/surefire/booter/Classpath.java | 5 ++---
2 files changed, 6 insertions(+), 7 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/9478990e/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkConfiguration.java
--
diff --git
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkConfiguration.java
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkConfiguration.java
index 6d43bd2..988af8f 100644
---
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkConfiguration.java
+++
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkConfiguration.java
@@ -39,8 +39,6 @@ import java.util.jar.JarEntry;
import java.util.jar.JarOutputStream;
import java.util.jar.Manifest;
-import static org.apache.maven.surefire.util.internal.UrlUtils.toURL;
-
/**
* Configuration for forking tests.
*
@@ -287,8 +285,10 @@ public class ForkConfiguration
StringBuilder cp = new StringBuilder();
for ( String el : classPath )
{
-// NOTE: if File points to a directory, this entry MUST end in
'/'.
-cp.append( toURL( new File( el ) ).toExternalForm() )
+File file1 = new File( el );
+String pathEnd = file1.isDirectory() ? "/" : "";
+cp.append( file1.toURI().toASCIIString() )
+.append( pathEnd )
.append( " " );
}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/9478990e/surefire-booter/src/main/java/org/apache/maven/surefire/booter/Classpath.java
--
diff --git
a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/Classpath.java
b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/Classpath.java
index 13388c5..e7d97c8 100644
---
a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/Classpath.java
+++
b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/Classpath.java
@@ -162,9 +162,9 @@ public class Classpath implements Iterable
try
{
IsolatedClassLoader classLoader = new IsolatedClassLoader( parent,
childDelegation, roleName );
-for ( URL url : getAsUrlList() )
+for ( String classPathElement : unmodifiableElements )
{
-classLoader.addURL( url );
+classLoader.addURL( new File( classPathElement ).toURL() );
}
if ( parent != null )
{
@@ -179,7 +179,6 @@ public class Classpath implements Iterable
}
}
-
public int hashCode()
{
return unmodifiableElements.hashCode();
[2/4] maven-surefire git commit: [SUREFIRE] refactoring
[SUREFIRE] refactoring
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/fd293d89
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/fd293d89
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/fd293d89
Branch: refs/heads/master
Commit: fd293d8971c0c869fca6ee9cd9d17145b9a76bd1
Parents: 68246e2
Author: Tibor17
Authored: Sun Dec 11 13:28:37 2016 +0100
Committer: Tibor17
Committed: Sun Dec 11 13:28:37 2016 +0100
--
.../apache/maven/surefire/booter/ClasspathConfiguration.java| 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/fd293d89/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ClasspathConfiguration.java
--
diff --git
a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ClasspathConfiguration.java
b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ClasspathConfiguration.java
index d582f3c..3389a37 100644
---
a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ClasspathConfiguration.java
+++
b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ClasspathConfiguration.java
@@ -82,7 +82,7 @@ public class ClasspathConfiguration
throws SurefireExecutionException
{
return Classpath.join( inprocClasspath, classpathUrls )
-.createClassLoader( null, this.childDelegation, enableAssertions,
"test" );
+.createClassLoader( null, childDelegation, enableAssertions,
"test" );
}
public Classpath getProviderClasspath()
@@ -90,8 +90,7 @@ public class ClasspathConfiguration
return surefireClasspathUrls;
}
-
-public Classpath getTestClasspath()
+public Classpath getTestClasspath()
{
return classpathUrls;
}
svn commit: r1773601 - /maven/site/trunk/content/apt/guides/mini/guide-http-settings.apt
Author: rfscholte Date: Sun Dec 11 19:34:55 2016 New Revision: 1773601 URL: http://svn.apache.org/viewvc?rev=1773601&view=rev Log: CMS commit to maven by rfscholte Modified: maven/site/trunk/content/apt/guides/mini/guide-http-settings.apt Modified: maven/site/trunk/content/apt/guides/mini/guide-http-settings.apt URL: http://svn.apache.org/viewvc/maven/site/trunk/content/apt/guides/mini/guide-http-settings.apt?rev=1773601&r1=1773600&r2=1773601&view=diff == --- maven/site/trunk/content/apt/guides/mini/guide-http-settings.apt (original) +++ maven/site/trunk/content/apt/guides/mini/guide-http-settings.apt Sun Dec 11 19:34:55 2016 @@ -282,6 +282,25 @@ problems with HTTP servers and proxies t +---+ + Another option is to make write it like this: + ++---+ + + + + my-server + + + +true + + + + + + ++---+ + **Ignoring Cookies Like the example above, telling the HttpClient to ignore cookies for all methods of request is a simple matter of
maven-wagon git commit: [WAGON-389] Incorrect versions on gh-pages - refer to correct placeholder - upgrade org.apache.maven.scm:* to 1.9.5
Repository: maven-wagon
Updated Branches:
refs/heads/master 5d600267c -> 424971d40
[WAGON-389] Incorrect versions on gh-pages
- refer to correct placeholder
- upgrade org.apache.maven.scm:* to 1.9.5
Project: http://git-wip-us.apache.org/repos/asf/maven-wagon/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-wagon/commit/424971d4
Tree: http://git-wip-us.apache.org/repos/asf/maven-wagon/tree/424971d4
Diff: http://git-wip-us.apache.org/repos/asf/maven-wagon/diff/424971d4
Branch: refs/heads/master
Commit: 424971d400372ba61bf38df2b4a63e442333a6ac
Parents: 5d60026
Author: rfscholte
Authored: Sun Dec 11 23:09:26 2016 +0100
Committer: rfscholte
Committed: Sun Dec 11 23:09:26 2016 +0100
--
wagon-providers/wagon-scm/pom.xml | 2 +-
wagon-providers/wagon-scm/src/site/apt/usage.apt.vm | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/424971d4/wagon-providers/wagon-scm/pom.xml
--
diff --git a/wagon-providers/wagon-scm/pom.xml
b/wagon-providers/wagon-scm/pom.xml
index 17c9c65..60b8583 100644
--- a/wagon-providers/wagon-scm/pom.xml
+++ b/wagon-providers/wagon-scm/pom.xml
@@ -34,7 +34,7 @@ under the License.
-1.5
+1.9.5
http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/424971d4/wagon-providers/wagon-scm/src/site/apt/usage.apt.vm
--
diff --git a/wagon-providers/wagon-scm/src/site/apt/usage.apt.vm
b/wagon-providers/wagon-scm/src/site/apt/usage.apt.vm
index 246fa09..22e4a78 100644
--- a/wagon-providers/wagon-scm/src/site/apt/usage.apt.vm
+++ b/wagon-providers/wagon-scm/src/site/apt/usage.apt.vm
@@ -146,12 +146,12 @@ Deploying your Maven site to SCM
org.apache.maven.scm
maven-scm-manager-plexus
-${project.version}
+${mavenScmVersion}
org.apache.maven.scm
maven-scm-provider-gitexe
-${project.version}
+${mavenScmVersion}
[2/7] maven git commit: [MNG-6110] Upgrade Aether to Maven Resolver 1.2
http://git-wip-us.apache.org/repos/asf/maven/blob/58554032/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/package-info.java
--
diff --git
a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/package-info.java
b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/package-info.java
new file mode 100644
index 000..9849971
--- /dev/null
+++
b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/package-info.java
@@ -0,0 +1,25 @@
+// CHECKSTYLE_OFF: RegexpHeader
+/**
+ * http://maven.apache.org/resolver/";>Maven Resolver extensions
for utilizing the Maven POM and Maven
+ * repository metadata.
+ */
+package org.apache.maven.repository.internal;
+
+/*
+ * 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.
+ */
http://git-wip-us.apache.org/repos/asf/maven/blob/58554032/maven-resolver-provider/src/site/apt/index.apt
--
diff --git a/maven-resolver-provider/src/site/apt/index.apt
b/maven-resolver-provider/src/site/apt/index.apt
new file mode 100644
index 000..600ec41
--- /dev/null
+++ b/maven-resolver-provider/src/site/apt/index.apt
@@ -0,0 +1,33 @@
+~~ 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.
+
+ -
+ Introduction
+ -
+ Hervé Boutemy
+ -
+ 2012-09-29
+ -
+
+Maven Aether Provider
+
+ Maven Aether Provider is an {{{http://www.eclipse.org/aether/}Aether}}
extension to support
+ Maven POMs and local+remote repositories.
+
+ Main component is <<>>
+
({{{./apidocs/org/apache/maven/repository/internal/MavenRepositorySystemUtils.html}javadoc}},
+
{{{./xref/org/apache/maven/repository/internal/MavenRepositorySystemUtils.html}source}}).
http://git-wip-us.apache.org/repos/asf/maven/blob/58554032/maven-resolver-provider/src/site/site.xml
--
diff --git a/maven-resolver-provider/src/site/site.xml
b/maven-resolver-provider/src/site/site.xml
new file mode 100644
index 000..3a16bf9
--- /dev/null
+++ b/maven-resolver-provider/src/site/site.xml
@@ -0,0 +1,36 @@
+
+
+
+
+http://maven.apache.org/DECORATION/1.0.0";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.0
http://maven.apache.org/xsd/decoration-1.0.0.xsd";>
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven/blob/58554032/maven-resolver-provider/src/test/java/org/apache/maven/repository/internal/AbstractRepositoryTestCase.java
--
diff --git
a/maven-resolver-provider/src/test/java/org/apache/maven/repository/internal/AbstractRepositoryTestCase.java
b/maven-resolver-provider/src/test/java/org/apache/maven/repository/internal/AbstractRepositoryTestCase.java
new file mode 100644
index 000..b81450c
--- /dev/null
+++
b/maven-resolver-provider/src/test/java/org/apache/maven/repository/internal/AbstractRepositoryTestCase.java
@@ -0,0 +1,87 @@
+package org.apache.maven.repository.internal;
+
+/*
+ * 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
[4/7] maven git commit: [MNG-6110] Upgrade Aether to Maven Resolver 1.2
http://git-wip-us.apache.org/repos/asf/maven/blob/58554032/maven-core/src/main/resources/META-INF/maven/extension.xml -- diff --git a/maven-core/src/main/resources/META-INF/maven/extension.xml b/maven-core/src/main/resources/META-INF/maven/extension.xml index eaa807b..55e0096 100644 --- a/maven-core/src/main/resources/META-INF/maven/extension.xml +++ b/maven-core/src/main/resources/META-INF/maven/extension.xml @@ -54,7 +54,7 @@ under the License. org.apache.maven.wagon.repository org.apache.maven.wagon.resource - + org.eclipse.aether.* org.eclipse.aether.artifact org.eclipse.aether.collection @@ -134,7 +134,7 @@ under the License. org.sonatype.sisu:sisu-inject-plexus org.eclipse.sisu:org.eclipse.sisu.plexus org.apache.maven:maven-artifact -org.apache.maven:maven-aether-provider + org.apache.maven:maven-resolver-provider org.apache.maven:maven-artifact-manager org.apache.maven:maven-compat org.apache.maven:maven-core @@ -154,9 +154,9 @@ under the License. org.apache.maven:maven-settings-builder org.apache.maven:maven-toolchain org.apache.maven.wagon:wagon-provider-api -org.eclipse.aether:aether-api -org.eclipse.aether:aether-spi -org.eclipse.aether:aether-impl + org.apache.maven.resolver:maven-resolver-api + org.apache.maven.resolver:maven-resolver-spi + org.apache.maven.resolver:maven-resolver-impl javax.inject:javax.inject javax.annotation:jsr250-api @@ -169,6 +169,9 @@ under the License. org.sonatype.aether:aether-api org.sonatype.aether:aether-spi org.sonatype.aether:aether-impl +org.eclipse.aether:aether-api +org.eclipse.aether:aether-spi +org.eclipse.aether:aether-impl + +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 +maven +3.4.0-SNAPSHOT + + + maven-resolver-provider + + Maven Resolver Provider + Extensions to Maven Resolver for utilizing Maven POM and repository metadata. + + + + org.apache.maven + maven-model + + + org.apache.maven + maven-model-builder + + + org.apache.maven + maven-repository-metadata + + + org.apache.maven.resolver + maven-resolver-api + + + org.apache.maven.resolver + maven-resolver-spi + + + org.apache.maven.resolver + maven-resolver-util + + + org.apache.maven.resolver + maven-resolver-impl + + + org.codehaus.plexus + plexus-component-annotations + + + org.codehaus.plexus + plexus-utils + + + com.google.inject + guice + no_aop + true + + + aopalliance + aopalliance + + + + + org.apache.commons + commons-lang3 + + + com.google.guava + guava + + + org.eclipse.sisu + org.eclipse.sisu.inject + + + org.eclipse.sisu + org.eclipse.sisu.plexus + + + javax.inject + javax.inject + + + + org.apache.maven.resolver + maven-resolver-connector-basic + test + + + org.apache.maven.resolver + maven-resolver-transport-wagon + test + + + org.apache.maven.wagon + wagon-file + test + + + org.mockito + mockito-core + 1.10.19 + test + + + + + + +org.codehaus.plexus +plexus-component-metadata + + + + + + http://git-wip-us.apache.org/repos/asf/maven/blob/58554032/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/ArtifactDescriptorReaderDelegate.java -- diff --git a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/ArtifactDescriptorReaderDelegate.java b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/ArtifactDescriptorReaderDelegate.java new file mode 100644 index 000..284ee86 --- /dev/null +++ b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/ArtifactDescriptorReaderDelegate.java @@ -0,0 +1,157 @@ +package org.apache.maven.repository.internal; + +/* + * 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
[1/7] maven git commit: [MNG-6110] Upgrade Aether to Maven Resolver 1.2
Repository: maven
Updated Branches:
refs/heads/master 624a73671 -> 58554032f
http://git-wip-us.apache.org/repos/asf/maven/blob/58554032/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 5a02403..ebc859f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -89,7 +89,7 @@ under the License.
maven-settings
maven-settings-builder
maven-artifact
-maven-aether-provider
+maven-resolver-provider
maven-repository-metadata
maven-slf4j-provider
maven-embedder
@@ -215,7 +215,7 @@ under the License.
org.apache.maven
-maven-aether-provider
+maven-resolver-provider
${project.version}
http://git-wip-us.apache.org/repos/asf/maven/blob/58554032/src/site/resources/images/maven-deps.png
--
diff --git a/src/site/resources/images/maven-deps.png
b/src/site/resources/images/maven-deps.png
index f18688d..a51bcf8 100644
Binary files a/src/site/resources/images/maven-deps.png and
b/src/site/resources/images/maven-deps.png differ
http://git-wip-us.apache.org/repos/asf/maven/blob/58554032/src/site/xdoc/index.xml
--
diff --git a/src/site/xdoc/index.xml b/src/site/xdoc/index.xml
index eda684f..289f428 100644
--- a/src/site/xdoc/index.xml
+++ b/src/site/xdoc/index.xml
@@ -46,7 +46,7 @@
-
+
@@ -69,7 +69,7 @@
https://codehaus-plexus.github.io/plexus-classworlds"; />
https://codehaus-plexus.github.io/plexus-utils"; />
https://codehaus-plexus.github.io/"; />
- http://www.eclipse.org/projects/project_summary.php?projectid=technology.aether";
/>
+ http://maven.apache.org/resolver/"; />
http://www.eclipse.org/projects/project_summary.php?projectid=technology.sisu";
/>
http://code.google.com/p/google-guice/"; />
http://docs.oracle.com/javaee/6/api/javax/inject/package-summary.html"; />
http://git-wip-us.apache.org/repos/asf/maven/blob/58554032/src/site/xdoc/maven-deps.odg
--
diff --git a/src/site/xdoc/maven-deps.odg b/src/site/xdoc/maven-deps.odg
index a14e6fc..8e2ced7 100644
Binary files a/src/site/xdoc/maven-deps.odg and b/src/site/xdoc/maven-deps.odg
differ
[5/7] maven git commit: [MNG-6110] Upgrade Aether to Maven Resolver 1.2
http://git-wip-us.apache.org/repos/asf/maven/blob/58554032/maven-aether-provider/src/site/site.xml
--
diff --git a/maven-aether-provider/src/site/site.xml
b/maven-aether-provider/src/site/site.xml
deleted file mode 100644
index 3a16bf9..000
--- a/maven-aether-provider/src/site/site.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-
-
-
-
-http://maven.apache.org/DECORATION/1.0.0";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.0
http://maven.apache.org/xsd/decoration-1.0.0.xsd";>
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven/blob/58554032/maven-aether-provider/src/test/java/org/apache/maven/repository/internal/AbstractRepositoryTestCase.java
--
diff --git
a/maven-aether-provider/src/test/java/org/apache/maven/repository/internal/AbstractRepositoryTestCase.java
b/maven-aether-provider/src/test/java/org/apache/maven/repository/internal/AbstractRepositoryTestCase.java
deleted file mode 100644
index b81450c..000
---
a/maven-aether-provider/src/test/java/org/apache/maven/repository/internal/AbstractRepositoryTestCase.java
+++ /dev/null
@@ -1,87 +0,0 @@
-package org.apache.maven.repository.internal;
-
-/*
- * 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.net.MalformedURLException;
-
-import org.apache.maven.repository.internal.util.ConsoleRepositoryListener;
-import org.apache.maven.repository.internal.util.ConsoleTransferListener;
-import org.codehaus.plexus.ContainerConfiguration;
-import org.codehaus.plexus.PlexusConstants;
-import org.codehaus.plexus.PlexusTestCase;
-import org.eclipse.aether.DefaultRepositorySystemSession;
-import org.eclipse.aether.RepositorySystem;
-import org.eclipse.aether.RepositorySystemSession;
-import org.eclipse.aether.repository.LocalRepository;
-import org.eclipse.aether.repository.RemoteRepository;
-
-public abstract class AbstractRepositoryTestCase
-extends PlexusTestCase
-{
-protected RepositorySystem system;
-
-protected RepositorySystemSession session;
-
-@Override
-protected void customizeContainerConfiguration( ContainerConfiguration
containerConfiguration )
-{
-super.customizeContainerConfiguration( containerConfiguration );
-containerConfiguration.setAutoWiring( true );
-containerConfiguration.setClassPathScanning(
PlexusConstants.SCANNING_INDEX );
-}
-
-@Override
-protected void setUp()
-throws Exception
-{
-super.setUp();
-system = lookup( RepositorySystem.class );
-session = newMavenRepositorySystemSession( system );
-}
-
-@Override
-protected void tearDown()
-throws Exception
-{
-session = null;
-system = null;
-super.tearDown();
-}
-
-public static RepositorySystemSession newMavenRepositorySystemSession(
RepositorySystem system )
-{
-DefaultRepositorySystemSession session =
MavenRepositorySystemUtils.newSession();
-
-LocalRepository localRepo = new LocalRepository( "target/local-repo" );
-session.setLocalRepositoryManager( system.newLocalRepositoryManager(
session, localRepo ) );
-
-session.setTransferListener( new ConsoleTransferListener() );
-session.setRepositoryListener( new ConsoleRepositoryListener() );
-
-return session;
-}
-
-public static RemoteRepository newTestRepository()
-throws MalformedURLException
-{
-return new RemoteRepository.Builder( "repo", "default",
- getTestFile(
"target/test-classes/repo" ).toURI().toURL().toString() ).build();
-}
-}
http://git-wip-us.apache.org/repos/asf/maven/blob/58554032/maven-aether-provider/src/test/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReaderTest.java
--
diff --git
a/maven-aether-provider/src/test/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReader
[7/7] maven git commit: [MNG-6110] Upgrade Aether to Maven Resolver 1.2
[MNG-6110] Upgrade Aether to Maven Resolver 1.2 o Updated to rename 'maven-aether-provider' to 'maven-resolver-provider'. Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/58554032 Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/58554032 Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/58554032 Branch: refs/heads/master Commit: 58554032fe026f3fa3588be7911505d1aa1fff3f Parents: 624a736 Author: Christian Schulte Authored: Sun Dec 11 23:36:04 2016 +0100 Committer: Christian Schulte Committed: Sun Dec 11 23:36:04 2016 +0100 -- maven-aether-provider/pom.xml | 139 - .../ArtifactDescriptorReaderDelegate.java | 157 - .../internal/ArtifactDescriptorUtils.java | 81 --- .../DefaultArtifactDescriptorReader.java| 415 - .../repository/internal/DefaultModelCache.java | 119 .../internal/DefaultModelResolver.java | 279 - .../internal/DefaultVersionRangeResolver.java | 327 -- .../DefaultVersionRangeResultFilter.java| 45 -- .../internal/DefaultVersionResolver.java| 612 --- .../internal/LocalSnapshotMetadata.java | 163 - .../LocalSnapshotMetadataGenerator.java | 82 --- .../repository/internal/MavenAetherModule.java | 76 --- .../repository/internal/MavenMetadata.java | 137 - .../internal/MavenRepositorySystemUtils.java| 146 - .../internal/MavenSnapshotMetadata.java | 100 --- .../internal/MavenWorkspaceReader.java | 32 - .../repository/internal/RelocatedArtifact.java | 114 .../internal/RemoteSnapshotMetadata.java| 157 - .../RemoteSnapshotMetadataGenerator.java| 107 .../SnapshotMetadataGeneratorFactory.java | 52 -- .../internal/VersionRangeResultFilter.java | 45 -- .../repository/internal/VersionsMetadata.java | 133 .../internal/VersionsMetadataGenerator.java | 108 .../VersionsMetadataGeneratorFactory.java | 52 -- .../maven/repository/internal/package-info.java | 25 - maven-aether-provider/src/site/apt/index.apt| 33 - maven-aether-provider/src/site/site.xml | 36 -- .../internal/AbstractRepositoryTestCase.java| 87 --- .../DefaultArtifactDescriptorReaderTest.java| 77 --- .../DefaultVersionRangeResolverTest.java| 455 -- .../internal/DefaultVersionResolverTest.java| 96 --- .../MavenRepositorySystemUtilsTest.java | 45 -- .../internal/RemoteSnapshotMetadataTest.java| 82 --- .../internal/RepositorySystemTest.java | 220 --- .../util/ConsoleRepositoryListener.java | 132 .../internal/util/ConsoleTransferListener.java | 186 -- .../07.20.3-SNAPSHOT/maven-metadata.xml | 49 -- .../0.4.0-SNAPSHOT/maven-metadata.xml | 47 -- .../maven/its/mng-3092/maven-metadata.xml | 104 .../artifact/1.0/artifact-1.0-classifier.zip| 0 .../ut/simple/artifact/1.0/artifact-1.0.jar | 0 .../ut/simple/artifact/1.0/artifact-1.0.pom | 48 -- .../ut/simple/artifact/1.0/artifact-1.0.zip | 0 .../repo/ut/simple/artifact/maven-metadata.xml | 34 -- .../dependency/1.0/dependency-1.0-sources.jar | 0 .../ut/simple/dependency/1.0/dependency-1.0.jar | 0 .../ut/simple/dependency/1.0/dependency-1.0.pom | 31 - .../ut/simple/dependency/maven-metadata.xml | 34 -- .../repo/ut/simple/parent/1.0/parent-1.0.pom| 43 -- .../repo/ut/simple/parent/maven-metadata.xml| 34 -- maven-compat/pom.xml| 2 +- maven-core/pom.xml | 2 +- .../main/resources/META-INF/maven/extension.xml | 13 +- maven-resolver-provider/pom.xml | 139 + .../ArtifactDescriptorReaderDelegate.java | 157 + .../internal/ArtifactDescriptorUtils.java | 81 +++ .../DefaultArtifactDescriptorReader.java| 415 + .../repository/internal/DefaultModelCache.java | 119 .../internal/DefaultModelResolver.java | 279 + .../internal/DefaultVersionRangeResolver.java | 327 ++ .../DefaultVersionRangeResultFilter.java| 45 ++ .../internal/DefaultVersionResolver.java| 612 +++ .../internal/LocalSnapshotMetadata.java | 163 + .../LocalSnapshotMetadataGenerator.java | 82 +++ .../repository/internal/MavenAetherModule.java | 80 +++ .../repository/internal/MavenMetadata.java | 137 + .../internal/MavenRepositorySystemUtils.java| 146 + .../internal/MavenResolverModule.java | 70 +++ .../internal/MavenSnapshotMetadata.java | 100 +++ .../internal/MavenWorkspaceReader.java | 32 + .../repository/internal/RelocatedArtifact.java | 114 .../internal/RemoteSnapshotMetadata.java
[6/7] maven git commit: [MNG-6110] Upgrade Aether to Maven Resolver 1.2
http://git-wip-us.apache.org/repos/asf/maven/blob/58554032/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionResolver.java
--
diff --git
a/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionResolver.java
b/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionResolver.java
deleted file mode 100644
index 0d5a880..000
---
a/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionResolver.java
+++ /dev/null
@@ -1,612 +0,0 @@
-package org.apache.maven.repository.internal;
-
-/*
- * 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.apache.commons.lang3.Validate;
-import org.apache.maven.artifact.repository.metadata.Snapshot;
-import org.apache.maven.artifact.repository.metadata.SnapshotVersion;
-import org.apache.maven.artifact.repository.metadata.Versioning;
-import
org.apache.maven.artifact.repository.metadata.io.xpp3.MetadataXpp3Reader;
-import org.codehaus.plexus.component.annotations.Component;
-import org.codehaus.plexus.component.annotations.Requirement;
-import org.codehaus.plexus.util.StringUtils;
-import org.eclipse.aether.RepositoryCache;
-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.impl.MetadataResolver;
-import org.eclipse.aether.impl.RepositoryEventDispatcher;
-import org.eclipse.aether.impl.SyncContextFactory;
-import org.eclipse.aether.impl.VersionResolver;
-import org.eclipse.aether.internal.impl.CacheUtils;
-import org.eclipse.aether.metadata.DefaultMetadata;
-import org.eclipse.aether.metadata.Metadata;
-import org.eclipse.aether.repository.ArtifactRepository;
-import org.eclipse.aether.repository.LocalRepository;
-import org.eclipse.aether.repository.RemoteRepository;
-import org.eclipse.aether.repository.WorkspaceReader;
-import org.eclipse.aether.repository.WorkspaceRepository;
-import org.eclipse.aether.resolution.MetadataRequest;
-import org.eclipse.aether.resolution.MetadataResult;
-import org.eclipse.aether.resolution.VersionRequest;
-import org.eclipse.aether.resolution.VersionResolutionException;
-import org.eclipse.aether.resolution.VersionResult;
-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.ConfigUtils;
-
-import javax.inject.Inject;
-import javax.inject.Named;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @author Benjamin Bentmann
- */
-@Named
-@Component( role = VersionResolver.class )
-public class DefaultVersionResolver
-implements VersionResolver, Service
-{
-
-private static final String MAVEN_METADATA_XML = "maven-metadata.xml";
-
-private static final String RELEASE = "RELEASE";
-
-private static final String LATEST = "LATEST";
-
-private static final String SNAPSHOT = "SNAPSHOT";
-
-@SuppressWarnings( "unused" )
-@Requirement( role = LoggerFactory.class )
-private Logger logger = NullLoggerFactory.LOGGER;
-
-@Requirement
-private MetadataResolver metadataResolver;
-
-@Requirement
-private SyncContextFactory syncContextFactory;
-
-@Requirement
-private RepositoryEventDispatcher repositoryEventDispatcher;
-
-public DefaultVersionResolver()
-{
-// enable no-arg constructor
-}
-
-@Inject
-DefaultVersionResolver( MetadataResolver metadataResolver,
SyncContextFactory syncContextFactory,
-RepositoryEventDispatcher
repositoryEventDispatcher, LoggerFactory loggerFactory )
-{
-setMetadata
[3/7] maven git commit: [MNG-6110] Upgrade Aether to Maven Resolver 1.2
http://git-wip-us.apache.org/repos/asf/maven/blob/58554032/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionResolver.java
--
diff --git
a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionResolver.java
b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionResolver.java
new file mode 100644
index 000..0d5a880
--- /dev/null
+++
b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionResolver.java
@@ -0,0 +1,612 @@
+package org.apache.maven.repository.internal;
+
+/*
+ * 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.apache.commons.lang3.Validate;
+import org.apache.maven.artifact.repository.metadata.Snapshot;
+import org.apache.maven.artifact.repository.metadata.SnapshotVersion;
+import org.apache.maven.artifact.repository.metadata.Versioning;
+import
org.apache.maven.artifact.repository.metadata.io.xpp3.MetadataXpp3Reader;
+import org.codehaus.plexus.component.annotations.Component;
+import org.codehaus.plexus.component.annotations.Requirement;
+import org.codehaus.plexus.util.StringUtils;
+import org.eclipse.aether.RepositoryCache;
+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.impl.MetadataResolver;
+import org.eclipse.aether.impl.RepositoryEventDispatcher;
+import org.eclipse.aether.impl.SyncContextFactory;
+import org.eclipse.aether.impl.VersionResolver;
+import org.eclipse.aether.internal.impl.CacheUtils;
+import org.eclipse.aether.metadata.DefaultMetadata;
+import org.eclipse.aether.metadata.Metadata;
+import org.eclipse.aether.repository.ArtifactRepository;
+import org.eclipse.aether.repository.LocalRepository;
+import org.eclipse.aether.repository.RemoteRepository;
+import org.eclipse.aether.repository.WorkspaceReader;
+import org.eclipse.aether.repository.WorkspaceRepository;
+import org.eclipse.aether.resolution.MetadataRequest;
+import org.eclipse.aether.resolution.MetadataResult;
+import org.eclipse.aether.resolution.VersionRequest;
+import org.eclipse.aether.resolution.VersionResolutionException;
+import org.eclipse.aether.resolution.VersionResult;
+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.ConfigUtils;
+
+import javax.inject.Inject;
+import javax.inject.Named;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author Benjamin Bentmann
+ */
+@Named
+@Component( role = VersionResolver.class )
+public class DefaultVersionResolver
+implements VersionResolver, Service
+{
+
+private static final String MAVEN_METADATA_XML = "maven-metadata.xml";
+
+private static final String RELEASE = "RELEASE";
+
+private static final String LATEST = "LATEST";
+
+private static final String SNAPSHOT = "SNAPSHOT";
+
+@SuppressWarnings( "unused" )
+@Requirement( role = LoggerFactory.class )
+private Logger logger = NullLoggerFactory.LOGGER;
+
+@Requirement
+private MetadataResolver metadataResolver;
+
+@Requirement
+private SyncContextFactory syncContextFactory;
+
+@Requirement
+private RepositoryEventDispatcher repositoryEventDispatcher;
+
+public DefaultVersionResolver()
+{
+// enable no-arg constructor
+}
+
+@Inject
+DefaultVersionResolver( MetadataResolver metadataResolver,
SyncContextFactory syncContextFactory,
+RepositoryEventDispatcher
repositoryEventDispatcher, LoggerFactory loggerFactory )
+{
+setMeta
maven git commit: [MNG-5971] Imported dependencies should be available to inheritance processing
Repository: maven
Updated Branches:
refs/heads/master 58554032f -> ee4fcfd54
[MNG-5971] Imported dependencies should be available to inheritance processing
o Updated to correctly setup the model resolver for processing import scope
dependencies and to process include scope dependencies using the effective
repositories to support repository overriding the same way property
overriding is supported.
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/ee4fcfd5
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/ee4fcfd5
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/ee4fcfd5
Branch: refs/heads/master
Commit: ee4fcfd547cdec357e05c1fa8da36f0c5138e4e9
Parents: 5855403
Author: Christian Schulte
Authored: Mon Dec 12 02:29:01 2016 +0100
Committer: Christian Schulte
Committed: Mon Dec 12 02:41:00 2016 +0100
--
.../model/building/DefaultModelBuilder.java | 31
1 file changed, 26 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven/blob/ee4fcfd5/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
--
diff --git
a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
index 24b314a..21d9d83 100644
---
a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
+++
b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
@@ -533,6 +533,9 @@ public class DefaultModelBuilder
lifecycleBindingsInjector.injectLifecycleBindings( resultModel,
request, problems );
}
+// Re-configure the resolver to reflect the effective result model.
+// It may have been modified during include scope processing.
+this.configureResolver( request.getModelResolver(), resultModel,
problems, true );
this.importDependencyManagement( resultModel, "import", request,
problems, new HashSet() );
// dependency management injection
@@ -889,6 +892,7 @@ public class DefaultModelBuilder
}
final Properties effectiveProperties = intermediateLineage.get( 0
).getProperties();
+final List effectiveRepositories =
intermediateLineage.get( 0 ).getRepositories();
final DefaultModelProblemCollector intermediateProblems =
new DefaultModelProblemCollector( new DefaultModelBuildingResult()
);
@@ -903,7 +907,7 @@ public class DefaultModelBuilder
this.interpolateModel( model, request, intermediateProblems );
}
-// Exchanges 'import' scope dependencies in the original lineage with
possibly interpolated values.
+// Exchanges 'include' scope dependencies in the original lineage with
possibly interpolated values.
for ( int i = 0, s0 = lineage.size(); i < s0; i++ )
{
final Model model = lineage.get( i );
@@ -941,12 +945,29 @@ public class DefaultModelBuilder
};
}
-// Imports dependencies into the original model using the repositories
of the intermediate model.
+// Sets up the resolver to use the effective repositories to support
repository overriding.
+if ( lenientRequest.getModelResolver() != null )
+{
+for ( Repository repository : effectiveRepositories )
+{
+try
+{
+lenientRequest.getModelResolver().addRepository(
repository, true );
+}
+catch ( InvalidRepositoryException e )
+{
+problems.add( new ModelProblemCollectorRequest(
Severity.ERROR, Version.BASE )
+.setMessage( "Invalid repository " +
repository.getId() + ": " + e.getMessage() )
+.setLocation( repository.getLocation( "" )
).setException( e ) );
+
+}
+}
+}
+
+// Imports dependencies into the original model using the effective
repositories.
for ( int i = 0, s0 = lineage.size(); i < s0; i++ )
{
-final Model model = lineage.get( i );
-this.configureResolver( lenientRequest.getModelResolver(),
intermediateLineage.get( i ), problems, true );
-this.importDependencyManagement( model, scope, lenientRequest,
problems, new HashSet() );
+this.importDependencyManagement( lineage.get( i ), scope,
lenientRequest, problems, new HashSet() );
}
}
maven-integration-testing git commit: [MNG-5227] Make 'optional' flag of a dependency manageable.
Repository: maven-integration-testing
Updated Branches:
refs/heads/master c3f03ac53 -> 723b942ad
[MNG-5227] Make 'optional' flag of a dependency manageable.
o Updated to run this test with Maven 3.4+ instead of 3.5+.
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/723b942a
Tree:
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/tree/723b942a
Diff:
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/diff/723b942a
Branch: refs/heads/master
Commit: 723b942ad10ab471dfbc5d81ed1071891573dc01
Parents: c3f03ac
Author: Christian Schulte
Authored: Mon Dec 12 02:45:19 2016 +0100
Committer: Christian Schulte
Committed: Mon Dec 12 02:45:19 2016 +0100
--
.../it/MavenITmng5227DependencyOptionalFlagManagementTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/723b942a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5227DependencyOptionalFlagManagementTest.java
--
diff --git
a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5227DependencyOptionalFlagManagementTest.java
b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5227DependencyOptionalFlagManagementTest.java
index f009307..3dc0ad8 100644
---
a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5227DependencyOptionalFlagManagementTest.java
+++
b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5227DependencyOptionalFlagManagementTest.java
@@ -37,7 +37,7 @@ public class
MavenITmng5227DependencyOptionalFlagManagementTest
public MavenITmng5227DependencyOptionalFlagManagementTest()
{
-super( "[3.5,)" );
+super( "[3.4,)" );
}
/**
maven git commit: [MNG-5971] Imported dependencies should be available to inheritance processing
Repository: maven Updated Branches: refs/heads/master ee4fcfd54 -> 2858fd32d [MNG-5971] Imported dependencies should be available to inheritance processing o Updated to remove redundant re-configuration of the resolver introduced by latest commit. The integration test for MNG-4347 still fails but due to the a profile from settings disappearing on successive model building requests. Needs further analysis. Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/2858fd32 Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/2858fd32 Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/2858fd32 Branch: refs/heads/master Commit: 2858fd32d7b58255ecf487325eff68db99a2909e Parents: ee4fcfd Author: Christian Schulte Authored: Mon Dec 12 05:54:58 2016 +0100 Committer: Christian Schulte Committed: Mon Dec 12 05:58:51 2016 +0100 -- .../java/org/apache/maven/model/building/DefaultModelBuilder.java | 3 --- 1 file changed, 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven/blob/2858fd32/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java -- diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java index 21d9d83..119ac6c 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java @@ -533,9 +533,6 @@ public class DefaultModelBuilder lifecycleBindingsInjector.injectLifecycleBindings( resultModel, request, problems ); } -// Re-configure the resolver to reflect the effective result model. -// It may have been modified during include scope processing. -this.configureResolver( request.getModelResolver(), resultModel, problems, true ); this.importDependencyManagement( resultModel, "import", request, problems, new HashSet() ); // dependency management injection
