You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sk...@apache.org on 2013/06/27 00:47:42 UTC
svn commit: r1497149 - in /maven/sandbox/trunk/dist-tools/dist-tool-plugin:
pom.xml src/main/java/org/apache/maven/dist/tools/AbstractDistCheckMojo.java
src/main/java/org/apache/maven/dist/tools/ConfigurationLineInfo.java
src/main/resources/db/mavendb.csv
Author: skygo
Date: Wed Jun 26 22:47:42 2013
New Revision: 1497149
URL: http://svn.apache.org/r1497149
Log:
* fix pmd config for jdk 7
* add a manual override version in use for maven-release
because central says 5 is the latest but it's 2.4.1 according to pom.xml in trunk (actions should be taken with infra for that ?)
* add a field in csv database for future extensions MVA for MaVen Artifact (not yet used)
Modified:
maven/sandbox/trunk/dist-tools/dist-tool-plugin/pom.xml
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/AbstractDistCheckMojo.java
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/ConfigurationLineInfo.java
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/resources/db/mavendb.csv
Modified: maven/sandbox/trunk/dist-tools/dist-tool-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/dist-tools/dist-tool-plugin/pom.xml?rev=1497149&r1=1497148&r2=1497149&view=diff
==============================================================================
--- maven/sandbox/trunk/dist-tools/dist-tool-plugin/pom.xml (original)
+++ maven/sandbox/trunk/dist-tools/dist-tool-plugin/pom.xml Wed Jun 26 22:47:42 2013
@@ -210,6 +210,14 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-pmd-plugin</artifactId>
+ <version>3.0.1</version>
+ <configuration>
+ <targetJdk>1.7</targetJdk>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>2.10</version>
<configuration><!-- help for netbeans -->
Modified: maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/AbstractDistCheckMojo.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/AbstractDistCheckMojo.java?rev=1497149&r1=1497148&r2=1497149&view=diff
==============================================================================
--- maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/AbstractDistCheckMojo.java (original)
+++ maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/AbstractDistCheckMojo.java Wed Jun 26 22:47:42 2013
@@ -183,7 +183,19 @@ public abstract class AbstractDistCheckM
getLog().debug( metadata.getVersioning().getVersions() + " version(s) detected " + repoBaseUrl );
// central
- checkArtifact( aLine, metadata.getVersioning().getLatest() );
+ if ( aLine.getForcedVersion() == null )
+ {
+ checkArtifact( aLine, metadata.getVersioning().getLatest() );
+ }
+ else
+ {
+ //
+ getLog().error( "metadata lastest version value is "
+ + metadata.getVersioning().getLatest() + " but was manually set to "
+ + aLine.getForcedVersion()
+ + " as it's the actual latest version ");
+ checkArtifact( aLine, aLine.getForcedVersion() );
+ }
}
catch ( IOException | XmlPullParserException ex )
Modified: maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/ConfigurationLineInfo.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/ConfigurationLineInfo.java?rev=1497149&r1=1497148&r2=1497149&view=diff
==============================================================================
--- maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/ConfigurationLineInfo.java (original)
+++ maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/ConfigurationLineInfo.java Wed Jun 26 22:47:42 2013
@@ -36,13 +36,27 @@ class ConfigurationLineInfo
private final String artifactId;
private final String dist;
private static final String URLSEP = "/";
+ private final String forceVersion;
private Metadata metadata;
public ConfigurationLineInfo( String[] infos )
{
- this.groupId = infos[0];
- this.artifactId = infos[1];
- this.dist = infos[2];
+ this.groupId = infos[1];
+ this.artifactId = infos[2];
+ this.dist = infos[3];
+ if ( infos.length == 5 )
+ {
+ this.forceVersion = infos[4];
+ }
+ else
+ {
+ this.forceVersion = null;
+ }
+ }
+
+ public String getForcedVersion()
+ {
+ return forceVersion;
}
/**
Modified: maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/resources/db/mavendb.csv
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/resources/db/mavendb.csv?rev=1497149&r1=1497148&r2=1497149&view=diff
==============================================================================
--- maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/resources/db/mavendb.csv (original)
+++ maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/resources/db/mavendb.csv Wed Jun 26 22:47:42 2013
@@ -2,95 +2,95 @@
## ant-tasks nothing
## binaries nothing
## doxia
-org.apache.maven.doxia;doxia;http://www.apache.org/dist/maven/doxia/
-org.apache.maven.doxia;doxia-sitetools;http://www.apache.org/dist/maven/doxia/
+MVA;org.apache.maven.doxia;doxia;http://www.apache.org/dist/maven/doxia/
+MVA;org.apache.maven.doxia;doxia-sitetools;http://www.apache.org/dist/maven/doxia/
## indexer
-org.apache.maven.indexer;maven-indexer;http://www.apache.org/dist/maven/indexer/
+MVA;org.apache.maven.indexer;maven-indexer;http://www.apache.org/dist/maven/indexer/
## maven-1 nothing
## maven-2 nothing
## maven-3 nothing
## plugin-testing
-org.apache.maven.plugin-testing;maven-plugin-testing;http://www.apache.org/dist/maven/plugin-testing/
+MVA;org.apache.maven.plugin-testing;maven-plugin-testing;http://www.apache.org/dist/maven/plugin-testing/
## plugin-tools
-org.apache.maven.plugin-tools;maven-plugin-tools;http://www.apache.org/dist/maven/plugin-tools/
+MVA;org.apache.maven.plugin-tools;maven-plugin-tools;http://www.apache.org/dist/maven/plugin-tools/
## plugins
-org.apache.maven.plugins;maven-acr-plugin;http://www.apache.org/dist/maven/plugins/
-org.apache.maven.plugins;maven-ant-plugin;http://www.apache.org/dist/maven/plugins/
-org.apache.maven.plugins;maven-antrun-plugin;http://www.apache.org/dist/maven/plugins/
-org.apache.maven.plugins;maven-assembly-plugin;http://www.apache.org/dist/maven/plugins/
-org.apache.maven.plugins;maven-changelog-plugin;http://www.apache.org/dist/maven/plugins/
-org.apache.maven.plugins;maven-changes-plugin;http://www.apache.org/dist/maven/plugins/
-org.apache.maven.plugins;maven-checkstyle-plugin;http://www.apache.org/dist/maven/plugins/
-org.apache.maven.plugins;maven-clean-plugin;http://www.apache.org/dist/maven/plugins/
-org.apache.maven.plugins;maven-compiler-plugin;http://www.apache.org/dist/maven/plugins/
-org.apache.maven.plugins;maven-dependency-plugin;http://www.apache.org/dist/maven/plugins/
-org.apache.maven.plugins;maven-deploy-plugin;http://www.apache.org/dist/maven/plugins/
-org.apache.maven.plugins;maven-doap-plugin;http://www.apache.org/dist/maven/plugins/
-org.apache.maven.plugins;maven-docck-plugin;http://www.apache.org/dist/maven/plugins/
-org.apache.maven.plugins;maven-ear-plugin;http://www.apache.org/dist/maven/plugins/
-org.apache.maven.plugins;maven-eclipse-plugin;http://www.apache.org/dist/maven/plugins/
-org.apache.maven.plugins;maven-ejb-plugin;http://www.apache.org/dist/maven/plugins/
-org.apache.maven.plugins;maven-gpg-plugin;http://www.apache.org/dist/maven/plugins/
-org.apache.maven.plugins;maven-help-plugin;http://www.apache.org/dist/maven/plugins/
-org.apache.maven.plugins;maven-idea-plugin;http://www.apache.org/dist/maven/plugins/
-org.apache.maven.plugins;maven-install-plugin;http://www.apache.org/dist/maven/plugins/
-org.apache.maven.plugins;maven-invoker-plugin;http://www.apache.org/dist/maven/plugins/
-org.apache.maven.plugins;maven-jar-plugin;http://www.apache.org/dist/maven/plugins/
-org.apache.maven.plugins;maven-jarsigner-plugin;http://www.apache.org/dist/maven/plugins/
-org.apache.maven.plugins;maven-javadoc-plugin;http://www.apache.org/dist/maven/plugins/
-org.apache.maven.plugins;maven-linkcheck-plugin;http://www.apache.org/dist/maven/plugins/
-org.apache.maven.plugins;maven-one-plugin;http://www.apache.org/dist/maven/plugins/
-org.apache.maven.plugins;maven-patch-plugin;http://www.apache.org/dist/maven/plugins/
-org.apache.maven.plugins;maven-pdf-plugin;http://www.apache.org/dist/maven/plugins/
-org.apache.maven.plugins;maven-plugins;http://www.apache.org/dist/maven/plugins/
-org.apache.maven.plugins;maven-pmd-plugin;http://www.apache.org/dist/maven/plugins/
-org.apache.maven.plugins;maven-project-info-reports-plugin;http://www.apache.org/dist/maven/plugins/
-org.apache.maven.plugins;maven-rar-plugin;http://www.apache.org/dist/maven/plugins/
-org.apache.maven.plugins;maven-reactor-plugin;http://www.apache.org/dist/maven/plugins/
-org.apache.maven.plugins;maven-remote-resources-plugin;http://www.apache.org/dist/maven/plugins/
-org.apache.maven.plugins;maven-repository-plugin;http://www.apache.org/dist/maven/plugins/
-org.apache.maven.plugins;maven-resources-plugin;http://www.apache.org/dist/maven/plugins/
-org.apache.maven.plugins;maven-scm-publish-plugin;http://www.apache.org/dist/maven/plugins/
-org.apache.maven.plugins;maven-shade-plugin;http://www.apache.org/dist/maven/plugins/
-org.apache.maven.plugins;maven-site-plugin;http://www.apache.org/dist/maven/plugins/
-org.apache.maven.plugins;maven-source-plugin;http://www.apache.org/dist/maven/plugins/
-org.apache.maven.plugins;maven-stage-plugin;http://www.apache.org/dist/maven/plugins/
-org.apache.maven.plugins;maven-toolchains-plugin;http://www.apache.org/dist/maven/plugins/
-org.apache.maven.plugins;maven-verifier-plugin;http://www.apache.org/dist/maven/plugins/
-org.apache.maven.plugins;maven-war-plugin;http://www.apache.org/dist/maven/plugins/
+MVA;org.apache.maven.plugins;maven-acr-plugin;http://www.apache.org/dist/maven/plugins/
+MVA;org.apache.maven.plugins;maven-ant-plugin;http://www.apache.org/dist/maven/plugins/
+MVA;org.apache.maven.plugins;maven-antrun-plugin;http://www.apache.org/dist/maven/plugins/
+MVA;org.apache.maven.plugins;maven-assembly-plugin;http://www.apache.org/dist/maven/plugins/
+MVA;org.apache.maven.plugins;maven-changelog-plugin;http://www.apache.org/dist/maven/plugins/
+MVA;org.apache.maven.plugins;maven-changes-plugin;http://www.apache.org/dist/maven/plugins/
+MVA;org.apache.maven.plugins;maven-checkstyle-plugin;http://www.apache.org/dist/maven/plugins/
+MVA;org.apache.maven.plugins;maven-clean-plugin;http://www.apache.org/dist/maven/plugins/
+MVA;org.apache.maven.plugins;maven-compiler-plugin;http://www.apache.org/dist/maven/plugins/
+MVA;org.apache.maven.plugins;maven-dependency-plugin;http://www.apache.org/dist/maven/plugins/
+MVA;org.apache.maven.plugins;maven-deploy-plugin;http://www.apache.org/dist/maven/plugins/
+MVA;org.apache.maven.plugins;maven-doap-plugin;http://www.apache.org/dist/maven/plugins/
+MVA;org.apache.maven.plugins;maven-docck-plugin;http://www.apache.org/dist/maven/plugins/
+MVA;org.apache.maven.plugins;maven-ear-plugin;http://www.apache.org/dist/maven/plugins/
+MVA;org.apache.maven.plugins;maven-eclipse-plugin;http://www.apache.org/dist/maven/plugins/
+MVA;org.apache.maven.plugins;maven-ejb-plugin;http://www.apache.org/dist/maven/plugins/
+MVA;org.apache.maven.plugins;maven-gpg-plugin;http://www.apache.org/dist/maven/plugins/
+MVA;org.apache.maven.plugins;maven-help-plugin;http://www.apache.org/dist/maven/plugins/
+MVA;org.apache.maven.plugins;maven-idea-plugin;http://www.apache.org/dist/maven/plugins/
+MVA;org.apache.maven.plugins;maven-install-plugin;http://www.apache.org/dist/maven/plugins/
+MVA;org.apache.maven.plugins;maven-invoker-plugin;http://www.apache.org/dist/maven/plugins/
+MVA;org.apache.maven.plugins;maven-jar-plugin;http://www.apache.org/dist/maven/plugins/
+MVA;org.apache.maven.plugins;maven-jarsigner-plugin;http://www.apache.org/dist/maven/plugins/
+MVA;org.apache.maven.plugins;maven-javadoc-plugin;http://www.apache.org/dist/maven/plugins/
+MVA;org.apache.maven.plugins;maven-linkcheck-plugin;http://www.apache.org/dist/maven/plugins/
+MVA;org.apache.maven.plugins;maven-one-plugin;http://www.apache.org/dist/maven/plugins/
+MVA;org.apache.maven.plugins;maven-patch-plugin;http://www.apache.org/dist/maven/plugins/
+MVA;org.apache.maven.plugins;maven-pdf-plugin;http://www.apache.org/dist/maven/plugins/
+MVA;org.apache.maven.plugins;maven-plugins;http://www.apache.org/dist/maven/plugins/
+MVA;org.apache.maven.plugins;maven-pmd-plugin;http://www.apache.org/dist/maven/plugins/
+MVA;org.apache.maven.plugins;maven-project-info-reports-plugin;http://www.apache.org/dist/maven/plugins/
+MVA;org.apache.maven.plugins;maven-rar-plugin;http://www.apache.org/dist/maven/plugins/
+MVA;org.apache.maven.plugins;maven-reactor-plugin;http://www.apache.org/dist/maven/plugins/
+MVA;org.apache.maven.plugins;maven-remote-resources-plugin;http://www.apache.org/dist/maven/plugins/
+MVA;org.apache.maven.plugins;maven-repository-plugin;http://www.apache.org/dist/maven/plugins/
+MVA;org.apache.maven.plugins;maven-resources-plugin;http://www.apache.org/dist/maven/plugins/
+MVA;org.apache.maven.plugins;maven-scm-publish-plugin;http://www.apache.org/dist/maven/plugins/
+MVA;org.apache.maven.plugins;maven-shade-plugin;http://www.apache.org/dist/maven/plugins/
+MVA;org.apache.maven.plugins;maven-site-plugin;http://www.apache.org/dist/maven/plugins/
+MVA;org.apache.maven.plugins;maven-source-plugin;http://www.apache.org/dist/maven/plugins/
+MVA;org.apache.maven.plugins;maven-stage-plugin;http://www.apache.org/dist/maven/plugins/
+MVA;org.apache.maven.plugins;maven-toolchains-plugin;http://www.apache.org/dist/maven/plugins/
+MVA;org.apache.maven.plugins;maven-verifier-plugin;http://www.apache.org/dist/maven/plugins/
+MVA;org.apache.maven.plugins;maven-war-plugin;http://www.apache.org/dist/maven/plugins/
## release
-org.apache.maven.release;maven-release;http://www.apache.org/dist/maven/release/
+MVA;org.apache.maven.release;maven-release;http://www.apache.org/dist/maven/release/;2.4.1
## reporting
-org.apache.maven.reporting;maven-reporting-api;http://www.apache.org/dist/maven/reporting/
-org.apache.maven.reporting;maven-reporting-exec;http://www.apache.org/dist/maven/reporting/
-org.apache.maven.reporting;maven-reporting-impl;http://www.apache.org/dist/maven/reporting/
+MVA;org.apache.maven.reporting;maven-reporting-api;http://www.apache.org/dist/maven/reporting/
+MVA;org.apache.maven.reporting;maven-reporting-exec;http://www.apache.org/dist/maven/reporting/
+MVA;org.apache.maven.reporting;maven-reporting-impl;http://www.apache.org/dist/maven/reporting/
## scm
-org.apache.maven.scm;maven-scm;http://www.apache.org/dist/maven/scm/
+MVA;org.apache.maven.scm;maven-scm;http://www.apache.org/dist/maven/scm/
## shared
-org.apache.maven.shared;maven-artifact-resolver;http://www.apache.org/dist/maven/shared/
-org.apache.maven.shared;maven-common-artifact-filters;http://www.apache.org/dist/maven/shared/
-org.apache.maven.shared;maven-dependency-analyzer;http://www.apache.org/dist/maven/shared/
-org.apache.maven.shared;maven-dependency-tree;http://www.apache.org/dist/maven/shared/
-org.apache.maven.shared;maven-doxia-tools;http://www.apache.org/dist/maven/shared/
-org.apache.maven.shared;maven-filtering;http://www.apache.org/dist/maven/shared/
-org.apache.maven.shared;maven-invoker;http://www.apache.org/dist/maven/shared/
-org.apache.maven.shared;maven-jarsigner;http://www.apache.org/dist/maven/shared/
-org.apache.maven.shared;maven-runtime;http://www.apache.org/dist/maven/shared/
-org.apache.maven.shared;maven-script-interpreter;http://www.apache.org/dist/maven/shared/
-org.apache.maven.shared;maven-shared-components;http://www.apache.org/dist/maven/shared/
-org.apache.maven.shared;maven-shared-incremental;http://www.apache.org/dist/maven/shared/
-org.apache.maven.shared;maven-shared-jar;http://www.apache.org/dist/maven/shared/
-org.apache.maven.shared;maven-shared-resources;http://www.apache.org/dist/maven/shared/
-org.apache.maven.shared;maven-shared-utils;http://www.apache.org/dist/maven/shared/
-org.apache.maven.shared;maven-verifier;http://www.apache.org/dist/maven/shared/
+MVA;org.apache.maven.shared;maven-artifact-resolver;http://www.apache.org/dist/maven/shared/
+MVA;org.apache.maven.shared;maven-common-artifact-filters;http://www.apache.org/dist/maven/shared/
+MVA;org.apache.maven.shared;maven-dependency-analyzer;http://www.apache.org/dist/maven/shared/
+MVA;org.apache.maven.shared;maven-dependency-tree;http://www.apache.org/dist/maven/shared/
+MVA;org.apache.maven.shared;maven-doxia-tools;http://www.apache.org/dist/maven/shared/
+MVA;org.apache.maven.shared;maven-filtering;http://www.apache.org/dist/maven/shared/
+MVA;org.apache.maven.shared;maven-invoker;http://www.apache.org/dist/maven/shared/
+MVA;org.apache.maven.shared;maven-jarsigner;http://www.apache.org/dist/maven/shared/
+MVA;org.apache.maven.shared;maven-runtime;http://www.apache.org/dist/maven/shared/
+MVA;org.apache.maven.shared;maven-script-interpreter;http://www.apache.org/dist/maven/shared/
+MVA;org.apache.maven.shared;maven-shared-components;http://www.apache.org/dist/maven/shared/
+MVA;org.apache.maven.shared;maven-shared-incremental;http://www.apache.org/dist/maven/shared/
+MVA;org.apache.maven.shared;maven-shared-jar;http://www.apache.org/dist/maven/shared/
+MVA;org.apache.maven.shared;maven-shared-resources;http://www.apache.org/dist/maven/shared/
+MVA;org.apache.maven.shared;maven-shared-utils;http://www.apache.org/dist/maven/shared/
+MVA;org.apache.maven.shared;maven-verifier;http://www.apache.org/dist/maven/shared/
## skins
-org.apache.maven.skins;maven-application-skin;http://www.apache.org/dist/maven/skins/
-org.apache.maven.skins;maven-classic-skin;http://www.apache.org/dist/maven/skins/
-org.apache.maven.skins;maven-default-skin;http://www.apache.org/dist/maven/skins/
-org.apache.maven.skins;maven-fluido-skin;http://www.apache.org/dist/maven/skins/
-org.apache.maven.skins;maven-skins;http://www.apache.org/dist/maven/skins/
-org.apache.maven.skins;maven-stylus-skin;http://www.apache.org/dist/maven/skins/
+MVA;org.apache.maven.skins;maven-application-skin;http://www.apache.org/dist/maven/skins/
+MVA;org.apache.maven.skins;maven-classic-skin;http://www.apache.org/dist/maven/skins/
+MVA;org.apache.maven.skins;maven-default-skin;http://www.apache.org/dist/maven/skins/
+MVA;org.apache.maven.skins;maven-fluido-skin;http://www.apache.org/dist/maven/skins/
+MVA;org.apache.maven.skins;maven-skins;http://www.apache.org/dist/maven/skins/
+MVA;org.apache.maven.skins;maven-stylus-skin;http://www.apache.org/dist/maven/skins/
## surefire
-org.apache.maven.surefire;surefire;http://www.apache.org/dist/maven/surefire/
+MVA;org.apache.maven.surefire;surefire;http://www.apache.org/dist/maven/surefire/
## wagon
-org.apache.maven.wagon;wagon;http://www.apache.org/dist/maven/wagon/
+MVA;org.apache.maven.wagon;wagon;http://www.apache.org/dist/maven/wagon/