svn commit: r1446610 - /maven/plugins/trunk/maven-assembly-plugin/pom.xml
Author: krosenvold Date: Fri Feb 15 14:45:35 2013 New Revision: 1446610 URL: http://svn.apache.org/r1446610 Log: o p-a 2.3 posix tar support Modified: maven/plugins/trunk/maven-assembly-plugin/pom.xml Modified: maven/plugins/trunk/maven-assembly-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/pom.xml?rev=1446610r1=1446609r2=1446610view=diff == --- maven/plugins/trunk/maven-assembly-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-assembly-plugin/pom.xml Fri Feb 15 14:45:35 2013 @@ -105,7 +105,7 @@ under the License. dependency groupIdorg.codehaus.plexus/groupId artifactIdplexus-archiver/artifactId - version2.2/version + version2.3/version exclusions exclusion groupIdorg.codehaus.plexus/groupId
svn commit: r850716 - /websites/production/maven/content/plugins/maven-pmd-plugin/
Author: olamy Date: Fri Feb 15 15:39:38 2013 New Revision: 850716 Log: remove previous version Removed: websites/production/maven/content/plugins/maven-pmd-plugin/
svn commit: r850717 - /websites/production/maven/content/plugins/maven-pmd-plugin/
Author: olamy Date: Fri Feb 15 15:40:08 2013 New Revision: 850717 Log: pmd plugin 3.0 site Added: websites/production/maven/content/plugins/maven-pmd-plugin/ - copied from r850716, websites/production/maven/content/plugins-archives/maven-pmd-plugin-3.0/
svn commit: r1446635 - /maven/site/trunk/content/apt/plugins/index.apt
Author: olamy
Date: Fri Feb 15 15:41:56 2013
New Revision: 1446635
URL: http://svn.apache.org/r1446635
Log:
pmd plugin 3.0
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=1446635r1=1446634r2=1446635view=diff
==
--- maven/site/trunk/content/apt/plugins/index.apt (original)
+++ maven/site/trunk/content/apt/plugins/index.apt Fri Feb 15 15:41:56 2013
@@ -119,7 +119,7 @@ Available Plugins
*--++--++--+++
| {{{/plugins/maven-linkcheck-plugin/} linkcheck}} | R |
1.1 | 2010-11-13 | 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}}
*--++--++--+++
-| {{{/plugins/maven-pmd-plugin/} pmd}} | B+R|
2.7.1| 2012-02-16 | Generate a PMD report. |
{{{http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-pmd-plugin}SVN}} |
{{{http://jira.codehaus.org/browse/MPMD}JIRA}}
+| {{{/plugins/maven-pmd-plugin/} pmd}} | B+R|
3.0| 2013-02-15 | Generate a PMD report. |
{{{http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-pmd-plugin}SVN}} |
{{{http://jira.codehaus.org/browse/MPMD}JIRA}}
*--++--++--+++
| {{{/plugins/maven-project-info-reports-plugin/} project-info-reports}}
| R | 2.6 | 2012-10-28 | Generate standard project reports. |
{{{http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-project-info-reports-plugin}SVN}}
| {{{http://jira.codehaus.org/browse/MPIR}JIRA}}
*--++--++--+++
svn commit: r1446764 - in /maven/plugins/trunk/maven-help-plugin/src/it/all-profiles: invoker.properties verify.groovy
Author: rfscholte
Date: Fri Feb 15 21:00:36 2013
New Revision: 1446764
URL: http://svn.apache.org/r1446764
Log:
Add verification script
Added:
maven/plugins/trunk/maven-help-plugin/src/it/all-profiles/verify.groovy
Modified:
maven/plugins/trunk/maven-help-plugin/src/it/all-profiles/invoker.properties
Modified:
maven/plugins/trunk/maven-help-plugin/src/it/all-profiles/invoker.properties
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-help-plugin/src/it/all-profiles/invoker.properties?rev=1446764r1=1446763r2=1446764view=diff
==
---
maven/plugins/trunk/maven-help-plugin/src/it/all-profiles/invoker.properties
(original)
+++
maven/plugins/trunk/maven-help-plugin/src/it/all-profiles/invoker.properties
Fri Feb 15 21:00:36 2013
@@ -1 +1,2 @@
invoker.goals =
${project.groupId}:${project.artifactId}:${project.version}:all-profiles
+invoker.maven.version = 3.0-, 3.0.4+
Added: maven/plugins/trunk/maven-help-plugin/src/it/all-profiles/verify.groovy
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-help-plugin/src/it/all-profiles/verify.groovy?rev=1446764view=auto
==
--- maven/plugins/trunk/maven-help-plugin/src/it/all-profiles/verify.groovy
(added)
+++ maven/plugins/trunk/maven-help-plugin/src/it/all-profiles/verify.groovy Fri
Feb 15 21:00:36 2013
@@ -0,0 +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.
+ */
+def buildLog = new File( basedir, 'build.log' );
+assert buildLog.exists()
+
+assert buildLog.text.contains( ' Profile Id: it-repo (Active: true , Source:
settings.xml)' )
svn commit: r1446786 - in /maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help: AbstractEffectiveMojo.java DescribeMojo.java EvaluateMojo.java HelpUtil.java
Author: rfscholte
Date: Fri Feb 15 21:54:28 2013
New Revision: 1446786
URL: http://svn.apache.org/r1446786
Log:
Optimizations detected by Sonar
Modified:
maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/AbstractEffectiveMojo.java
maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/DescribeMojo.java
maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/EvaluateMojo.java
maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/HelpUtil.java
Modified:
maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/AbstractEffectiveMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/AbstractEffectiveMojo.java?rev=1446786r1=1446785r2=1446786view=diff
==
---
maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/AbstractEffectiveMojo.java
(original)
+++
maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/AbstractEffectiveMojo.java
Fri Feb 15 21:54:28 2013
@@ -26,13 +26,14 @@ import java.io.StringWriter;
import java.io.Writer;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
+import java.util.ArrayList;
import java.util.Collections;
import java.util.Date;
import java.util.Iterator;
import java.util.LinkedHashSet;
+import java.util.List;
import java.util.Properties;
import java.util.Set;
-import java.util.Vector;
import org.codehaus.plexus.util.IOUtil;
import org.codehaus.plexus.util.StringUtils;
@@ -50,7 +51,7 @@ import org.jdom.output.XMLOutputter;
/**
* Base class with common utilities to write effective Pom/settings.
- *
+ *
* @author a href=mailto:vincent.sive...@gmail.com;Vincent Siveton/a
* @version $Id$
* @since 2.1
@@ -66,7 +67,7 @@ public abstract class AbstractEffectiveM
/**
* Utility method to write an XML content in a given file.
- *
+ *
* @param output is the wanted output file.
* @param content contains the XML content to be written to the file.
* @param encoding is the wanted encoding to use when writing file.
@@ -106,17 +107,18 @@ public abstract class AbstractEffectiveM
/**
* Write comments in the Effective POM/settings header.
- *
+ *
* @param writer not null
*/
protected static void writeHeader( XMLWriter writer )
{
XmlWriterUtil.writeCommentLineBreak( writer );
XmlWriterUtil.writeComment( writer, );
- // Use ISO8601-format for date and time
- DateFormat dateFormat = new SimpleDateFormat( -MM-dd'T'hh:mm:ss );
-XmlWriterUtil.writeComment( writer, Generated by Maven Help Plugin on
-+ dateFormat.format( new Date( System.currentTimeMillis() ) ) );
+// Use ISO8601-format for date and time
+DateFormat dateFormat = new SimpleDateFormat( -MM-dd'T'hh:mm:ss
);
+XmlWriterUtil.writeComment( writer,
+Generated by Maven Help Plugin on
++ dateFormat.format( new Date(
System.currentTimeMillis() ) ) );
XmlWriterUtil.writeComment( writer, See:
http://maven.apache.org/plugins/maven-help-plugin/; );
XmlWriterUtil.writeComment( writer, );
XmlWriterUtil.writeCommentLineBreak( writer );
@@ -126,7 +128,7 @@ public abstract class AbstractEffectiveM
/**
* Write comments in a normalize way.
- *
+ *
* @param writer not null
* @param comment not null
*/
@@ -143,11 +145,11 @@ public abstract class AbstractEffectiveM
/**
* Add a Pom/Settings namespaces to the effective XML content.
- *
+ *
* @param effectiveXml not null the effective POM or Settings
* @param isPom if codetrue/code add the Pom xsd url, otherwise add
the settings xsd url.
- * @return the content of the root element, i.e. lt;project/gt; or
lt;settings/gt; with the Maven namespace
- * or the original codeeffective/code if an error occurred.
+ * @return the content of the root element, i.e. lt;project/gt; or
lt;settings/gt; with the Maven namespace or
+ * the original codeeffective/code if an error occurred.
* @see #POM_XSD_URL
* @see #SETTINGS_XSD_URL
*/
@@ -206,10 +208,11 @@ public abstract class AbstractEffectiveM
static final long serialVersionUID = -8985316072702233744L;
/** {@inheritDoc} */
+@SuppressWarnings( { rawtypes, unchecked } )
public SetObject keySet()
{
-SetObjectkeynames = super.keySet();
-Vector list = new Vector( keynames );
+SetObject keynames = super.keySet();
+List list = new ArrayList( keynames );
Collections.sort( list );
return
svn commit: r1446806 - in /maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help: ActiveProfilesMojo.java AllProfilesMojo.java DescribeMojo.java EffectiveSettingsMojo.java
Author: rfscholte
Date: Fri Feb 15 23:07:28 2013
New Revision: 1446806
URL: http://svn.apache.org/r1446806
Log:
formatting
Modified:
maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/ActiveProfilesMojo.java
maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/AllProfilesMojo.java
maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/DescribeMojo.java
maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/EffectiveSettingsMojo.java
maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/EvaluateMojo.java
maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/ExpressionsMojo.java
Modified:
maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/ActiveProfilesMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/ActiveProfilesMojo.java?rev=1446806r1=1446805r2=1446806view=diff
==
---
maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/ActiveProfilesMojo.java
(original)
+++
maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/ActiveProfilesMojo.java
Fri Feb 15 23:07:28 2013
@@ -124,10 +124,10 @@ public class ActiveProfilesMojo
@SuppressWarnings( unchecked )
ListProfile profiles = new ArrayListProfile(
project.getActiveProfiles() );
-for( Profile profile : profiles )
+for ( Profile profile : profiles )
{
ListString profileIds = activeProfileIds.get(
profile.getSource() );
-if( profileIds == null )
+if ( profileIds == null )
{
profileIds = new ArrayListString();
activeProfileIds.put( profile.getSource(), profileIds );
Modified:
maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/AllProfilesMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/AllProfilesMojo.java?rev=1446806r1=1446805r2=1446806view=diff
==
---
maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/AllProfilesMojo.java
(original)
+++
maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/AllProfilesMojo.java
Fri Feb 15 23:07:28 2013
@@ -261,7 +261,7 @@ public class AllProfilesMojo
}
MavenProject parent = project.getParent();
-while( parent != null )
+while ( parent != null )
{
ListProfile profiles2 = parent.getModel().getProfiles();
for ( Profile profile : profiles2 )
Modified:
maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/DescribeMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/DescribeMojo.java?rev=1446806r1=1446805r2=1446806view=diff
==
---
maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/DescribeMojo.java
(original)
+++
maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/DescribeMojo.java
Fri Feb 15 23:07:28 2013
@@ -473,7 +473,7 @@ public class DescribeMojo
if ( descriptor == null )
{
throw new MojoFailureException( Plugin could not be found. If you
believe it is correct,
-+ check your pluginGroups
setting, and run with -U to update the remote configuration );
++ check your pluginGroups setting, and run with -U to update
the remote configuration );
}
return descriptor;
Modified:
maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/EffectiveSettingsMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/EffectiveSettingsMojo.java?rev=1446806r1=1446805r2=1446806view=diff
==
---
maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/EffectiveSettingsMojo.java
(original)
+++
maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/EffectiveSettingsMojo.java
Fri Feb 15 23:07:28 2013
@@ -202,7 +202,7 @@ public class EffectiveSettingsMojo
clone.setServers( clonedServers );
ListProxy clonedProxies = new ArrayListProxy(
settings.getProxies().size() );
-for( Proxy proxy : settings.getProxies()
svn commit: r1446807 - /maven/plugins/trunk/maven-help-plugin/pom.xml
Author: rfscholte
Date: Fri Feb 15 23:13:56 2013
New Revision: 1446807
URL: http://svn.apache.org/r1446807
Log:
cleanup reporting profile: reports already inherited or never used by other
plugins.
Modified:
maven/plugins/trunk/maven-help-plugin/pom.xml
Modified: maven/plugins/trunk/maven-help-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-help-plugin/pom.xml?rev=1446807r1=1446806r2=1446807view=diff
==
--- maven/plugins/trunk/maven-help-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-help-plugin/pom.xml Fri Feb 15 23:13:56 2013
@@ -256,42 +256,5 @@ under the License.
/pluginManagement
/build
/profile
-profile
- idreporting/id
- reporting
-plugins
- plugin
-groupIdorg.apache.maven.plugins/groupId
-artifactIdmaven-changes-plugin/artifactId
-version2.0/version
-configuration
- !-- For JIRA-report --
- columnNamesType,Key,Summary,Assignee,Status,Resolution,Fix
Version/columnNames
- onlyCurrentVersiontrue/onlyCurrentVersion
- resolutionIdsClosed/resolutionIds
- sortColumnNamesType,Key/sortColumnNames
- maxEntries100/maxEntries !-- MCHANGES-124 --
-/configuration
-reportSets
- reportSet
-reports
- reportjira-report/report
-/reports
- /reportSet
-/reportSets
- /plugin
- plugin
-groupIdorg.apache.maven.plugins/groupId
-artifactIdmaven-changelog-plugin/artifactId
-version2.1/version
- /plugin
- plugin
-groupIdorg.apache.maven.plugins/groupId
-artifactIdmaven-plugin-plugin/artifactId
-version${mavenPluginVersion}/version
- /plugin
-/plugins
- /reporting
-/profile
/profiles
/project
