configure site url in dist-tool.conf instead of pom.xml
git-svn-id: https://svn.apache.org/repos/asf/maven/sandbox/trunk@1542609 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/dist-tools/dist-tool-plugin/pom.xml b/dist-tools/dist-tool-plugin/pom.xml
index 66c50f9..3f70a93 100644
--- a/dist-tools/dist-tool-plugin/pom.xml
+++ b/dist-tools/dist-tool-plugin/pom.xml
@@ -275,24 +275,6 @@
<ignoreDistFailure>apache-jar-resource-bundle:1.4</ignoreDistFailure>
<ignoreDistFailure>apache-license-header-resource-bundle:1.1</ignoreDistFailure>
</ignoreDistFailures>
- <sites>
- <property>
- <name>apache</name>
- <value>http://maven.apache.org/pom/asf/</value>
- </property>
- <property>
- <name>maven-parent</name>
- <value>http://maven.apache.org/pom/maven/</value>
- </property>
- <property>
- <name>apache-maven:2.0.11</name>
- <value>http://maven.apache.org/ref/2.0.11/</value>
- </property>
- <property>
- <name>apache-maven:2.2.1</name>
- <value>http://maven.apache.org/ref/2.2.1/</value>
- </property>
- </sites>
</configuration>
<reportSets>
<reportSet>
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 1cc510c..4a4050d 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
@@ -112,6 +112,14 @@
protected Map<String, String> paths = new HashMap<String, String>();
/**
+ * Site url mapping, when site url read in pom doesn't get the expected value
+ * The configuration in <code>dist-tool.conf</code> looks like this:
+ * <pre>artifact-id site = site url
+ *artifact-id:version site = site url</pre>
+ */
+ protected Map<String, String> sites = new HashMap<String, String>();
+
+ /**
* 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, ...)
@@ -223,6 +231,10 @@
{
paths.put( artifactId, value );
}
+ else if ( "site".equals( param ) )
+ {
+ sites.put( artifactId, value );
+ }
else
{
throw new MojoExecutionException( "unknown parameter '" + param + "' in configuration line: "
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 d1ee877..6a85a73 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
@@ -25,7 +25,6 @@
import java.util.List;
import java.util.Locale;
import java.util.Map;
-import java.util.Properties;
import org.apache.commons.io.FileUtils;
import org.apache.maven.artifact.Artifact;
@@ -101,25 +100,6 @@
*/
protected static final int HTTP_OK = 200;
- /**
- * Site url mapping, when site url read in pom doesn't get the expected value
- * The configuration looks like this:
- * <pre>
- * <sites>
- * <property>
- * <name>artifact-id</name>
- * <value>site url</value>
- * </property>
- * <property>
- * <name>artifact-id:version</name>
- * <value>site url</value>
- * </property>
- * </sites>
- * </pre>
- */
- @Parameter
- private Properties sites;
-
@Override
boolean isIndexPageCheck()
{
@@ -437,10 +417,10 @@
MavenProject artifactProject =
mavenProjectBuilder.buildFromRepository( artifact, artifactRepositories, localRepository, false );
- String siteUrl = sites.getProperty( cli.getArtifactId() );
+ String siteUrl = sites.get( cli.getArtifactId() );
if ( siteUrl == null )
{
- siteUrl = sites.getProperty( cli.getArtifactId() + ':' + version );
+ siteUrl = sites.get( cli.getArtifactId() + ':' + version );
if ( siteUrl == null )
{
siteUrl = artifactProject.getUrl();
diff --git a/dist-tools/dist-tool-plugin/src/main/resources/dist-tool.conf b/dist-tools/dist-tool-plugin/src/main/resources/dist-tool.conf
index 7a71237..5dfa579 100644
--- a/dist-tools/dist-tool-plugin/src/main/resources/dist-tool.conf
+++ b/dist-tools/dist-tool-plugin/src/main/resources/dist-tool.conf
@@ -6,7 +6,11 @@
dist-area = http://www.apache.org/dist/maven/
apache index-path = /asf/
+apache site = http://maven.apache.org/pom/asf/
+apache-maven:2.0.11 site = http://maven.apache.org/ref/2.0.11/
+apache-maven:2.2.1 site = http://maven.apache.org/ref/2.2.1/
maven-parent index-path = /maven/
+maven-parent site = http://maven.apache.org/pom/maven/
maven-skins index-path = /skins/
/_not_in_distribution_area_: org.apache.maven http://maven.apache.org/pom/
