svn commit: r1636790 - in /maven/plugins/trunk/maven-toolchains-plugin/src/it/custom-toolchain/src/main/java/org/apache/maven/plugins/toolchains/its/custom: CustomToolchainFactory.java DefaultCustomTo
Author: hboutemy
Date: Wed Nov 5 01:06:08 2014
New Revision: 1636790
URL: http://svn.apache.org/r1636790
Log:
[MTOOLCHAINS-6] updated sample custom toolchain to be compatible with Maven
2.0.9-3.2.3 and Maven 3.2.4+: see MNG-5718 and MNG-5720
Added:
maven/plugins/trunk/maven-toolchains-plugin/src/it/custom-toolchain/src/main/java/org/apache/maven/plugins/toolchains/its/custom/CustomToolchainFactory.java
- copied, changed from r1636475,
maven/plugins/trunk/maven-toolchains-plugin/src/it/custom-toolchain/src/main/java/org/apache/maven/plugins/toolchains/its/custom/DefaultCustomToolchainFactory.java
Removed:
maven/plugins/trunk/maven-toolchains-plugin/src/it/custom-toolchain/src/main/java/org/apache/maven/plugins/toolchains/its/custom/DefaultCustomToolchainFactory.java
Copied:
maven/plugins/trunk/maven-toolchains-plugin/src/it/custom-toolchain/src/main/java/org/apache/maven/plugins/toolchains/its/custom/CustomToolchainFactory.java
(from r1636475,
maven/plugins/trunk/maven-toolchains-plugin/src/it/custom-toolchain/src/main/java/org/apache/maven/plugins/toolchains/its/custom/DefaultCustomToolchainFactory.java)
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-toolchains-plugin/src/it/custom-toolchain/src/main/java/org/apache/maven/plugins/toolchains/its/custom/CustomToolchainFactory.java?p2=maven/plugins/trunk/maven-toolchains-plugin/src/it/custom-toolchain/src/main/java/org/apache/maven/plugins/toolchains/its/custom/CustomToolchainFactory.java&p1=maven/plugins/trunk/maven-toolchains-plugin/src/it/custom-toolchain/src/main/java/org/apache/maven/plugins/toolchains/its/custom/DefaultCustomToolchainFactory.java&r1=1636475&r2=1636790&rev=1636790&view=diff
==
---
maven/plugins/trunk/maven-toolchains-plugin/src/it/custom-toolchain/src/main/java/org/apache/maven/plugins/toolchains/its/custom/DefaultCustomToolchainFactory.java
(original)
+++
maven/plugins/trunk/maven-toolchains-plugin/src/it/custom-toolchain/src/main/java/org/apache/maven/plugins/toolchains/its/custom/CustomToolchainFactory.java
Wed Nov 5 01:06:08 2014
@@ -19,8 +19,16 @@ package org.apache.maven.plugins.toolcha
* under the License.
*/
+import java.beans.IntrospectionException;
+import java.beans.PropertyDescriptor;
import java.io.File;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.Map;
+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.RequirementMatcherFactory;
import org.apache.maven.toolchain.ToolchainFactory;
@@ -33,21 +41,19 @@ import org.codehaus.plexus.util.FileUtil
import org.codehaus.plexus.util.xml.Xpp3Dom;
/**
+ * Custom toolchain factory, declared as ToolchainFactory Plexus
component with custom
+ * hint.
*
* @author Hervé Boutemy
*/
@Component( role = ToolchainFactory.class, hint = "custom" )
-public class DefaultCustomToolchainFactory
+public class CustomToolchainFactory
implements ToolchainFactory
{
@Requirement
private Logger logger;
-public DefaultCustomToolchainFactory()
-{
-}
-
public ToolchainPrivate createToolchain( ToolchainModel model )
throws MisconfiguredToolchainException
{
@@ -55,39 +61,22 @@ public class DefaultCustomToolchainFacto
{
return null;
}
+
DefaultCustomToolchain customToolchain = new DefaultCustomToolchain(
model, logger );
-Xpp3Dom dom = (Xpp3Dom) model.getConfiguration();
-Xpp3Dom toolHome = dom.getChild( DefaultCustomToolchain.KEY_TOOLHOME );
-if ( toolHome == null )
-{
-throw new MisconfiguredToolchainException( "Custom toolchain
without the "
-+ DefaultCustomToolchain.KEY_TOOLHOME + " configuration
element." );
-}
-File normal = new File( FileUtils.normalize( toolHome.getValue() ) );
-if ( normal.exists() )
-{
-customToolchain.setToolHome( FileUtils.normalize(
toolHome.getValue() ) );
-}
-else
-{
-// for this IT, don't really check the toolHome directory exists...
-// throw new MisconfiguredToolchainException( "Non-existing tool
home configuration at "
-//+ normal.getAbsolutePath() );
-customToolchain.setToolHome( FileUtils.normalize(
toolHome.getValue() ) );
-}
-// now populate the provides section.
-dom = (Xpp3Dom) model.getProvides();
-Xpp3Dom[] provides = dom.getChildren();
-for ( Xpp3Dom provide : provides )
+// populate the provides section
+Properties provides = getModelProperties( model, "provides" );
+
+for ( Map.Entry provide : provides.entrySet() )
{
-String key =
git commit: improved documentation
Repository: maven
Updated Branches:
refs/heads/master aef3b36c0 -> bdf5770f9
improved documentation
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/bdf5770f
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/bdf5770f
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/bdf5770f
Branch: refs/heads/master
Commit: bdf5770f9515ca70749c9ace40de8e8cb01195ae
Parents: aef3b36
Author: Hervé Boutemy
Authored: Wed Nov 5 01:36:24 2014 +0100
Committer: Hervé Boutemy
Committed: Wed Nov 5 01:36:24 2014 +0100
--
maven-core/src/site/apt/index.apt | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven/blob/bdf5770f/maven-core/src/site/apt/index.apt
--
diff --git a/maven-core/src/site/apt/index.apt
b/maven-core/src/site/apt/index.apt
index d847b0d..316f695 100644
--- a/maven-core/src/site/apt/index.apt
+++ b/maven-core/src/site/apt/index.apt
@@ -61,7 +61,7 @@ Maven Core
* {{{./toolchains.html}Toolchains descriptor reference}},
- * <<>> component
({{{./apidocs/org/apache/maven/toolchain/ToolchainManager.html}javadoc}})
+ * public API for toolchains-aware plugins: <<>> component
({{{./apidocs/org/apache/maven/toolchain/ToolchainManager.html}javadoc}})
with its <<>> implementation
({{{./xref/org/apache/maven/toolchain/DefaultToolchainManager.html}source}}),
to get selected <<>>
({{{./apidocs/org/apache/maven/toolchain/Toolchain.html}javadoc}}) instance,
@@ -69,7 +69,7 @@ Maven Core
with its <<>> implementation
({{{./xref/org/apache/maven/toolchain/DefaultToolchainManagerPrivate.html}source}}),
to manage toolchain selection,
- * <<>> interface
({{{./apidocs/org/apache/maven/toolchain/java/JavaToolchain.html}javadoc}}),
+ * internal JDK toolchain implementation: <<>> interface
({{{./apidocs/org/apache/maven/toolchain/java/JavaToolchain.html}javadoc}}),
with its <<>> implementation
({{{./xref/org/apache/maven/toolchain/java/DefaultJavaToolchain.html}source}})
and <<>>
factory
({{{./xref/org/apache/maven/toolchain/java/JavaToolchainFactory.html}source}}).
[3/3] git commit: renamed DefaultJavaToolchainFactory to JavaToolchainFactory to ease understanding: there is no JavaToolchainFactory Plexus component
renamed DefaultJavaToolchainFactory to JavaToolchainFactory to ease
understanding: there is no JavaToolchainFactory Plexus component
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/aef3b36c
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/aef3b36c
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/aef3b36c
Branch: refs/heads/master
Commit: aef3b36c0e56bf9515259ecf492881f59113b97c
Parents: eddfef3
Author: Hervé Boutemy
Authored: Wed Nov 5 01:32:21 2014 +0100
Committer: Hervé Boutemy
Committed: Wed Nov 5 01:32:21 2014 +0100
--
.../java/DefaultJavaToolchainFactory.java | 118 --
.../toolchain/java/JavaToolchainFactory.java| 120 +++
maven-core/src/site/apt/index.apt | 6 +-
3 files changed, 123 insertions(+), 121 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven/blob/aef3b36c/maven-core/src/main/java/org/apache/maven/toolchain/java/DefaultJavaToolchainFactory.java
--
diff --git
a/maven-core/src/main/java/org/apache/maven/toolchain/java/DefaultJavaToolchainFactory.java
b/maven-core/src/main/java/org/apache/maven/toolchain/java/DefaultJavaToolchainFactory.java
deleted file mode 100644
index d95f2fe..000
---
a/maven-core/src/main/java/org/apache/maven/toolchain/java/DefaultJavaToolchainFactory.java
+++ /dev/null
@@ -1,118 +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 java.util.Map.Entry;
-import java.util.Properties;
-
-import org.apache.maven.toolchain.MisconfiguredToolchainException;
-import org.apache.maven.toolchain.RequirementMatcherFactory;
-import org.apache.maven.toolchain.ToolchainFactory;
-import org.apache.maven.toolchain.ToolchainPrivate;
-import org.apache.maven.toolchain.model.ToolchainModel;
-import org.codehaus.plexus.component.annotations.Component;
-import org.codehaus.plexus.component.annotations.Requirement;
-import org.codehaus.plexus.logging.Logger;
-import org.codehaus.plexus.util.FileUtils;
-import org.codehaus.plexus.util.xml.Xpp3Dom;
-
-/**
- * JDK toolchain factory.
- *
- * @author mkleint
- * @since 2.0.9
- */
-@Component( role = ToolchainFactory.class, hint = "jdk" )
-public class DefaultJavaToolchainFactory
-implements ToolchainFactory
-{
-
-@Requirement
-private Logger logger;
-
-public ToolchainPrivate createToolchain( ToolchainModel model )
-throws MisconfiguredToolchainException
-{
-if ( model == null )
-{
-return null;
-}
-
-DefaultJavaToolchain jtc = new DefaultJavaToolchain( model, logger );
-
-// populate the provides section
-Properties provides = model.getProvides();
-for ( Entry 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." );
-}
-
-if ( "version".equals( key ) )
-{
-jtc.addProvideToken( key,
RequirementMatcherFactory.createVersionMatcher( value ) );
-}
-else
-{
-jtc.addProvideToken( key,
RequirementMatcherFactory.createExactMatcher( value ) );
-}
-}
-
-// populate the configuration section
-Xpp3Dom dom = (Xpp3Dom) model.getConfiguration();
-Xpp3Dom javahome = dom.getChild( DefaultJavaToolchain.KEY_JAVAHOME );
-if ( javahome == null )
-{
-throw new MisconfiguredToolchainException( "Java toolchain without
the "
-+ DefaultJavaToolchain.KEY_JAVAHOME + " configuration
element." );
-}
-File normal = new File( FileUtils.normalize( javahome.getValue() ) );
-
[2/3] git commit: improved javadoc
improved javadoc
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/eddfef33
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/eddfef33
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/eddfef33
Branch: refs/heads/master
Commit: eddfef33942d483136d547452c63a2d98665d718
Parents: b8d220c
Author: Hervé Boutemy
Authored: Wed Nov 5 01:24:32 2014 +0100
Committer: Hervé Boutemy
Committed: Wed Nov 5 01:24:32 2014 +0100
--
.../java/org/apache/maven/toolchain/DefaultToolchain.java | 1 +
.../src/main/java/org/apache/maven/toolchain/Toolchain.java | 7 +++
.../java/org/apache/maven/toolchain/ToolchainFactory.java | 5 +++--
.../java/org/apache/maven/toolchain/ToolchainManager.java | 3 ++-
.../org/apache/maven/toolchain/java/DefaultJavaToolchain.java | 2 ++
.../java/org/apache/maven/toolchain/java/JavaToolchain.java | 2 ++
6 files changed, 17 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven/blob/eddfef33/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 8196246..65d947c 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,6 +27,7 @@ import org.apache.maven.toolchain.model.ToolchainModel;
import org.codehaus.plexus.logging.Logger;
/**
+ * Default toolchain implementation.
*
* @author mkleint
* @since 2.0.9
http://git-wip-us.apache.org/repos/asf/maven/blob/eddfef33/maven-core/src/main/java/org/apache/maven/toolchain/Toolchain.java
--
diff --git a/maven-core/src/main/java/org/apache/maven/toolchain/Toolchain.java
b/maven-core/src/main/java/org/apache/maven/toolchain/Toolchain.java
index 5e99b0a..c6c6ebf 100644
--- a/maven-core/src/main/java/org/apache/maven/toolchain/Toolchain.java
+++ b/maven-core/src/main/java/org/apache/maven/toolchain/Toolchain.java
@@ -20,6 +20,8 @@ package org.apache.maven.toolchain;
*/
/**
+ * Toolchain interface.
+ *
* @author Milos Kleint
* @author Jason van Zyl
* @since 2.0.9
@@ -27,6 +29,11 @@ package org.apache.maven.toolchain;
public interface Toolchain
{
+/**
+ * get the type of toolchain.
+ *
+ * @return the toolchain type
+ */
String getType();
/**
http://git-wip-us.apache.org/repos/asf/maven/blob/eddfef33/maven-core/src/main/java/org/apache/maven/toolchain/ToolchainFactory.java
--
diff --git
a/maven-core/src/main/java/org/apache/maven/toolchain/ToolchainFactory.java
b/maven-core/src/main/java/org/apache/maven/toolchain/ToolchainFactory.java
index a187f96..c1c2aa9 100644
--- a/maven-core/src/main/java/org/apache/maven/toolchain/ToolchainFactory.java
+++ b/maven-core/src/main/java/org/apache/maven/toolchain/ToolchainFactory.java
@@ -22,7 +22,8 @@ package org.apache.maven.toolchain;
import org.apache.maven.toolchain.model.ToolchainModel;
/**
- *
+ * Internal toolchain factory, to prepare toolchains instances.
+ *
* @author mkleint
* @since 2.0.9
*/
@@ -35,7 +36,7 @@ public interface ToolchainFactory
throws MisconfiguredToolchainException;
/**
- * Returns the default instance of the particular type of toolchain, can
return null
+ * Returns the default instance of the particular type of toolchain, can
return null
* if not applicable.
* TODO keep around??
**/
http://git-wip-us.apache.org/repos/asf/maven/blob/eddfef33/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 6b8acf5..ee49b07 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,8 @@ import org.apache.maven.execution.MavenSession;
/**
- *
+ * Public API for a plugin to get a toolchain instance.
+ *
* @author mkleint
* @since 2.0.9
*/
http://git-wip-us.apache.org/repos/asf/maven/blob/eddfef33/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.ja
[1/3] git commit: prepare provides before configuration, to follown descriptor logic
Repository: maven
Updated Branches:
refs/heads/master 44174308a -> aef3b36c0
prepare provides before configuration, to follown descriptor logic
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/b8d220c6
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/b8d220c6
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/b8d220c6
Branch: refs/heads/master
Commit: b8d220c686ca6a5b8eeed4697ff39d10f9fb0128
Parents: 4417430
Author: Hervé Boutemy
Authored: Wed Nov 5 01:23:26 2014 +0100
Committer: Hervé Boutemy
Committed: Wed Nov 5 01:23:26 2014 +0100
--
.../java/DefaultJavaToolchainFactory.java | 49 +++-
1 file changed, 26 insertions(+), 23 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven/blob/b8d220c6/maven-core/src/main/java/org/apache/maven/toolchain/java/DefaultJavaToolchainFactory.java
--
diff --git
a/maven-core/src/main/java/org/apache/maven/toolchain/java/DefaultJavaToolchainFactory.java
b/maven-core/src/main/java/org/apache/maven/toolchain/java/DefaultJavaToolchainFactory.java
index 3a9d213..d95f2fe 100644
---
a/maven-core/src/main/java/org/apache/maven/toolchain/java/DefaultJavaToolchainFactory.java
+++
b/maven-core/src/main/java/org/apache/maven/toolchain/java/DefaultJavaToolchainFactory.java
@@ -35,7 +35,8 @@ import org.codehaus.plexus.util.FileUtils;
import org.codehaus.plexus.util.xml.Xpp3Dom;
/**
- *
+ * JDK toolchain factory.
+ *
* @author mkleint
* @since 2.0.9
*/
@@ -47,10 +48,6 @@ public class DefaultJavaToolchainFactory
@Requirement
private Logger logger;
-public DefaultJavaToolchainFactory()
-{
-}
-
public ToolchainPrivate createToolchain( ToolchainModel model )
throws MisconfiguredToolchainException
{
@@ -58,36 +55,22 @@ public class DefaultJavaToolchainFactory
{
return null;
}
+
DefaultJavaToolchain jtc = new DefaultJavaToolchain( model, logger );
-Xpp3Dom dom = (Xpp3Dom) model.getConfiguration();
-Xpp3Dom javahome = dom.getChild( DefaultJavaToolchain.KEY_JAVAHOME );
-if ( javahome == null )
-{
-throw new MisconfiguredToolchainException( "Java toolchain without
the "
-+ DefaultJavaToolchain.KEY_JAVAHOME + " configuration
element." );
-}
-File normal = new File( FileUtils.normalize( javahome.getValue() ) );
-if ( normal.exists() )
-{
-jtc.setJavaHome( FileUtils.normalize( javahome.getValue() ) );
-}
-else
-{
-throw new MisconfiguredToolchainException( "Non-existing JDK home
configuration at "
-+ normal.getAbsolutePath() );
-}
-//now populate the provides section.
+// populate the provides section
Properties provides = model.getProvides();
for ( Entry 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." );
}
+
if ( "version".equals( key ) )
{
jtc.addProvideToken( key,
RequirementMatcherFactory.createVersionMatcher( value ) );
@@ -97,6 +80,26 @@ public class DefaultJavaToolchainFactory
jtc.addProvideToken( key,
RequirementMatcherFactory.createExactMatcher( value ) );
}
}
+
+// populate the configuration section
+Xpp3Dom dom = (Xpp3Dom) model.getConfiguration();
+Xpp3Dom javahome = dom.getChild( DefaultJavaToolchain.KEY_JAVAHOME );
+if ( javahome == null )
+{
+throw new MisconfiguredToolchainException( "Java toolchain without
the "
++ DefaultJavaToolchain.KEY_JAVAHOME + " configuration
element." );
+}
+File normal = new File( FileUtils.normalize( javahome.getValue() ) );
+if ( normal.exists() )
+{
+jtc.setJavaHome( FileUtils.normalize( javahome.getValue() ) );
+}
+else
+{
+throw new MisconfiguredToolchainException( "Non-existing JDK home
configuration at "
++ normal.getAbsolutePath() );
+}
+
return jtc;
}
svn commit: r1636726 - in /maven/plugins/trunk/maven-jar-plugin: pom.xml src/main/java/org/apache/maven/plugin/jar/AbstractJarMojo.java src/main/java/org/apache/maven/plugin/jar/TestJarMojo.java
Author: khmarbaise
Date: Tue Nov 4 20:11:52 2014
New Revision: 1636726
URL: http://svn.apache.org/r1636726
Log:
[MJAR-190] Upgrade to maven-plugins version 25 to 26
- Upgrade maven-plugins from 25 to 26.
- Cleaned up pom file.
- Fixed formatting issues.
Modified:
maven/plugins/trunk/maven-jar-plugin/pom.xml
maven/plugins/trunk/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar/AbstractJarMojo.java
maven/plugins/trunk/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar/TestJarMojo.java
Modified: maven/plugins/trunk/maven-jar-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jar-plugin/pom.xml?rev=1636726&r1=1636725&r2=1636726&view=diff
==
--- maven/plugins/trunk/maven-jar-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-jar-plugin/pom.xml Tue Nov 4 20:11:52 2014
@@ -25,7 +25,7 @@ under the License.
maven-plugins
org.apache.maven.plugins
-25
+26
../maven-plugins/pom.xml
@@ -72,7 +72,7 @@ under the License.
2.6
2.2.1
-3.2
+3.3
@@ -137,22 +137,6 @@ under the License.
- org.apache.maven.plugins
- maven-plugin-plugin
- ${mavenPluginPluginVersion}
-
-true
-
-
-
- mojo-descriptor
-
-descriptor
-
-
-
-
-
org.apache.rat
apache-rat-plugin
Modified:
maven/plugins/trunk/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar/AbstractJarMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar/AbstractJarMojo.java?rev=1636726&r1=1636725&r2=1636726&view=diff
==
---
maven/plugins/trunk/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar/AbstractJarMojo.java
(original)
+++
maven/plugins/trunk/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar/AbstractJarMojo.java
Tue Nov 4 20:11:52 2014
@@ -242,7 +242,7 @@ public abstract class AbstractJarMojo
public void execute()
throws MojoExecutionException
{
-if ( skipIfEmpty && (!getClassesDirectory().exists() ||
getClassesDirectory().list().length < 1 ) )
+if ( skipIfEmpty && ( !getClassesDirectory().exists() ||
getClassesDirectory().list().length < 1 ) )
{
getLog().info( "Skipping packaging of the " + getType() );
}
Modified:
maven/plugins/trunk/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar/TestJarMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar/TestJarMojo.java?rev=1636726&r1=1636725&r2=1636726&view=diff
==
---
maven/plugins/trunk/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar/TestJarMojo.java
(original)
+++
maven/plugins/trunk/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar/TestJarMojo.java
Tue Nov 4 20:11:52 2014
@@ -72,7 +72,7 @@ public class TestJarMojo
return testClassesDirectory;
}
- public void execute()
+public void execute()
throws MojoExecutionException
{
if ( skip )
svn commit: r1636729 - /maven/site/trunk/content/apt/plugins/index.apt
Author: agudian
Date: Tue Nov 4 20:45:59 2014
New Revision: 1636729
URL: http://svn.apache.org/r1636729
Log:
Surefire 2.18 release
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=1636729&r1=1636728&r2=1636729&view=diff
==
--- maven/site/trunk/content/apt/plugins/index.apt (original)
+++ maven/site/trunk/content/apt/plugins/index.apt Tue Nov 4 20:45:59 2014
@@ -8,7 +8,7 @@
Benson Margulies
Karl-Heinz Marbaise
-
- 2014-09-28
+ 2014-11-04
-
~~ Licensed to the Apache Software Foundation (ASF) under one
@@ -73,7 +73,7 @@ Available Plugins
*--++--++--+++
| {{{/plugins/maven-deploy-plugin/} <<>>}} | B |
2.8.2| 2014-08-27 | Deploy the built artifact to the remote repository.
|
{{{http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-deploy-plugin}SVN}}
| {{{http://jira.codehaus.org/browse/MDEPLOY}JIRA}}
*--++--++--+++
-| {{{/surefire/maven-failsafe-plugin/} <<>>}}| B |
2.17 | 2014-03-16 | Run the JUnit integration tests in an isolated
classloader. |
{{{https://git-wip-us.apache.org/repos/asf/maven-surefire.git}GIT}} |
{{{http://jira.codehaus.org/browse/SUREFIRE}JIRA}}
+| {{{/surefire/maven-failsafe-plugin/} <<>>}}| B |
2.18 | 2014-11-04 | Run the JUnit integration tests in an isolated
classloader. |
{{{https://git-wip-us.apache.org/repos/asf/maven-surefire.git}GIT}} |
{{{http://jira.codehaus.org/browse/SUREFIRE}JIRA}}
*--++--++--+++
| {{{/plugins/maven-install-plugin/} <<>>}} | B |
2.5.2| 2014-08-27 | Install the built artifact into the local
repository. |
{{{http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-install-plugin}SVN}}
| {{{http://jira.codehaus.org/browse/MINSTALL}JIRA}}
*--++--++--+++
@@ -81,7 +81,7 @@ Available Plugins
*--++--++--+++
| {{{/plugins/maven-site-plugin/} <<>>}} | B |
3.4 | 2014-07-07 | Generate a site for the current project. |
{{{http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-site-plugin/}SVN}}
| {{{http://jira.codehaus.org/browse/MSITE}JIRA}}
*--++--++--+++
-| {{{/surefire/maven-surefire-plugin/} <<>>}}| B |
2.17 | 2014-03-16 | Run the JUnit unit tests in an isolated
classloader. |
{{{https://git-wip-us.apache.org/repos/asf/maven-surefire.git}GIT}} |
{{{http://jira.codehaus.org/browse/SUREFIRE}JIRA}}
+| {{{/surefire/maven-surefire-plugin/} <<>>}}| B |
2.18 | 2014-11-04 | Run the JUnit unit tests in an isolated
classloader. |
{{{https://git-wip-us.apache.org/repos/asf/maven-surefire.git}GIT}} |
{{{http://jira.codehaus.org/browse/SUREFIRE}JIRA}}
*--++--++--+++
| {{{/plugins/maven-verifier-plugin/} <<>>}} | B |
1.0 | 2010-01-30 | Useful for integration tests - verifies the
existence of certain conditions. |
{{{http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-verifier-plugin}SVN}}
| {{{http://jira.codehaus.org/browse/MVERIFIER}JIRA}}
*--++--++--+++
@@ -125,7 +125,7 @@ Available Plugins
*--++--++--+++
| {{{/plugins/maven-project-info-reports-plugin/} <<>>}}
| R | 2.7 | 2013-05-16 | 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: r927935 [3/4] - in /websites/staging/maven/trunk/content: ./ apache-resource-bundles/ archives/maven-2.x/ background/ developers/ developers/conventions/ developers/release/ developers/web
Modified: websites/staging/maven/trunk/content/guides/mini/guide-bash-m2-completion.html == --- websites/staging/maven/trunk/content/guides/mini/guide-bash-m2-completion.html (original) +++ websites/staging/maven/trunk/content/guides/mini/guide-bash-m2-completion.html Tue Nov 4 19:59:11 2014 @@ -1,6 +1,6 @@ http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";> http://www.w3.org/1999/xhtml";> @@ -15,7 +15,7 @@ - + http://www.google-analytics.com/urchin.js"; type="text/javascript"> @@ -45,7 +45,7 @@ Jason van Zyl" /> Guide to Maven 2.x auto completion using BASH -Last Published: 2014-11-03 +Last Published: 2014-11-04 Modified: websites/staging/maven/trunk/content/guides/mini/guide-building-for-different-environments.html == --- websites/staging/maven/trunk/content/guides/mini/guide-building-for-different-environments.html (original) +++ websites/staging/maven/trunk/content/guides/mini/guide-building-for-different-environments.html Tue Nov 4 19:59:11 2014 @@ -1,6 +1,6 @@ http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";> http://www.w3.org/1999/xhtml";> @@ -14,7 +14,7 @@ - + http://www.google-analytics.com/urchin.js"; type="text/javascript"> @@ -44,7 +44,7 @@ Building For Different Environments with Maven 2 -Last Published: 2014-11-03 +Last Published: 2014-11-04 Modified: websites/staging/maven/trunk/content/guides/mini/guide-building-jdk14-on-jdk15.html == --- websites/staging/maven/trunk/content/guides/mini/guide-building-jdk14-on-jdk15.html (original) +++ websites/staging/maven/trunk/content/guides/mini/guide-building-jdk14-on-jdk15.html Tue Nov 4 19:59:11 2014 @@ -1,6 +1,6 @@ http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";> http://www.w3.org/1999/xhtml";> @@ -14,7 +14,7 @@ - + http://www.google-analytics.com/urchin.js"; type="text/javascript"> @@ -44,7 +44,7 @@ Guide to Building JDK 1.4 Projects Using JDK 1.5 -Last Published: 2014-11-03 +Last Published: 2014-11-04 Modified: websites/staging/maven/trunk/content/guides/mini/guide-central-repository-upload.html == --- websites/staging/maven/trunk/content/guides/mini/guide-central-repository-upload.html (original) +++ websites/staging/maven/trunk/content/guides/mini/guide-central-repository-upload.html Tue Nov 4 19:59:11 2014 @@ -1,6 +1,6 @@ http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";> http://www.w3.org/1999/xhtml";> @@ -15,7 +15,7 @@ - + http://www.google-analytics.com/urchin.js"; type="text/javascript"> @@ -45,7 +45,7 @@ Brian Fox" /> Guide to uploading artifacts to the Central Repository -Last Published: 2014-11-03 +Last Published: 2014-11-04 Modified: websites/staging/maven/trunk/content/guides/mini/guide-configuring-maven.html == --- websites/staging/maven/trunk/content/guides/mini/guide-configuring-maven.html (original) +++ websites/staging/maven/trunk/content/guides/mini/guide-configuring-maven.html Tue Nov 4 19:59:11 2014 @@ -1,6 +1,6 @@ http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";> http://www.w3.org/1999/xhtml";> @@ -14,7 +14,7 @@ - + http://www.google-analytics.com/urchin.js"; type="text/javascript"> @@ -44,7 +44,7 @@ Guide to Configuring Maven -Last Published: 2014-11-03 +Last Published: 2014-11-04 Modified: websites/staging/maven/trunk/content/guides/mini/guide-configuring-plugins.html == --- websites/stagi
svn commit: r927935 [1/4] - in /websites/staging/maven/trunk/content: ./ apache-resource-bundles/ archives/maven-2.x/ background/ developers/ developers/conventions/ developers/release/ developers/web
Author: buildbot Date: Tue Nov 4 19:59:11 2014 New Revision: 927935 Log: Staging update by buildbot for maven Modified: websites/staging/maven/trunk/content/ (props changed) websites/staging/maven/trunk/content/about.html websites/staging/maven/trunk/content/apache-resource-bundles/index.html websites/staging/maven/trunk/content/archives/maven-2.x/index.html websites/staging/maven/trunk/content/articles.html websites/staging/maven/trunk/content/background/history-of-maven.html websites/staging/maven/trunk/content/background/philosophy-of-maven.html websites/staging/maven/trunk/content/benefits-of-using-maven.html websites/staging/maven/trunk/content/code-quality-management.html websites/staging/maven/trunk/content/community.html websites/staging/maven/trunk/content/continuous-integration.html websites/staging/maven/trunk/content/developers/committer-environment.html websites/staging/maven/trunk/content/developers/committer-settings.html websites/staging/maven/trunk/content/developers/conventions/code.html websites/staging/maven/trunk/content/developers/conventions/git.html websites/staging/maven/trunk/content/developers/conventions/jira.html websites/staging/maven/trunk/content/developers/conventions/svn.html websites/staging/maven/trunk/content/developers/dependency-policies.html websites/staging/maven/trunk/content/developers/index.html websites/staging/maven/trunk/content/developers/java5.html websites/staging/maven/trunk/content/developers/mojo-api-specification.html websites/staging/maven/trunk/content/developers/release/index.html websites/staging/maven/trunk/content/developers/release/maven-core-release.html websites/staging/maven/trunk/content/developers/release/maven-project-release-procedure.html websites/staging/maven/trunk/content/developers/release/parent-pom-release.html websites/staging/maven/trunk/content/developers/release/pmc-gpg-keys.html websites/staging/maven/trunk/content/developers/retirement-plan-plugins.html websites/staging/maven/trunk/content/developers/website/deploy-component-reference-documentation.html websites/staging/maven/trunk/content/developers/website/deploy-maven-website.html websites/staging/maven/trunk/content/developers/website/index.html websites/staging/maven/trunk/content/developers/website/website-overview.html websites/staging/maven/trunk/content/developers/welcome-to-new-committers.html websites/staging/maven/trunk/content/docs-required.html websites/staging/maven/trunk/content/docs/2.0.1/release-notes.html websites/staging/maven/trunk/content/docs/2.0.10/release-notes.html websites/staging/maven/trunk/content/docs/2.0.11/release-notes.html websites/staging/maven/trunk/content/docs/2.0.2/release-notes.html websites/staging/maven/trunk/content/docs/2.0.3/release-notes.html websites/staging/maven/trunk/content/docs/2.0.4/release-notes.html websites/staging/maven/trunk/content/docs/2.0.5/release-notes.html websites/staging/maven/trunk/content/docs/2.0.6/release-notes.html websites/staging/maven/trunk/content/docs/2.0.7/release-notes.html websites/staging/maven/trunk/content/docs/2.0.8/release-notes.html websites/staging/maven/trunk/content/docs/2.0.9/release-notes.html websites/staging/maven/trunk/content/docs/2.0/release-notes.html websites/staging/maven/trunk/content/docs/2.1.0/release-notes.html websites/staging/maven/trunk/content/docs/2.2.0/release-notes.html websites/staging/maven/trunk/content/docs/2.2.1/release-notes.html websites/staging/maven/trunk/content/docs/3.0-alpha-3/release-notes.html websites/staging/maven/trunk/content/docs/3.0-alpha-4/release-notes.html websites/staging/maven/trunk/content/docs/3.0-alpha-5/release-notes.html websites/staging/maven/trunk/content/docs/3.0-alpha-6/release-notes.html websites/staging/maven/trunk/content/docs/3.0-alpha-7/release-notes.html websites/staging/maven/trunk/content/docs/3.0-beta-1/release-notes.html websites/staging/maven/trunk/content/docs/3.0-beta-2/release-notes.html websites/staging/maven/trunk/content/docs/3.0-beta-3/release-notes.html websites/staging/maven/trunk/content/docs/3.0.1/release-notes.html websites/staging/maven/trunk/content/docs/3.0.2/release-notes.html websites/staging/maven/trunk/content/docs/3.0.3/release-notes.html websites/staging/maven/trunk/content/docs/3.0.4/release-notes.html websites/staging/maven/trunk/content/docs/3.0.5/release-notes.html websites/staging/maven/trunk/content/docs/3.0/release-notes.html websites/staging/maven/trunk/content/docs/3.1.0-alpha-1/release-notes.html websites/staging/maven/trunk/content/docs/3.1.0/release-notes.html websites/staging/maven/trunk/content/docs/3.1.1/release-notes.html websites/staging/maven/trunk/content/docs/3.2.1/release-notes.html websites/staging/maven/tru
svn commit: r1636711 - /maven/site/trunk/content/apt/guides/mini/guide-using-toolchains.apt
Author: rfscholte
Date: Tue Nov 4 19:58:26 2014
New Revision: 1636711
URL: http://svn.apache.org/r1636711
Log:
No reason to shout
Modified:
maven/site/trunk/content/apt/guides/mini/guide-using-toolchains.apt
Modified: maven/site/trunk/content/apt/guides/mini/guide-using-toolchains.apt
URL:
http://svn.apache.org/viewvc/maven/site/trunk/content/apt/guides/mini/guide-using-toolchains.apt?rev=1636711&r1=1636710&r2=1636711&view=diff
==
--- maven/site/trunk/content/apt/guides/mini/guide-using-toolchains.apt
(original)
+++ maven/site/trunk/content/apt/guides/mini/guide-using-toolchains.apt Tue Nov
4 19:58:26 2014
@@ -58,17 +58,17 @@ Guide to Using Toolchains
*--+-++
| <<<{{{/plugins/maven-surefire-plugin/}maven-surefire-plugin}}>>>
| 2.5 | Apache Maven
*--+-++
-|
<<<{{{http://mojo.codehaus.org/animal-sniffer-maven-plugin/}animal-sniffer-maven-plugin}}>>>
| 1.3 | Codehaus MOJO
+|
<<<{{{http://mojo.codehaus.org/animal-sniffer-maven-plugin/}animal-sniffer-maven-plugin}}>>>
| 1.3 | Codehaus Mojo
*--+-++
-|
<<<{{{http://mojo.codehaus.org/cassandra-maven-plugin/}cassandra-maven-plugin}}>>>
| 0.7.0-1 | Codehaus MOJO
+|
<<<{{{http://mojo.codehaus.org/cassandra-maven-plugin/}cassandra-maven-plugin}}>>>
| 0.7.0-1 | Codehaus Mojo
*--+-++
-| <<<{{{http://mojo.codehaus.org/exec-maven-plugin/}exec-maven-plugin}}>>>
| 1.1.1 | Codehaus MOJO
+| <<<{{{http://mojo.codehaus.org/exec-maven-plugin/}exec-maven-plugin}}>>>
| 1.1.1 | Codehaus Mojo
*--+-++
-|
<<<{{{http://mojo.codehaus.org/jasperreports-maven-plugin/}jasperreports-maven-plugin}}>>>
| 1.0-beta-3-SNAPSHOT | Codehaus MOJO
+|
<<<{{{http://mojo.codehaus.org/jasperreports-maven-plugin/}jasperreports-maven-plugin}}>>>
| 1.0-beta-3-SNAPSHOT | Codehaus Mojo
*--+-++
-| <<<{{{http://mojo.codehaus.org/jdiff-maven-plugin/}jdiff-maven-plugin}}>>>
| 1.0-beta-1-SNAPSHOT | Codehaus MOJO
+| <<<{{{http://mojo.codehaus.org/jdiff-maven-plugin/}jdiff-maven-plugin}}>>>
| 1.0-beta-1-SNAPSHOT | Codehaus Mojo
*--+-++
-|
<<<{{{http://mojo.codehaus.org/keytool-maven-plugin/}keytool-maven-plugin}}>>>
| 1.4 | Codehaus MOJO
+|
<<<{{{http://mojo.codehaus.org/keytool-maven-plugin/}keytool-maven-plugin}}>>>
| 1.4 | Codehaus Mojo
*--+-++
* Using Toolchains in Your Project
svn commit: r1636704 - /maven/plugins/trunk/maven-ear-plugin/pom.xml
Author: khmarbaise
Date: Tue Nov 4 19:51:38 2014
New Revision: 1636704
URL: http://svn.apache.org/r1636704
Log:
[MEAR-202] Upgrade to maven-plugins version 25 to 26
- Cleanup pom according to the update.
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=1636704&r1=1636703&r2=1636704&view=diff
==
--- maven/plugins/trunk/maven-ear-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-ear-plugin/pom.xml Tue Nov 4 19:51:38 2014
@@ -159,14 +159,6 @@ under the License.
- org.apache.maven.plugins
- maven-plugin-plugin
- ${mavenPluginVersion}
-
-true
-
-
-
org.apache.rat
apache-rat-plugin
@@ -197,21 +189,6 @@ under the License.
-org.apache.maven.plugins
-maven-plugin-plugin
-
- true
-
-
-
-generate-descriptor
-
- descriptor
-
-
-
-
-
maven-surefire-plugin
svn commit: r1636695 - /maven/plugins/trunk/maven-war-plugin/pom.xml
Author: khmarbaise Date: Tue Nov 4 19:38:32 2014 New Revision: 1636695 URL: http://svn.apache.org/r1636695 Log: - Removed unused property. 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=1636695&r1=1636694&r2=1636695&view=diff == --- maven/plugins/trunk/maven-war-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-war-plugin/pom.xml Tue Nov 4 19:38:32 2014 @@ -60,7 +60,6 @@ under the License. 2.6 1.3 2.2.1 -3.2
svn commit: r1636694 - /maven/plugins/trunk/maven-war-plugin/pom.xml
Author: khmarbaise Date: Tue Nov 4 19:32:25 2014 New Revision: 1636694 URL: http://svn.apache.org/r1636694 Log: - Removed FIXME from pom.xml. 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=1636694&r1=1636693&r2=1636694&view=diff == --- maven/plugins/trunk/maven-war-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-war-plugin/pom.xml Tue Nov 4 19:32:25 2014 @@ -116,7 +116,6 @@ under the License. maven-plugin-annotations provided - org.codehaus.plexus plexus-io
svn commit: r1636692 - /maven/enforcer/trunk/pom.xml
Author: khmarbaise Date: Tue Nov 4 19:19:08 2014 New Revision: 1636692 URL: http://svn.apache.org/r1636692 Log: [MENFORCER-212] Upgrade maven-plugin-plugin from 3.2 to 3.3 Modified: maven/enforcer/trunk/pom.xml Modified: maven/enforcer/trunk/pom.xml URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/pom.xml?rev=1636692&r1=1636691&r2=1636692&view=diff == --- maven/enforcer/trunk/pom.xml (original) +++ maven/enforcer/trunk/pom.xml Tue Nov 4 19:19:08 2014 @@ -141,7 +141,7 @@ 2.2.1 -3.2 +3.3 enforcer-archives/enforcer-LATEST
svn commit: r1636691 - /maven/plugins/trunk/maven-ear-plugin/pom.xml
Author: khmarbaise Date: Tue Nov 4 19:00:05 2014 New Revision: 1636691 URL: http://svn.apache.org/r1636691 Log: [MEAR-202] Upgrade to maven-plugins version 25 to 26 - Added excludes for har, sar types which seemed to be causing problems. 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=1636691&r1=1636690&r2=1636691&view=diff == --- maven/plugins/trunk/maven-ear-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-ear-plugin/pom.xml Tue Nov 4 19:00:05 2014 @@ -177,6 +177,11 @@ under the License. src/test/resources/projects/project-015/src/main/application/META-INF/MANIFEST.MF 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 + src/test/resources/dtd/application_1_3.dtd
svn commit: r1636538 - /maven/plugins/trunk/maven-assembly-plugin/pom.xml
Author: krosenvold Date: Tue Nov 4 10:52:26 2014 New Revision: 1636538 URL: http://svn.apache.org/r1636538 Log: [maven-release-plugin] prepare release maven-assembly-plugin-2.5.1 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=1636538&r1=1636537&r2=1636538&view=diff == --- maven/plugins/trunk/maven-assembly-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-assembly-plugin/pom.xml Tue Nov 4 10:52:26 2014 @@ -30,7 +30,7 @@ under the License. maven-assembly-plugin - 2.5.2-SNAPSHOT + 2.5.1 maven-plugin Apache Maven Assembly Plugin @@ -41,9 +41,9 @@ under the License. - scm:svn:http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-assembly-plugin/ - scm:svn:https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-assembly-plugin/ - http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/ + scm:svn:http://svn.apache.org/repos/asf/maven/plugins/tags/maven-assembly-plugin-2.5.1 + scm:svn:https://svn.apache.org/repos/asf/maven/plugins/tags/maven-assembly-plugin-2.5.1 + http://svn.apache.org/viewvc/maven/plugins/tags/maven-assembly-plugin-2.5.1 jira
svn commit: r1636539 - /maven/plugins/tags/maven-assembly-plugin-2.5.1/
Author: krosenvold Date: Tue Nov 4 10:52:38 2014 New Revision: 1636539 URL: http://svn.apache.org/r1636539 Log: [maven-release-plugin] copy for tag maven-assembly-plugin-2.5.1 Added: maven/plugins/tags/maven-assembly-plugin-2.5.1/ (props changed) - copied from r1636538, maven/plugins/trunk/maven-assembly-plugin/ Propchange: maven/plugins/tags/maven-assembly-plugin-2.5.1/ -- bugtraq:logregex = MASSEMBLY-\d+ Propchange: maven/plugins/tags/maven-assembly-plugin-2.5.1/ -- bugtraq:url = http://jira.codehaus.org/browse/%BUGID% Propchange: maven/plugins/tags/maven-assembly-plugin-2.5.1/ -- bugtraq:warnifnoissue = false Propchange: maven/plugins/tags/maven-assembly-plugin-2.5.1/ -- --- svn:ignore (added) +++ svn:ignore Tue Nov 4 10:52:38 2014 @@ -0,0 +1,14 @@ +MAVEN_ENV +target +cobertura.ser +*~ +*.log +.classpath +.project +*.ipr +*.iws +*.iml +.wtpmodules +bin +.settings +.idea Propchange: maven/plugins/tags/maven-assembly-plugin-2.5.1/ -- --- svn:mergeinfo (added) +++ svn:mergeinfo Tue Nov 4 10:52:38 2014 @@ -0,0 +1 @@ +/maven/plugins/branches/maven-assembly-plugin-2.2-beta-4:773752-780691
svn commit: r1636540 - /maven/plugins/trunk/maven-assembly-plugin/pom.xml
Author: krosenvold Date: Tue Nov 4 10:52:42 2014 New Revision: 1636540 URL: http://svn.apache.org/r1636540 Log: [maven-release-plugin] prepare for next development iteration 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=1636540&r1=1636539&r2=1636540&view=diff == --- maven/plugins/trunk/maven-assembly-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-assembly-plugin/pom.xml Tue Nov 4 10:52:42 2014 @@ -30,7 +30,7 @@ under the License. maven-assembly-plugin - 2.5.1 + 2.6-SNAPSHOT maven-plugin Apache Maven Assembly Plugin @@ -41,9 +41,9 @@ under the License. - scm:svn:http://svn.apache.org/repos/asf/maven/plugins/tags/maven-assembly-plugin-2.5.1 - scm:svn:https://svn.apache.org/repos/asf/maven/plugins/tags/maven-assembly-plugin-2.5.1 - http://svn.apache.org/viewvc/maven/plugins/tags/maven-assembly-plugin-2.5.1 + scm:svn:http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-assembly-plugin/ + scm:svn:https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-assembly-plugin/ + http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/ jira
svn commit: r1636536 - /maven/plugins/tags/maven-assembly-plugin-2.5.1/
Author: krosenvold Date: Tue Nov 4 10:46:13 2014 New Revision: 1636536 URL: http://svn.apache.org/r1636536 Log: Removed bad tag Removed: maven/plugins/tags/maven-assembly-plugin-2.5.1/
svn commit: r1636535 - in /maven/plugins/trunk/maven-assembly-plugin: ./ src/it/projects/dependency-sets/massembly-395/ src/it/projects/dependency-sets/massembly-395/child1/ src/it/projects/dependency
Author: krosenvold Date: Tue Nov 4 10:43:54 2014 New Revision: 1636535 URL: http://svn.apache.org/r1636535 Log: [MASSEMBLY-727] Implied dependencysets have incorrect outputfilemapping Updated IT for massambly-395 which originally demonstrated this problem Added: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-395/child1/ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-395/child1/pom.xml maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-395/child1/src/ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-395/child1/src/main/ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-395/child1/src/main/java/ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-395/child1/src/main/java/com/ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-395/child1/src/main/java/com/mycompany/ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-395/child1/src/main/java/com/mycompany/app/ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-395/child1/src/main/java/com/mycompany/app/App.java - copied, changed from r1636510, maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-395/verify.bsh maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-395/child2/ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-395/child2/pom.xml maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-395/child2/src/ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-395/child2/src/main/ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-395/child2/src/main/java/ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-395/child2/src/main/java/com/ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-395/child2/src/main/java/com/mycompany/ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-395/child2/src/main/java/com/mycompany/app/ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-395/child2/src/main/java/com/mycompany/app/App2.java - copied, changed from r1636510, maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-395/verify.bsh Removed: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-395/my-app-module1/pom.xml maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-395/my-app-module1/src/main/java/com/mycompany/app/App.java maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-395/my-app-module2/pom.xml maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-395/my-app-module2/src/main/java/com/mycompany/app/App2.java Modified: maven/plugins/trunk/maven-assembly-plugin/pom.xml maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-395/pom.xml maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-395/src/main/assembly/zip.xml maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-395/verify.bsh maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/using-moduleSet-implied-depSet/verify.bsh maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/ModuleSetAssemblyPhase.java maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddArtifactTask.java Modified: maven/plugins/trunk/maven-assembly-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/pom.xml?rev=1636535&r1=1636534&r2=1636535&view=diff == --- maven/plugins/trunk/maven-assembly-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-assembly-plugin/pom.xml Tue Nov 4 10:43:54 2014 @@ -456,6 +456,7 @@ under the License. dependency-sets/depSet-enum-vs-wildcard/enum/pom.xml dependency-sets/depSet-enum-vs-wildcard/wildcard/pom.xml +**/my-app*/pom.xml **/child*/pom.xml **/module*/pom.xml **/descriptor/pom.xml Added: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-395/child1/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-395/child1/pom.xm
