maven-wagon git commit: back to 3.0.0-SNAPSHOT javadoc is failing
Repository: maven-wagon Updated Branches: refs/heads/master f30f0f823 -> a4538d53e back to 3.0.0-SNAPSHOT javadoc is failing Signed-off-by: olivier lamyProject: http://git-wip-us.apache.org/repos/asf/maven-wagon/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-wagon/commit/a4538d53 Tree: http://git-wip-us.apache.org/repos/asf/maven-wagon/tree/a4538d53 Diff: http://git-wip-us.apache.org/repos/asf/maven-wagon/diff/a4538d53 Branch: refs/heads/master Commit: a4538d53e879fa03bec0d660220b08f7e8608f90 Parents: f30f0f8 Author: olivier lamy Authored: Wed Aug 2 12:15:16 2017 +1000 Committer: olivier lamy Committed: Wed Aug 2 12:15:16 2017 +1000 -- pom.xml | 2 +- wagon-provider-api/pom.xml | 2 +- wagon-provider-test/pom.xml | 2 +- wagon-providers/pom.xml | 2 +- wagon-providers/wagon-file/pom.xml | 2 +- wagon-providers/wagon-ftp/pom.xml | 2 +- wagon-providers/wagon-http-lightweight/pom.xml | 2 +- wagon-providers/wagon-http-shared/pom.xml | 2 +- wagon-providers/wagon-http/pom.xml | 2 +- wagon-providers/wagon-scm/pom.xml | 2 +- wagon-providers/wagon-ssh-common-test/pom.xml | 2 +- wagon-providers/wagon-ssh-common/pom.xml| 2 +- wagon-providers/wagon-ssh-external/pom.xml | 2 +- wagon-providers/wagon-ssh/pom.xml | 2 +- wagon-providers/wagon-webdav-jackrabbit/pom.xml | 2 +- wagon-tcks/pom.xml | 2 +- wagon-tcks/wagon-tck-http/pom.xml | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/a4538d53/pom.xml -- diff --git a/pom.xml b/pom.xml index 9f9d5c8..6b24939 100644 --- a/pom.xml +++ b/pom.xml @@ -29,7 +29,7 @@ under the License. org.apache.maven.wagon wagon - 3.0.1-SNAPSHOT + 3.0.0-SNAPSHOT pom Apache Maven Wagon http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/a4538d53/wagon-provider-api/pom.xml -- diff --git a/wagon-provider-api/pom.xml b/wagon-provider-api/pom.xml index d07315b..6be1d51 100644 --- a/wagon-provider-api/pom.xml +++ b/wagon-provider-api/pom.xml @@ -23,7 +23,7 @@ under the License. org.apache.maven.wagon wagon -3.0.1-SNAPSHOT +3.0.0-SNAPSHOT ../pom.xml http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/a4538d53/wagon-provider-test/pom.xml -- diff --git a/wagon-provider-test/pom.xml b/wagon-provider-test/pom.xml index 3789a59..a070677 100644 --- a/wagon-provider-test/pom.xml +++ b/wagon-provider-test/pom.xml @@ -23,7 +23,7 @@ under the License. org.apache.maven.wagon wagon -3.0.1-SNAPSHOT +3.0.0-SNAPSHOT ../pom.xml http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/a4538d53/wagon-providers/pom.xml -- diff --git a/wagon-providers/pom.xml b/wagon-providers/pom.xml index 151be66..d9641f6 100644 --- a/wagon-providers/pom.xml +++ b/wagon-providers/pom.xml @@ -23,7 +23,7 @@ under the License. org.apache.maven.wagon wagon -3.0.1-SNAPSHOT +3.0.0-SNAPSHOT ../pom.xml http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/a4538d53/wagon-providers/wagon-file/pom.xml -- diff --git a/wagon-providers/wagon-file/pom.xml b/wagon-providers/wagon-file/pom.xml index 48e70ac..e93bcbf 100644 --- a/wagon-providers/wagon-file/pom.xml +++ b/wagon-providers/wagon-file/pom.xml @@ -23,7 +23,7 @@ under the License. org.apache.maven.wagon wagon-providers -3.0.1-SNAPSHOT +3.0.0-SNAPSHOT ../pom.xml http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/a4538d53/wagon-providers/wagon-ftp/pom.xml -- diff --git a/wagon-providers/wagon-ftp/pom.xml b/wagon-providers/wagon-ftp/pom.xml index de98c54..bc1fa14 100644 --- a/wagon-providers/wagon-ftp/pom.xml +++ b/wagon-providers/wagon-ftp/pom.xml @@ -23,7 +23,7 @@ under the License. org.apache.maven.wagon wagon-providers -3.0.1-SNAPSHOT +3.0.0-SNAPSHOT ../pom.xml http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/a4538d53/wagon-providers/wagon-http-lightweight/pom.xml -- diff --git a/wagon-providers/wagon-http-lightweight/pom.xml b/wagon-providers/wagon-http-lightweight/pom.xml index
[maven-wagon] Git Push Summary
Repository: maven-wagon Updated Tags: refs/tags/wagon-3.0.0 [deleted] 683aad370
maven-wagon git commit: [maven-release-plugin] prepare for next development iteration
Repository: maven-wagon Updated Branches: refs/heads/master a6e0e8a9a -> f30f0f823 [maven-release-plugin] prepare for next development iteration Project: http://git-wip-us.apache.org/repos/asf/maven-wagon/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-wagon/commit/f30f0f82 Tree: http://git-wip-us.apache.org/repos/asf/maven-wagon/tree/f30f0f82 Diff: http://git-wip-us.apache.org/repos/asf/maven-wagon/diff/f30f0f82 Branch: refs/heads/master Commit: f30f0f8238ec81b7cc9cef3541a8123d48380861 Parents: a6e0e8a Author: olivier lamyAuthored: Wed Aug 2 12:05:57 2017 +1000 Committer: olivier lamy Committed: Wed Aug 2 12:05:57 2017 +1000 -- pom.xml | 4 ++-- wagon-provider-api/pom.xml | 2 +- wagon-provider-test/pom.xml | 2 +- wagon-providers/pom.xml | 2 +- wagon-providers/wagon-file/pom.xml | 2 +- wagon-providers/wagon-ftp/pom.xml | 2 +- wagon-providers/wagon-http-lightweight/pom.xml | 2 +- wagon-providers/wagon-http-shared/pom.xml | 2 +- wagon-providers/wagon-http/pom.xml | 2 +- wagon-providers/wagon-scm/pom.xml | 2 +- wagon-providers/wagon-ssh-common-test/pom.xml | 2 +- wagon-providers/wagon-ssh-common/pom.xml| 2 +- wagon-providers/wagon-ssh-external/pom.xml | 2 +- wagon-providers/wagon-ssh/pom.xml | 2 +- wagon-providers/wagon-webdav-jackrabbit/pom.xml | 2 +- wagon-tcks/pom.xml | 2 +- wagon-tcks/wagon-tck-http/pom.xml | 2 +- 17 files changed, 18 insertions(+), 18 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/f30f0f82/pom.xml -- diff --git a/pom.xml b/pom.xml index 1a823de..9f9d5c8 100644 --- a/pom.xml +++ b/pom.xml @@ -29,7 +29,7 @@ under the License. org.apache.maven.wagon wagon - 3.0.0 + 3.0.1-SNAPSHOT pom Apache Maven Wagon @@ -200,7 +200,7 @@ under the License. scm:git:https://git-wip-us.apache.org/repos/asf/maven-wagon.git scm:git:https://git-wip-us.apache.org/repos/asf/maven-wagon.git https://github.com/apache/maven-wagon/tree/${project.scm.tag} -wagon-3.0.0 +master http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/f30f0f82/wagon-provider-api/pom.xml -- diff --git a/wagon-provider-api/pom.xml b/wagon-provider-api/pom.xml index 58cdf09..d07315b 100644 --- a/wagon-provider-api/pom.xml +++ b/wagon-provider-api/pom.xml @@ -23,7 +23,7 @@ under the License. org.apache.maven.wagon wagon -3.0.0 +3.0.1-SNAPSHOT ../pom.xml http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/f30f0f82/wagon-provider-test/pom.xml -- diff --git a/wagon-provider-test/pom.xml b/wagon-provider-test/pom.xml index ace4d81..3789a59 100644 --- a/wagon-provider-test/pom.xml +++ b/wagon-provider-test/pom.xml @@ -23,7 +23,7 @@ under the License. org.apache.maven.wagon wagon -3.0.0 +3.0.1-SNAPSHOT ../pom.xml http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/f30f0f82/wagon-providers/pom.xml -- diff --git a/wagon-providers/pom.xml b/wagon-providers/pom.xml index b524aeb..151be66 100644 --- a/wagon-providers/pom.xml +++ b/wagon-providers/pom.xml @@ -23,7 +23,7 @@ under the License. org.apache.maven.wagon wagon -3.0.0 +3.0.1-SNAPSHOT ../pom.xml http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/f30f0f82/wagon-providers/wagon-file/pom.xml -- diff --git a/wagon-providers/wagon-file/pom.xml b/wagon-providers/wagon-file/pom.xml index 6489d99..48e70ac 100644 --- a/wagon-providers/wagon-file/pom.xml +++ b/wagon-providers/wagon-file/pom.xml @@ -23,7 +23,7 @@ under the License. org.apache.maven.wagon wagon-providers -3.0.0 +3.0.1-SNAPSHOT ../pom.xml http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/f30f0f82/wagon-providers/wagon-ftp/pom.xml -- diff --git a/wagon-providers/wagon-ftp/pom.xml b/wagon-providers/wagon-ftp/pom.xml index 6825511..de98c54 100644 --- a/wagon-providers/wagon-ftp/pom.xml +++ b/wagon-providers/wagon-ftp/pom.xml @@ -23,7 +23,7 @@ under the License. org.apache.maven.wagon wagon-providers -3.0.0 +3.0.1-SNAPSHOT ../pom.xml
[maven-wagon] Git Push Summary
Repository: maven-wagon Updated Tags: refs/tags/wagon-3.0.0 [created] 683aad370
maven-wagon git commit: [maven-release-plugin] prepare release wagon-3.0.0
Repository: maven-wagon Updated Branches: refs/heads/master f0ef6992f -> a6e0e8a9a [maven-release-plugin] prepare release wagon-3.0.0 Project: http://git-wip-us.apache.org/repos/asf/maven-wagon/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-wagon/commit/a6e0e8a9 Tree: http://git-wip-us.apache.org/repos/asf/maven-wagon/tree/a6e0e8a9 Diff: http://git-wip-us.apache.org/repos/asf/maven-wagon/diff/a6e0e8a9 Branch: refs/heads/master Commit: a6e0e8a9a1210ef8a0ba200edf86ad20a5e0b20b Parents: f0ef699 Author: olivier lamyAuthored: Wed Aug 2 12:05:40 2017 +1000 Committer: olivier lamy Committed: Wed Aug 2 12:05:40 2017 +1000 -- pom.xml | 4 ++-- wagon-provider-api/pom.xml | 2 +- wagon-provider-test/pom.xml | 2 +- wagon-providers/pom.xml | 2 +- wagon-providers/wagon-file/pom.xml | 2 +- wagon-providers/wagon-ftp/pom.xml | 2 +- wagon-providers/wagon-http-lightweight/pom.xml | 2 +- wagon-providers/wagon-http-shared/pom.xml | 2 +- wagon-providers/wagon-http/pom.xml | 2 +- wagon-providers/wagon-scm/pom.xml | 2 +- wagon-providers/wagon-ssh-common-test/pom.xml | 2 +- wagon-providers/wagon-ssh-common/pom.xml| 2 +- wagon-providers/wagon-ssh-external/pom.xml | 2 +- wagon-providers/wagon-ssh/pom.xml | 2 +- wagon-providers/wagon-webdav-jackrabbit/pom.xml | 2 +- wagon-tcks/pom.xml | 2 +- wagon-tcks/wagon-tck-http/pom.xml | 2 +- 17 files changed, 18 insertions(+), 18 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/a6e0e8a9/pom.xml -- diff --git a/pom.xml b/pom.xml index 6b24939..1a823de 100644 --- a/pom.xml +++ b/pom.xml @@ -29,7 +29,7 @@ under the License. org.apache.maven.wagon wagon - 3.0.0-SNAPSHOT + 3.0.0 pom Apache Maven Wagon @@ -200,7 +200,7 @@ under the License. scm:git:https://git-wip-us.apache.org/repos/asf/maven-wagon.git scm:git:https://git-wip-us.apache.org/repos/asf/maven-wagon.git https://github.com/apache/maven-wagon/tree/${project.scm.tag} -master +wagon-3.0.0 http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/a6e0e8a9/wagon-provider-api/pom.xml -- diff --git a/wagon-provider-api/pom.xml b/wagon-provider-api/pom.xml index 6be1d51..58cdf09 100644 --- a/wagon-provider-api/pom.xml +++ b/wagon-provider-api/pom.xml @@ -23,7 +23,7 @@ under the License. org.apache.maven.wagon wagon -3.0.0-SNAPSHOT +3.0.0 ../pom.xml http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/a6e0e8a9/wagon-provider-test/pom.xml -- diff --git a/wagon-provider-test/pom.xml b/wagon-provider-test/pom.xml index a070677..ace4d81 100644 --- a/wagon-provider-test/pom.xml +++ b/wagon-provider-test/pom.xml @@ -23,7 +23,7 @@ under the License. org.apache.maven.wagon wagon -3.0.0-SNAPSHOT +3.0.0 ../pom.xml http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/a6e0e8a9/wagon-providers/pom.xml -- diff --git a/wagon-providers/pom.xml b/wagon-providers/pom.xml index d9641f6..b524aeb 100644 --- a/wagon-providers/pom.xml +++ b/wagon-providers/pom.xml @@ -23,7 +23,7 @@ under the License. org.apache.maven.wagon wagon -3.0.0-SNAPSHOT +3.0.0 ../pom.xml http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/a6e0e8a9/wagon-providers/wagon-file/pom.xml -- diff --git a/wagon-providers/wagon-file/pom.xml b/wagon-providers/wagon-file/pom.xml index e93bcbf..6489d99 100644 --- a/wagon-providers/wagon-file/pom.xml +++ b/wagon-providers/wagon-file/pom.xml @@ -23,7 +23,7 @@ under the License. org.apache.maven.wagon wagon-providers -3.0.0-SNAPSHOT +3.0.0 ../pom.xml http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/a6e0e8a9/wagon-providers/wagon-ftp/pom.xml -- diff --git a/wagon-providers/wagon-ftp/pom.xml b/wagon-providers/wagon-ftp/pom.xml index bc1fa14..6825511 100644 --- a/wagon-providers/wagon-ftp/pom.xml +++ b/wagon-providers/wagon-ftp/pom.xml @@ -23,7 +23,7 @@ under the License. org.apache.maven.wagon wagon-providers -3.0.0-SNAPSHOT +3.0.0 ../pom.xml http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/a6e0e8a9/wagon-providers/wagon-http-lightweight/pom.xml
maven git commit: [MNG-6123] detect self references in POM and fail fast o Added unit test and self referencing pom [Forced Update!]
Repository: maven Updated Branches: refs/heads/MNG-6123-detect-self-references 65bb30301 -> 8f8c45c99 (forced update) [MNG-6123] detect self references in POM and fail fast o Added unit test and self referencing pom Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/8f8c45c9 Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/8f8c45c9 Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/8f8c45c9 Branch: refs/heads/MNG-6123-detect-self-references Commit: 8f8c45c990193b04c1770997d446951c5185b164 Parents: b100257 Author: Karl Heinz MarbaiseAuthored: Tue Apr 4 22:46:11 2017 +0200 Committer: Karl Heinz Marbaise Committed: Tue Aug 1 22:01:36 2017 +0200 -- .../model/validation/DefaultModelValidator.java | 54 ++-- .../validation/DefaultModelValidatorTest.java | 13 + .../validation/raw-model/self-referencing.xml | 38 ++ 3 files changed, 102 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven/blob/8f8c45c9/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java -- diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java b/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java index 2e7985f..d97d8f6 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java @@ -131,6 +131,9 @@ public class DefaultModelValidator validate20RawDependencies( problems, m.getDependencies(), "dependencies.dependency", request ); +validate20RawDependenciesSelfReferencing( problems, m, m.getDependencies(), "dependencies.dependency", + request ); + if ( m.getDependencyManagement() != null ) { validate20RawDependencies( problems, m.getDependencyManagement().getDependencies(), @@ -344,12 +347,12 @@ public class DefaultModelValidator Severity errOn30 = getSeverity( request, ModelBuildingRequest.VALIDATION_LEVEL_MAVEN_3_0 ); -validateEffectiveDependencies( problems, m.getDependencies(), false, request ); +validateEffectiveDependencies( problems, m, m.getDependencies(), false, request ); DependencyManagement mgmt = m.getDependencyManagement(); if ( mgmt != null ) { -validateEffectiveDependencies( problems, mgmt.getDependencies(), true, request ); +validateEffectiveDependencies( problems, m, mgmt.getDependencies(), true, request ); } if ( request.getValidationLevel() >= ModelBuildingRequest.VALIDATION_LEVEL_MAVEN_2_0 ) @@ -524,7 +527,33 @@ public class DefaultModelValidator } } -private void validateEffectiveDependencies( ModelProblemCollector problems, List dependencies, +private void validate20RawDependenciesSelfReferencing( ModelProblemCollector problems, Model m, + List dependencies, String prefix, + ModelBuildingRequest request ) +{ +// We only check for groupId/artifactId cause if there is another +// module with the same groupId/artifactId this will fail the build +// earlier like "Project '...' is duplicated in the reactor. +// So it is sufficient to check only groupId/artifactId and not the +// packaging type. +for ( Dependency dependency : dependencies ) +{ +String key = dependency.getGroupId() + ":" + dependency.getArtifactId() + ":" + dependency.getVersion(); +String mKey = m.getGroupId() + ":" + m.getArtifactId() + ":" + m.getVersion(); +if ( key.equals( mKey ) ) +{ +// This means a module which is build has a dependency which has the same +// groupId, artifactId and version coordinates. This is in consequence +// a self reference or in other words a circular reference which can not +// being resolved. +addViolation( problems, Severity.FATAL, Version.V31, prefix + " " + key, key, "is referencing itself.", + dependency ); + +} +} +} + +private void validateEffectiveDependencies( ModelProblemCollector problems, Model m, List dependencies, boolean management, ModelBuildingRequest request )
maven git commit: [MNG-6148] Can't package and assemble with JDK9/Jigsaw
Repository: maven Updated Branches: refs/heads/MNG-6148 [created] 361b902d0 [MNG-6148] Can't package and assemble with JDK9/Jigsaw Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/361b902d Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/361b902d Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/361b902d Branch: refs/heads/MNG-6148 Commit: 361b902d0c01d9a2b82d4b126ecd3a228b955124 Parents: a1fe421 Author: rfscholteAuthored: Tue Aug 1 21:44:40 2017 +0200 Committer: rfscholte Committed: Tue Aug 1 21:44:40 2017 +0200 -- pom.xml | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/maven/blob/361b902d/pom.xml -- diff --git a/pom.xml b/pom.xml index d6f165c..1a1dbe7 100644 --- a/pom.xml +++ b/pom.xml @@ -657,6 +657,7 @@ under the License. org.apache.maven.plugins maven-javadoc-plugin +3.0.0-M1 en
svn commit: r1803691 - in /maven/shared/branches/maven-artifact-transfer-MSHARED-627/src/main/java/org/apache/maven/shared: dependencies/resolve/ project/deploy/ project/install/internal/
Author: khmarbaise Date: Tue Aug 1 19:36:26 2017 New Revision: 1803691 URL: http://svn.apache.org/viewvc?rev=1803691=rev Log: - Enhanced javadoc. - Removed duplicated copyright header. Modified: maven/shared/branches/maven-artifact-transfer-MSHARED-627/src/main/java/org/apache/maven/shared/dependencies/resolve/DependencyResult.java maven/shared/branches/maven-artifact-transfer-MSHARED-627/src/main/java/org/apache/maven/shared/project/deploy/ProjectDeployer.java maven/shared/branches/maven-artifact-transfer-MSHARED-627/src/main/java/org/apache/maven/shared/project/install/internal/DefaultProjectInstaller.java Modified: maven/shared/branches/maven-artifact-transfer-MSHARED-627/src/main/java/org/apache/maven/shared/dependencies/resolve/DependencyResult.java URL: http://svn.apache.org/viewvc/maven/shared/branches/maven-artifact-transfer-MSHARED-627/src/main/java/org/apache/maven/shared/dependencies/resolve/DependencyResult.java?rev=1803691=1803690=1803691=diff == --- maven/shared/branches/maven-artifact-transfer-MSHARED-627/src/main/java/org/apache/maven/shared/dependencies/resolve/DependencyResult.java (original) +++ maven/shared/branches/maven-artifact-transfer-MSHARED-627/src/main/java/org/apache/maven/shared/dependencies/resolve/DependencyResult.java Tue Aug 1 19:36:26 2017 @@ -31,7 +31,7 @@ public interface DependencyResult /** * Gets the exceptions that occurred while building the dependency graph. * - * @return + * @return The list of exceptions {@link Exception}. */ List getCollectorExceptions(); } Modified: maven/shared/branches/maven-artifact-transfer-MSHARED-627/src/main/java/org/apache/maven/shared/project/deploy/ProjectDeployer.java URL: http://svn.apache.org/viewvc/maven/shared/branches/maven-artifact-transfer-MSHARED-627/src/main/java/org/apache/maven/shared/project/deploy/ProjectDeployer.java?rev=1803691=1803690=1803691=diff == --- maven/shared/branches/maven-artifact-transfer-MSHARED-627/src/main/java/org/apache/maven/shared/project/deploy/ProjectDeployer.java (original) +++ maven/shared/branches/maven-artifact-transfer-MSHARED-627/src/main/java/org/apache/maven/shared/project/deploy/ProjectDeployer.java Tue Aug 1 19:36:26 2017 @@ -19,31 +19,12 @@ package org.apache.maven.shared.project. * under the License. */ -import java.io.IOException; - -/* - * 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.maven.artifact.repository.ArtifactRepository; import org.apache.maven.project.ProjectBuildingRequest; import org.apache.maven.shared.project.NoFileAssignedException; +import java.io.IOException; + /** * This defines the interface to deploy a single Maven Project. * @@ -56,9 +37,9 @@ public interface ProjectDeployer * appropriate remote repository. * * - * @Parameter( defaultValue = "${session}", required=true, readonly = true) + * Parameter( defaultValue = "${session}", required=true, readonly = true) * MavenSession session; - * @Parameter( defaultValue = "${project}", required=true, readonly = true) + * Parameter( defaultValue = "${project}", required=true, readonly = true) * MavenProject project; * .. * Component @@ -72,6 +53,17 @@ public interface ProjectDeployer * deployer.deploy (session.getProjectBuildingRequest(), pdr, artifactRepository); * * + * To set a different local repository than the current one in the Maven session, you can inject an instance of the + * RepositoryManager and set the path to the local repository, called localRepositoryPath, + * as such: + * + * + * Component + * private RepositoryManager repositoryManager; + * + * buildingRequest = repositoryManager.setLocalRepositoryBasedir( buildingRequest, localRepositoryPath ); + * + * * @param buildingRequest {@link ProjectBuildingRequest} * @param request {@link ProjectDeployerRequest} * @param artifactRepository {@link ArtifactRepository} @@ -79,7 +71,7 @@
maven-surefire git commit: [SUREFIRE-1400] Windows surefire boot directory should appear in system default temporary-directory [Forced Update!]
Repository: maven-surefire Updated Branches: refs/heads/SUREFIRE-1400 1e4bdbf03 -> e799e4bc4 (forced update) [SUREFIRE-1400] Windows surefire boot directory should appear in system default temporary-directory Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/e799e4bc Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/e799e4bc Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/e799e4bc Branch: refs/heads/SUREFIRE-1400 Commit: e799e4bc45127ceacd3bfba5e28ec276de09a342 Parents: 26527d1 Author: Tibor17Authored: Tue Aug 1 09:37:48 2017 +0200 Committer: Tibor17 Committed: Tue Aug 1 11:37:05 2017 +0200 -- .../plugin/surefire/AbstractSurefireMojo.java | 92 ++- .../surefire/booterclient/ForkStarter.java | 1 + .../surefire/AbstractSurefireMojoTest.java | 111 +++ .../apache/maven/surefire/JUnit4SuiteTest.java | 4 +- .../maven/surefire/util/ReflectionUtils.java| 29 - .../surefire/util/ReflectionUtilsTest.java | 6 +- surefire-integration-tests/pom.xml | 2 + .../maven/surefire/its/LongWindowsPathIT.java | 55 + .../surefire/its/fixture/HelperAssertions.java | 13 +-- .../test/resources/long-windows-path/pom.xml| 57 ++ .../test/java/longwindowspath/BasicTest.java| 32 ++ .../java/jiras/surefre855/bundle/FooIT.java | 31 +- .../test/java/jiras/surefire855/jar/FooIT.java | 33 +- .../test/java/jiras/surefire855/war/FooIT.java | 31 +- 14 files changed, 395 insertions(+), 102 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e799e4bc/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 b3df567..a661d40 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 @@ -76,12 +76,14 @@ import org.apache.maven.surefire.testset.TestRequest; import org.apache.maven.surefire.testset.TestSetFailedException; import org.apache.maven.surefire.util.DefaultScanResult; import org.apache.maven.surefire.util.RunOrder; +import org.apache.maven.surefire.util.SurefireReflectionException; import org.apache.maven.toolchain.Toolchain; import org.apache.maven.toolchain.ToolchainManager; import javax.annotation.Nonnull; import java.io.File; import java.io.IOException; +import java.lang.reflect.Array; import java.lang.reflect.Method; import java.util.ArrayList; import java.util.Arrays; @@ -98,12 +100,18 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import static java.lang.Thread.currentThread; +import static org.apache.commons.lang3.JavaVersion.JAVA_1_7; +import static org.apache.commons.lang3.SystemUtils.IS_OS_WINDOWS; +import static org.apache.commons.lang3.SystemUtils.isJavaVersionAtLeast; 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; +import static org.apache.maven.surefire.util.ReflectionUtils.invokeGetter; +import static org.apache.maven.surefire.util.ReflectionUtils.invokeStaticMethod; +import static org.apache.maven.surefire.util.ReflectionUtils.tryLoadClass; /** * Abstract base class for running tests using Surefire. @@ -117,6 +125,8 @@ public abstract class AbstractSurefireMojo { private static final Platform PLATFORM = new Platform(); +private static final File SYSTEM_TMP_DIR = new File( System.getProperty( "java.io.tmpdir" ) ); + private final ProviderDetector providerDetector = new ProviderDetector(); /** @@ -342,7 +352,12 @@ public abstract class AbstractSurefireMojo private String forkMode; /** - * Relative path to project.build.directory containing internal Surefire temporary files. + * Relative path to temporary-surefire-boot directory containing internal Surefire temporary files. + * + * The temporary-surefire-boot directory is project.build.directory on most platforms or + * system default temporary-directory specified by
maven-surefire git commit: [SUREFIRE-1400] Windows surefire boot directory should appear in system default temporary-directory
Repository: maven-surefire Updated Branches: refs/heads/SUREFIRE-1400 [created] 1e4bdbf03 [SUREFIRE-1400] Windows surefire boot directory should appear in system default temporary-directory Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/1e4bdbf0 Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/1e4bdbf0 Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/1e4bdbf0 Branch: refs/heads/SUREFIRE-1400 Commit: 1e4bdbf03a2f697b435de6f179eda4e4b617d15e Parents: 26527d1 Author: Tibor17Authored: Tue Aug 1 09:37:48 2017 +0200 Committer: Tibor17 Committed: Tue Aug 1 09:37:48 2017 +0200 -- .../plugin/surefire/AbstractSurefireMojo.java | 92 ++- .../surefire/booterclient/ForkStarter.java | 1 + .../surefire/AbstractSurefireMojoTest.java | 111 +++ .../apache/maven/surefire/JUnit4SuiteTest.java | 4 +- .../maven/surefire/util/ReflectionUtils.java| 29 - .../surefire/util/ReflectionUtilsTest.java | 6 +- surefire-integration-tests/pom.xml | 2 + .../maven/surefire/its/LongWindowsPathIT.java | 55 + .../surefire/its/fixture/HelperAssertions.java | 13 +-- .../test/resources/long-windows-path/pom.xml| 57 ++ .../test/java/longwindowspath/BasicTest.java| 32 ++ 11 files changed, 382 insertions(+), 20 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/1e4bdbf0/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 b3df567..a661d40 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 @@ -76,12 +76,14 @@ import org.apache.maven.surefire.testset.TestRequest; import org.apache.maven.surefire.testset.TestSetFailedException; import org.apache.maven.surefire.util.DefaultScanResult; import org.apache.maven.surefire.util.RunOrder; +import org.apache.maven.surefire.util.SurefireReflectionException; import org.apache.maven.toolchain.Toolchain; import org.apache.maven.toolchain.ToolchainManager; import javax.annotation.Nonnull; import java.io.File; import java.io.IOException; +import java.lang.reflect.Array; import java.lang.reflect.Method; import java.util.ArrayList; import java.util.Arrays; @@ -98,12 +100,18 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import static java.lang.Thread.currentThread; +import static org.apache.commons.lang3.JavaVersion.JAVA_1_7; +import static org.apache.commons.lang3.SystemUtils.IS_OS_WINDOWS; +import static org.apache.commons.lang3.SystemUtils.isJavaVersionAtLeast; 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; +import static org.apache.maven.surefire.util.ReflectionUtils.invokeGetter; +import static org.apache.maven.surefire.util.ReflectionUtils.invokeStaticMethod; +import static org.apache.maven.surefire.util.ReflectionUtils.tryLoadClass; /** * Abstract base class for running tests using Surefire. @@ -117,6 +125,8 @@ public abstract class AbstractSurefireMojo { private static final Platform PLATFORM = new Platform(); +private static final File SYSTEM_TMP_DIR = new File( System.getProperty( "java.io.tmpdir" ) ); + private final ProviderDetector providerDetector = new ProviderDetector(); /** @@ -342,7 +352,12 @@ public abstract class AbstractSurefireMojo private String forkMode; /** - * Relative path to project.build.directory containing internal Surefire temporary files. + * Relative path to temporary-surefire-boot directory containing internal Surefire temporary files. + * + * The temporary-surefire-boot directory is project.build.directory on most platforms or + * system default temporary-directory specified by the system property {@code java.io.tmpdir} + * on Windows (see https://issues.apache.org/jira/browse/SUREFIRE-1400;>SUREFIRE-1400). + * * It is deleted after the test set has completed.