svn commit: r1637568 - /maven/plugins/trunk/maven-toolchains-plugin/src/it/custom-toolchain-plugin/src/main/java/org/apache/maven/plugins/toolchains/its/custom/CustomToolchainFactory.java
Author: hboutemy
Date: Sat Nov 8 13:57:46 2014
New Revision: 1637568
URL: http://svn.apache.org/r1637568
Log:
rework code after MNG-5720 discussion
Modified:
maven/plugins/trunk/maven-toolchains-plugin/src/it/custom-toolchain-plugin/src/main/java/org/apache/maven/plugins/toolchains/its/custom/CustomToolchainFactory.java
Modified:
maven/plugins/trunk/maven-toolchains-plugin/src/it/custom-toolchain-plugin/src/main/java/org/apache/maven/plugins/toolchains/its/custom/CustomToolchainFactory.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-toolchains-plugin/src/it/custom-toolchain-plugin/src/main/java/org/apache/maven/plugins/toolchains/its/custom/CustomToolchainFactory.java?rev=1637568r1=1637567r2=1637568view=diff
==
---
maven/plugins/trunk/maven-toolchains-plugin/src/it/custom-toolchain-plugin/src/main/java/org/apache/maven/plugins/toolchains/its/custom/CustomToolchainFactory.java
(original)
+++
maven/plugins/trunk/maven-toolchains-plugin/src/it/custom-toolchain-plugin/src/main/java/org/apache/maven/plugins/toolchains/its/custom/CustomToolchainFactory.java
Sat Nov 8 13:57:46 2014
@@ -30,6 +30,7 @@ import java.util.Properties;
import org.apache.maven.execution.MavenSession;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.toolchain.MisconfiguredToolchainException;
+import org.apache.maven.toolchain.RequirementMatcher;
import org.apache.maven.toolchain.RequirementMatcherFactory;
import org.apache.maven.toolchain.ToolchainFactory;
import org.apache.maven.toolchain.ToolchainPrivate;
@@ -65,30 +66,34 @@ public class CustomToolchainFactory
DefaultCustomToolchain customToolchain = new DefaultCustomToolchain(
model, logger );
// populate the provides section
-Properties provides = getModelProperties( model, provides );
+Properties provides = getProvidesProperties( model );
for ( Map.EntryObject, Object provide : provides.entrySet() )
{
String key = (String) provide.getKey();
String value = (String) provide.getValue();
+
if ( value == null )
{
throw new MisconfiguredToolchainException(
Provides token ' + key + ' doesn't have any value
configured. );
}
+RequirementMatcher matcher;
if ( version.equals( key ) )
{
-customToolchain.addProvideToken( key,
RequirementMatcherFactory.createVersionMatcher( value ) );
+matcher = RequirementMatcherFactory.createVersionMatcher(
value );
}
else
{
-customToolchain.addProvideToken( key,
RequirementMatcherFactory.createExactMatcher( value ) );
+matcher = RequirementMatcherFactory.createExactMatcher( value
);
}
+
+customToolchain.addProvideToken( key, matcher );
}
// populate the configuration section
-Properties configuration = getModelProperties( model, configuration
);
+Properties configuration = toProperties( (Xpp3Dom)
model.getConfiguration() );
String toolHome = configuration.getProperty(
DefaultCustomToolchain.KEY_TOOLHOME );
if ( toolHome == null )
@@ -121,25 +126,25 @@ public class CustomToolchainFactory
}
/**
- * Get model properties in in a way compatible with toolchains descriptor
version 1.0
+ * Get codeprovides/code properties in in a way compatible with
toolchains descriptor version 1.0
* (Maven 2.0.9 to 3.2.3, where it is represented as Object/DOM) and
descriptor version 1.1
* (Maven 3.2.4 and later, where it is represented as Properties).
*
* @param model the toolchain model as read from XML
- * @param property the model XML element to get
- * @return the properties defined in the corresponding element
- * @see a href=http://jira.codehaus.org/browse/MNG-5718;MNG-5718/a,
a href=http://jira.codehaus.org/browse/MNG-5720;MNG-5720/a
+ * @return the properties defined in the codeprovides/code element
+ * @see a href=http://jira.codehaus.org/browse/MNG-5718;MNG-5718/a
*/
-protected Properties getModelProperties( ToolchainModel model, String
property )
+protected Properties getProvidesProperties( ToolchainModel model )
{
-Object value = getBeanProperty( model, property );
-if ( value instanceof Properties )
-{
-return (Properties) value;
-}
+Object value = getBeanProperty( model, provides );
+return ( value instanceof Properties ) ? (Properties) value :
toProperties( (Xpp3Dom) value );
+}
+
+protected Properties toProperties( Xpp3Dom dom )
+{
Properties props = new Properties();
-Xpp3Dom dom = (Xpp3Dom) value;
+
Xpp3Dom[] children = dom.getChildren();
for
svn commit: r1637570 - in /maven/plugins/trunk/maven-project-info-reports-plugin: ./ src/main/java/org/apache/maven/report/projectinfo/ src/main/java/org/apache/maven/report/projectinfo/dependencies/
Author: khmarbaise
Date: Sat Nov 8 14:42:36 2014
New Revision: 1637570
URL: http://svn.apache.org/r1637570
Log:
[MPIR-306] Upgrade to maven-plugins version 25 to 26
- Fixed several checkstyle reported errors.
Modified:
maven/plugins/trunk/maven-project-info-reports-plugin/pom.xml
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoRenderer.java
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoReport.java
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependencyConvergenceReport.java
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/MailingListsReport.java
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ProjectInfoReportUtils.java
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ScmReport.java
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/TeamListReport.java
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/DependencyVersionMap.java
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/SinkSerializingDependencyNodeVisitor.java
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependenciesRenderer.java
Modified: maven/plugins/trunk/maven-project-info-reports-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/pom.xml?rev=1637570r1=1637569r2=1637570view=diff
==
--- maven/plugins/trunk/maven-project-info-reports-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-project-info-reports-plugin/pom.xml Sat Nov 8
14:42:36 2014
@@ -25,7 +25,7 @@ under the License.
parent
artifactIdmaven-plugins/artifactId
groupIdorg.apache.maven.plugins/groupId
-version25/version
+version26/version
relativePath../maven-plugins/pom.xml/relativePath
/parent
Modified:
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoRenderer.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoRenderer.java?rev=1637570r1=1637569r2=1637570view=diff
==
---
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoRenderer.java
(original)
+++
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoRenderer.java
Sat Nov 8 14:42:36 2014
@@ -27,6 +27,10 @@ import org.apache.maven.reporting.Abstra
import org.codehaus.plexus.i18n.I18N;
import org.codehaus.plexus.util.StringUtils;
+/**
+ * @author Hervé Boutemy
+ *
+ */
public abstract class AbstractProjectInfoRenderer
extends AbstractMavenReportRenderer
{
Modified:
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoReport.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoReport.java?rev=1637570r1=1637569r2=1637570view=diff
==
---
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoReport.java
(original)
+++
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoReport.java
Sat Nov 8 14:42:36 2014
@@ -298,8 +298,8 @@ public abstract class AbstractProjectInf
Plugin plugin = (Plugin)
getProject().getBuild().getPluginsAsMap().get( pluginId );
-if ( ( plugin == null ) (
getProject().getBuild().getPluginManagement() != null ) (
-
getProject().getBuild().getPluginManagement().getPluginsAsMap() != null ) )
+if ( ( plugin == null ) (
getProject().getBuild().getPluginManagement() != null )
+ (
getProject().getBuild().getPluginManagement().getPluginsAsMap() != null ) )
{
plugin = (Plugin)
getProject().getBuild().getPluginManagement().getPluginsAsMap().get( pluginId );
}
@@ -385,7 +385,7 @@ public abstract class AbstractProjectInf
private ResourceBundle bundle;
-
svn commit: r1637571 - /maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/TeamListReport.java
Author: khmarbaise
Date: Sat Nov 8 14:49:31 2014
New Revision: 1637571
URL: http://svn.apache.org/r1637571
Log:
- Removed unused code.
Modified:
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/TeamListReport.java
Modified:
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/TeamListReport.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/TeamListReport.java?rev=1637571r1=1637570r2=1637571view=diff
==
---
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/TeamListReport.java
(original)
+++
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/TeamListReport.java
Sat Nov 8 14:49:31 2014
@@ -127,8 +127,6 @@ public class TeamListReport
private final boolean showAvatarImages;
-private static final String[] EMPTY_STRING_ARRAY = new String[0];
-
TeamListRenderer( Sink sink, Model model, I18N i18n, Locale locale,
Log log, boolean showAvatarImages )
{
super( sink, i18n, locale );
@@ -437,15 +435,6 @@ public class TeamListReport
}
}
-private String img( String src )
-{
-if ( src == null )
-{
-return ;
-}
-return img src=' + src + '/;
-}
-
/**
* @param requiredHeaders
* @return
svn commit: r1637574 - in /maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo: ./ dependencies/renderer/
Author: khmarbaise
Date: Sat Nov 8 15:49:45 2014
New Revision: 1637574
URL: http://svn.apache.org/r1637574
Log:
[MPIR-306] Upgrade to maven-plugins version 25 to 26
- Followup fixed checkstyle reported errors which broke the build.
Modified:
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoReport.java
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependencyConvergenceReport.java
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/IssueTrackingReport.java
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ModulesReport.java
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ProjectInfoReportUtils.java
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ScmReport.java
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/TeamListReport.java
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependenciesRenderer.java
Modified:
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoReport.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoReport.java?rev=1637574r1=1637573r2=1637574view=diff
==
---
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoReport.java
(original)
+++
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoReport.java
Sat Nov 8 15:49:45 2014
@@ -206,8 +206,10 @@ public abstract class AbstractProjectInf
Artifact defaultSkin =
siteTool.getDefaultSkinArtifact( localRepository,
project.getRemoteArtifactRepositories() );
+// CHECKSTYLE_OFF: LineLength
SiteRenderingContext siteContext =
siteRenderer.createContextForSkin( defaultSkin.getFile(),
attributes, model, getName( locale ), locale );
+// CHECKSTYLE_ON: LineLength
RenderingContext context = new RenderingContext( outputDirectory,
filename );
Modified:
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependencyConvergenceReport.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependencyConvergenceReport.java?rev=1637574r1=1637573r2=1637574view=diff
==
---
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependencyConvergenceReport.java
(original)
+++
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependencyConvergenceReport.java
Sat Nov 8 15:49:45 2014
@@ -210,7 +210,9 @@ public class DependencyConvergenceReport
* @param dependencyMap
* @return snapshots dependencies
*/
+// CHECKSTYLE_OFF: LineLength
private ListReverseDependencyLink getSnapshotDependencies( MapString,
ListReverseDependencyLink dependencyMap )
+// CHECKSTYLE_ON: LineLength
{
ListReverseDependencyLink snapshots = new
ArrayListReverseDependencyLink();
for ( Map.EntryString, ListReverseDependencyLink entry :
dependencyMap.entrySet() )
@@ -359,7 +361,9 @@ public class DependencyConvergenceReport
* @param artifactMap
* @param version
*/
+// CHECKSTYLE_OFF: LineLength
private void generateVersionDetails( Sink sink, MapString,
ListReverseDependencyLink artifactMap, String version )
+// CHECKSTYLE_ON: LineLength
{
sink.numberedList( 0 ); // Use lower alpha numbering
ListReverseDependencyLink depList = artifactMap.get( version );
@@ -776,8 +780,10 @@ public class DependencyConvergenceReport
* @return DependencyAnalyzeResult contains conflicting dependencies map,
snapshot dependencies map and all
* dependencies map.
*/
+// CHECKSTYLE_OFF: LineLength
private DependencyAnalyzeResult populateDependencyAnalyzeResult(
MapString, ListReverseDependencyLink conflictingDependencyMap,
MapString, ListReverseDependencyLink allDependencies )
+// CHECKSTYLE_ON: LineLength
{
DependencyAnalyzeResult dependencyResult = new
svn commit: r1637575 - in /maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo: ./ dependencies/ dependencies/renderer/
Author: khmarbaise
Date: Sat Nov 8 16:25:21 2014
New Revision: 1637575
URL: http://svn.apache.org/r1637575
Log:
[MPIR-306] Upgrade to maven-plugins version 25 to 26
- Followup fixed checkstyle reported warnings/errors.
Modified:
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoReport.java
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/PluginManagementReport.java
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/PluginsReport.java
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ProjectInfoReportUtils.java
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/DependencyVersionMap.java
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/RepositoryUtils.java
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/SinkSerializingDependencyNodeVisitor.java
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependenciesRenderer.java
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependencyManagementRenderer.java
Modified:
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoReport.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoReport.java?rev=1637575r1=1637574r2=1637575view=diff
==
---
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoReport.java
(original)
+++
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoReport.java
Sat Nov 8 16:25:21 2014
@@ -262,6 +262,10 @@ public abstract class AbstractProjectInf
// Protected methods
// --
+/**
+ * @param coll The collection to be checked.
+ * @return true if coll is empty false otherwise.
+ */
protected boolean isEmpty( Collection? coll )
{
return coll == null || coll.isEmpty();
@@ -291,6 +295,10 @@ public abstract class AbstractProjectInf
return project;
}
+/**
+ * @param pluginId The id of the plugin
+ * @return The information about the plugin.
+ */
protected Plugin getPlugin( String pluginId )
{
if ( ( getProject().getBuild() == null ) || (
getProject().getBuild().getPluginsAsMap() == null ) )
@@ -309,6 +317,11 @@ public abstract class AbstractProjectInf
return plugin;
}
+/**
+ * @param pluginId The pluginId
+ * @param param The child which should be checked.
+ * @return The value of the dom tree.
+ */
protected String getPluginParameter( String pluginId, String param )
{
Plugin plugin = getPlugin( pluginId );
@@ -325,17 +338,29 @@ public abstract class AbstractProjectInf
return null;
}
+/**
+ * {@inheritDoc}
+ */
@Override
protected Renderer getSiteRenderer()
{
return siteRenderer;
}
+/**
+ * @param locale The locale
+ * @param key The key to search for
+ * @return The text appropriate for the locale.
+ */
protected String getI18nString( Locale locale, String key )
{
return getI18N( locale ).getString( project-info-report, locale,
report. + getI18Nsection() + '.' + key );
}
+/**
+ * @param locale The local.
+ * @return I18N for the locale
+ */
protected I18N getI18N( Locale locale )
{
if ( customBundle != null )
@@ -358,6 +383,9 @@ public abstract class AbstractProjectInf
return i18n;
}
+/**
+ * @return The according string for the section.
+ */
protected abstract String getI18Nsection();
/** {@inheritDoc} */
Modified:
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/PluginManagementReport.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/PluginManagementReport.java?rev=1637575r1=1637574r2=1637575view=diff
==
---
svn commit: r1637576 - /maven/pom/trunk/maven/pom.xml
Author: khmarbaise Date: Sat Nov 8 16:38:33 2014 New Revision: 1637576 URL: http://svn.apache.org/r1637576 Log: [MPOM-61] Keep maven-surefire-report-plugin in sync with ASF parent - Updated the version of maven-surefire-report-plugin to 2.17 cause the ASF parent already uses maven-surefire/failsafe-plugin version 2.17 Modified: maven/pom/trunk/maven/pom.xml Modified: maven/pom/trunk/maven/pom.xml URL: http://svn.apache.org/viewvc/maven/pom/trunk/maven/pom.xml?rev=1637576r1=1637575r2=1637576view=diff == --- maven/pom/trunk/maven/pom.xml (original) +++ maven/pom/trunk/maven/pom.xml Sat Nov 8 16:38:33 2014 @@ -1093,7 +1093,7 @@ under the License. plugin groupIdorg.apache.maven.plugins/groupId artifactIdmaven-surefire-report-plugin/artifactId -version2.16/version +version2.17/version /plugin plugin groupIdorg.apache.maven.plugins/groupId
svn commit: r1637578 - /maven/pom/trunk/maven/pom.xml
Author: khmarbaise Date: Sat Nov 8 17:11:27 2014 New Revision: 1637578 URL: http://svn.apache.org/r1637578 Log: [MPOM-62] Fix warning according to taglist maven plugin about legacy format. Modified: maven/pom/trunk/maven/pom.xml Modified: maven/pom/trunk/maven/pom.xml URL: http://svn.apache.org/viewvc/maven/pom/trunk/maven/pom.xml?rev=1637578r1=1637577r2=1637578view=diff == --- maven/pom/trunk/maven/pom.xml (original) +++ maven/pom/trunk/maven/pom.xml Sat Nov 8 17:11:27 2014 @@ -1142,6 +1142,47 @@ under the License. groupIdorg.codehaus.mojo/groupId artifactIdtaglist-maven-plugin/artifactId version2.4/version +configuration + tagListOptions +tagClasses + tagClass +displayNameFIXME Work/displayName +tags + tag +matchStringfixme/matchString +matchTypeignoreCase/matchType + /tag + tag +matchString@fixme/matchString +matchTypeignoreCase/matchType + /tag +/tags + /tagClass + tagClass +displayNameTodo Work/displayName +tags + tag +matchStringtodo/matchString +matchTypeignoreCase/matchType + /tag + tag +matchString@todo/matchString +matchTypeignoreCase/matchType + /tag +/tags + /tagClass + tagClass +displayNameDeprecated Work/displayName +tags + tag +matchString@deprecated/matchString +matchTypeignoreCase/matchType + /tag +/tags + /tagClass +/tagClasses + /tagListOptions +/configuration /plugin plugin groupIdorg.apache.maven.plugins/groupId
svn commit: r1637591 - /maven/plugins/tags/maven-pmd-plugin-3.3/
Author: mfriedenhagen Date: Sat Nov 8 20:13:40 2014 New Revision: 1637591 URL: http://svn.apache.org/r1637591 Log: Vote cancelled Removed: maven/plugins/tags/maven-pmd-plugin-3.3/
maven git commit: make algo more visible
Repository: maven
Updated Branches:
refs/heads/master bdf5770f9 - 36d746789
make algo more visible
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/36d74678
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/36d74678
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/36d74678
Branch: refs/heads/master
Commit: 36d746789d5493cfeb290120c9735876ceb0f48f
Parents: bdf5770
Author: Hervé Boutemy hbout...@apache.org
Authored: Sat Nov 8 21:53:16 2014 +0100
Committer: Hervé Boutemy hbout...@apache.org
Committed: Sat Nov 8 21:53:16 2014 +0100
--
.../apache/maven/toolchain/java/JavaToolchainFactory.java| 8 ++--
1 file changed, 6 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven/blob/36d74678/maven-core/src/main/java/org/apache/maven/toolchain/java/JavaToolchainFactory.java
--
diff --git
a/maven-core/src/main/java/org/apache/maven/toolchain/java/JavaToolchainFactory.java
b/maven-core/src/main/java/org/apache/maven/toolchain/java/JavaToolchainFactory.java
index f47a3d0..9df707c 100644
---
a/maven-core/src/main/java/org/apache/maven/toolchain/java/JavaToolchainFactory.java
+++
b/maven-core/src/main/java/org/apache/maven/toolchain/java/JavaToolchainFactory.java
@@ -24,6 +24,7 @@ import java.util.Map.Entry;
import java.util.Properties;
import org.apache.maven.toolchain.MisconfiguredToolchainException;
+import org.apache.maven.toolchain.RequirementMatcher;
import org.apache.maven.toolchain.RequirementMatcherFactory;
import org.apache.maven.toolchain.ToolchainFactory;
import org.apache.maven.toolchain.ToolchainPrivate;
@@ -73,14 +74,17 @@ public class JavaToolchainFactory
Provides token ' + key + ' doesn't have any value
configured. );
}
+RequirementMatcher matcher;
if ( version.equals( key ) )
{
-jtc.addProvideToken( key,
RequirementMatcherFactory.createVersionMatcher( value ) );
+matcher = RequirementMatcherFactory.createVersionMatcher(
value );
}
else
{
-jtc.addProvideToken( key,
RequirementMatcherFactory.createExactMatcher( value ) );
+matcher = RequirementMatcherFactory.createExactMatcher( value
);
}
+
+jtc.addProvideToken( key, matcher );
}
// populate the configuration section
maven git commit: improved javadoc and Java toolchain implementation class name (not a Plexus component, then DefaultComponentName convention doesn't apply)
Repository: maven
Updated Branches:
refs/heads/master 36d746789 - e661aa87f
improved javadoc and Java toolchain implementation class name (not a
Plexus component, then DefaultComponentName convention doesn't apply)
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/e661aa87
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/e661aa87
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/e661aa87
Branch: refs/heads/master
Commit: e661aa87f5f001547d42bddc8d91c7729613a6a9
Parents: 36d7467
Author: Hervé Boutemy hbout...@apache.org
Authored: Sat Nov 8 22:43:09 2014 +0100
Committer: Hervé Boutemy hbout...@apache.org
Committed: Sat Nov 8 22:43:09 2014 +0100
--
.../maven/toolchain/DefaultToolchain.java | 5 +-
.../maven/toolchain/ToolchainManager.java | 2 +-
.../toolchain/java/DefaultJavaToolchain.java| 87
.../maven/toolchain/java/JavaToolchain.java | 2 +-
.../toolchain/java/JavaToolchainFactory.java| 6 +-
.../maven/toolchain/java/JavaToolchainImpl.java | 87
maven-core/src/site/apt/index.apt | 4 +-
.../maven/toolchain/DefaultToolchainTest.java | 6 +-
8 files changed, 100 insertions(+), 99 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven/blob/e661aa87/maven-core/src/main/java/org/apache/maven/toolchain/DefaultToolchain.java
--
diff --git
a/maven-core/src/main/java/org/apache/maven/toolchain/DefaultToolchain.java
b/maven-core/src/main/java/org/apache/maven/toolchain/DefaultToolchain.java
index 65d947c..7c39474 100644
--- a/maven-core/src/main/java/org/apache/maven/toolchain/DefaultToolchain.java
+++ b/maven-core/src/main/java/org/apache/maven/toolchain/DefaultToolchain.java
@@ -27,12 +27,13 @@ import org.apache.maven.toolchain.model.ToolchainModel;
import org.codehaus.plexus.logging.Logger;
/**
- * Default toolchain implementation.
+ * Default abstract toolchain implementation, to be used as base class for any
toolchain implementation
+ * to avoid rewriting usual code.
*
* @author mkleint
* @since 2.0.9
*/
-public abstract class DefaultToolchain
+public abstract class DefaultToolchain // should have been AbstractToolchain...
implements Toolchain, ToolchainPrivate
{
http://git-wip-us.apache.org/repos/asf/maven/blob/e661aa87/maven-core/src/main/java/org/apache/maven/toolchain/ToolchainManager.java
--
diff --git
a/maven-core/src/main/java/org/apache/maven/toolchain/ToolchainManager.java
b/maven-core/src/main/java/org/apache/maven/toolchain/ToolchainManager.java
index ee49b07..2150a19 100644
--- a/maven-core/src/main/java/org/apache/maven/toolchain/ToolchainManager.java
+++ b/maven-core/src/main/java/org/apache/maven/toolchain/ToolchainManager.java
@@ -23,7 +23,7 @@ import org.apache.maven.execution.MavenSession;
/**
- * Public API for a plugin to get a toolchain instance.
+ * Public API for a toolchain-aware plugin to get expected toolchain instance.
*
* @author mkleint
* @since 2.0.9
http://git-wip-us.apache.org/repos/asf/maven/blob/e661aa87/maven-core/src/main/java/org/apache/maven/toolchain/java/DefaultJavaToolchain.java
--
diff --git
a/maven-core/src/main/java/org/apache/maven/toolchain/java/DefaultJavaToolchain.java
b/maven-core/src/main/java/org/apache/maven/toolchain/java/DefaultJavaToolchain.java
deleted file mode 100644
index ee82013..000
---
a/maven-core/src/main/java/org/apache/maven/toolchain/java/DefaultJavaToolchain.java
+++ /dev/null
@@ -1,87 +0,0 @@
-package org.apache.maven.toolchain.java;
-
-/*
- * 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.
- */
-
-import java.io.File;
-
-import org.apache.maven.toolchain.DefaultToolchain;
-import org.apache.maven.toolchain.model.ToolchainModel;
-import org.codehaus.plexus.logging.Logger;
-import org.codehaus.plexus.util.FileUtils;
-import
maven-surefire git commit: (docu) added prerequisites in JUnit 4.7+ parallel and text refactoring
Repository: maven-surefire Updated Branches: refs/heads/master c97303b78 - 4183b3cbf (docu) added prerequisites in JUnit 4.7+ parallel and text refactoring Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/4183b3cb Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/4183b3cb Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/4183b3cb Branch: refs/heads/master Commit: 4183b3cbfd109a9406ccb7e5267eae3a7cc637cf Parents: c97303b Author: tibordigana tibo...@lycos.com Authored: Sat Nov 8 23:56:13 2014 +0100 Committer: tibordigana tibo...@lycos.com Committed: Sat Nov 8 23:56:13 2014 +0100 -- .../fork-options-and-parallel-execution.apt.vm| 18 +- 1 file changed, 13 insertions(+), 5 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4183b3cb/maven-surefire-plugin/src/site/apt/examples/fork-options-and-parallel-execution.apt.vm -- diff --git a/maven-surefire-plugin/src/site/apt/examples/fork-options-and-parallel-execution.apt.vm b/maven-surefire-plugin/src/site/apt/examples/fork-options-and-parallel-execution.apt.vm index aca06ca..6b9d046 100644 --- a/maven-surefire-plugin/src/site/apt/examples/fork-options-and-parallel-execution.apt.vm +++ b/maven-surefire-plugin/src/site/apt/examples/fork-options-and-parallel-execution.apt.vm @@ -47,7 +47,10 @@ Fork Options and Parallel Test Execution values depend on the test provider used. For JUnit 4.7 and onwards, this may be methods, classes, both, suites, suitesAndClasses, suitesAndMethods, classesAndMethods or - all. + all. As a prerequisite in JUnit tests, the JUnit runner should extend + org.junit.runners.ParentRunner. If no runner is specified through the + annotation @org.junit.runner.RunWith, the prerequisite is accomplished. + As of Surefire 2.16, the value both is deprecated but it still can be used and behaves same as classesAndMethods. @@ -117,14 +120,19 @@ Fork Options and Parallel Test Execution @net.jcip.annotations.NotThreadSafe on the Java class of JUnit test (test class, Suite, Parameterized, etc.) in order to execute it in single Thread instance. The Thread has name maven-surefire-plugin@NotThreadSafe. + Just use the dependency net.jcip:jcip-annotations:1.0, or another Artifact - with Apache License com.github.stephenc.jcip:jcip-annotations:1.0-1. This - way parallel execution of tests classes annotated with @NotThreadSafe - are forked in single thread instance (don't mean forked JVM process). + with Apache License com.github.stephenc.jcip:jcip-annotations:1.0-1. + + This way the parallel execution of tests classes annotated with + @NotThreadSafe are forked in single thread instance (don't mean + forked JVM process). + If the Suite or Parameterized is annotated with @NotThreadSafe, the suite classes are executed in single thread. - You can also annotate test class referenced by Suite, and the other + You can also annotate individual test class referenced by Suite, and the other unannotated test classes in the Suite can be subject to run in parallel. + Note: As designed by JUnit runners, the static methods annotated with @BeforeClass and @AfterClass are called in parent thread. Assign classes to the @NotThreadSafe Suite to prevent from this trouble.
svn commit: r1637610 - in /maven/plugins/trunk/maven-toolchains-plugin/src: it/custom-toolchain-plugin/src/main/java/org/apache/maven/plugins/toolchains/its/custom/ site/apt/toolchains/
Author: hboutemy
Date: Sat Nov 8 23:34:05 2014
New Revision: 1637610
URL: http://svn.apache.org/r1637610
Log:
[MTOOLCHAIN-6] added documentation on custom toolchain
Added:
maven/plugins/trunk/maven-toolchains-plugin/src/it/custom-toolchain-plugin/src/main/java/org/apache/maven/plugins/toolchains/its/custom/CustomToolchainImpl.java
- copied, changed from r1637573,
maven/plugins/trunk/maven-toolchains-plugin/src/it/custom-toolchain-plugin/src/main/java/org/apache/maven/plugins/toolchains/its/custom/DefaultCustomToolchain.java
maven/plugins/trunk/maven-toolchains-plugin/src/site/apt/toolchains/custom.apt
(with props)
Removed:
maven/plugins/trunk/maven-toolchains-plugin/src/it/custom-toolchain-plugin/src/main/java/org/apache/maven/plugins/toolchains/its/custom/DefaultCustomToolchain.java
Modified:
maven/plugins/trunk/maven-toolchains-plugin/src/it/custom-toolchain-plugin/src/main/java/org/apache/maven/plugins/toolchains/its/custom/CustomToolchainFactory.java
maven/plugins/trunk/maven-toolchains-plugin/src/site/apt/toolchains/index.apt
Modified:
maven/plugins/trunk/maven-toolchains-plugin/src/it/custom-toolchain-plugin/src/main/java/org/apache/maven/plugins/toolchains/its/custom/CustomToolchainFactory.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-toolchains-plugin/src/it/custom-toolchain-plugin/src/main/java/org/apache/maven/plugins/toolchains/its/custom/CustomToolchainFactory.java?rev=1637610r1=1637609r2=1637610view=diff
==
---
maven/plugins/trunk/maven-toolchains-plugin/src/it/custom-toolchain-plugin/src/main/java/org/apache/maven/plugins/toolchains/its/custom/CustomToolchainFactory.java
(original)
+++
maven/plugins/trunk/maven-toolchains-plugin/src/it/custom-toolchain-plugin/src/main/java/org/apache/maven/plugins/toolchains/its/custom/CustomToolchainFactory.java
Sat Nov 8 23:34:05 2014
@@ -63,7 +63,7 @@ public class CustomToolchainFactory
return null;
}
-DefaultCustomToolchain customToolchain = new DefaultCustomToolchain(
model, logger );
+CustomToolchainImpl customToolchain = new CustomToolchainImpl( model,
logger );
// populate the provides section
Properties provides = getProvidesProperties( model );
@@ -95,11 +95,11 @@ public class CustomToolchainFactory
// populate the configuration section
Properties configuration = toProperties( (Xpp3Dom)
model.getConfiguration() );
-String toolHome = configuration.getProperty(
DefaultCustomToolchain.KEY_TOOLHOME );
+String toolHome = configuration.getProperty(
CustomToolchainImpl.KEY_TOOLHOME );
if ( toolHome == null )
{
throw new MisconfiguredToolchainException( Custom toolchain
without the
-+ DefaultCustomToolchain.KEY_TOOLHOME + configuration
element. );
++ CustomToolchainImpl.KEY_TOOLHOME + configuration element.
);
}
toolHome = FileUtils.normalize( toolHome );
Copied:
maven/plugins/trunk/maven-toolchains-plugin/src/it/custom-toolchain-plugin/src/main/java/org/apache/maven/plugins/toolchains/its/custom/CustomToolchainImpl.java
(from r1637573,
maven/plugins/trunk/maven-toolchains-plugin/src/it/custom-toolchain-plugin/src/main/java/org/apache/maven/plugins/toolchains/its/custom/DefaultCustomToolchain.java)
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-toolchains-plugin/src/it/custom-toolchain-plugin/src/main/java/org/apache/maven/plugins/toolchains/its/custom/CustomToolchainImpl.java?p2=maven/plugins/trunk/maven-toolchains-plugin/src/it/custom-toolchain-plugin/src/main/java/org/apache/maven/plugins/toolchains/its/custom/CustomToolchainImpl.javap1=maven/plugins/trunk/maven-toolchains-plugin/src/it/custom-toolchain-plugin/src/main/java/org/apache/maven/plugins/toolchains/its/custom/DefaultCustomToolchain.javar1=1637573r2=1637610rev=1637610view=diff
==
---
maven/plugins/trunk/maven-toolchains-plugin/src/it/custom-toolchain-plugin/src/main/java/org/apache/maven/plugins/toolchains/its/custom/DefaultCustomToolchain.java
(original)
+++
maven/plugins/trunk/maven-toolchains-plugin/src/it/custom-toolchain-plugin/src/main/java/org/apache/maven/plugins/toolchains/its/custom/CustomToolchainImpl.java
Sat Nov 8 23:34:05 2014
@@ -31,7 +31,7 @@ import org.codehaus.plexus.util.Os;
/**
* @author Hervé Boutemy
*/
-public class DefaultCustomToolchain
+public class CustomToolchainImpl
extends DefaultToolchain
implements CustomToolchain
{
@@ -39,7 +39,7 @@ public class DefaultCustomToolchain
public static final String KEY_TOOLHOME = toolHome;
-public DefaultCustomToolchain( ToolchainModel model, Logger logger )
+public CustomToolchainImpl( ToolchainModel model, Logger logger )
{
super( model, custom, logger );
}
svn commit: r1637616 - in /maven/plugins/trunk/maven-source-plugin: pom.xml src/main/java/org/apache/maven/plugin/source/AbstractSourceJarMojo.java
Author: khmarbaise
Date: Sun Nov 9 00:54:30 2014
New Revision: 1637616
URL: http://svn.apache.org/r1637616
Log:
[MSOURCES-76] Upgrade from maven-plugins version 25 to 26
- Fixed checkstyle reported errors.
Modified:
maven/plugins/trunk/maven-source-plugin/pom.xml
maven/plugins/trunk/maven-source-plugin/src/main/java/org/apache/maven/plugin/source/AbstractSourceJarMojo.java
Modified: maven/plugins/trunk/maven-source-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-source-plugin/pom.xml?rev=1637616r1=1637615r2=1637616view=diff
==
--- maven/plugins/trunk/maven-source-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-source-plugin/pom.xml Sun Nov 9 00:54:30 2014
@@ -25,7 +25,7 @@ under the License.
parent
artifactIdmaven-plugins/artifactId
groupIdorg.apache.maven.plugins/groupId
-version25/version
+version26/version
relativePath../maven-plugins/pom.xml/relativePath
/parent
Modified:
maven/plugins/trunk/maven-source-plugin/src/main/java/org/apache/maven/plugin/source/AbstractSourceJarMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-source-plugin/src/main/java/org/apache/maven/plugin/source/AbstractSourceJarMojo.java?rev=1637616r1=1637615r2=1637616view=diff
==
---
maven/plugins/trunk/maven-source-plugin/src/main/java/org/apache/maven/plugin/source/AbstractSourceJarMojo.java
(original)
+++
maven/plugins/trunk/maven-source-plugin/src/main/java/org/apache/maven/plugin/source/AbstractSourceJarMojo.java
Sun Nov 9 00:54:30 2014
@@ -51,9 +51,9 @@ import org.codehaus.plexus.util.FileUtil
public abstract class AbstractSourceJarMojo
extends AbstractMojo
{
-private static final String[] DEFAULT_INCLUDES = new String[]{ **/* };
+private static final String[] DEFAULT_INCLUDES = new String[] { **/* };
-private static final String[] DEFAULT_EXCLUDES = new String[]{ };
+private static final String[] DEFAULT_EXCLUDES = new String[] {};
/**
* List of files to include. Specified as fileset patterns which are
relative to the input directory whose contents
@@ -84,9 +84,8 @@ public abstract class AbstractSourceJarM
/**
* The Maven Project Object
- *
*/
-@Parameter(defaultValue = ${project}, readonly = true, required = true)
+@Parameter( defaultValue = ${project}, readonly = true, required = true )
protected MavenProject project;
/**
@@ -110,8 +109,9 @@ public abstract class AbstractSourceJarM
*
* @since 2.1
*/
-@Parameter( defaultValue =
${project.build.outputDirectory}/META-INF/MANIFEST.MF, readonly = false,
-required = true )
+// CHECKSTYLE_OFF: LineLength
+@Parameter( defaultValue =
${project.build.outputDirectory}/META-INF/MANIFEST.MF, readonly = false,
required = true )
+// CHECKSTYLE_ON: LineLength
private File defaultManifestFile;
/**
@@ -173,8 +173,8 @@ public abstract class AbstractSourceJarM
protected List reactorProjects;
/**
- * Whether creating the archive should be forced. If set to true, the jar
will
- * always be created. If set to false, the jar will only be created when
the
+ * Whether creating the archive should be forced. If set to true, the jar
will
+ * always be created. If set to false, the jar will only be created when
the
* sources are newer than the jar.
*
* @since 2.1
@@ -196,7 +196,7 @@ public abstract class AbstractSourceJarM
*/
@Parameter( defaultValue = ${session}, readonly = true, required = true )
private MavenSession session;
-
+
// --
// Public methods
// --
@@ -352,7 +352,7 @@ public abstract class AbstractSourceJarM
}
}
-//MAPI: this should be taken from the resources plugin
+// MAPI: this should be taken from the resources plugin
for ( Resource resource : getResources( p ) )
{
svn commit: r928399 - in /websites/production/maven/content: ./ ant-tasks-archives/ ant-tasks/ archetype-archives/ archetype/ archives/maven-1.x/ core-its/ enforcer-archives/ enforcer/ jxr-archives/ j
Author: hboutemy Date: Sat Nov 8 13:41:10 2014 New Revision: 928399 Log: Publishing svnmucc operation to maven site by hboutemy Added: websites/production/maven/content/ - copied from r928398, websites/staging/maven/trunk/content/ websites/production/maven/content/ant-tasks/ - copied from r928398, websites/production/maven/content/ant-tasks/ websites/production/maven/content/ant-tasks-archives/ - copied from r928398, websites/production/maven/content/ant-tasks-archives/ websites/production/maven/content/archetype/ - copied from r928398, websites/production/maven/content/archetype/ websites/production/maven/content/archetype-archives/ - copied from r928398, websites/production/maven/content/archetype-archives/ websites/production/maven/content/archives/maven-1.x/ - copied from r928398, websites/production/maven/content/archives/maven-1.x/ websites/production/maven/content/core-its/ - copied from r928398, websites/production/maven/content/core-its/ websites/production/maven/content/enforcer/ - copied from r928398, websites/production/maven/content/enforcer/ websites/production/maven/content/enforcer-archives/ - copied from r928398, websites/production/maven/content/enforcer-archives/ websites/production/maven/content/jxr/ - copied from r928398, websites/production/maven/content/jxr/ websites/production/maven/content/jxr-archives/ - copied from r928398, websites/production/maven/content/jxr-archives/ websites/production/maven/content/maven-archetype-bundles/ - copied from r928398, websites/production/maven/content/maven-archetype-bundles/ websites/production/maven/content/maven-indexer/ - copied from r928398, websites/production/maven/content/maven-indexer/ websites/production/maven/content/maven-indexer-archives/ - copied from r928398, websites/production/maven/content/maven-indexer-archives/ websites/production/maven/content/maven-release/ - copied from r928398, websites/production/maven/content/maven-release/ websites/production/maven/content/maven-release-archives/ - copied from r928398, websites/production/maven/content/maven-release-archives/ websites/production/maven/content/plugin-testing/ - copied from r928398, websites/production/maven/content/plugin-testing/ websites/production/maven/content/plugin-testing-archives/ - copied from r928398, websites/production/maven/content/plugin-testing-archives/ websites/production/maven/content/plugin-tools/ - copied from r928398, websites/production/maven/content/plugin-tools/ websites/production/maven/content/plugin-tools-archives/ - copied from r928398, websites/production/maven/content/plugin-tools-archives/ websites/production/maven/content/plugins-archives/ - copied from r928398, websites/production/maven/content/plugins-archives/ websites/production/maven/content/plugins/maven-acr-plugin/ - copied from r928398, websites/production/maven/content/plugins/maven-acr-plugin/ websites/production/maven/content/plugins/maven-ant-plugin/ - copied from r928398, websites/production/maven/content/plugins/maven-ant-plugin/ websites/production/maven/content/plugins/maven-antrun-plugin/ - copied from r928398, websites/production/maven/content/plugins/maven-antrun-plugin/ websites/production/maven/content/plugins/maven-assembly-plugin/ - copied from r928398, websites/production/maven/content/plugins/maven-assembly-plugin/ websites/production/maven/content/plugins/maven-changelog-plugin/ - copied from r928398, websites/production/maven/content/plugins/maven-changelog-plugin/ websites/production/maven/content/plugins/maven-changes-plugin/ - copied from r928398, websites/production/maven/content/plugins/maven-changes-plugin/ websites/production/maven/content/plugins/maven-checkstyle-plugin/ - copied from r928398, websites/production/maven/content/plugins/maven-checkstyle-plugin/ websites/production/maven/content/plugins/maven-clean-plugin/ - copied from r928398, websites/production/maven/content/plugins/maven-clean-plugin/ websites/production/maven/content/plugins/maven-compiler-plugin/ - copied from r928398, websites/production/maven/content/plugins/maven-compiler-plugin/ websites/production/maven/content/plugins/maven-dependency-plugin/ - copied from r928398, websites/production/maven/content/plugins/maven-dependency-plugin/ websites/production/maven/content/plugins/maven-deploy-plugin/ - copied from r928398, websites/production/maven/content/plugins/maven-deploy-plugin/ websites/production/maven/content/plugins/maven-doap-plugin/ - copied from r928398, websites/production/maven/content/plugins/maven-doap-plugin/ websites/production/maven/content/plugins/maven-docck-plugin/ - copied from r928398,
