svn commit: r1767164 - in /maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/repository: ./ internal/
Author: gboue
Date: Sun Oct 30 15:00:30 2016
New Revision: 1767164
URL: http://svn.apache.org/viewvc?rev=1767164&view=rev
Log:
[MSHARED-596] Support for getting local metadata for RepositoryManager
Adding method "getPathForLocalMetadata" in RepositoryManager delegating to
Sonatype or Eclipse Aether depending on the Maven version.
Modified:
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/repository/RepositoryManager.java
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/repository/internal/DefaultRepositoryManager.java
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/repository/internal/Maven30RepositoryManager.java
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/repository/internal/Maven31RepositoryManager.java
Modified:
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/repository/RepositoryManager.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/repository/RepositoryManager.java?rev=1767164&r1=1767163&r2=1767164&view=diff
==
---
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/repository/RepositoryManager.java
(original)
+++
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/repository/RepositoryManager.java
Sun Oct 30 15:00:30 2016
@@ -22,6 +22,7 @@ package org.apache.maven.shared.reposito
import java.io.File;
import org.apache.maven.artifact.Artifact;
+import org.apache.maven.artifact.metadata.ArtifactMetadata;
import org.apache.maven.project.ProjectBuildingRequest;
import org.apache.maven.shared.artifact.ArtifactCoordinate;
@@ -44,6 +45,13 @@ public interface RepositoryManager
* @return the path for the local artifact.
*/
String getPathForLocalArtifact( ProjectBuildingRequest buildingRequest,
ArtifactCoordinate coordinate );
+
+/**
+ * @param buildingRequest {@link ProjectBuildingRequest}
+ * @param metadata {@link ArtifactMetadata}
+ * @return the path of the local metadata.
+ */
+String getPathForLocalMetadata( ProjectBuildingRequest buildingRequest,
ArtifactMetadata metadata );
/**
* Create a new {@code ProjectBuildingRequest} with an adjusted repository
session.
Modified:
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/repository/internal/DefaultRepositoryManager.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/repository/internal/DefaultRepositoryManager.java?rev=1767164&r1=1767163&r2=1767164&view=diff
==
---
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/repository/internal/DefaultRepositoryManager.java
(original)
+++
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/repository/internal/DefaultRepositoryManager.java
Sun Oct 30 15:00:30 2016
@@ -22,8 +22,11 @@ package org.apache.maven.shared.reposito
import java.io.File;
import org.apache.maven.artifact.Artifact;
+import org.apache.maven.artifact.metadata.ArtifactMetadata;
import org.apache.maven.project.ProjectBuildingRequest;
+import org.apache.maven.project.artifact.ProjectArtifactMetadata;
import org.apache.maven.shared.artifact.ArtifactCoordinate;
+import org.apache.maven.shared.artifact.DefaultArtifactCoordinate;
import org.apache.maven.shared.repository.RepositoryManager;
import org.codehaus.plexus.PlexusConstants;
import org.codehaus.plexus.PlexusContainer;
@@ -72,6 +75,34 @@ public class DefaultRepositoryManager
}
catch ( ComponentLookupException e )
{
+throw new IllegalStateException( e.getMessage(), e );
+}
+}
+
+@Override
+public String getPathForLocalMetadata( ProjectBuildingRequest
buildingRequest, ArtifactMetadata metadata )
+{
+if ( metadata instanceof ProjectArtifactMetadata )
+{
+DefaultArtifactCoordinate pomCoordinate = new
DefaultArtifactCoordinate();
+pomCoordinate.setGroupId( metadata.getGroupId() );
+pomCoordinate.setArtifactId( metadata.getArtifactId() );
+pomCoordinate.setVersion( metadata.getBaseVersion() );
+pomCoordinate.setExtension( "pom" );
+return getPathForLocalArtifact( buildingRequest, pomCoordinate );
+}
+
+try
+{
+
+String hint = isMaven31() ? "maven31" : "maven3";
+
+RepositoryManager effectiveRepositoryManager = container.lookup(
RepositoryManager.class, hint );
+
+return
svn commit: r1767170 - in /maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/project/install: ProjectInstaller.java internal/DefaultProjectInstaller.java
Author: gboue
Date: Sun Oct 30 16:34:11 2016
New Revision: 1767170
URL: http://svn.apache.org/viewvc?rev=1767170&view=rev
Log:
[MSHARED-598] Simplify ProjectInstaller by not requiring an ArtifactRepository
Part 1 - Making it so that the "install" interface doesn't take an
ArtifactRepository as parameter, and has a single point of entry with regard to
the path to the local repository to install to.
Modified:
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/project/install/ProjectInstaller.java
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/project/install/internal/DefaultProjectInstaller.java
Modified:
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/project/install/ProjectInstaller.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/project/install/ProjectInstaller.java?rev=1767170&r1=1767169&r2=1767170&view=diff
==
---
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/project/install/ProjectInstaller.java
(original)
+++
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/project/install/ProjectInstaller.java
Sun Oct 30 16:34:11 2016
@@ -38,13 +38,13 @@ public interface ProjectInstaller
* the appropriate repository.
*
*
- * @Parameter( defaultValue = "${session}", required=true, readonly =
true)
- * MavenSession session;
- * @Parameter( defaultValue = "${project}", required=true, readonly =
true)
- * MavenProject project;
+ * @Parameter( defaultValue = "${session}", required=true, readonly =
true)
+ * private MavenSession session;
+ * @Parameter( defaultValue = "${project}", required=true, readonly =
true)
+ * private MavenProject project;
* ..
* @Component
- * ProjectInstaller installer;
+ * private ProjectInstaller installer;
*
*ProjectInstallerRequest pir =
* new ProjectInstallerRequest()
@@ -52,19 +52,32 @@ public interface ProjectInstaller
* .setCreateChecksum( false )
* .setUpdateReleaseInfo( false );
*
- * installer.install (session.getProjectBuildingRequest(), pir,
artifactRepository);
+ * installer.install( session.getProjectBuildingRequest(), pir );
*
*
+ * 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 projectBuildingRequest {@link ProjectBuildingRequest}
* @param projectInstallerRequest {@link ProjectInstallerRequest}
- * @param artifactRepository {@link ArtifactRepository}
* @throws IOException In case of problems related to checksums.
* @throws ArtifactInstallerException In case of problems to install
artifacts.
* @throws NoFileAssignedException If no file has been assigned to the
project.
*/
+void install( ProjectBuildingRequest projectBuildingRequest,
ProjectInstallerRequest projectInstallerRequest )
+throws IOException, ArtifactInstallerException,
NoFileAssignedException;
+
+// to be removed
void install( ProjectBuildingRequest projectBuildingRequest,
ProjectInstallerRequest projectInstallerRequest,
- ArtifactRepository artifactRepository )
+ ArtifactRepository artifactRepository )
throws IOException, ArtifactInstallerException,
NoFileAssignedException;
}
Modified:
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/project/install/internal/DefaultProjectInstaller.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/project/install/internal/DefaultProjectInstaller.java?rev=1767170&r1=1767169&r2=1767170&view=diff
==
---
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/project/install/internal/DefaultProjectInstaller.java
(original)
+++
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/project/install/internal/DefaultProjectInstaller.java
Sun Oct 30 16:34:11 2016
@@ -65,11 +65,17 @@ public class DefaultProjectInstaller
private final DualDigester digester = new DualDigester();
+public voi
svn commit: r1767174 - in /maven/plugins/trunk/maven-install-plugin: ./ src/it/local-repo-override-with-checksum-generatePom/ src/it/local-repo-override-with-checksum/ src/main/java/org/apache/maven/p
Author: gboue Date: Sun Oct 30 18:07:25 2016 New Revision: 1767174 URL: http://svn.apache.org/viewvc?rev=1767174&view=rev Log: - Using latest Maven Artifact Transfer (re-versioned to 0.9.0-SNAPSHOT). - Adding ITs for the manual installation of files with POM and generating checksums in a overridden local repository Added: maven/plugins/trunk/maven-install-plugin/src/it/local-repo-override-with-checksum-generatePom/ maven/plugins/trunk/maven-install-plugin/src/it/local-repo-override-with-checksum-generatePom/invoker.properties (with props) maven/plugins/trunk/maven-install-plugin/src/it/local-repo-override-with-checksum-generatePom/pom.xml (with props) maven/plugins/trunk/maven-install-plugin/src/it/local-repo-override-with-checksum-generatePom/setup.bsh (with props) maven/plugins/trunk/maven-install-plugin/src/it/local-repo-override-with-checksum-generatePom/test.jar (with props) maven/plugins/trunk/maven-install-plugin/src/it/local-repo-override-with-checksum-generatePom/test.properties (with props) maven/plugins/trunk/maven-install-plugin/src/it/local-repo-override-with-checksum-generatePom/verify.bsh (with props) Modified: maven/plugins/trunk/maven-install-plugin/pom.xml maven/plugins/trunk/maven-install-plugin/src/it/local-repo-override-with-checksum/verify.bsh maven/plugins/trunk/maven-install-plugin/src/main/java/org/apache/maven/plugin/install/AbstractInstallMojo.java maven/plugins/trunk/maven-install-plugin/src/main/java/org/apache/maven/plugin/install/InstallFileMojo.java maven/plugins/trunk/maven-install-plugin/src/main/java/org/apache/maven/plugin/install/InstallMojo.java maven/plugins/trunk/maven-install-plugin/src/test/java/org/apache/maven/plugin/install/InstallMojoTest.java maven/plugins/trunk/maven-install-plugin/src/test/resources/unit/basic-install-checksum/plugin-config.xml maven/plugins/trunk/maven-install-plugin/src/test/resources/unit/basic-install-test-packaging-pom/plugin-config.xml maven/plugins/trunk/maven-install-plugin/src/test/resources/unit/basic-install-test-with-attached-artifacts/plugin-config.xml maven/plugins/trunk/maven-install-plugin/src/test/resources/unit/basic-install-test/plugin-config.xml maven/plugins/trunk/maven-install-plugin/src/test/resources/unit/configured-install-test/plugin-config.xml maven/plugins/trunk/maven-install-plugin/src/test/resources/unit/install-file-basic-test/plugin-config.xml maven/plugins/trunk/maven-install-plugin/src/test/resources/unit/install-file-test-generatePom/plugin-config.xml maven/plugins/trunk/maven-install-plugin/src/test/resources/unit/install-file-with-checksum/plugin-config.xml maven/plugins/trunk/maven-install-plugin/src/test/resources/unit/install-file-with-classifier/plugin-config.xml maven/plugins/trunk/maven-install-plugin/src/test/resources/unit/install-file-with-pom-as-packaging/plugin-config.xml maven/plugins/trunk/maven-install-plugin/src/test/resources/unit/install-file-with-pomFile-test/plugin-config.xml Modified: maven/plugins/trunk/maven-install-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-install-plugin/pom.xml?rev=1767174&r1=1767173&r2=1767174&view=diff == --- maven/plugins/trunk/maven-install-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-install-plugin/pom.xml Sun Oct 30 18:07:25 2016 @@ -83,7 +83,7 @@ org.apache.maven.shared maven-artifact-transfer - 3.0.0-SNAPSHOT + 0.9.0-SNAPSHOT Added: maven/plugins/trunk/maven-install-plugin/src/it/local-repo-override-with-checksum-generatePom/invoker.properties URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-install-plugin/src/it/local-repo-override-with-checksum-generatePom/invoker.properties?rev=1767174&view=auto == --- maven/plugins/trunk/maven-install-plugin/src/it/local-repo-override-with-checksum-generatePom/invoker.properties (added) +++ maven/plugins/trunk/maven-install-plugin/src/it/local-repo-override-with-checksum-generatePom/invoker.properties Sun Oct 30 18:07:25 2016 @@ -0,0 +1,18 @@ +# 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 COND
svn commit: r1767178 - in /maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/project/install: ProjectInstaller.java internal/DefaultProjectInstaller.java
Author: gboue
Date: Sun Oct 30 19:25:53 2016
New Revision: 1767178
URL: http://svn.apache.org/viewvc?rev=1767178&view=rev
Log:
[MSHARED-598] Simplify ProjectInstaller by not requiring an ArtifactRepository
Part 2 - Removing the "install" overload taking the ArtifactRepository
Modified:
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/project/install/ProjectInstaller.java
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/project/install/internal/DefaultProjectInstaller.java
Modified:
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/project/install/ProjectInstaller.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/project/install/ProjectInstaller.java?rev=1767178&r1=1767177&r2=1767178&view=diff
==
---
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/project/install/ProjectInstaller.java
(original)
+++
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/project/install/ProjectInstaller.java
Sun Oct 30 19:25:53 2016
@@ -21,7 +21,6 @@ package org.apache.maven.shared.project.
import java.io.IOException;
-import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.project.ProjectBuildingRequest;
import org.apache.maven.shared.artifact.install.ArtifactInstallerException;
import org.apache.maven.shared.project.NoFileAssignedException;
@@ -75,9 +74,4 @@ public interface ProjectInstaller
void install( ProjectBuildingRequest projectBuildingRequest,
ProjectInstallerRequest projectInstallerRequest )
throws IOException, ArtifactInstallerException,
NoFileAssignedException;
-// to be removed
-void install( ProjectBuildingRequest projectBuildingRequest,
ProjectInstallerRequest projectInstallerRequest,
- ArtifactRepository artifactRepository )
-throws IOException, ArtifactInstallerException,
NoFileAssignedException;
-
}
Modified:
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/project/install/internal/DefaultProjectInstaller.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/project/install/internal/DefaultProjectInstaller.java?rev=1767178&r1=1767177&r2=1767178&view=diff
==
---
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/project/install/internal/DefaultProjectInstaller.java
(original)
+++
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/project/install/internal/DefaultProjectInstaller.java
Sun Oct 30 19:25:53 2016
@@ -28,7 +28,6 @@ import java.util.List;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.metadata.ArtifactMetadata;
-import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.ProjectBuildingRequest;
import org.apache.maven.project.artifact.ProjectArtifact;
@@ -65,16 +64,10 @@ public class DefaultProjectInstaller
private final DualDigester digester = new DualDigester();
-public void install( ProjectBuildingRequest buildingRequest,
ProjectInstallerRequest request,
- ArtifactRepository artifactRepository )
-throws IOException, ArtifactInstallerException, NoFileAssignedException
-{
-install( buildingRequest, request );
-}
-
/**
* {@inheritDoc}
*/
+@Override
public void install( ProjectBuildingRequest buildingRequest,
ProjectInstallerRequest request )
throws IOException, ArtifactInstallerException, NoFileAssignedException
{
svn commit: r1767593 - in /maven/plugins/trunk/maven-help-plugin/src: it/describe-cmd-with-goal-report/ main/java/org/apache/maven/plugins/help/
Author: gboue
Date: Wed Nov 2 00:43:39 2016
New Revision: 1767593
URL: http://svn.apache.org/viewvc?rev=1767593&view=rev
Log:
[MPH-116] Printout the information if a goal is a report goal or not
Adding the information in the describe goal: the plugin and all of its
dependencies are resolved to determine whether the Java class of the goal
implements MavenReport.
Added:
maven/plugins/trunk/maven-help-plugin/src/it/describe-cmd-with-goal-report/
maven/plugins/trunk/maven-help-plugin/src/it/describe-cmd-with-goal-report/invoker.properties
(with props)
maven/plugins/trunk/maven-help-plugin/src/it/describe-cmd-with-goal-report/pom.xml
(with props)
maven/plugins/trunk/maven-help-plugin/src/it/describe-cmd-with-goal-report/verify.groovy
(with props)
Modified:
maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/DescribeMojo.java
Added:
maven/plugins/trunk/maven-help-plugin/src/it/describe-cmd-with-goal-report/invoker.properties
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-help-plugin/src/it/describe-cmd-with-goal-report/invoker.properties?rev=1767593&view=auto
==
---
maven/plugins/trunk/maven-help-plugin/src/it/describe-cmd-with-goal-report/invoker.properties
(added)
+++
maven/plugins/trunk/maven-help-plugin/src/it/describe-cmd-with-goal-report/invoker.properties
Wed Nov 2 00:43:39 2016
@@ -0,0 +1,20 @@
+# 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.
+
+invoker.goals.1 = -l changes.log
${project.groupId}:${project.artifactId}:${project.version}:describe
-Dcmd=changes:jira-report
+invoker.goals.2 = -l javadoc.log
${project.groupId}:${project.artifactId}:${project.version}:describe
-Dcmd=javadoc:javadoc
+invoker.goals.3 = -l assembly.log
${project.groupId}:${project.artifactId}:${project.version}:describe
-Dcmd=assembly:single
Propchange:
maven/plugins/trunk/maven-help-plugin/src/it/describe-cmd-with-goal-report/invoker.properties
--
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-help-plugin/src/it/describe-cmd-with-goal-report/invoker.properties
--
svn:keywords = Author Date Id Revision
Added:
maven/plugins/trunk/maven-help-plugin/src/it/describe-cmd-with-goal-report/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-help-plugin/src/it/describe-cmd-with-goal-report/pom.xml?rev=1767593&view=auto
==
---
maven/plugins/trunk/maven-help-plugin/src/it/describe-cmd-with-goal-report/pom.xml
(added)
+++
maven/plugins/trunk/maven-help-plugin/src/it/describe-cmd-with-goal-report/pom.xml
Wed Nov 2 00:43:39 2016
@@ -0,0 +1,36 @@
+
+
+
+
+
+ 4.0.0
+
+ org.apache.maven.its.help
+ test
+ 1.0
+
+ https://issues.apache.org/jira/browse/MPH-116
+ Tests that describe outputs whether the configured goal is a
report goal or not
+
+
+
+
+
+
Propchange:
maven/plugins/trunk/maven-help-plugin/src/it/describe-cmd-with-goal-report/pom.xml
--
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-help-plugin/src/it/describe-cmd-with-goal-report/pom.xml
--
svn:keywords = Author Date Id Revision
Added:
maven/plugins/trunk/maven-help-plugin/src/it/describe-cmd-with-goal-report/verify.groovy
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-help-plugin/src/it/describe-cmd-with-goal-report/verify.groovy?rev=1767593&view=auto
==
---
maven/plugins/trunk/maven-help-plugin/src/it/describe-cmd-with-goal-report/verify.groovy
(added)
+++
maven/plugins/trunk/maven-help-plugin/src/it/describe-cmd-with-goal-report/verify.groovy
Wed Nov 2 00:43:39 2016
@@ -0,0 +1,29 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor lice
svn commit: r1767762 - /maven/plugins/trunk/maven-dependency-plugin/src/site/apt/examples/purging-local-repository.apt.vm
Author: gboue
Date: Wed Nov 2 18:53:47 2016
New Revision: 1767762
URL: http://svn.apache.org/viewvc?rev=1767762&view=rev
Log:
[MDEP-386] Split purge-local-repository into manual and transitive
Keeping the documentation in sync: the manual-purge-local-repository goal was
reintegrated into the purge-local-repository goal, but the doc still mentioned
it.
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/site/apt/examples/purging-local-repository.apt.vm
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/site/apt/examples/purging-local-repository.apt.vm
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/site/apt/examples/purging-local-repository.apt.vm?rev=1767762&r1=1767761&r2=1767762&view=diff
==
---
maven/plugins/trunk/maven-dependency-plugin/src/site/apt/examples/purging-local-repository.apt.vm
(original)
+++
maven/plugins/trunk/maven-dependency-plugin/src/site/apt/examples/purging-local-repository.apt.vm
Wed Nov 2 18:53:47 2016
@@ -108,12 +108,12 @@ mvn dependency:purge-local-repository -D
* Manual purge
Specific dependencies which are not part of the current project dependency
tree
- can be purged by using the
-
{{{../manual-purge-local-repository-mojo.html}manual-purge-local-repository}}
+ can also be purged by using the
+ {{{../purge-local-repository-mojo.html}purge-local-repository}}
goal and setting the "manualIncludes" or "manualInclude" parameters. Any
manually
included purge artifacts will be removed from the local repository and will
not be re-resolved until they are needed. This can be useful for
- example to refresh the parent pom, an imported pom, or a maven plugin.
+ example to refresh the parent pom, an imported pom, or a Maven plugin.
Warning, using this goal during the normal build process can be risky
if dependencies are removed from the local repo, but are needed later in
@@ -126,7 +126,7 @@ mvn dependency:purge-local-repository -D
or during the clean process.
+---+
-mvn dependency:manual-purge-local-repository -Dinclude=org.apache:apache
+mvn dependency:purge-local-repository -DmanualInclude=org.apache:apache
+---+
svn commit: r1768086 - in /maven/plugins/trunk/maven-compiler-plugin/src: it/MCOMPILER-284/ it/MCOMPILER-284/src/ it/MCOMPILER-284/src/main/ it/MCOMPILER-284/src/main/java/ it/MCOMPILER-284/src/main/j
Author: gboue Date: Fri Nov 4 19:48:26 2016 New Revision: 1768086 URL: http://svn.apache.org/viewvc?rev=1768086&view=rev Log: [MCOMPILER-284] maven.test.skip doesn't skip test compilation The tests classes were still compiled, even when setting "skip" to true (regression introduced in 2.6.0). Adding unit tests and integration tests for this case as well. Added: maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-284/ maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-284/pom.xml (with props) maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-284/src/ maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-284/src/main/ maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-284/src/main/java/ maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-284/src/main/java/com/ maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-284/src/main/java/com/foo/ maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-284/src/main/java/com/foo/MyClass.java (with props) maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-284/src/test/ maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-284/src/test/java/ maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-284/src/test/java/com/ maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-284/src/test/java/com/foo/ maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-284/src/test/java/com/foo/MyTest.java (with props) maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-284/verify.bsh (with props) maven/plugins/trunk/maven-compiler-plugin/src/test/resources/unit/compiler-skip-main/ maven/plugins/trunk/maven-compiler-plugin/src/test/resources/unit/compiler-skip-main/plugin-config.xml (with props) maven/plugins/trunk/maven-compiler-plugin/src/test/resources/unit/compiler-skip-main/src/ maven/plugins/trunk/maven-compiler-plugin/src/test/resources/unit/compiler-skip-main/src/main/ maven/plugins/trunk/maven-compiler-plugin/src/test/resources/unit/compiler-skip-main/src/main/java/ maven/plugins/trunk/maven-compiler-plugin/src/test/resources/unit/compiler-skip-main/src/main/java/TestSkipMainCompile0.java (with props) maven/plugins/trunk/maven-compiler-plugin/src/test/resources/unit/compiler-skip-main/src/test/ maven/plugins/trunk/maven-compiler-plugin/src/test/resources/unit/compiler-skip-main/src/test/java/ maven/plugins/trunk/maven-compiler-plugin/src/test/resources/unit/compiler-skip-main/src/test/java/TestSkipMainCompile0Test.java (with props) maven/plugins/trunk/maven-compiler-plugin/src/test/resources/unit/compiler-skip-test/ maven/plugins/trunk/maven-compiler-plugin/src/test/resources/unit/compiler-skip-test/plugin-config.xml (with props) maven/plugins/trunk/maven-compiler-plugin/src/test/resources/unit/compiler-skip-test/src/ maven/plugins/trunk/maven-compiler-plugin/src/test/resources/unit/compiler-skip-test/src/main/ maven/plugins/trunk/maven-compiler-plugin/src/test/resources/unit/compiler-skip-test/src/main/java/ maven/plugins/trunk/maven-compiler-plugin/src/test/resources/unit/compiler-skip-test/src/main/java/TestSkipTestCompile0.java (with props) maven/plugins/trunk/maven-compiler-plugin/src/test/resources/unit/compiler-skip-test/src/test/ maven/plugins/trunk/maven-compiler-plugin/src/test/resources/unit/compiler-skip-test/src/test/java/ maven/plugins/trunk/maven-compiler-plugin/src/test/resources/unit/compiler-skip-test/src/test/java/TestSkipTestCompile0Test.java (with props) Modified: maven/plugins/trunk/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/compiler/TestCompilerMojo.java maven/plugins/trunk/maven-compiler-plugin/src/test/java/org/apache/maven/plugin/compiler/CompilerMojoTestCase.java Added: maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-284/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-284/pom.xml?rev=1768086&view=auto == --- maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-284/pom.xml (added) +++ maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-284/pom.xml Fri Nov 4 19:48:26 2016 @@ -0,0 +1,59 @@ + + + +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/maven-v4_0_0.xsd";> + 4.0.0 + + org.apache.maven.plugins.compiler.it + mcompiler284 + 1.0-SNAPSHOT + + https://issues.apache.org/jira/browse/MCOMPILER-284 + + +UTF-8 + + + + + junit + junit + 3.8.2 + test + + + + + + +org.apache.maven.plugins +maven-compiler-plugin +@project
svn commit: r1768231 - in /maven/plugins/trunk/maven-help-plugin/src: it/evaluate-artifact-with-expression-with-output/ main/java/org/apache/maven/plugins/help/
Author: gboue
Date: Sat Nov 5 15:49:26 2016
New Revision: 1768231
URL: http://svn.apache.org/viewvc?rev=1768231&view=rev
Log:
[MPH-119] The "artifact" parameter is not taken into account with Maven 3
Starting with Maven 3, PluginParameterExpressionEvaluator ignores the project
given as parameter in its 6-args constructor, and fetches instead the current
project from the Maven session. As such, the plugin needs to set the fake
project created through the "artifact" parameter as the session current
project, and put back the real one after construction of the evaluator.
Added:
maven/plugins/trunk/maven-help-plugin/src/it/evaluate-artifact-with-expression-with-output/
maven/plugins/trunk/maven-help-plugin/src/it/evaluate-artifact-with-expression-with-output/pom.xml
(with props)
maven/plugins/trunk/maven-help-plugin/src/it/evaluate-artifact-with-expression-with-output/test.properties
(with props)
maven/plugins/trunk/maven-help-plugin/src/it/evaluate-artifact-with-expression-with-output/verify.groovy
(with props)
Modified:
maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/EvaluateMojo.java
Added:
maven/plugins/trunk/maven-help-plugin/src/it/evaluate-artifact-with-expression-with-output/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-help-plugin/src/it/evaluate-artifact-with-expression-with-output/pom.xml?rev=1768231&view=auto
==
---
maven/plugins/trunk/maven-help-plugin/src/it/evaluate-artifact-with-expression-with-output/pom.xml
(added)
+++
maven/plugins/trunk/maven-help-plugin/src/it/evaluate-artifact-with-expression-with-output/pom.xml
Sat Nov 5 15:49:26 2016
@@ -0,0 +1,75 @@
+
+
+
+
+
+ 4.0.0
+
+ org.apache.maven.its.help
+ test
+ 1.0
+ Maven Foo Bar
+ https://issues.apache.org/jira/browse/MPH-114
+
+
+
+
+org.apache.maven.plugins
+maven-help-plugin
+@project.version@
+
+
+its
+
+ evaluate
+
+package
+
+
+
+
+org.apache.maven.plugins
+maven-enforcer-plugin
+1.4.1
+
+
+enforce-currentproject
+
+ enforce
+
+package
+
+
+
+
+ ${session.currentProject.artifactId} ==
test
+
+
+ true
+
+
+
+
+
+
+
Propchange:
maven/plugins/trunk/maven-help-plugin/src/it/evaluate-artifact-with-expression-with-output/pom.xml
--
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-help-plugin/src/it/evaluate-artifact-with-expression-with-output/pom.xml
--
svn:keywords = Author Date Id Revision
Added:
maven/plugins/trunk/maven-help-plugin/src/it/evaluate-artifact-with-expression-with-output/test.properties
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-help-plugin/src/it/evaluate-artifact-with-expression-with-output/test.properties?rev=1768231&view=auto
==
---
maven/plugins/trunk/maven-help-plugin/src/it/evaluate-artifact-with-expression-with-output/test.properties
(added)
+++
maven/plugins/trunk/maven-help-plugin/src/it/evaluate-artifact-with-expression-with-output/test.properties
Sat Nov 5 15:49:26 2016
@@ -0,0 +1,20 @@
+# 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.
+
+expression = project.name
+output = result.txt
+artifact = org.apache.maven.plugins:maven-help-plugin
Propchange:
maven/plugins/trunk/maven-help-plugin/src/it/evaluate-artifact-with-expression-with-output/test.properties
--
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-help-plugin/src/it/evaluate-
svn commit: r1768232 - /maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/EvaluateMojo.java
Author: gboue Date: Sat Nov 5 15:49:51 2016 New Revision: 1768232 URL: http://svn.apache.org/viewvc?rev=1768232&view=rev Log: [MPH-114] Goal fails with “Unable to get the POM for the artifact” Clarifying docs: the latest version of the artifact is used when no version is specified for the artifact. Modified: maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/EvaluateMojo.java Modified: maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/EvaluateMojo.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/EvaluateMojo.java?rev=1768232&r1=1768231&r2=1768232&view=diff == --- maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/EvaluateMojo.java (original) +++ maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/EvaluateMojo.java Sat Nov 5 15:49:51 2016 @@ -136,7 +136,8 @@ public class EvaluateMojo /** * An artifact for evaluating Maven expressions. * - * Note: Should respect the Maven format, i.e. groupId:artifactId[:version][:classifier]. + * Note: Should respect the Maven format, i.e. groupId:artifactId[:version][:classifier]. The + * latest version of the artifact will be used when no version is specified. */ @Parameter( property = "artifact" ) private String artifact;
svn commit: r1768250 - in /maven/plugins/trunk/maven-help-plugin/src: it/effective-pom-artifact/ main/java/org/apache/maven/plugins/help/
Author: gboue
Date: Sat Nov 5 17:09:51 2016
New Revision: 1768250
URL: http://svn.apache.org/viewvc?rev=1768250&view=rev
Log:
[MPH-106] add gav parameter to calculate effective pom for any gav, not only
reactor
Adding an "artifact" parameter to the effective-pom goal. The name is to be
consistent with the evaluate goal.
-> Refactoring the common code into AbstractHelpMojo
Added:
maven/plugins/trunk/maven-help-plugin/src/it/effective-pom-artifact/
maven/plugins/trunk/maven-help-plugin/src/it/effective-pom-artifact/invoker.properties
(with props)
maven/plugins/trunk/maven-help-plugin/src/it/effective-pom-artifact/pom.xml
(with props)
maven/plugins/trunk/maven-help-plugin/src/it/effective-pom-artifact/test.properties
(with props)
maven/plugins/trunk/maven-help-plugin/src/it/effective-pom-artifact/verify.groovy
(with props)
Modified:
maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/AbstractHelpMojo.java
maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/EffectivePomMojo.java
maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/EvaluateMojo.java
Added:
maven/plugins/trunk/maven-help-plugin/src/it/effective-pom-artifact/invoker.properties
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-help-plugin/src/it/effective-pom-artifact/invoker.properties?rev=1768250&view=auto
==
---
maven/plugins/trunk/maven-help-plugin/src/it/effective-pom-artifact/invoker.properties
(added)
+++
maven/plugins/trunk/maven-help-plugin/src/it/effective-pom-artifact/invoker.properties
Sat Nov 5 17:09:51 2016
@@ -0,0 +1,18 @@
+# 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.
+
+invoker.goals =
${project.groupId}:${project.artifactId}:${project.version}:effective-pom
Propchange:
maven/plugins/trunk/maven-help-plugin/src/it/effective-pom-artifact/invoker.properties
--
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-help-plugin/src/it/effective-pom-artifact/invoker.properties
--
svn:keywords = Author Date Id Revision
Added:
maven/plugins/trunk/maven-help-plugin/src/it/effective-pom-artifact/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-help-plugin/src/it/effective-pom-artifact/pom.xml?rev=1768250&view=auto
==
--- maven/plugins/trunk/maven-help-plugin/src/it/effective-pom-artifact/pom.xml
(added)
+++ maven/plugins/trunk/maven-help-plugin/src/it/effective-pom-artifact/pom.xml
Sat Nov 5 17:09:51 2016
@@ -0,0 +1,30 @@
+
+
+
+
+
+ 4.0.0
+
+ org.apache.maven.its.help
+ mph-106
+ 1.0-SNAPSHOT
+ https://issues.apache.org/jira/browse/MPH-106
+
+
Propchange:
maven/plugins/trunk/maven-help-plugin/src/it/effective-pom-artifact/pom.xml
--
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-help-plugin/src/it/effective-pom-artifact/pom.xml
--
svn:keywords = Author Date Id Revision
Added:
maven/plugins/trunk/maven-help-plugin/src/it/effective-pom-artifact/test.properties
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-help-plugin/src/it/effective-pom-artifact/test.properties?rev=1768250&view=auto
==
---
maven/plugins/trunk/maven-help-plugin/src/it/effective-pom-artifact/test.properties
(added)
+++
maven/plugins/trunk/maven-help-plugin/src/it/effective-pom-artifact/test.properties
Sat Nov 5 17:09:51 2016
@@ -0,0 +1,19 @@
+# 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
svn commit: r1768264 - in /maven/plugins/trunk/maven-help-plugin/src: main/java/org/apache/maven/plugins/help/ test/java/org/apache/maven/plugins/help/
Author: gboue
Date: Sat Nov 5 18:15:28 2016
New Revision: 1768264
URL: http://svn.apache.org/viewvc?rev=1768264&view=rev
Log:
[MPH-107] Mojos use inconsistent line endings throughout
Using the system line separator instead of hard-coding "\n" in the different
mojos.
Modified:
maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/ActiveProfilesMojo.java
maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/AllProfilesMojo.java
maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/DescribeMojo.java
maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/EffectivePomMojo.java
maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/EffectiveSettingsMojo.java
maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/EvaluateMojo.java
maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/ExpressionsMojo.java
maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/HelpUtil.java
maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/SystemMojo.java
maven/plugins/trunk/maven-help-plugin/src/test/java/org/apache/maven/plugins/help/DescribeMojoTest.java
maven/plugins/trunk/maven-help-plugin/src/test/java/org/apache/maven/plugins/help/EvaluateMojoTest.java
Modified:
maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/ActiveProfilesMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/ActiveProfilesMojo.java?rev=1768264&r1=1768263&r2=1768264&view=diff
==
---
maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/ActiveProfilesMojo.java
(original)
+++
maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/ActiveProfilesMojo.java
Sat Nov 5 18:15:28 2016
@@ -19,6 +19,8 @@ package org.apache.maven.plugins.help;
* under the License.
*/
+import static org.apache.maven.plugins.help.HelpUtil.LS;
+
import java.io.IOException;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
@@ -68,15 +70,15 @@ public class ActiveProfilesMojo
{
getActiveProfileStatement( project, message );
-message.append( "\n\n" );
+message.append( LS ).append( LS );
}
if ( output != null )
{
String formattedDateTime =
DateFormatUtils.ISO_DATETIME_FORMAT.format( System.currentTimeMillis() );
StringBuilder sb = new StringBuilder();
-sb.append( "Created by: " ).append( getClass().getName() ).append(
"\n" );
-sb.append( "Created on: " ).append( formattedDateTime ).append(
"\n" ).append( "\n" );
+sb.append( "Created by: " ).append( getClass().getName() ).append(
LS );
+sb.append( "Created on: " ).append( formattedDateTime ).append( LS
).append( LS );
sb.append( message.toString() );
try
@@ -138,9 +140,10 @@ public class ActiveProfilesMojo
}
-message.append( "\n" );
+message.append( LS );
-message.append( "Active Profiles for Project \'" ).append(
project.getId() ).append( "\': \n\n" );
+message.append( "Active Profiles for Project \'" ).append(
project.getId() ).append( "\':" );
+message.append( LS ).append( LS );
if ( activeProfileIds.isEmpty() )
{
@@ -148,19 +151,19 @@ public class ActiveProfilesMojo
}
else
{
-message.append( "The following profiles are active:\n" );
+message.append( "The following profiles are active:" ).append( LS
);
for ( Map.Entry> entry :
activeProfileIds.entrySet() )
{
for ( String profileId : entry.getValue() )
{
-message.append( "\n - " ).append( profileId );
+message.append( LS ).append( " - " ).append( profileId );
message.append( " (source: " ).append( entry.getKey()
).append( ")" );
}
}
}
-message.append( "\n" );
+message.append( LS );
}
@SuppressWarnings( "unchecked" )
Modified:
maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/AllProfilesMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/All
svn commit: r1769304 - in /maven/release/trunk/maven-release-plugin: ./ src/it/projects/prepare/MRELEASE-966/ src/main/java/org/apache/maven/plugins/release/
Author: gboue
Date: Fri Nov 11 15:32:18 2016
New Revision: 1769304
URL: http://svn.apache.org/viewvc?rev=1769304&view=rev
Log:
[MRELEASE-966] release plugin does not respect "mvn -f"
The prepare and perform goals execute goals against the given pomFileName. This
should default to the name of the POM file of the project being built (it can
be something else than pom.xml when running Maven with the -f option).
Added:
maven/release/trunk/maven-release-plugin/src/it/projects/prepare/MRELEASE-966/
maven/release/trunk/maven-release-plugin/src/it/projects/prepare/MRELEASE-966/invoker.properties
(with props)
maven/release/trunk/maven-release-plugin/src/it/projects/prepare/MRELEASE-966/my-pom.xml
(with props)
maven/release/trunk/maven-release-plugin/src/it/projects/prepare/MRELEASE-966/pom.xml
(with props)
maven/release/trunk/maven-release-plugin/src/it/projects/prepare/MRELEASE-966/verify.groovy
(with props)
Modified:
maven/release/trunk/maven-release-plugin/pom.xml
maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/AbstractReleaseMojo.java
Modified: maven/release/trunk/maven-release-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-plugin/pom.xml?rev=1769304&r1=1769303&r2=1769304&view=diff
==
--- maven/release/trunk/maven-release-plugin/pom.xml (original)
+++ maven/release/trunk/maven-release-plugin/pom.xml Fri Nov 11 15:32:18 2016
@@ -220,6 +220,9 @@
projects/prepare/*/*pom.xml
projects/prepare/flat-multi-module/parent-project/pom.xml
+
+
projects/prepare/MRELEASE-966/pom.xml
+
clean
${project.groupId}:${project.artifactId}:${project.version}:clean
Added:
maven/release/trunk/maven-release-plugin/src/it/projects/prepare/MRELEASE-966/invoker.properties
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-plugin/src/it/projects/prepare/MRELEASE-966/invoker.properties?rev=1769304&view=auto
==
---
maven/release/trunk/maven-release-plugin/src/it/projects/prepare/MRELEASE-966/invoker.properties
(added)
+++
maven/release/trunk/maven-release-plugin/src/it/projects/prepare/MRELEASE-966/invoker.properties
Fri Nov 11 15:32:18 2016
@@ -0,0 +1,18 @@
+# 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.
+
+invoker.project = my-pom.xml
\ No newline at end of file
Propchange:
maven/release/trunk/maven-release-plugin/src/it/projects/prepare/MRELEASE-966/invoker.properties
--
svn:eol-style = native
Propchange:
maven/release/trunk/maven-release-plugin/src/it/projects/prepare/MRELEASE-966/invoker.properties
--
svn:keywords = Author Date Id Revision
Added:
maven/release/trunk/maven-release-plugin/src/it/projects/prepare/MRELEASE-966/my-pom.xml
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-plugin/src/it/projects/prepare/MRELEASE-966/my-pom.xml?rev=1769304&view=auto
==
---
maven/release/trunk/maven-release-plugin/src/it/projects/prepare/MRELEASE-966/my-pom.xml
(added)
+++
maven/release/trunk/maven-release-plugin/src/it/projects/prepare/MRELEASE-966/my-pom.xml
Fri Nov 11 15:32:18 2016
@@ -0,0 +1,48 @@
+
+
+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/maven-v4_0_0.xsd";>
+ 4.0.0
+
+ org.apache.maven.plugin.release.its
+ mrelease-966-my-pom
+ 1.0-SNAPSHOT
+
+
+scm:dummy|nul
+scm:dummy|nul
+
+
+
+
+
+org.apache.maven.plugins
+maven-release-plugin
+@project.version@
+
+
+o
svn commit: r1769319 [3/3] - in /maven/plugins/trunk/maven-help-plugin: ./ src/it/active-profiles/ src/it/active-profiles_multimodule/ src/it/active-profiles_multimodule/module/ src/it/all-profiles/ s
Added: maven/plugins/trunk/maven-help-plugin/src/test/resources/unit/all-profiles/plugin-config.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-help-plugin/src/test/resources/unit/all-profiles/plugin-config.xml?rev=1769319&view=auto == --- maven/plugins/trunk/maven-help-plugin/src/test/resources/unit/all-profiles/plugin-config.xml (added) +++ maven/plugins/trunk/maven-help-plugin/src/test/resources/unit/all-profiles/plugin-config.xml Fri Nov 11 17:13:13 2016 @@ -0,0 +1,37 @@ + + +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/maven-v4_0_0.xsd";> + 4.0.0 + org.apache.maven.its.help + active-profiles + jar + 1.0-SNAPSHOT + http://maven.apache.org + + + +org.apache.maven.plugins +maven-help-plugin + + + + + + Propchange: maven/plugins/trunk/maven-help-plugin/src/test/resources/unit/all-profiles/plugin-config.xml -- svn:eol-style = native Propchange: maven/plugins/trunk/maven-help-plugin/src/test/resources/unit/all-profiles/plugin-config.xml -- svn:keywords = Author Date Id Revision
svn commit: r1769319 [1/3] - in /maven/plugins/trunk/maven-help-plugin: ./ src/it/active-profiles/ src/it/active-profiles_multimodule/ src/it/active-profiles_multimodule/module/ src/it/all-profiles/ s
Author: gboue Date: Fri Nov 11 17:13:13 2016 New Revision: 1769319 URL: http://svn.apache.org/viewvc?rev=1769319&view=rev Log: [MPH-120] Migrate plugin to Maven 3.0 Bump Maven requirement to 3.0 and version of the plugin to 3.0.0-SNAPSHOT. Replacing deprecated APIs like ArtifactFactory with the use of the shared components and removing Maven 2 specific code. The "expressions" goal that was Maven 2 specific is removed (it is now covered in the Javadoc of PluginParameterExpressionEvaluator). Added: maven/plugins/trunk/maven-help-plugin/src/it/active-profiles/verify.groovy (with props) maven/plugins/trunk/maven-help-plugin/src/it/describe-cmd-invalid/ maven/plugins/trunk/maven-help-plugin/src/it/describe-cmd-invalid/invoker.properties (with props) maven/plugins/trunk/maven-help-plugin/src/it/describe-cmd-invalid/pom.xml (with props) maven/plugins/trunk/maven-help-plugin/src/it/describe-cmd-invalid/test.properties (with props) maven/plugins/trunk/maven-help-plugin/src/it/describe-cmd-with-goal-invalid/ maven/plugins/trunk/maven-help-plugin/src/it/describe-cmd-with-goal-invalid/invoker.properties (with props) maven/plugins/trunk/maven-help-plugin/src/it/describe-cmd-with-goal-invalid/pom.xml (with props) maven/plugins/trunk/maven-help-plugin/src/it/describe-cmd-with-goal-invalid/test.properties (with props) maven/plugins/trunk/maven-help-plugin/src/it/describe-cmd-with-goal/verify.groovy (with props) maven/plugins/trunk/maven-help-plugin/src/it/describe-cmd/test-deploy.properties - copied, changed from r1768278, maven/plugins/trunk/maven-help-plugin/src/it/describe-cmd/test.properties maven/plugins/trunk/maven-help-plugin/src/it/describe-cmd/test-site.properties (with props) maven/plugins/trunk/maven-help-plugin/src/it/describe-cmd/verify.groovy (with props) maven/plugins/trunk/maven-help-plugin/src/it/describe-plugin-without-name/ maven/plugins/trunk/maven-help-plugin/src/it/describe-plugin-without-name/invoker.properties (with props) maven/plugins/trunk/maven-help-plugin/src/it/describe-plugin-without-name/pom.xml (with props) maven/plugins/trunk/maven-help-plugin/src/it/describe-plugin-without-name/test.properties (with props) maven/plugins/trunk/maven-help-plugin/src/it/describe-plugin-without-name/verify.groovy (with props) maven/plugins/trunk/maven-help-plugin/src/it/evaluate-settings-servers/ maven/plugins/trunk/maven-help-plugin/src/it/evaluate-settings-servers/invoker.properties (with props) maven/plugins/trunk/maven-help-plugin/src/it/evaluate-settings-servers/pom.xml (with props) maven/plugins/trunk/maven-help-plugin/src/it/evaluate-settings-servers/test.properties (with props) maven/plugins/trunk/maven-help-plugin/src/it/evaluate-settings-servers/verify.groovy (with props) maven/plugins/trunk/maven-help-plugin/src/it/evaluate/verify.groovy (with props) maven/plugins/trunk/maven-help-plugin/src/test/java/org/apache/maven/plugins/help/ActiveProfilesMojoTest.java (with props) maven/plugins/trunk/maven-help-plugin/src/test/java/org/apache/maven/plugins/help/AllProfilesMojoTest.java (with props) maven/plugins/trunk/maven-help-plugin/src/test/resources/unit/active-profiles/ maven/plugins/trunk/maven-help-plugin/src/test/resources/unit/active-profiles/plugin-config.xml (with props) maven/plugins/trunk/maven-help-plugin/src/test/resources/unit/all-profiles/ maven/plugins/trunk/maven-help-plugin/src/test/resources/unit/all-profiles/plugin-config.xml (with props) Removed: maven/plugins/trunk/maven-help-plugin/src/it/describe-cmd/test.properties maven/plugins/trunk/maven-help-plugin/src/it/expressions/ maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/ExpressionsMojo.java maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/HelpUtil.java maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/LoggerRetriever.java maven/plugins/trunk/maven-help-plugin/src/test/java/org/apache/maven/plugins/help/ExpressionsMojoTest.java maven/plugins/trunk/maven-help-plugin/src/test/java/org/apache/maven/plugins/help/HelpUtilTest.java Modified: maven/plugins/trunk/maven-help-plugin/pom.xml maven/plugins/trunk/maven-help-plugin/src/it/active-profiles_multimodule/module/pom.xml maven/plugins/trunk/maven-help-plugin/src/it/active-profiles_multimodule/verify.groovy maven/plugins/trunk/maven-help-plugin/src/it/all-profiles/pom.xml maven/plugins/trunk/maven-help-plugin/src/it/all-profiles/verify.groovy maven/plugins/trunk/maven-help-plugin/src/it/describe-cmd-with-goal/test.properties maven/plugins/trunk/maven-help-plugin/src/it/describe-cmd/invoker.properties maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/mave
svn commit: r1769319 [2/3] - in /maven/plugins/trunk/maven-help-plugin: ./ src/it/active-profiles/ src/it/active-profiles_multimodule/ src/it/active-profiles_multimodule/module/ src/it/all-profiles/ s
Modified: maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/DescribeMojo.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/DescribeMojo.java?rev=1769319&r1=1769318&r2=1769319&view=diff == --- maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/DescribeMojo.java (original) +++ maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/DescribeMojo.java Fri Nov 11 17:13:13 2016 @@ -19,8 +19,6 @@ package org.apache.maven.plugins.help; * under the License. */ -import static org.apache.maven.plugins.help.HelpUtil.LS; - import java.io.File; import java.io.IOException; import java.lang.reflect.InvocationTargetException; @@ -28,47 +26,39 @@ import java.lang.reflect.Method; import java.net.URL; import java.net.URLClassLoader; import java.util.ArrayList; -import java.util.Collections; -import java.util.Comparator; import java.util.List; +import java.util.Map; import java.util.StringTokenizer; import java.util.regex.Matcher; import java.util.regex.Pattern; import org.apache.maven.artifact.Artifact; -import org.apache.maven.artifact.factory.ArtifactFactory; -import org.apache.maven.artifact.repository.ArtifactRepository; -import org.apache.maven.artifact.resolver.ArtifactNotFoundException; -import org.apache.maven.artifact.resolver.ArtifactResolutionException; -import org.apache.maven.artifact.resolver.ArtifactResolver; -import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException; -import org.apache.maven.artifact.versioning.VersionRange; -import org.apache.maven.execution.MavenSession; -import org.apache.maven.lifecycle.DefaultLifecycleExecutor; +import org.apache.maven.lifecycle.DefaultLifecycles; import org.apache.maven.lifecycle.Lifecycle; -import org.apache.maven.lifecycle.LifecycleExecutionException; -import org.apache.maven.lifecycle.LifecycleExecutor; +import org.apache.maven.lifecycle.internal.MojoDescriptorCreator; import org.apache.maven.lifecycle.mapping.LifecycleMapping; import org.apache.maven.model.Plugin; -import org.apache.maven.plugin.InvalidPluginException; +import org.apache.maven.model.building.ModelBuildingRequest; import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugin.MojoFailureException; -import org.apache.maven.plugin.PluginManager; -import org.apache.maven.plugin.PluginManagerException; -import org.apache.maven.plugin.PluginNotFoundException; import org.apache.maven.plugin.descriptor.MojoDescriptor; import org.apache.maven.plugin.descriptor.Parameter; import org.apache.maven.plugin.descriptor.PluginDescriptor; -import org.apache.maven.plugin.version.PluginVersionNotFoundException; +import org.apache.maven.plugin.prefix.NoPluginFoundForPrefixException; +import org.apache.maven.plugin.version.DefaultPluginVersionRequest; import org.apache.maven.plugin.version.PluginVersionResolutionException; +import org.apache.maven.plugin.version.PluginVersionResolver; +import org.apache.maven.plugin.version.PluginVersionResult; import org.apache.maven.plugins.annotations.Component; import org.apache.maven.plugins.annotations.Mojo; +import org.apache.maven.project.DefaultProjectBuildingRequest; import org.apache.maven.project.MavenProject; -import org.apache.maven.project.MavenProjectBuilder; -import org.apache.maven.project.ProjectBuildingException; +import org.apache.maven.project.ProjectBuildingRequest; import org.apache.maven.reporting.MavenReport; +import org.apache.maven.reporting.exec.MavenPluginManagerHelper; +import org.apache.maven.shared.artifact.ArtifactCoordinate; +import org.apache.maven.tools.plugin.generator.GeneratorUtils; import org.apache.maven.tools.plugin.util.PluginUtils; -import org.codehaus.plexus.component.repository.exception.ComponentLookupException; import org.codehaus.plexus.util.StringUtils; /** @@ -107,36 +97,36 @@ public class DescribeMojo // -- // Mojo components // -- - + /** - * Maven Artifact Factory component. - * - * @since 2.1 + * Component used to get a plugin descriptor from a given plugin. */ @Component -private ArtifactFactory artifactFactory; +private MavenPluginManagerHelper pluginManager; /** - * Maven Artifact Resolver component. - * - * @since 2.2.1 + * Component used to get a plugin by its prefix and get mojo descriptors. */ @Component -private ArtifactResolver artifactResolver; - +private MojoDescriptorCreator mojoDescriptorCreator; + /** - * The Plugin manager instance used to resolve Plugin descriptors. + * Component used to resolve the version for a plugin. */ -@Componen
svn commit: r1769339 - in /maven/plugins/trunk/maven-deploy-plugin/src: it/MDEPLOY-169_deploy-at-end-multithread/ it/MDEPLOY-170_deploy-at-end-configperproject/ it/MDEPLOY-202_deployfile-with-multiple
Author: gboue
Date: Fri Nov 11 20:36:18 2016
New Revision: 1769339
URL: http://svn.apache.org/viewvc?rev=1769339&view=rev
Log:
[MDEPLOY-211] uniqueVersion broken (if not supported, should be removed from
doc, and warning printed)
The parameter uniqueVersion in the deploy-file goal isn't supported since Maven
3, so it is removed from the code base and from the documentation of the
plugin. A check is made to fail the build if it is still used, and the index
page mentions the removal.
Modified:
maven/plugins/trunk/maven-deploy-plugin/src/it/MDEPLOY-169_deploy-at-end-multithread/pom.xml
maven/plugins/trunk/maven-deploy-plugin/src/it/MDEPLOY-170_deploy-at-end-configperproject/pom.xml
maven/plugins/trunk/maven-deploy-plugin/src/it/MDEPLOY-202_deployfile-with-multiple-executions/pom.xml
maven/plugins/trunk/maven-deploy-plugin/src/it/MDEPLOY-213/pom.xml
maven/plugins/trunk/maven-deploy-plugin/src/it/attach-release-jar/pom.xml
maven/plugins/trunk/maven-deploy-plugin/src/it/deploy-at-end-fail/pom.xml
maven/plugins/trunk/maven-deploy-plugin/src/it/deploy-at-end-pass/pom.xml
maven/plugins/trunk/maven-deploy-plugin/src/it/offline/pom.xml
maven/plugins/trunk/maven-deploy-plugin/src/it/release-jar/pom.xml
maven/plugins/trunk/maven-deploy-plugin/src/it/release-pom/pom.xml
maven/plugins/trunk/maven-deploy-plugin/src/main/java/org/apache/maven/plugins/deploy/AbstractDeployMojo.java
maven/plugins/trunk/maven-deploy-plugin/src/main/java/org/apache/maven/plugins/deploy/DeployFileMojo.java
maven/plugins/trunk/maven-deploy-plugin/src/main/java/org/apache/maven/plugins/deploy/DeployMojo.java
maven/plugins/trunk/maven-deploy-plugin/src/site/apt/file-deployment.apt
maven/plugins/trunk/maven-deploy-plugin/src/site/apt/index.apt.vm
maven/plugins/trunk/maven-deploy-plugin/src/site/apt/usage.apt
maven/plugins/trunk/maven-deploy-plugin/src/test/java/org/apache/maven/plugins/deploy/DeployMojoTest.java
maven/plugins/trunk/maven-deploy-plugin/src/test/resources/unit/deploy-file-artifact-not-jar/plugin-config.xml
maven/plugins/trunk/maven-deploy-plugin/src/test/resources/unit/deploy-file-classifier/plugin-config.xml
maven/plugins/trunk/maven-deploy-plugin/src/test/resources/unit/deploy-file-legacy-repository-layout/plugin-config.xml
maven/plugins/trunk/maven-deploy-plugin/src/test/resources/unit/deploy-file-pom-file/plugin-config.xml
maven/plugins/trunk/maven-deploy-plugin/src/test/resources/unit/deploy-file-test/plugin-config.xml
Modified:
maven/plugins/trunk/maven-deploy-plugin/src/it/MDEPLOY-169_deploy-at-end-multithread/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-deploy-plugin/src/it/MDEPLOY-169_deploy-at-end-multithread/pom.xml?rev=1769339&r1=1769338&r2=1769339&view=diff
==
---
maven/plugins/trunk/maven-deploy-plugin/src/it/MDEPLOY-169_deploy-at-end-multithread/pom.xml
(original)
+++
maven/plugins/trunk/maven-deploy-plugin/src/it/MDEPLOY-169_deploy-at-end-multithread/pom.xml
Fri Nov 11 20:36:18 2016
@@ -39,7 +39,6 @@ under the License.
it
file:///${basedir}/target/repo
- false
Modified:
maven/plugins/trunk/maven-deploy-plugin/src/it/MDEPLOY-170_deploy-at-end-configperproject/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-deploy-plugin/src/it/MDEPLOY-170_deploy-at-end-configperproject/pom.xml?rev=1769339&r1=1769338&r2=1769339&view=diff
==
---
maven/plugins/trunk/maven-deploy-plugin/src/it/MDEPLOY-170_deploy-at-end-configperproject/pom.xml
(original)
+++
maven/plugins/trunk/maven-deploy-plugin/src/it/MDEPLOY-170_deploy-at-end-configperproject/pom.xml
Fri Nov 11 20:36:18 2016
@@ -39,7 +39,6 @@ under the License.
it
file:///${basedir}/target/repo
- false
Modified:
maven/plugins/trunk/maven-deploy-plugin/src/it/MDEPLOY-202_deployfile-with-multiple-executions/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-deploy-plugin/src/it/MDEPLOY-202_deployfile-with-multiple-executions/pom.xml?rev=1769339&r1=1769338&r2=1769339&view=diff
==
---
maven/plugins/trunk/maven-deploy-plugin/src/it/MDEPLOY-202_deployfile-with-multiple-executions/pom.xml
(original)
+++
maven/plugins/trunk/maven-deploy-plugin/src/it/MDEPLOY-202_deployfile-with-multiple-executions/pom.xml
Fri Nov 11 20:36:18 2016
@@ -38,7 +38,6 @@
it
file:///${basedir}/target/repo
- false
Modified: maven/plugins/trunk/maven-deploy-plugin/src/it/MDEPLOY-213/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-deploy-plugin/src/it/MDEPLOY-213/pom.xm
svn commit: r1769402 - in /maven/plugins/trunk/maven-help-plugin/src: it/describe-plugin-in-plugin-management/ main/java/org/apache/maven/plugins/help/ test/java/org/apache/maven/plugins/help/
Author: gboue
Date: Sat Nov 12 19:43:02 2016
New Revision: 1769402
URL: http://svn.apache.org/viewvc?rev=1769402&view=rev
Log:
[MPH-53] mvn help:describe returns the version that is specified in metadata
instead of the one in the parent pom
Set the POM to use in the plugin version requuest, so that plugin versions
declared in it are correctly used.
Added:
maven/plugins/trunk/maven-help-plugin/src/it/describe-plugin-in-plugin-management/
maven/plugins/trunk/maven-help-plugin/src/it/describe-plugin-in-plugin-management/invoker.properties
(with props)
maven/plugins/trunk/maven-help-plugin/src/it/describe-plugin-in-plugin-management/pom.xml
(with props)
maven/plugins/trunk/maven-help-plugin/src/it/describe-plugin-in-plugin-management/test.properties
(with props)
maven/plugins/trunk/maven-help-plugin/src/it/describe-plugin-in-plugin-management/verify.groovy
(with props)
Modified:
maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/DescribeMojo.java
maven/plugins/trunk/maven-help-plugin/src/test/java/org/apache/maven/plugins/help/DescribeMojoTest.java
Added:
maven/plugins/trunk/maven-help-plugin/src/it/describe-plugin-in-plugin-management/invoker.properties
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-help-plugin/src/it/describe-plugin-in-plugin-management/invoker.properties?rev=1769402&view=auto
==
---
maven/plugins/trunk/maven-help-plugin/src/it/describe-plugin-in-plugin-management/invoker.properties
(added)
+++
maven/plugins/trunk/maven-help-plugin/src/it/describe-plugin-in-plugin-management/invoker.properties
Sat Nov 12 19:43:02 2016
@@ -0,0 +1,18 @@
+# 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.
+
+invoker.goals =
${project.groupId}:${project.artifactId}:${project.version}:describe
Propchange:
maven/plugins/trunk/maven-help-plugin/src/it/describe-plugin-in-plugin-management/invoker.properties
--
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-help-plugin/src/it/describe-plugin-in-plugin-management/invoker.properties
--
svn:keywords = Author Date Id Revision
Added:
maven/plugins/trunk/maven-help-plugin/src/it/describe-plugin-in-plugin-management/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-help-plugin/src/it/describe-plugin-in-plugin-management/pom.xml?rev=1769402&view=auto
==
---
maven/plugins/trunk/maven-help-plugin/src/it/describe-plugin-in-plugin-management/pom.xml
(added)
+++
maven/plugins/trunk/maven-help-plugin/src/it/describe-plugin-in-plugin-management/pom.xml
Sat Nov 12 19:43:02 2016
@@ -0,0 +1,43 @@
+
+
+
+
+
+ 4.0.0
+
+ org.apache.maven.its.help
+ test
+ 1.0
+ https://issues.apache.org/jira/browse/MPH-53
+
+Tests that the describe goal correctly resolves the version of the plugin
to describe from the POM, if defined.
+
+
+
+
+
+
+ maven-surefire-plugin
+ 2.4.3
+
+
+
+
+
Propchange:
maven/plugins/trunk/maven-help-plugin/src/it/describe-plugin-in-plugin-management/pom.xml
--
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-help-plugin/src/it/describe-plugin-in-plugin-management/pom.xml
--
svn:keywords = Author Date Id Revision
Added:
maven/plugins/trunk/maven-help-plugin/src/it/describe-plugin-in-plugin-management/test.properties
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-help-plugin/src/it/describe-plugin-in-plugin-management/test.properties?rev=1769402&view=auto
==
---
maven/plugins/trunk/maven-help-plugin/src/it/describe-plugin-in-plugin-management/test.properties
(added)
+++
maven/plugins/trunk/maven-help-plugin/src/it/
svn commit: r1769446 - in /maven/plugins/trunk/maven-help-plugin/src: it/effective-pom-from-lifecycle/ it/effective-pom-from-lifecycle/module/ it/effective-pom-multimodule-unlink-parent/ it/effective-
Author: gboue Date: Sat Nov 12 23:16:20 2016 New Revision: 1769446 URL: http://svn.apache.org/viewvc?rev=1769446&view=rev Log: [MPH-105] Effective pom aggregation is not triggered When the plugin is invoked from the command-line, always show all effective POMs for all projects in the reactor. When it is invoked from the lifecycle, only show all effective POMs for the head project in the reactor (see commit 497785 and resolution of MPH-21); otherwise, show the effective POM for the current project only. Added: maven/plugins/trunk/maven-help-plugin/src/it/effective-pom-from-lifecycle/ maven/plugins/trunk/maven-help-plugin/src/it/effective-pom-from-lifecycle/module/ maven/plugins/trunk/maven-help-plugin/src/it/effective-pom-from-lifecycle/module/pom.xml (with props) maven/plugins/trunk/maven-help-plugin/src/it/effective-pom-from-lifecycle/pom.xml (with props) maven/plugins/trunk/maven-help-plugin/src/it/effective-pom-from-lifecycle/verify.groovy (with props) maven/plugins/trunk/maven-help-plugin/src/it/effective-pom-multimodule/ maven/plugins/trunk/maven-help-plugin/src/it/effective-pom-multimodule-unlink-parent/ maven/plugins/trunk/maven-help-plugin/src/it/effective-pom-multimodule-unlink-parent/invoker.properties (with props) maven/plugins/trunk/maven-help-plugin/src/it/effective-pom-multimodule-unlink-parent/module/ maven/plugins/trunk/maven-help-plugin/src/it/effective-pom-multimodule-unlink-parent/module/pom.xml (with props) maven/plugins/trunk/maven-help-plugin/src/it/effective-pom-multimodule-unlink-parent/pom.xml (with props) maven/plugins/trunk/maven-help-plugin/src/it/effective-pom-multimodule-unlink-parent/verify.groovy (with props) maven/plugins/trunk/maven-help-plugin/src/it/effective-pom-multimodule/invoker.properties (with props) maven/plugins/trunk/maven-help-plugin/src/it/effective-pom-multimodule/module/ maven/plugins/trunk/maven-help-plugin/src/it/effective-pom-multimodule/module/pom.xml (with props) maven/plugins/trunk/maven-help-plugin/src/it/effective-pom-multimodule/pom.xml (with props) maven/plugins/trunk/maven-help-plugin/src/it/effective-pom-multimodule/verify.groovy (with props) Modified: maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/EffectivePomMojo.java Added: maven/plugins/trunk/maven-help-plugin/src/it/effective-pom-from-lifecycle/module/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-help-plugin/src/it/effective-pom-from-lifecycle/module/pom.xml?rev=1769446&view=auto == --- maven/plugins/trunk/maven-help-plugin/src/it/effective-pom-from-lifecycle/module/pom.xml (added) +++ maven/plugins/trunk/maven-help-plugin/src/it/effective-pom-from-lifecycle/module/pom.xml Sat Nov 12 23:16:20 2016 @@ -0,0 +1,23 @@ + + + + + + 4.0.0 + +org.apache.maven.its.help +test +1.0 + + pom + module + Propchange: maven/plugins/trunk/maven-help-plugin/src/it/effective-pom-from-lifecycle/module/pom.xml -- svn:eol-style = native Propchange: maven/plugins/trunk/maven-help-plugin/src/it/effective-pom-from-lifecycle/module/pom.xml -- svn:keywords = Author Date Id Revision Added: maven/plugins/trunk/maven-help-plugin/src/it/effective-pom-from-lifecycle/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-help-plugin/src/it/effective-pom-from-lifecycle/pom.xml?rev=1769446&view=auto == --- maven/plugins/trunk/maven-help-plugin/src/it/effective-pom-from-lifecycle/pom.xml (added) +++ maven/plugins/trunk/maven-help-plugin/src/it/effective-pom-from-lifecycle/pom.xml Sat Nov 12 23:16:20 2016 @@ -0,0 +1,59 @@ + + + + + + 4.0.0 + + org.apache.maven.its.help + test + 1.0 + pom + https://issues.apache.org/jira/browse/MPH-21 + +Tests that the effective POM goal, bound to a phase of the lifecycle in a project of a multi-module build, prints +all the effective POMs in the reactor for the head project, and only prints their effective POM for the other projects. + + +module + + + + + +org.apache.maven.plugins +maven-help-plugin +@project.version@ + + +print-effective-pom +package + + effective-pom + + + result.txt + + + + + + + Propchange: maven/plugins/trunk/maven-help-plugin/src/it/effective-pom-from-lifecycle/pom.xml -- svn:eol-style = native Propchange: maven/plugins/trunk/maven
maven git commit: [MNG-6117] ${session.parallel} not correctly set
Repository: maven
Updated Branches:
refs/heads/master f381cd4f2 -> dfb4a7b7f
[MNG-6117] ${session.parallel} not correctly set
MultiThreadedBuilder must set parallel to true when it's using more than
1 thread to build: i.e. a degree of concurrency greater than 1 (-T) and
more than 1 project to build. Since each ProjectSegment works on a
cloned session instance (see
BuildListCalculator#calculateProjectBuilds), the flag must be also set
on each cloned session.
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/dfb4a7b7
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/dfb4a7b7
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/dfb4a7b7
Branch: refs/heads/master
Commit: dfb4a7b7f4225bc32385da139679e189a2aeb79a
Parents: f381cd4
Author: Guillaume Boué
Authored: Sun Nov 13 22:46:18 2016 +0100
Committer: Guillaume Boué
Committed: Sun Nov 13 22:46:18 2016 +0100
--
.../multithreaded/MultiThreadedBuilder.java | 18 ++
1 file changed, 14 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven/blob/dfb4a7b7/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/multithreaded/MultiThreadedBuilder.java
--
diff --git
a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/multithreaded/MultiThreadedBuilder.java
b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/multithreaded/MultiThreadedBuilder.java
index b24d785..14bf13b 100644
---
a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/multithreaded/MultiThreadedBuilder.java
+++
b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/multithreaded/MultiThreadedBuilder.java
@@ -44,7 +44,11 @@ import org.codehaus.plexus.component.annotations.Requirement;
import org.codehaus.plexus.logging.Logger;
/**
- * Builds the full lifecycle in weave-mode (phase by phase as opposed to
project-by-project)
+ * Builds the full lifecycle in weave-mode (phase by phase as opposed to
project-by-project).
+ *
+ * This builder uses a number of threads equal to the minimum of the degree of
concurrency (which is the thread count
+ * set with -T on the command-line) and the number of projects to
build. As such, building a single project
+ * will always result in a sequential build, regardless of the thread count.
*
* @since 3.0
* @author Kristian Rosenvold
@@ -73,9 +77,15 @@ public class MultiThreadedBuilder
List taskSegments, ReactorBuildStatus
reactorBuildStatus )
throws ExecutionException, InterruptedException
{
-ExecutorService executor =
-Executors.newFixedThreadPool( Math.min(
session.getRequest().getDegreeOfConcurrency(),
-
session.getProjects().size() ), new BuildThreadFactory() );
+int nThreads = Math.min(
session.getRequest().getDegreeOfConcurrency(), session.getProjects().size() );
+boolean parallel = nThreads >= 2;
+// Propagate the parallel flag to the root session and all of the
cloned sessions in each project segment
+session.setParallel( parallel );
+for ( ProjectSegment segment : projectBuilds )
+{
+segment.getSession().setParallel( parallel );
+}
+ExecutorService executor = Executors.newFixedThreadPool( nThreads, new
BuildThreadFactory() );
CompletionService service = new
ExecutorCompletionService<>( executor );
ConcurrencyDependencyGraph analyzer =
new ConcurrencyDependencyGraph( projectBuilds,
session.getProjectDependencyGraph() );
maven-archetype git commit: [ARCHETYPE-513] Files in excludePatterns having a default filtered extension are still included
Repository: maven-archetype
Updated Branches:
refs/heads/master 4a59126c6 -> 44e7ed632
[ARCHETYPE-513] Files in excludePatterns having a default filtered
extension are still included
If a file having a default filtered extensions was present in a manually
excluded pattern, it still ended up in the generated archetype. The fix
is to propagate the excludePattern to the creation of the archetype
files in (FilesetArchetypeCreator#createArchetypeFiles).
Project: http://git-wip-us.apache.org/repos/asf/maven-archetype/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-archetype/commit/44e7ed63
Tree: http://git-wip-us.apache.org/repos/asf/maven-archetype/tree/44e7ed63
Diff: http://git-wip-us.apache.org/repos/asf/maven-archetype/diff/44e7ed63
Branch: refs/heads/master
Commit: 44e7ed6329320ae6b009bf3415b0e615770a110e
Parents: 4a59126
Author: Guillaume Boué
Authored: Thu Nov 17 13:27:58 2016 +0100
Committer: Guillaume Boué
Committed: Thu Nov 17 13:27:58 2016 +0100
--
.../creator/FilesetArchetypeCreator.java| 18 ++--
.../archetype.properties| 1 +
.../invoker.properties | 1 +
.../pom.xml | 30 +
.../src/main/resources/file.txt | 0
.../src/main/resources/file.xml | 0
.../src/main/resources/toexclude/file.txt | 0
.../src/main/resources/toexclude/file.xml | 0
.../src/main/toexclude/file.txt | 0
.../src/main/toexclude/file.xml | 0
.../src/toexclude/file.txt | 0
.../src/toexclude/file.xml | 0
.../toexclude/file.txt | 0
.../toexclude/file.xml | 0
.../verify.bsh | 46
.../creator/DefaultArchetypeCreatorTest.java| 12 +
.../projects/exclude-patterns-2/.sonar/file.txt | 0
.../archetype.properties.sample | 9
.../exclude-patterns-2/folder/.sonar/file.txt | 0
.../projects/exclude-patterns-2/folder/file.txt | 0
.../projects/exclude-patterns-2/pom.xml.sample | 34 +++
21 files changed, 147 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven-archetype/blob/44e7ed63/archetype-common/src/main/java/org/apache/maven/archetype/creator/FilesetArchetypeCreator.java
--
diff --git
a/archetype-common/src/main/java/org/apache/maven/archetype/creator/FilesetArchetypeCreator.java
b/archetype-common/src/main/java/org/apache/maven/archetype/creator/FilesetArchetypeCreator.java
index 6af535f..22465fd 100644
---
a/archetype-common/src/main/java/org/apache/maven/archetype/creator/FilesetArchetypeCreator.java
+++
b/archetype-common/src/main/java/org/apache/maven/archetype/creator/FilesetArchetypeCreator.java
@@ -211,7 +211,7 @@ public class FilesetArchetypeCreator
archetypeDescriptor.setFileSets( filesets );
createArchetypeFiles( reverseProperties, filesets, packageName,
basedir, archetypeFilesDirectory,
- defaultEncoding );
+ defaultEncoding, excludePatterns );
getLogger().debug( "Created files for " +
archetypeDescriptor.getName() );
setParentArtifactId( reverseProperties,
configurationProperties.getProperty( Constants.ARTIFACT_ID ) );
@@ -805,6 +805,14 @@ public class FilesetArchetypeCreator
return result;
}
+private List addLists( List list, List other )
+{
+List result = new ArrayList( list.size() +
other.size() );
+result.addAll( list );
+result.addAll( other );
+return result;
+}
+
private void copyFiles( File basedir, File archetypeFilesDirectory, String
directory, List fileSetResources,
boolean packaged, String packageName )
throws IOException
@@ -832,7 +840,8 @@ public class FilesetArchetypeCreator
}
private void createArchetypeFiles( Properties reverseProperties,
List fileSets, String packageName,
- File basedir, File
archetypeFilesDirectory, String defaultEncoding )
+ File basedir, File
archetypeFilesDirectory, String defaultEncoding,
+ List excludePatterns )
throws IOException
{
getLogger().debug( "Creating Archetype/Module files from " + basedir +
" to " + archetypeFilesDirectory );
@@ -843,7 +852,8 @@ public class FilesetArchetypeCreator
scanner.setBasedir( basedir );
scanner.setIncludes( (String[]) concatenateToList(
fileSet.getIncludes(), fileSet.getDirectory() ).toArray(
svn commit: r1770187 [2/2] - in /maven/site/trunk/content/resources/xsd: assembly-2.0.0.xsd assembly-component-2.0.0.xsd
Added: maven/site/trunk/content/resources/xsd/assembly-component-2.0.0.xsd URL: http://svn.apache.org/viewvc/maven/site/trunk/content/resources/xsd/assembly-component-2.0.0.xsd?rev=1770187&view=auto == --- maven/site/trunk/content/resources/xsd/assembly-component-2.0.0.xsd (added) +++ maven/site/trunk/content/resources/xsd/assembly-component-2.0.0.xsd Thu Nov 17 13:16:25 2016 @@ -0,0 +1,1247 @@ + + + + + +http://www.w3.org/2001/XMLSchema"; elementFormDefault="qualified" xmlns="http://maven.apache.org/ASSEMBLY-COMPONENT/2.0.0"; targetNamespace="http://maven.apache.org/ASSEMBLY-COMPONENT/2.0.0";> + + + 1.0.0+ + Describes the component layout and packaging. + + + + + 1.0.0+ + Describes the component layout and packaging. + + + + + 1.1.2+ + + +Specifies which module files to include in the assembly. A moduleSet +is specified by providing one or more of <moduleSet> +subelements. + + + + + + + + + + + + 1.0.0+ + + +Specifies which groups of files to include in the assembly. A +fileSet is specified by providing one or more of <fileSet> +subelements. + + + + + + + + + + + + 1.0.0+ + + +Specifies which single files to include in the assembly. A file +is specified by providing one or more of <file> +subelements. + + + + + + + + + + + + 1.0.0+ + + +Specifies which dependencies to include in the assembly. A +dependencySet is specified by providing one or more of +<dependencySet> subelements. + + + + + + + + + + + + 1.1.0+ + + +Specifies a set of repositories to include in the assembly. A +repository is specified by providing one or more of +<repository> subelements. + + + + + + + + + + + + 1.1.0+ + + +Set of components which filter various container descriptors out of +the normal archive stream, so they can be aggregated then added. + + + + + + + + + + + + + + 1.0.0+ + +A file allows individual file inclusion with the option to change +the destination filename not supported by fileSets. + + + + + + 1.0.0+ + +Sets the absolute or relative path from the module's directory +of the file to be included in the assembly. + + + + + + 1.0.0+ + +Sets the output directory relative to the root +of the root directory of the assembly. For example, +"log" will put the specified files in the log directory. + + + + + + 1.0.0+ + +Sets the destination filename in the outputDirectory. +Default is the same name as the source's file. + + + + + + 1.0.0+ + + +Similar to a UNIX permission, sets the file mode of the files included. +THIS IS AN OCTAL VALUE. +Format: (User)(Group)(Other) where each component is a sum of Read = 4, +Write = 2, and Execute = 1. For example, the value 0644 +translates to User read-write, Group and Other read-only. The default value is 0644. +;(more on unix-style permissions) + + + + + + + 1.0.0+ + + +Sets the line-endings of the files in this file. +Valid values are: ++
+ + + +- "keep" - Preserve all line endings
+- "unix" - Use Unix-style line endings
+- "lf" - Use a single line-feed line endings
+- "dos" - Use DOS-style line endings
+- "crlf" - Use Carraige-return, line-feed line endings
+
svn commit: r1770187 [1/2] - in /maven/site/trunk/content/resources/xsd: assembly-2.0.0.xsd assembly-component-2.0.0.xsd
Author: gboue Date: Thu Nov 17 13:16:25 2016 New Revision: 1770187 URL: http://svn.apache.org/viewvc?rev=1770187&view=rev Log: [MASSEMBLY-838] Assembly descriptor schemas are missing from web site Adding 2.0.0 assembly descriptors for the Assembly Plugin to the site with regard to the 3.0.0 release of the plugin. XSD generated by checking out the 3.0.0 tag from SVN on Ubuntu 16.04, running "mvn clean package" (Maven 3.3.9) and copying the two generated XSDs by Modello. Added: maven/site/trunk/content/resources/xsd/assembly-2.0.0.xsd (with props) maven/site/trunk/content/resources/xsd/assembly-component-2.0.0.xsd (with props) Added: maven/site/trunk/content/resources/xsd/assembly-2.0.0.xsd URL: http://svn.apache.org/viewvc/maven/site/trunk/content/resources/xsd/assembly-2.0.0.xsd?rev=1770187&view=auto == --- maven/site/trunk/content/resources/xsd/assembly-2.0.0.xsd (added) +++ maven/site/trunk/content/resources/xsd/assembly-2.0.0.xsd Thu Nov 17 13:16:25 2016 @@ -0,0 +1,1364 @@ + + + + + +http://www.w3.org/2001/XMLSchema"; elementFormDefault="qualified" xmlns="http://maven.apache.org/ASSEMBLY/2.0.0"; targetNamespace="http://maven.apache.org/ASSEMBLY/2.0.0";> + + + 1.0.0+ + + +An assembly defines a collection of files usually distributed in an +archive format such as zip, tar, or tar.gz that is generated from a +project. For example, a project could produce a ZIP assembly which +contains a project's JAR artifact in the root directory, the +runtime dependencies in a lib/ directory, and a shell script to launch +a stand-alone application. + + + + + + + 1.0.0+ + + +An assembly defines a collection of files usually distributed in an +archive format such as zip, tar, or tar.gz that is generated from a +project. For example, a project could produce a ZIP assembly which +contains a project's JAR artifact in the root directory, the +runtime dependencies in a lib/ directory, and a shell script to launch +a stand-alone application. + + + + + + + 1.0.0+ + +Sets the id of this assembly. This is a symbolic name for a +particular assembly of files from this project. Also, aside from +being used to distinctly name the assembled package by attaching +its value to the generated archive, the id is used as your +artifact's classifier when deploying. + + + + + + 1.0.0+ + + +Specifies the formats of the assembly. + +It is often better to specify the formats via the goal parameter rather +than here. For example, that allows different profiles to generate +different types of archives. + +Multiple formats can be +supplied and the Assembly Plugin will generate an archive for each +of the desired formats. When deploying your project, all file formats +specified will also be deployed. A format is specified by supplying +one of the following values in a <format> subelement: +<ul> + <li><b>"zip"</b> - Creates a ZIP file format</li> + <li><b>"tar"</b> - Creates a TAR format</li> + <li><b>"tar.gz"</b> or <b>"tgz"</b> - Creates a gzip'd TAR format</li> + <li><b>"tar.bz2"</b> or <b>"tbz2"</b> - Creates a bzip'd TAR format</li> + <li><b>"jar"</b> - Creates a JAR format</li> + <li><b>"dir"</b> - Creates an exploded directory format</li> + <li><b>"war"</b> - Creates a WAR format</li> +</ul> + + + + + + + + + + + + 0.0.0+ + +Includes a base directory in the final archive. For example, +if you are creating an assembly named "your-app", setting +includeBaseDirectory to true will create an archive that +includes this base directory. If this option is set to false +the archive created will unzip its content to the current +directory. + + + + + + 1.1.0+ + +Sets the base directory of the resulting assembly archive. If this is n
maven git commit: [MNG-5889] .mvn directory should be picked when using --file
Repository: maven Updated Branches: refs/heads/master baf343fcb -> 8ae1a3e92 [MNG-5889] .mvn directory should be picked when using --file Fixing the ITs on Windows: accessing arguments should be done with "%~1" to take care of the fact that some parameter already contain quotes (otherwise, it fails by calling mvn --version -Dtest -Dmaven.repo.local="C:\test space\repo" -f "C:\test space\pom.xml" for example). Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/8ae1a3e9 Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/8ae1a3e9 Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/8ae1a3e9 Branch: refs/heads/master Commit: 8ae1a3e92418fbac59acb07fcbd668d3735c1945 Parents: baf343f Author: Guillaume Boué Authored: Thu Nov 17 16:50:40 2016 +0100 Committer: Guillaume Boué Committed: Thu Nov 17 16:50:40 2016 +0100 -- apache-maven/src/bin/mvn.cmd | 8 1 file changed, 4 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven/blob/8ae1a3e9/apache-maven/src/bin/mvn.cmd -- diff --git a/apache-maven/src/bin/mvn.cmd b/apache-maven/src/bin/mvn.cmd index 21829fa..6271f17 100644 --- a/apache-maven/src/bin/mvn.cmd +++ b/apache-maven/src/bin/mvn.cmd @@ -94,13 +94,13 @@ set WDIR=%EXEC_DIR% set FILE_ARG= :arg_loop -if "%1" == "-f" ( - set "FILE_ARG=%2" +if "%~1" == "-f" ( + set "FILE_ARG=%~2" shift goto process_file_arg ) -if "%1" == "--file" ( - set "FILE_ARG=%2" +if "%~1" == "--file" ( + set "FILE_ARG=%~2" shift goto process_file_arg )
svn commit: r1770285 - /maven/enforcer/trunk/enforcer-rules/src/site/apt/requireEnvironmentVariable.apt.vm
Author: gboue Date: Thu Nov 17 22:32:38 2016 New Revision: 1770285 URL: http://svn.apache.org/viewvc?rev=1770285&view=rev Log: Fixing a typo in the documentation of requireEnvironmentVariable. Submitted by: Jérémie Bresson. This closes #19. Modified: maven/enforcer/trunk/enforcer-rules/src/site/apt/requireEnvironmentVariable.apt.vm Modified: maven/enforcer/trunk/enforcer-rules/src/site/apt/requireEnvironmentVariable.apt.vm URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/site/apt/requireEnvironmentVariable.apt.vm?rev=1770285&r1=1770284&r2=1770285&view=diff == --- maven/enforcer/trunk/enforcer-rules/src/site/apt/requireEnvironmentVariable.apt.vm (original) +++ maven/enforcer/trunk/enforcer-rules/src/site/apt/requireEnvironmentVariable.apt.vm Thu Nov 17 22:32:38 2016 @@ -57,7 +57,7 @@ Require Environment Variable - the_name_you_wish_to_be_checked + the_name_you_wish_to_be_checked true
svn commit: r1770444 - in /maven/plugins/trunk/maven-install-plugin/src: it/minstall-55/verify.bsh main/java/org/apache/maven/plugin/install/InstallFileMojo.java
Author: gboue
Date: Fri Nov 18 22:35:24 2016
New Revision: 1770444
URL: http://svn.apache.org/viewvc?rev=1770444&view=rev
Log:
[MINSTALL-110] install-file should also install bundled pom.xml from artifact.
Follow-up: make sure the POM file extracted from the archive is into a
temporary folder, and that it is correctly deleted after installation.
Modified:
maven/plugins/trunk/maven-install-plugin/src/it/minstall-55/verify.bsh
maven/plugins/trunk/maven-install-plugin/src/main/java/org/apache/maven/plugin/install/InstallFileMojo.java
Modified: maven/plugins/trunk/maven-install-plugin/src/it/minstall-55/verify.bsh
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-install-plugin/src/it/minstall-55/verify.bsh?rev=1770444&r1=1770443&r2=1770444&view=diff
==
--- maven/plugins/trunk/maven-install-plugin/src/it/minstall-55/verify.bsh
(original)
+++ maven/plugins/trunk/maven-install-plugin/src/it/minstall-55/verify.bsh Fri
Nov 18 22:35:24 2016
@@ -37,4 +37,10 @@ for ( String path : paths )
}
}
+File file = new File( basedir, "test-0.1.pom" );
+if ( !file.isFile() )
+{
+throw new FileNotFoundException( "Missing: " + file.getAbsolutePath() );
+}
+
return true;
Modified:
maven/plugins/trunk/maven-install-plugin/src/main/java/org/apache/maven/plugin/install/InstallFileMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-install-plugin/src/main/java/org/apache/maven/plugin/install/InstallFileMojo.java?rev=1770444&r1=1770443&r2=1770444&view=diff
==
---
maven/plugins/trunk/maven-install-plugin/src/main/java/org/apache/maven/plugin/install/InstallFileMojo.java
(original)
+++
maven/plugins/trunk/maven-install-plugin/src/main/java/org/apache/maven/plugin/install/InstallFileMojo.java
Fri Nov 18 22:35:24 2016
@@ -213,13 +213,16 @@ public class InstallFileMojo
getLog().debug( "localRepoPath: " +
repositoryManager.getLocalRepositoryBasedir( buildingRequest ) );
}
+File temporaryPom = null;
+
if ( pomFile != null )
{
processModel( readModel( pomFile ) );
}
else
{
-readingPomFromJarFile();
+temporaryPom = readingPomFromJarFile();
+pomFile = temporaryPom;
}
validateArtifactInformation();
@@ -261,8 +264,8 @@ public class InstallFileMojo
}
else
{
-File generatedPomFile = generatePomFile();
-ProjectArtifactMetadata pomMetadata = new
ProjectArtifactMetadata( artifact, generatedPomFile );
+temporaryPom = generatePomFile();
+ProjectArtifactMetadata pomMetadata = new
ProjectArtifactMetadata( artifact, temporaryPom );
if ( Boolean.TRUE.equals( generatePom )
|| ( generatePom == null && !getLocalRepoFile(
buildingRequest, pomMetadata ).exists() ) )
{
@@ -273,7 +276,7 @@ public class InstallFileMojo
}
else
{
-project.setFile( generatedPomFile );
+project.setFile( temporaryPom );
}
}
else if ( generatePom == null )
@@ -306,6 +309,14 @@ public class InstallFileMojo
{
throw new MojoExecutionException( e.getMessage(), e );
}
+finally
+{
+if ( temporaryPom != null )
+{
+// noinspection ResultOfMethodCallIgnored
+temporaryPom.delete();
+}
+}
}
/**
@@ -336,10 +347,10 @@ public class InstallFileMojo
}
}
-private void readingPomFromJarFile()
+private File readingPomFromJarFile()
throws MojoExecutionException
{
-boolean foundPom = false;
+File pomFile = null;
JarFile jarFile = null;
try
@@ -358,8 +369,6 @@ public class InstallFileMojo
{
getLog().debug( "Using " + entry.getName() + " as pomFile"
);
-foundPom = true;
-
InputStream pomInputStream = null;
OutputStream pomOutputStream = null;
@@ -372,7 +381,7 @@ public class InstallFileMojo
{
base = base.substring( 0, base.lastIndexOf( '.' )
);
}
-pomFile = new File( file.getParentFile(), base +
".pom" );
+pomFile = File.createTempFile( base, ".pom" );
pomOutputStream = new FileOutputStream( pomFile );
svn commit: r1770497 - in /maven/plugins/trunk: maven-deploy-plugin/src/it/gav-validation/ maven-deploy-plugin/src/main/java/org/apache/maven/plugins/deploy/ maven-install-plugin/src/it/gav-validation
Author: gboue
Date: Sat Nov 19 15:21:30 2016
New Revision: 1770497
URL: http://svn.apache.org/viewvc?rev=1770497&view=rev
Log:
Migration to Maven 3: because of an API change in ModelProblemCollector between
3.0.x and 3.1.x, that interface cannot be used as-is for compatibility for both
in order to determine if the coordinate information passed by the user is
valid. The plugins are compiled with 3.0 core and are currently linked to a
specific ModelProblemCollector, but starting with 3.1.0-alpha-1, Maven core
calls a different method than the one the plugins were compiled with. This
results in AbstractMethodError at run-time. (this was not detected by the ITs
because, although they tested that the build failed with missing parameters, it
didn't test the cause of the failure.)
Since the plugins are now using a new MavenProject instance, and attaching
things to it in order to deploy or install them, it is possible to rely on the
validation performed during the building of that project to catch model errors.
Added:
maven/plugins/trunk/maven-deploy-plugin/src/it/gav-validation/test-invalid.properties
- copied unchanged from r1768278,
maven/plugins/trunk/maven-deploy-plugin/src/it/gav-validation/test.properties
maven/plugins/trunk/maven-deploy-plugin/src/it/gav-validation/test-missing.properties
(with props)
maven/plugins/trunk/maven-deploy-plugin/src/it/gav-validation/verify.groovy
- copied, changed from r1768278,
maven/plugins/trunk/maven-deploy-plugin/src/it/gav-validation/verify.bsh
maven/plugins/trunk/maven-install-plugin/src/it/gav-validation/test-invalid.properties
- copied unchanged from r1768278,
maven/plugins/trunk/maven-install-plugin/src/it/gav-validation/test.properties
maven/plugins/trunk/maven-install-plugin/src/it/gav-validation/test-missing.properties
(with props)
maven/plugins/trunk/maven-install-plugin/src/it/gav-validation/verify.groovy
- copied, changed from r1768278,
maven/plugins/trunk/maven-install-plugin/src/it/gav-validation/verify.bsh
Removed:
maven/plugins/trunk/maven-deploy-plugin/src/it/gav-validation/test.properties
maven/plugins/trunk/maven-deploy-plugin/src/it/gav-validation/verify.bsh
maven/plugins/trunk/maven-install-plugin/src/it/gav-validation/test.properties
maven/plugins/trunk/maven-install-plugin/src/it/gav-validation/verify.bsh
Modified:
maven/plugins/trunk/maven-deploy-plugin/src/it/gav-validation/invoker.properties
maven/plugins/trunk/maven-deploy-plugin/src/main/java/org/apache/maven/plugins/deploy/DeployFileMojo.java
maven/plugins/trunk/maven-install-plugin/src/it/gav-validation/invoker.properties
maven/plugins/trunk/maven-install-plugin/src/main/java/org/apache/maven/plugin/install/InstallFileMojo.java
Modified:
maven/plugins/trunk/maven-deploy-plugin/src/it/gav-validation/invoker.properties
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-deploy-plugin/src/it/gav-validation/invoker.properties?rev=1770497&r1=1770496&r2=1770497&view=diff
==
---
maven/plugins/trunk/maven-deploy-plugin/src/it/gav-validation/invoker.properties
(original)
+++
maven/plugins/trunk/maven-deploy-plugin/src/it/gav-validation/invoker.properties
Sat Nov 19 15:21:30 2016
@@ -17,3 +17,6 @@
invoker.goals =
org.apache.maven.plugins:maven-deploy-plugin:${project.version}:deploy-file
invoker.buildResult = failure
+
+invoker.systemPropertiesFile.1 = test-invalid.properties
+invoker.systemPropertiesFile.2 = test-missing.properties
Added:
maven/plugins/trunk/maven-deploy-plugin/src/it/gav-validation/test-missing.properties
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-deploy-plugin/src/it/gav-validation/test-missing.properties?rev=1770497&view=auto
==
---
maven/plugins/trunk/maven-deploy-plugin/src/it/gav-validation/test-missing.properties
(added)
+++
maven/plugins/trunk/maven-deploy-plugin/src/it/gav-validation/test-missing.properties
Sat Nov 19 15:21:30 2016
@@ -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
+# unde
svn commit: r1770507 - /maven/plugins/trunk/maven-install-plugin/src/it/non-changed-artifact/invoker.properties
Author: gboue Date: Sat Nov 19 16:52:31 2016 New Revision: 1770507 URL: http://svn.apache.org/viewvc?rev=1770507&view=rev Log: Fixing IT that will break when Jar Plugin is updated to 3.0.0 (indirectly through a Maven update): running install twice in the same build would call the plugin twice and attach the main artifact twice - which is now disallowed. Modified: maven/plugins/trunk/maven-install-plugin/src/it/non-changed-artifact/invoker.properties Modified: maven/plugins/trunk/maven-install-plugin/src/it/non-changed-artifact/invoker.properties URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-install-plugin/src/it/non-changed-artifact/invoker.properties?rev=1770507&r1=1770506&r2=1770507&view=diff == --- maven/plugins/trunk/maven-install-plugin/src/it/non-changed-artifact/invoker.properties (original) +++ maven/plugins/trunk/maven-install-plugin/src/it/non-changed-artifact/invoker.properties Sat Nov 19 16:52:31 2016 @@ -15,5 +15,7 @@ # specific language governing permissions and limitations # under the License. -invoker.goals = install install +# install called in two different Maven invocations, otherwise the build would fail with the Jar Plugin (MJAR-198) +invoker.goals.1 = install +invoker.goals.2 = install invoker.maven.version = 2.2.2+, !3.0-alpha-1, !3.0-alpha-2
svn commit: r1770564 - in /maven/plugins/trunk/maven-checkstyle-plugin/src: it/MCHECKSTYLE-332_cache-checker/ it/MCHECKSTYLE-332_cache-checker/src/ it/MCHECKSTYLE-332_cache-checker/src/main/ it/MCHECK
Author: gboue Date: Sun Nov 20 15:04:12 2016 New Revision: 1770564 URL: http://svn.apache.org/viewvc?rev=1770564&view=rev Log: [MCHECKSTYLE-332] maven plugin not using cache property Starting with Checkstyle 6.16, the cache configuration was moved from the TreeWalker module to the Checker module, as per https://github.com/checkstyle/checkstyle/issues/569. To detect this change, we can rely on the presence of the public API method "setCacheFile(String)" in the Checker class. Added: maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-332_cache-checker/ maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-332_cache-checker/invoker.properties (with props) maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-332_cache-checker/pom.xml (with props) maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-332_cache-checker/src/ maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-332_cache-checker/src/main/ maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-332_cache-checker/src/main/java/ maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-332_cache-checker/src/main/java/org/ maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-332_cache-checker/src/main/java/org/MyClass.java (with props) maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-332_cache-checker/verify.groovy (with props) maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-332_cache-treewalker/ maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-332_cache-treewalker/invoker.properties (with props) maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-332_cache-treewalker/pom.xml (with props) maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-332_cache-treewalker/src/ maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-332_cache-treewalker/src/main/ maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-332_cache-treewalker/src/main/java/ maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-332_cache-treewalker/src/main/java/org/ maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-332_cache-treewalker/src/main/java/org/MyClass.java (with props) maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-332_cache-treewalker/verify.groovy (with props) Modified: maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/exec/DefaultCheckstyleExecutor.java Added: maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-332_cache-checker/invoker.properties URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-332_cache-checker/invoker.properties?rev=1770564&view=auto == --- maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-332_cache-checker/invoker.properties (added) +++ maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-332_cache-checker/invoker.properties Sun Nov 20 15:04:12 2016 @@ -0,0 +1,18 @@ +# 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. + +invoker.goals=clean checkstyle:checkstyle Propchange: maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-332_cache-checker/invoker.properties -- svn:eol-style = native Propchange: maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-332_cache-checker/invoker.properties -- svn:keywords = Author Date Id Revision Added: maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-332_cache-checker/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-332_cache-checker/pom.xml?rev=1770564&view=auto == --- maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-332_cache-checker/pom.xml (added) +++ maven/plugins/trunk/maven-chec
svn commit: r1770586 - in /maven/plugins/trunk/maven-install-plugin/src: it/attach-jar-checksum/ it/generate-pom-auto-1/ it/jar-sources-javadoc/ it/local-repo-override-with-checksum-generatePom/ it/lo
Author: gboue
Date: Sun Nov 20 20:51:17 2016
New Revision: 1770586
URL: http://svn.apache.org/viewvc?rev=1770586&view=rev
Log:
[MINSTALL-131] Rename package to org.apache.maven.plugins
With the migration to Maven 3, the main package should be
"org.apache.maven.plugins" instead of the current "org.apache.maven.plugin".
Added:
maven/plugins/trunk/maven-install-plugin/src/main/java/org/apache/maven/plugins/
maven/plugins/trunk/maven-install-plugin/src/main/java/org/apache/maven/plugins/install/
- copied from r1768278,
maven/plugins/trunk/maven-install-plugin/src/main/java/org/apache/maven/plugin/install/
maven/plugins/trunk/maven-install-plugin/src/main/java/org/apache/maven/plugins/install/InstallFileMojo.java
- copied, changed from r1770497,
maven/plugins/trunk/maven-install-plugin/src/main/java/org/apache/maven/plugin/install/InstallFileMojo.java
maven/plugins/trunk/maven-install-plugin/src/test/java/org/apache/maven/plugins/
maven/plugins/trunk/maven-install-plugin/src/test/java/org/apache/maven/plugins/install/
maven/plugins/trunk/maven-install-plugin/src/test/java/org/apache/maven/plugins/install/InstallFileMojoTest.java
- copied, changed from r1768278,
maven/plugins/trunk/maven-install-plugin/src/test/java/org/apache/maven/plugin/install/InstallFileMojoTest.java
maven/plugins/trunk/maven-install-plugin/src/test/java/org/apache/maven/plugins/install/InstallMojoTest.java
- copied, changed from r1768278,
maven/plugins/trunk/maven-install-plugin/src/test/java/org/apache/maven/plugin/install/InstallMojoTest.java
maven/plugins/trunk/maven-install-plugin/src/test/java/org/apache/maven/plugins/install/Utils.java
- copied, changed from r1768278,
maven/plugins/trunk/maven-install-plugin/src/test/java/org/apache/maven/plugin/install/Utils.java
maven/plugins/trunk/maven-install-plugin/src/test/java/org/apache/maven/plugins/install/stubs/
- copied from r1770585,
maven/plugins/trunk/maven-install-plugin/src/test/java/org/apache/maven/plugin/install/stubs/
Removed:
maven/plugins/trunk/maven-install-plugin/src/main/java/org/apache/maven/plugin/
maven/plugins/trunk/maven-install-plugin/src/test/java/org/apache/maven/plugin/
Modified:
maven/plugins/trunk/maven-install-plugin/src/it/attach-jar-checksum/verify.bsh
maven/plugins/trunk/maven-install-plugin/src/it/generate-pom-auto-1/verify.bsh
maven/plugins/trunk/maven-install-plugin/src/it/jar-sources-javadoc/verify.bsh
maven/plugins/trunk/maven-install-plugin/src/it/local-repo-override-with-checksum-generatePom/verify.bsh
maven/plugins/trunk/maven-install-plugin/src/it/local-repo-override-with-checksum/verify.bsh
maven/plugins/trunk/maven-install-plugin/src/it/pom-checksum/verify.bsh
maven/plugins/trunk/maven-install-plugin/src/main/java/org/apache/maven/plugins/install/AbstractInstallMojo.java
maven/plugins/trunk/maven-install-plugin/src/main/java/org/apache/maven/plugins/install/InstallMojo.java
maven/plugins/trunk/maven-install-plugin/src/test/java/org/apache/maven/plugins/install/stubs/AttachedArtifactStub0.java
maven/plugins/trunk/maven-install-plugin/src/test/java/org/apache/maven/plugins/install/stubs/AttachedArtifactStub1.java
maven/plugins/trunk/maven-install-plugin/src/test/java/org/apache/maven/plugins/install/stubs/InstallArtifactStub.java
maven/plugins/trunk/maven-install-plugin/src/test/resources/unit/basic-install-checksum/plugin-config.xml
maven/plugins/trunk/maven-install-plugin/src/test/resources/unit/basic-install-test-packaging-pom/plugin-config.xml
maven/plugins/trunk/maven-install-plugin/src/test/resources/unit/basic-install-test-with-attached-artifacts/plugin-config.xml
maven/plugins/trunk/maven-install-plugin/src/test/resources/unit/basic-install-test/plugin-config.xml
maven/plugins/trunk/maven-install-plugin/src/test/resources/unit/configured-install-test/plugin-config.xml
Modified:
maven/plugins/trunk/maven-install-plugin/src/it/attach-jar-checksum/verify.bsh
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-install-plugin/src/it/attach-jar-checksum/verify.bsh?rev=1770586&r1=1770585&r2=1770586&view=diff
==
---
maven/plugins/trunk/maven-install-plugin/src/it/attach-jar-checksum/verify.bsh
(original)
+++
maven/plugins/trunk/maven-install-plugin/src/it/attach-jar-checksum/verify.bsh
Sun Nov 20 20:51:17 2016
@@ -20,7 +20,7 @@
import java.io.*;
import java.util.*;
-import org.apache.maven.plugin.install.Utils;
+import org.apache.maven.plugins.install.Utils;
String[] paths =
{
Modified:
maven/plugins/trunk/maven-install-plugin/src/it/generate-pom-auto-1/verify.bsh
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-install-plugin/src/it/generate-pom-auto-1/verify.bsh?rev=177
svn commit: r1771515 - in /maven/enforcer/trunk: ./ enforcer-rules/ enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/ enforcer-rules/src/site/apt/ enforcer-rules/src/test/java/org/apache
Author: gboue
Date: Sat Nov 26 21:56:24 2016
New Revision: 1771515
URL: http://svn.apache.org/viewvc?rev=1771515&view=rev
Log:
[MENFORCER-247] Add a "require file checksum" rule
Submitted by: Lyubomyr Shaydariv
New RequireFileChecksum, rule that is non cacheable and inherits from
AbstractNonCacheableEnforcerRule. This closes #18.
Added:
maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireFileChecksum.java
(with props)
maven/enforcer/trunk/enforcer-rules/src/site/apt/requireFileChecksum.apt.vm
(with props)
maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireFileChecksum.java
(with props)
maven/enforcer/trunk/maven-enforcer-plugin/src/it/projects/require-file-checksum/
maven/enforcer/trunk/maven-enforcer-plugin/src/it/projects/require-file-checksum/LICENSE
maven/enforcer/trunk/maven-enforcer-plugin/src/it/projects/require-file-checksum/pom.xml
(with props)
Modified:
maven/enforcer/trunk/enforcer-rules/pom.xml
maven/enforcer/trunk/enforcer-rules/src/site/apt/index.apt
maven/enforcer/trunk/pom.xml
Modified: maven/enforcer/trunk/enforcer-rules/pom.xml
URL:
http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/pom.xml?rev=1771515&r1=1771514&r2=1771515&view=diff
==
--- maven/enforcer/trunk/enforcer-rules/pom.xml (original)
+++ maven/enforcer/trunk/enforcer-rules/pom.xml Sat Nov 26 21:56:24 2016
@@ -67,6 +67,10 @@
commons-lang
+ commons-codec
+ commons-codec
+
+
org.apache.maven.enforcer
enforcer-api
Added:
maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireFileChecksum.java
URL:
http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireFileChecksum.java?rev=1771515&view=auto
==
---
maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireFileChecksum.java
(added)
+++
maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireFileChecksum.java
Sat Nov 26 21:56:24 2016
@@ -0,0 +1,146 @@
+package org.apache.maven.plugins.enforcer;
+
+/*
+ * 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.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+
+import org.apache.commons.codec.digest.DigestUtils;
+import org.apache.maven.enforcer.rule.api.EnforcerRuleException;
+import org.apache.maven.enforcer.rule.api.EnforcerRuleHelper;
+import org.codehaus.plexus.util.IOUtil;
+
+/**
+ * Rule to validate a file to match the specified checksum.
+ *
+ * @author Edward Samson
+ * @author Lyubomyr Shaydariv
+ */
+public class RequireFileChecksum
+extends AbstractNonCacheableEnforcerRule
+{
+
+private File file;
+
+private String checksum;
+
+private String type;
+
+public void execute( EnforcerRuleHelper helper )
+throws EnforcerRuleException
+{
+if ( this.file == null )
+{
+throw new EnforcerRuleException( "Input file unspecified" );
+}
+
+if ( this.type == null )
+{
+throw new EnforcerRuleException( "Hash type unspecified" );
+}
+
+if ( this.checksum == null )
+{
+throw new EnforcerRuleException( "Checksum unspecified" );
+}
+
+InputStream inputStream = null;
+try
+{
+if ( this.file.isDirectory() || !this.file.canRead() )
+{
+throw new EnforcerRuleException( "Cannot read file: " +
this.file.getAbsolutePath() );
+}
+
+inputStream = new FileInputStream( this.file );
+String checksum;
+if ( "md5".equals( this.type ) )
+{
+checksum = DigestUtils.md5Hex( inputStream );
+}
+else if ( &qu
svn commit: r1771943 - in /maven/plugins/trunk/maven-shade-plugin/src: main/java/org/apache/maven/plugins/shade/resource/GroovyResourceTransformer.java test/java/org/apache/maven/plugins/shade/resourc
Author: gboue
Date: Tue Nov 29 19:05:13 2016
New Revision: 1771943
URL: http://svn.apache.org/viewvc?rev=1771943&view=rev
Log:
Fixed compilation errors. The variables extModuleName and extModuleVersion in
the GroovyResourceTransformer need setters to be changed properly in tests,
instead of having reflection hacks.
Modified:
maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/GroovyResourceTransformer.java
maven/plugins/trunk/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/resource/GroovyResourceTransformerTest.java
Modified:
maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/GroovyResourceTransformer.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/GroovyResourceTransformer.java?rev=1771943&r1=1771942&r2=1771943&view=diff
==
---
maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/GroovyResourceTransformer.java
(original)
+++
maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/GroovyResourceTransformer.java
Tue Nov 29 19:05:13 2016
@@ -134,4 +134,14 @@ public class GroovyResourceTransformer
return buff.toString();
}
}
+
+public void setExtModuleName( String extModuleName )
+{
+this.extModuleName = extModuleName;
+}
+
+public void setExtModuleVersion( String extModuleVersion )
+{
+this.extModuleVersion = extModuleVersion;
+}
}
Modified:
maven/plugins/trunk/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/resource/GroovyResourceTransformerTest.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/resource/GroovyResourceTransformerTest.java?rev=1771943&r1=1771942&r2=1771943&view=diff
==
---
maven/plugins/trunk/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/resource/GroovyResourceTransformerTest.java
(original)
+++
maven/plugins/trunk/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/resource/GroovyResourceTransformerTest.java
Tue Nov 29 19:05:13 2016
@@ -78,13 +78,20 @@ public class GroovyResourceTransformerTe
JarOutputStream jaos = new JarOutputStream( fos );
transformer.modifyOutputStream( jaos );
jaos.close();
-JarFile jar = new JarFile( tempJar );
Properties desc = null;
-ZipEntry entry = jar.getEntry(
GroovyResourceTransformer.EXT_MODULE_NAME );
-if ( entry != null )
+JarFile jar = new JarFile( tempJar );
+try
+{
+ZipEntry entry = jar.getEntry(
GroovyResourceTransformer.EXT_MODULE_NAME );
+if ( entry != null )
+{
+desc = new Properties();
+desc.load( jar.getInputStream( entry ) );
+}
+}
+finally
{
-desc = new Properties();
-desc.load( jar.getInputStream( entry ) );
+jar.close();
}
return desc;
}
@@ -110,8 +117,8 @@ public class GroovyResourceTransformerTe
throws Exception
{
GroovyResourceTransformer transformer = new
GroovyResourceTransformer();
-transformer.extModuleName = "the-module-name";
-transformer.extModuleVersion = "2.0";
+transformer.setExtModuleName( "the-module-name" );
+transformer.setExtModuleVersion( "2.0" );
transformer.processResource( GroovyResourceTransformer.EXT_MODULE_NAME,
module( "mod1", "1.0", "some.ext",
"some.staticExt" ),
Collections.emptyList() );
svn commit: r1771979 - in /maven/enforcer/trunk/enforcer-rules/src/site/apt: banDuplicatePomDependencyVersions.apt.vm index.apt
Author: gboue
Date: Tue Nov 29 23:31:33 2016
New Revision: 1771979
URL: http://svn.apache.org/viewvc?rev=1771979&view=rev
Log:
[MENFORCER-259] The rule BanDuplicatePomDependencyVersions is not documented
Adding banDuplicatePomDependencyVersions, introduced in MENFORCER-152, to the
documentation.
Added:
maven/enforcer/trunk/enforcer-rules/src/site/apt/banDuplicatePomDependencyVersions.apt.vm
(with props)
Modified:
maven/enforcer/trunk/enforcer-rules/src/site/apt/index.apt
Added:
maven/enforcer/trunk/enforcer-rules/src/site/apt/banDuplicatePomDependencyVersions.apt.vm
URL:
http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/site/apt/banDuplicatePomDependencyVersions.apt.vm?rev=1771979&view=auto
==
---
maven/enforcer/trunk/enforcer-rules/src/site/apt/banDuplicatePomDependencyVersions.apt.vm
(added)
+++
maven/enforcer/trunk/enforcer-rules/src/site/apt/banDuplicatePomDependencyVersions.apt.vm
Tue Nov 29 23:31:33 2016
@@ -0,0 +1,67 @@
+~~ 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.
+
+ --
+ Ban Duplicate Pom Dependency Versions
+ --
+ Guillaume Boue
+ --
+ November 2016
+ --
+
+Ban Duplicate Pom Dependency Versions
+
+ This rule checks that there are no duplicate dependencies declared in the
POM of the project.
+ Duplicate dependencies are dependencies which have the same group id,
artifact id, type and classifier.
+
+ The following parameters are supported by this rule:
+
+ * message - an optional supplemental message to the user if the rule fails.
+
+ []
+
+
+ Sample Plugin Configuration:
+
++--+
+
+ [...]
+
+
+
+org.apache.maven.plugins
+maven-enforcer-plugin
+${project.version}
+
+
+no-duplicate-declared-dependencies
+
+ enforce
+
+
+
+
+
+
+
+
+
+
+
+ [...]
+
++---+
Propchange:
maven/enforcer/trunk/enforcer-rules/src/site/apt/banDuplicatePomDependencyVersions.apt.vm
--
svn:eol-style = native
Propchange:
maven/enforcer/trunk/enforcer-rules/src/site/apt/banDuplicatePomDependencyVersions.apt.vm
--
svn:keywords = Author Date Id Revision
Modified: maven/enforcer/trunk/enforcer-rules/src/site/apt/index.apt
URL:
http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/site/apt/index.apt?rev=1771979&r1=1771978&r2=1771979&view=diff
==
--- maven/enforcer/trunk/enforcer-rules/src/site/apt/index.apt (original)
+++ maven/enforcer/trunk/enforcer-rules/src/site/apt/index.apt Tue Nov 29
23:31:33 2016
@@ -32,7 +32,9 @@ Standard Rules
* {{{./alwaysPass.html}alwaysPass}} - Always passes... used to test plugin
configuration.
* {{{./banDistributionManagement.html}banDistributionManagement}} - enforces
that project doesn't have distributionManagement.
-
+
+ *
{{{./banDuplicatePomDependencyVersions.html}banDuplicatePomDependencyVersions}}
- enforces that the project doesn't have duplicate declared dependencies.
+
* {{{./bannedDependencies.html}bannedDependencies}} - enforces that excluded
dependencies aren't included.
* {{{./bannedPlugins.html}bannedPlugins}} - enforces that specific plugins
aren't included in the build.
svn commit: r1774310 - in /maven/plugins/trunk/maven-ear-plugin: ./ src/it/ src/it/skinny-wars-timestamp/ src/it/skinny-wars-timestamp/ear-module/ src/it/skinny-wars-timestamp/war-module/ src/it/skinn
Author: gboue
Date: Wed Dec 14 18:57:02 2016
New Revision: 1774310
URL: http://svn.apache.org/viewvc?rev=1774310&view=rev
Log:
[MEAR-217] Snapshot dependencies are not deleted from skinny WARs
Submitted by: Fabian Schlier
Applied after adding the JAR file attached to the JIRA issue. This closes #100.
Added:
maven/plugins/trunk/maven-ear-plugin/src/it/skinny-wars-timestamp/
maven/plugins/trunk/maven-ear-plugin/src/it/skinny-wars-timestamp/ear-module/
maven/plugins/trunk/maven-ear-plugin/src/it/skinny-wars-timestamp/ear-module/pom.xml
(with props)
maven/plugins/trunk/maven-ear-plugin/src/it/skinny-wars-timestamp/pom.xml
(with props)
maven/plugins/trunk/maven-ear-plugin/src/it/skinny-wars-timestamp/verify.bsh
(with props)
maven/plugins/trunk/maven-ear-plugin/src/it/skinny-wars-timestamp/war-module/
maven/plugins/trunk/maven-ear-plugin/src/it/skinny-wars-timestamp/war-module/pom.xml
(with props)
maven/plugins/trunk/maven-ear-plugin/src/it/skinny-wars-timestamp/war-module/src/
maven/plugins/trunk/maven-ear-plugin/src/it/skinny-wars-timestamp/war-module/src/main/
maven/plugins/trunk/maven-ear-plugin/src/it/skinny-wars-timestamp/war-module/src/main/webapp/
maven/plugins/trunk/maven-ear-plugin/src/it/skinny-wars-timestamp/war-module/src/main/webapp/WEB-INF/
maven/plugins/trunk/maven-ear-plugin/src/it/skinny-wars-timestamp/war-module/src/main/webapp/WEB-INF/web.xml
(with props)
maven/plugins/trunk/maven-ear-plugin/src/test/resources/m2snapshots/
maven/plugins/trunk/maven-ear-plugin/src/test/resources/m2snapshots/eartest/
maven/plugins/trunk/maven-ear-plugin/src/test/resources/m2snapshots/eartest/jar-sample-one/
maven/plugins/trunk/maven-ear-plugin/src/test/resources/m2snapshots/eartest/jar-sample-one/1.0-SNAPSHOT/
maven/plugins/trunk/maven-ear-plugin/src/test/resources/m2snapshots/eartest/jar-sample-one/1.0-SNAPSHOT/jar-sample-one-1.0-20150825.210557-91.jar
(with props)
maven/plugins/trunk/maven-ear-plugin/src/test/resources/m2snapshots/eartest/jar-sample-one/1.0-SNAPSHOT/jar-sample-one-1.0-20150825.210557-91.jar.sha1
maven/plugins/trunk/maven-ear-plugin/src/test/resources/m2snapshots/eartest/jar-sample-one/1.0-SNAPSHOT/jar-sample-one-1.0-20150825.210557-91.pom
(with props)
maven/plugins/trunk/maven-ear-plugin/src/test/resources/m2snapshots/eartest/jar-sample-one/1.0-SNAPSHOT/jar-sample-one-1.0-20150825.210557-91.pom.sha1
maven/plugins/trunk/maven-ear-plugin/src/test/resources/m2snapshots/eartest/jar-sample-one/1.0-SNAPSHOT/maven-metadata.xml
(with props)
Modified:
maven/plugins/trunk/maven-ear-plugin/pom.xml
maven/plugins/trunk/maven-ear-plugin/src/it/settings.xml
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugins/ear/EarMojo.java
Modified: maven/plugins/trunk/maven-ear-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/pom.xml?rev=1774310&r1=1774309&r2=1774310&view=diff
==
--- maven/plugins/trunk/maven-ear-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-ear-plugin/pom.xml Wed Dec 14 18:57:02 2016
@@ -180,6 +180,11 @@
src/test/resources/dtd/jboss-app_4_0.dtd
src/test/resources/dtd/jboss-app_4_2.dtd
src/test/resources/dtd/jboss-app_5_0.dtd
+
+
src/test/resources/m2snapshots/eartest/jar-sample-one/1.0-SNAPSHOT/jar-sample-one-1.0-20150825.210557-91.jar.sha1
+
src/test/resources/m2snapshots/eartest/jar-sample-one/1.0-SNAPSHOT/jar-sample-one-1.0-20150825.210557-91.pom.sha1
@@ -193,6 +198,7 @@
run-its
${project.build.testOutputDirectory}/m2repo
+
${project.build.testOutputDirectory}/m2snapshots
Modified: maven/plugins/trunk/maven-ear-plugin/src/it/settings.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/it/settings.xml?rev=1774310&r1=1774309&r2=1774310&view=diff
==
--- maven/plugins/trunk/maven-ear-plugin/src/it/settings.xml (original)
+++ maven/plugins/trunk/maven-ear-plugin/src/it/settings.xml Wed Dec 14
18:57:02 2016
@@ -37,6 +37,16 @@ under the License.
true
+
+ local.snapshot
+ file://@localSnapshotRepositoryPath@
+
+false
+
+
+true
+
+
Added:
maven/plugins/trunk/maven-ear-plugin/src/it/skinny-wars-timestamp/ear-module/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/it/skinny-wars-timestamp/ear-module/pom.xml?rev=1774310&view=auto
==
---
maven/pl
svn commit: r1774329 - /maven/plugins/trunk/maven-changelog-plugin/src/main/java/org/apache/maven/plugin/changelog/ChangeLogReport.java
Author: gboue
Date: Wed Dec 14 19:38:57 2016
New Revision: 1774329
URL: http://svn.apache.org/viewvc?rev=1774329&view=rev
Log:
Fixing Checkstyle issue, by refactoring the default issue link URL to a
constant, and re-using the %ISSUE% constant.
Modified:
maven/plugins/trunk/maven-changelog-plugin/src/main/java/org/apache/maven/plugin/changelog/ChangeLogReport.java
Modified:
maven/plugins/trunk/maven-changelog-plugin/src/main/java/org/apache/maven/plugin/changelog/ChangeLogReport.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changelog-plugin/src/main/java/org/apache/maven/plugin/changelog/ChangeLogReport.java?rev=1774329&r1=1774328&r2=1774329&view=diff
==
---
maven/plugins/trunk/maven-changelog-plugin/src/main/java/org/apache/maven/plugin/changelog/ChangeLogReport.java
(original)
+++
maven/plugins/trunk/maven-changelog-plugin/src/main/java/org/apache/maven/plugin/changelog/ChangeLogReport.java
Wed Dec 14 19:38:57 2016
@@ -118,6 +118,8 @@ public class ChangeLogReport
public static final String DEFAULT_ISSUE_ID_REGEX_PATTERN =
"[a-zA-Z]{2,}-\\d+";
+private static final String DEFAULT_ISSUE_LINK_URL =
"https://issues.apache.org/jira/browse/"; + ISSUE_TOKEN;
+
/**
* Used to specify the format to use for the dates in the headings of the
* report.
@@ -337,7 +339,7 @@ public class ChangeLogReport
*
* @since 2.2
*/
-@Parameter( property = "issueLinkUrl", defaultValue =
"https://issues.apache.org/jira/browse/%ISSUE%";, required = true )
+@Parameter( property = "issueLinkUrl", defaultValue =
DEFAULT_ISSUE_LINK_URL, required = true )
private String issueLinkUrl;
/**
svn commit: r1774759 - /maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/dependencies/collect/internal/Maven30DependencyCollector.java
Author: gboue
Date: Sat Dec 17 13:20:19 2016
New Revision: 1774759
URL: http://svn.apache.org/viewvc?rev=1774759&view=rev
Log:
[MSHARED-602] NoSuchMethodException using DependencyCollector with Maven 3.0
Looking for the method toDependency inside RepositoryUtils taking the correct
org.apache.maven.model.Dependency instead of
org.sonatype.aether.graph.Dependency.
Modified:
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/dependencies/collect/internal/Maven30DependencyCollector.java
Modified:
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/dependencies/collect/internal/Maven30DependencyCollector.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/dependencies/collect/internal/Maven30DependencyCollector.java?rev=1774759&r1=1774758&r2=1774759&view=diff
==
---
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/dependencies/collect/internal/Maven30DependencyCollector.java
(original)
+++
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/dependencies/collect/internal/Maven30DependencyCollector.java
Sat Dec 17 13:20:19 2016
@@ -159,10 +159,10 @@ public class Maven30DependencyCollector
ArtifactTypeRegistry typeRegistry )
throws DependencyCollectorException
{
-Class[] argClasses = new Class[] { Dependency.class,
ArtifactTypeRegistry.class };
+Class[] argClasses = new Class[] {
org.apache.maven.model.Dependency.class, ArtifactTypeRegistry.class };
Object[] args = new Object[] { mavenDependency, typeRegistry };
return (Dependency) Invoker.invoke( RepositoryUtils.class,
"toDependency", argClasses, args );
-}
+}
}
svn commit: r1774769 - in /maven/plugins/trunk/maven-dependency-plugin/src/it/projects: copy-from-remote-repository/verify.groovy unpack-from-remote-repository/verify.groovy
Author: gboue Date: Sat Dec 17 15:03:29 2016 New Revision: 1774769 URL: http://svn.apache.org/viewvc?rev=1774769&view=rev Log: Updating the tests so that they pass with Maven 3.0.x also Modified: maven/plugins/trunk/maven-dependency-plugin/src/it/projects/copy-from-remote-repository/verify.groovy maven/plugins/trunk/maven-dependency-plugin/src/it/projects/unpack-from-remote-repository/verify.groovy Modified: maven/plugins/trunk/maven-dependency-plugin/src/it/projects/copy-from-remote-repository/verify.groovy URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/it/projects/copy-from-remote-repository/verify.groovy?rev=1774769&r1=1774768&r2=1774769&view=diff == --- maven/plugins/trunk/maven-dependency-plugin/src/it/projects/copy-from-remote-repository/verify.groovy (original) +++ maven/plugins/trunk/maven-dependency-plugin/src/it/projects/copy-from-remote-repository/verify.groovy Sat Dec 17 15:03:29 2016 @@ -21,8 +21,8 @@ import java.io.*; File buildLog = new File( basedir, 'build.log' ) assert buildLog.exists() -assert buildLog.text.contains( "[INFO] Downloading: file:///" + basedir + "/repo/org/apache/maven/its/dependency/fake-remote-copy/1.0/fake-remote-copy-1.0.jar" ) -assert buildLog.text.contains( "[INFO] Downloaded: file:///" + basedir + "/repo/org/apache/maven/its/dependency/fake-remote-copy/1.0/fake-remote-copy-1.0.jar" ) +assert buildLog.text.contains( "Downloading: file:///" + basedir + "/repo/org/apache/maven/its/dependency/fake-remote-copy/1.0/fake-remote-copy-1.0.jar" ) +assert buildLog.text.contains( "Downloaded: file:///" + basedir + "/repo/org/apache/maven/its/dependency/fake-remote-copy/1.0/fake-remote-copy-1.0.jar" ) File copied = new File( basedir, 'target/dependency/fake-remote-copy-1.0.jar' ) assert copied.exists() Modified: maven/plugins/trunk/maven-dependency-plugin/src/it/projects/unpack-from-remote-repository/verify.groovy URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/it/projects/unpack-from-remote-repository/verify.groovy?rev=1774769&r1=1774768&r2=1774769&view=diff == --- maven/plugins/trunk/maven-dependency-plugin/src/it/projects/unpack-from-remote-repository/verify.groovy (original) +++ maven/plugins/trunk/maven-dependency-plugin/src/it/projects/unpack-from-remote-repository/verify.groovy Sat Dec 17 15:03:29 2016 @@ -21,8 +21,8 @@ import java.io.*; File buildLog = new File( basedir, 'build.log' ) assert buildLog.exists() -assert buildLog.text.contains( "[INFO] Downloading: file:///" + basedir + "/repo/org/apache/maven/its/dependency/fake-remote-unpack/1.0/fake-remote-unpack-1.0.jar" ) -assert buildLog.text.contains( "[INFO] Downloaded: file:///" + basedir + "/repo/org/apache/maven/its/dependency/fake-remote-unpack/1.0/fake-remote-unpack-1.0.jar" ) +assert buildLog.text.contains( "Downloading: file:///" + basedir + "/repo/org/apache/maven/its/dependency/fake-remote-unpack/1.0/fake-remote-unpack-1.0.jar" ) +assert buildLog.text.contains( "Downloaded: file:///" + basedir + "/repo/org/apache/maven/its/dependency/fake-remote-unpack/1.0/fake-remote-unpack-1.0.jar" ) File unpacked = new File( basedir, 'target/dependency/META-INF/MANIFEST.MF' ) assert unpacked.exists()
svn commit: r1774770 - in /maven/plugins/trunk/maven-dependency-plugin/src: it/mrm/repository/ it/projects/get-artifact-maven-plugin/ it/projects/get-artifact-no-transitive/ it/projects/get-artifact/
Author: gboue Date: Sat Dec 17 15:03:53 2016 New Revision: 1774770 URL: http://svn.apache.org/viewvc?rev=1774770&view=rev Log: [MDEP-548] The get Mojo doesn't resolve the artifact when setting transitive to false When transitive is set to false, the ArtifactResolver needs to be used to resolve just the specified artifact, without its transitive dependencies. Added: maven/plugins/trunk/maven-dependency-plugin/src/it/mrm/repository/get-artifact-1.0.jar (with props) maven/plugins/trunk/maven-dependency-plugin/src/it/mrm/repository/get-artifact-1.0.pom (with props) maven/plugins/trunk/maven-dependency-plugin/src/it/mrm/repository/get-artifact-maven-plugin-1.0.jar (with props) maven/plugins/trunk/maven-dependency-plugin/src/it/mrm/repository/get-artifact-maven-plugin-1.0.pom (with props) maven/plugins/trunk/maven-dependency-plugin/src/it/mrm/repository/get-artifact-transitive-1.0.jar (with props) maven/plugins/trunk/maven-dependency-plugin/src/it/mrm/repository/get-artifact-transitive-1.0.pom (with props) maven/plugins/trunk/maven-dependency-plugin/src/it/projects/get-artifact/ maven/plugins/trunk/maven-dependency-plugin/src/it/projects/get-artifact-maven-plugin/ maven/plugins/trunk/maven-dependency-plugin/src/it/projects/get-artifact-maven-plugin/invoker.properties (with props) maven/plugins/trunk/maven-dependency-plugin/src/it/projects/get-artifact-maven-plugin/pom.xml (with props) maven/plugins/trunk/maven-dependency-plugin/src/it/projects/get-artifact-maven-plugin/setup.bsh (with props) maven/plugins/trunk/maven-dependency-plugin/src/it/projects/get-artifact-maven-plugin/test.properties (with props) maven/plugins/trunk/maven-dependency-plugin/src/it/projects/get-artifact-maven-plugin/verify.bsh (with props) maven/plugins/trunk/maven-dependency-plugin/src/it/projects/get-artifact-no-transitive/ maven/plugins/trunk/maven-dependency-plugin/src/it/projects/get-artifact-no-transitive/invoker.properties (with props) maven/plugins/trunk/maven-dependency-plugin/src/it/projects/get-artifact-no-transitive/pom.xml (with props) maven/plugins/trunk/maven-dependency-plugin/src/it/projects/get-artifact-no-transitive/setup.bsh (with props) maven/plugins/trunk/maven-dependency-plugin/src/it/projects/get-artifact-no-transitive/test.properties (with props) maven/plugins/trunk/maven-dependency-plugin/src/it/projects/get-artifact-no-transitive/verify.bsh (with props) maven/plugins/trunk/maven-dependency-plugin/src/it/projects/get-artifact/invoker.properties (with props) maven/plugins/trunk/maven-dependency-plugin/src/it/projects/get-artifact/pom.xml (with props) maven/plugins/trunk/maven-dependency-plugin/src/it/projects/get-artifact/setup.bsh (with props) maven/plugins/trunk/maven-dependency-plugin/src/it/projects/get-artifact/test.properties (with props) maven/plugins/trunk/maven-dependency-plugin/src/it/projects/get-artifact/verify.bsh (with props) maven/plugins/trunk/maven-dependency-plugin/src/it/projects/get-gav/ maven/plugins/trunk/maven-dependency-plugin/src/it/projects/get-gav/invoker.properties (with props) maven/plugins/trunk/maven-dependency-plugin/src/it/projects/get-gav/pom.xml (with props) maven/plugins/trunk/maven-dependency-plugin/src/it/projects/get-gav/setup.bsh (with props) maven/plugins/trunk/maven-dependency-plugin/src/it/projects/get-gav/test.properties (with props) maven/plugins/trunk/maven-dependency-plugin/src/it/projects/get-gav/verify.bsh (with props) Modified: maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugins/dependency/GetMojo.java Added: maven/plugins/trunk/maven-dependency-plugin/src/it/mrm/repository/get-artifact-1.0.jar URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/it/mrm/repository/get-artifact-1.0.jar?rev=1774770&view=auto == Binary file - no diff available. Propchange: maven/plugins/trunk/maven-dependency-plugin/src/it/mrm/repository/get-artifact-1.0.jar -- svn:mime-type = application/octet-stream Added: maven/plugins/trunk/maven-dependency-plugin/src/it/mrm/repository/get-artifact-1.0.pom URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/it/mrm/repository/get-artifact-1.0.pom?rev=1774770&view=auto == --- maven/plugins/trunk/maven-dependency-plugin/src/it/mrm/repository/get-artifact-1.0.pom (added) +++ maven/plugins/trunk/maven-dependency-plugin/src/it/mrm/repository/get-artifact-1.0.pom Sat Dec 17 15:03:53 2016 @@ -0,0 +1,42 @@ + + + +http://maven.apache.org/POM/4.0.0"; + xmlns:xsi=&
svn commit: r1774803 - in /maven/plugins/trunk/maven-dependency-plugin/src: it/projects/build-classpath-output-file-and-property/ main/java/org/apache/maven/plugins/dependency/fromDependencies/
Author: gboue Date: Sat Dec 17 20:40:08 2016 New Revision: 1774803 URL: http://svn.apache.org/viewvc?rev=1774803&view=rev Log: [MDEP-482] Can't use both outputProperty and outputFile in build-classpath mojo Submitted by: Dagan Sandler Make sure outputFile and outputProperty can both be used at the same time. Applied patch after adding an IT. Added: maven/plugins/trunk/maven-dependency-plugin/src/it/projects/build-classpath-output-file-and-property/ maven/plugins/trunk/maven-dependency-plugin/src/it/projects/build-classpath-output-file-and-property/invoker.properties (with props) maven/plugins/trunk/maven-dependency-plugin/src/it/projects/build-classpath-output-file-and-property/pom.xml (with props) maven/plugins/trunk/maven-dependency-plugin/src/it/projects/build-classpath-output-file-and-property/test.properties (with props) maven/plugins/trunk/maven-dependency-plugin/src/it/projects/build-classpath-output-file-and-property/verify.bsh (with props) Modified: maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugins/dependency/fromDependencies/BuildClasspathMojo.java Added: maven/plugins/trunk/maven-dependency-plugin/src/it/projects/build-classpath-output-file-and-property/invoker.properties URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/it/projects/build-classpath-output-file-and-property/invoker.properties?rev=1774803&view=auto == --- maven/plugins/trunk/maven-dependency-plugin/src/it/projects/build-classpath-output-file-and-property/invoker.properties (added) +++ maven/plugins/trunk/maven-dependency-plugin/src/it/projects/build-classpath-output-file-and-property/invoker.properties Sat Dec 17 20:40:08 2016 @@ -0,0 +1,18 @@ +# 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. + +invoker.goals = clean package Propchange: maven/plugins/trunk/maven-dependency-plugin/src/it/projects/build-classpath-output-file-and-property/invoker.properties -- svn:eol-style = native Propchange: maven/plugins/trunk/maven-dependency-plugin/src/it/projects/build-classpath-output-file-and-property/invoker.properties -- svn:keywords = Author Date Id Revision Added: maven/plugins/trunk/maven-dependency-plugin/src/it/projects/build-classpath-output-file-and-property/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/it/projects/build-classpath-output-file-and-property/pom.xml?rev=1774803&view=auto == --- maven/plugins/trunk/maven-dependency-plugin/src/it/projects/build-classpath-output-file-and-property/pom.xml (added) +++ maven/plugins/trunk/maven-dependency-plugin/src/it/projects/build-classpath-output-file-and-property/pom.xml Sat Dec 17 20:40:08 2016 @@ -0,0 +1,89 @@ + + + +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.its.dependency + test + 1.0-SNAPSHOT + https://issues.apache.org/jira/browse/MDEP-482 + +Test dependency:build-classpath when setting both an output file and an output property + + + +UTF-8 + + + + + org.apache.maven.its.dependency + get-artifact + 1.0 + + + + + + +org.apache.maven.plugins +maven-dependency-plugin +@project.version@ + + +its + + build-classpath + +package + + + + +org.apache.maven.plugins +maven-enforcer-plugin +1.4.1 + + +enforce-property + + enforce + +package + + + + +
svn commit: r1774870 - /maven/pom/trunk/maven/pom.xml
Author: gboue Date: Sun Dec 18 09:48:04 2016 New Revision: 1774870 URL: http://svn.apache.org/viewvc?rev=1774870&view=rev Log: [MPOM-152] Upgrade maven-checkstyle-plugin to 2.17. The file maven_checks.xml was moved to the Shared Resources project, so a dependency on it needs to be added in the plugin declaration for version 2.17. Modified: maven/pom/trunk/maven/pom.xml Modified: maven/pom/trunk/maven/pom.xml URL: http://svn.apache.org/viewvc/maven/pom/trunk/maven/pom.xml?rev=1774870&r1=1774869&r2=1774870&view=diff == --- maven/pom/trunk/maven/pom.xml (original) +++ maven/pom/trunk/maven/pom.xml Sun Dec 18 09:48:04 2016 @@ -947,6 +947,14 @@ under the License. src/main/java src/test/java + + + + org.apache.maven.shared + maven-shared-resources + 2 + + org.apache.maven.plugins
svn commit: r1776610 - in /maven/plugins/trunk/maven-dependency-plugin/src/it/projects: copy-from-remote-repository/ unpack-from-remote-repository/
Author: gboue
Date: Fri Dec 30 17:13:57 2016
New Revision: 1776610
URL: http://svn.apache.org/viewvc?rev=1776610&view=rev
Log:
Updating the tests so that they no longer rely on reading the logs, making them
more robust: a setup script first deletes from the local repository the
artifact that should be downloaded, then it is verified that they are present
in the local repository after the build (thus verifying that they were
correctly downloaded).
Added:
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/copy-from-remote-repository/setup.bsh
(with props)
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/copy-from-remote-repository/verify.bsh
- copied, changed from r1776513,
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/copy-from-remote-repository/verify.groovy
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/unpack-from-remote-repository/setup.bsh
(with props)
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/unpack-from-remote-repository/verify.bsh
- copied, changed from r1776513,
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/unpack-from-remote-repository/verify.groovy
Removed:
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/copy-from-remote-repository/verify.groovy
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/unpack-from-remote-repository/verify.groovy
Added:
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/copy-from-remote-repository/setup.bsh
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/it/projects/copy-from-remote-repository/setup.bsh?rev=1776610&view=auto
==
---
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/copy-from-remote-repository/setup.bsh
(added)
+++
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/copy-from-remote-repository/setup.bsh
Fri Dec 30 17:13:57 2016
@@ -0,0 +1,41 @@
+/*
+ * 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.*;
+
+import org.codehaus.plexus.util.*;
+
+String[] foldersToDelete = {
+"org/apache/maven/its/dependency/fake-remote-copy"
+};
+
+try
+{
+for ( String folderToDelete : foldersToDelete )
+{
+FileUtils.deleteDirectory( new File( localRepositoryPath,
folderToDelete ) );
+}
+}
+catch ( IOException e )
+{
+e.printStackTrace();
+return false;
+}
+
+return true;
Propchange:
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/copy-from-remote-repository/setup.bsh
--
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/copy-from-remote-repository/setup.bsh
--
svn:keywords = Author Date Id Revision
Copied:
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/copy-from-remote-repository/verify.bsh
(from r1776513,
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/copy-from-remote-repository/verify.groovy)
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/it/projects/copy-from-remote-repository/verify.bsh?p2=maven/plugins/trunk/maven-dependency-plugin/src/it/projects/copy-from-remote-repository/verify.bsh&p1=maven/plugins/trunk/maven-dependency-plugin/src/it/projects/copy-from-remote-repository/verify.groovy&r1=1776513&r2=1776610&rev=1776610&view=diff
==
---
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/copy-from-remote-repository/verify.groovy
(original)
+++
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/copy-from-remote-repository/verify.bsh
Fri Dec 30 17:13:57 2016
@@ -16,19 +16,27 @@
* specific language governing permissions and limitations
* under the License.
*/
-
+
import java.io.*;
-File buildLog = new File( basedir, 'build.log' )
-assert buildLog.exists()
-String expectedDownloadin
maven-wagon git commit: Adding timestamps to wagon-http Surefire logs
Repository: maven-wagon
Updated Branches:
refs/heads/jetty-8 df0af51bc -> 05d04b298
Adding timestamps to wagon-http Surefire logs
* Be able to measure how long it takes to download the 4Go test file
(and write the downloaded data to disk) in HugeFileDownloadTest.
* Adding log lines before/after the creation of the test file and
download, to measure how much time this actually takes.
Project: http://git-wip-us.apache.org/repos/asf/maven-wagon/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-wagon/commit/05d04b29
Tree: http://git-wip-us.apache.org/repos/asf/maven-wagon/tree/05d04b29
Diff: http://git-wip-us.apache.org/repos/asf/maven-wagon/diff/05d04b29
Branch: refs/heads/jetty-8
Commit: 05d04b298137b9d072fd284f34ade504ec163c9f
Parents: df0af51
Author: Guillaume Boué
Authored: Sat Dec 31 18:33:32 2016 +0100
Committer: Guillaume Boué
Committed: Sat Dec 31 18:33:32 2016 +0100
--
wagon-providers/wagon-http/pom.xml | 2 ++
.../wagon/providers/http/HugeFileDownloadTest.java | 13 ++---
2 files changed, 12 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/05d04b29/wagon-providers/wagon-http/pom.xml
--
diff --git a/wagon-providers/wagon-http/pom.xml
b/wagon-providers/wagon-http/pom.xml
index e32cfcc..27554b9 100644
--- a/wagon-providers/wagon-http/pom.xml
+++ b/wagon-providers/wagon-http/pom.xml
@@ -163,6 +163,8 @@ under the License.
true
true
+
true
+
-MM-dd'T'HH:mm:ss.SSS
http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/05d04b29/wagon-providers/wagon-http/src/test/java/org/apache/maven/wagon/providers/http/HugeFileDownloadTest.java
--
diff --git
a/wagon-providers/wagon-http/src/test/java/org/apache/maven/wagon/providers/http/HugeFileDownloadTest.java
b/wagon-providers/wagon-http/src/test/java/org/apache/maven/wagon/providers/http/HugeFileDownloadTest.java
index fba63c4..4489b6b 100644
---
a/wagon-providers/wagon-http/src/test/java/org/apache/maven/wagon/providers/http/HugeFileDownloadTest.java
+++
b/wagon-providers/wagon-http/src/test/java/org/apache/maven/wagon/providers/http/HugeFileDownloadTest.java
@@ -29,6 +29,8 @@ import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.servlet.DefaultServlet;
import org.eclipse.jetty.servlet.ServletContextHandler;
import org.eclipse.jetty.servlet.ServletHolder;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
@@ -46,6 +48,8 @@ public class HugeFileDownloadTest
extends PlexusTestCase
{
+private static final Logger LOGGER = LoggerFactory.getLogger(
HugeFileDownloadTest.class );
+
private static long HUGE_FILE_SIZE =
Integer.valueOf( Integer.MAX_VALUE ).longValue() + Integer.valueOf(
Integer.MAX_VALUE ).longValue();
@@ -78,9 +82,11 @@ public class HugeFileDownloadTest
dest = File.createTempFile( "huge", "txt" );
+LOGGER.info( "Fetching 'hugefile.txt' with content length" );
wagon.get( "hugefile.txt", dest );
Assert.assertTrue( dest.length() >= HUGE_FILE_SIZE );
+LOGGER.info( "The file was successfully fetched" );
wagon.disconnect();
}
@@ -91,7 +97,6 @@ public class HugeFileDownloadTest
hugeFile.delete();
}
-
}
public void testDownloadHugeFileWithChunked()
@@ -137,9 +142,11 @@ public class HugeFileDownloadTest
dest = File.createTempFile( "huge", "txt" );
+LOGGER.info( "Fetching 'hugefile.txt' in chunks" );
wagon.get( "hugefile.txt", dest );
Assert.assertTrue( dest.length() >= HUGE_FILE_SIZE );
+LOGGER.info( "The file was successfully fetched" );
wagon.disconnect();
}
@@ -150,10 +157,8 @@ public class HugeFileDownloadTest
hugeFile.delete();
}
-
}
-
protected Wagon getWagon()
throws Exception
{
@@ -169,6 +174,7 @@ public class HugeFileDownloadTest
private void makeHugeFile( File hugeFile )
throws Exception
{
+LOGGER.info( "Creating test file" );
if ( Os.isFamily( Os.FAMILY_WINDOWS ) )
{
Process p = new ProcessBuilder( "fsutil", "file", "createnew",
hugeFile.getAbsolutePath(),
@@ -183,6 +189,7 @@ public class HugeFileDownloadTest
ra.write( 1 );
ra.close();
}
+LOGGER.info( "Test file created" );
}
}
svn commit: r1777913 - /maven/release/trunk/maven-release-manager/pom.xml
Author: gboue Date: Sun Jan 8 21:17:21 2017 New Revision: 1777913 URL: http://svn.apache.org/viewvc?rev=1777913&view=rev Log: [MRELEASE-964] Error injecting: org.apache.maven.shared.release.phase.RewritePomsForReleasePhase jaxen is bringing a conflicting dependency of JDom (version 1.0 when the plugin depends on 1.1). Instead of excluding jdom, the Jaxen dependency can be removed as XPath is not used anymore: it was introduced in r397561 for the RewritePomsForReleasePhase class, the code depending on it was later moved to AbstractRewritePomsPhase in r398224, and that code was rewritten in r1179704, removing the XPath dependency. Modified: maven/release/trunk/maven-release-manager/pom.xml Modified: maven/release/trunk/maven-release-manager/pom.xml URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/pom.xml?rev=1777913&r1=1777912&r2=1777913&view=diff == --- maven/release/trunk/maven-release-manager/pom.xml (original) +++ maven/release/trunk/maven-release-manager/pom.xml Sun Jan 8 21:17:21 2017 @@ -153,30 +153,6 @@ org.jdom jdom - - jaxen - jaxen - 1.1-beta-8 - runtime - - - dom4j - dom4j - - - xerces - xmlParserAPIs - - - xerces - xercesImpl - - - xom - xom - - - junit
svn commit: r1777917 - in /maven/release/trunk/maven-release-manager: pom.xml src/main/java/org/apache/maven/shared/release/phase/MapVersionsPhase.java src/test/java/org/apache/maven/shared/release/ph
Author: gboue
Date: Sun Jan 8 22:33:36 2017
New Revision: 1777917
URL: http://svn.apache.org/viewvc?rev=1777917&view=rev
Log:
[MRELEASE-975] NPE when using an unknown project versionpolicy id
Passing an empty version policy hint (with -DprojectVersionPolicyId on the
command-line), on an unknown one, should result in a helpful exception being
thrown (not NullPointerException). Upgrading JUnit to 4.11 to use the expected
exception mechanism (in order to test that the cause of the exception thrown is
a PolicyException). This closes #8.
Modified:
maven/release/trunk/maven-release-manager/pom.xml
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/MapVersionsPhase.java
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/MapVersionsPhaseTest.java
Modified: maven/release/trunk/maven-release-manager/pom.xml
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/pom.xml?rev=1777917&r1=1777916&r2=1777917&view=diff
==
--- maven/release/trunk/maven-release-manager/pom.xml (original)
+++ maven/release/trunk/maven-release-manager/pom.xml Sun Jan 8 22:33:36 2017
@@ -157,7 +157,7 @@
junit
junit
- 4.10
+ 4.11
test
Modified:
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/MapVersionsPhase.java
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/MapVersionsPhase.java?rev=1777917&r1=1777916&r2=1777917&view=diff
==
---
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/MapVersionsPhase.java
(original)
+++
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/MapVersionsPhase.java
Sun Jan 8 22:33:36 2017
@@ -321,8 +321,12 @@ public class MapVersionsPhase
throws PolicyException, VersionParseException
{
VersionPolicy policy = versionPolicies.get( policyId );
-VersionPolicyRequest request = new VersionPolicyRequest().setVersion(
baseVersion );
+if ( policy == null )
+{
+throw new PolicyException( "Policy '" + policyId + "' is unknown,
available: " + versionPolicies.keySet() );
+}
+VersionPolicyRequest request = new VersionPolicyRequest().setVersion(
baseVersion );
return convertToSnapshot ? policy.getDevelopmentVersion( request
).getVersion()
: policy.getReleaseVersion( request ).getVersion();
}
Modified:
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/MapVersionsPhaseTest.java
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/MapVersionsPhaseTest.java?rev=1777917&r1=1777916&r2=1777917&view=diff
==
---
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/MapVersionsPhaseTest.java
(original)
+++
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/MapVersionsPhaseTest.java
Sun Jan 8 22:33:36 2017
@@ -42,10 +42,14 @@ import org.apache.maven.shared.release.P
import org.apache.maven.shared.release.ReleaseExecutionException;
import org.apache.maven.shared.release.config.ReleaseDescriptor;
import org.apache.maven.shared.release.env.DefaultReleaseEnvironment;
+import org.apache.maven.shared.release.policy.PolicyException;
import org.apache.maven.shared.release.versions.VersionParseException;
import org.codehaus.plexus.components.interactivity.Prompter;
import org.codehaus.plexus.components.interactivity.PrompterException;
+import org.hamcrest.CoreMatchers;
+import org.junit.Rule;
import org.junit.Test;
+import org.junit.rules.ExpectedException;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
@@ -63,6 +67,9 @@ public class MapVersionsPhaseTest
private static final String TEST_MAP_RELEASE_VERSIONS =
"test-map-release-versions";
+@Rule
+public ExpectedException expectedException = ExpectedException.none();
+
@Mock
private Prompter mockPrompter;
@@ -2112,6 +2119,29 @@ public class MapVersionsPhaseTest
verify( mockPrompter ).prompt( startsWith( "What is the release
version for " ), eq( "1.11" ) );
}
+/**
+ * MRELEASE-975: Test that a PolicyException is thrown when using an
unknown policy version hint.
+ * @throws Exception
+ */
+@Test
+public void testNonExistentVersionPolicy()
svn commit: r1777925 - in /maven/release/trunk/maven-release-plugin/src: it/projects/branch/MRELEASE-976/ it/projects/prepare/MRELEASE-976/ it/projects/update-versions/MRELEASE-976/ it/setup/maven-pro
Author: gboue Date: Mon Jan 9 01:21:56 2017 New Revision: 1777925 URL: http://svn.apache.org/viewvc?rev=1777925&view=rev Log: [MRELEASE-976] release:branch should also support project version policies Adding parameter projectVersionPolicyId to the branch and update-versions goals. The ITs are done by creating a stub version policy that switches between snapshot and release and testing that it is possible to invoke release:branch, release:update-versions and release:prepare on a sample project with this custom policy. This closes #9. Added: maven/release/trunk/maven-release-plugin/src/it/projects/branch/MRELEASE-976/ maven/release/trunk/maven-release-plugin/src/it/projects/branch/MRELEASE-976/pom.xml (with props) maven/release/trunk/maven-release-plugin/src/it/projects/branch/MRELEASE-976/verify.groovy (with props) maven/release/trunk/maven-release-plugin/src/it/projects/prepare/MRELEASE-976/ maven/release/trunk/maven-release-plugin/src/it/projects/prepare/MRELEASE-976/pom.xml (with props) maven/release/trunk/maven-release-plugin/src/it/projects/prepare/MRELEASE-976/verify.groovy (with props) maven/release/trunk/maven-release-plugin/src/it/projects/update-versions/MRELEASE-976/ maven/release/trunk/maven-release-plugin/src/it/projects/update-versions/MRELEASE-976/pom.xml (with props) maven/release/trunk/maven-release-plugin/src/it/projects/update-versions/MRELEASE-976/verify.groovy (with props) maven/release/trunk/maven-release-plugin/src/it/setup/maven-project-version-stub-policy/ maven/release/trunk/maven-release-plugin/src/it/setup/maven-project-version-stub-policy/invoker.properties (with props) maven/release/trunk/maven-release-plugin/src/it/setup/maven-project-version-stub-policy/pom.xml (with props) maven/release/trunk/maven-release-plugin/src/it/setup/maven-project-version-stub-policy/src/ maven/release/trunk/maven-release-plugin/src/it/setup/maven-project-version-stub-policy/src/main/ maven/release/trunk/maven-release-plugin/src/it/setup/maven-project-version-stub-policy/src/main/java/ maven/release/trunk/maven-release-plugin/src/it/setup/maven-project-version-stub-policy/src/main/java/org/ maven/release/trunk/maven-release-plugin/src/it/setup/maven-project-version-stub-policy/src/main/java/org/apache/ maven/release/trunk/maven-release-plugin/src/it/setup/maven-project-version-stub-policy/src/main/java/org/apache/maven/ maven/release/trunk/maven-release-plugin/src/it/setup/maven-project-version-stub-policy/src/main/java/org/apache/maven/shared/ maven/release/trunk/maven-release-plugin/src/it/setup/maven-project-version-stub-policy/src/main/java/org/apache/maven/shared/release/ maven/release/trunk/maven-release-plugin/src/it/setup/maven-project-version-stub-policy/src/main/java/org/apache/maven/shared/release/policy/ maven/release/trunk/maven-release-plugin/src/it/setup/maven-project-version-stub-policy/src/main/java/org/apache/maven/shared/release/policy/stub/ maven/release/trunk/maven-release-plugin/src/it/setup/maven-project-version-stub-policy/src/main/java/org/apache/maven/shared/release/policy/stub/StubVersionPolicy.java (with props) Modified: maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/BranchReleaseMojo.java maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/UpdateVersionsMojo.java Added: maven/release/trunk/maven-release-plugin/src/it/projects/branch/MRELEASE-976/pom.xml URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-plugin/src/it/projects/branch/MRELEASE-976/pom.xml?rev=1777925&view=auto == --- maven/release/trunk/maven-release-plugin/src/it/projects/branch/MRELEASE-976/pom.xml (added) +++ maven/release/trunk/maven-release-plugin/src/it/projects/branch/MRELEASE-976/pom.xml Mon Jan 9 01:21:56 2017 @@ -0,0 +1,55 @@ + + +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/maven-v4_0_0.xsd";> + 4.0.0 + org.apache.maven.plugin.release.it + mrelease-976 + 1.0-SNAPSHOT + https://issues.apache.org/jira/browse/MRELEASE-976 + Tests that release:branch supports setting a custom projectVersionPolicyId + +scm:dummy|nul +scm:dummy|nul + + + + +maven-release-plugin + + branch-mrelease-976 + StubVersionPolicy + + + +org.apache.maven.its.release +maven-scm-provider-dummy +1.0 + + +org.apache.maven.its.release +maven-project-version-stub-policy +1.0 + + + + + + Propchange: maven/release/trunk/
maven git commit: [MNG-6117] ${session.parallel} not correctly set
Repository: maven
Updated Branches:
refs/heads/MNG-6117 [created] bd98ae6a3
[MNG-6117] ${session.parallel} not correctly set
MultiThreadedBuilder must set parallel to true when it's using more than
1 thread to build: i.e. a degree of concurrency greater than 1 (-T) and
more than 1 project to build. Since each ProjectSegment works on a
cloned session instance (see
BuildListCalculator#calculateProjectBuilds), the flag must be also set
on each cloned session.
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/bd98ae6a
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/bd98ae6a
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/bd98ae6a
Branch: refs/heads/MNG-6117
Commit: bd98ae6a3de8d443f5b3d2f895f2348c2912ae05
Parents: e51fc87
Author: Guillaume Boué
Authored: Sun Nov 13 22:46:18 2016 +0100
Committer: Guillaume Boué
Committed: Mon Jan 9 21:50:07 2017 +0100
--
.../multithreaded/MultiThreadedBuilder.java | 18 ++
1 file changed, 14 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven/blob/bd98ae6a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/multithreaded/MultiThreadedBuilder.java
--
diff --git
a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/multithreaded/MultiThreadedBuilder.java
b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/multithreaded/MultiThreadedBuilder.java
index b3e35e0..f0fa2ac 100644
---
a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/multithreaded/MultiThreadedBuilder.java
+++
b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/multithreaded/MultiThreadedBuilder.java
@@ -44,7 +44,11 @@ import org.codehaus.plexus.component.annotations.Requirement;
import org.codehaus.plexus.logging.Logger;
/**
- * Builds the full lifecycle in weave-mode (phase by phase as opposed to
project-by-project)
+ * Builds the full lifecycle in weave-mode (phase by phase as opposed to
project-by-project).
+ *
+ * This builder uses a number of threads equal to the minimum of the degree of
concurrency (which is the thread count
+ * set with -T on the command-line) and the number of projects to
build. As such, building a single project
+ * will always result in a sequential build, regardless of the thread count.
*
* @since 3.0
* @author Kristian Rosenvold
@@ -73,9 +77,15 @@ public class MultiThreadedBuilder
List taskSegments, ReactorBuildStatus
reactorBuildStatus )
throws ExecutionException, InterruptedException
{
-ExecutorService executor =
-Executors.newFixedThreadPool( Math.min(
session.getRequest().getDegreeOfConcurrency(),
-
session.getProjects().size() ), new BuildThreadFactory() );
+int nThreads = Math.min(
session.getRequest().getDegreeOfConcurrency(), session.getProjects().size() );
+boolean parallel = nThreads >= 2;
+// Propagate the parallel flag to the root session and all of the
cloned sessions in each project segment
+session.setParallel( parallel );
+for ( ProjectSegment segment : projectBuilds )
+{
+segment.getSession().setParallel( parallel );
+}
+ExecutorService executor = Executors.newFixedThreadPool( nThreads, new
BuildThreadFactory() );
CompletionService service = new
ExecutorCompletionService<>( executor );
ConcurrencyDependencyGraph analyzer =
new ConcurrencyDependencyGraph( projectBuilds,
session.getProjectDependencyGraph() );
svn commit: r1778362 - in /maven/plugin-tools/trunk: ./ maven-plugin-tools-java/src/test/java/org/apache/maven/tools/plugin/extractor/javadoc/ maven-plugin-tools-java/src/test/resources/MPLUGIN-314/ m
Author: gboue
Date: Thu Jan 12 00:07:08 2017
New Revision: 1778362
URL: http://svn.apache.org/viewvc?rev=1778362&view=rev
Log:
[MPLUGIN-314] invalid requirement role generated in plugin.xml
[MPLUGIN-320] JavaJavadocMojoDescriptorExtractor fails with Java 8 lambdas.
Updating QDox to 2.0-M5, containing the fixes for both of those issues (see
QDOX-13 and QDOX-15).
Added:
maven/plugin-tools/trunk/maven-plugin-tools-java/src/test/resources/MPLUGIN-314/
maven/plugin-tools/trunk/maven-plugin-tools-java/src/test/resources/MPLUGIN-314/MyMojo.java
(with props)
maven/plugin-tools/trunk/maven-plugin-tools-java/src/test/resources/MPLUGIN-314/plugin-expected.xml
(with props)
maven/plugin-tools/trunk/maven-plugin-tools-java/src/test/resources/MPLUGIN-320/
maven/plugin-tools/trunk/maven-plugin-tools-java/src/test/resources/MPLUGIN-320/Exceptions.java
(with props)
maven/plugin-tools/trunk/maven-plugin-tools-java/src/test/resources/MPLUGIN-320/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
maven/plugin-tools/trunk/pom.xml
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=1778362&r1=1778361&r2=1778362&view=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
Thu Jan 12 00:07:08 2017
@@ -233,4 +233,20 @@ public class JavaMojoDescriptorExtractor
assertEquals( 1, results.size() );
}
+public void testSingleTypeImportWithFullyQualifiedClassName()
+throws Exception
+{
+List results = extract( "MPLUGIN-314" );
+
+assertEquals( 1, results.size() );
+}
+
+public void testMethodReferenceInEnumConstructor()
+throws Exception
+{
+List results = extract( "MPLUGIN-320" );
+
+assertNull( results );
+}
+
}
Added:
maven/plugin-tools/trunk/maven-plugin-tools-java/src/test/resources/MPLUGIN-314/MyMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-tools-java/src/test/resources/MPLUGIN-314/MyMojo.java?rev=1778362&view=auto
==
---
maven/plugin-tools/trunk/maven-plugin-tools-java/src/test/resources/MPLUGIN-314/MyMojo.java
(added)
+++
maven/plugin-tools/trunk/maven-plugin-tools-java/src/test/resources/MPLUGIN-314/MyMojo.java
Thu Jan 12 00:07:08 2017
@@ -0,0 +1,41 @@
+/*
+ * 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.resolver.ArtifactResolver;
+import org.apache.maven.plugin.AbstractMojo;
+
+/**
+ * Tests that using an import and the same fully qualified class name results
in a correct requirement role generated.
+ *
+ * @goal test
+ */
+public class MyMojo
+extends AbstractMojo
+{
+
+/**
+ * @component
+ */
+private org.apache.maven.artifact.resolver.ArtifactResolver resolver;
+
+public void execute()
+{
+}
+
+}
Propchange:
maven/plugin-tools/trunk/maven-plugin-tools-java/src/test/resources/MPLUGIN-314/MyMojo.java
--
svn:eol-style = native
Propchange:
maven/plugin-tools/trunk/maven-plugin-tools-java/src/test/resources/MPLUGIN-314/MyMojo.java
--
svn:keywords = Author Date Id Revision
Added:
maven/plugin-tools/trunk/maven-plugin-tools-java/src/test/resources/MPLUGI
svn commit: r1778360 - /maven/plugin-tools/trunk/maven-plugin-plugin/src/it/mplugin-319_report-since/invoker.properties
Author: gboue Date: Thu Jan 12 00:06:37 2017 New Revision: 1778360 URL: http://svn.apache.org/viewvc?rev=1778360&view=rev Log: [MPLUGIN-319] @since values ignored in report The IT relies on reading the generated HTML site for the test mojo in English, but the report is written in the default locale of the JVM. As such, it fails when run on machines with a locale different than English. Therefore, the locale needs to be forced to English in the MAVEN_OPTS. Modified: maven/plugin-tools/trunk/maven-plugin-plugin/src/it/mplugin-319_report-since/invoker.properties Modified: maven/plugin-tools/trunk/maven-plugin-plugin/src/it/mplugin-319_report-since/invoker.properties URL: http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-plugin/src/it/mplugin-319_report-since/invoker.properties?rev=1778360&r1=1778359&r2=1778360&view=diff == --- maven/plugin-tools/trunk/maven-plugin-plugin/src/it/mplugin-319_report-since/invoker.properties (original) +++ maven/plugin-tools/trunk/maven-plugin-plugin/src/it/mplugin-319_report-since/invoker.properties Thu Jan 12 00:06:37 2017 @@ -16,3 +16,4 @@ # under the License. invoker.goals = clean plugin:report +invoker.mavenOpts = -Duser.language=en -Duser.country=US -Duser.variant=US
svn commit: r1778361 - in /maven/plugin-tools/trunk/maven-plugin-tools-annotations/src/test/java/org/apache/maven/tools/plugin/extractor/annotations: TestAnnotationsReader.java scanner/DefaultMojoAnno
Author: gboue
Date: Thu Jan 12 00:06:50 2017
New Revision: 1778361
URL: http://svn.apache.org/viewvc?rev=1778361&view=rev
Log:
Updating the unit tests so that they can be run successfully directly inside
Eclipse: this means fixing the location of the basedir by extending from
PlexusTestCase and using the getBasedir() method.
Modified:
maven/plugin-tools/trunk/maven-plugin-tools-annotations/src/test/java/org/apache/maven/tools/plugin/extractor/annotations/TestAnnotationsReader.java
maven/plugin-tools/trunk/maven-plugin-tools-annotations/src/test/java/org/apache/maven/tools/plugin/extractor/annotations/scanner/DefaultMojoAnnotationsScannerTest.java
Modified:
maven/plugin-tools/trunk/maven-plugin-tools-annotations/src/test/java/org/apache/maven/tools/plugin/extractor/annotations/TestAnnotationsReader.java
URL:
http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-tools-annotations/src/test/java/org/apache/maven/tools/plugin/extractor/annotations/TestAnnotationsReader.java?rev=1778361&r1=1778360&r2=1778361&view=diff
==
---
maven/plugin-tools/trunk/maven-plugin-tools-annotations/src/test/java/org/apache/maven/tools/plugin/extractor/annotations/TestAnnotationsReader.java
(original)
+++
maven/plugin-tools/trunk/maven-plugin-tools-annotations/src/test/java/org/apache/maven/tools/plugin/extractor/annotations/TestAnnotationsReader.java
Thu Jan 12 00:06:50 2017
@@ -50,7 +50,7 @@ public class TestAnnotationsReader
MojoAnnotationsScanner mojoAnnotationsScanner =
(MojoAnnotationsScanner) lookup( MojoAnnotationsScanner.ROLE );
MojoAnnotationsScannerRequest request = new
MojoAnnotationsScannerRequest();
-request.setClassesDirectories( Collections.singletonList( new File(
"target/test-classes" ) ) );
+request.setClassesDirectories( Collections.singletonList( new File(
getBasedir(), "target/test-classes" ) ) );
request.setIncludePatterns( Arrays.asList( "**/FooMojo.class" ) );
request.setProject( new MavenProject() );
Modified:
maven/plugin-tools/trunk/maven-plugin-tools-annotations/src/test/java/org/apache/maven/tools/plugin/extractor/annotations/scanner/DefaultMojoAnnotationsScannerTest.java
URL:
http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-tools-annotations/src/test/java/org/apache/maven/tools/plugin/extractor/annotations/scanner/DefaultMojoAnnotationsScannerTest.java?rev=1778361&r1=1778360&r2=1778361&view=diff
==
---
maven/plugin-tools/trunk/maven-plugin-tools-annotations/src/test/java/org/apache/maven/tools/plugin/extractor/annotations/scanner/DefaultMojoAnnotationsScannerTest.java
(original)
+++
maven/plugin-tools/trunk/maven-plugin-tools-annotations/src/test/java/org/apache/maven/tools/plugin/extractor/annotations/scanner/DefaultMojoAnnotationsScannerTest.java
Thu Jan 12 00:06:50 2017
@@ -23,17 +23,17 @@ import static org.easymock.EasyMock.*;
import java.io.File;
+import org.codehaus.plexus.PlexusTestCase;
import org.codehaus.plexus.logging.Logger;
-import junit.framework.TestCase;
public class DefaultMojoAnnotationsScannerTest
-extends TestCase
+extends PlexusTestCase
{
private DefaultMojoAnnotationsScanner scanner = new
DefaultMojoAnnotationsScanner();
public void testSkipModuleInfoClassInArchive() throws Exception
{
-scanner.scanArchive( new File( "src/test/resources/java9-module.jar"),
null, false );
+scanner.scanArchive( new File( getBasedir(),
"target/test-classes/java9-module.jar"), null, false );
}
public void testJava8Annotations() throws Exception
@@ -42,7 +42,7 @@ public class DefaultMojoAnnotationsScann
expect( logger.isDebugEnabled() ).andReturn( false );
replay( logger );
scanner.enableLogging( logger );
-scanner.scanArchive( new File(
"src/test/resources/java8-annotations.jar"), null, false );
+scanner.scanArchive( new File( getBasedir(),
"target/test-classes/java8-annotations.jar"), null, false );
}
}
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
Author: gboue Date: Sun Jan 15 12:19:50 2017 New Revision: 1778908 URL: http://svn.apache.org/viewvc?rev=1778908&view=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&r1=1778907&r2=1778908&view=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&r1=1778907&r2=1778908&view=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&r1=1778907&r2=1778908&view=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&r1=1778907&r2=1778908&view=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&r1=1778907&r2=1778908&view=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&r1=1778907&r2=1778908&view=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/viewv
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/
Author: gboue
Date: Sun Jan 15 13:08:04 2017
New Revision: 1778912
URL: http://svn.apache.org/viewvc?rev=1778912&view=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&r1=1778911&r2=1778912&view=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&view=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&view=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
-
maven git commit: [MNG-6117] ${session.parallel} not correctly set
Repository: maven
Updated Branches:
refs/heads/master c6c5192d4 -> d413296cf
[MNG-6117] ${session.parallel} not correctly set
MultiThreadedBuilder must set parallel to true when it's using more than
1 thread to build: i.e. a degree of concurrency greater than 1 (-T) and
more than 1 project to build. Since each ProjectSegment works on a
cloned session instance (see
BuildListCalculator#calculateProjectBuilds), the flag must be also set
on each cloned session.
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/d413296c
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/d413296c
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/d413296c
Branch: refs/heads/master
Commit: d413296cf396d4df385d1323843f9464af0c8a3e
Parents: c6c5192
Author: Guillaume Boué
Authored: Sun Nov 13 22:46:18 2016 +0100
Committer: Guillaume Boué
Committed: Mon Jan 16 20:29:49 2017 +0100
--
.../multithreaded/MultiThreadedBuilder.java | 18 ++
1 file changed, 14 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven/blob/d413296c/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/multithreaded/MultiThreadedBuilder.java
--
diff --git
a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/multithreaded/MultiThreadedBuilder.java
b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/multithreaded/MultiThreadedBuilder.java
index b3e35e0..f0fa2ac 100644
---
a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/multithreaded/MultiThreadedBuilder.java
+++
b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/multithreaded/MultiThreadedBuilder.java
@@ -44,7 +44,11 @@ import org.codehaus.plexus.component.annotations.Requirement;
import org.codehaus.plexus.logging.Logger;
/**
- * Builds the full lifecycle in weave-mode (phase by phase as opposed to
project-by-project)
+ * Builds the full lifecycle in weave-mode (phase by phase as opposed to
project-by-project).
+ *
+ * This builder uses a number of threads equal to the minimum of the degree of
concurrency (which is the thread count
+ * set with -T on the command-line) and the number of projects to
build. As such, building a single project
+ * will always result in a sequential build, regardless of the thread count.
*
* @since 3.0
* @author Kristian Rosenvold
@@ -73,9 +77,15 @@ public class MultiThreadedBuilder
List taskSegments, ReactorBuildStatus
reactorBuildStatus )
throws ExecutionException, InterruptedException
{
-ExecutorService executor =
-Executors.newFixedThreadPool( Math.min(
session.getRequest().getDegreeOfConcurrency(),
-
session.getProjects().size() ), new BuildThreadFactory() );
+int nThreads = Math.min(
session.getRequest().getDegreeOfConcurrency(), session.getProjects().size() );
+boolean parallel = nThreads >= 2;
+// Propagate the parallel flag to the root session and all of the
cloned sessions in each project segment
+session.setParallel( parallel );
+for ( ProjectSegment segment : projectBuilds )
+{
+segment.getSession().setParallel( parallel );
+}
+ExecutorService executor = Executors.newFixedThreadPool( nThreads, new
BuildThreadFactory() );
CompletionService service = new
ExecutorCompletionService<>( executor );
ConcurrencyDependencyGraph analyzer =
new ConcurrencyDependencyGraph( projectBuilds,
session.getProjectDependencyGraph() );
[maven] Git Push Summary
Repository: maven Updated Branches: refs/heads/MNG-6117 [deleted] bd98ae6a3
svn commit: r1779510 - in /maven/release/trunk: maven-release-manager/src/main/ maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ maven-release-manager/src/test/java/org/apach
Author: gboue
Date: Thu Jan 19 19:22:25 2017
New Revision: 1779510
URL: http://svn.apache.org/viewvc?rev=1779510&view=rev
Log:
[MRELEASE-977] release:branch should prompt for branch name if none is given
Submitted by Henning Schmiedehausen
When a release is made in interactive mode, the plugin will now ask for a
branch name instead of ending with an error. In batch mode, the branch name is
still required, so the current behaviour is unchanged.
Added:
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/BranchInputVariablesPhaseTest.java
(with props)
Modified:
maven/release/trunk/maven-release-manager/src/main/components-fragment.xml
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/InputVariablesPhase.java
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/InputVariablesPhaseTest.java
maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/BranchReleaseMojo.java
Modified:
maven/release/trunk/maven-release-manager/src/main/components-fragment.xml
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/components-fragment.xml?rev=1779510&r1=1779509&r2=1779510&view=diff
==
--- maven/release/trunk/maven-release-manager/src/main/components-fragment.xml
(original)
+++ maven/release/trunk/maven-release-manager/src/main/components-fragment.xml
Thu Jan 19 19:22:25 2017
@@ -70,6 +70,7 @@
scm-check-modifications
create-backup-poms
map-branch-versions
+ branch-input-variables
map-development-versions
rewrite-poms-for-branch
scm-commit-branch
@@ -220,6 +221,40 @@
org.apache.maven.shared.release.scm.ScmRepositoryConfigurator
+
+
+
+ org.apache.maven.shared.release.phase.ReleasePhase
+ input-variables
+
org.apache.maven.shared.release.phase.InputVariablesPhase
+
+false
+
+
+
+ org.codehaus.plexus.components.interactivity.Prompter
+ default
+
+
+
org.apache.maven.shared.release.scm.ScmRepositoryConfigurator
+
+
+
+
+ org.apache.maven.shared.release.phase.ReleasePhase
+ branch-input-variables
+
org.apache.maven.shared.release.phase.InputVariablesPhase
+
+true
+
+
+
+ org.codehaus.plexus.components.interactivity.Prompter
+ default
+
+
+
org.apache.maven.shared.release.scm.ScmRepositoryConfigurator
+
Modified:
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/InputVariablesPhase.java
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/InputVariablesPhase.java?rev=1779510&r1=1779509&r2=1779510&view=diff
==
---
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/InputVariablesPhase.java
(original)
+++
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/InputVariablesPhase.java
Thu Jan 19 19:22:25 2017
@@ -32,7 +32,6 @@ import org.apache.maven.shared.release.e
import org.apache.maven.shared.release.scm.ReleaseScmRepositoryException;
import org.apache.maven.shared.release.scm.ScmRepositoryConfigurator;
import org.apache.maven.shared.release.util.ReleaseUtil;
-import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.component.annotations.Requirement;
import org.codehaus.plexus.components.interactivity.Prompter;
import org.codehaus.plexus.components.interactivity.PrompterException;
@@ -42,6 +41,7 @@ import org.codehaus.plexus.interpolation
import org.codehaus.plexus.interpolation.PrefixedPropertiesValueSource;
import org.codehaus.plexus.interpolation.RecursionInterceptor;
import org.codehaus.plexus.interpolation.StringSearchInterpolator;
+import org.codehaus.plexus.util.StringUtils;
import java.util.List;
import java.util.Properties;
@@ -51,7 +51,6 @@ import java.util.Properties;
*
* @author mailto:br...@apache.org";>Brett Porter
*/
-@Component( role = ReleasePhase.class, hint = "input-variables" )
public class InputVariablesPhase
extends AbstractReleasePhase
{
@@ -62,6 +61,11 @@ public class InputVariablesPhase
private Prompter prompter;
/**
+ * Whether this is a branch or a tag operation.
+ */
+private boolean branchOperation;
+
+/**
* Tool that gets a configured SCM repository from release configuration.
*/
@Requirement
@@ -72,6 +76,11 @@ public cl
svn commit: r1779527 - in /maven/plugins/trunk/maven-checkstyle-plugin: ./ src/main/java/org/apache/maven/plugin/ src/main/java/org/apache/maven/plugins/ src/main/java/org/apache/maven/plugins/checkst
Author: gboue Date: Thu Jan 19 21:06:23 2017 New Revision: 1779527 URL: http://svn.apache.org/viewvc?rev=1779527&view=rev Log: [MCHECKSTYLE-335] Migrate plugin to Maven 3.0 Upgrading the Maven version to 3.0 in the POM: - Passing version to 3.0.0-SNAPSHOT to mark the upgrade - Renaming the packages to org.apache.maven.plugins - Removing Maven 2 specific quirks Added: maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugins/ maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugins/checkstyle/ maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugins/checkstyle/AbstractCheckstyleReport.java - copied, changed from r1776692, maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/AbstractCheckstyleReport.java maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugins/checkstyle/CheckstyleAggregateReport.java - copied, changed from r1776692, maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleAggregateReport.java maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugins/checkstyle/CheckstyleReport.java - copied, changed from r1776692, maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReport.java maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugins/checkstyle/CheckstyleReportGenerator.java - copied, changed from r1776692, maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReportGenerator.java maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugins/checkstyle/CheckstyleViolationCheckMojo.java - copied, changed from r1776692, maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleViolationCheckMojo.java maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugins/checkstyle/IconTool.java - copied, changed from r1776692, maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/IconTool.java maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugins/checkstyle/ReportResource.java - copied, changed from r1776692, maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/ReportResource.java maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugins/checkstyle/RuleUtil.java - copied, changed from r1776692, maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/RuleUtil.java maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugins/checkstyle/exec/ - copied from r1779526, maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/exec/ maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugins/checkstyle/resource/ - copied from r1779526, maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/resource/ maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugins/checkstyle/rss/ - copied from r1779526, maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/rss/ maven/plugins/trunk/maven-checkstyle-plugin/src/main/resources/org/apache/maven/plugins/ - copied from r1779526, maven/plugins/trunk/maven-checkstyle-plugin/src/main/resources/org/apache/maven/plugin/ maven/plugins/trunk/maven-checkstyle-plugin/src/test/java/org/apache/maven/plugins/ maven/plugins/trunk/maven-checkstyle-plugin/src/test/java/org/apache/maven/plugins/checkstyle/ maven/plugins/trunk/maven-checkstyle-plugin/src/test/java/org/apache/maven/plugins/checkstyle/CheckstyleReportTest.java - copied, changed from r1776692, maven/plugins/trunk/maven-checkstyle-plugin/src/test/java/org/apache/maven/plugin/checkstyle/CheckstyleReportTest.java maven/plugins/trunk/maven-checkstyle-plugin/src/test/java/org/apache/maven/plugins/checkstyle/CheckstyleViolationCheckMojoTest.java - copied, changed from r1776692, maven/plugins/trunk/maven-checkstyle-plugin/src/test/java/org/apache/maven/plugin/checkstyle/CheckstyleViolationCheckMojoTest.java maven/plugins/trunk/maven-checkstyle-plugin/src/test/java/org/apache/maven/plugins/checkstyle/ReportResourceTest.java - copied, changed from r1776692, maven/plugins/trunk/maven-checkstyle-plugin/src/test/java/org/apache/maven/plugin/checkstyle/ReportResourceTest.java maven/plugins/trunk/maven-checkstyle-plugin/src/test/java/org/apache/maven/plugins/checkstyle/RuleUtilTest.java - copied, changed from r1776692, maven/plugins/trunk/maven-checkstyle-pl
maven git commit: [MNG-6105] properties.internal.SystemProperties.addSystemProperties() is not really thread-safe
Repository: maven
Updated Branches:
refs/heads/MNG-6105 [created] 39c1f80cc
[MNG-6105] properties.internal.SystemProperties.addSystemProperties() is not
really thread-safe
Refactoring the current code setting system properties to synchronize correctly
on the given ones: avoids ConcurrentModificationException and
NullPointerException if the properties is modified by another thread.
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/39c1f80c
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/39c1f80c
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/39c1f80c
Branch: refs/heads/MNG-6105
Commit: 39c1f80cc4c23e19f236f8a0fa493aa3493cd070
Parents: 733eedc
Author: Guillaume Boué
Authored: Sun Oct 16 01:40:46 2016 +0200
Committer: Guillaume Boué
Committed: Tue Jan 24 19:55:30 2017 +0100
--
.../internal/MavenRepositorySystemUtils.java| 14 +
.../execution/DefaultMavenExecutionRequest.java | 4 +--
.../project/DefaultProjectBuildingRequest.java | 7 ++---
.../properties/internal/SystemProperties.java | 30 ++--
.../building/DefaultModelBuildingRequest.java | 5 +++-
.../DefaultSettingsBuildingRequest.java | 7 ++---
6 files changed, 42 insertions(+), 25 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven/blob/39c1f80c/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/MavenRepositorySystemUtils.java
--
diff --git
a/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/MavenRepositorySystemUtils.java
b/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/MavenRepositorySystemUtils.java
index 5b240ef..1b11cb3 100644
---
a/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/MavenRepositorySystemUtils.java
+++
b/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/MavenRepositorySystemUtils.java
@@ -126,14 +126,18 @@ public final class MavenRepositorySystemUtils
session.setArtifactDescriptorPolicy( new
SimpleArtifactDescriptorPolicy( true, true ) );
+final Properties systemProperties = new Properties();
+
// MNG-5670 guard against ConcurrentModificationException
-Properties sysProps = new Properties();
-for ( String key : System.getProperties().stringPropertyNames() )
+// MNG-6053 guard against key without value
+Properties sysProp = System.getProperties();
+synchronized ( sysProp )
{
-sysProps.put( key, System.getProperty( key ) );
+systemProperties.putAll( sysProp );
}
-session.setSystemProperties( sysProps );
-session.setConfigProperties( sysProps );
+
+session.setSystemProperties( systemProperties );
+session.setConfigProperties( systemProperties );
return session;
}
http://git-wip-us.apache.org/repos/asf/maven/blob/39c1f80c/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java
--
diff --git
a/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java
b/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java
index 71a6894..d67061f 100644
---
a/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java
+++
b/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java
@@ -33,6 +33,7 @@ import org.apache.maven.eventspy.internal.EventSpyDispatcher;
import org.apache.maven.model.Profile;
import org.apache.maven.project.DefaultProjectBuildingRequest;
import org.apache.maven.project.ProjectBuildingRequest;
+import org.apache.maven.properties.internal.SystemProperties;
import org.apache.maven.settings.Mirror;
import org.apache.maven.settings.Proxy;
import org.apache.maven.settings.Server;
@@ -535,8 +536,7 @@ public class DefaultMavenExecutionRequest
{
if ( properties != null )
{
-this.systemProperties = new Properties();
-this.systemProperties.putAll( properties );
+this.systemProperties = SystemProperties.copyProperties(
properties );
}
else
{
http://git-wip-us.apache.org/repos/asf/maven/blob/39c1f80c/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingRequest.java
--
diff --git
a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingRequest.java
b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingRequest.java
index f439240..f1b271b 100644
---
a/maven-core/src/main/java/
svn commit: r1780608 - in /maven/plugins/trunk/maven-checkstyle-plugin/src/it: check-tests-only/verify.groovy inlinerules/verify.groovy
Author: gboue Date: Fri Jan 27 20:37:20 2017 New Revision: 1780608 URL: http://svn.apache.org/viewvc?rev=1780608&view=rev Log: Improving current ITs, that are testing the failure of the build, by checking what was the actual cause of the failure. This makes sure the build didn't fail for another reason which isn't the one intended. Added: maven/plugins/trunk/maven-checkstyle-plugin/src/it/check-tests-only/verify.groovy (with props) Modified: maven/plugins/trunk/maven-checkstyle-plugin/src/it/inlinerules/verify.groovy Added: maven/plugins/trunk/maven-checkstyle-plugin/src/it/check-tests-only/verify.groovy URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/it/check-tests-only/verify.groovy?rev=1780608&view=auto == --- maven/plugins/trunk/maven-checkstyle-plugin/src/it/check-tests-only/verify.groovy (added) +++ maven/plugins/trunk/maven-checkstyle-plugin/src/it/check-tests-only/verify.groovy Fri Jan 27 20:37:20 2017 @@ -0,0 +1,22 @@ + +/* + * 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. + */ +def buildLog = new File( basedir, 'build.log' ) + +assert buildLog.text =~ /There are \d+ errors reported by Checkstyle/ Propchange: maven/plugins/trunk/maven-checkstyle-plugin/src/it/check-tests-only/verify.groovy -- svn:eol-style = native Propchange: maven/plugins/trunk/maven-checkstyle-plugin/src/it/check-tests-only/verify.groovy -- svn:keywords = Author Date Id Revision Modified: maven/plugins/trunk/maven-checkstyle-plugin/src/it/inlinerules/verify.groovy URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/it/inlinerules/verify.groovy?rev=1780608&r1=1780607&r2=1780608&view=diff == --- maven/plugins/trunk/maven-checkstyle-plugin/src/it/inlinerules/verify.groovy (original) +++ maven/plugins/trunk/maven-checkstyle-plugin/src/it/inlinerules/verify.groovy Fri Jan 27 20:37:20 2017 @@ -20,5 +20,7 @@ assert new File(basedir, 'target/checkst assert new File(basedir, 'target/checkstyle-header.txt').exists(); assert new File(basedir, 'target/checkstyle-result.xml').exists(); +def buildLog = new File( basedir, 'build.log' ) +assert buildLog.text =~ /There are \d+ errors reported by Checkstyle/ return true;
svn commit: r1780613 - in /maven/plugins/trunk/maven-checkstyle-plugin/src: main/java/org/apache/maven/plugins/checkstyle/ site/apt/examples/ test/plugin-configs/
Author: gboue
Date: Fri Jan 27 21:29:10 2017
New Revision: 1780613
URL: http://svn.apache.org/viewvc?rev=1780613&view=rev
Log:
[MCHECKSTYLE-275] remove old deprecated parameters from report
Now that we're moving to the next major 3.0.0, the old deprecated parameters
from CheckstyleReport can be removed. The parameter packageNamesLocation,
although not officially deprecated, doesn't do anything since the upgrade to
Checkstyle 5.0 (circa 2009 in version 2.4 with r825243 in CHECKSTYLE-105) which
removed that support, and can safely be removed as well.
Modified:
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugins/checkstyle/CheckstyleReport.java
maven/plugins/trunk/maven-checkstyle-plugin/src/site/apt/examples/custom-developed-checkstyle.apt.vm
maven/plugins/trunk/maven-checkstyle-plugin/src/test/plugin-configs/custom-plugin-config.xml
maven/plugins/trunk/maven-checkstyle-plugin/src/test/plugin-configs/dep-resolution-exception-plugin-config.xml
maven/plugins/trunk/maven-checkstyle-plugin/src/test/plugin-configs/fail-on-error-plugin-config.xml
maven/plugins/trunk/maven-checkstyle-plugin/src/test/plugin-configs/min-plugin-config.xml
maven/plugins/trunk/maven-checkstyle-plugin/src/test/plugin-configs/no-files-plugin-config.xml
maven/plugins/trunk/maven-checkstyle-plugin/src/test/plugin-configs/no-rules-plugin-config.xml
maven/plugins/trunk/maven-checkstyle-plugin/src/test/plugin-configs/no-severity-plugin-config.xml
maven/plugins/trunk/maven-checkstyle-plugin/src/test/plugin-configs/no-source-plugin-config.xml
maven/plugins/trunk/maven-checkstyle-plugin/src/test/plugin-configs/test-source-directory-plugin-config.xml
maven/plugins/trunk/maven-checkstyle-plugin/src/test/plugin-configs/useFile-plugin-config.xml
Modified:
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugins/checkstyle/CheckstyleReport.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugins/checkstyle/CheckstyleReport.java?rev=1780613&r1=1780612&r2=1780613&view=diff
==
---
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugins/checkstyle/CheckstyleReport.java
(original)
+++
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugins/checkstyle/CheckstyleReport.java
Fri Jan 27 21:29:10 2017
@@ -20,21 +20,15 @@ package org.apache.maven.plugins.checkst
*/
import java.io.File;
-import java.net.URL;
-import java.util.Collections;
-import java.util.HashMap;
import java.util.List;
import java.util.Locale;
-import java.util.Map;
import org.apache.maven.model.Resource;
import org.apache.maven.plugins.annotations.Mojo;
-import org.apache.maven.plugins.annotations.Parameter;
import org.apache.maven.plugins.annotations.ResolutionScope;
import org.apache.maven.plugins.checkstyle.exec.CheckstyleExecutorRequest;
import org.apache.maven.project.MavenProject;
import org.apache.maven.reporting.MavenReportException;
-import org.codehaus.plexus.util.StringUtils;
/**
* A reporting task that performs Checkstyle analysis and generates an HTML
@@ -49,96 +43,6 @@ import org.codehaus.plexus.util.StringUt
public class CheckstyleReport
extends AbstractCheckstyleReport
{
-/**
- * @deprecated Remove with format parameter.
- */
-private static final Map FORMAT_TO_CONFIG_LOCATION;
-
-static
-{
-Map fmt2Cfg = new HashMap<>();
-
-fmt2Cfg.put( "sun", "sun_checks.xml" );
-
-FORMAT_TO_CONFIG_LOCATION = Collections.unmodifiableMap( fmt2Cfg );
-}
-
-/**
- * Specifies what predefined check set to use. Available sets are "sun"
(for
- * the Sun coding conventions), and "maven".
- *
- * @deprecated Use configLocation instead.
- */
-@Parameter( defaultValue = "sun" )
-private String format;
-
-/**
- * Specifies the location of the Checkstyle properties file that will be
used to
- * check the source.
- *
- * @deprecated Use propertiesLocation instead.
- */
-@Parameter
-private File propertiesFile;
-
-/**
- * Specifies the URL of the Checkstyle properties that will be used to
check
- * the source.
- *
- * @deprecated Use propertiesLocation instead.
- */
-@Parameter
-private URL propertiesURL;
-
-/**
- * Specifies the location of the License file (a.k.a. the header file) that
- * is used by Checkstyle to verify that source code has the correct
- * license header.
- *
- * @deprecated Use headerLocation instead.
- */
-@Parameter( defaultValue = "${basedir}/LICENSE.txt" )
-private File headerFile;
-
-/**
- * Specifies the location of the suppressions XML file to use.
svn commit: r1780622 - in /maven/plugins/trunk/maven-checkstyle-plugin/src: it/MCHECKSTYLE-260-sourceDirectories/ it/MCHECKSTYLE-260-sourceDirectories/child-a/ it/MCHECKSTYLE-260-sourceDirectories/chi
Author: gboue Date: Sat Jan 28 00:50:38 2017 New Revision: 1780622 URL: http://svn.apache.org/viewvc?rev=1780622&view=rev Log: [MCHECKSTYLE-260] sourceDirectories property is ignored in multi-modules Because of a bug in Sisu, plugin parameters of type Collection or array are always using their default value if it is specified (MNG-5440). This was fixed in 3.3.9, but to be able to have compatibility for all Maven 3.x versions, we have to handle the default value manually, instead of relying on @Parameter's defaultValue mechanism. Updating the MavenProject stub tests so that they return meaningful values for compileSourceRoot and testCompileSourceRoot (thus getting rid of the specific code inside the actual Mojo checking for null when that cannot happen on a real project). Added: maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-260-sourceDirectories/ maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-260-sourceDirectories/child-a/ maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-260-sourceDirectories/child-a/pom.xml (with props) maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-260-sourceDirectories/child-a/src/ maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-260-sourceDirectories/child-a/src/generated/ maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-260-sourceDirectories/child-a/src/generated/java/ maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-260-sourceDirectories/child-a/src/generated/java/org/ maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-260-sourceDirectories/child-a/src/generated/java/org/MyClass.java (with props) maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-260-sourceDirectories/child-b/ maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-260-sourceDirectories/child-b/pom.xml (with props) maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-260-sourceDirectories/child-b/src/ maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-260-sourceDirectories/child-b/src/generated/ maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-260-sourceDirectories/child-b/src/generated/java/ maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-260-sourceDirectories/child-b/src/generated/java/org/ maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-260-sourceDirectories/child-b/src/generated/java/org/MyClass.java (with props) maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-260-sourceDirectories/invoker.properties (with props) maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-260-sourceDirectories/pom.xml (with props) maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-260-sourceDirectories/verify.groovy (with props) maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-260-testSourceDirectories/ maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-260-testSourceDirectories/child-a/ maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-260-testSourceDirectories/child-a/pom.xml (with props) maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-260-testSourceDirectories/child-a/src/ maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-260-testSourceDirectories/child-a/src/generated/ maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-260-testSourceDirectories/child-a/src/generated/java/ maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-260-testSourceDirectories/child-a/src/generated/java/org/ maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-260-testSourceDirectories/child-a/src/generated/java/org/MyClass.java (with props) maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-260-testSourceDirectories/child-b/ maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-260-testSourceDirectories/child-b/pom.xml (with props) maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-260-testSourceDirectories/child-b/src/ maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-260-testSourceDirectories/child-b/src/generated/ maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-260-testSourceDirectories/child-b/src/generated/java/ maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-260-testSourceDirectories/child-b/src/generated/java/org/ maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-260-testSourceDirectories/child-b/src/generated/java/org/MyClass.java (with props) maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-260-testSourceDirectories/invoker.properties (with props) maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-260-testSourceDirectories/pom.xml (with props) maven/plugins/trunk/maven-c
svn commit: r1780625 - /maven/plugins/trunk/maven-dependency-plugin/pom.xml
Author: gboue Date: Sat Jan 28 01:11:07 2017 New Revision: 1780625 URL: http://svn.apache.org/viewvc?rev=1780625&view=rev Log: The list-repositories IT is broken with Maven 3.0.x because of a downstream bug in maven-artifact-trasnfer 0.9.0. Using the latest snapshot that fixes it (MSHARED-602). Modified: maven/plugins/trunk/maven-dependency-plugin/pom.xml Modified: maven/plugins/trunk/maven-dependency-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/pom.xml?rev=1780625&r1=1780624&r2=1780625&view=diff == --- maven/plugins/trunk/maven-dependency-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-dependency-plugin/pom.xml Sat Jan 28 01:11:07 2017 @@ -222,7 +222,7 @@ under the License. org.apache.maven.shared maven-artifact-transfer - 0.9.0 + 0.9.1-SNAPSHOT
maven git commit: [MNG-6105] properties.internal.SystemProperties.addSystemProperties() is not really thread-safe
Repository: maven
Updated Branches:
refs/heads/master 1e2a80ece -> 5b4b8bd94
[MNG-6105] properties.internal.SystemProperties.addSystemProperties() is not
really thread-safe
Refactoring the current code setting system properties to synchronize correctly
on the given ones: avoids ConcurrentModificationException and
NullPointerException if the properties is modified by another thread.
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/5b4b8bd9
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/5b4b8bd9
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/5b4b8bd9
Branch: refs/heads/master
Commit: 5b4b8bd94c87afd2a1527d6a860e9673bdaf4a22
Parents: 1e2a80e
Author: Guillaume Boué
Authored: Sun Oct 16 01:40:46 2016 +0200
Committer: Guillaume Boué
Committed: Sat Jan 28 14:07:59 2017 +0100
--
.../internal/MavenRepositorySystemUtils.java| 14 +
.../execution/DefaultMavenExecutionRequest.java | 4 +--
.../project/DefaultProjectBuildingRequest.java | 7 ++---
.../properties/internal/SystemProperties.java | 30 ++--
.../building/DefaultModelBuildingRequest.java | 5 +++-
.../DefaultSettingsBuildingRequest.java | 7 ++---
6 files changed, 42 insertions(+), 25 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven/blob/5b4b8bd9/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/MavenRepositorySystemUtils.java
--
diff --git
a/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/MavenRepositorySystemUtils.java
b/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/MavenRepositorySystemUtils.java
index 5b240ef..1b11cb3 100644
---
a/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/MavenRepositorySystemUtils.java
+++
b/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/MavenRepositorySystemUtils.java
@@ -126,14 +126,18 @@ public final class MavenRepositorySystemUtils
session.setArtifactDescriptorPolicy( new
SimpleArtifactDescriptorPolicy( true, true ) );
+final Properties systemProperties = new Properties();
+
// MNG-5670 guard against ConcurrentModificationException
-Properties sysProps = new Properties();
-for ( String key : System.getProperties().stringPropertyNames() )
+// MNG-6053 guard against key without value
+Properties sysProp = System.getProperties();
+synchronized ( sysProp )
{
-sysProps.put( key, System.getProperty( key ) );
+systemProperties.putAll( sysProp );
}
-session.setSystemProperties( sysProps );
-session.setConfigProperties( sysProps );
+
+session.setSystemProperties( systemProperties );
+session.setConfigProperties( systemProperties );
return session;
}
http://git-wip-us.apache.org/repos/asf/maven/blob/5b4b8bd9/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java
--
diff --git
a/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java
b/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java
index 71a6894..d67061f 100644
---
a/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java
+++
b/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java
@@ -33,6 +33,7 @@ import org.apache.maven.eventspy.internal.EventSpyDispatcher;
import org.apache.maven.model.Profile;
import org.apache.maven.project.DefaultProjectBuildingRequest;
import org.apache.maven.project.ProjectBuildingRequest;
+import org.apache.maven.properties.internal.SystemProperties;
import org.apache.maven.settings.Mirror;
import org.apache.maven.settings.Proxy;
import org.apache.maven.settings.Server;
@@ -535,8 +536,7 @@ public class DefaultMavenExecutionRequest
{
if ( properties != null )
{
-this.systemProperties = new Properties();
-this.systemProperties.putAll( properties );
+this.systemProperties = SystemProperties.copyProperties(
properties );
}
else
{
http://git-wip-us.apache.org/repos/asf/maven/blob/5b4b8bd9/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingRequest.java
--
diff --git
a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingRequest.java
b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingRequest.java
index f439240..f1b271b 100644
---
a/maven-core/src/main/java/o
[maven] Git Push Summary
Repository: maven Updated Branches: refs/heads/MNG-6105 [deleted] 39c1f80cc
svn commit: r1796441 - in /maven/plugins/trunk/maven-checkstyle-plugin/src: it/MCHECKSTYLE-338/ it/MCHECKSTYLE-338/empty-logging-check/ it/MCHECKSTYLE-338/empty-logging-check/src/ it/MCHECKSTYLE-338/e
Author: gboue Date: Sat May 27 19:40:30 2017 New Revision: 1796441 URL: http://svn.apache.org/viewvc?rev=1796441&view=rev Log: [MCHECKSTYLE-338] Add support for 'omitIgnoredModules' The boolean parameter 'omitIgnoredModules' controls whether modules in a Checkstyle configuration with a severity set to 'ignore' should be omitted or still executed during Checkstyle invocation. This defaults to false to be consistent with the previous behavior of the plugin. IT is done by writing a custom check that does nothing except always logging as an error the name of the file it was invoked on. This is used to verify whether the check was invoked or not depending on the value of 'omitIgnoredModules'. Added: maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-338/ maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-338/checkstyle.xml (with props) maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-338/empty-logging-check/ maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-338/empty-logging-check/pom.xml (with props) maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-338/empty-logging-check/src/ maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-338/empty-logging-check/src/main/ maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-338/empty-logging-check/src/main/java/ maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-338/empty-logging-check/src/main/java/org/ maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-338/empty-logging-check/src/main/java/org/apache/ maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-338/empty-logging-check/src/main/java/org/apache/maven/ maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-338/empty-logging-check/src/main/java/org/apache/maven/plugins/ maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-338/empty-logging-check/src/main/java/org/apache/maven/plugins/checkstyle/ maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-338/empty-logging-check/src/main/java/org/apache/maven/plugins/checkstyle/EmptyLoggingCheck.java (with props) maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-338/invoker.properties (with props) maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-338/omitignoredmodules-false/ maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-338/omitignoredmodules-false/pom.xml (with props) maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-338/omitignoredmodules-false/src/ maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-338/omitignoredmodules-false/src/main/ maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-338/omitignoredmodules-false/src/main/java/ maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-338/omitignoredmodules-false/src/main/java/org/ maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-338/omitignoredmodules-false/src/main/java/org/apache/ maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-338/omitignoredmodules-false/src/main/java/org/apache/maven/ maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-338/omitignoredmodules-false/src/main/java/org/apache/maven/plugins/ maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-338/omitignoredmodules-false/src/main/java/org/apache/maven/plugins/checkstyle/ maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-338/omitignoredmodules-false/src/main/java/org/apache/maven/plugins/checkstyle/TestFalse.java (with props) maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-338/omitignoredmodules-true/ maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-338/omitignoredmodules-true/pom.xml (with props) maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-338/omitignoredmodules-true/src/ maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-338/omitignoredmodules-true/src/main/ maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-338/omitignoredmodules-true/src/main/java/ maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-338/omitignoredmodules-true/src/main/java/org/ maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-338/omitignoredmodules-true/src/main/java/org/apache/ maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-338/omitignoredmodules-true/src/main/java/org/apache/maven/ maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-338/omitignoredmodules-true/src/main/java/org/apache/maven/plugins/ maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-338/omitignoredmodules-true/src/main/java/org/apache/maven/plugins/checkstyle/ maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-338/omit
svn commit: r1796461 - in /maven/plugins/trunk/maven-assembly-plugin: ./ src/it/projects/container-descriptors/custom-containerDescriptorHandler/ src/it/projects/container-descriptors/custom-handler-w
Author: gboue
Date: Sat May 27 21:37:13 2017
New Revision: 1796461
URL: http://svn.apache.org/viewvc?rev=1796461&view=rev
Log:
- Correcting ITs with regard to r1795362: the maven-invoker-plugin 3.0.0
clones the project to 'target/its' by default now, instead of the directory
where the IT was ran.
- Using release of m-invoker-plugin 3.0.0 instead of a snapshot.
Modified:
maven/plugins/trunk/maven-assembly-plugin/pom.xml
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/custom-containerDescriptorHandler/verify.bsh
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/custom-handler-withFileEntries/verify.bsh
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/custom-handler-withMixedEntries/verify.bsh
Modified: maven/plugins/trunk/maven-assembly-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/pom.xml?rev=1796461&r1=1796460&r2=1796461&view=diff
==
--- maven/plugins/trunk/maven-assembly-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/pom.xml Sat May 27 21:37:13 2017
@@ -368,7 +368,7 @@ under the License.
-3.0.0-SNAPSHOT
+3.0.0
file://${project.build.testOutputDirectory}/remote-repository
false
${project.version}
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/custom-containerDescriptorHandler/verify.bsh
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/custom-containerDescriptorHandler/verify.bsh?rev=1796461&r1=1796460&r2=1796461&view=diff
==
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/custom-containerDescriptorHandler/verify.bsh
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/custom-containerDescriptorHandler/verify.bsh
Sat May 27 21:37:13 2017
@@ -23,8 +23,8 @@ boolean result = true;
try
{
-File a = new File( basedir, "assembly/target/assembly-1-bin/file.txt");
-File b = new File( basedir, "assembly/target/assembly-1-bin/b/file.txt");
+File a = new File( basedir, "target/its/target/assembly-1-bin/file.txt");
+File b = new File( basedir, "target/its/target/assembly-1-bin/b/file.txt");
if(result && !a.exists() ) {
System.out.println( "File: " + a + " should have been generated, but
was not." );
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/custom-handler-withFileEntries/verify.bsh
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/custom-handler-withFileEntries/verify.bsh?rev=1796461&r1=1796460&r2=1796461&view=diff
==
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/custom-handler-withFileEntries/verify.bsh
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/custom-handler-withFileEntries/verify.bsh
Sat May 27 21:37:13 2017
@@ -23,8 +23,8 @@ boolean result = true;
try
{
-File a = new File( basedir, "assembly/target/assembly-1-bin/file.txt");
-File b = new File( basedir, "assembly/target/assembly-1-bin/b/file.txt");
+File a = new File( basedir, "target/its/target/assembly-1-bin/file.txt");
+File b = new File( basedir, "target/its/target/assembly-1-bin/b/file.txt");
if(result && !a.exists() ) {
System.out.println( "File: " + a + " should have been generated, but
was not." );
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/custom-handler-withMixedEntries/verify.bsh
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/custom-handler-withMixedEntries/verify.bsh?rev=1796461&r1=1796460&r2=1796461&view=diff
==
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/custom-handler-withMixedEntries/verify.bsh
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/custom-handler-withMixedEntries/verify.bsh
Sat May 27 21:37:13 2017
@@ -23,8 +23,8 @@ boolean result = true;
try
{
-File a = new File( basedir, "assembly/target/assembly-1-bin/file.txt");
-File b = new File( basedir, "assembly/target/assembly-
svn commit: r1796671 - in /maven/plugins/trunk/maven-antrun-plugin/src: it/attach-artifact-from-ant-task/ main/java/org/apache/maven/plugin/antrun/
Author: gboue Date: Mon May 29 18:43:25 2017 New Revision: 1796671 URL: http://svn.apache.org/viewvc?rev=1796671&view=rev Log: [MANTRUN-181] AttachArtifact task does not work in external Ant build file When the run goal executes an Ant task that calls an external Ant build file, Ant creates a sub-project of the main Ant project that was created for the (parent) Ant task. However, the project's references are not passed to the sub-project, meaning that whatever Maven added as a reference to the main project is lost when calling the external build file. This notably includes the "maven.project" and "maven.project.helper" references that are needed for the 'attachartifact' built-in task to work. This is resolved by overriding the way of creating sub-projects, so that references added to an Ant project by Maven are passed to any sub-projects. Added: maven/plugins/trunk/maven-antrun-plugin/src/it/attach-artifact-from-ant-task/ maven/plugins/trunk/maven-antrun-plugin/src/it/attach-artifact-from-ant-task/build.xml (with props) maven/plugins/trunk/maven-antrun-plugin/src/it/attach-artifact-from-ant-task/invoker.properties (with props) maven/plugins/trunk/maven-antrun-plugin/src/it/attach-artifact-from-ant-task/pom.xml (with props) maven/plugins/trunk/maven-antrun-plugin/src/it/attach-artifact-from-ant-task/test.txt (with props) maven/plugins/trunk/maven-antrun-plugin/src/it/attach-artifact-from-ant-task/verify.bsh (with props) maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/plugin/antrun/MavenAntRunProject.java (with props) Modified: maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/plugin/antrun/AntRunMojo.java Added: maven/plugins/trunk/maven-antrun-plugin/src/it/attach-artifact-from-ant-task/build.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-antrun-plugin/src/it/attach-artifact-from-ant-task/build.xml?rev=1796671&view=auto == --- maven/plugins/trunk/maven-antrun-plugin/src/it/attach-artifact-from-ant-task/build.xml (added) +++ maven/plugins/trunk/maven-antrun-plugin/src/it/attach-artifact-from-ant-task/build.xml Mon May 29 18:43:25 2017 @@ -0,0 +1,26 @@ + + + + + + + + + Propchange: maven/plugins/trunk/maven-antrun-plugin/src/it/attach-artifact-from-ant-task/build.xml -- svn:eol-style = native Propchange: maven/plugins/trunk/maven-antrun-plugin/src/it/attach-artifact-from-ant-task/build.xml -- svn:keywords = Author Date Id Revision Added: maven/plugins/trunk/maven-antrun-plugin/src/it/attach-artifact-from-ant-task/invoker.properties URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-antrun-plugin/src/it/attach-artifact-from-ant-task/invoker.properties?rev=1796671&view=auto == --- maven/plugins/trunk/maven-antrun-plugin/src/it/attach-artifact-from-ant-task/invoker.properties (added) +++ maven/plugins/trunk/maven-antrun-plugin/src/it/attach-artifact-from-ant-task/invoker.properties Mon May 29 18:43:25 2017 @@ -0,0 +1,18 @@ +# 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. + +invoker.goals=clean install Propchange: maven/plugins/trunk/maven-antrun-plugin/src/it/attach-artifact-from-ant-task/invoker.properties -- svn:eol-style = native Propchange: maven/plugins/trunk/maven-antrun-plugin/src/it/attach-artifact-from-ant-task/invoker.properties -- svn:keywords = Author Date Id Revision Added: maven/plugins/trunk/maven-antrun-plugin/src/it/attach-artifact-from-ant-task/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-antrun-plugin/src/it/attach-artifact-from-ant-task/pom.xml?rev=1796671&view=auto ===
svn commit: r1796719 - in /maven/plugins/trunk/maven-antrun-plugin/src: it/attach-artifact-from-ant-task/ main/java/org/apache/maven/ant/tasks/ main/java/org/apache/maven/plugin/antrun/
Author: gboue
Date: Mon May 29 23:06:16 2017
New Revision: 1796719
URL: http://svn.apache.org/viewvc?rev=1796719&view=rev
Log:
[MANTRUN-181] AttachArtifact task does not work in external Ant build file
Instead of overriding the Ant project and forcing to pass the Ant project
references by reference to sub-projects, it is cleaner to add in the plugin
another reference, containing the Maven project, that cannot be cloned. This
way, a task that wants to change the Maven project can obtain this new
reference (like 'attachartifact'), and old code behaves exactly like before. It
is important that this new reference is not clonable, so that inheritRefs=true
doesn't pass a clone of it to an external Ant build called with the 'ant' task,
but the reference itself.
Modified:
maven/plugins/trunk/maven-antrun-plugin/src/it/attach-artifact-from-ant-task/pom.xml
maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/ant/tasks/AttachArtifactTask.java
maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/plugin/antrun/AntRunMojo.java
maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/plugin/antrun/MavenAntRunProject.java
Modified:
maven/plugins/trunk/maven-antrun-plugin/src/it/attach-artifact-from-ant-task/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-antrun-plugin/src/it/attach-artifact-from-ant-task/pom.xml?rev=1796719&r1=1796718&r2=1796719&view=diff
==
---
maven/plugins/trunk/maven-antrun-plugin/src/it/attach-artifact-from-ant-task/pom.xml
(original)
+++
maven/plugins/trunk/maven-antrun-plugin/src/it/attach-artifact-from-ant-task/pom.xml
Mon May 29 23:06:16 2017
@@ -45,7 +45,7 @@ under the License.
-
+
Modified:
maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/ant/tasks/AttachArtifactTask.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/ant/tasks/AttachArtifactTask.java?rev=1796719&r1=1796718&r2=1796719&view=diff
==
---
maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/ant/tasks/AttachArtifactTask.java
(original)
+++
maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/ant/tasks/AttachArtifactTask.java
Mon May 29 23:06:16 2017
@@ -20,6 +20,7 @@ package org.apache.maven.ant.tasks;
*/
import org.apache.maven.plugin.antrun.AntRunMojo;
+import org.apache.maven.plugin.antrun.MavenAntRunProject;
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.MavenProjectHelper;
import org.apache.tools.ant.BuildException;
@@ -39,7 +40,7 @@ public class AttachArtifactTask
/**
* The refId of the Maven project.
*/
-private String mavenProjectRefId = AntRunMojo.DEFAULT_MAVEN_PROJECT_REFID;
+private String mavenProjectRefId =
AntRunMojo.DEFAULT_MAVEN_PROJECT_REF_REFID;
/**
* The refId of the Maven project helper component.
@@ -84,7 +85,8 @@ public class AttachArtifactTask
type = FileUtils.getExtension( file.getName() );
}
-MavenProject mavenProject = (MavenProject)
this.getProject().getReference( mavenProjectRefId );
+MavenProject mavenProject =
+( (MavenAntRunProject) this.getProject().getReference(
mavenProjectRefId ) ).getMavenProject();
if ( this.getProject().getReference( mavenProjectHelperRefId ) == null
)
{
Modified:
maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/plugin/antrun/AntRunMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/plugin/antrun/AntRunMojo.java?rev=1796719&r1=1796718&r2=1796719&view=diff
==
---
maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/plugin/antrun/AntRunMojo.java
(original)
+++
maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/plugin/antrun/AntRunMojo.java
Mon May 29 23:06:16 2017
@@ -75,11 +75,21 @@ public class AntRunMojo
public static final String MAVEN_REFID_PREFIX = "maven.";
/**
- * The refid used to store the Maven project object in the Ant build.
+ * The refid used to store the Maven project object in the Ant build. If
this reference is retrieved in a custom
+ * task, note that this will be a clone of the Maven project, and not the
project itself, when the task is called
+ * through an ant task.
*/
public static final String DEFAULT_MAVEN_PROJECT_REFID =
MAVEN_REFID_PREFIX + "project";
/**
+ * The r
svn commit: r1796930 - in /maven/plugins/trunk/maven-antrun-plugin: ./ src/main/java/org/apache/maven/ant/tasks/ src/main/java/org/apache/maven/plugin/ src/main/java/org/apache/maven/plugins/ src/main
Author: gboue
Date: Tue May 30 20:14:59 2017
New Revision: 1796930
URL: http://svn.apache.org/viewvc?rev=1796930&view=rev
Log:
[MANTRUN-201] Migrate plugin to Maven 3.0
Migrating to Maven 3.0 and renaming plugin package to org.apache.maven.plugins.
Added:
maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/plugins/
maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/plugins/antrun/
- copied from r1796929,
maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/plugin/antrun/
Removed:
maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/plugin/
Modified:
maven/plugins/trunk/maven-antrun-plugin/pom.xml
maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/ant/tasks/AttachArtifactTask.java
maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/ant/tasks/DependencyFilesetsTask.java
maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/plugins/antrun/AntRunMojo.java
maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/plugins/antrun/AntrunXmlPlexusConfigurationWriter.java
maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/plugins/antrun/MavenAntRunProject.java
maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/plugins/antrun/MavenLogger.java
Modified: maven/plugins/trunk/maven-antrun-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-antrun-plugin/pom.xml?rev=1796930&r1=1796929&r2=1796930&view=diff
==
--- maven/plugins/trunk/maven-antrun-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-antrun-plugin/pom.xml Tue May 30 20:14:59 2017
@@ -30,7 +30,7 @@ under the License.
maven-antrun-plugin
- 1.9-SNAPSHOT
+ 3.0.0-SNAPSHOT
maven-plugin
Apache Maven AntRun Plugin
@@ -57,7 +57,7 @@ under the License.
-2.2.1
+3.0
@@ -68,7 +68,7 @@ under the License.
org.apache.maven
- maven-project
+ maven-core
${mavenVersion}
Modified:
maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/ant/tasks/AttachArtifactTask.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/ant/tasks/AttachArtifactTask.java?rev=1796930&r1=1796929&r2=1796930&view=diff
==
---
maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/ant/tasks/AttachArtifactTask.java
(original)
+++
maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/ant/tasks/AttachArtifactTask.java
Tue May 30 20:14:59 2017
@@ -19,8 +19,8 @@ package org.apache.maven.ant.tasks;
* under the License.
*/
-import org.apache.maven.plugin.antrun.AntRunMojo;
-import org.apache.maven.plugin.antrun.MavenAntRunProject;
+import org.apache.maven.plugins.antrun.AntRunMojo;
+import org.apache.maven.plugins.antrun.MavenAntRunProject;
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.MavenProjectHelper;
import org.apache.tools.ant.BuildException;
Modified:
maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/ant/tasks/DependencyFilesetsTask.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/ant/tasks/DependencyFilesetsTask.java?rev=1796930&r1=1796929&r2=1796930&view=diff
==
---
maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/ant/tasks/DependencyFilesetsTask.java
(original)
+++
maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/ant/tasks/DependencyFilesetsTask.java
Tue May 30 20:14:59 2017
@@ -24,7 +24,7 @@ import org.apache.maven.ant.tasks.suppor
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.resolver.filter.AndArtifactFilter;
-import org.apache.maven.plugin.antrun.AntRunMojo;
+import org.apache.maven.plugins.antrun.AntRunMojo;
import org.apache.maven.project.MavenProject;
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.Task;
@@ -109,7 +109,7 @@ public class DependencyFilesetsTask
MavenProject mavenProject = (MavenProject)
this.getProject().getReference( "maven.project" );
// Add filesets for depenedency artifacts
-@SuppressWarnings( "unchecked" ) Set depArtifacts =
filterArtifacts( mavenProject.getArtifacts() );
+Set depArtifacts = filterArtifacts(
mavenProject.getArtifacts() );
FileSet dependenciesFileSet = new FileSet();
dependenciesFileSet.setProject( getProject() );
Modified:
maven/plugins/trunk/maven
svn commit: r1796945 - in /maven/plugins/trunk/maven-antrun-plugin/src: it/ant-1.7-features/ it/antrun-default-test/ it/attach-artifact-test/ it/classpath-ref-test/ it/classpath-test-scope-test/ it/co
Author: gboue Date: Tue May 30 21:26:31 2017 New Revision: 1796945 URL: http://svn.apache.org/viewvc?rev=1796945&view=rev Log: [MANTRUN-202] Fail the build when deprecated parameters tasks, sourceRoot or testSourceRoot are used With the upgrade to Maven 3, deprecated parameters should fail the build when used, in order to prepare their complete removal from the code. The ITs are updated to reflect this. Modified: maven/plugins/trunk/maven-antrun-plugin/src/it/ant-1.7-features/pom.xml maven/plugins/trunk/maven-antrun-plugin/src/it/antrun-default-test/pom.xml maven/plugins/trunk/maven-antrun-plugin/src/it/attach-artifact-test/pom.xml maven/plugins/trunk/maven-antrun-plugin/src/it/classpath-ref-test/pom.xml maven/plugins/trunk/maven-antrun-plugin/src/it/classpath-test-scope-test/pom.xml maven/plugins/trunk/maven-antrun-plugin/src/it/copy-fail-test/pom.xml maven/plugins/trunk/maven-antrun-plugin/src/it/custom-task-test/pom.xml maven/plugins/trunk/maven-antrun-plugin/src/it/env-var-test/pom.xml maven/plugins/trunk/maven-antrun-plugin/src/it/filesets-test/pom.xml maven/plugins/trunk/maven-antrun-plugin/src/it/local-repo-prop-test/pom.xml maven/plugins/trunk/maven-antrun-plugin/src/it/multiple-phase-test/pom.xml maven/plugins/trunk/maven-antrun-plugin/src/it/never-fail-test/pom.xml maven/plugins/trunk/maven-antrun-plugin/src/it/plugin-classpath-test/pom.xml maven/plugins/trunk/maven-antrun-plugin/src/it/properties-attributes-test/pom.xml maven/plugins/trunk/maven-antrun-plugin/src/it/properties-test/build.xml maven/plugins/trunk/maven-antrun-plugin/src/it/properties-test/pom.xml maven/plugins/trunk/maven-antrun-plugin/src/it/task-encoding-test/pom.xml maven/plugins/trunk/maven-antrun-plugin/src/it/tasksattributes-test/pom.xml maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/plugins/antrun/AntRunMojo.java maven/plugins/trunk/maven-antrun-plugin/src/site/apt/examples/classpaths.apt.vm maven/plugins/trunk/maven-antrun-plugin/src/site/apt/index.apt.vm maven/plugins/trunk/maven-antrun-plugin/src/site/apt/usage.apt.vm Modified: maven/plugins/trunk/maven-antrun-plugin/src/it/ant-1.7-features/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-antrun-plugin/src/it/ant-1.7-features/pom.xml?rev=1796945&r1=1796944&r2=1796945&view=diff == --- maven/plugins/trunk/maven-antrun-plugin/src/it/ant-1.7-features/pom.xml (original) +++ maven/plugins/trunk/maven-antrun-plugin/src/it/ant-1.7-features/pom.xml Tue May 30 21:26:31 2017 @@ -37,11 +37,11 @@ test - + - + run Modified: maven/plugins/trunk/maven-antrun-plugin/src/it/antrun-default-test/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-antrun-plugin/src/it/antrun-default-test/pom.xml?rev=1796945&r1=1796944&r2=1796945&view=diff == --- maven/plugins/trunk/maven-antrun-plugin/src/it/antrun-default-test/pom.xml (original) +++ maven/plugins/trunk/maven-antrun-plugin/src/it/antrun-default-test/pom.xml Tue May 30 21:26:31 2017 @@ -45,9 +45,9 @@ under the License. maven-antrun-plugin @pom.version@ - + - + Modified: maven/plugins/trunk/maven-antrun-plugin/src/it/attach-artifact-test/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-antrun-plugin/src/it/attach-artifact-test/pom.xml?rev=1796945&r1=1796944&r2=1796945&view=diff == --- maven/plugins/trunk/maven-antrun-plugin/src/it/attach-artifact-test/pom.xml (original) +++ maven/plugins/trunk/maven-antrun-plugin/src/it/attach-artifact-test/pom.xml Tue May 30 21:26:31 2017 @@ -44,14 +44,14 @@ under the License. run - + - + Modified: maven/plugins/trunk/maven-antrun-plugin/src/it/classpath-ref-test/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-antrun-plugin/src/it/classpath-ref-test/pom.xml?rev=1796945&r1=1796944&r2=1796945&view=diff == --- maven/plugins/trunk/maven-antrun-plugin/src/it/classpath-ref-test/pom.xml (original) +++ maven/plugins/trunk/maven-antrun-plugin/src/it/classpath-ref-test/pom.xml Tue May 30 21:26:31 2017 @@ -49,8 +49,7 @@ under the License. compile compi
svn commit: r1796946 - in /maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/plugins/antrun: AntRunMojo.java AntrunXmlPlexusConfigurationWriter.java
Author: gboue
Date: Tue May 30 21:34:41 2017
New Revision: 1796946
URL: http://svn.apache.org/viewvc?rev=1796946&view=rev
Log:
Fix Javadoc generation issues with JDK 8:
- self-enclosing element are not allowed
- don't link to a method not declared in a class
Modified:
maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/plugins/antrun/AntRunMojo.java
maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/plugins/antrun/AntrunXmlPlexusConfigurationWriter.java
Modified:
maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/plugins/antrun/AntRunMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/plugins/antrun/AntRunMojo.java?rev=1796946&r1=1796945&r2=1796946&view=diff
==
---
maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/plugins/antrun/AntRunMojo.java
(original)
+++
maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/plugins/antrun/AntRunMojo.java
Tue May 30 21:34:41 2017
@@ -56,7 +56,8 @@ import org.codehaus.plexus.util.ReaderFa
import org.codehaus.plexus.util.StringUtils;
/**
- * Maven AntRun Mojo.
+ * Maven AntRun Mojo.
+ *
* This plugin provides the capability of calling Ant tasks from a POM by
running the nested Ant tasks inside the
* <target/> parameter. It is encouraged to move the actual tasks to a
separate build.xml file and call that file
* with an <ant/> task.
Modified:
maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/plugins/antrun/AntrunXmlPlexusConfigurationWriter.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/plugins/antrun/AntrunXmlPlexusConfigurationWriter.java?rev=1796946&r1=1796945&r2=1796946&view=diff
==
---
maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/plugins/antrun/AntrunXmlPlexusConfigurationWriter.java
(original)
+++
maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/plugins/antrun/AntrunXmlPlexusConfigurationWriter.java
Tue May 30 21:34:41 2017
@@ -28,7 +28,7 @@ import java.io.Writer;
/**
* Write a plexus configuration to a stream Note: This class was originally
copied from plexus-container-default. It is
- * not possible to rely on {@link PlexusConfiguration#toString()} because it
doesn't properly escape XML attributes.
+ * not possible to rely on PlexusConfiguration.toString() because it doesn't
properly escape XML attributes.
*/
public class AntrunXmlPlexusConfigurationWriter
{
svn commit: r1796947 - /maven/plugins/trunk/maven-antrun-plugin/pom.xml
Author: gboue Date: Tue May 30 21:38:38 2017 New Revision: 1796947 URL: http://svn.apache.org/viewvc?rev=1796947&view=rev Log: [MANTRUN-203] Upgrade to maven-plugins 30 Modified: maven/plugins/trunk/maven-antrun-plugin/pom.xml Modified: maven/plugins/trunk/maven-antrun-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-antrun-plugin/pom.xml?rev=1796947&r1=1796946&r2=1796947&view=diff == --- maven/plugins/trunk/maven-antrun-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-antrun-plugin/pom.xml Tue May 30 21:38:38 2017 @@ -25,7 +25,7 @@ under the License. maven-plugins org.apache.maven.plugins -28 +30 ../../pom/maven/maven-plugins/pom.xml
svn commit: r1797098 - /maven/plugins/trunk/maven-compiler-plugin/src/it/error-prone-compiler/invoker.properties
Author: gboue Date: Wed May 31 18:45:26 2017 New Revision: 1797098 URL: http://svn.apache.org/viewvc?rev=1797098&view=rev Log: Fix IT failure: plexus-compiler-javac-errorprone 2.8.2 updated the Error Prone library to version >= 2.0.6, which requires JDK 8 (https://github.com/google/error-prone/issues/369). Modified: maven/plugins/trunk/maven-compiler-plugin/src/it/error-prone-compiler/invoker.properties Modified: maven/plugins/trunk/maven-compiler-plugin/src/it/error-prone-compiler/invoker.properties URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-compiler-plugin/src/it/error-prone-compiler/invoker.properties?rev=1797098&r1=1797097&r2=1797098&view=diff == --- maven/plugins/trunk/maven-compiler-plugin/src/it/error-prone-compiler/invoker.properties (original) +++ maven/plugins/trunk/maven-compiler-plugin/src/it/error-prone-compiler/invoker.properties Wed May 31 18:45:26 2017 @@ -15,6 +15,6 @@ # specific language governing permissions and limitations # under the License. -invoker.java.version = 1.7+ +invoker.java.version = 1.8+ invoker.goals = clean compile invoker.buildResult = failure
svn commit: r1797111 - in /maven/plugins/trunk/maven-antrun-plugin/src: it/MANTRUN-178/ it/MANTRUN-178/build.xml it/MANTRUN-178/invoker.properties it/MANTRUN-178/pom.xml main/java/org/apache/maven/plu
Author: gboue
Date: Wed May 31 21:15:31 2017
New Revision: 1797111
URL: http://svn.apache.org/viewvc?rev=1797111&view=rev
Log:
[MANTRUN-178] Ignore precedence of mvn command line over property defined in
section
Only properties declared in the POM are passed to Ant invocations, and their
value should be overridable from a user property.
Added:
maven/plugins/trunk/maven-antrun-plugin/src/it/MANTRUN-178/
maven/plugins/trunk/maven-antrun-plugin/src/it/MANTRUN-178/build.xml
(with props)
maven/plugins/trunk/maven-antrun-plugin/src/it/MANTRUN-178/invoker.properties
(with props)
maven/plugins/trunk/maven-antrun-plugin/src/it/MANTRUN-178/pom.xml (with
props)
Modified:
maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/plugins/antrun/AntRunMojo.java
Added: maven/plugins/trunk/maven-antrun-plugin/src/it/MANTRUN-178/build.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-antrun-plugin/src/it/MANTRUN-178/build.xml?rev=1797111&view=auto
==
--- maven/plugins/trunk/maven-antrun-plugin/src/it/MANTRUN-178/build.xml (added)
+++ maven/plugins/trunk/maven-antrun-plugin/src/it/MANTRUN-178/build.xml Wed
May 31 21:15:31 2017
@@ -0,0 +1,44 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ prop1=${prop1} is not equal to val1-pom
+
+
+ prop2=${prop2} is not equal to val2-cli
+
+
+ prop3=${prop3} was set
+
+
+
+
\ No newline at end of file
Propchange: maven/plugins/trunk/maven-antrun-plugin/src/it/MANTRUN-178/build.xml
--
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-antrun-plugin/src/it/MANTRUN-178/build.xml
--
svn:keywords = Author Date Id Revision
Added:
maven/plugins/trunk/maven-antrun-plugin/src/it/MANTRUN-178/invoker.properties
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-antrun-plugin/src/it/MANTRUN-178/invoker.properties?rev=1797111&view=auto
==
---
maven/plugins/trunk/maven-antrun-plugin/src/it/MANTRUN-178/invoker.properties
(added)
+++
maven/plugins/trunk/maven-antrun-plugin/src/it/MANTRUN-178/invoker.properties
Wed May 31 21:15:31 2017
@@ -0,0 +1,18 @@
+# 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.
+
+invoker.goals = clean validate -Dprop2=val2-cli -Dprop3=val3-cli
Propchange:
maven/plugins/trunk/maven-antrun-plugin/src/it/MANTRUN-178/invoker.properties
--
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-antrun-plugin/src/it/MANTRUN-178/invoker.properties
--
svn:keywords = Author Date Id Revision
Added: maven/plugins/trunk/maven-antrun-plugin/src/it/MANTRUN-178/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-antrun-plugin/src/it/MANTRUN-178/pom.xml?rev=1797111&view=auto
==
--- maven/plugins/trunk/maven-antrun-plugin/src/it/MANTRUN-178/pom.xml (added)
+++ maven/plugins/trunk/maven-antrun-plugin/src/it/MANTRUN-178/pom.xml Wed May
31 21:15:31 2017
@@ -0,0 +1,61 @@
+
+
+
+
+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/maven-v4_0_0.xsd";>
+ 4.0.0
+ org.apache.maven.plugins.antrun
+ MANTRUN-178
+ pom
+ 1.0
+ https://issues.apache.org/jira/browse/MANTRUN-178
+
+Checks that only POM properties are passed to Ant invocation, and that
their values can be overriden by a user
+property.
+
+
+val1-pom
+val2-pom
+
+
+
+
+
+maven-antrun-plugin
+@pom.version@
+
+
svn commit: r1797125 - in /maven/plugins/trunk/maven-antrun-plugin/src/it/MANTRUN-172: ./ build.xml invoker.properties pom.xml verify.bsh
Author: gboue
Date: Wed May 31 22:25:12 2017
New Revision: 1797125
URL: http://svn.apache.org/viewvc?rev=1797125&view=rev
Log:
[MANTRUN-172] Properties passed to Maven as -D don't get passed to
invocations when a profile sets the same property
Adding IT proving that r1797111 also fixed this issue.
Added:
maven/plugins/trunk/maven-antrun-plugin/src/it/MANTRUN-172/
maven/plugins/trunk/maven-antrun-plugin/src/it/MANTRUN-172/build.xml
(with props)
maven/plugins/trunk/maven-antrun-plugin/src/it/MANTRUN-172/invoker.properties
(with props)
maven/plugins/trunk/maven-antrun-plugin/src/it/MANTRUN-172/pom.xml (with
props)
maven/plugins/trunk/maven-antrun-plugin/src/it/MANTRUN-172/verify.bsh
(with props)
Added: maven/plugins/trunk/maven-antrun-plugin/src/it/MANTRUN-172/build.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-antrun-plugin/src/it/MANTRUN-172/build.xml?rev=1797125&view=auto
==
--- maven/plugins/trunk/maven-antrun-plugin/src/it/MANTRUN-172/build.xml (added)
+++ maven/plugins/trunk/maven-antrun-plugin/src/it/MANTRUN-172/build.xml Wed
May 31 22:25:12 2017
@@ -0,0 +1,26 @@
+
+
+
+
+
+
+
+
+
Propchange: maven/plugins/trunk/maven-antrun-plugin/src/it/MANTRUN-172/build.xml
--
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-antrun-plugin/src/it/MANTRUN-172/build.xml
--
svn:keywords = Author Date Id Revision
Added:
maven/plugins/trunk/maven-antrun-plugin/src/it/MANTRUN-172/invoker.properties
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-antrun-plugin/src/it/MANTRUN-172/invoker.properties?rev=1797125&view=auto
==
---
maven/plugins/trunk/maven-antrun-plugin/src/it/MANTRUN-172/invoker.properties
(added)
+++
maven/plugins/trunk/maven-antrun-plugin/src/it/MANTRUN-172/invoker.properties
Wed May 31 22:25:12 2017
@@ -0,0 +1,19 @@
+# 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.
+
+invoker.goals = clean validate -Dmy.test.property="from commandline"
+invoker.profiles = test-profile
Propchange:
maven/plugins/trunk/maven-antrun-plugin/src/it/MANTRUN-172/invoker.properties
--
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-antrun-plugin/src/it/MANTRUN-172/invoker.properties
--
svn:keywords = Author Date Id Revision
Added: maven/plugins/trunk/maven-antrun-plugin/src/it/MANTRUN-172/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-antrun-plugin/src/it/MANTRUN-172/pom.xml?rev=1797125&view=auto
==
--- maven/plugins/trunk/maven-antrun-plugin/src/it/MANTRUN-172/pom.xml (added)
+++ maven/plugins/trunk/maven-antrun-plugin/src/it/MANTRUN-172/pom.xml Wed May
31 22:25:12 2017
@@ -0,0 +1,65 @@
+
+
+
+
+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/maven-v4_0_0.xsd";>
+ 4.0.0
+ org.apache.maven.plugins.antrun
+ MANTRUN-172
+ pom
+ 1.0
+ https://issues.apache.org/jira/browse/MANTRUN-172
+
+${my.test.property}
+
+
+
+ test-profile
+
+from profile
+
+
+
+
+
+
+maven-antrun-plugin
+@pom.version@
+
+
+validate
+
+ run
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Propchange: maven/plugins/trunk/maven-antrun-plugin/src/it/MANTRUN-172/pom.xml
--
svn:eol-style = native
svn commit: r1797263 - in /maven/plugins/trunk/maven-shade-plugin/src: it/MSHADE-247/ it/MSHADE-247/repo/ it/MSHADE-247/repo/org/ it/MSHADE-247/repo/org/apache/ it/MSHADE-247/repo/org/apache/maven/ it
Author: gboue
Date: Thu Jun 1 20:44:07 2017
New Revision: 1797263
URL: http://svn.apache.org/viewvc?rev=1797263&view=rev
Log:
[MSHADE-247] NullpointerException when createSourcesJar = true and source jar
cannot be found
Submitted by: Anders Smestad
Applied after adding an IT.
Added:
maven/plugins/trunk/maven-shade-plugin/src/it/MSHADE-247/
maven/plugins/trunk/maven-shade-plugin/src/it/MSHADE-247/pom.xml
maven/plugins/trunk/maven-shade-plugin/src/it/MSHADE-247/repo/
maven/plugins/trunk/maven-shade-plugin/src/it/MSHADE-247/repo/org/
maven/plugins/trunk/maven-shade-plugin/src/it/MSHADE-247/repo/org/apache/
maven/plugins/trunk/maven-shade-plugin/src/it/MSHADE-247/repo/org/apache/maven/
maven/plugins/trunk/maven-shade-plugin/src/it/MSHADE-247/repo/org/apache/maven/its/
maven/plugins/trunk/maven-shade-plugin/src/it/MSHADE-247/repo/org/apache/maven/its/shade/
maven/plugins/trunk/maven-shade-plugin/src/it/MSHADE-247/repo/org/apache/maven/its/shade/csj/
maven/plugins/trunk/maven-shade-plugin/src/it/MSHADE-247/repo/org/apache/maven/its/shade/csj/mshade-247-one/
maven/plugins/trunk/maven-shade-plugin/src/it/MSHADE-247/repo/org/apache/maven/its/shade/csj/mshade-247-one/0.1/
maven/plugins/trunk/maven-shade-plugin/src/it/MSHADE-247/repo/org/apache/maven/its/shade/csj/mshade-247-one/0.1/mshade-247-one-0.1-sources.jar
(with props)
maven/plugins/trunk/maven-shade-plugin/src/it/MSHADE-247/repo/org/apache/maven/its/shade/csj/mshade-247-one/0.1/mshade-247-one-0.1.jar
(with props)
maven/plugins/trunk/maven-shade-plugin/src/it/MSHADE-247/repo/org/apache/maven/its/shade/csj/mshade-247-one/0.1/mshade-247-one-0.1.pom
maven/plugins/trunk/maven-shade-plugin/src/it/MSHADE-247/repo/org/apache/maven/its/shade/csj/mshade-247-two/
maven/plugins/trunk/maven-shade-plugin/src/it/MSHADE-247/repo/org/apache/maven/its/shade/csj/mshade-247-two/0.1/
maven/plugins/trunk/maven-shade-plugin/src/it/MSHADE-247/repo/org/apache/maven/its/shade/csj/mshade-247-two/0.1/mshade-247-two-0.1.jar
(with props)
maven/plugins/trunk/maven-shade-plugin/src/it/MSHADE-247/repo/org/apache/maven/its/shade/csj/mshade-247-two/0.1/mshade-247-two-0.1.pom
Modified:
maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/mojo/ShadeMojo.java
Added: maven/plugins/trunk/maven-shade-plugin/src/it/MSHADE-247/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/it/MSHADE-247/pom.xml?rev=1797263&view=auto
==
--- maven/plugins/trunk/maven-shade-plugin/src/it/MSHADE-247/pom.xml (added)
+++ maven/plugins/trunk/maven-shade-plugin/src/it/MSHADE-247/pom.xml Thu Jun 1
20:44:07 2017
@@ -0,0 +1,78 @@
+
+
+
+
+
+ 4.0.0
+ org.apache.maven.its.shade.csj
+ mshade-247
+ 1.0
+ https://issues.apache.org/jira/browse/MSHADE-247
+
+Test that setting createSourcesJar to true does not fail the build when no
sources Jar is available.
+
+
+
+ shade-it
+ file:///${basedir}/repo
+
+ignore
+
+
+false
+
+
+
+
+
+
+ org.apache.maven.its.shade.csj
+ mshade-247-one
+ 0.1
+
+
+ org.apache.maven.its.shade.csj
+ mshade-247-two
+ 0.1
+
+
+
+
+
+
+org.apache.maven.plugins
+maven-shade-plugin
+@project.version@
+
+
+shade
+package
+
+ shade
+
+
+ true
+
+
+
+
+
+
+
Added:
maven/plugins/trunk/maven-shade-plugin/src/it/MSHADE-247/repo/org/apache/maven/its/shade/csj/mshade-247-one/0.1/mshade-247-one-0.1-sources.jar
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/it/MSHADE-247/repo/org/apache/maven/its/shade/csj/mshade-247-one/0.1/mshade-247-one-0.1-sources.jar?rev=1797263&view=auto
==
Binary file - no diff available.
Propchange:
maven/plugins/trunk/maven-shade-plugin/src/it/MSHADE-247/repo/org/apache/maven/its/shade/csj/mshade-247-one/0.1/mshade-247-one-0.1-sources.jar
--
svn:mime-type = application/octet-stream
Added:
maven/plugins/trunk/maven-shade-plugin/src/it/MSHADE-247/repo/org/apache/maven/its/shade/csj/mshade-247-one/0.1/mshade-247-one-0.1.jar
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/it/MSHADE-247/repo/org/apache/maven/its/shade/csj/mshade-247-one/0.1/mshade-247-one-0.1.jar?rev=1797263&view=auto
==
Binary file - no diff available.
Propchange:
maven/plugins/trunk/maven-shade-plugin/src/it/MSHADE-247/repo/org/apache/maven/its/shade/csj/mshade-247-one/0.
svn commit: r1797596 - in /maven/plugins/trunk/maven-checkstyle-plugin/src: it/MCHECKSTYLE-337/ it/MCHECKSTYLE-337/src/ it/MCHECKSTYLE-337/src/main/ it/MCHECKSTYLE-337/src/main/java/ it/MCHECKSTYLE-33
Author: gboue Date: Sun Jun 4 17:26:27 2017 New Revision: 1797596 URL: http://svn.apache.org/viewvc?rev=1797596&view=rev Log: [MCHECKSTYLE-337] checkstyle:check only supports xml output format, but the docs say it supports plain as well Submitted by: Stig Rohde Døssing Adding support for 'plain' output file format in the 'check' goal. It is still not possible to use it in combination with 'skipExec' because the plain format does not interact fully with 'violationIgnore' (which can contain fully qualified class name, when Checkstyle plain format only has the class simple name). Added: maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-337/ maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-337/invoker.properties (with props) maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-337/pom.xml (with props) maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-337/src/ maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-337/src/main/ maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-337/src/main/java/ maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-337/src/main/java/org/ maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-337/src/main/java/org/MyClass.java (with props) maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-337/src/main/java/org/package-info.java (with props) maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-337/verify.groovy (with props) maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugins/checkstyle/CompositeAuditListener.java (with props) maven/plugins/trunk/maven-checkstyle-plugin/src/test/plugin-configs/check-plugin-plain-output.xml (with props) Modified: maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugins/checkstyle/CheckstyleViolationCheckMojo.java maven/plugins/trunk/maven-checkstyle-plugin/src/test/java/org/apache/maven/plugins/checkstyle/CheckstyleViolationCheckMojoTest.java Added: maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-337/invoker.properties URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-337/invoker.properties?rev=1797596&view=auto == --- maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-337/invoker.properties (added) +++ maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-337/invoker.properties Sun Jun 4 17:26:27 2017 @@ -0,0 +1,20 @@ +# 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. + +invoker.goals = verify +invoker.buildResult = failure +invoker.mavenOpts = -Duser.language=en -Duser.country=US -Duser.variant=US Propchange: maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-337/invoker.properties -- svn:eol-style = native Propchange: maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-337/invoker.properties -- svn:keywords = Author Date Id Revision Added: maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-337/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-337/pom.xml?rev=1797596&view=auto == --- maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-337/pom.xml (added) +++ maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-337/pom.xml Sun Jun 4 17:26:27 2017 @@ -0,0 +1,59 @@ + + + +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.plugins.checkstyle + MCHECKSTYLE-337 + 1.0-SNAPSHOT + jar + + http://maven.apache.org/ + + +UTF-8 + NewlineAt
svn commit: r1797601 - in /maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugins/checkstyle: ./ exec/ rss/
Author: gboue
Date: Sun Jun 4 19:01:48 2017
New Revision: 1797601
URL: http://svn.apache.org/viewvc?rev=1797601&view=rev
Log:
Fixing Javadoc issues when building with JDK 8:
- Self closing elements like are disallowed, just a single is needed
to create a new paragraph.
- Documenting @param and @return for methods.
- Escaping > with >.
Modified:
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugins/checkstyle/AbstractCheckstyleReport.java
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugins/checkstyle/CheckstyleReportGenerator.java
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugins/checkstyle/CheckstyleViolationCheckMojo.java
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugins/checkstyle/RuleUtil.java
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugins/checkstyle/exec/CheckstyleCheckerListener.java
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugins/checkstyle/exec/CheckstyleExecutor.java
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugins/checkstyle/exec/CheckstyleExecutorException.java
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugins/checkstyle/exec/CheckstyleExecutorRequest.java
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugins/checkstyle/exec/CheckstyleResults.java
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugins/checkstyle/rss/DefaultCheckstyleRssGenerator.java
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugins/checkstyle/rss/VelocityTemplate.java
Modified:
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugins/checkstyle/AbstractCheckstyleReport.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugins/checkstyle/AbstractCheckstyleReport.java?rev=1797601&r1=1797600&r2=1797601&view=diff
==
---
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugins/checkstyle/AbstractCheckstyleReport.java
(original)
+++
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugins/checkstyle/AbstractCheckstyleReport.java
Sun Jun 4 19:01:48 2017
@@ -82,26 +82,19 @@ public abstract class AbstractCheckstyle
/**
*
* Specifies the location of the XML configuration to use.
- *
- *
*
* Potential values are a filesystem path, a URL, or a classpath resource.
* This parameter expects that the contents of the location conform to the
* xml format (Checkstyle http://checkstyle.sourceforge.net/config.html#Modules";>Checker
* module) configuration of rulesets.
- *
- *
*
* This parameter is resolved as resource, URL, then file. If successfully
* resolved, the contents of the configuration is copied into the
* ${project.build.directory}/checkstyle-configuration.xml
* file before being passed to Checkstyle as a configuration.
- *
- *
*
* There are 2 predefined rulesets included in Maven Checkstyle Plugin:
- *
*
* sun_checks.xml: Sun Checks.
* google_checks.xml: Google Checks.
@@ -137,21 +130,16 @@ public abstract class AbstractCheckstyle
* Specifies the location of the License file (a.k.a. the header file) that
* can be used by Checkstyle to verify that source code has the correct
* license header.
- *
*
- * You need to use ${checkstyle.header.file} in your Checkstyle xml
+ * You need to use ${checkstyle.header.file} in your
Checkstyle xml
* configuration to reference the name of this header file.
- *
*
* For instance:
- *
- *
- *
- * <module name="RegexpHeader">
- * <property name="headerFile" value="${checkstyle.header.file}"/>
- * </module>
- *
- *
+ *
+ * <module name="RegexpHeader">
+ * <property name="headerFile" value="${checkstyle.header.file}"/>
+ * </module>
+ *
*
* @since 2.0-beta-2
*/
@@ -177,21 +165,16 @@ public abstract class AbstractCheckstyle
/**
*
* Specifies the location of the properties file.
- *
- *
*
* This parameter is resolved as URL, File then resource. If successfully
* resolved, the contents of the properties location is copied into the
* ${project.build.directory}/checkstyle-checker.properties
* file before being passed to Checkstyle for loading.
- *
- *
*
* The contents of the propertiesL
svn commit: r1797615 - in /maven/plugins/trunk/maven-dependency-plugin/src/it/projects: analyze-report/ analyze/ used-dependencies/ used-dependencies/annotation/ used-dependencies/annotation/src/ used
Author: gboue Date: Sun Jun 4 23:06:33 2017 New Revision: 1797615 URL: http://svn.apache.org/viewvc?rev=1797615&view=rev Log: Fixing the 'analyze' and 'analyze-report' ITs under JDK 8: they must not force the declaration of maven-artifact as a used dependency, because JDK 8 now writes bytecode entries for constants and maven-dependency-analyzer fails the build in that case. This commit also adds a specific IT for the 'usedDependencies' parameter, leveraging a source retention annotation. Added: maven/plugins/trunk/maven-dependency-plugin/src/it/projects/used-dependencies/ maven/plugins/trunk/maven-dependency-plugin/src/it/projects/used-dependencies/annotation/ maven/plugins/trunk/maven-dependency-plugin/src/it/projects/used-dependencies/annotation/pom.xml (with props) maven/plugins/trunk/maven-dependency-plugin/src/it/projects/used-dependencies/annotation/src/ maven/plugins/trunk/maven-dependency-plugin/src/it/projects/used-dependencies/annotation/src/main/ maven/plugins/trunk/maven-dependency-plugin/src/it/projects/used-dependencies/annotation/src/main/java/ maven/plugins/trunk/maven-dependency-plugin/src/it/projects/used-dependencies/annotation/src/main/java/org/ maven/plugins/trunk/maven-dependency-plugin/src/it/projects/used-dependencies/annotation/src/main/java/org/apache/ maven/plugins/trunk/maven-dependency-plugin/src/it/projects/used-dependencies/annotation/src/main/java/org/apache/maven/ maven/plugins/trunk/maven-dependency-plugin/src/it/projects/used-dependencies/annotation/src/main/java/org/apache/maven/plugins/ maven/plugins/trunk/maven-dependency-plugin/src/it/projects/used-dependencies/annotation/src/main/java/org/apache/maven/plugins/dependency/ maven/plugins/trunk/maven-dependency-plugin/src/it/projects/used-dependencies/annotation/src/main/java/org/apache/maven/plugins/dependency/MySourceRetentionAnnotation.java (with props) maven/plugins/trunk/maven-dependency-plugin/src/it/projects/used-dependencies/invoker.properties (with props) maven/plugins/trunk/maven-dependency-plugin/src/it/projects/used-dependencies/module/ maven/plugins/trunk/maven-dependency-plugin/src/it/projects/used-dependencies/module/pom.xml (with props) maven/plugins/trunk/maven-dependency-plugin/src/it/projects/used-dependencies/module/src/ maven/plugins/trunk/maven-dependency-plugin/src/it/projects/used-dependencies/module/src/main/ maven/plugins/trunk/maven-dependency-plugin/src/it/projects/used-dependencies/module/src/main/java/ maven/plugins/trunk/maven-dependency-plugin/src/it/projects/used-dependencies/module/src/main/java/test/ maven/plugins/trunk/maven-dependency-plugin/src/it/projects/used-dependencies/module/src/main/java/test/Main.java (with props) maven/plugins/trunk/maven-dependency-plugin/src/it/projects/used-dependencies/pom.xml (with props) Modified: maven/plugins/trunk/maven-dependency-plugin/src/it/projects/analyze-report/pom.xml maven/plugins/trunk/maven-dependency-plugin/src/it/projects/analyze/pom.xml Modified: maven/plugins/trunk/maven-dependency-plugin/src/it/projects/analyze-report/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/it/projects/analyze-report/pom.xml?rev=1797615&r1=1797614&r2=1797615&view=diff == --- maven/plugins/trunk/maven-dependency-plugin/src/it/projects/analyze-report/pom.xml (original) +++ maven/plugins/trunk/maven-dependency-plugin/src/it/projects/analyze-report/pom.xml Sun Jun 4 23:06:33 2017 @@ -60,9 +60,6 @@ maven-dependency-plugin - - org.apache.maven:maven-artifact - true true true Modified: maven/plugins/trunk/maven-dependency-plugin/src/it/projects/analyze/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/it/projects/analyze/pom.xml?rev=1797615&r1=1797614&r2=1797615&view=diff == --- maven/plugins/trunk/maven-dependency-plugin/src/it/projects/analyze/pom.xml (original) +++ maven/plugins/trunk/maven-dependency-plugin/src/it/projects/analyze/pom.xml Sun Jun 4 23:06:33 2017 @@ -60,9 +60,6 @@ maven-dependency-plugin - - org.apache.maven:maven-artifact - true true true Added: maven/plugins/trunk/maven-dependency-plugin/src/it/projects/used-dependencies/annotation/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/it/projects/used-dependencies/annotation/pom.xml?rev=1797615&view=auto == --- maven/plugins/t
maven git commit: [MNG-6240] Duplicate components in plugin extension realm when plugin depends on maven-aether-resolver
Repository: maven Updated Branches: refs/heads/MNG-6240 [created] e76e217a0 [MNG-6240] Duplicate components in plugin extension realm when plugin depends on maven-aether-resolver Maven Core needs to export the maven-aether-provider artifact so that its components do not get added twice in plugin realm. This happens if the build uses an extension plugin depending on maven-aether-provider, before it was renamed 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/e76e217a Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/e76e217a Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/e76e217a Branch: refs/heads/MNG-6240 Commit: e76e217a071ea007ec75ee13c9629aefd8d0db15 Parents: eb6b212 Author: Guillaume Boué Authored: Fri Jun 9 23:25:31 2017 +0200 Committer: Guillaume Boué Committed: Fri Jun 9 23:25:31 2017 +0200 -- maven-core/src/main/resources/META-INF/maven/extension.xml | 5 + 1 file changed, 5 insertions(+) -- http://git-wip-us.apache.org/repos/asf/maven/blob/e76e217a/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 1f0b95f..c5f40b5 100644 --- a/maven-core/src/main/resources/META-INF/maven/extension.xml +++ b/maven-core/src/main/resources/META-INF/maven/extension.xml @@ -134,6 +134,11 @@ 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
maven-integration-testing git commit: [MNG-6240] Duplicate components in plugin extension realm when plugin depends on maven-aether-resolver
Repository: maven-integration-testing
Updated Branches:
refs/heads/MNG-6240 [created] a162291ef
[MNG-6240] Duplicate components in plugin extension realm when plugin depends
on maven-aether-resolver
Maven Core needs to export the maven-aether-provider artifact so that its
components do not get added twice in plugin realm. This happens if the build
uses an extension plugin depending on maven-aether-provider, before it was
renamed to maven-resolver-provider
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/a162291e
Tree:
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/tree/a162291e
Diff:
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/diff/a162291e
Branch: refs/heads/MNG-6240
Commit: a162291ef72059a67fac816dbc905b7702c57456
Parents: c7dae6d
Author: Guillaume Boué
Authored: Fri Jun 9 23:24:00 2017 +0200
Committer: Guillaume Boué
Committed: Fri Jun 9 23:24:00 2017 +0200
--
.../apache/maven/it/IntegrationTestSuite.java | 1 +
...nITmng6240PluginExtensionAetherProvider.java | 81
.../plugin-extension/pom.xml| 46 +++
.../org/apache/maven/its/plugin/TestMojo.java | 36 +
.../project/pom.xml | 47
5 files changed, 211 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/a162291e/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 f93e432..026b4b0 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java
@@ -106,6 +106,7 @@ public class IntegrationTestSuite
//
-
// suite.addTestSuite( MavenIT0108SnapshotUpdateTest.class ); --
MNG-3137
+suite.addTestSuite( MavenITmng6240PluginExtensionAetherProvider.class
);
suite.addTestSuite( MavenITmng6223FindBasedir.class );
suite.addTestSuite( MavenITmng6189SiteReportPluginsWarningTest.class );
suite.addTestSuite( MavenITmng6057CheckReactorOrderTest.class );
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/a162291e/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6240PluginExtensionAetherProvider.java
--
diff --git
a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6240PluginExtensionAetherProvider.java
b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6240PluginExtensionAetherProvider.java
new file mode 100644
index 000..6fb542d
--- /dev/null
+++
b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6240PluginExtensionAetherProvider.java
@@ -0,0 +1,81 @@
+package org.apache.maven.it;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import java.io.File;
+import java.util.List;
+
+import org.apache.maven.it.util.ResourceExtractor;
+
+/**
+ * This is a test set for https://issues.apache.org/jira/browse/MNG-6240";>MNG-6240.
+ *
+ * @author gboue
+ */
+public class MavenITmng6240PluginExtensionAetherProvider
+extends AbstractMavenIntegrationTestCase
+{
+public MavenITmng6240PluginExtensionAetherProvider()
+{
+super( "[3.5.1,)" );
+}
+
+/**
+ *
+ * Checks that there are no duplicate classes from maven-aether-provider
on the classpath, when the build has a
+ * plugin extension that depends on the former maven-aether-provider,
renamed to maven-resolver-provider.
+ *
+ * One way to do this is to look at MetadataGeneratorFactory, which is
svn commit: r1798383 - in /maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-338: pom.xml verify.groovy
Author: gboue Date: Sun Jun 11 16:52:30 2017 New Revision: 1798383 URL: http://svn.apache.org/viewvc?rev=1798383&view=rev Log: [MCHECKSTYLE-338] Add support for 'omitIgnoredModules' Make IT not rely on the 'check' goal invoking the 'checkstyle' goal first. Modified: maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-338/pom.xml maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-338/verify.groovy Modified: maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-338/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-338/pom.xml?rev=1798383&r1=1798382&r2=1798383&view=diff == --- maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-338/pom.xml (original) +++ maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-338/pom.xml Sun Jun 11 16:52:30 2017 @@ -46,7 +46,9 @@ + verify +checkstyle check Modified: maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-338/verify.groovy URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-338/verify.groovy?rev=1798383&r1=1798382&r2=1798383&view=diff == --- maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-338/verify.groovy (original) +++ maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-338/verify.groovy Sun Jun 11 16:52:30 2017 @@ -24,7 +24,7 @@ buildLog = new File( basedir, 'build.log assert buildLog.text.contains( 'EmptyLogging: EmptyLoggingCheck on file TestFalse.java' ) assert !buildLog.text.contains( 'EmptyLogging: EmptyLoggingCheck on file TestTrue.java' ) -// verify that the "checkstyle" goal launched by "check" does the same +// verify that the "checkstyle" goal does the same site = new File( basedir, 'omitignoredmodules-false/target/site/checkstyle.html' ) assert site.text.contains( 'EmptyLoggingCheck on file TestFalse.java' ) site = new File( basedir, 'omitignoredmodules-true/target/site/checkstyle.html' )
svn commit: r1798389 - in /maven/plugins/trunk/maven-antrun-plugin/src: it/export-ant-properties/ it/export-ant-properties/invoker.properties it/export-ant-properties/pom.xml main/java/org/apache/mave
Author: gboue Date: Sun Jun 11 18:10:40 2017 New Revision: 1798389 URL: http://svn.apache.org/viewvc?rev=1798389&view=rev Log: [MANTRUN-204] antrun loops the backing map of java.util.Properties withouth checking type safety Avoid blind casts to String when copying Ant project properties to Maven properties. Added: maven/plugins/trunk/maven-antrun-plugin/src/it/export-ant-properties/ maven/plugins/trunk/maven-antrun-plugin/src/it/export-ant-properties/invoker.properties (with props) maven/plugins/trunk/maven-antrun-plugin/src/it/export-ant-properties/pom.xml (with props) Modified: maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/plugins/antrun/AntRunMojo.java Added: maven/plugins/trunk/maven-antrun-plugin/src/it/export-ant-properties/invoker.properties URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-antrun-plugin/src/it/export-ant-properties/invoker.properties?rev=1798389&view=auto == --- maven/plugins/trunk/maven-antrun-plugin/src/it/export-ant-properties/invoker.properties (added) +++ maven/plugins/trunk/maven-antrun-plugin/src/it/export-ant-properties/invoker.properties Sun Jun 11 18:10:40 2017 @@ -0,0 +1,18 @@ +# 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. + +invoker.goals = clean validate Propchange: maven/plugins/trunk/maven-antrun-plugin/src/it/export-ant-properties/invoker.properties -- svn:eol-style = native Propchange: maven/plugins/trunk/maven-antrun-plugin/src/it/export-ant-properties/invoker.properties -- svn:keywords = Author Date Id Revision Added: maven/plugins/trunk/maven-antrun-plugin/src/it/export-ant-properties/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-antrun-plugin/src/it/export-ant-properties/pom.xml?rev=1798389&view=auto == --- maven/plugins/trunk/maven-antrun-plugin/src/it/export-ant-properties/pom.xml (added) +++ maven/plugins/trunk/maven-antrun-plugin/src/it/export-ant-properties/pom.xml Sun Jun 11 18:10:40 2017 @@ -0,0 +1,81 @@ + + + + +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/maven-v4_0_0.xsd";> + 4.0.0 + org.apache.maven.plugins.antrun + export-ant-propertie + pom + 1.0 + Checks that exportAntProperties correctly generates the Maven properties + +val1-from-maven + + + + +maven-antrun-plugin +@pom.version@ + + +validate + + run + + + + + + true + + + + + +maven-enforcer-plugin +1.4.1 + + +enforce-properties + + enforce + +validate + + + + prop1 + val1-from-maven + + + prop2 + val2-from-ant + + + + + + + + + Propchange: maven/plugins/trunk/maven-antrun-plugin/src/it/export-ant-properties/pom.xml -- svn:eol-style = native Propchange: maven/plugins/trunk/maven-antrun-plugin/src/it/export-ant-properties/pom.xml -- svn:keywords = Author Date Id Revision Modified: maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/plugins/antrun/AntRunMojo.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/plugins/antrun
maven git commit: [MNG-6240] Duplicate components in plugin extension realm when plugin depends on maven-aether-resolver
Repository: maven Updated Branches: refs/heads/master 12d647133 -> a1fe42199 [MNG-6240] Duplicate components in plugin extension realm when plugin depends on maven-aether-resolver Maven Core needs to export the maven-aether-provider artifact so that its components do not get added twice in plugin realm. This happens if the build uses an extension plugin depending on maven-aether-provider, before it was renamed 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/a1fe4219 Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/a1fe4219 Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/a1fe4219 Branch: refs/heads/master Commit: a1fe42199565f76007a97f47cd4a848fd9b63482 Parents: 12d6471 Author: Guillaume Boué Authored: Fri Jun 9 23:25:31 2017 +0200 Committer: Guillaume Boué Committed: Wed Jun 14 19:55:41 2017 +0200 -- maven-core/src/main/resources/META-INF/maven/extension.xml | 5 + 1 file changed, 5 insertions(+) -- http://git-wip-us.apache.org/repos/asf/maven/blob/a1fe4219/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 1f0b95f..c5f40b5 100644 --- a/maven-core/src/main/resources/META-INF/maven/extension.xml +++ b/maven-core/src/main/resources/META-INF/maven/extension.xml @@ -134,6 +134,11 @@ 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
maven-integration-testing git commit: [MNG-6240] Duplicate components in plugin extension realm when plugin depends on maven-aether-resolver
Repository: maven-integration-testing
Updated Branches:
refs/heads/master c7dae6d21 -> a162291ef
[MNG-6240] Duplicate components in plugin extension realm when plugin depends
on maven-aether-resolver
Maven Core needs to export the maven-aether-provider artifact so that its
components do not get added twice in plugin realm. This happens if the build
uses an extension plugin depending on maven-aether-provider, before it was
renamed to maven-resolver-provider
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/a162291e
Tree:
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/tree/a162291e
Diff:
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/diff/a162291e
Branch: refs/heads/master
Commit: a162291ef72059a67fac816dbc905b7702c57456
Parents: c7dae6d
Author: Guillaume Boué
Authored: Fri Jun 9 23:24:00 2017 +0200
Committer: Guillaume Boué
Committed: Fri Jun 9 23:24:00 2017 +0200
--
.../apache/maven/it/IntegrationTestSuite.java | 1 +
...nITmng6240PluginExtensionAetherProvider.java | 81
.../plugin-extension/pom.xml| 46 +++
.../org/apache/maven/its/plugin/TestMojo.java | 36 +
.../project/pom.xml | 47
5 files changed, 211 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/a162291e/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 f93e432..026b4b0 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java
@@ -106,6 +106,7 @@ public class IntegrationTestSuite
//
-
// suite.addTestSuite( MavenIT0108SnapshotUpdateTest.class ); --
MNG-3137
+suite.addTestSuite( MavenITmng6240PluginExtensionAetherProvider.class
);
suite.addTestSuite( MavenITmng6223FindBasedir.class );
suite.addTestSuite( MavenITmng6189SiteReportPluginsWarningTest.class );
suite.addTestSuite( MavenITmng6057CheckReactorOrderTest.class );
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/a162291e/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6240PluginExtensionAetherProvider.java
--
diff --git
a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6240PluginExtensionAetherProvider.java
b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6240PluginExtensionAetherProvider.java
new file mode 100644
index 000..6fb542d
--- /dev/null
+++
b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6240PluginExtensionAetherProvider.java
@@ -0,0 +1,81 @@
+package org.apache.maven.it;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import java.io.File;
+import java.util.List;
+
+import org.apache.maven.it.util.ResourceExtractor;
+
+/**
+ * This is a test set for https://issues.apache.org/jira/browse/MNG-6240";>MNG-6240.
+ *
+ * @author gboue
+ */
+public class MavenITmng6240PluginExtensionAetherProvider
+extends AbstractMavenIntegrationTestCase
+{
+public MavenITmng6240PluginExtensionAetherProvider()
+{
+super( "[3.5.1,)" );
+}
+
+/**
+ *
+ * Checks that there are no duplicate classes from maven-aether-provider
on the classpath, when the build has a
+ * plugin extension that depends on the former maven-aether-provider,
renamed to maven-resolver-provider.
+ *
+ * One way to do this is to look at MetadataGeneratorFactory, which is a
[maven] Git Push Summary
Repository: maven Updated Branches: refs/heads/MNG-6240 [deleted] e76e217a0
[maven-integration-testing] Git Push Summary
Repository: maven-integration-testing Updated Branches: refs/heads/MNG-6240 [deleted] a162291ef
svn commit: r1798738 - /maven/shared/trunk/maven-artifact-resolver/pom.xml
Author: gboue
Date: Wed Jun 14 19:00:22 2017
New Revision: 1798738
URL: http://svn.apache.org/viewvc?rev=1798738&view=rev
Log:
[MSHARED-640] Upgrade maven-invoker-plugin to resolve IT failure on Windows
Fix failing IT on Windows. The current parent Apache POM defines version 2.0.0
for the maven-invoker-plugin, where the issue due to the rename of mvn.bat on
Windows with Maven 3.3.1 is fixed. The project should inherit from it instead
of forcing version 1.7.
Modified:
maven/shared/trunk/maven-artifact-resolver/pom.xml
Modified: maven/shared/trunk/maven-artifact-resolver/pom.xml
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-artifact-resolver/pom.xml?rev=1798738&r1=1798737&r2=1798738&view=diff
==
--- maven/shared/trunk/maven-artifact-resolver/pom.xml (original)
+++ maven/shared/trunk/maven-artifact-resolver/pom.xml Wed Jun 14 19:00:22 2017
@@ -172,7 +172,6 @@ under the License.
maven-invoker-plugin
-1.7
true
${project.build.directory}/it
svn commit: r1798754 - /maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/dependencies/resolve/internal/Maven30DependencyResolver.java
Author: gboue
Date: Wed Jun 14 20:53:24 2017
New Revision: 1798754
URL: http://svn.apache.org/viewvc?rev=1798754&view=rev
Log:
[MSHARED-641] NoSuchMethodException using DependencyResolver with Maven 3.0
Looking for the method toDependency inside RepositoryUtils taking the correct
org.apache.maven.model.Dependency instead of
org.sonatype.aether.graph.Dependency.
Modified:
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/dependencies/resolve/internal/Maven30DependencyResolver.java
Modified:
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/dependencies/resolve/internal/Maven30DependencyResolver.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/dependencies/resolve/internal/Maven30DependencyResolver.java?rev=1798754&r1=1798753&r2=1798754&view=diff
==
---
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/dependencies/resolve/internal/Maven30DependencyResolver.java
(original)
+++
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/dependencies/resolve/internal/Maven30DependencyResolver.java
Wed Jun 14 20:53:24 2017
@@ -282,7 +282,7 @@ public class Maven30DependencyResolver
ArtifactTypeRegistry typeRegistry )
throws DependencyResolverException
{
-Class[] argClasses = new Class[] { Dependency.class,
ArtifactTypeRegistry.class };
+Class[] argClasses = new Class[] {
org.apache.maven.model.Dependency.class, ArtifactTypeRegistry.class };
Object[] args = new Object[] { mavenDependency, typeRegistry };
maven-surefire git commit: [SUREFIRE-1385] System properties defined in the Surefire and Failsafe plugin configuration should override user properties
mPropertyVariables.put( "prop1", "system-property-variable-1" );
+systemPropertyVariables.put( "prop2", "system-property-variable-2" );
+
+SurefireProperties surefireProperties =
+SurefireProperties.calculateEffectiveProperties( null,
systemPropertyVariables, userProperties, null );
+
+assertEquals( 3, surefireProperties.size() );
+assertEquals( "system-property-variable-1", surefireProperties.get(
"prop1" ) );
+assertEquals( "system-property-variable-2", surefireProperties.get(
"prop2" ) );
+assertEquals( "user-property-3", surefireProperties.get( "prop3" ) );
+}
+
}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4de017b3/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1385SystemPropertyVariablesOverrideIT.java
--
diff --git
a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1385SystemPropertyVariablesOverrideIT.java
b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1385SystemPropertyVariablesOverrideIT.java
new file mode 100644
index 000..b82e603
--- /dev/null
+++
b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1385SystemPropertyVariablesOverrideIT.java
@@ -0,0 +1,45 @@
+package org.apache.maven.surefire.its.jiras;
+
+/*
+ * 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.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
+import org.apache.maven.surefire.its.fixture.SurefireLauncher;
+import org.junit.Test;
+
+/**
+ * @author gboue
+ * @since 2.20.1
+ */
+public class Surefire1385SystemPropertyVariablesOverrideIT
+extends SurefireJUnit4IntegrationTestCase
+{
+
+@Test
+public void systemPropertyVariablesShouldOverrideUserProperties()
+{
+unpack().sysProp( "prop-2", "from-cli-2" ).sysProp( "prop-3",
"from-cli-3" ).executeTest().verifyErrorFree( 3 );
+}
+
+private SurefireLauncher unpack()
+{
+return unpack( "/surefire-1385-system-property-variables-override" );
+}
+
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4de017b3/surefire-integration-tests/src/test/resources/surefire-1385-system-property-variables-override/pom.xml
--
diff --git
a/surefire-integration-tests/src/test/resources/surefire-1385-system-property-variables-override/pom.xml
b/surefire-integration-tests/src/test/resources/surefire-1385-system-property-variables-override/pom.xml
new file mode 100644
index 000..4ea06c3
--- /dev/null
+++
b/surefire-integration-tests/src/test/resources/surefire-1385-system-property-variables-override/pom.xml
@@ -0,0 +1,61 @@
+
+
+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.surefire
+it-parent
+1.0
+../pom.xml
+
+
+ org.apache.maven.plugins.surefire
+ surefire-1385
+ 1.0
+
+
+UTF-8
+
+
+
+
+ junit
+ junit
+ 4.12
+ test
+
+
+
+
+
+
+maven-surefire-plugin
+
+
+from-system-property-variable-1
+from-system-property-variable-2
+
+
+
+
+
+
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4de017b3/surefire-integration-tests/src/test/resources/surefire-1385-system-property-variables-override/src/test/java/ATest.java
--
diff --git
a/surefire-integration-tests/src/test/resources/surefire-1385-system-property-variables-override/src/test/java/ATest.java
b/surefire-integration-tests/src/test/resources/surefire-1385-system-property-variables-override/src/test/java/ATest.java
new
svn commit: r1799014 - in /maven/plugins/trunk/maven-antrun-plugin: ./ src/it/MANTRUN-179/ src/it/attach-artifact-test-with-prefix-unknown/ src/it/attach-artifact-test-with-prefix/ src/it/custom-ant-t
Author: gboue Date: Sat Jun 17 14:46:13 2017 New Revision: 1799014 URL: http://svn.apache.org/viewvc?rev=1799014&view=rev Log: [MANTRUN-179] Seems impossible to use combine.* attributes with maven-antrun-plugin configuration During creation of the temporary Ant file, the Maven combine.children and combine.self attributes of the XML plugin configuration elements should be removed. Also refactoring the code generating the Ant build file, which is only the responsibility of the writer and not the Mojo, to use proper XML serialization instead of string manipulations. Added: maven/plugins/trunk/maven-antrun-plugin/src/it/MANTRUN-179/ maven/plugins/trunk/maven-antrun-plugin/src/it/MANTRUN-179/pom.xml (with props) maven/plugins/trunk/maven-antrun-plugin/src/it/MANTRUN-179/verify.bsh (with props) maven/plugins/trunk/maven-antrun-plugin/src/it/attach-artifact-test-with-prefix/ maven/plugins/trunk/maven-antrun-plugin/src/it/attach-artifact-test-with-prefix-unknown/ maven/plugins/trunk/maven-antrun-plugin/src/it/attach-artifact-test-with-prefix-unknown/invoker.properties (with props) maven/plugins/trunk/maven-antrun-plugin/src/it/attach-artifact-test-with-prefix-unknown/pom.xml (with props) maven/plugins/trunk/maven-antrun-plugin/src/it/attach-artifact-test-with-prefix-unknown/test.txt (with props) maven/plugins/trunk/maven-antrun-plugin/src/it/attach-artifact-test-with-prefix/invoker.properties (with props) maven/plugins/trunk/maven-antrun-plugin/src/it/attach-artifact-test-with-prefix/pom.xml (with props) maven/plugins/trunk/maven-antrun-plugin/src/it/attach-artifact-test-with-prefix/test.txt (with props) maven/plugins/trunk/maven-antrun-plugin/src/it/attach-artifact-test-with-prefix/verify.bsh (with props) maven/plugins/trunk/maven-antrun-plugin/src/it/custom-ant-target-attributes/ maven/plugins/trunk/maven-antrun-plugin/src/it/custom-ant-target-attributes/pom.xml (with props) maven/plugins/trunk/maven-antrun-plugin/src/it/custom-ant-target-attributes/verify.groovy (with props) maven/plugins/trunk/maven-antrun-plugin/src/test/java/org/ maven/plugins/trunk/maven-antrun-plugin/src/test/java/org/apache/ maven/plugins/trunk/maven-antrun-plugin/src/test/java/org/apache/maven/ maven/plugins/trunk/maven-antrun-plugin/src/test/java/org/apache/maven/plugins/ maven/plugins/trunk/maven-antrun-plugin/src/test/java/org/apache/maven/plugins/antrun/ maven/plugins/trunk/maven-antrun-plugin/src/test/java/org/apache/maven/plugins/antrun/AntrunXmlPlexusConfigurationWriterTest.java (with props) maven/plugins/trunk/maven-antrun-plugin/src/test/resources/configuration-writer/ maven/plugins/trunk/maven-antrun-plugin/src/test/resources/configuration-writer/basic.xml (with props) maven/plugins/trunk/maven-antrun-plugin/src/test/resources/configuration-writer/combine-attributes.xml (with props) maven/plugins/trunk/maven-antrun-plugin/src/test/resources/configuration-writer/custom-task-prefix.xml (with props) maven/plugins/trunk/maven-antrun-plugin/src/test/resources/configuration-writer/empty-target.xml (with props) Modified: maven/plugins/trunk/maven-antrun-plugin/pom.xml maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/plugins/antrun/AntRunMojo.java maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/plugins/antrun/AntrunXmlPlexusConfigurationWriter.java Modified: maven/plugins/trunk/maven-antrun-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-antrun-plugin/pom.xml?rev=1799014&r1=1799013&r2=1799014&view=diff == --- maven/plugins/trunk/maven-antrun-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-antrun-plugin/pom.xml Sat Jun 17 14:46:13 2017 @@ -91,5 +91,34 @@ under the License. ant 1.9.4 + + + junit + junit + 4.11 + test + + + xmlunit + xmlunit + 1.6 + test + + + + + + + org.apache.rat + apache-rat-plugin + + + src/test/resources/configuration-writer/*.xml + + + + + + Added: maven/plugins/trunk/maven-antrun-plugin/src/it/MANTRUN-179/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-antrun-plugin/src/it/MANTRUN-179/pom.xml?rev=1799014&view=auto == --- maven/plugins/trunk/maven-antrun-plugin/src/it/MANTRUN-179/pom.xml (added) +++ maven/plugins/trunk/maven-antrun-plugin/src/it/MANTRUN-179/pom.xml Sat Jun 17 14:46:13 2017 @@ -0,0 +1,66 @@ + + + + +http://maven.apache.org/POM/4.0.0"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation
svn commit: r1799020 - in /maven/plugins/trunk/maven-antrun-plugin/src: it/MANTRUN-192/ it/MANTRUN-192/pom.xml main/java/org/apache/maven/ant/tasks/DependencyFilesetsTask.java
Author: gboue
Date: Sat Jun 17 19:54:34 2017
New Revision: 1799020
URL: http://svn.apache.org/viewvc?rev=1799020&view=rev
Log:
[MANTRUN-192] filterArtifacts in DependencyFilesetsTask includes entire
maven.local.repository
When there are no artifacts after filtering, Ant will include by default
everything under the local repository (since there are no include patterns).
Therefore, in this case, we need to exclude everything explicitly. For
performance reasons, we need to add a dummy file to the include patterns,
otherwise Ant will still traverse the whole directory before applying the
exclusions.
Added:
maven/plugins/trunk/maven-antrun-plugin/src/it/MANTRUN-192/
maven/plugins/trunk/maven-antrun-plugin/src/it/MANTRUN-192/pom.xml (with
props)
Modified:
maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/ant/tasks/DependencyFilesetsTask.java
Added: maven/plugins/trunk/maven-antrun-plugin/src/it/MANTRUN-192/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-antrun-plugin/src/it/MANTRUN-192/pom.xml?rev=1799020&view=auto
==
--- maven/plugins/trunk/maven-antrun-plugin/src/it/MANTRUN-192/pom.xml (added)
+++ maven/plugins/trunk/maven-antrun-plugin/src/it/MANTRUN-192/pom.xml Sat Jun
17 19:54:34 2017
@@ -0,0 +1,61 @@
+
+
+
+
+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/maven-v4_0_0.xsd";>
+ 4.0.0
+ org.apache.maven.plugins.antrun
+ MANTRUN-192
+ pom
+ 1.0
+ https://issues.apache.org/jira/browse/MANTRUN-192
+ Checks that creating a FileSet of the project dependencies also
works when there are no dependencies.
+
+
+
+maven-antrun-plugin
+@pom.version@
+
+
+
+ run
+
+validate
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Propchange: maven/plugins/trunk/maven-antrun-plugin/src/it/MANTRUN-192/pom.xml
--
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-antrun-plugin/src/it/MANTRUN-192/pom.xml
--
svn:keywords = Author Date Id Revision
Modified:
maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/ant/tasks/DependencyFilesetsTask.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/ant/tasks/DependencyFilesetsTask.java?rev=1799020&r1=1799019&r2=1799020&view=diff
==
---
maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/ant/tasks/DependencyFilesetsTask.java
(original)
+++
maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/ant/tasks/DependencyFilesetsTask.java
Sat Jun 17 19:54:34 2017
@@ -116,6 +116,14 @@ public class DependencyFilesetsTask
ArtifactRepository localRepository = (ArtifactRepository)
getProject().getReference( "maven.local.repository" );
dependenciesFileSet.setDir( new File( localRepository.getBasedir() ) );
+if ( depArtifacts.isEmpty() )
+{
+// For performance reasons in case of huge local repo, tell Ant to
include a single thing, otherwise the
+// whole directory is scanned (even though ** is excluded).
+dependenciesFileSet.createInclude().setName( "." );
+dependenciesFileSet.createExclude().setName( "**" );
+}
+
for ( Artifact artifact : depArtifacts )
{
String relativeArtifactPath = localRepository.pathOf( artifact );
svn commit: r1799022 - in /maven/plugins/trunk/maven-remote-resources-plugin: ./ src/test/java/org/apache/maven/plugin/resources/remote/it/ src/test/java/org/apache/maven/plugin/resources/remote/it/su
Author: gboue
Date: Sat Jun 17 21:02:49 2017
New Revision: 1799022
URL: http://svn.apache.org/viewvc?rev=1799022&view=rev
Log:
Fix ITs when the build is launched with a custom maven.repo.local set on the
CLI.
Modified:
maven/plugins/trunk/maven-remote-resources-plugin/pom.xml
maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_BadDependencyPoms.java
maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_CustomFilterDelimiter.java
maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_FilterLocalOverride.java
maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_GenerateFromBundle.java
maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_GenerateFromBundleWithTypeAndClassifier.java
maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_GenerateFromOverride.java
maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_GetDependencyProjects.java
maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_RunOnlyAtExecutionRoot.java
maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_SupplementalArtifact.java
maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it/support/BootstrapInstaller.java
maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it/support/TestUtils.java
Modified: maven/plugins/trunk/maven-remote-resources-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-remote-resources-plugin/pom.xml?rev=1799022&r1=1799021&r2=1799022&view=diff
==
--- maven/plugins/trunk/maven-remote-resources-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-remote-resources-plugin/pom.xml Sat Jun 17
21:02:49 2017
@@ -350,8 +350,12 @@ under the License.
-
-
${project.build.directory}/it-repo
+
+
${project.build.directory}/it-repo
Modified:
maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_BadDependencyPoms.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_BadDependencyPoms.java?rev=1799022&r1=1799021&r2=1799022&view=diff
==
---
maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_BadDependencyPoms.java
(original)
+++
maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_BadDependencyPoms.java
Sat Jun 17 21:02:49 2017
@@ -40,9 +40,7 @@ public class IT_BadDependencyPoms
{
File dir = TestUtils.getTestDir( "bad-dependency-poms" );
-Verifier verifier;
-
-verifier = new Verifier( dir.getAbsolutePath() );
+Verifier verifier = TestUtils.newVerifier( dir );
verifier.deleteArtifacts( "test" );
verifier.getSystemProperties().setProperty( "it.dir",
dir.getAbsolutePath() );
Modified:
maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_CustomFilterDelimiter.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_CustomFilterDelimiter.java?rev=1799022&r1=1799021&r2=1799022&view=diff
==
---
maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_CustomFilterDelimiter.java
(original)
+++
maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_CustomFilterDelimiter.java
Sat Jun 17 21:02:49 2017
@@ -36,7 +36,7 @@ public class IT_CustomFilterDelimiter
throws IOException, URISyntaxException, VerificationException
{
File dir = TestUtils.getTestDir( "custom-filter-delim" );
-Verifier verifier = new Verifier( dir.getAbsolutePath() );
+Verifier verifier = TestUtils.newVerifier( dir );
verifier.get
svn commit: r1799024 - /maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/plugins/antrun/AntRunMojo.java
Author: gboue
Date: Sat Jun 17 21:43:57 2017
New Revision: 1799024
URL: http://svn.apache.org/viewvc?rev=1799024&view=rev
Log:
Various refactorings and simplifications:
- Removing dead code
- Creating dedicated methods
- Fixing spelling errors
- Trying to minimize try blocks length
Modified:
maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/plugins/antrun/AntRunMojo.java
Modified:
maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/plugins/antrun/AntRunMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/plugins/antrun/AntRunMojo.java?rev=1799024&r1=1799023&r2=1799024&view=diff
==
---
maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/plugins/antrun/AntRunMojo.java
(original)
+++
maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/plugins/antrun/AntRunMojo.java
Sat Jun 17 21:43:57 2017
@@ -50,12 +50,12 @@ import org.apache.tools.ant.ProjectHelpe
import org.apache.tools.ant.taskdefs.Typedef;
import org.apache.tools.ant.types.Path;
import org.codehaus.plexus.configuration.PlexusConfiguration;
-import org.codehaus.plexus.configuration.PlexusConfigurationException;
import org.codehaus.plexus.util.IOUtil;
import org.codehaus.plexus.util.ReaderFactory;
import org.codehaus.plexus.util.StringUtils;
/**
+ *
* Maven AntRun Mojo.
*
* This plugin provides the capability of calling Ant tasks from a POM by
running the nested Ant tasks inside the
@@ -120,7 +120,7 @@ public class AntRunMojo
* The Maven project object
*/
@Parameter( defaultValue = "${project}", readonly = true, required = true )
-private MavenProject project;
+private MavenProject mavenProject;
/**
* The Maven session object
@@ -230,16 +230,16 @@ public class AntRunMojo
private boolean exportAntProperties;
/**
- * Specifies whether a failure in the Ant build leads to a failure of the
Maven build. If this
- * value is {@code false}, the Maven build will proceed even if the Ant
build fails. If it is
- * {@code true}, then the Maven build fails if the Ant build fails.
+ * Specifies whether a failure in the Ant build leads to a failure of the
Maven build. If this value is
+ * {@code false}, the Maven build will proceed even if the Ant build
fails. If it is {@code true}, then the Maven
+ * build fails if the Ant build fails.
*
* @since 1.7
*/
@Parameter( defaultValue = "true" )
private boolean failOnError;
-/** {@inheritDoc} */
+@Override
public void execute()
throws MojoExecutionException, MojoFailureException
{
@@ -252,8 +252,6 @@ public class AntRunMojo
return;
}
-MavenProject mavenProject = getMavenProject();
-
if ( target == null )
{
getLog().info( "No Ant target defined - SKIPPED" );
@@ -268,86 +266,29 @@ public class AntRunMojo
String antTargetName = target.getAttribute( "name",
DEFAULT_ANT_TARGET_NAME );
target.setAttribute( "name", antTargetName );
+Project antProject = new Project();
+antProject.addBuildListener( getConfiguredBuildLogger() );
try
{
-Project antProject = new Project();
File antBuildFile = writeTargetToProjectFile( antTargetName );
ProjectHelper.configureProject( antProject, antBuildFile );
antProject.init();
-DefaultLogger antLogger = new MavenLogger( getLog() );
-
-if ( getLog().isDebugEnabled() )
-{
-antLogger.setMessageOutputLevel( Project.MSG_DEBUG );
-}
-else if ( getLog().isInfoEnabled() )
-{
-antLogger.setMessageOutputLevel( Project.MSG_INFO );
-}
-else if ( getLog().isWarnEnabled() )
-{
-antLogger.setMessageOutputLevel( Project.MSG_WARN );
-}
-else if ( getLog().isErrorEnabled() )
-{
-antLogger.setMessageOutputLevel( Project.MSG_ERR );
-}
-else
-{
-antLogger.setMessageOutputLevel( Project.MSG_VERBOSE );
-}
-
-antProject.addBuildListener( antLogger );
antProject.setBaseDir( mavenProject.getBasedir() );
-Path p = new Path( antProject );
-p.setPath( StringUtils.join(
mavenProject.getCompileClasspathElements().iterator(), File.pathSeparator ) );
-
-/* maven.dependency.classpath it's deprecated as it's equal to
maven.compile.classpath */
-antProject.addReference( MAVEN_REFID_PREFIX +
"dependency.classpath", p );
-antProject.addReference( M
svn commit: r1799110 - in /maven/plugins/trunk/maven-dependency-plugin/src: it/projects/mdep-571-list-java9/ main/java/org/apache/maven/plugins/dependency/utils/
Author: gboue
Date: Sun Jun 18 18:00:24 2017
New Revision: 1799110
URL: http://svn.apache.org/viewvc?rev=1799110&view=rev
Log:
[MDEP-571] JDK9: Issue with list goal fails with java.lang.NoSuchMethodException
Only find public inherited methods through reflection with getMethod instead of
getDeclaredMethod.
Added:
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/mdep-571-list-java9/
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/mdep-571-list-java9/invoker.properties
(with props)
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/mdep-571-list-java9/pom.xml
(with props)
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/mdep-571-list-java9/verify.groovy
(with props)
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugins/dependency/utils/DependencyStatusSets.java
Added:
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/mdep-571-list-java9/invoker.properties
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/it/projects/mdep-571-list-java9/invoker.properties?rev=1799110&view=auto
==
---
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/mdep-571-list-java9/invoker.properties
(added)
+++
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/mdep-571-list-java9/invoker.properties
Sun Jun 18 18:00:24 2017
@@ -0,0 +1,19 @@
+# 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.
+
+invoker.java.version = 1.9+
+invoker.goals =
${project.groupId}:${project.artifactId}:${project.version}:list
Propchange:
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/mdep-571-list-java9/invoker.properties
--
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/mdep-571-list-java9/invoker.properties
--
svn:keywords = Author Date Id Revision
Added:
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/mdep-571-list-java9/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/it/projects/mdep-571-list-java9/pom.xml?rev=1799110&view=auto
==
---
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/mdep-571-list-java9/pom.xml
(added)
+++
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/mdep-571-list-java9/pom.xml
Sun Jun 18 18:00:24 2017
@@ -0,0 +1,35 @@
+
+
+
+
+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.plugins.dependency
+ mdep-571-list-java9
+ 1.0.0-SNAPSHOT
+ Test that dependency:list doesn't fail on JRE9
+
+
+ org.slf4j
+ slf4j-api
+ 1.7.6
+
+
+
Propchange:
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/mdep-571-list-java9/pom.xml
--
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/mdep-571-list-java9/pom.xml
--
svn:keywords = Author Date Id Revision
Added:
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/mdep-571-list-java9/verify.groovy
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/it/projects/mdep-571-list-java9/verify.groovy?rev=1799110&view=auto
==
---
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/mdep-571-list-java9/verify.groovy
(added)
+++
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/mdep-571-list-java9/verify.groovy
Sun Jun 18 18:00:24 2017
@@ -0,0 +1,26 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more
svn commit: r1799601 - in /maven/plugins/trunk/maven-dependency-plugin/src/it/projects/mdep-572-unpack-tar-long-file: ./ child1/ child2/
Author: gboue
Date: Thu Jun 22 18:03:33 2017
New Revision: 1799601
URL: http://svn.apache.org/viewvc?rev=1799601&view=rev
Log:
[MDEP-572] Truncated filenames extracting tar files.
Adding IT showing that the plugin keeps the correct file name when unpacking a
TAR file with POSIX long file mode containing a file with a very long file name.
Added:
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/mdep-572-unpack-tar-long-file/
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/mdep-572-unpack-tar-long-file/child1/
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/mdep-572-unpack-tar-long-file/child1/assembly.xml
(with props)
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/mdep-572-unpack-tar-long-file/child1/pom.xml
(with props)
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/mdep-572-unpack-tar-long-file/child1/this-is-an-empty-text-file-with-a-name-that-is-longer-than-100-characters-to-verify-that-the-name-is-fully-kept-when-unpacking-from-a-tar.txt
(with props)
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/mdep-572-unpack-tar-long-file/child2/
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/mdep-572-unpack-tar-long-file/child2/pom.xml
(with props)
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/mdep-572-unpack-tar-long-file/invoker.properties
(with props)
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/mdep-572-unpack-tar-long-file/pom.xml
(with props)
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/mdep-572-unpack-tar-long-file/verify.bsh
(with props)
Added:
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/mdep-572-unpack-tar-long-file/child1/assembly.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/it/projects/mdep-572-unpack-tar-long-file/child1/assembly.xml?rev=1799601&view=auto
==
---
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/mdep-572-unpack-tar-long-file/child1/assembly.xml
(added)
+++
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/mdep-572-unpack-tar-long-file/child1/assembly.xml
Thu Jun 22 18:03:33 2017
@@ -0,0 +1,37 @@
+
+
+
+
+http://maven.apache.org/ASSEMBLY/2.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0
http://maven.apache.org/xsd/assembly-2.0.0.xsd";>
+ assemble
+
+tar.bz2
+
+ false
+
+
+ ${project.basedir}
+
+*.txt
+
+
+
+
Propchange:
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/mdep-572-unpack-tar-long-file/child1/assembly.xml
--
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/mdep-572-unpack-tar-long-file/child1/assembly.xml
--
svn:keywords = Author Date Id Revision
Added:
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/mdep-572-unpack-tar-long-file/child1/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/it/projects/mdep-572-unpack-tar-long-file/child1/pom.xml?rev=1799601&view=auto
==
---
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/mdep-572-unpack-tar-long-file/child1/pom.xml
(added)
+++
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/mdep-572-unpack-tar-long-file/child1/pom.xml
Thu Jun 22 18:03:33 2017
@@ -0,0 +1,53 @@
+
+
+
+
+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.its.dependency
+mdep-572-unpack-tar-long-file
+1.0
+
+ child1
+ pom
+
+
+
+maven-assembly-plugin
+3.0.0
+
+
+
+ single
+
+package
+
+
+assembly.xml
+
+ posix
+
+
+
+
+
+
+
Propchange:
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/mdep-572-unpack-tar-long-file/child1/pom.xml
--
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/mdep-572-unpack-tar-long-file/child1/pom.xml
--
svn:keywords = Author Date Id Revision
Added:
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/mdep-57
svn commit: r1799794 - in /maven/enforcer/trunk: enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/ maven-enforcer-plugin/src/it/projects/require-plugin-versions-plugin-with-integration-t
Author: gboue Date: Sun Jun 25 10:41:39 2017 New Revision: 1799794 URL: http://svn.apache.org/viewvc?rev=1799794&view=rev Log: Fix build on JDK 9: - In TestMavenVersion, changing the test comparing Java and Maven versions together, due to Java versioning scheme change (JDK-8061493). We now use a fixed version with an underscore to test that it doesn't cause any issues. - In resolve_collect_dependencies IT, version 3.0.0 of the Assembly Plugin needs to be used to incorporate Plexus Archiver resolved issue with new JDK versioning scheme (commit c0357c5 of Plexus Archiver). - In require-plugin-versions-plugin-with-integration-test-lifecycle IT, Tycho needs to be updated to 0.22.0 so that an execution environment greater than 1.5 (which JDK 9 no longer supports) can be specified uniquely. Modified: maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestMavenVersion.java maven/enforcer/trunk/maven-enforcer-plugin/src/it/projects/require-plugin-versions-plugin-with-integration-test-lifecycle/pom.xml maven/enforcer/trunk/maven-enforcer-plugin/src/it/projects/resolve_collect_dependencies/pom.xml Modified: maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestMavenVersion.java URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestMavenVersion.java?rev=1799794&r1=1799793&r2=1799794&view=diff == --- maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestMavenVersion.java (original) +++ maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestMavenVersion.java Sun Jun 25 10:41:39 2017 @@ -19,7 +19,6 @@ package org.apache.maven.plugins.enforce * under the License. */ -import org.apache.commons.lang3.SystemUtils; import org.apache.maven.enforcer.rule.api.EnforcerRuleException; import org.apache.maven.enforcer.rule.api.EnforcerRuleHelper; @@ -65,7 +64,7 @@ public class TestMavenVersion } // this shouldn't crash -rule.setVersion( SystemUtils.JAVA_VERSION ); +rule.setVersion( "2.0.5_01" ); rule.execute( helper ); } Modified: maven/enforcer/trunk/maven-enforcer-plugin/src/it/projects/require-plugin-versions-plugin-with-integration-test-lifecycle/pom.xml URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/maven-enforcer-plugin/src/it/projects/require-plugin-versions-plugin-with-integration-test-lifecycle/pom.xml?rev=1799794&r1=1799793&r2=1799794&view=diff == --- maven/enforcer/trunk/maven-enforcer-plugin/src/it/projects/require-plugin-versions-plugin-with-integration-test-lifecycle/pom.xml (original) +++ maven/enforcer/trunk/maven-enforcer-plugin/src/it/projects/require-plugin-versions-plugin-with-integration-test-lifecycle/pom.xml Sun Jun 25 10:41:39 2017 @@ -25,7 +25,7 @@ 1.0.0-SNAPSHOT eclipse-plugin -0.19.0 +0.22.0 @@ -68,6 +68,7 @@ p2 + JavaSE-@maven.compiler.source@ Modified: maven/enforcer/trunk/maven-enforcer-plugin/src/it/projects/resolve_collect_dependencies/pom.xml URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/maven-enforcer-plugin/src/it/projects/resolve_collect_dependencies/pom.xml?rev=1799794&r1=1799793&r2=1799794&view=diff == --- maven/enforcer/trunk/maven-enforcer-plugin/src/it/projects/resolve_collect_dependencies/pom.xml (original) +++ maven/enforcer/trunk/maven-enforcer-plugin/src/it/projects/resolve_collect_dependencies/pom.xml Sun Jun 25 10:41:39 2017 @@ -43,7 +43,7 @@ org.apache.maven.plugins maven-assembly-plugin -2.5.5 +3.0.0 assemble
svn commit: r1799997 - in /maven/enforcer/trunk: ./ enforcer-rules/ maven-enforcer-plugin/ maven-enforcer-plugin/src/it/projects/display-info/ maven-enforcer-plugin/src/main/java/org/apache/maven/plug
Author: gboue Date: Mon Jun 26 21:26:08 2017 New Revision: 177 URL: http://svn.apache.org/viewvc?rev=177&view=rev Log: Remove usage of commons-lang in the project, to only have commons-lang3 on the classpath. In DisplayInfoMojo, we can simply get the Java version from the system properties. Added: maven/enforcer/trunk/maven-enforcer-plugin/src/it/projects/display-info/ maven/enforcer/trunk/maven-enforcer-plugin/src/it/projects/display-info/pom.xml (with props) maven/enforcer/trunk/maven-enforcer-plugin/src/it/projects/display-info/verify.groovy (with props) Modified: maven/enforcer/trunk/enforcer-rules/pom.xml maven/enforcer/trunk/maven-enforcer-plugin/pom.xml maven/enforcer/trunk/maven-enforcer-plugin/src/main/java/org/apache/maven/plugins/enforcer/DisplayInfoMojo.java maven/enforcer/trunk/pom.xml Modified: maven/enforcer/trunk/enforcer-rules/pom.xml URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/pom.xml?rev=177&r1=176&r2=177&view=diff == --- maven/enforcer/trunk/enforcer-rules/pom.xml (original) +++ maven/enforcer/trunk/enforcer-rules/pom.xml Mon Jun 26 21:26:08 2017 @@ -61,7 +61,6 @@ org.apache.commons commons-lang3 - 3.5 commons-codec Modified: maven/enforcer/trunk/maven-enforcer-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/maven-enforcer-plugin/pom.xml?rev=177&r1=176&r2=177&view=diff == --- maven/enforcer/trunk/maven-enforcer-plugin/pom.xml (original) +++ maven/enforcer/trunk/maven-enforcer-plugin/pom.xml Mon Jun 26 21:26:08 2017 @@ -56,10 +56,6 @@ plexus-utils - commons-lang - commons-lang - - org.apache.maven.enforcer enforcer-api Added: maven/enforcer/trunk/maven-enforcer-plugin/src/it/projects/display-info/pom.xml URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/maven-enforcer-plugin/src/it/projects/display-info/pom.xml?rev=177&view=auto == --- maven/enforcer/trunk/maven-enforcer-plugin/src/it/projects/display-info/pom.xml (added) +++ maven/enforcer/trunk/maven-enforcer-plugin/src/it/projects/display-info/pom.xml Mon Jun 26 21:26:08 2017 @@ -0,0 +1,44 @@ + + + + + + 4.0.0 + org.apache.maven.its.enforcer + display-info + 1.0 + + + +maven-enforcer-plugin +@project.version@ + + +test +validate + + display-info + + + + + + + Propchange: maven/enforcer/trunk/maven-enforcer-plugin/src/it/projects/display-info/pom.xml -- svn:eol-style = native Propchange: maven/enforcer/trunk/maven-enforcer-plugin/src/it/projects/display-info/pom.xml -- svn:keywords = Author Date Id Revision Added: maven/enforcer/trunk/maven-enforcer-plugin/src/it/projects/display-info/verify.groovy URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/maven-enforcer-plugin/src/it/projects/display-info/verify.groovy?rev=177&view=auto == --- maven/enforcer/trunk/maven-enforcer-plugin/src/it/projects/display-info/verify.groovy (added) +++ maven/enforcer/trunk/maven-enforcer-plugin/src/it/projects/display-info/verify.groovy Mon Jun 26 21:26:08 2017 @@ -0,0 +1,22 @@ +/* + * 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. + */ + +File buildLog = new File( basedir, 'build.log' ) +assert buildLog.text.contains( 'Maven Version:' ) +assert buildLog.text.contains( 'JDK Version:' ) Propchange: maven/enforcer/trunk/maven-enforcer-plugin/src/it/projects/display-info/verify.groovy --
svn commit: r1799998 - in /maven/enforcer/trunk/enforcer-rules: pom.xml src/main/java/org/apache/maven/plugins/enforcer/DependencyConvergence.java src/main/java/org/apache/maven/plugins/enforcer/Requi
Author: gboue
Date: Mon Jun 26 21:36:41 2017
New Revision: 178
URL: http://svn.apache.org/viewvc?rev=178&view=rev
Log:
Clean up plexus-i18n dependency, and the code looking the I18N component, since
it is never used.
Modified:
maven/enforcer/trunk/enforcer-rules/pom.xml
maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/DependencyConvergence.java
maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireUpperBoundDeps.java
Modified: maven/enforcer/trunk/enforcer-rules/pom.xml
URL:
http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/pom.xml?rev=178&r1=177&r2=178&view=diff
==
--- maven/enforcer/trunk/enforcer-rules/pom.xml (original)
+++ maven/enforcer/trunk/enforcer-rules/pom.xml Mon Jun 26 21:36:41 2017
@@ -90,11 +90,6 @@
maven-dependency-tree
- org.codehaus.plexus
- plexus-i18n
- 1.0-beta-6
-
-
org.apache.maven
maven-compat
Modified:
maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/DependencyConvergence.java
URL:
http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/DependencyConvergence.java?rev=178&r1=177&r2=178&view=diff
==
---
maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/DependencyConvergence.java
(original)
+++
maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/DependencyConvergence.java
Mon Jun 26 21:36:41 2017
@@ -40,7 +40,6 @@ import org.apache.maven.shared.dependenc
import org.apache.maven.shared.dependency.tree.DependencyTreeBuilderException;
import
org.codehaus.plexus.component.configurator.expression.ExpressionEvaluationException;
import
org.codehaus.plexus.component.repository.exception.ComponentLookupException;
-import org.codehaus.plexus.i18n.I18N;
/**
* @author mailto:r...@e-hoffman.org";>Rex Hoffman
@@ -51,8 +50,6 @@ public class DependencyConvergence
private static Log log;
-private static I18N i18n;
-
private boolean uniqueVersions;
public void setUniqueVersions( boolean uniqueVersions )
@@ -113,10 +110,6 @@ public class DependencyConvergence
}
try
{
-if ( i18n == null )
-{
-i18n = (I18N) helper.getComponent( I18N.class );
-}
DependencyNode node = getNode( helper );
DependencyVersionMap visitor = new DependencyVersionMap( log );
visitor.setUniqueVersions( uniqueVersions );
@@ -133,10 +126,6 @@ public class DependencyConvergence
+ "See above detailed error message." );
}
}
-catch ( ComponentLookupException e )
-{
-throw new EnforcerRuleException( "Unable to lookup a component " +
e.getLocalizedMessage(), e );
-}
catch ( Exception e )
{
throw new EnforcerRuleException( e.getLocalizedMessage(), e );
Modified:
maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireUpperBoundDeps.java
URL:
http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireUpperBoundDeps.java?rev=178&r1=177&r2=178&view=diff
==
---
maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireUpperBoundDeps.java
(original)
+++
maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireUpperBoundDeps.java
Mon Jun 26 21:36:41 2017
@@ -44,7 +44,6 @@ import org.apache.maven.shared.dependenc
import org.apache.maven.shared.dependency.tree.traversal.DependencyNodeVisitor;
import
org.codehaus.plexus.component.configurator.expression.ExpressionEvaluationException;
import
org.codehaus.plexus.component.repository.exception.ComponentLookupException;
-import org.codehaus.plexus.i18n.I18N;
/**
* Rule to enforce that the resolved dependency is also the most recent one of
all transitive dependencies.
@@ -57,8 +56,6 @@ public class RequireUpperBoundDeps
{
private static Log log;
-private static I18N i18n;
-
/**
* @since 1.3
*/
@@ -145,10 +142,6 @@ public class RequireUpperBoundDeps
}
try
{
-if ( i18n == null )
-{
-i18n = (I18N) helper.getComponent( I18N.class );
-}
DependencyNode node = getNode( helper );
RequireUpperBoundDepsVisitor visitor = new
RequireUpperBoundDepsVisitor();
visitor.se
svn commit: r1800187 - /maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireJavaVersion.java
Author: gboue Date: Wed Jun 28 17:54:02 2017 New Revision: 1800187 URL: http://svn.apache.org/viewvc?rev=1800187&view=rev Log: [MENFORCER-274] Add check for version 9 in RequireJavaVersion Submitted by: Peter Ansell Applied without change. This closes #24. Modified: maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireJavaVersion.java Modified: maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireJavaVersion.java URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireJavaVersion.java?rev=1800187&r1=1800186&r2=1800187&view=diff == --- maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireJavaVersion.java (original) +++ maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireJavaVersion.java Wed Jun 28 17:54:02 2017 @@ -60,6 +60,7 @@ public class TestRequireJavaVersion assertThat( RequireJavaVersion.normalizeJDKVersion( "1.6.0-dp" ) ).isEqualTo( "1.6.0" ); assertThat( RequireJavaVersion.normalizeJDKVersion( "1.6.0-dp2" ) ).isEqualTo( "1.6.0-2" ); assertThat( RequireJavaVersion.normalizeJDKVersion( "1.8.0_73" ) ).isEqualTo( "1.8.0-73" ); +assertThat( RequireJavaVersion.normalizeJDKVersion( "9" ) ).isEqualTo( "9" ); }
svn commit: r1800481 - in /maven/plugins/trunk/maven-dependency-plugin: ./ src/it/projects/purge-local-repository-bad-dep/ src/it/projects/purge-local-repository-include/ src/it/projects/purge-local-r
Author: gboue Date: Sat Jul 1 07:32:06 2017 New Revision: 1800481 URL: http://svn.apache.org/viewvc?rev=1800481&view=rev Log: [MDEP-573] "purge-local-repository -Dinclude" does not work as described Due to requiresProject = false, we need to loop over the projects in the reactor ourselves if the mojo was launched from the CLI. This requires several changes: - Dependency artifacts do not exist anymore so we work on dependencies and resolve them if necessary. - Dependencies on projects in the reactor are ignored (just like in the case of a single project, the project itself is not purged). - Artifacts already purged do not need to be purged again: if they were re-resolved then no need to purge and re-resolve them a second time; if they were not re-resolved then keep them deleted. - Updating to maven-artifact-transfer 0.9.2-SNAPSHOT to make added ITs work on Maven 3.0.x. Added: maven/plugins/trunk/maven-dependency-plugin/src/it/projects/purge-local-repository-bad-dep/ maven/plugins/trunk/maven-dependency-plugin/src/it/projects/purge-local-repository-bad-dep/invoker.properties (with props) maven/plugins/trunk/maven-dependency-plugin/src/it/projects/purge-local-repository-bad-dep/pom.xml (with props) maven/plugins/trunk/maven-dependency-plugin/src/it/projects/purge-local-repository-bad-dep/verify.groovy (with props) maven/plugins/trunk/maven-dependency-plugin/src/it/projects/purge-local-repository-include/ maven/plugins/trunk/maven-dependency-plugin/src/it/projects/purge-local-repository-include/invoker.properties (with props) maven/plugins/trunk/maven-dependency-plugin/src/it/projects/purge-local-repository-include/pom.xml (with props) maven/plugins/trunk/maven-dependency-plugin/src/it/projects/purge-local-repository-include/test.properties (with props) maven/plugins/trunk/maven-dependency-plugin/src/it/projects/purge-local-repository-include/verify.groovy (with props) maven/plugins/trunk/maven-dependency-plugin/src/it/projects/purge-local-repository-multi-module/ maven/plugins/trunk/maven-dependency-plugin/src/it/projects/purge-local-repository-multi-module-execution/ maven/plugins/trunk/maven-dependency-plugin/src/it/projects/purge-local-repository-multi-module-execution/child1/ maven/plugins/trunk/maven-dependency-plugin/src/it/projects/purge-local-repository-multi-module-execution/child1/pom.xml (with props) maven/plugins/trunk/maven-dependency-plugin/src/it/projects/purge-local-repository-multi-module-execution/child2/ maven/plugins/trunk/maven-dependency-plugin/src/it/projects/purge-local-repository-multi-module-execution/child2/pom.xml (with props) maven/plugins/trunk/maven-dependency-plugin/src/it/projects/purge-local-repository-multi-module-execution/pom.xml (with props) maven/plugins/trunk/maven-dependency-plugin/src/it/projects/purge-local-repository-multi-module-execution/setup.bsh (with props) maven/plugins/trunk/maven-dependency-plugin/src/it/projects/purge-local-repository-multi-module-execution/test.properties (with props) maven/plugins/trunk/maven-dependency-plugin/src/it/projects/purge-local-repository-multi-module-execution/verify.bsh (with props) maven/plugins/trunk/maven-dependency-plugin/src/it/projects/purge-local-repository-multi-module/child1/ maven/plugins/trunk/maven-dependency-plugin/src/it/projects/purge-local-repository-multi-module/child1/pom.xml (with props) maven/plugins/trunk/maven-dependency-plugin/src/it/projects/purge-local-repository-multi-module/child2/ maven/plugins/trunk/maven-dependency-plugin/src/it/projects/purge-local-repository-multi-module/child2/pom.xml (with props) maven/plugins/trunk/maven-dependency-plugin/src/it/projects/purge-local-repository-multi-module/invoker.properties (with props) maven/plugins/trunk/maven-dependency-plugin/src/it/projects/purge-local-repository-multi-module/pom.xml (with props) maven/plugins/trunk/maven-dependency-plugin/src/it/projects/purge-local-repository-multi-module/setup.bsh (with props) maven/plugins/trunk/maven-dependency-plugin/src/it/projects/purge-local-repository-multi-module/test.properties (with props) maven/plugins/trunk/maven-dependency-plugin/src/it/projects/purge-local-repository-multi-module/verify.bsh (with props) maven/plugins/trunk/maven-dependency-plugin/src/test/resources/unit/skip-test/plugin-purge-local-repository-config.xml (with props) Modified: maven/plugins/trunk/maven-dependency-plugin/pom.xml maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugins/dependency/PurgeLocalRepositoryMojo.java maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugins/dependency/TestSkip.java Modified: maven/plugins/trunk/maven-dependency-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-
svn commit: r1800508 - in /maven/plugins/trunk/maven-assembly-plugin/src: it/projects/repositories/massembly-855/ it/projects/repositories/massembly-855/child/ it/projects/repositories/massembly-855/c
Author: gboue
Date: Sat Jul 1 14:01:59 2017
New Revision: 1800508
URL: http://svn.apache.org/viewvc?rev=1800508&view=rev
Log:
[MASSEMBLY-855] Remote repositories ignored in a multi-module project
All the project repositories (and not just the session) need to be considered
when a repository is assembled.
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/repositories/massembly-855/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/repositories/massembly-855/child/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/repositories/massembly-855/child/pom.xml
(with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/repositories/massembly-855/child/src/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/repositories/massembly-855/child/src/assembly/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/repositories/massembly-855/child/src/assembly/repository.xml
(with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/repositories/massembly-855/invoker.properties
(with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/repositories/massembly-855/pom.xml
(with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/repositories/massembly-855/remote-repository/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/repositories/massembly-855/remote-repository/org/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/repositories/massembly-855/remote-repository/org/apache/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/repositories/massembly-855/remote-repository/org/apache/maven/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/repositories/massembly-855/remote-repository/org/apache/maven/plugins/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/repositories/massembly-855/remote-repository/org/apache/maven/plugins/assembly/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/repositories/massembly-855/remote-repository/org/apache/maven/plugins/assembly/it/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/repositories/massembly-855/remote-repository/org/apache/maven/plugins/assembly/it/massembly-855/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/repositories/massembly-855/remote-repository/org/apache/maven/plugins/assembly/it/massembly-855/1.0/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/repositories/massembly-855/remote-repository/org/apache/maven/plugins/assembly/it/massembly-855/1.0/massembly-855-1.0.jar
(with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/repositories/massembly-855/remote-repository/org/apache/maven/plugins/assembly/it/massembly-855/1.0/massembly-855-1.0.pom
(with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/repositories/massembly-855/verify.bsh
(with props)
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/phase/wrappers/RepoBuilderConfigSourceWrapper.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/artifact/DefaultDependencyResolver.java
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/repositories/massembly-855/child/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/repositories/massembly-855/child/pom.xml?rev=1800508&view=auto
==
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/repositories/massembly-855/child/pom.xml
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/repositories/massembly-855/child/pom.xml
Sat Jul 1 14:01:59 2017
@@ -0,0 +1,64 @@
+
+
+
+
+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/maven-v4_0_0.xsd";>
+ 4.0.0
+
+org.apache.maven.plugin.assembly.test
+massembly-855
+1
+
+ child
+ pom
+
+file://${project.basedir}/../remote-repository
+
+
+
+ org.apache.maven.plugins.assembly.it
+ massembly-855
+ 1.0
+
+
+
+
+
+maven-assembly-plugin
+@project.version@
+
+
+src/assembly/repository.xml
+
+
+
+
+create-repository
+package
+
+ single
+
+
+
+
+
+
+
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/repositories/massembly-855/child/pom.xml
--
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/repo
svn commit: r1800814 - in /maven/plugins/trunk/maven-help-plugin/src: it/all-profiles-parent-pom/ it/all-profiles-parent-pom/child/ main/java/org/apache/maven/plugins/help/ test/java/org/apache/maven/
Author: gboue
Date: Tue Jul 4 20:17:57 2017
New Revision: 1800814
URL: http://svn.apache.org/viewvc?rev=1800814&view=rev
Log:
[MPH-123] all-profiles does not show right active status
MavenProject.getActiveProfiles only considers profiles from the project POM, so
we also need to get the active profiles from the parents. With Maven 3, while
it would be possible to use MavenProject.getInjectedProfileIds, it is more
direct and symmetrical here to walk the parent chain ourselves (and makes sure
the printed 'source' is consistent for active and inactive profiles from the
settings).
Added:
maven/plugins/trunk/maven-help-plugin/src/it/all-profiles-parent-pom/
maven/plugins/trunk/maven-help-plugin/src/it/all-profiles-parent-pom/child/
maven/plugins/trunk/maven-help-plugin/src/it/all-profiles-parent-pom/child/pom.xml
(with props)
maven/plugins/trunk/maven-help-plugin/src/it/all-profiles-parent-pom/invoker.properties
(with props)
maven/plugins/trunk/maven-help-plugin/src/it/all-profiles-parent-pom/pom.xml
(with props)
maven/plugins/trunk/maven-help-plugin/src/it/all-profiles-parent-pom/verify.groovy
(with props)
Modified:
maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/AllProfilesMojo.java
maven/plugins/trunk/maven-help-plugin/src/test/java/org/apache/maven/plugins/help/AllProfilesMojoTest.java
Added:
maven/plugins/trunk/maven-help-plugin/src/it/all-profiles-parent-pom/child/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-help-plugin/src/it/all-profiles-parent-pom/child/pom.xml?rev=1800814&view=auto
==
---
maven/plugins/trunk/maven-help-plugin/src/it/all-profiles-parent-pom/child/pom.xml
(added)
+++
maven/plugins/trunk/maven-help-plugin/src/it/all-profiles-parent-pom/child/pom.xml
Tue Jul 4 20:17:57 2017
@@ -0,0 +1,43 @@
+
+
+
+
+
+ 4.0.0
+
+org.apache.maven.its.help
+all-profiles-parent-pom
+1.0
+
+ child
+
+
+ profile-active-from-child-pom
+
+
+ pom.xml
+
+
+
+
+ profile-inactive-from-child-pom
+
+
+
Propchange:
maven/plugins/trunk/maven-help-plugin/src/it/all-profiles-parent-pom/child/pom.xml
--
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-help-plugin/src/it/all-profiles-parent-pom/child/pom.xml
--
svn:keywords = Author Date Id Revision
Added:
maven/plugins/trunk/maven-help-plugin/src/it/all-profiles-parent-pom/invoker.properties
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-help-plugin/src/it/all-profiles-parent-pom/invoker.properties?rev=1800814&view=auto
==
---
maven/plugins/trunk/maven-help-plugin/src/it/all-profiles-parent-pom/invoker.properties
(added)
+++
maven/plugins/trunk/maven-help-plugin/src/it/all-profiles-parent-pom/invoker.properties
Tue Jul 4 20:17:57 2017
@@ -0,0 +1,19 @@
+# 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.
+
+invoker.goals =
${project.groupId}:${project.artifactId}:${project.version}:all-profiles
+invoker.maven.version = 3.0-, 3.0.4+
Propchange:
maven/plugins/trunk/maven-help-plugin/src/it/all-profiles-parent-pom/invoker.properties
--
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-help-plugin/src/it/all-profiles-parent-pom/invoker.properties
--
svn:keywords = Author Date Id Revision
Added:
maven/plugins/trunk/maven-help-plugin/src/it/all-profiles-parent-pom/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-help-plugin/src/it/all-profiles-parent-pom/pom.xml?rev=1800814&view=auto
==
---
maven/plugins/trunk/maven-help-plugin/src/it/all-profiles-parent-pom/pom.xml
(added)
+++
ma
