updated parent pom: required to fix issues reported by rat and checkstyle...
git-svn-id: https://svn.apache.org/repos/asf/maven/sandbox/trunk@1628079 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/dist-tools/dist-tool-plugin/pom.xml b/dist-tools/dist-tool-plugin/pom.xml
index 219d687..07555a2 100644
--- a/dist-tools/dist-tool-plugin/pom.xml
+++ b/dist-tools/dist-tool-plugin/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven-parent</artifactId>
- <version>24</version>
+ <version>25-SNAPSHOT</version>
<relativePath>../../../pom/maven/pom.xml</relativePath>
</parent>
diff --git a/dist-tools/dist-tool-plugin/src/it/check-site-report/invoker.properties b/dist-tools/dist-tool-plugin/src/it/check-site-report/invoker.properties
index 99ea201..0b5fd53 100644
--- a/dist-tools/dist-tool-plugin/src/it/check-site-report/invoker.properties
+++ b/dist-tools/dist-tool-plugin/src/it/check-site-report/invoker.properties
@@ -1 +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 = site
\ No newline at end of file
diff --git a/dist-tools/dist-tool-plugin/src/it/check-site/invoker.properties b/dist-tools/dist-tool-plugin/src/it/check-site/invoker.properties
index eec4873..c3dac72 100644
--- a/dist-tools/dist-tool-plugin/src/it/check-site/invoker.properties
+++ b/dist-tools/dist-tool-plugin/src/it/check-site/invoker.properties
@@ -1 +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}:check-site
\ No newline at end of file
diff --git a/dist-tools/dist-tool-plugin/src/it/check-source-release-report/invoker.properties b/dist-tools/dist-tool-plugin/src/it/check-source-release-report/invoker.properties
index 99ea201..0b5fd53 100644
--- a/dist-tools/dist-tool-plugin/src/it/check-source-release-report/invoker.properties
+++ b/dist-tools/dist-tool-plugin/src/it/check-source-release-report/invoker.properties
@@ -1 +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 = site
\ No newline at end of file
diff --git a/dist-tools/dist-tool-plugin/src/it/check-source-release/invoker.properties b/dist-tools/dist-tool-plugin/src/it/check-source-release/invoker.properties
index 7d8e98d..e4217bc 100644
--- a/dist-tools/dist-tool-plugin/src/it/check-source-release/invoker.properties
+++ b/dist-tools/dist-tool-plugin/src/it/check-source-release/invoker.properties
@@ -1 +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}:check-source-release
\ No newline at end of file
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 001d8b6..a884c22 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
@@ -173,18 +173,19 @@
}
}
+ private ArtifactRepositoryPolicy newArtifactRepositoryPolicy( boolean enabled )
+ {
+ return new ArtifactRepositoryPolicy( enabled, ArtifactRepositoryPolicy.UPDATE_POLICY_ALWAYS,
+ ArtifactRepositoryPolicy.CHECKSUM_POLICY_WARN );
+ }
+
@Override
public void execute()
throws MojoExecutionException
{
ArtifactRepository aa =
new MavenArtifactRepository( "central", repoBaseUrl, new DefaultRepositoryLayout(),
- new ArtifactRepositoryPolicy( false,
- ArtifactRepositoryPolicy.UPDATE_POLICY_ALWAYS,
- ArtifactRepositoryPolicy.CHECKSUM_POLICY_WARN ),
- new ArtifactRepositoryPolicy( true,
- ArtifactRepositoryPolicy.UPDATE_POLICY_ALWAYS,
- ArtifactRepositoryPolicy.CHECKSUM_POLICY_WARN ) );
+ newArtifactRepositoryPolicy( false ), newArtifactRepositoryPolicy( true ) );
artifactRepositories.add( aa );
if ( configurationLines.isEmpty() )
@@ -247,8 +248,8 @@
}
else
{
- throw new MojoExecutionException( "unknown artifact parameter '" + param + "' in configuration line: "
- + line );
+ throw new MojoExecutionException( "unknown artifact parameter '" + param
+ + "' in configuration line: " + line );
}
}
else
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 2efb4f1..909959e 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
@@ -219,8 +219,8 @@
sink.body();
sink.section1();
sink.paragraph();
- sink.rawText( "Check that index pages have been updated with latest release info available in central repository"
- + " <code>maven-metadata.xml</code>." );
+ sink.rawText( "Check that index pages have been updated with latest release info available in central"
+ + " repository <code>maven-metadata.xml</code>." );
sink.paragraph_();
sink.section1_();
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 6514472..ba9bfd3 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
@@ -47,7 +47,7 @@
public class DistCheckSourceReleaseMojo
extends AbstractDistCheckMojo
{
- private final static String NOT_IN_DISTRIBUTION_AREA = "_not_in_distribution_area_";
+ private static final String NOT_IN_DISTRIBUTION_AREA = "_not_in_distribution_area_";
static final String FAILURES_FILENAME = "check-source-release.log";
@@ -203,7 +203,9 @@
if ( !csrr.central.contains( missing ) )
{
// if the release distribution is in central repository, we can get it from there...
- cliMissing.append( "\nwget " ).append( cli.getVersionnedFolderURL( repoBaseUrl, csrr.getVersion() ) ).append( "/" ).append( missing );
+ cliMissing.append( "\nwget " );
+ cliMissing.append( cli.getVersionnedFolderURL( repoBaseUrl, csrr.getVersion() ) );
+ cliMissing.append( "/" ).append( missing );
cliMissing.append( "\nsvn add " ).append( missing );
}
}
@@ -551,7 +553,8 @@
// dist
String distUrl =
- distributionAreaUrl + configLine.getDirectory() + ( configLine.isSrcBin() ? ( "/" + version + "/source" ) : "" );
+ distributionAreaUrl + configLine.getDirectory()
+ + ( configLine.isSrcBin() ? ( "/" + version + "/source" ) : "" );
result.setMissingDistSourceRelease( checkDirectoryIndex( distUrl, configLine, version, true ) );
result.setDistOlderSourceRelease( checkContainsOld( distUrl, configLine, version ) );
}
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 4cf36e7..27ff8c4 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
@@ -40,7 +40,7 @@
public class DummyFailureMojo
extends AbstractDistCheckMojo
{
- private final static String[] FAILURES_FILENAMES = { DistCheckSourceReleaseMojo.FAILURES_FILENAME,
+ private static final String[] FAILURES_FILENAMES = { DistCheckSourceReleaseMojo.FAILURES_FILENAME,
DistCheckSiteMojo.FAILURES_FILENAME, DistCheckIndexPageMojo.FAILURES_FILENAME };
private static final String EOL = System.getProperty( "line.separator" );
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 9104be2..ff2b27d 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
@@ -1,3 +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.
+
## line format:
## /directory: groupId[:parent-pom artifactId] [src+bin] [index page url]
## [*] artifactId [version restriction]
diff --git a/dist-tools/dist-tool-plugin/src/site/markdown/index.md b/dist-tools/dist-tool-plugin/src/site/markdown/index.md
index 2c3eb3e..e6b14d5 100644
--- a/dist-tools/dist-tool-plugin/src/site/markdown/index.md
+++ b/dist-tools/dist-tool-plugin/src/site/markdown/index.md
@@ -1,3 +1,22 @@
+<!--
+ 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.
+-->
+
About dist-tool-plugin
=====
diff --git a/dist-tools/dist-tool-plugin/src/site/markdown/todo.md b/dist-tools/dist-tool-plugin/src/site/markdown/todo.md
index 114d0d3..bf48650 100644
--- a/dist-tools/dist-tool-plugin/src/site/markdown/todo.md
+++ b/dist-tools/dist-tool-plugin/src/site/markdown/todo.md
@@ -1,3 +1,22 @@
+<!--
+ 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.
+-->
+
Todo
====
