Author: hboutemy
Date: Sun Sep 28 16:13:04 2014
New Revision: 1628079
URL: http://svn.apache.org/r1628079
Log:
updated parent pom: required to fix issues reported by rat and checkstyle...
Modified:
maven/sandbox/trunk/dist-tools/dist-tool-plugin/pom.xml
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/it/check-site-report/invoker.properties
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/it/check-site/invoker.properties
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/it/check-source-release-report/invoker.properties
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/it/check-source-release/invoker.properties
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/DistCheckIndexPageMojo.java
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/DistCheckSourceReleaseMojo.java
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/DummyFailureMojo.java
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/resources/dist-tool.conf
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/site/markdown/index.md
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/site/markdown/todo.md
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=1628079&r1=1628078&r2=1628079&view=diff
==============================================================================
--- maven/sandbox/trunk/dist-tools/dist-tool-plugin/pom.xml (original)
+++ maven/sandbox/trunk/dist-tools/dist-tool-plugin/pom.xml Sun Sep 28 16:13:04
2014
@@ -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>
Modified:
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/it/check-site-report/invoker.properties
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/it/check-site-report/invoker.properties?rev=1628079&r1=1628078&r2=1628079&view=diff
==============================================================================
---
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/it/check-site-report/invoker.properties
(original)
+++
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/it/check-site-report/invoker.properties
Sun Sep 28 16:13:04 2014
@@ -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
Modified:
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/it/check-site/invoker.properties
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/it/check-site/invoker.properties?rev=1628079&r1=1628078&r2=1628079&view=diff
==============================================================================
---
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/it/check-site/invoker.properties
(original)
+++
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/it/check-site/invoker.properties
Sun Sep 28 16:13:04 2014
@@ -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
Modified:
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/it/check-source-release-report/invoker.properties
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/it/check-source-release-report/invoker.properties?rev=1628079&r1=1628078&r2=1628079&view=diff
==============================================================================
---
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/it/check-source-release-report/invoker.properties
(original)
+++
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/it/check-source-release-report/invoker.properties
Sun Sep 28 16:13:04 2014
@@ -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
Modified:
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/it/check-source-release/invoker.properties
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/it/check-source-release/invoker.properties?rev=1628079&r1=1628078&r2=1628079&view=diff
==============================================================================
---
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/it/check-source-release/invoker.properties
(original)
+++
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/it/check-source-release/invoker.properties
Sun Sep 28 16:13:04 2014
@@ -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
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=1628079&r1=1628078&r2=1628079&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
Sun Sep 28 16:13:04 2014
@@ -173,18 +173,19 @@ public abstract class AbstractDistCheckM
}
}
+ 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 @@ public abstract class AbstractDistCheckM
}
else
{
- throw new MojoExecutionException( "unknown artifact
parameter '" + param + "' in configuration line: "
- + line );
+ throw new MojoExecutionException( "unknown artifact
parameter '" + param
+ + "' in configuration line: " + line );
}
}
else
Modified:
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/DistCheckIndexPageMojo.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/DistCheckIndexPageMojo.java?rev=1628079&r1=1628078&r2=1628079&view=diff
==============================================================================
---
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/DistCheckIndexPageMojo.java
(original)
+++
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/DistCheckIndexPageMojo.java
Sun Sep 28 16:13:04 2014
@@ -219,8 +219,8 @@ public class DistCheckIndexPageMojo
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_();
Modified:
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/DistCheckSourceReleaseMojo.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/DistCheckSourceReleaseMojo.java?rev=1628079&r1=1628078&r2=1628079&view=diff
==============================================================================
---
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/DistCheckSourceReleaseMojo.java
(original)
+++
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/DistCheckSourceReleaseMojo.java
Sun Sep 28 16:13:04 2014
@@ -47,7 +47,7 @@ import org.jsoup.select.Elements;
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 @@ public class DistCheckSourceReleaseMojo
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 @@ public class DistCheckSourceReleaseMojo
// 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 ) );
}
Modified:
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/DummyFailureMojo.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/DummyFailureMojo.java?rev=1628079&r1=1628078&r2=1628079&view=diff
==============================================================================
---
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/DummyFailureMojo.java
(original)
+++
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/DummyFailureMojo.java
Sun Sep 28 16:13:04 2014
@@ -40,7 +40,7 @@ import org.codehaus.plexus.util.FileUtil
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" );
Modified:
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/resources/dist-tool.conf
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/resources/dist-tool.conf?rev=1628079&r1=1628078&r2=1628079&view=diff
==============================================================================
---
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/resources/dist-tool.conf
(original)
+++
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/resources/dist-tool.conf
Sun Sep 28 16:13:04 2014
@@ -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]
Modified:
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/site/markdown/index.md
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/site/markdown/index.md?rev=1628079&r1=1628078&r2=1628079&view=diff
==============================================================================
--- maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/site/markdown/index.md
(original)
+++ maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/site/markdown/index.md
Sun Sep 28 16:13:04 2014
@@ -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
=====
Modified:
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/site/markdown/todo.md
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/site/markdown/todo.md?rev=1628079&r1=1628078&r2=1628079&view=diff
==============================================================================
--- maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/site/markdown/todo.md
(original)
+++ maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/site/markdown/todo.md
Sun Sep 28 16:13:04 2014
@@ -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
====
