svn commit: r1636818 - /maven/plugins/trunk/maven-ear-plugin/pom.xml
Author: khmarbaise Date: Wed Nov 5 08:10:42 2014 New Revision: 1636818 URL: http://svn.apache.org/r1636818 Log: - Added Link to RAT-187 to ignore har/sar files. Modified: maven/plugins/trunk/maven-ear-plugin/pom.xml Modified: maven/plugins/trunk/maven-ear-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/pom.xml?rev=1636818&r1=1636817&r2=1636818&view=diff == --- maven/plugins/trunk/maven-ear-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-ear-plugin/pom.xml Wed Nov 5 08:10:42 2014 @@ -170,6 +170,7 @@ under the License. src/test/resources/projects/project-016/src/main/ear/MANIFEST.MF src/test/resources/m2repo/eartest/har-sample-one/1.0/har-sample-one-1.0.har src/test/resources/m2repo/eartest/sar-sample-one/1.0/sar-sample-one-1.0.sar
svn commit: r1636819 - /maven/plugins/trunk/maven-ear-plugin/pom.xml
Author: andham Date: Wed Nov 5 08:24:52 2014 New Revision: 1636819 URL: http://svn.apache.org/r1636819 Log: [MEAR-204] Upgrade maven-archiver dependency to v2.6 Modified: maven/plugins/trunk/maven-ear-plugin/pom.xml Modified: maven/plugins/trunk/maven-ear-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/pom.xml?rev=1636819&r1=1636818&r2=1636819&view=diff == --- maven/plugins/trunk/maven-ear-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-ear-plugin/pom.xml Wed Nov 5 08:24:52 2014 @@ -75,7 +75,7 @@ under the License. -2.5 +2.6 1.0-beta-2 2.2.1 3.2 @@ -116,7 +116,7 @@ under the License. org.codehaus.plexus plexus-archiver - 2.7 + 2.8.1 org.codehaus.plexus
svn commit: r1636820 - in /maven/plugins/trunk/maven-war-plugin: ./ src/main/java/org/apache/maven/plugin/war/ src/main/java/org/apache/maven/plugin/war/overlay/ src/main/java/org/apache/maven/plugin/
Author: khmarbaise
Date: Wed Nov 5 08:27:25 2014
New Revision: 1636820
URL: http://svn.apache.org/r1636820
Log:
[MWAR-336] Upgrade to maven-plugins version 25 to 26
- Fixed several checkstyle reported issues
Modified:
maven/plugins/trunk/maven-war-plugin/pom.xml
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/AbstractWarMojo.java
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/WarExplodedMojo.java
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/WarManifestMojo.java
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/WarMojo.java
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/overlay/OverlayManager.java
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/AbstractWarPackagingTask.java
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/DependenciesAnalysisPackagingTask.java
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/WarProjectPackagingTask.java
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/util/WebappStructure.java
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/util/WebappStructureSerializer.java
Modified: maven/plugins/trunk/maven-war-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/pom.xml?rev=1636820&r1=1636819&r2=1636820&view=diff
==
--- maven/plugins/trunk/maven-war-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-war-plugin/pom.xml Wed Nov 5 08:27:25 2014
@@ -25,7 +25,7 @@ under the License.
maven-plugins
org.apache.maven.plugins
-25
+26
../maven-plugins/pom.xml
Modified:
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/AbstractWarMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/AbstractWarMojo.java?rev=1636820&r1=1636819&r2=1636820&view=diff
==
---
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/AbstractWarMojo.java
(original)
+++
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/AbstractWarMojo.java
Wed Nov 5 08:27:25 2014
@@ -435,19 +435,23 @@ public abstract class AbstractWarMojo
WebappStructure cache;
if ( useCache && cacheFile.exists() )
{
+// CHECKSTYLE_OFF: LineLength
cache = new WebappStructure( mavenProject.getDependencies(),
webappStructureSerialier.fromXml( cacheFile ) );
+// CHECKSTYLE_ON: LineLength
}
else
{
cache = new WebappStructure( mavenProject.getDependencies(), null
);
}
+// CHECKSTYLE_OFF: LineLength
final long startTime = System.currentTimeMillis();
getLog().info( "Assembling webapp [" + mavenProject.getArtifactId() +
"] in [" + webapplicationDirectory + "]" );
final OverlayManager overlayManager =
new OverlayManager( overlays, mavenProject, dependentWarIncludes,
dependentWarExcludes, currentProjectOverlay );
final List packagingTasks = getPackagingTasks(
overlayManager );
+// CHECKSTYLE_ON: LineLength
List defaultFilterWrappers;
try
{
@@ -582,7 +586,7 @@ public abstract class AbstractWarMojo
this.artifactFactory = artifactFactory;
this.filteringDeploymentDescriptors =
filteringDeploymentDescriptors;
this.nonFilteredFileExtensions =
-nonFilteredFileExtensions == null ? Collections.
emptyList() : nonFilteredFileExtensions;
+nonFilteredFileExtensions == null ?
Collections.emptyList() : nonFilteredFileExtensions;
this.resourceEncoding = resourceEncoding;
// This is kinda stupid but if we loop over the current overlays
and we request the path structure
// it will register it. This will avoid wrong warning messages in
a later phase
Modified:
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/WarExplodedMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/WarExplodedMojo.java?rev=1636820&r1=1636819&r2=1636820&view=diff
==
---
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/WarExplodedMojo.java
(original)
+++
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/WarExplodedMojo.java
Wed Nov 5 08:27:25 2014
@@ -30,6 +30,7 @@ import org.apache.maven
svn commit: r7025 - in /release/maven/jxr: jxr-2.4-source-release.zip jxr-2.4-source-release.zip.asc jxr-2.4-source-release.zip.md5 jxr-2.5-source-release.zip jxr-2.5-source-release.zip.asc jxr-2.5-so
Author: khmarbaise Date: Wed Nov 5 20:44:45 2014 New Revision: 7025 Log: Apache Maven JXR Version 2.5. Added: release/maven/jxr/jxr-2.5-source-release.zip (with props) release/maven/jxr/jxr-2.5-source-release.zip.asc release/maven/jxr/jxr-2.5-source-release.zip.md5 Removed: release/maven/jxr/jxr-2.4-source-release.zip release/maven/jxr/jxr-2.4-source-release.zip.asc release/maven/jxr/jxr-2.4-source-release.zip.md5 Added: release/maven/jxr/jxr-2.5-source-release.zip == Binary file - no diff available. Propchange: release/maven/jxr/jxr-2.5-source-release.zip -- svn:mime-type = application/octet-stream Added: release/maven/jxr/jxr-2.5-source-release.zip.asc == --- release/maven/jxr/jxr-2.5-source-release.zip.asc (added) +++ release/maven/jxr/jxr-2.5-source-release.zip.asc Wed Nov 5 20:44:45 2014 @@ -0,0 +1,28 @@ +-BEGIN PGP SIGNATURE- +Version: GnuPG/MacGPG2 v2.0.19 (Darwin) +Comment: GPGTools - http://gpgtools.org + +iQQcBAABCgAGBQJUVejZAAoJECGiSz+LD1lKKucf/2gYYh8twe6WraHnIoIWajL1 +MbmJTUyiSZ4Ww+qNMEXE1mZmKMwbGIN25GDmChIkSnnp4TvBMZ7GUrtc1UCzWHDG +yb/lBX296x6zN5X4iIjcpVGqUzzs9yKgcm8fad/alhBO2N06s7MVUQWV1Y53INhX +rUl1D8Ms+3zeKEgnwdKr5ps6jpF4jprmk9bZEicMYgSYMN06IrsiDTKFueGojHnI +quWhF39gzeRW3luZqMMTAguZy5vIr0+b/0Ba1B+hxxf/MzQo5pnDw9qTG8mewKJA +rLMTl3S2vvvabujt7ML0Reobiwfofx0Diha0p7FHMFS9AqJmvRTHOR5whD8HFhfq +8wIBJiaiOYM1jTFpLmvKxXxP8fAj3TcD2MmD87SEJtOVG9ZJHwnEaa/4fB5K1kDy +aBrmRLJGIZJU+ZUyvHownNaRU7X2h0oxbJJ8h2ObdqmX/MGomi0CkIOk/V7oyALc +dPXoees1rFNbpZSzkLwDCKl8ViWg0k6hd4GYoGN3U1QKil8/XQBgfXHHnRNY8CPt +1CUmOqRtjR+plvlI8D5hNWNB+tRq8p5lirEJmERnx5hGMvn2mEQfHf9RBSfAwwit +2zR5DVgpXoab63xRFJI5lVURh6h3EheYKK7kCZ+yf8oNvCrvc4F9RkD2uSQyHl0O +ANqzo8+9kugXCxMwePcG2qj5+/BZb5Os44Xuqt8Jn0GAOOUZ2Sg4bP3kLIG/ITCK +2khc0XHY10PgC6prSpGyxlnguIpst+nel/IMbQGYDuQbeq56Sow0H8tsILfbymFn +znE3WTUcw/E5auNTcdBOi34K/qLnJosV1qgg3REp8lCgftcTN7W9eYiv0SCBLs0N +xLMxH1MTyb+cl6A09ScZ1DlWnzve7pVzV5fpGA+ip3QqiooU1CHCfJq7P/CvN2od +rNeg91JxY4BoYnKvaKD0SY6h+4temjT2pHpcq+pUZzR1tvHfzfXUASQ5bAWmhcBu +zj6i8t6oLYKxFol1FYn+2EeG71bPICbo7yw4fl16y9mBlg/pyWsaQZNnp9FPxSh1 +r8pUPUJ4OcAPj3p49ZGcaT5VHtYKGyXFce5ux3uuBafQMgiJl0t0eZ91JuvnPbw6 +vvAsRWzpMJrjMDi5m3BYvvif/MuMVpJ+aPC8kVpgwFDDiKhbQJJUMqNz9rnLcver +VFjOfUl5Om0e9eM+X88207rd6mXK4JjbdkJ4fSZ4zH/t9UPNCwT2nxFwGnogJp7o +DFEmuRfSPpNHcEIfIIBiVfUSqz5k1EQTnCOzdx6gDHJ9RkqIIsSSYgGV7Nvd99Gq +Tqwg49Q9JO6rAAU/+1ZU2MhgJiWVBZ/ry+u4bR9K1kzz7177lkLCNgrcs1f7vAc= +=1IhK +-END PGP SIGNATURE- Added: release/maven/jxr/jxr-2.5-source-release.zip.md5 == --- release/maven/jxr/jxr-2.5-source-release.zip.md5 (added) +++ release/maven/jxr/jxr-2.5-source-release.zip.md5 Wed Nov 5 20:44:45 2014 @@ -0,0 +1 @@ +6a1feaf76124194c40e16f06d0f662c3 \ No newline at end of file
svn commit: r1636957 - /maven/site/trunk/content/apt/plugins/index.apt
Author: khmarbaise
Date: Wed Nov 5 20:59:25 2014
New Revision: 1636957
URL: http://svn.apache.org/r1636957
Log:
Apache Maven JXR Version 2.5.
Modified:
maven/site/trunk/content/apt/plugins/index.apt
Modified: maven/site/trunk/content/apt/plugins/index.apt
URL:
http://svn.apache.org/viewvc/maven/site/trunk/content/apt/plugins/index.apt?rev=1636957&r1=1636956&r2=1636957&view=diff
==
--- maven/site/trunk/content/apt/plugins/index.apt (original)
+++ maven/site/trunk/content/apt/plugins/index.apt Wed Nov 5 20:59:25 2014
@@ -8,7 +8,7 @@
Benson Margulies
Karl-Heinz Marbaise
-
- 2014-11-04
+ 2014-11-05
-
~~ Licensed to the Apache Software Foundation (ASF) under one
@@ -117,7 +117,7 @@ Available Plugins
*--++--++--+++
| {{{/plugins/maven-javadoc-plugin/} <<>>}} | B+R|
2.10.1 | 2014-09-27 | Generate Javadoc for the project. |
{{{http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-javadoc-plugin}SVN}}
| {{{http://jira.codehaus.org/browse/MJAVADOC}JIRA}}
*--++--++--+++
-| {{{/jxr/maven-jxr-plugin/} <<>>}} | R |
2.4 | 2013-12-10 | Generate a source cross reference. |
{{{http://svn.apache.org/repos/asf/maven/jxr/trunk/maven-jxr-plugin}SVN}} |
{{{http://jira.codehaus.org/browse/JXR}JIRA}}
+| {{{/jxr/maven-jxr-plugin/} <<>>}} | R |
2.5 | 2014-11-02 | Generate a source cross reference. |
{{{http://svn.apache.org/repos/asf/maven/jxr/trunk/maven-jxr-plugin}SVN}} |
{{{http://jira.codehaus.org/browse/JXR}JIRA}}
*--++--++--+++
| {{{/plugins/maven-linkcheck-plugin/} <<>>}} | R |
1.2 | 2014-10-08 | Generate a Linkcheck report of your project's
documentation. |
{{{http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-linkcheck-plugin}SVN}}
| {{{http://jira.codehaus.org/browse/MLINKCHECK}JIRA}}
*--++--++--+++
svn commit: r1636977 - /maven/plugins/trunk/maven-war-plugin/pom.xml
Author: khmarbaise Date: Wed Nov 5 22:03:04 2014 New Revision: 1636977 URL: http://svn.apache.org/r1636977 Log: [maven-release-plugin] prepare release maven-war-plugin-2.6 Modified: maven/plugins/trunk/maven-war-plugin/pom.xml Modified: maven/plugins/trunk/maven-war-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/pom.xml?rev=1636977&r1=1636976&r2=1636977&view=diff == --- maven/plugins/trunk/maven-war-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-war-plugin/pom.xml Wed Nov 5 22:03:04 2014 @@ -30,7 +30,7 @@ under the License. maven-war-plugin - 2.6-SNAPSHOT + 2.6 maven-plugin Apache Maven WAR Plugin @@ -41,9 +41,9 @@ under the License. - scm:svn:http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-war-plugin/ - scm:svn:https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-war-plugin/ - http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/ + scm:svn:http://svn.apache.org/repos/asf/maven/plugins/tags/maven-war-plugin-2.6 + scm:svn:https://svn.apache.org/repos/asf/maven/plugins/tags/maven-war-plugin-2.6 + http://svn.apache.org/viewvc/maven/plugins/tags/maven-war-plugin-2.6 JIRA
svn commit: r1636978 - /maven/plugins/trunk/maven-war-plugin/pom.xml
Author: khmarbaise Date: Wed Nov 5 22:03:25 2014 New Revision: 1636978 URL: http://svn.apache.org/r1636978 Log: [maven-release-plugin] rollback the release of maven-war-plugin-2.6 Modified: maven/plugins/trunk/maven-war-plugin/pom.xml Modified: maven/plugins/trunk/maven-war-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/pom.xml?rev=1636978&r1=1636977&r2=1636978&view=diff == --- maven/plugins/trunk/maven-war-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-war-plugin/pom.xml Wed Nov 5 22:03:25 2014 @@ -30,7 +30,7 @@ under the License. maven-war-plugin - 2.6 + 2.6-SNAPSHOT maven-plugin Apache Maven WAR Plugin @@ -41,9 +41,9 @@ under the License. - scm:svn:http://svn.apache.org/repos/asf/maven/plugins/tags/maven-war-plugin-2.6 - scm:svn:https://svn.apache.org/repos/asf/maven/plugins/tags/maven-war-plugin-2.6 - http://svn.apache.org/viewvc/maven/plugins/tags/maven-war-plugin-2.6 + scm:svn:http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-war-plugin/ + scm:svn:https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-war-plugin/ + http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/ JIRA
svn commit: r1636987 - in /maven/plugins/trunk/maven-pmd-plugin: ./ src/it/empty-rulesets/ src/main/java/org/apache/maven/plugin/pmd/ src/test/java/org/apache/maven/plugin/pmd/ src/test/resources/unit
Author: mfriedenhagen
Date: Wed Nov 5 22:21:28 2014
New Revision: 1636987
URL: http://svn.apache.org/r1636987
Log:
MPMD-191: Update to PMD 5.2.1
* Because PMD now comes with multiple moduls depending on the language
we must not only update the version.
* The API for detecting languages was changed as well.
* Additionally, rules in PMD do not end on `Rule` anymore, so
custom configurations need to be adapted as well.
Modified:
maven/plugins/trunk/maven-pmd-plugin/pom.xml
maven/plugins/trunk/maven-pmd-plugin/src/it/empty-rulesets/pom.xml
maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/PmdReport.java
maven/plugins/trunk/maven-pmd-plugin/src/test/java/org/apache/maven/plugin/pmd/PmdReportTest.java
maven/plugins/trunk/maven-pmd-plugin/src/test/resources/unit/custom-configuration/resources/rulesets/custom.xml
Modified: maven/plugins/trunk/maven-pmd-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pmd-plugin/pom.xml?rev=1636987&r1=1636986&r2=1636987&view=diff
==
--- maven/plugins/trunk/maven-pmd-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-pmd-plugin/pom.xml Wed Nov 5 22:21:28 2014
@@ -86,7 +86,7 @@ under the License.
1.6
${javaVersion}
${javaVersion}
-5.1.2
+5.2.1
3.3
3.2
2.7
@@ -117,7 +117,6 @@ under the License.
org.apache.maven.plugin-tools
maven-plugin-annotations
- ${mavenPluginVersion}
provided
@@ -175,15 +174,23 @@ under the License.
net.sourceforge.pmd
- pmd
+ pmd-core
+ ${pmdVersion}
+
+
+ net.sourceforge.pmd
+ pmd-java
+ ${pmdVersion}
+
+
+ net.sourceforge.pmd
+ pmd-javascript
+ ${pmdVersion}
+
+
+ net.sourceforge.pmd
+ pmd-jsp
${pmdVersion}
-
-
-
- com.ibm.icu
- icu4j
-
-
Modified: maven/plugins/trunk/maven-pmd-plugin/src/it/empty-rulesets/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pmd-plugin/src/it/empty-rulesets/pom.xml?rev=1636987&r1=1636986&r2=1636987&view=diff
==
--- maven/plugins/trunk/maven-pmd-plugin/src/it/empty-rulesets/pom.xml
(original)
+++ maven/plugins/trunk/maven-pmd-plugin/src/it/empty-rulesets/pom.xml Wed Nov
5 22:21:28 2014
@@ -46,13 +46,6 @@ under the License.
org.apache.maven.plugins
maven-pmd-plugin
@project.version@
-
-
-net.sourceforge.pmd
-pmd
-5.0.5
-
-
false
false
Modified:
maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/PmdReport.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/PmdReport.java?rev=1636987&r1=1636986&r2=1636987&view=diff
==
---
maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/PmdReport.java
(original)
+++
maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/PmdReport.java
Wed Nov 5 22:21:28 2014
@@ -28,6 +28,7 @@ import net.sourceforge.pmd.RuleSetFactor
import net.sourceforge.pmd.RuleSetReferenceId;
import net.sourceforge.pmd.benchmark.Benchmarker;
import net.sourceforge.pmd.benchmark.TextReport;
+import net.sourceforge.pmd.lang.LanguageRegistry;
import net.sourceforge.pmd.lang.LanguageVersion;
import net.sourceforge.pmd.renderers.CSVRenderer;
import net.sourceforge.pmd.renderers.HTMLRenderer;
@@ -524,7 +525,7 @@ public class PmdReport
if ( null != targetJdk )
{
-languageVersion = LanguageVersion.findByTerseName( "java " +
targetJdk );
+languageVersion = LanguageRegistry.findLanguageVersionByTerseName(
"java " + targetJdk );
if ( languageVersion == null )
{
throw new MavenReportException( "Unsupported targetJdk value
'" + targetJdk + "'." );
@@ -532,7 +533,7 @@ public class PmdReport
}
else if ( "javascript".equals( language ) || "ecmascript".equals(
language ) )
{
-languageVersion = LanguageVersion.ECMASCRIPT;
+languageVersion = LanguageRegistry.findLanguageVersionByTerseName(
"ecmascript" );
}
if ( languageVersion != null )
{
Modified:
maven/plugins/trunk/maven-pmd-plugin/src/test/java/org/apache/maven/plugin/pmd/PmdReportTest.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pmd-plugin/src/test/java/org/apache/maven/plugin/pmd/PmdReportTest.java?rev=1636987&r1=1636986&r2=1636987&view=diff
==
---
maven/plu
