svn commit: r1763933 - in /maven/plugins/trunk/maven-install-plugin: ./ src/it/attach-jar-checksum/ src/it/generate-pom-auto-1/ src/it/jar-sources-javadoc/ src/it/local-repo-override-with-checksum/ sr
Author: gboue
Date: Sat Oct 8 20:06:42 2016
New Revision: 1763933
URL: http://svn.apache.org/viewvc?rev=1763933&view=rev
Log:
[MINSTALL-128] Replace usage of the deprecated ArtifactFactory
In order to fix the use of deprecated code from ArtifactFactory, the
install-file Mojo now creates a new MavenProject and attaches to this project
all artifacts to install.
Added:
maven/plugins/trunk/maven-install-plugin/src/it/local-repo-override-with-checksum/
maven/plugins/trunk/maven-install-plugin/src/it/local-repo-override-with-checksum/invoker.properties
(with props)
maven/plugins/trunk/maven-install-plugin/src/it/local-repo-override-with-checksum/pom.xml
(with props)
maven/plugins/trunk/maven-install-plugin/src/it/local-repo-override-with-checksum/setup.bsh
(with props)
maven/plugins/trunk/maven-install-plugin/src/it/local-repo-override-with-checksum/test.jar
(with props)
maven/plugins/trunk/maven-install-plugin/src/it/local-repo-override-with-checksum/test.properties
(with props)
maven/plugins/trunk/maven-install-plugin/src/it/local-repo-override-with-checksum/verify.bsh
(with props)
Removed:
maven/plugins/trunk/maven-install-plugin/src/main/java/org/apache/maven/plugin/install/DualDigester.java
maven/plugins/trunk/maven-install-plugin/src/test/java/org/apache/maven/plugin/install/DualDigesterTest.java
maven/plugins/trunk/maven-install-plugin/src/test/java/org/apache/maven/plugin/install/SimpleDigester.java
maven/plugins/trunk/maven-install-plugin/src/test/java/org/apache/maven/plugin/install/testingharness/
maven/plugins/trunk/maven-install-plugin/src/test/resources/META-INF/plexus/components.xml
Modified:
maven/plugins/trunk/maven-install-plugin/pom.xml
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/pom-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/test/java/org/apache/maven/plugin/install/InstallFileMojoTest.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/java/org/apache/maven/plugin/install/Utils.java
Modified: maven/plugins/trunk/maven-install-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-install-plugin/pom.xml?rev=1763933&r1=1763932&r2=1763933&view=diff
==
--- maven/plugins/trunk/maven-install-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-install-plugin/pom.xml Sat Oct 8 20:06:42 2016
@@ -110,12 +110,6 @@
maven-plugin-testing-harness
2.1
test
-
-
- plexus-container-default
- org.codehaus.plexus
-
-
org.apache.maven
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=1763933&r1=1763932&r2=1763933&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
Sat Oct 8 20:06:42 2016
@@ -20,7 +20,7 @@
import java.io.*;
import java.util.*;
-import org.apache.maven.plugin.install.*;
+import org.apache.maven.plugin.install.Utils;
String[] paths =
{
@@ -34,13 +34,16 @@ String[] paths =
"org/apache/maven/its/install/ajc/test/1.0-SNAPSHOT/test-1.0-SNAPSHOT-sources.jar.md5",
"org/apache/maven/its/install/ajc/test/1.0-SNAPSHOT/test-1.0-SNAPSHOT-sources.jar.sha1",
"org/apache/maven/its/install/ajc/test/1.0-SNAPSHOT/maven-metadata-local.xml",
-//
"org/apache/maven/its/install/ajc/test/1.0-SNAPSHOT/maven-metadata-local.xml.md5",
-//
"org/apache/maven/its/install/ajc/test/1.0-SNAPSHOT/maven-metadata-local.xml.sha1",
"org/apache/maven/its/install/ajc/test/maven-metadata-local.xml",
-//"org/apache/maven/its/install/ajc/test/maven-metadata-local.xml.md5",
-//"org/apache/maven/its/install/ajc/test/maven-metadata-local.xml.sha1",
};
+Set cksumToCheckPaths = new HashSet( Arrays.asList( new String[]
+{
+"org/apache/maven/its/install/ajc/test/1.0-SNAPSHOT/test-1.0-SNAPSHOT.pom",
+"org/apache/maven/its/install/ajc/test/1.0-SNAPSHOT/test-1.0-SNAPSHOT.jar",
+
"org/apache/maven/its/install/ajc/test/1.0-
svn commit: r1763932 - /maven/plugins/trunk/maven-invoker-plugin/src/it/special-characters-should-work/setup.groovy
Author: hboutemy
Date: Sat Oct 8 19:41:03 2016
New Revision: 1763932
URL: http://svn.apache.org/viewvc?rev=1763932&view=rev
Log:
added space and & to tested special characters
Modified:
maven/plugins/trunk/maven-invoker-plugin/src/it/special-characters-should-work/setup.groovy
Modified:
maven/plugins/trunk/maven-invoker-plugin/src/it/special-characters-should-work/setup.groovy
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/src/it/special-characters-should-work/setup.groovy?rev=1763932&r1=1763931&r2=1763932&view=diff
==
---
maven/plugins/trunk/maven-invoker-plugin/src/it/special-characters-should-work/setup.groovy
(original)
+++
maven/plugins/trunk/maven-invoker-plugin/src/it/special-characters-should-work/setup.groovy
Sat Oct 8 19:41:03 2016
@@ -23,7 +23,7 @@ import java.util.regex.*
File srcIt = new File (basedir, "src/it");
File originalFolder = new File (srcIt, "minvoker-test");
-File destinationFolder = new File(srcIt,
"test-\u00c9\u00e9\u00ea-more-\u00c9\u00e9\u00ea-test");
+File destinationFolder = new File(srcIt, "test-\u00c9\u00e9\u00ea- &
-\u00c9\u00e9\u00ea-test");
// rename old one into new one with special characters.
if (!originalFolder.renameTo(destinationFolder)) {
throw new IOException("Rename didn't work.")
svn commit: r1763929 - /maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/project/install/internal/DefaultProjectInstaller.java
Author: gboue
Date: Sat Oct 8 18:43:58 2016
New Revision: 1763929
URL: http://svn.apache.org/viewvc?rev=1763929&view=rev
Log:
[MSHARED-595] In DefaultProjectInstaller, the path to the local repository
should be retrieved from the RepositoryManager
We need to rely on the RepositoryManager to get a hold of the local repository
base directory.
Modified:
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/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=1763929&r1=1763928&r2=1763929&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
Sat Oct 8 18:43:58 2016
@@ -101,7 +101,7 @@ public class DefaultProjectInstaller
{
installer.install( buildingRequest,
Collections.singletonList( new
ProjectArtifact( project ) ) );
-installChecksums( buildingRequest, artifactRepository,
artifact, createChecksum );
+installChecksums( buildingRequest, artifact, createChecksum );
addMetaDataFilesForArtifact( artifactRepository, artifact,
metadataFiles, createChecksum );
}
}
@@ -120,7 +120,7 @@ public class DefaultProjectInstaller
if ( file != null && file.isFile() )
{
installer.install( buildingRequest,
Collections.singletonList( artifact ) );
-installChecksums( buildingRequest, artifactRepository,
artifact, createChecksum );
+installChecksums( buildingRequest, artifact, createChecksum );
addMetaDataFilesForArtifact( artifactRepository, artifact,
metadataFiles, createChecksum );
}
else if ( !attachedArtifacts.isEmpty() )
@@ -139,7 +139,7 @@ public class DefaultProjectInstaller
for ( Artifact attached : attachedArtifacts )
{
installer.install( buildingRequest, Collections.singletonList(
attached ) );
-installChecksums( buildingRequest, artifactRepository, attached,
createChecksum );
+installChecksums( buildingRequest, attached, createChecksum );
addMetaDataFilesForArtifact( artifactRepository, attached,
metadataFiles, createChecksum );
}
@@ -153,12 +153,12 @@ public class DefaultProjectInstaller
* the original POM file (cf. MNG-2820). While the plugin currently
requires Maven 2.0.6, we continue to hash the
* installed POM for robustness with regard to future changes like
re-introducing some kind of POM filtering.
*
+ * @param buildingRequest The project building request, must not be
null.
* @param artifact The artifact for which to create checksums, must not be
null.
* @param createChecksum {@code true} if checksum should be created,
otherwise {@code false}.
* @throws IOException If the checksums could not be installed.
*/
-private void installChecksums( ProjectBuildingRequest buildingRequest,
ArtifactRepository artifactRepository,
- Artifact artifact, boolean createChecksum )
+private void installChecksums( ProjectBuildingRequest buildingRequest,
Artifact artifact, boolean createChecksum )
throws IOException
{
if ( !createChecksum )
@@ -166,7 +166,7 @@ public class DefaultProjectInstaller
return;
}
-File artifactFile = getLocalRepoFile( buildingRequest,
artifactRepository, artifact );
+File artifactFile = getLocalRepoFile( buildingRequest, artifact );
installChecksums( artifactFile );
}
@@ -257,14 +257,14 @@ public class DefaultProjectInstaller
* Gets the path of the specified artifact within the local repository.
Note that the returned path need not exist
* (yet).
*
+ * @param buildingRequest The project building request, must not be
null.
* @param artifact The artifact whose local repo path should be
determined, must not be null.
* @return The absolute path to the artifact when installed, never
null.
*/
-private File getLocalRepoFile( ProjectBuildingRequest buildingRequest,
ArtifactRepository artifactRepository,
- Artifact artifact )
+private File getLocalRepoFile( ProjectBuildingRequest buildingRequest,
Artifact artifact )
{
String path =
svn commit: r1763928 - /maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/project/install/internal/DefaultProjectInstaller.java
Author: gboue
Date: Sat Oct 8 18:26:40 2016
New Revision: 1763928
URL: http://svn.apache.org/viewvc?rev=1763928&view=rev
Log:
[MSHARED-594] NullPointerException is thrown when trying to install a project
without POM file
Adding null-check for MavenProject.getFile(): it could be the case that there
is no POM file for the project, when it only has attached artifacts and those
should get installed.
Modified:
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/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=1763928&r1=1763927&r2=1763928&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
Sat Oct 8 18:26:40 2016
@@ -97,14 +97,21 @@ public class DefaultProjectInstaller
if ( isPomArtifact )
{
-installer.install( buildingRequest,
Collections.singletonList( new ProjectArtifact( project ) ) );
-installChecksums( buildingRequest, artifactRepository, artifact,
createChecksum );
-addMetaDataFilesForArtifact( artifactRepository, artifact,
metadataFiles, createChecksum );
+if ( pomFile != null )
+{
+installer.install( buildingRequest,
+ Collections.singletonList( new
ProjectArtifact( project ) ) );
+installChecksums( buildingRequest, artifactRepository,
artifact, createChecksum );
+addMetaDataFilesForArtifact( artifactRepository, artifact,
metadataFiles, createChecksum );
+}
}
else
{
-metadata = new ProjectArtifactMetadata( artifact, pomFile );
-artifact.addMetadata( metadata );
+if ( pomFile != null )
+{
+metadata = new ProjectArtifactMetadata( artifact, pomFile );
+artifact.addMetadata( metadata );
+}
File file = artifact.getFile();
svn commit: r1763916 - /maven/plugins/trunk/maven-pmd-plugin/pom.xml
Author: adangel Date: Sat Oct 8 16:09:01 2016 New Revision: 1763916 URL: http://svn.apache.org/viewvc?rev=1763916&view=rev Log: [maven-release-plugin] prepare for next development iteration Modified: maven/plugins/trunk/maven-pmd-plugin/pom.xml Modified: maven/plugins/trunk/maven-pmd-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pmd-plugin/pom.xml?rev=1763916&r1=1763915&r2=1763916&view=diff == --- maven/plugins/trunk/maven-pmd-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-pmd-plugin/pom.xml Sat Oct 8 16:09:01 2016 @@ -30,7 +30,7 @@ under the License. maven-pmd-plugin - 3.7 + 3.8-SNAPSHOT maven-plugin Apache Maven PMD Plugin @@ -64,9 +64,9 @@ under the License. - scm:svn:http://svn.apache.org/repos/asf/maven/plugins/tags/maven-pmd-plugin-3.7 - scm:svn:https://svn.apache.org/repos/asf/maven/plugins/tags/maven-pmd-plugin-3.7 - http://svn.apache.org/viewvc/maven/plugins/tags/maven-pmd-plugin-3.7 + scm:svn:http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-pmd-plugin/ + scm:svn:https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-pmd-plugin/ + http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pmd-plugin/ JIRA
svn commit: r1763915 - /maven/plugins/tags/maven-pmd-plugin-3.7/
Author: adangel Date: Sat Oct 8 16:08:58 2016 New Revision: 1763915 URL: http://svn.apache.org/viewvc?rev=1763915&view=rev Log: [maven-release-plugin] copy for tag maven-pmd-plugin-3.7 Added: maven/plugins/tags/maven-pmd-plugin-3.7/ - copied from r1763914, maven/plugins/trunk/maven-pmd-plugin/
svn commit: r1763914 - /maven/plugins/trunk/maven-pmd-plugin/pom.xml
Author: adangel Date: Sat Oct 8 16:08:43 2016 New Revision: 1763914 URL: http://svn.apache.org/viewvc?rev=1763914&view=rev Log: [maven-release-plugin] prepare release maven-pmd-plugin-3.7 Modified: maven/plugins/trunk/maven-pmd-plugin/pom.xml Modified: maven/plugins/trunk/maven-pmd-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pmd-plugin/pom.xml?rev=1763914&r1=1763913&r2=1763914&view=diff == --- maven/plugins/trunk/maven-pmd-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-pmd-plugin/pom.xml Sat Oct 8 16:08:43 2016 @@ -30,7 +30,7 @@ under the License. maven-pmd-plugin - 3.7-SNAPSHOT + 3.7 maven-plugin Apache Maven PMD Plugin @@ -64,9 +64,9 @@ under the License. - scm:svn:http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-pmd-plugin/ - scm:svn:https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-pmd-plugin/ - http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pmd-plugin/ + scm:svn:http://svn.apache.org/repos/asf/maven/plugins/tags/maven-pmd-plugin-3.7 + scm:svn:https://svn.apache.org/repos/asf/maven/plugins/tags/maven-pmd-plugin-3.7 + http://svn.apache.org/viewvc/maven/plugins/tags/maven-pmd-plugin-3.7 JIRA
svn commit: r1763911 - /maven/plugins/trunk/maven-pmd-plugin/pom.xml
Author: adangel
Date: Sat Oct 8 15:43:24 2016
New Revision: 1763911
URL: http://svn.apache.org/viewvc?rev=1763911&view=rev
Log:
[MPMD-229] Cleanup POM, remove temporary workarounds
dom4j comes in via velocity-tools, but it doesn't seem to be needed at all
so it is not added back
Modified:
maven/plugins/trunk/maven-pmd-plugin/pom.xml
Modified: maven/plugins/trunk/maven-pmd-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pmd-plugin/pom.xml?rev=1763911&r1=1763910&r2=1763911&view=diff
==
--- maven/plugins/trunk/maven-pmd-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-pmd-plugin/pom.xml Sat Oct 8 15:43:24 2016
@@ -135,26 +135,13 @@ under the License.
doxia-site-renderer
${doxiaVersion}
- dom4j
dom4j
-
-
-
-
-
- dom4j
- dom4j
- 1.6.1
- runtime
-
-
- xml-apis
- xml-apis
+ dom4j
svn commit: r1763910 - /maven/plugins/trunk/maven-pmd-plugin/pom.xml
Author: adangel Date: Sat Oct 8 15:43:12 2016 New Revision: 1763910 URL: http://svn.apache.org/viewvc?rev=1763910&view=rev Log: [MPMD-229] Cleanup POM, remove temporary workarounds Use m-release-p from parent Modified: maven/plugins/trunk/maven-pmd-plugin/pom.xml Modified: maven/plugins/trunk/maven-pmd-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pmd-plugin/pom.xml?rev=1763910&r1=1763909&r2=1763910&view=diff == --- maven/plugins/trunk/maven-pmd-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-pmd-plugin/pom.xml Sat Oct 8 15:43:12 2016 @@ -240,16 +240,6 @@ under the License. - - - - org.apache.maven.plugins - maven-release-plugin - - 2.5.3 - - -
svn commit: r1763909 - /maven/plugins/trunk/maven-pmd-plugin/pom.xml
Author: adangel Date: Sat Oct 8 15:42:58 2016 New Revision: 1763909 URL: http://svn.apache.org/viewvc?rev=1763909&view=rev Log: [MPMD-228] Upgrade maven-plugins to version 30 Modified: maven/plugins/trunk/maven-pmd-plugin/pom.xml Modified: maven/plugins/trunk/maven-pmd-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pmd-plugin/pom.xml?rev=1763909&r1=1763908&r2=1763909&view=diff == --- maven/plugins/trunk/maven-pmd-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-pmd-plugin/pom.xml Sat Oct 8 15:42:58 2016 @@ -25,7 +25,7 @@ under the License. maven-plugins org.apache.maven.plugins -28 +30 ../../pom/maven/maven-plugins/pom.xml
