svn commit: r1389158 - /maven/shared/trunk/maven-script-interpreter/pom.xml
Author: hboutemy Date: Sun Sep 23 22:47:47 2012 New Revision: 1389158 URL: http://svn.apache.org/viewvc?rev=1389158&view=rev Log: removed configuration inherited from parent Modified: maven/shared/trunk/maven-script-interpreter/pom.xml Modified: maven/shared/trunk/maven-script-interpreter/pom.xml URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-script-interpreter/pom.xml?rev=1389158&r1=1389157&r2=1389158&view=diff == --- maven/shared/trunk/maven-script-interpreter/pom.xml (original) +++ maven/shared/trunk/maven-script-interpreter/pom.xml Sun Sep 23 22:47:47 2012 @@ -57,7 +57,6 @@ org.codehaus.plexus plexus-component-annotations - 1.5.5 org.codehaus.groovy
svn commit: r1389141 - in /maven/shared/trunk/maven-script-interpreter/src/main/java/org/apache/maven/shared/scriptinterpreter: FileLogger.java ScriptInterpreter.java ScriptRunner.java
Author: hboutemy
Date: Sun Sep 23 20:29:01 2012
New Revision: 1389141
URL: http://svn.apache.org/viewvc?rev=1389141&view=rev
Log:
typos
Modified:
maven/shared/trunk/maven-script-interpreter/src/main/java/org/apache/maven/shared/scriptinterpreter/FileLogger.java
maven/shared/trunk/maven-script-interpreter/src/main/java/org/apache/maven/shared/scriptinterpreter/ScriptInterpreter.java
maven/shared/trunk/maven-script-interpreter/src/main/java/org/apache/maven/shared/scriptinterpreter/ScriptRunner.java
Modified:
maven/shared/trunk/maven-script-interpreter/src/main/java/org/apache/maven/shared/scriptinterpreter/FileLogger.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-script-interpreter/src/main/java/org/apache/maven/shared/scriptinterpreter/FileLogger.java?rev=1389141&r1=1389140&r2=1389141&view=diff
==
---
maven/shared/trunk/maven-script-interpreter/src/main/java/org/apache/maven/shared/scriptinterpreter/FileLogger.java
(original)
+++
maven/shared/trunk/maven-script-interpreter/src/main/java/org/apache/maven/shared/scriptinterpreter/FileLogger.java
Sun Sep 23 20:29:01 2012
@@ -50,7 +50,7 @@ public class FileLogger
private boolean shouldFinalize = true;
/**
- * The optional mojo logger to additionally write messages to, can be
nulll.
+ * The optional mojo logger to additionally write messages to, can be
null.
*/
private final Log log;
Modified:
maven/shared/trunk/maven-script-interpreter/src/main/java/org/apache/maven/shared/scriptinterpreter/ScriptInterpreter.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-script-interpreter/src/main/java/org/apache/maven/shared/scriptinterpreter/ScriptInterpreter.java?rev=1389141&r1=1389140&r2=1389141&view=diff
==
---
maven/shared/trunk/maven-script-interpreter/src/main/java/org/apache/maven/shared/scriptinterpreter/ScriptInterpreter.java
(original)
+++
maven/shared/trunk/maven-script-interpreter/src/main/java/org/apache/maven/shared/scriptinterpreter/ScriptInterpreter.java
Sun Sep 23 20:29:01 2012
@@ -25,7 +25,7 @@ import java.util.Map;
/**
* Defines a simple abstraction used to plug-in several script interpreters
for the pre-/post-build-hooks. Each
- * interpretator implementation should be stateless and support reuse.
+ * interpreter implementation should be stateless and support reuse.
*
* @author Benjamin Bentmann
* @version $Id$
@@ -36,7 +36,7 @@ public interface ScriptInterpreter
/**
* Evaluates the specified script.
*
- * @param script The script contents to evalute, must not be
null.
+ * @param script The script contents to evaluate, must not be
null.
* @param classPath The additional class path for the script interpreter,
may be null or empty if only
*the plugin realm should be used for the script evaluation.
If specified, this class path will precede
*the artifacts from the plugin class path.
Modified:
maven/shared/trunk/maven-script-interpreter/src/main/java/org/apache/maven/shared/scriptinterpreter/ScriptRunner.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-script-interpreter/src/main/java/org/apache/maven/shared/scriptinterpreter/ScriptRunner.java?rev=1389141&r1=1389140&r2=1389141&view=diff
==
---
maven/shared/trunk/maven-script-interpreter/src/main/java/org/apache/maven/shared/scriptinterpreter/ScriptRunner.java
(original)
+++
maven/shared/trunk/maven-script-interpreter/src/main/java/org/apache/maven/shared/scriptinterpreter/ScriptRunner.java
Sun Sep 23 20:29:01 2012
@@ -103,7 +103,7 @@ public class ScriptRunner
}
/**
- * Sets a global variable for the script interpeter.
+ * Sets a global variable for the script interpreter.
*
* @param name The name of the variable, must not be null.
* @param value The value of the variable, may be null.
@@ -215,8 +215,6 @@ public class ScriptRunner
globalVariables.put( "basedir", scriptFile.getParentFile() );
globalVariables.put( "context", context );
-PrintStream out = ( logger != null ) ? logger.getPrintStream() : null;
-
ScriptInterpreter interpreter = getInterpreter( scriptFile );
if ( getLog().isDebugEnabled() )
{
@@ -246,6 +244,9 @@ public class ScriptRunner
{
logger.consumeLine( "Running " + scriptDescription + ": " +
scriptFile );
}
+
+PrintStream out = ( logger != null ) ? logger.getPrintStream() :
null;
+
result = interpreter.evaluateScript( script, classPath,
globalVariables, out );
if ( logger != null )
{
svn commit: r1389119 - in /maven/plugin-testing/trunk: maven-plugin-testing-harness/pom.xml maven-plugin-testing-tools/pom.xml maven-test-tools/pom.xml pom.xml
Author: krosenvold Date: Sun Sep 23 18:59:22 2012 New Revision: 1389119 URL: http://svn.apache.org/viewvc?rev=1389119&view=rev Log: [maven-release-plugin] prepare for next development iteration Modified: maven/plugin-testing/trunk/maven-plugin-testing-harness/pom.xml maven/plugin-testing/trunk/maven-plugin-testing-tools/pom.xml maven/plugin-testing/trunk/maven-test-tools/pom.xml maven/plugin-testing/trunk/pom.xml Modified: maven/plugin-testing/trunk/maven-plugin-testing-harness/pom.xml URL: http://svn.apache.org/viewvc/maven/plugin-testing/trunk/maven-plugin-testing-harness/pom.xml?rev=1389119&r1=1389118&r2=1389119&view=diff == --- maven/plugin-testing/trunk/maven-plugin-testing-harness/pom.xml (original) +++ maven/plugin-testing/trunk/maven-plugin-testing-harness/pom.xml Sun Sep 23 18:59:22 2012 @@ -25,7 +25,7 @@ under the License. org.apache.maven.plugin-testing maven-plugin-testing -2.1 +2.2-SNAPSHOT maven-plugin-testing-harness @@ -33,9 +33,9 @@ under the License. The Maven Plugin Testing Harness provides mechanisms to manage tests on Mojo. - scm:svn:http://svn.apache.org/repos/asf/maven/plugin-testing/tags/maven-plugin-testing-2.1/maven-plugin-testing-harness - scm:svn:https://svn.apache.org/repos/asf/maven/plugin-testing/tags/maven-plugin-testing-2.1/maven-plugin-testing-harness - http://svn.apache.org/viewvc/maven/plugin-testing/tags/maven-plugin-testing-2.1/maven-plugin-testing-harness + scm:svn:http://svn.apache.org/repos/asf/maven/plugin-testing/trunk/maven-plugin-testing-harness/ + scm:svn:https://svn.apache.org/repos/asf/maven/plugin-testing/trunk/maven-plugin-testing-harness/ + http://svn.apache.org/viewvc/maven/plugin-testing/trunk/maven-plugin-testing-harness/ Modified: maven/plugin-testing/trunk/maven-plugin-testing-tools/pom.xml URL: http://svn.apache.org/viewvc/maven/plugin-testing/trunk/maven-plugin-testing-tools/pom.xml?rev=1389119&r1=1389118&r2=1389119&view=diff == --- maven/plugin-testing/trunk/maven-plugin-testing-tools/pom.xml (original) +++ maven/plugin-testing/trunk/maven-plugin-testing-tools/pom.xml Sun Sep 23 18:59:22 2012 @@ -25,16 +25,16 @@ under the License. org.apache.maven.plugin-testing maven-plugin-testing -2.1 +2.2-SNAPSHOT maven-plugin-testing-tools Maven Plugin Testing Tools - scm:svn:http://svn.apache.org/repos/asf/maven/plugin-testing/tags/maven-plugin-testing-2.1/maven-plugin-testing-tools - scm:svn:https://svn.apache.org/repos/asf/maven/plugin-testing/tags/maven-plugin-testing-2.1/maven-plugin-testing-tools - http://svn.apache.org/viewvc/maven/plugin-testing/tags/maven-plugin-testing-2.1/maven-plugin-testing-tools + scm:svn:http://svn.apache.org/repos/asf/maven/plugin-testing/trunk/maven-plugin-testing-tools + scm:svn:https://svn.apache.org/repos/asf/maven/plugin-testing/trunk/maven-plugin-testing-tools + http://svn.apache.org/viewvc/maven/plugin-testing/trunk/maven-plugin-testing-tools Modified: maven/plugin-testing/trunk/maven-test-tools/pom.xml URL: http://svn.apache.org/viewvc/maven/plugin-testing/trunk/maven-test-tools/pom.xml?rev=1389119&r1=1389118&r2=1389119&view=diff == --- maven/plugin-testing/trunk/maven-test-tools/pom.xml (original) +++ maven/plugin-testing/trunk/maven-test-tools/pom.xml Sun Sep 23 18:59:22 2012 @@ -25,16 +25,16 @@ under the License. org.apache.maven.plugin-testing maven-plugin-testing -2.1 +2.2-SNAPSHOT maven-test-tools Maven Testing Tools - scm:svn:http://svn.apache.org/repos/asf/maven/plugin-testing/tags/maven-plugin-testing-2.1/maven-test-tools - scm:svn:https://svn.apache.org/repos/asf/maven/plugin-testing/tags/maven-plugin-testing-2.1/maven-test-tools - http://svn.apache.org/viewvc/maven/plugin-testing/tags/maven-plugin-testing-2.1/maven-test-tools + scm:svn:http://svn.apache.org/repos/asf/maven/plugin-testing/trunk/maven-test-tools + scm:svn:https://svn.apache.org/repos/asf/maven/plugin-testing/trunk/maven-test-tools + http://svn.apache.org/viewvc/maven/plugin-testing/trunk/maven-test-tools Modified: maven/plugin-testing/trunk/pom.xml URL: http://svn.apache.org/viewvc/maven/plugin-testing/trunk/pom.xml?rev=1389119&r1=1389118&r2=1389119&view=diff == --- maven/plugin-testing/trunk/pom.xml (original) +++ maven/plugin-testing/trunk/pom.xml Sun Sep 23 18:59:22 2012 @@ -31,7 +31,7 @@ under the License. org.apache.maven.plugin-testing maven-plugin-testing - 2.1 + 2.2-SNAPSHOT pom Maven Plugin Testing @@ -124,9 +124,9 @@ under the License. - scm:svn:http://svn.ap
svn commit: r1389118 - /maven/plugin-testing/tags/maven-plugin-testing-2.1/
Author: krosenvold Date: Sun Sep 23 18:59:17 2012 New Revision: 1389118 URL: http://svn.apache.org/viewvc?rev=1389118&view=rev Log: [maven-release-plugin] copy for tag maven-plugin-testing-2.1 Added: maven/plugin-testing/tags/maven-plugin-testing-2.1/ - copied from r1389117, maven/plugin-testing/trunk/
svn commit: r1389117 - in /maven/plugin-testing/trunk: maven-plugin-testing-harness/pom.xml maven-plugin-testing-tools/pom.xml maven-test-tools/pom.xml pom.xml
Author: krosenvold Date: Sun Sep 23 18:59:07 2012 New Revision: 1389117 URL: http://svn.apache.org/viewvc?rev=1389117&view=rev Log: [maven-release-plugin] prepare release maven-plugin-testing-2.1 Modified: maven/plugin-testing/trunk/maven-plugin-testing-harness/pom.xml maven/plugin-testing/trunk/maven-plugin-testing-tools/pom.xml maven/plugin-testing/trunk/maven-test-tools/pom.xml maven/plugin-testing/trunk/pom.xml Modified: maven/plugin-testing/trunk/maven-plugin-testing-harness/pom.xml URL: http://svn.apache.org/viewvc/maven/plugin-testing/trunk/maven-plugin-testing-harness/pom.xml?rev=1389117&r1=1389116&r2=1389117&view=diff == --- maven/plugin-testing/trunk/maven-plugin-testing-harness/pom.xml (original) +++ maven/plugin-testing/trunk/maven-plugin-testing-harness/pom.xml Sun Sep 23 18:59:07 2012 @@ -25,7 +25,7 @@ under the License. org.apache.maven.plugin-testing maven-plugin-testing -2.2-SNAPSHOT +2.1 maven-plugin-testing-harness @@ -33,9 +33,9 @@ under the License. The Maven Plugin Testing Harness provides mechanisms to manage tests on Mojo. - scm:svn:http://svn.apache.org/repos/asf/maven/plugin-testing/trunk/maven-plugin-testing-harness/ - scm:svn:https://svn.apache.org/repos/asf/maven/plugin-testing/trunk/maven-plugin-testing-harness/ - http://svn.apache.org/viewvc/maven/plugin-testing/trunk/maven-plugin-testing-harness/ + scm:svn:http://svn.apache.org/repos/asf/maven/plugin-testing/tags/maven-plugin-testing-2.1/maven-plugin-testing-harness + scm:svn:https://svn.apache.org/repos/asf/maven/plugin-testing/tags/maven-plugin-testing-2.1/maven-plugin-testing-harness + http://svn.apache.org/viewvc/maven/plugin-testing/tags/maven-plugin-testing-2.1/maven-plugin-testing-harness Modified: maven/plugin-testing/trunk/maven-plugin-testing-tools/pom.xml URL: http://svn.apache.org/viewvc/maven/plugin-testing/trunk/maven-plugin-testing-tools/pom.xml?rev=1389117&r1=1389116&r2=1389117&view=diff == --- maven/plugin-testing/trunk/maven-plugin-testing-tools/pom.xml (original) +++ maven/plugin-testing/trunk/maven-plugin-testing-tools/pom.xml Sun Sep 23 18:59:07 2012 @@ -25,16 +25,16 @@ under the License. org.apache.maven.plugin-testing maven-plugin-testing -2.2-SNAPSHOT +2.1 maven-plugin-testing-tools Maven Plugin Testing Tools - scm:svn:http://svn.apache.org/repos/asf/maven/plugin-testing/trunk/maven-plugin-testing-tools - scm:svn:https://svn.apache.org/repos/asf/maven/plugin-testing/trunk/maven-plugin-testing-tools - http://svn.apache.org/viewvc/maven/plugin-testing/trunk/maven-plugin-testing-tools + scm:svn:http://svn.apache.org/repos/asf/maven/plugin-testing/tags/maven-plugin-testing-2.1/maven-plugin-testing-tools + scm:svn:https://svn.apache.org/repos/asf/maven/plugin-testing/tags/maven-plugin-testing-2.1/maven-plugin-testing-tools + http://svn.apache.org/viewvc/maven/plugin-testing/tags/maven-plugin-testing-2.1/maven-plugin-testing-tools Modified: maven/plugin-testing/trunk/maven-test-tools/pom.xml URL: http://svn.apache.org/viewvc/maven/plugin-testing/trunk/maven-test-tools/pom.xml?rev=1389117&r1=1389116&r2=1389117&view=diff == --- maven/plugin-testing/trunk/maven-test-tools/pom.xml (original) +++ maven/plugin-testing/trunk/maven-test-tools/pom.xml Sun Sep 23 18:59:07 2012 @@ -25,16 +25,16 @@ under the License. org.apache.maven.plugin-testing maven-plugin-testing -2.2-SNAPSHOT +2.1 maven-test-tools Maven Testing Tools - scm:svn:http://svn.apache.org/repos/asf/maven/plugin-testing/trunk/maven-test-tools - scm:svn:https://svn.apache.org/repos/asf/maven/plugin-testing/trunk/maven-test-tools - http://svn.apache.org/viewvc/maven/plugin-testing/trunk/maven-test-tools + scm:svn:http://svn.apache.org/repos/asf/maven/plugin-testing/tags/maven-plugin-testing-2.1/maven-test-tools + scm:svn:https://svn.apache.org/repos/asf/maven/plugin-testing/tags/maven-plugin-testing-2.1/maven-test-tools + http://svn.apache.org/viewvc/maven/plugin-testing/tags/maven-plugin-testing-2.1/maven-test-tools Modified: maven/plugin-testing/trunk/pom.xml URL: http://svn.apache.org/viewvc/maven/plugin-testing/trunk/pom.xml?rev=1389117&r1=1389116&r2=1389117&view=diff == --- maven/plugin-testing/trunk/pom.xml (original) +++ maven/plugin-testing/trunk/pom.xml Sun Sep 23 18:59:07 2012 @@ -31,7 +31,7 @@ under the License. org.apache.maven.plugin-testing maven-plugin-testing - 2.2-SNAPSHOT + 2.1 pom Maven Plugin Testing @@ -124,9 +124,9 @@ under the License. - scm:svn:http://svn.
svn commit: r1389115 - /maven/plugin-testing/trunk/pom.xml
Author: krosenvold
Date: Sun Sep 23 18:53:49 2012
New Revision: 1389115
URL: http://svn.apache.org/viewvc?rev=1389115&view=rev
Log:
o Modified scope of all maven artifact.
Patch by Igor Fedorenko, applied unchanged
Modified:
maven/plugin-testing/trunk/pom.xml
Modified: maven/plugin-testing/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugin-testing/trunk/pom.xml?rev=1389115&r1=1389114&r2=1389115&view=diff
==
--- maven/plugin-testing/trunk/pom.xml (original)
+++ maven/plugin-testing/trunk/pom.xml Sun Sep 23 18:53:49 2012
@@ -152,38 +152,45 @@ under the License.
org.apache.maven
maven-core
${mavenVersion}
+provided
org.apache.maven
maven-compat
${mavenVersion}
+provided
org.apache.maven
maven-model
${mavenVersion}
+provided
org.apache.maven
maven-plugin-api
${mavenVersion}
+provided
org.apache.maven
maven-aether-provider
${mavenVersion}
+provided
org.codehaus.plexus
plexus-utils
3.0.8
+provided
junit
junit
4.10
+provided
svn commit: r1389113 - /maven/plugin-testing/tags/maven-plugin-testing-2.1/
Author: krosenvold Date: Sun Sep 23 18:48:35 2012 New Revision: 1389113 URL: http://svn.apache.org/viewvc?rev=1389113&view=rev Log: o Reverted release Removed: maven/plugin-testing/tags/maven-plugin-testing-2.1/
svn commit: r1389085 - /maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/
Author: rfscholte
Date: Sun Sep 23 15:50:37 2012
New Revision: 1389085
URL: http://svn.apache.org/viewvc?rev=1389085&view=rev
Log:
Fix MRELEASE-796: Add AbstractScmReleaseMojo so scmParameters won't be visible
if they're not used.
Added:
maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/AbstractScmReleaseMojo.java
Modified:
maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/AbstractReleaseMojo.java
maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/BranchReleaseMojo.java
maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/PrepareReleaseMojo.java
maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/RollbackReleaseMojo.java
maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/StageReleaseMojo.java
Modified:
maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/AbstractReleaseMojo.java
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/AbstractReleaseMojo.java?rev=1389085&r1=1389084&r2=1389085&view=diff
==
---
maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/AbstractReleaseMojo.java
(original)
+++
maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/AbstractReleaseMojo.java
Sun Sep 23 15:50:37 2012
@@ -50,47 +50,6 @@ public abstract class AbstractReleaseMoj
extends AbstractMojo
{
/**
- * The SCM username to use.
- */
-@Parameter( property = "username" )
-private String username;
-
-/**
- * The SCM password to use.
- */
-@Parameter( property = "password" )
-private String password;
-
-/**
- * The SCM tag to use.
- */
-@Parameter( alias = "releaseLabel", property = "tag" )
-private String tag;
-
-/**
- * Format to use when generating the tag name if none is specified.
Property interpolation is performed on the
- * tag, but in order to ensure that the interpolation occurs during
release, you must use @{...}
- * to reference the properties rather than ${...}. The
following properties are available:
- *
- * groupId or project.groupId - The
groupId of the root project.
- * artifactId or project.artifactId -
The artifactId of the root project.
- * version or project.version - The
release version of the root project.
- *
- *
- * @since 2.2.0
- */
-@Parameter( defaultValue = "@{project.artifactId}-@{project.version}",
property = "tagNameFormat" )
-private String tagNameFormat;
-
-/**
- * The tag base directory in SVN, you must define it if you don't use the
standard svn layout (trunk/tags/branches).
- * For example,
http://svn.apache.org/repos/asf/maven/plugins/tags. The URL is an
SVN URL and does not
- * include the SCM provider and protocol.
- */
-@Parameter( property = "tagBase" )
-private String tagBase;
-
-/**
*/
@Parameter( defaultValue = "${basedir}", readonly = true, required = true )
private File basedir;
@@ -123,14 +82,6 @@ public abstract class AbstractReleaseMoj
private String pomFileName;
/**
- * The message prefix to use for all SCM changes.
- *
- * @since 2.0-beta-5
- */
-@Parameter( defaultValue = "[maven-release-plugin] ", property =
"scmCommentPrefix" )
-private String scmCommentPrefix;
-
-/**
*/
@Parameter( defaultValue = "${reactorProjects}", readonly = true, required
= true )
private List reactorProjects;
@@ -251,13 +202,6 @@ public abstract class AbstractReleaseMoj
descriptor.setInteractive( settings.isInteractiveMode() );
-descriptor.setScmPassword( password );
-descriptor.setScmReleaseLabel( tag );
-descriptor.setScmTagNameFormat( tagNameFormat );
-descriptor.setScmTagBase( tagBase );
-descriptor.setScmUsername( username );
-descriptor.setScmCommentPrefix( scmCommentPrefix );
-
descriptor.setWorkingDirectory( basedir.getAbsolutePath() );
descriptor.setPomFileName( pomFileName );
Added:
maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/AbstractScmReleaseMojo.java
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/AbstractScmReleaseMojo.java?rev=1389085&view=auto
==
---
maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/AbstractScmReleaseMojo.java
(added)
+++
maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/rel
svn commit: r1389067 - /maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckDependencySnapshotsPhase.java
Author: rfscholte Date: Sun Sep 23 14:32:56 2012 New Revision: 1389067 URL: http://svn.apache.org/viewvc?rev=1389067&view=rev Log: Add reminder Modified: maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckDependencySnapshotsPhase.java Modified: maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckDependencySnapshotsPhase.java URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckDependencySnapshotsPhase.java?rev=1389067&r1=1389066&r2=1389067&view=diff == --- maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckDependencySnapshotsPhase.java (original) +++ maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckDependencySnapshotsPhase.java Sun Sep 23 14:32:56 2012 @@ -79,7 +79,13 @@ public class CheckDependencySnapshotsPha * @plexus.requirement */ private ArtifactFactory artifactFactory; - + +// Be aware of the difference between usedSnapshots and specifiedSnapshots: +// UsedSnapshots end up on the classpath. +// SpecifiedSnapshots are defined anywhere in the pom. +// We'll probably need to introduce specifiedSnapshots as well. +// @TODO MRELEASE-378: verify custom dependencies in plugins. Be aware of deprecated/removed Components in M3, such as PluginCollector +// @TODO MRELEASE-763: verify all dependencies in inactive profiles private Set usedSnapshotDependencies = new HashSet(); private Set usedSnapshotReports = new HashSet(); private Set usedSnapshotExtensions = new HashSet();
svn commit: r1389052 - /maven/doxia/doxia-tools/trunk/doxia-integration-tools/pom.xml
Author: dennisl Date: Sun Sep 23 13:26:20 2012 New Revision: 1389052 URL: http://svn.apache.org/viewvc?rev=1389052&view=rev Log: [maven-release-plugin] prepare for next development iteration Modified: maven/doxia/doxia-tools/trunk/doxia-integration-tools/pom.xml Modified: maven/doxia/doxia-tools/trunk/doxia-integration-tools/pom.xml URL: http://svn.apache.org/viewvc/maven/doxia/doxia-tools/trunk/doxia-integration-tools/pom.xml?rev=1389052&r1=1389051&r2=1389052&view=diff == --- maven/doxia/doxia-tools/trunk/doxia-integration-tools/pom.xml (original) +++ maven/doxia/doxia-tools/trunk/doxia-integration-tools/pom.xml Sun Sep 23 13:26:20 2012 @@ -30,7 +30,7 @@ doxia-integration-tools - 1.5 + 1.6-SNAPSHOT Doxia Integration Tools A collection of tools to help the integration of Doxia in Maven plugins. @@ -40,9 +40,9 @@ - scm:svn:http://svn.apache.org/repos/asf/maven/doxia/doxia-tools/tags/doxia-integration-tools-1.5 - scm:svn:https://svn.apache.org/repos/asf/maven/doxia/doxia-tools/tags/doxia-integration-tools-1.5 - http://svn.apache.org/viewvc/maven/doxia/doxia-tools/tags/doxia-integration-tools-1.5 + scm:svn:http://svn.apache.org/repos/asf/maven/doxia/doxia-tools/trunk/doxia-integration-tools/ + scm:svn:https://svn.apache.org/repos/asf/maven/doxia/doxia-tools/trunk/doxia-integration-tools/ + http://svn.apache.org/viewvc/maven/doxia/doxia-tools/trunk/doxia-integration-tools/ jira
svn commit: r1389051 - /maven/doxia/doxia-tools/tags/doxia-integration-tools-1.5/
Author: dennisl Date: Sun Sep 23 13:26:16 2012 New Revision: 1389051 URL: http://svn.apache.org/viewvc?rev=1389051&view=rev Log: [maven-release-plugin] copy for tag doxia-integration-tools-1.5 Added: maven/doxia/doxia-tools/tags/doxia-integration-tools-1.5/ - copied from r1389050, maven/doxia/doxia-tools/trunk/doxia-integration-tools/
svn commit: r1389050 - /maven/doxia/doxia-tools/trunk/doxia-integration-tools/pom.xml
Author: dennisl Date: Sun Sep 23 13:26:06 2012 New Revision: 1389050 URL: http://svn.apache.org/viewvc?rev=1389050&view=rev Log: [maven-release-plugin] prepare release doxia-integration-tools-1.5 Modified: maven/doxia/doxia-tools/trunk/doxia-integration-tools/pom.xml Modified: maven/doxia/doxia-tools/trunk/doxia-integration-tools/pom.xml URL: http://svn.apache.org/viewvc/maven/doxia/doxia-tools/trunk/doxia-integration-tools/pom.xml?rev=1389050&r1=1389049&r2=1389050&view=diff == --- maven/doxia/doxia-tools/trunk/doxia-integration-tools/pom.xml (original) +++ maven/doxia/doxia-tools/trunk/doxia-integration-tools/pom.xml Sun Sep 23 13:26:06 2012 @@ -30,7 +30,7 @@ doxia-integration-tools - 1.5-SNAPSHOT + 1.5 Doxia Integration Tools A collection of tools to help the integration of Doxia in Maven plugins. @@ -40,9 +40,9 @@ - scm:svn:http://svn.apache.org/repos/asf/maven/doxia/doxia-tools/trunk/doxia-integration-tools/ - scm:svn:https://svn.apache.org/repos/asf/maven/doxia/doxia-tools/trunk/doxia-integration-tools/ - http://svn.apache.org/viewvc/maven/doxia/doxia-tools/trunk/doxia-integration-tools/ + scm:svn:http://svn.apache.org/repos/asf/maven/doxia/doxia-tools/tags/doxia-integration-tools-1.5 + scm:svn:https://svn.apache.org/repos/asf/maven/doxia/doxia-tools/tags/doxia-integration-tools-1.5 + http://svn.apache.org/viewvc/maven/doxia/doxia-tools/tags/doxia-integration-tools-1.5 jira
svn commit: r1389049 - /maven/doxia/doxia-tools/trunk/doxia-integration-tools/pom.xml
Author: dennisl Date: Sun Sep 23 13:24:04 2012 New Revision: 1389049 URL: http://svn.apache.org/viewvc?rev=1389049&view=rev Log: Use doxia-tools:2 as parent. Modified: maven/doxia/doxia-tools/trunk/doxia-integration-tools/pom.xml Modified: maven/doxia/doxia-tools/trunk/doxia-integration-tools/pom.xml URL: http://svn.apache.org/viewvc/maven/doxia/doxia-tools/trunk/doxia-integration-tools/pom.xml?rev=1389049&r1=1389048&r2=1389049&view=diff == --- maven/doxia/doxia-tools/trunk/doxia-integration-tools/pom.xml (original) +++ maven/doxia/doxia-tools/trunk/doxia-integration-tools/pom.xml Sun Sep 23 13:24:04 2012 @@ -25,7 +25,7 @@ org.apache.maven.doxia doxia-tools -2-SNAPSHOT +2 ../doxia-tools/pom.xml
svn commit: r1389048 - /maven/doxia/doxia-tools/trunk/doxia-tools/pom.xml
Author: dennisl Date: Sun Sep 23 13:22:52 2012 New Revision: 1389048 URL: http://svn.apache.org/viewvc?rev=1389048&view=rev Log: [maven-release-plugin] prepare for next development iteration Modified: maven/doxia/doxia-tools/trunk/doxia-tools/pom.xml Modified: maven/doxia/doxia-tools/trunk/doxia-tools/pom.xml URL: http://svn.apache.org/viewvc/maven/doxia/doxia-tools/trunk/doxia-tools/pom.xml?rev=1389048&r1=1389047&r2=1389048&view=diff == --- maven/doxia/doxia-tools/trunk/doxia-tools/pom.xml (original) +++ maven/doxia/doxia-tools/trunk/doxia-tools/pom.xml Sun Sep 23 13:22:52 2012 @@ -31,7 +31,7 @@ under the License. org.apache.maven.doxia doxia-tools - 2 + 3-SNAPSHOT pom Doxia Tools @@ -151,9 +151,9 @@ under the License. - scm:svn:http://svn.apache.org/repos/asf/maven/doxia/doxia-tools/tags/doxia-tools-2 - scm:svn:https://svn.apache.org/repos/asf/maven/doxia/doxia-tools/tags/doxia-tools-2 - http://svn.apache.org/viewvc/maven/doxia/doxia-tools/tags/doxia-tools-2 + scm:svn:http://svn.apache.org/repos/asf/maven/doxia/doxia-tools/trunk/doxia-tools + scm:svn:https://svn.apache.org/repos/asf/maven/doxia/doxia-tools/trunk/doxia-tools + http://svn.apache.org/viewvc/maven/doxia/doxia-tools/trunk/doxia-tools
svn commit: r1389047 - /maven/doxia/doxia-tools/tags/doxia-tools-2/
Author: dennisl Date: Sun Sep 23 13:22:48 2012 New Revision: 1389047 URL: http://svn.apache.org/viewvc?rev=1389047&view=rev Log: [maven-release-plugin] copy for tag doxia-tools-2 Added: maven/doxia/doxia-tools/tags/doxia-tools-2/ - copied from r1389046, maven/doxia/doxia-tools/trunk/doxia-tools/
svn commit: r1389046 - /maven/doxia/doxia-tools/trunk/doxia-tools/pom.xml
Author: dennisl Date: Sun Sep 23 13:22:38 2012 New Revision: 1389046 URL: http://svn.apache.org/viewvc?rev=1389046&view=rev Log: [maven-release-plugin] prepare release doxia-tools-2 Modified: maven/doxia/doxia-tools/trunk/doxia-tools/pom.xml Modified: maven/doxia/doxia-tools/trunk/doxia-tools/pom.xml URL: http://svn.apache.org/viewvc/maven/doxia/doxia-tools/trunk/doxia-tools/pom.xml?rev=1389046&r1=1389045&r2=1389046&view=diff == --- maven/doxia/doxia-tools/trunk/doxia-tools/pom.xml (original) +++ maven/doxia/doxia-tools/trunk/doxia-tools/pom.xml Sun Sep 23 13:22:38 2012 @@ -31,7 +31,7 @@ under the License. org.apache.maven.doxia doxia-tools - 2-SNAPSHOT + 2 pom Doxia Tools @@ -151,9 +151,9 @@ under the License. - scm:svn:http://svn.apache.org/repos/asf/maven/doxia/doxia-tools/trunk/doxia-tools - scm:svn:https://svn.apache.org/repos/asf/maven/doxia/doxia-tools/trunk/doxia-tools - http://svn.apache.org/viewvc/maven/doxia/doxia-tools/trunk/doxia-tools + scm:svn:http://svn.apache.org/repos/asf/maven/doxia/doxia-tools/tags/doxia-tools-2 + scm:svn:https://svn.apache.org/repos/asf/maven/doxia/doxia-tools/tags/doxia-tools-2 + http://svn.apache.org/viewvc/maven/doxia/doxia-tools/tags/doxia-tools-2
svn commit: r1389045 - in /maven/doxia/doxia-tools/trunk: doxia-book-maven-plugin/src/site/ doxia-book-renderer/src/site/ doxia-converter/src/site/ doxia-integration-tools/src/site/ doxia-linkcheck/sr
Author: dennisl Date: Sun Sep 23 13:14:33 2012 New Revision: 1389045 URL: http://svn.apache.org/viewvc?rev=1389045&view=rev Log: Use latest decoration schema. Synchronize the menus so they look the same. Modified: maven/doxia/doxia-tools/trunk/doxia-book-maven-plugin/src/site/site.xml maven/doxia/doxia-tools/trunk/doxia-book-renderer/src/site/site.xml maven/doxia/doxia-tools/trunk/doxia-converter/src/site/site.xml maven/doxia/doxia-tools/trunk/doxia-integration-tools/src/site/site.xml maven/doxia/doxia-tools/trunk/doxia-linkcheck/src/site/site.xml maven/doxia/doxia-tools/trunk/doxia-tools/src/site/site.xml Modified: maven/doxia/doxia-tools/trunk/doxia-book-maven-plugin/src/site/site.xml URL: http://svn.apache.org/viewvc/maven/doxia/doxia-tools/trunk/doxia-book-maven-plugin/src/site/site.xml?rev=1389045&r1=1389044&r2=1389045&view=diff == --- maven/doxia/doxia-tools/trunk/doxia-book-maven-plugin/src/site/site.xml (original) +++ maven/doxia/doxia-tools/trunk/doxia-book-maven-plugin/src/site/site.xml Sun Sep 23 13:14:33 2012 @@ -1,33 +1,26 @@ - + - -http://maven.apache.org/DECORATION/1.1.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/DECORATION/1.1.0 http://maven.apache.org/xsd/decoration-1.1.0.xsd";> +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. +--> +http://maven.apache.org/DECORATION/1.3.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/DECORATION/1.3.0 http://maven.apache.org/xsd/decoration-1.3.0.xsd";> - - - @@ -36,7 +29,5 @@ - - Modified: maven/doxia/doxia-tools/trunk/doxia-book-renderer/src/site/site.xml URL: http://svn.apache.org/viewvc/maven/doxia/doxia-tools/trunk/doxia-book-renderer/src/site/site.xml?rev=1389045&r1=1389044&r2=1389045&view=diff == --- maven/doxia/doxia-tools/trunk/doxia-book-renderer/src/site/site.xml (original) +++ maven/doxia/doxia-tools/trunk/doxia-book-renderer/src/site/site.xml Sun Sep 23 13:14:33 2012 @@ -1,33 +1,26 @@ - + - -http://maven.apache.org/DECORATION/1.1.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/DECORATION/1.1.0 http://maven.apache.org/xsd/decoration-1.1.0.xsd";> +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. +--> +http://maven.apache.org/DECORATION/1.3.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/DECORATION/1.3.0 http://maven.apache.org/xsd/decoration-1.3.0.xsd";> - - - @@ -42,7 +35,5 @@ - - Modified: maven/doxia/doxia-tools/trunk/doxia-converter/src/site/site.xml URL: http://svn.apache.org/viewvc/maven/doxia/doxia-tools/trunk/doxia-converter/src/site/site.xml?rev=1389045&r1=1389044&r2=1389045&view=diff == --- maven/doxia/doxia-tools/trunk/doxia-converter/src/site/site.xml (original) +++ maven/doxia/doxia-tools/trunk/doxia-converter/src/site/site.xml Sun Sep 23 13:14:33 2012 @@ -1,37 +1,31 @@ - + - -http://maven.apache.org/DECORATION/1.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.0 http://maven.apache.org/xsd/decoration-1.0.0.xsd";> +Licensed to the Apache
svn commit: r1389043 - /maven/doxia/doxia-tools/trunk/doxia-tools/pom.xml
Author: dennisl Date: Sun Sep 23 13:02:14 2012 New Revision: 1389043 URL: http://svn.apache.org/viewvc?rev=1389043&view=rev Log: Inherit plugin versions from parent. Modified: maven/doxia/doxia-tools/trunk/doxia-tools/pom.xml Modified: maven/doxia/doxia-tools/trunk/doxia-tools/pom.xml URL: http://svn.apache.org/viewvc/maven/doxia/doxia-tools/trunk/doxia-tools/pom.xml?rev=1389043&r1=1389042&r2=1389043&view=diff == --- maven/doxia/doxia-tools/trunk/doxia-tools/pom.xml (original) +++ maven/doxia/doxia-tools/trunk/doxia-tools/pom.xml Sun Sep 23 13:02:14 2012 @@ -239,7 +239,6 @@ under the License. org.apache.maven.plugins maven-jxr-plugin -2.3 non-aggregate @@ -258,7 +257,6 @@ under the License. org.apache.maven.plugins maven-javadoc-plugin -2.8 non-aggregate @@ -277,7 +275,6 @@ under the License. org.codehaus.mojo cobertura-maven-plugin -2.4
svn commit: r1389033 - in /maven/doxia/doxia-tools/trunk: doxia-converter/pom.xml doxia-linkcheck/pom.xml doxia-tools/pom.xml
Author: dennisl Date: Sun Sep 23 12:52:56 2012 New Revision: 1389033 URL: http://svn.apache.org/viewvc?rev=1389033&view=rev Log: Sort out test dependencies. We should not have declared in a parent POM, so I moved them to the projects that actually use them. Modified: maven/doxia/doxia-tools/trunk/doxia-converter/pom.xml maven/doxia/doxia-tools/trunk/doxia-linkcheck/pom.xml maven/doxia/doxia-tools/trunk/doxia-tools/pom.xml Modified: maven/doxia/doxia-tools/trunk/doxia-converter/pom.xml URL: http://svn.apache.org/viewvc/maven/doxia/doxia-tools/trunk/doxia-converter/pom.xml?rev=1389033&r1=1389032&r2=1389033&view=diff == --- maven/doxia/doxia-tools/trunk/doxia-converter/pom.xml (original) +++ maven/doxia/doxia-tools/trunk/doxia-converter/pom.xml Sun Sep 23 12:52:56 2012 @@ -144,6 +144,11 @@ under the License. org.codehaus.plexus plexus-utils + + org.codehaus.plexus + plexus-container-default + test + Modified: maven/doxia/doxia-tools/trunk/doxia-linkcheck/pom.xml URL: http://svn.apache.org/viewvc/maven/doxia/doxia-tools/trunk/doxia-linkcheck/pom.xml?rev=1389033&r1=1389032&r2=1389033&view=diff == --- maven/doxia/doxia-tools/trunk/doxia-linkcheck/pom.xml (original) +++ maven/doxia/doxia-tools/trunk/doxia-linkcheck/pom.xml Sun Sep 23 12:52:56 2012 @@ -76,6 +76,13 @@ under the License. org.codehaus.plexus plexus-component-annotations + + + junit + junit + 3.8.2 + test + Modified: maven/doxia/doxia-tools/trunk/doxia-tools/pom.xml URL: http://svn.apache.org/viewvc/maven/doxia/doxia-tools/trunk/doxia-tools/pom.xml?rev=1389033&r1=1389032&r2=1389033&view=diff == --- maven/doxia/doxia-tools/trunk/doxia-tools/pom.xml (original) +++ maven/doxia/doxia-tools/trunk/doxia-tools/pom.xml Sun Sep 23 12:52:56 2012 @@ -197,14 +197,6 @@ under the License. - - - junit - junit - 3.8.2 - test - -
