svn commit: r1766221 - in /maven/plugins/trunk/maven-compiler-plugin/src/site/apt/examples: compile-using-different-jdk.apt.vm set-compiler-source-and-target.apt.vm
Author: gboue
Date: Sat Oct 22 18:11:12 2016
New Revision: 1766221
URL: http://svn.apache.org/viewvc?rev=1766221&view=rev
Log:
- Updating the "Setting the -source and -target of the Java Compiler": fixing
broken link to Mojohaus, adding a note about the usage of "source", linking to
the page about compiling with a different JDK.
- Updating "Compile using a different JDK" documentation page to reference
toolchains.
Modified:
maven/plugins/trunk/maven-compiler-plugin/src/site/apt/examples/compile-using-different-jdk.apt.vm
maven/plugins/trunk/maven-compiler-plugin/src/site/apt/examples/set-compiler-source-and-target.apt.vm
Modified:
maven/plugins/trunk/maven-compiler-plugin/src/site/apt/examples/compile-using-different-jdk.apt.vm
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-compiler-plugin/src/site/apt/examples/compile-using-different-jdk.apt.vm?rev=1766221&r1=1766220&r2=1766221&view=diff
==
---
maven/plugins/trunk/maven-compiler-plugin/src/site/apt/examples/compile-using-different-jdk.apt.vm
(original)
+++
maven/plugins/trunk/maven-compiler-plugin/src/site/apt/examples/compile-using-different-jdk.apt.vm
Sat Oct 22 18:11:12 2016
@@ -28,6 +28,22 @@
Compiling Sources Using A Different JDK
+* Using Maven Toolchains
+
+ The preferable way to use a different JDK is to use the toolchains
mechanism. During the build of a project, Maven,
+ without toolchains, will use the JDK to perform various steps, like
compiling the Java sources, generate the Javadoc,
+ run unit tests or sign JARs. Each of those plugins need a tool of the JDK to
operate: <<>>, <<>>,
+ <<>>, etc. A toolchains is a way to specify the path to the JDK
to use for all of those plugins in a
+ centralized manner, independant from the one running Maven itself.
+
+ To set this up, refer to the
{{{/guides/mini/guide-using-toolchains.html}Guide to Using Toolchains}}, which
makes use
+ of the {{{/plugins/maven-toolchains-plugin/}Maven Toolchains Plugin}}.
+
+* Configuring the Compiler Plugin
+
+ Outside of a toolchains, it is still possible to tell the Compiler Plugin
the specific JDK to use during compilation.
+ Note that such configuration will be specific to this plugin, and will not
affect others.
+
The <<>> parameter can be used to specify the version of the
compiler that the plugin will use. However, you also need to set <<>>
to <<>> for this to work. For example:
Modified:
maven/plugins/trunk/maven-compiler-plugin/src/site/apt/examples/set-compiler-source-and-target.apt.vm
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-compiler-plugin/src/site/apt/examples/set-compiler-source-and-target.apt.vm?rev=1766221&r1=1766220&r2=1766221&view=diff
==
---
maven/plugins/trunk/maven-compiler-plugin/src/site/apt/examples/set-compiler-source-and-target.apt.vm
(original)
+++
maven/plugins/trunk/maven-compiler-plugin/src/site/apt/examples/set-compiler-source-and-target.apt.vm
Sat Oct 22 18:11:12 2016
@@ -35,7 +35,20 @@ Setting the <<<-source>>> and <<<-target
For example, if you want to use the Java 8 language features (<<<-source
1.8>>>)
and also want the compiled classes to be compatible with JVM 1.8 (<<<-target
1.8>>>),
- you can then put:
+ you can either add the two following properties, which are the default
property names for the plugin parameters:
+
++-
+
+ [...]
+
+1.8
+1.8
+
+ [...]
+
++-
+
+ or configure the plugin directly:
+-
@@ -63,5 +76,8 @@ Setting the <<<-source>>> and <<<-target
specified version. The pitfall is unintended usage of APIs that only exist
in later JREs which would make your code
fail at runtime with a linkage error. To avoid this issue, you can either
configure the compiler's boot classpath
to match the target JRE or use the
- {{{http://mojo.codehaus.org/animal-sniffer-maven-plugin/}Animal Sniffer
Maven Plugin}} to verify your code doesn't
- use unintended APIs.
+
{{{http://www.mojohaus.org/animal-sniffer/animal-sniffer-maven-plugin/}Animal
Sniffer Maven Plugin}}
+ to verify your code doesn't use unintended APIs. In the same way, setting
the <<>> option does not guarantee
+ that your code actually compiles on a JDK with the specified version. To
compile your code with a specific JDK
+ version, different than the one used to launch Maven, refer to the
+ {{{../examples/compile-using-different-jdk.html}Compile Using A Different
JDK}} example.
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
