svn commit: r1422896 - in /maven/plugins/trunk/maven-site-plugin/src/site: apt/examples/multimodule.apt fml/faq.fml
Author: ltheussl
Date: Mon Dec 17 12:22:03 2012
New Revision: 1422896
URL: http://svn.apache.org/viewvc?rev=1422896view=rev
Log:
[MSITE-669] clarify usage of of distMngmnt url for staging and deploying
Modified:
maven/plugins/trunk/maven-site-plugin/src/site/apt/examples/multimodule.apt
maven/plugins/trunk/maven-site-plugin/src/site/fml/faq.fml
Modified:
maven/plugins/trunk/maven-site-plugin/src/site/apt/examples/multimodule.apt
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/site/apt/examples/multimodule.apt?rev=1422896r1=1422895r2=1422896view=diff
==
--- maven/plugins/trunk/maven-site-plugin/src/site/apt/examples/multimodule.apt
(original)
+++ maven/plugins/trunk/maven-site-plugin/src/site/apt/examples/multimodule.apt
Mon Dec 17 12:22:03 2012
@@ -53,14 +53,30 @@ Building multi-module sites
site:deploy but uses the stagingDirectory parameter as
deployment location.
This can be used to deploy the site to a remote staging area
(site:stage is always local).
- Note: If subprojects inherit the site URL from a parent POM, they will
automatically
+ Notes:
+
+ * If subprojects inherit the (distribution) site URL from a parent POM, they
will automatically
append their artifactId to form their effective deployment location.
This goes for both the project url and the url defined in the
- \distributionManagement\ element of the pom. If your multi-module
tree does not
+ \distributionManagement\ element of the pom.
+
+ * If your multi-module tree does not
follow the maven conventions, or if module directories are named differently
than
module artifacts, you have to specify the url's for each child project.
See also {{{../faq.html#Use_of_url}How does the Site Plugin use the
\url\ element in the POM?}}.
+ * The pom.xml of the topmost project in a multi-module build must define the
distributionManagement URL
+ element (called rootURL hereafter). The rootURL must be the topmost
distributionManagement URL
+ in the multi-module project, implying that any distributionManagement URL
defined within another
+ project in a multimodule build must start with the rootURL and append unique
paths
+ (to be situated below the rootURL).
+
+ * All projects in multi-module builds must define unique
distributionManagement url elements,
+ below/under the root distributionManagement URL in terms of URL path.
+
+ * If the artifactId and module name (i.e. directory name) are not identical
for any project within a
+ multi-module build, the distributionManagement URL element must be defined
in the pom.xml file in the project.
+
* Inheritance
Site descriptors are inherited along the same lines as project descriptors
Modified: maven/plugins/trunk/maven-site-plugin/src/site/fml/faq.fml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/site/fml/faq.fml?rev=1422896r1=1422895r2=1422896view=diff
==
--- maven/plugins/trunk/maven-site-plugin/src/site/fml/faq.fml (original)
+++ maven/plugins/trunk/maven-site-plugin/src/site/fml/faq.fml Mon Dec 17
12:22:03 2012
@@ -116,13 +116,17 @@ under the License.
questionHow does the Site Plugin use the lt;urlgt; element in the
POM?/question
answer
p
- The Site Plugin uses the lt;urlgt; element in the POM to create
- relative links for the generated site. If your project has a URL
+ The Site Plugin does not use the lt;urlgt; element in the POM.
+ The project URL is just a piece of information to let your users know
+ where the project lives. Some other plugins (e.g. the
project-info-report-plugin)
+ may be used to present this information. If your project has a URL
where the generated site is deployed, then put that URL into the
lt;urlgt; element. If the project's site is not deployed anywhere,
then remove the lt;urlgt; element from the POM.
/p
p
+ On the other hand, the lt;distributionManagement.urlgt; is used in
a multi-module
+ build to construct relative links between the generated sub-module
sites.
In a multi module build it is important for the parent and child
modules to have strongdifferent/strong URLs. If they have the
same URL, then links within the combined site will not work.
[1/2] git commit: make it pass
Updated Branches:
refs/heads/logging/slf4j-log4j2 fa35ca7de - 9350d1a6d
make it pass
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/9350d1a6
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/9350d1a6
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/9350d1a6
Branch: refs/heads/logging/slf4j-log4j2
Commit: 9350d1a6d91f96e542509ad97ec751642a1c23b8
Parents: 626b34b
Author: olivier lamy ol...@apache.org
Authored: Mon Dec 17 17:32:04 2012 +0100
Committer: olivier lamy ol...@apache.org
Committed: Mon Dec 17 17:32:04 2012 +0100
--
apache-maven/src/conf/logging/log4j2-color.xml |2 +-
.../main/java/org/apache/maven/cli/MavenCli.java |2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven/blob/9350d1a6/apache-maven/src/conf/logging/log4j2-color.xml
--
diff --git a/apache-maven/src/conf/logging/log4j2-color.xml
b/apache-maven/src/conf/logging/log4j2-color.xml
index ec93c35..0fab951 100644
--- a/apache-maven/src/conf/logging/log4j2-color.xml
+++ b/apache-maven/src/conf/logging/log4j2-color.xml
@@ -25,7 +25,7 @@
/properties
appenders
Console name=console target=SYSTEM_OUT
- PatternLayout pattern=%highlight{[%p] %msg%n%throwable}{INFO=white} /
+ PatternLayout pattern=%highlight{[%p{WARN=WARNING}]
%msg%n%throwable}{INFO=white} /
/Console
/appenders
loggers
http://git-wip-us.apache.org/repos/asf/maven/blob/9350d1a6/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
--
diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
b/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
index f4215cf..d457260 100644
--- a/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
+++ b/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
@@ -324,7 +324,7 @@ public class MavenCli
{
File logFile = new File( cliRequest.commandLine.getOptionValue(
CLIManager.LOG_FILE ) );
logFile = resolveFile( logFile, cliRequest.workingDirectory );
-System.setProperty(log4j.configurationFile,
logFile.getAbsolutePath() );
+
try
{
PrintStream ps = new PrintStream( new FileOutputStream(
logFile ) );
[2/2] git commit: fix WARN level name it need WARNING
fix WARN level name it need WARNING
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/626b34b4
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/626b34b4
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/626b34b4
Branch: refs/heads/logging/slf4j-log4j2
Commit: 626b34b4d6e8f7cd71b2241a33e2969320f0058c
Parents: fa35ca7
Author: olivier lamy ol...@apache.org
Authored: Mon Dec 17 17:18:51 2012 +0100
Committer: olivier lamy ol...@apache.org
Committed: Mon Dec 17 17:18:51 2012 +0100
--
apache-maven/src/conf/logging/log4j2.xml |2 +-
build.xml|2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven/blob/626b34b4/apache-maven/src/conf/logging/log4j2.xml
--
diff --git a/apache-maven/src/conf/logging/log4j2.xml
b/apache-maven/src/conf/logging/log4j2.xml
index 935e8a6..6635597 100644
--- a/apache-maven/src/conf/logging/log4j2.xml
+++ b/apache-maven/src/conf/logging/log4j2.xml
@@ -25,7 +25,7 @@
/properties
appenders
Console name=console target=SYSTEM_OUT
- PatternLayout pattern=[%p] %msg%n%throwable/
+ PatternLayout pattern=[%p{WARN=WARNING}] %msg%n%throwable/
/Console
/appenders
loggers
http://git-wip-us.apache.org/repos/asf/maven/blob/626b34b4/build.xml
--
diff --git a/build.xml b/build.xml
index d76031f..4bbbec9 100644
--- a/build.xml
+++ b/build.xml
@@ -34,7 +34,7 @@ END SNIPPET: ant-bootstrap --
property name=distributionDirectory value=apache-maven/
property name=distributionId value=apache-maven/
property name=distributionShortName value=Maven/
- property name=distributionName value=Apache Maven (log4j2)/
+ property name=distributionName value=Apache Maven/
property name=it.workdir.version value=3.0.x /
target name=initTaskDefs
Git Push Summary
Updated Branches: refs/heads/slf4j-log4j2 [created] 9350d1a6d
git commit: o Simplified concurrent code to try to isolate intermittent problem
Updated Branches:
refs/heads/master 318f8a9a4 - ab0cc7a84
o Simplified concurrent code to try to isolate intermittent problem
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/ab0cc7a8
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/ab0cc7a8
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/ab0cc7a8
Branch: refs/heads/master
Commit: ab0cc7a8477d2c8428882e58153c4486f8a23eb9
Parents: 318f8a9
Author: Kristian Rosenvold krosenv...@apache.org
Authored: Mon Dec 17 17:22:48 2012 +0100
Committer: Kristian Rosenvold krosenv...@apache.org
Committed: Mon Dec 17 17:26:14 2012 +0100
--
.../junitcore/ConcurrentReporterManager.java | 55 +++
.../maven/surefire/junitcore/TestMethod.java | 11 +++-
.../apache/maven/surefire/junitcore/TestSet.java |5 +-
.../maven/surefire/junitcore/TestMethodTest.java |4 +-
4 files changed, 41 insertions(+), 34 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/ab0cc7a8/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/ConcurrentReporterManager.java
--
diff --git
a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/ConcurrentReporterManager.java
b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/ConcurrentReporterManager.java
index 777f50b..69367f5 100644
---
a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/ConcurrentReporterManager.java
+++
b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/ConcurrentReporterManager.java
@@ -42,7 +42,7 @@ public abstract class ConcurrentReporterManager
{
private final MapString, TestSet classMethodCounts;
-private final ThreadLocalRunListener reporterManagerThreadLocal = new
ThreadLocalRunListener();
+private final ThreadLocalRunListener reporterManagerThreadLocal; // =
new ThreadLocalRunListener();
private final boolean reportImmediately;
@@ -58,6 +58,15 @@ public abstract class ConcurrentReporterManager
this.reporterFactory = reporterFactory;
this.classMethodCounts = classMethodCounts;
this.consoleLogger = consoleLogger;
+
+this.reporterManagerThreadLocal = new ThreadLocalRunListener()
+{
+@Override
+protected RunListener initialValue()
+{
+return
ConcurrentReporterManager.this.reporterFactory.createReporter();
+}
+};
}
public void testSetStarting( ReportEntry description )
@@ -71,54 +80,52 @@ public abstract class ConcurrentReporterManager
{
testSet.replay( reporterManager );
}
-detachTestMethodFromThread();
reporterManagerThreadLocal.remove();
}
public void testFailed( ReportEntry failure )
{
-final TestMethod testMethod = getOrCreateTestMethod( failure );
+final TestMethod testMethod = getOrCreateThreadAttachedTestMethod(
failure );
if ( testMethod != null )
{
testMethod.testFailure( failure );
+testMethod.detachFromCurrentThread();
}
-detachTestMethodFromThread();
}
public void testError( ReportEntry failure )
{
-final TestMethod testMethod = getOrCreateTestMethod( failure );
+final TestMethod testMethod = getOrCreateThreadAttachedTestMethod(
failure );
if ( testMethod != null )
{
testMethod.testError( failure );
+testMethod.detachFromCurrentThread();
}
-detachTestMethodFromThread();
}
public void testSkipped( ReportEntry description )
{
TestSet testSet = getTestSet( description );
-TestMethod testMethod = getTestSet( description ).createTestMethod(
description );
+TestMethod testMethod = testSet.createThreadAttachedTestMethod(
description );
testMethod.testIgnored( description );
testSet.incrementFinishedTests( getRunListener(), reportImmediately );
-detachTestMethodFromThread();
+testMethod.detachFromCurrentThread();
}
public void testAssumptionFailure( ReportEntry failure )
{
-final TestMethod testMethod = getOrCreateTestMethod( failure );
+final TestMethod testMethod = getOrCreateThreadAttachedTestMethod(
failure );
if ( testMethod != null )
{
testMethod.testIgnored( failure );
+testMethod.detachFromCurrentThread();
}
-detachTestMethodFromThread();
}
public void testStarting( ReportEntry description )
git commit: o Reduced likelyhood that a single thread will steal all the testcases, effectively failing the test
Updated Branches:
refs/heads/master ab0cc7a84 - d9fdcf8dc
o Reduced likelyhood that a single thread will steal all the testcases,
effectively failing the test
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/d9fdcf8d
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/d9fdcf8d
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/d9fdcf8d
Branch: refs/heads/master
Commit: d9fdcf8dc3ee59de9a200dae813f9213bdabf9fd
Parents: ab0cc7a
Author: Kristian Rosenvold krosenv...@apache.org
Authored: Mon Dec 17 17:59:53 2012 +0100
Committer: Kristian Rosenvold krosenv...@apache.org
Committed: Mon Dec 17 17:59:53 2012 +0100
--
.../src/test/resources/fork-mode/pom.xml |1 +
.../fork-mode/src/test/java/forkMode/Test1.java|4 +++-
2 files changed, 4 insertions(+), 1 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/d9fdcf8d/surefire-integration-tests/src/test/resources/fork-mode/pom.xml
--
diff --git a/surefire-integration-tests/src/test/resources/fork-mode/pom.xml
b/surefire-integration-tests/src/test/resources/fork-mode/pom.xml
index aa37e2c..ca7d365 100644
--- a/surefire-integration-tests/src/test/resources/fork-mode/pom.xml
+++ b/surefire-integration-tests/src/test/resources/fork-mode/pom.xml
@@ -43,6 +43,7 @@
configuration
forkMode${forkMode}/forkMode
threadCount${threadCount}/threadCount
+ runOrderalphabetical/runOrder
/configuration
/plugin
/plugins
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/d9fdcf8d/surefire-integration-tests/src/test/resources/fork-mode/src/test/java/forkMode/Test1.java
--
diff --git
a/surefire-integration-tests/src/test/resources/fork-mode/src/test/java/forkMode/Test1.java
b/surefire-integration-tests/src/test/resources/fork-mode/src/test/java/forkMode/Test1.java
index 01f1151..ca5af55 100644
---
a/surefire-integration-tests/src/test/resources/fork-mode/src/test/java/forkMode/Test1.java
+++
b/surefire-integration-tests/src/test/resources/fork-mode/src/test/java/forkMode/Test1.java
@@ -15,9 +15,11 @@ public class Test1
private static final Random RANDOM = new Random();
public void test1()
-throws IOException
+throws IOException, InterruptedException
{
+Thread.sleep( 750 );
dumpPidFile( this );
+
}
public static void dumpPidFile( TestCase test )
git commit: o m-s-u 0.2
Updated Branches: refs/heads/master d9fdcf8dc - 24eff24de o m-s-u 0.2 Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/24eff24d Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/24eff24d Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/24eff24d Branch: refs/heads/master Commit: 24eff24dead36615c8b9566a9c2ddc17e98a1593 Parents: d9fdcf8 Author: Kristian Rosenvold krosenv...@apache.org Authored: Mon Dec 17 18:01:35 2012 +0100 Committer: Kristian Rosenvold krosenv...@apache.org Committed: Mon Dec 17 18:01:35 2012 +0100 -- pom.xml |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/24eff24d/pom.xml -- diff --git a/pom.xml b/pom.xml index 60e5243..5079ce8 100644 --- a/pom.xml +++ b/pom.xml @@ -231,7 +231,7 @@ dependency groupIdorg.apache.maven.shared/groupId artifactIdmaven-shared-utils/artifactId -version0.2-SNAPSHOT/version +version0.2/version /dependency dependency groupIdjmock/groupId
svn commit: r1423092 - /maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/EffectivePomMojo.java
Author: hboutemy
Date: Mon Dec 17 18:53:49 2012
New Revision: 1423092
URL: http://svn.apache.org/viewvc?rev=1423092view=rev
Log:
o use generics
o use parameter default value instead of property since readonly
Modified:
maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/EffectivePomMojo.java
Modified:
maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/EffectivePomMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/EffectivePomMojo.java?rev=1423092r1=1423091r2=1423092view=diff
==
---
maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/EffectivePomMojo.java
(original)
+++
maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/EffectivePomMojo.java
Mon Dec 17 18:53:49 2012
@@ -39,7 +39,6 @@ import org.jdom.output.XMLOutputter;
import java.io.IOException;
import java.io.StringReader;
import java.io.StringWriter;
-import java.util.Iterator;
import java.util.List;
import java.util.Properties;
@@ -69,8 +68,8 @@ public class EffectivePomMojo
* The projects in the current build. The effective-POM for
* each of these projects will written.
*/
-@Parameter( property = reactorProjects, required = true, readonly = true
)
-private List projects;
+@Parameter( defaultValue = ${reactorProjects}, required = true, readonly
= true )
+private ListMavenProject projects;
// --
// Public methods
@@ -92,10 +91,8 @@ public class EffectivePomMojo
{
// outer root element
writer.startElement( projects );
-for ( Iterator it = projects.iterator(); it.hasNext(); )
+for ( MavenProject subProject : projects )
{
-MavenProject subProject = (MavenProject) it.next();
-
writeEffectivePom( subProject, writer );
}
writer.endElement();
svn commit: r1423197 - /maven/site/trunk/content/apt/plugins/index.apt
Author: rfscholte
Date: Mon Dec 17 22:26:20 2012
New Revision: 1423197
URL: http://svn.apache.org/viewvc?rev=1423197view=rev
Log:
CMS commit to maven by rfscholte
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=1423197r1=1423196r2=1423197view=diff
==
--- maven/site/trunk/content/apt/plugins/index.apt (original)
+++ maven/site/trunk/content/apt/plugins/index.apt Mon Dec 17 22:26:20 2012
@@ -155,7 +155,7 @@ Available Plugins
*--++--++--+++
| {{{/plugin-tools/maven-plugin-plugin/} plugin}}| B+R|
3.2 | 2012-11-11 | Create a Maven plugin descriptor for any mojos
found in the source tree, to include in the JAR. |
{{{http://svn.apache.org/repos/asf/maven/plugin-tools/trunk/maven-plugin-plugin}SVN}}
| {{{http://jira.codehaus.org/browse/MPLUGIN}JIRA}}
*--++--++--+++
-| {{{/plugins/maven-release-plugin/} release}} | B |
2.3.2| 2012-06-15 | Release the current project - updating the POM and
tagging in the SCM. |
{{{http://svn.apache.org/repos/asf/maven/release/trunk/maven-release-plugin}SVN}}
| {{{http://jira.codehaus.org/browse/MRELEASE}JIRA}}
+| {{{/plugins/maven-release-plugin/} release}} | B |
2.4 | 2012-12-16 | Release the current project - updating the POM and
tagging in the SCM. |
{{{http://svn.apache.org/repos/asf/maven/release/trunk/maven-release-plugin}SVN}}
| {{{http://jira.codehaus.org/browse/MRELEASE}JIRA}}
*--++--++--+++
| {{{/plugins/maven-reactor-plugin/} reactor}} | B |
1.0 | 2008-09-27 | Build a subset of interdependent projects in a
reactor |
{{{http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-reactor-plugin}SVN}}
| {{{http://jira.codehaus.org/browse/MREACTOR}JIRA}}
*--++--++--+++
svn commit: r842890 - in /websites/production/maven/content: ./ ant-tasks-archives/ apache-resource-bundles/ archetype-archives/ archetype/ core-its/ enforcer/ jxr/ maven-1.x/ maven-archetype-bundles/
Author: rfscholte Date: Mon Dec 17 22:28:30 2012 New Revision: 842890 Log: Publishing svnmucc operation to maven site by rfscholte Added: websites/production/maven/content/ - copied from r842889, websites/staging/maven/trunk/content/ websites/production/maven/content/ant-tasks - copied unchanged from r842889, websites/production/maven/content/ant-tasks websites/production/maven/content/ant-tasks-archives/ - copied from r842889, websites/production/maven/content/ant-tasks-archives/ websites/production/maven/content/apache-resource-bundles/ - copied from r842889, websites/production/maven/content/apache-resource-bundles/ websites/production/maven/content/archetype/ - copied from r842889, websites/production/maven/content/archetype/ websites/production/maven/content/archetype-archives/ - copied from r842889, websites/production/maven/content/archetype-archives/ websites/production/maven/content/core-its/ - copied from r842889, websites/production/maven/content/core-its/ websites/production/maven/content/enforcer/ - copied from r842889, websites/production/maven/content/enforcer/ websites/production/maven/content/jxr/ - copied from r842889, websites/production/maven/content/jxr/ websites/production/maven/content/maven-1.x/ - copied from r842889, websites/production/maven/content/maven-1.x/ websites/production/maven/content/maven-archetype-bundles/ - copied from r842889, websites/production/maven/content/maven-archetype-bundles/ websites/production/maven/content/maven-indexer/ - copied from r842889, websites/production/maven/content/maven-indexer/ websites/production/maven/content/maven-release/ - copied from r842889, websites/production/maven/content/maven-release/ websites/production/maven/content/maven-release-archives/ - copied from r842889, websites/production/maven/content/maven-release-archives/ websites/production/maven/content/plugin-testing/ - copied from r842889, websites/production/maven/content/plugin-testing/ websites/production/maven/content/plugin-tools/ - copied from r842889, websites/production/maven/content/plugin-tools/ websites/production/maven/content/plugin-tools-archives/ - copied from r842889, websites/production/maven/content/plugin-tools-archives/ websites/production/maven/content/plugins-archives/ - copied from r842889, websites/production/maven/content/plugins-archives/ websites/production/maven/content/plugins/maven-acr-plugin/ - copied from r842889, websites/production/maven/content/plugins/maven-acr-plugin/ websites/production/maven/content/plugins/maven-ant-plugin/ - copied from r842889, websites/production/maven/content/plugins/maven-ant-plugin/ websites/production/maven/content/plugins/maven-antrun-plugin/ - copied from r842889, websites/production/maven/content/plugins/maven-antrun-plugin/ websites/production/maven/content/plugins/maven-archetype-plugin/ - copied from r842889, websites/production/maven/content/plugins/maven-archetype-plugin/ websites/production/maven/content/plugins/maven-assembly-plugin/ - copied from r842889, websites/production/maven/content/plugins/maven-assembly-plugin/ websites/production/maven/content/plugins/maven-changelog-plugin/ - copied from r842889, websites/production/maven/content/plugins/maven-changelog-plugin/ websites/production/maven/content/plugins/maven-changes-plugin/ - copied from r842889, websites/production/maven/content/plugins/maven-changes-plugin/ websites/production/maven/content/plugins/maven-checkstyle-plugin/ - copied from r842889, websites/production/maven/content/plugins/maven-checkstyle-plugin/ websites/production/maven/content/plugins/maven-clean-plugin/ - copied from r842889, websites/production/maven/content/plugins/maven-clean-plugin/ websites/production/maven/content/plugins/maven-compiler-plugin/ - copied from r842889, websites/production/maven/content/plugins/maven-compiler-plugin/ websites/production/maven/content/plugins/maven-dependency-plugin/ - copied from r842889, websites/production/maven/content/plugins/maven-dependency-plugin/ websites/production/maven/content/plugins/maven-deploy-plugin/ - copied from r842889, websites/production/maven/content/plugins/maven-deploy-plugin/ websites/production/maven/content/plugins/maven-doap-plugin/ - copied from r842889, websites/production/maven/content/plugins/maven-doap-plugin/ websites/production/maven/content/plugins/maven-docck-plugin/ - copied from r842889, websites/production/maven/content/plugins/maven-docck-plugin/ websites/production/maven/content/plugins/maven-ear-plugin/ - copied from r842889, websites/production/maven/content/plugins/maven-ear-plugin/
svn commit: r842898 - in /websites/production/maven/content/maven-release: ./ css/ maven-release-manager/ maven-release-manager/apidocs/ maven-release-manager/apidocs/org/apache/maven/shared/release/
Author: rfscholte Date: Mon Dec 17 23:19:13 2012 New Revision: 842898 Log: Apache Maven Release site deployment [This commit notification would consist of 216 parts, which exceeds the limit of 50 ones, so it was shortened to the summary.]
svn commit: r1423261 - /maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/
Author: hboutemy
Date: Tue Dec 18 02:48:07 2012
New Revision: 1423261
URL: http://svn.apache.org/viewvc?rev=1423261view=rev
Log:
o use generics
o use parameter default value instead of property since readonly
Modified:
maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/AbstractEffectiveMojo.java
maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/ActiveProfilesMojo.java
maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/AllProfilesMojo.java
maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/DescribeMojo.java
maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/EffectiveSettingsMojo.java
maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/EvaluateMojo.java
maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/ExpressionsMojo.java
maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/SystemMojo.java
Modified:
maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/AbstractEffectiveMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/AbstractEffectiveMojo.java?rev=1423261r1=1423260r2=1423261view=diff
==
---
maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/AbstractEffectiveMojo.java
(original)
+++
maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/AbstractEffectiveMojo.java
Tue Dec 18 02:48:07 2012
@@ -173,7 +173,7 @@ public abstract class AbstractEffectiveM
}
ElementFilter elementFilter = new ElementFilter(
Namespace.getNamespace( ) );
-for ( Iterator i = rootElement.getDescendants( elementFilter );
i.hasNext(); )
+for ( Iterator? i = rootElement.getDescendants( elementFilter );
i.hasNext(); )
{
Element e = (Element) i.next();
e.setNamespace( pomNamespace );
@@ -206,13 +206,13 @@ public abstract class AbstractEffectiveM
static final long serialVersionUID = -8985316072702233744L;
/** {@inheritDoc} */
-public Set keySet()
+public SetObject keySet()
{
-Set keynames = super.keySet();
+SetObjectkeynames = super.keySet();
Vector list = new Vector( keynames );
Collections.sort( list );
-return new LinkedHashSet( list );
+return new LinkedHashSetObject( list );
}
}
}
Modified:
maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/ActiveProfilesMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/ActiveProfilesMojo.java?rev=1423261r1=1423260r2=1423261view=diff
==
---
maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/ActiveProfilesMojo.java
(original)
+++
maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/ActiveProfilesMojo.java
Tue Dec 18 02:48:07 2012
@@ -28,7 +28,6 @@ import org.apache.maven.project.MavenPro
import java.io.IOException;
import java.util.ArrayList;
import java.util.Date;
-import java.util.Iterator;
import java.util.List;
/**
@@ -48,8 +47,8 @@ public class ActiveProfilesMojo
/**
* This is the list of projects currently slated to be built by Maven.
*/
-@Parameter( property = reactorProjects, required = true, readonly = true
)
-private List projects;
+@Parameter( defaultValue = ${reactorProjects}, required = true, readonly
= true )
+private ListMavenProject projects;
// --
// Public methods
@@ -61,10 +60,8 @@ public class ActiveProfilesMojo
{
StringBuilder message = new StringBuilder();
-for ( Iterator it = projects.iterator(); it.hasNext(); )
+for ( MavenProject project : projects )
{
-MavenProject project = (MavenProject) it.next();
-
getActiveProfileStatement( project, message );
message.append( \n\n );
@@ -114,7 +111,8 @@ public class ActiveProfilesMojo
{
// Get active profiles into our own list,
// since we'll be modifying it, further below
-List profiles = new ArrayList( project.getActiveProfiles() );
+@SuppressWarnings( unchecked )
+ListProfile profiles = new ArrayListProfile(
project.getActiveProfiles() );
message.append( \n );
@@ -128,10 +126,8 @@ public class ActiveProfilesMojo
{
message.append( The following profiles
svn commit: r1423265 - in /maven/plugins/trunk/maven-help-plugin: pom.xml src/main/java/org/apache/maven/plugins/help/LoggerRetriever.java
Author: hboutemy
Date: Tue Dec 18 03:02:18 2012
New Revision: 1423265
URL: http://svn.apache.org/viewvc?rev=1423265view=rev
Log:
use plexus-component-annotations instead of javadoc annotations
Modified:
maven/plugins/trunk/maven-help-plugin/pom.xml
maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/LoggerRetriever.java
Modified: maven/plugins/trunk/maven-help-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-help-plugin/pom.xml?rev=1423265r1=1423264r2=1423265view=diff
==
--- maven/plugins/trunk/maven-help-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-help-plugin/pom.xml Tue Dec 18 03:02:18 2012
@@ -135,6 +135,11 @@ under the License.
/dependency
dependency
groupIdorg.codehaus.plexus/groupId
+ artifactIdplexus-component-annotations/artifactId
+ scopeprovided/scope
+/dependency
+dependency
+ groupIdorg.codehaus.plexus/groupId
artifactIdplexus-interactivity-api/artifactId
version1.0-alpha-4/version
exclusions
Modified:
maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/LoggerRetriever.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/LoggerRetriever.java?rev=1423265r1=1423264r2=1423265view=diff
==
---
maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/LoggerRetriever.java
(original)
+++
maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/LoggerRetriever.java
Tue Dec 18 03:02:18 2012
@@ -19,6 +19,7 @@ package org.apache.maven.plugins.help;
* under the License.
*/
+import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.logging.AbstractLogEnabled;
import org.codehaus.plexus.logging.Logger;
@@ -27,9 +28,8 @@ import org.codehaus.plexus.logging.Logge
* which is problematic with regard to future changes of the container as in
Maven 3.
*
* @author Benjamin Bentmann
- * @plexus.component role=org.apache.maven.plugins.help.LoggerRetriever
role-hint=default
- * instantiation-strategy=per-lookup
*/
+@Component( role = LoggerRetriever.class, hint = default,
instantiationStrategy = per-lookup )
public class LoggerRetriever
extends AbstractLogEnabled
{
git commit: is Slf4jConfiguration.setLoggerFile(File) API useful?
Updated Branches:
refs/heads/master 3849bbd46 - e95060321
is Slf4jConfiguration.setLoggerFile(File) API useful?
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/e9506032
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/e9506032
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/e9506032
Branch: refs/heads/master
Commit: e950603218f6dcf45fdc8e456b2492a2d05ccb68
Parents: 3849bbd
Author: Hervé Boutemy hbout...@apache.org
Authored: Tue Dec 18 04:11:57 2012 +0100
Committer: Hervé Boutemy hbout...@apache.org
Committed: Tue Dec 18 04:11:57 2012 +0100
--
.../main/java/org/apache/maven/cli/MavenCli.java | 11 +++
1 files changed, 7 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven/blob/e9506032/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
--
diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
b/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
index 99ea11b..eb440e4 100644
--- a/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
+++ b/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
@@ -298,9 +298,9 @@ public class MavenCli
}
}
-//
-// All logging is handled by SFL4J
-//
+/**
+ * configure logging
+ */
private void logging( CliRequest cliRequest )
{
cliRequest.debug = cliRequest.commandLine.hasOption( CLIManager.DEBUG
);
@@ -327,7 +327,8 @@ public class MavenCli
{
File logFile = new File( cliRequest.commandLine.getOptionValue(
CLIManager.LOG_FILE ) );
logFile = resolveFile( logFile, cliRequest.workingDirectory );
-slf4jConfiguration.setLoggerFile( logFile );
+
+// redirect stdout and stderr to file
try
{
PrintStream ps = new PrintStream( new FileOutputStream(
logFile ) );
@@ -340,6 +341,8 @@ public class MavenCli
// Ignore
//
}
+
+slf4jConfiguration.setLoggerFile( logFile ); // is it really
useful? redirecting stdout/stderr isn't sufficient in all cases?
}
plexusLoggerManager = new Slf4jLoggerManager();
git commit: created Slf4jConfiguration.Level enum to replace int
Updated Branches:
refs/heads/master e95060321 - 8112e6a83
created Slf4jConfiguration.Level enum to replace int
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/8112e6a8
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/8112e6a8
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/8112e6a8
Branch: refs/heads/master
Commit: 8112e6a83544fe8acdd7efd973200157c1e7ca04
Parents: e950603
Author: Hervé Boutemy hbout...@apache.org
Authored: Tue Dec 18 04:23:52 2012 +0100
Committer: Hervé Boutemy hbout...@apache.org
Committed: Tue Dec 18 04:23:52 2012 +0100
--
.../main/java/org/apache/maven/cli/MavenCli.java |6 +++---
.../cli/logging/AbstractSlf4jConfiguration.java|2 +-
.../maven/cli/logging/Slf4jConfiguration.java | 11 ---
.../cli/logging/impl/Slf4jSimpleConfiguration.java |9 -
4 files changed, 12 insertions(+), 16 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven/blob/8112e6a8/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
--
diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
b/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
index eb440e4..23d2ba1 100644
--- a/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
+++ b/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
@@ -310,17 +310,17 @@ public class MavenCli
if ( cliRequest.debug )
{
cliRequest.request.setLoggingLevel(
MavenExecutionRequest.LOGGING_LEVEL_DEBUG );
-slf4jConfiguration.setRootLoggerLevel(
MavenExecutionRequest.LOGGING_LEVEL_DEBUG );
+slf4jConfiguration.setRootLoggerLevel(
Slf4jConfiguration.Level.DEBUG );
}
else if ( cliRequest.quiet )
{
cliRequest.request.setLoggingLevel(
MavenExecutionRequest.LOGGING_LEVEL_ERROR );
-slf4jConfiguration.setRootLoggerLevel(
MavenExecutionRequest.LOGGING_LEVEL_ERROR );
+slf4jConfiguration.setRootLoggerLevel(
Slf4jConfiguration.Level.ERROR );
}
else
{
cliRequest.request.setLoggingLevel(
MavenExecutionRequest.LOGGING_LEVEL_INFO );
-slf4jConfiguration.setRootLoggerLevel(
MavenExecutionRequest.LOGGING_LEVEL_INFO );
+slf4jConfiguration.setRootLoggerLevel(
Slf4jConfiguration.Level.INFO );
}
if ( cliRequest.commandLine.hasOption( CLIManager.LOG_FILE ) )
http://git-wip-us.apache.org/repos/asf/maven/blob/8112e6a8/maven-embedder/src/main/java/org/apache/maven/cli/logging/AbstractSlf4jConfiguration.java
--
diff --git
a/maven-embedder/src/main/java/org/apache/maven/cli/logging/AbstractSlf4jConfiguration.java
b/maven-embedder/src/main/java/org/apache/maven/cli/logging/AbstractSlf4jConfiguration.java
index 2b2ef6d..4f89a94 100644
---
a/maven-embedder/src/main/java/org/apache/maven/cli/logging/AbstractSlf4jConfiguration.java
+++
b/maven-embedder/src/main/java/org/apache/maven/cli/logging/AbstractSlf4jConfiguration.java
@@ -34,7 +34,7 @@ public class AbstractSlf4jConfiguration
{
private final Logger logger = LoggerFactory.getLogger(
AbstractSlf4jConfiguration.class );
-public void setRootLoggerLevel( int level )
+public void setRootLoggerLevel( Level level )
{
logger.warn( setRootLoggerLevel: operation not supported );
}
http://git-wip-us.apache.org/repos/asf/maven/blob/8112e6a8/maven-embedder/src/main/java/org/apache/maven/cli/logging/Slf4jConfiguration.java
--
diff --git
a/maven-embedder/src/main/java/org/apache/maven/cli/logging/Slf4jConfiguration.java
b/maven-embedder/src/main/java/org/apache/maven/cli/logging/Slf4jConfiguration.java
index e153c96..1ab596f 100644
---
a/maven-embedder/src/main/java/org/apache/maven/cli/logging/Slf4jConfiguration.java
+++
b/maven-embedder/src/main/java/org/apache/maven/cli/logging/Slf4jConfiguration.java
@@ -20,8 +20,6 @@ package org.apache.maven.cli.logging;
*/
import java.io.File;
-import org.apache.maven.execution.MavenExecutionRequest;
-import org.codehaus.plexus.logging.Logger;
/**
* Interface for configuration operations on loggers, which are not available
in slf4j, then require per-slf4f-binding
@@ -31,15 +29,14 @@ import org.codehaus.plexus.logging.Logger;
*/
public interface Slf4jConfiguration
{
+public static enum Level { DEBUG, INFO, ERROR }
+
/**
* Set root logging level.
*
- * @param level the level as defined in Plexus codeLogger.LEVEL_*/code
and equivalent
- * codeMavenExecutionRequest.LOGGING_LEVEL_*/code constants.
-
git commit: mark @Override
Updated Branches:
refs/heads/master 9eeb09838 - eb190f029
mark @Override
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/eb190f02
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/eb190f02
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/eb190f02
Branch: refs/heads/master
Commit: eb190f029539efd95d5714298adb6752bf7ccf48
Parents: 9eeb098
Author: Hervé Boutemy hbout...@apache.org
Authored: Tue Dec 18 04:35:48 2012 +0100
Committer: Hervé Boutemy hbout...@apache.org
Committed: Tue Dec 18 04:35:48 2012 +0100
--
.../cli/logging/impl/Slf4jSimpleConfiguration.java |2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven/blob/eb190f02/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/Slf4jSimpleConfiguration.java
--
diff --git
a/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/Slf4jSimpleConfiguration.java
b/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/Slf4jSimpleConfiguration.java
index 52887fc..9012394 100644
---
a/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/Slf4jSimpleConfiguration.java
+++
b/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/Slf4jSimpleConfiguration.java
@@ -31,6 +31,7 @@ import
org.apache.maven.cli.logging.AbstractSlf4jConfiguration;
public class Slf4jSimpleConfiguration
extends AbstractSlf4jConfiguration
{
+@Override
public void setRootLoggerLevel( Level level )
{
String value = info;
@@ -51,6 +52,7 @@ public class Slf4jSimpleConfiguration
System.setProperty( org.slf4j.simpleLogger.defaultLogLevel, value );
}
+@Override
public void setLoggerFile( File output )
{
System.setProperty( org.slf4j.simpleLogger.logFile,
output.getAbsolutePath() );
