replaced "three spaces" convention with asterisk
git-svn-id: https://svn.apache.org/repos/asf/maven/sandbox/trunk@1538204 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/AbstractDistCheckMojo.java b/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/AbstractDistCheckMojo.java
index 4983da3..e268311 100644
--- a/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/AbstractDistCheckMojo.java
+++ b/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/AbstractDistCheckMojo.java
@@ -101,11 +101,11 @@
protected List<ArtifactRepository> artifactRepositories = new LinkedList<>();
/**
- * use detailed artifact ?
- * true to allow triple space line in db (use for scm plugins)
- * @return
+ * is it index page check mojo?
+ * necessary to only check index page information for plugins marked with asterisk * in db,
+ * because they are released as part of a global component (archetype, scm, release, ...)
*/
- abstract boolean useDetailed();
+ abstract boolean isIndexPageCheck();
protected abstract void checkArtifact( ConfigurationLineInfo request, String repoBase )
throws MojoExecutionException;
@@ -196,42 +196,31 @@
}
else
{
- // 3 space
- if ( line.startsWith( " " ) )
+ line = line.trim();
+
+ if ( line.startsWith( "*" ) )
{
- ConfigurationLineInfo aLine;
- try
+ // special artifact
+ if ( !isIndexPageCheck() )
{
- aLine = new ConfigurationLineInfo( currentGroup, line.trim().split( " " ) );
- }
- catch ( InvalidVersionSpecificationException e )
- {
- throw new MojoExecutionException( e.getMessage() );
- }
- if ( useDetailed() )
- {
- checkArtifact( aLine, getVersion( aLine ) );
- }
- }
- else if ( line.startsWith( " " ) )
- {
- ConfigurationLineInfo aLine;
- try
- {
- aLine = new ConfigurationLineInfo( currentGroup, line.trim().split( " " ) );
- }
- catch ( InvalidVersionSpecificationException e )
- {
- throw new MojoExecutionException( e.getMessage() );
+ // not check-index-page mojo, so ignore this artifact
+ continue;
}
- checkArtifact( aLine, getVersion( aLine ) );
- }
- else
- {
- getLog().warn( "No good Condition WIP" );
+ // remove the asterisk before running the check
+ line = line.substring( 1 ).trim();
}
-
+
+ try
+ {
+ ConfigurationLineInfo aLine = new ConfigurationLineInfo( currentGroup, line.split( " " ) );
+
+ checkArtifact( aLine, getVersion( aLine ) );
+ }
+ catch ( InvalidVersionSpecificationException e )
+ {
+ throw new MojoExecutionException( e.getMessage() );
+ }
}
}
}
diff --git a/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/DistCheckIndexPageMojo.java b/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/DistCheckIndexPageMojo.java
index 84f8557..b4a442c 100644
--- a/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/DistCheckIndexPageMojo.java
+++ b/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/DistCheckIndexPageMojo.java
@@ -124,7 +124,7 @@
}
@Override
- boolean useDetailed()
+ boolean isIndexPageCheck()
{
return true;
}
diff --git a/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/DistCheckSiteMojo.java b/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/DistCheckSiteMojo.java
index fc45da9..8a189ee 100644
--- a/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/DistCheckSiteMojo.java
+++ b/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/DistCheckSiteMojo.java
@@ -101,7 +101,7 @@
protected static final int HTTP_OK = 200;
@Override
- boolean useDetailed()
+ boolean isIndexPageCheck()
{
return false;
}
diff --git a/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/DistCheckSourceReleaseMojo.java b/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/DistCheckSourceReleaseMojo.java
index 0371f32..6e52e3f 100644
--- a/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/DistCheckSourceReleaseMojo.java
+++ b/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/DistCheckSourceReleaseMojo.java
@@ -52,11 +52,13 @@
private static final String DIST_AREA = "http://www.apache.org/dist/maven/";
//private static final String DIST_SVNPUBSUB = "https://dist.apache.org/repos/dist/release/maven/";
+
@Override
- boolean useDetailed()
+ boolean isIndexPageCheck()
{
return false;
}
+
/**
* Ignore dist failure for <code>artifactId</code> or <code>artifactId:version</code>
*/
diff --git a/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/DummyFailureMojo.java b/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/DummyFailureMojo.java
index 217e61c..61bacfd 100644
--- a/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/DummyFailureMojo.java
+++ b/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/DummyFailureMojo.java
@@ -63,7 +63,7 @@
protected MavenProject project;
@Override
- boolean useDetailed()
+ boolean isIndexPageCheck()
{
return false;
}
diff --git a/dist-tools/dist-tool-plugin/src/main/resources/db/mavendb.txt b/dist-tools/dist-tool-plugin/src/main/resources/db/mavendb.txt
index 78158f0..d661935 100644
--- a/dist-tools/dist-tool-plugin/src/main/resources/db/mavendb.txt
+++ b/dist-tools/dist-tool-plugin/src/main/resources/db/mavendb.txt
@@ -1,6 +1,7 @@
## line format:
## directory groupId [src+bin]
-## artifactId [version restriction] IPn
+## [*] artifactId [version restriction] IPn
+## * = only check info in index page, but not dist nor site (for plugins provided by components, like archetype, release, ...)
## n : 1 = plugins, 2 = shared, 3 = skins, 4 = poms
#### IP1 site2X
#### IP4 ASF (skin and parent find pattern hardcoded)
@@ -30,9 +31,9 @@
apache-maven [3.0,3.1.0-alpha-1)
apache-maven
notvalid org.apache.maven
- maven-parent IP4
+ * maven-parent IP4
notvalid org.apache
- apache IP4
+ * apache IP4
jxr org.apache.maven.jxr
jxr
plugin-testing org.apache.maven.plugin-testing
@@ -43,6 +44,7 @@
maven-acr-plugin IP1
maven-ant-plugin IP1
maven-antrun-plugin IP1
+ * maven-archetype-plugin IP1
maven-assembly-plugin IP1
maven-changelog-plugin IP1
maven-changes-plugin IP1
@@ -56,6 +58,8 @@
maven-ear-plugin IP1
maven-eclipse-plugin IP1
maven-ejb-plugin IP1
+ * maven-enforcer-plugin IP1
+ * maven-failsafe-plugin IP1
maven-gpg-plugin IP1
maven-help-plugin IP1
maven-idea-plugin IP1
@@ -64,35 +68,32 @@
maven-jar-plugin IP1
maven-jarsigner-plugin IP1
maven-javadoc-plugin IP1
+ * maven-jxr-plugin IP1
maven-linkcheck-plugin IP1
maven-one-plugin IP1
maven-patch-plugin IP1
maven-pdf-plugin IP1
maven-plugins IP4
+ * maven-plugin-plugin IP1
maven-pmd-plugin IP1
maven-project-info-reports-plugin IP1
maven-rar-plugin IP1
maven-reactor-plugin IP1
+ * maven-release-plugin IP1
maven-remote-resources-plugin IP1
maven-repository-plugin IP1
maven-resources-plugin IP1
+ * maven-scm-plugin IP1
maven-scm-publish-plugin IP1
maven-shade-plugin IP1
maven-site-plugin IP1
maven-source-plugin IP1
maven-stage-plugin IP1
+ * maven-surefire-plugin IP1
+ * maven-surefire-report-plugin IP1
maven-toolchains-plugin IP1
maven-verifier-plugin IP1
maven-war-plugin IP1
- maven-release-plugin IP1
- maven-scm-plugin IP1
- maven-jxr-plugin IP1
- maven-enforcer-plugin IP1
- maven-archetype-plugin IP1
- maven-failsafe-plugin IP1
- maven-surefire-plugin IP1
- maven-surefire-report-plugin IP1
- maven-plugin-plugin IP1
## release version is restricted because maven-release (=parent pom) versions 3, 4 and 5 were released earlier, but > to actual 2.x version
release org.apache.maven.release
maven-release (,3)
