[2/2] git commit: o Removed incorrect comment
o Removed incorrect comment Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/02d09642 Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/02d09642 Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/02d09642 Branch: refs/heads/master Commit: 02d09642c5cde263cd8ebf671335d5e62906b36f Parents: cd35301 Author: Kristian Rosenvold Authored: Wed Dec 19 03:12:46 2012 +0100 Committer: Kristian Rosenvold Committed: Wed Dec 19 03:12:46 2012 +0100 -- surefire-setup-integration-tests/pom.xml |1 - 1 files changed, 0 insertions(+), 1 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/02d09642/surefire-setup-integration-tests/pom.xml -- diff --git a/surefire-setup-integration-tests/pom.xml b/surefire-setup-integration-tests/pom.xml index 2fad52f..328120b 100644 --- a/surefire-setup-integration-tests/pom.xml +++ b/surefire-setup-integration-tests/pom.xml @@ -184,7 +184,6 @@ junit:junit-dep:4.8 junit:junit-dep:4.7 junit:junit-dep:4.4 - org.apache.maven.plugins:maven-surefire-plugin:2.10 org.apache.maven.surefire:surefire-junit3:2.10 org.codehaus.plexus:plexus-utils:1.0.4
[1/2] git commit: Revert "o Temporarily reverted to the boring verifier 1.3 to allow release now"
Updated Branches:
refs/heads/master cd35301a0 -> 349cff263
Revert "o Temporarily reverted to the boring verifier 1.3 to allow release now"
Reverting wasnt as easy as I thought, just wait for verifier 1.4 to pass vote.
This reverts commit cd35301a0affe10ee73acd37f3704cae901fe3eb.
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/349cff26
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/349cff26
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/349cff26
Branch: refs/heads/master
Commit: 349cff26392b425e2d1753b3e036efd593feb989
Parents: 02d0964
Author: Kristian Rosenvold
Authored: Wed Dec 19 03:13:07 2012 +0100
Committer: Kristian Rosenvold
Committed: Wed Dec 19 03:13:07 2012 +0100
--
surefire-integration-tests/pom.xml |2 +-
.../maven/surefire/its/fixture/MavenLauncher.java |2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/349cff26/surefire-integration-tests/pom.xml
--
diff --git a/surefire-integration-tests/pom.xml
b/surefire-integration-tests/pom.xml
index a0ab513..55191dd 100644
--- a/surefire-integration-tests/pom.xml
+++ b/surefire-integration-tests/pom.xml
@@ -46,7 +46,7 @@
org.apache.maven.shared
maven-verifier
- 1.3
+ 1.4-SNAPSHOT
org.apache.maven
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/349cff26/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/MavenLauncher.java
--
diff --git
a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/MavenLauncher.java
b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/MavenLauncher.java
index dd6f587..bbf910c 100755
---
a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/MavenLauncher.java
+++
b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/MavenLauncher.java
@@ -404,7 +404,7 @@ public class MavenLauncher
try
{
FileUtils.deleteDirectory( testDir );
-File file = ResourceExtractor.extractResourcePath( cl,
resourcePath, tempDir, true );
+File file = ResourceExtractor.extractResourceToDestination( cl,
resourcePath, tempDir, true );
return file.getCanonicalFile();
}
catch ( IOException e )
git commit: added Logback support
Updated Branches:
refs/heads/master 326992869 -> 0ab0641d3
added Logback support
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/0ab0641d
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/0ab0641d
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/0ab0641d
Branch: refs/heads/master
Commit: 0ab0641d3f1db429e00079a91564dd4d3b5b5072
Parents: 3269928
Author: Hervé Boutemy
Authored: Wed Dec 19 00:36:27 2012 +0100
Committer: Hervé Boutemy
Committed: Wed Dec 19 00:36:27 2012 +0100
--
maven-embedder/pom.xml |6 ++
.../cli/logging/impl/LogbackConfiguration.java | 62 +++
.../META-INF/maven/slf4j-configuration.properties |3 +-
3 files changed, 70 insertions(+), 1 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven/blob/0ab0641d/maven-embedder/pom.xml
--
diff --git a/maven-embedder/pom.xml b/maven-embedder/pom.xml
index 587398f..c95eb87 100644
--- a/maven-embedder/pom.xml
+++ b/maven-embedder/pom.xml
@@ -74,6 +74,12 @@
org.slf4j
slf4j-api
+
+ ch.qos.logback
+ logback-classic
+ 1.0.7
+ true
+
commons-cli
http://git-wip-us.apache.org/repos/asf/maven/blob/0ab0641d/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/LogbackConfiguration.java
--
diff --git
a/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/LogbackConfiguration.java
b/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/LogbackConfiguration.java
new file mode 100644
index 000..2d60b75
--- /dev/null
+++
b/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/LogbackConfiguration.java
@@ -0,0 +1,62 @@
+package org.apache.maven.cli.logging.impl;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import java.io.File;
+
+import org.apache.maven.cli.logging.BaseSlf4jConfiguration;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Configuration for slf4j-logback.
+ *
+ * @author Hervé Boutemy
+ */
+public class LogbackConfiguration
+extends BaseSlf4jConfiguration
+{
+@Override
+public void setRootLoggerLevel( Level level )
+{
+ch.qos.logback.classic.Level value = ch.qos.logback.classic.Level.INFO;
+switch ( level )
+{
+case DEBUG:
+value = ch.qos.logback.classic.Level.DEBUG;
+break;
+
+case INFO:
+value = ch.qos.logback.classic.Level.INFO;
+break;
+
+case ERROR:
+value = ch.qos.logback.classic.Level.ERROR;
+break;
+}
+( (ch.qos.logback.classic.Logger) LoggerFactory.getLogger(
Logger.ROOT_LOGGER_NAME ) ).setLevel( value );
+}
+
+@Override
+public void setLoggerFile( File output )
+{
+// no op
+}
+}
http://git-wip-us.apache.org/repos/asf/maven/blob/0ab0641d/maven-embedder/src/main/resources/META-INF/maven/slf4j-configuration.properties
--
diff --git
a/maven-embedder/src/main/resources/META-INF/maven/slf4j-configuration.properties
b/maven-embedder/src/main/resources/META-INF/maven/slf4j-configuration.properties
index 150c15b..5a6a12f 100644
---
a/maven-embedder/src/main/resources/META-INF/maven/slf4j-configuration.properties
+++
b/maven-embedder/src/main/resources/META-INF/maven/slf4j-configuration.properties
@@ -1,4 +1,5 @@
# key = Slf4j effective logger factory implementation
# value = corresponding o.a.m.cli.logging.Slf4jConfiguration class
org.slf4j.impl.SimpleLoggerFactory
org.apache.maven.cli.logging.impl.Slf4jSimpleConfiguration
-org.slf4j.helpers.Log4JLoggerFactory
org.apache.maven.cli.logging.impl.Log4j2Configuration
\ No newline at end of file
+org.slf4j.helpers.Log4JLoggerFactory
org.apache.maven.cli.logging.impl.Log4
git commit: added log4j2 configuration support
Updated Branches:
refs/heads/master 3511b09d1 -> 326992869
added log4j2 configuration support
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/32699286
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/32699286
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/32699286
Branch: refs/heads/master
Commit: 32699286999ee7c35bfe6f1768cce2732ceab337
Parents: 3511b09
Author: Hervé Boutemy
Authored: Wed Dec 19 00:09:04 2012 +0100
Committer: Hervé Boutemy
Committed: Wed Dec 19 00:09:04 2012 +0100
--
.../cli/logging/impl/Log4j2Configuration.java | 60 +++
.../META-INF/maven/slf4j-configuration.properties |1 +
2 files changed, 61 insertions(+), 0 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven/blob/32699286/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/Log4j2Configuration.java
--
diff --git
a/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/Log4j2Configuration.java
b/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/Log4j2Configuration.java
new file mode 100644
index 000..c1d1275
--- /dev/null
+++
b/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/Log4j2Configuration.java
@@ -0,0 +1,60 @@
+package org.apache.maven.cli.logging.impl;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import java.io.File;
+
+import org.apache.maven.cli.logging.BaseSlf4jConfiguration;
+
+/**
+ * Configuration for slf4j-log4j2.
+ *
+ * @author Hervé Boutemy
+ */
+public class Log4j2Configuration
+extends BaseSlf4jConfiguration
+{
+@Override
+public void setRootLoggerLevel( Level level )
+{
+String value = "info";
+switch ( level )
+{
+case DEBUG:
+value = "debug";
+break;
+
+case INFO:
+value = "info";
+break;
+
+case ERROR:
+value = "error";
+break;
+}
+System.setProperty( "maven.logging.root.level", value );
+}
+
+@Override
+public void setLoggerFile( File output )
+{
+// no op
+}
+}
http://git-wip-us.apache.org/repos/asf/maven/blob/32699286/maven-embedder/src/main/resources/META-INF/maven/slf4j-configuration.properties
--
diff --git
a/maven-embedder/src/main/resources/META-INF/maven/slf4j-configuration.properties
b/maven-embedder/src/main/resources/META-INF/maven/slf4j-configuration.properties
index 07d06e8..150c15b 100644
---
a/maven-embedder/src/main/resources/META-INF/maven/slf4j-configuration.properties
+++
b/maven-embedder/src/main/resources/META-INF/maven/slf4j-configuration.properties
@@ -1,3 +1,4 @@
# key = Slf4j effective logger factory implementation
# value = corresponding o.a.m.cli.logging.Slf4jConfiguration class
org.slf4j.impl.SimpleLoggerFactory
org.apache.maven.cli.logging.impl.Slf4jSimpleConfiguration
+org.slf4j.helpers.Log4JLoggerFactory
org.apache.maven.cli.logging.impl.Log4j2Configuration
\ No newline at end of file
svn commit: r843031 - 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: Tue Dec 18 22:59:16 2012 New Revision: 843031 Log: Publishing svnmucc operation to maven site by rfscholte Added: websites/production/maven/content/ - copied from r843030, websites/staging/maven/trunk/content/ websites/production/maven/content/ant-tasks - copied unchanged from r843030, websites/production/maven/content/ant-tasks websites/production/maven/content/ant-tasks-archives/ - copied from r843030, websites/production/maven/content/ant-tasks-archives/ websites/production/maven/content/apache-resource-bundles/ - copied from r843030, websites/production/maven/content/apache-resource-bundles/ websites/production/maven/content/archetype/ - copied from r843030, websites/production/maven/content/archetype/ websites/production/maven/content/archetype-archives/ - copied from r843030, websites/production/maven/content/archetype-archives/ websites/production/maven/content/core-its/ - copied from r843030, websites/production/maven/content/core-its/ websites/production/maven/content/enforcer/ - copied from r843030, websites/production/maven/content/enforcer/ websites/production/maven/content/jxr/ - copied from r843030, websites/production/maven/content/jxr/ websites/production/maven/content/maven-1.x/ - copied from r843030, websites/production/maven/content/maven-1.x/ websites/production/maven/content/maven-archetype-bundles/ - copied from r843030, websites/production/maven/content/maven-archetype-bundles/ websites/production/maven/content/maven-indexer/ - copied from r843030, websites/production/maven/content/maven-indexer/ websites/production/maven/content/maven-release/ - copied from r843030, websites/production/maven/content/maven-release/ websites/production/maven/content/maven-release-archives/ - copied from r843030, websites/production/maven/content/maven-release-archives/ websites/production/maven/content/plugin-testing/ - copied from r843030, websites/production/maven/content/plugin-testing/ websites/production/maven/content/plugin-tools/ - copied from r843030, websites/production/maven/content/plugin-tools/ websites/production/maven/content/plugin-tools-archives/ - copied from r843030, websites/production/maven/content/plugin-tools-archives/ websites/production/maven/content/plugins-archives/ - copied from r843030, websites/production/maven/content/plugins-archives/ websites/production/maven/content/plugins/maven-acr-plugin/ - copied from r843030, websites/production/maven/content/plugins/maven-acr-plugin/ websites/production/maven/content/plugins/maven-ant-plugin/ - copied from r843030, websites/production/maven/content/plugins/maven-ant-plugin/ websites/production/maven/content/plugins/maven-antrun-plugin/ - copied from r843030, websites/production/maven/content/plugins/maven-antrun-plugin/ websites/production/maven/content/plugins/maven-archetype-plugin/ - copied from r843030, websites/production/maven/content/plugins/maven-archetype-plugin/ websites/production/maven/content/plugins/maven-assembly-plugin/ - copied from r843030, websites/production/maven/content/plugins/maven-assembly-plugin/ websites/production/maven/content/plugins/maven-changelog-plugin/ - copied from r843030, websites/production/maven/content/plugins/maven-changelog-plugin/ websites/production/maven/content/plugins/maven-changes-plugin/ - copied from r843030, websites/production/maven/content/plugins/maven-changes-plugin/ websites/production/maven/content/plugins/maven-checkstyle-plugin/ - copied from r843030, websites/production/maven/content/plugins/maven-checkstyle-plugin/ websites/production/maven/content/plugins/maven-clean-plugin/ - copied from r843030, websites/production/maven/content/plugins/maven-clean-plugin/ websites/production/maven/content/plugins/maven-compiler-plugin/ - copied from r843030, websites/production/maven/content/plugins/maven-compiler-plugin/ websites/production/maven/content/plugins/maven-dependency-plugin/ - copied from r843030, websites/production/maven/content/plugins/maven-dependency-plugin/ websites/production/maven/content/plugins/maven-deploy-plugin/ - copied from r843030, websites/production/maven/content/plugins/maven-deploy-plugin/ websites/production/maven/content/plugins/maven-doap-plugin/ - copied from r843030, websites/production/maven/content/plugins/maven-doap-plugin/ websites/production/maven/content/plugins/maven-docck-plugin/ - copied from r843030, websites/production/maven/content/plugins/maven-docck-plugin/ websites/production/maven/content/plugins/maven-ear-plugin/ - copied from r843030, websites/production/maven/content/plugins/maven-ear-plugin/ websites/production/maven/content/plugins/maven-eclipse-plu
svn commit: r843030 - in /websites/staging/maven/trunk/content: ./ developers/website/deploy-maven-website.html maven-site-1.0-site.jar
Author: buildbot Date: Tue Dec 18 22:57:50 2012 New Revision: 843030 Log: Staging update by buildbot for maven Modified: websites/staging/maven/trunk/content/ (props changed) websites/staging/maven/trunk/content/developers/website/deploy-maven-website.html websites/staging/maven/trunk/content/maven-site-1.0-site.jar Propchange: websites/staging/maven/trunk/content/ -- --- cms:source-revision (original) +++ cms:source-revision Tue Dec 18 22:57:50 2012 @@ -1 +1 @@ -1423570 +1423703 Modified: websites/staging/maven/trunk/content/developers/website/deploy-maven-website.html == --- websites/staging/maven/trunk/content/developers/website/deploy-maven-website.html (original) +++ websites/staging/maven/trunk/content/developers/website/deploy-maven-website.html Tue Dec 18 22:57:50 2012 @@ -229,7 +229,7 @@ -IntroductionThis document gives step-by-step instructions for deploying the Maven website http://maven.apache.org";>http://maven.apache.org.Since 10th Decemeber 2012, the main website use CMS mechanism. (see https://cms.apache.org/maven";>https://cms.apache.org/maven).You can edit pages in two ways:use the CMS UI.checkout the content locally and modify manually.How it worksAt least how a user understand that.All the content is located here https://svn.apache.org/repos/infra/websites/production/maven/content/ then synced to lives machines.For parts edited/build with CMS, two buildbot jobs build the content via using Maven site plugin:http://ci.apache.org/builders/ma ven-site-staging">http://ci.apache.org/builders/maven-site-staginghttp://ci.apache.org/builders/maven-doxia-site-staging";>http://ci.apache.org/builders/maven-doxia-site-stagingOther parts can committed to the content source tree.As CMS will delete non build content, they must be ignored with adding paths in extpaths.txt file (located in site and doxia-site in path content/resources)Modify Maven Website with CMS UIGo to https://cms.apache.org/maven";>https://cms.apache.org/maven.Click link "Get maven Working Copy"Now navigate to the content you want to modifyOnce you have modify the content, you can now commit with the button "Submit".Modify Maven Website with a local copyDo a fresh check out of the Maven site, for example:$ svn checkout https://svn.apache.org/repos/asf/maven/site siteExecute the site goalsite$ mvn site Verify the documentation before committingPublish contentVerify staging content has been build with buildbot job http://ci.apache.org/builders/maven-site-staging";>http://ci.apache.org/builders/maven-site-stagingBuild finish, publish modifications using https://cms.apache.org/maven/publish";>https://cms.apache.org/maven/publish +IntroductionThis document gives step-by-step instructions for deploying the Maven website http://maven.apache.org";>http://maven.apache.org.Since 10th Decemeber 2012, the main website use CMS mechanism. (see https://cms.apache.org/maven";>https://cms.apache.org/maven).You can edit pages in two ways:use the CMS UI.checkout the content locally and modify manually.How it worksAt least how a user understand that.All the content is located here https://svn.apache.org/repos/infra/websites/production/maven/content/ then synced to lives machines.For parts edited/build with CMS, two buildbot jobs build the content via using Maven site plugin:http://ci.apache.org/builders/ma ven-site-staging">http://ci.apache.org/builders/maven-site-staginghttp://ci.apache.org/builders/maven-doxia-site-staging";>http://ci.apache.org/builders/maven-doxia-site-stagingOther parts can committed to the content source tree.As CMS will delete non build content, they must be ignored with adding paths in extpaths.txt file (located in site and doxia-site in path content/resources)Modify Maven Website with CMS UIGo to https://cms.apache.org/maven";>https://cms.apache.org/maven.Click link "Get maven Working Copy"Now navigate to the content you want to modifyOnce you have modify the content, you can now commit with the button "Submit".Modify Maven Website with a local copyDo a fresh check out of the Maven site, for example:$ svn checkout https://svn.apache.org/repos/asf/maven/site siteExecute the site goalsite$ mvn site Verify the documentation before committingPublish contentVerify staging content has been build with buildbot job http://ci.apache.org/builders/maven-site-staging";>http://ci.apache.org/builders/maven-site-staging and http://maven.staging.apache.org/plugins/";>http://maven.staging.apache.org/plugins/ Build finish, publish modifications using https://cms.apache.org/maven/publish";>https://cms.apache.org/maven/publish Modified: websites/staging/maven/trunk/content/maven-site-1.0-site.jar =
svn commit: r1423703 - /maven/site/trunk/content/apt/developers/website/deploy-maven-website.apt
Author: rfscholte
Date: Tue Dec 18 22:56:04 2012
New Revision: 1423703
URL: http://svn.apache.org/viewvc?rev=1423703&view=rev
Log:
CMS commit to maven by rfscholte
Modified:
maven/site/trunk/content/apt/developers/website/deploy-maven-website.apt
Modified:
maven/site/trunk/content/apt/developers/website/deploy-maven-website.apt
URL:
http://svn.apache.org/viewvc/maven/site/trunk/content/apt/developers/website/deploy-maven-website.apt?rev=1423703&r1=1423702&r2=1423703&view=diff
==
--- maven/site/trunk/content/apt/developers/website/deploy-maven-website.apt
(original)
+++ maven/site/trunk/content/apt/developers/website/deploy-maven-website.apt
Tue Dec 18 22:56:04 2012
@@ -88,6 +88,6 @@ site$ mvn site
Publish content
- * Verify staging content has been build with buildbot job
{{{http://ci.apache.org/builders/maven-site-staging}http://ci.apache.org/builders/maven-site-staging}}
+ * Verify staging content has been build with buildbot job
{{http://ci.apache.org/builders/maven-site-staging}} and
{{http://maven.staging.apache.org/plugins/}}
- * Build finish, publish modifications using
{{{https://cms.apache.org/maven/publish}https://cms.apache.org/maven/publish}}
\ No newline at end of file
+ * Build finish, publish modifications using
{{https://cms.apache.org/maven/publish}}
\ No newline at end of file
svn commit: r843029 - 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: Tue Dec 18 22:50:35 2012 New Revision: 843029 Log: Publishing svnmucc operation to maven site by rfscholte Added: websites/production/maven/content/ - copied from r843028, websites/staging/maven/trunk/content/ websites/production/maven/content/ant-tasks - copied unchanged from r843028, websites/production/maven/content/ant-tasks websites/production/maven/content/ant-tasks-archives/ - copied from r843028, websites/production/maven/content/ant-tasks-archives/ websites/production/maven/content/apache-resource-bundles/ - copied from r843028, websites/production/maven/content/apache-resource-bundles/ websites/production/maven/content/archetype/ - copied from r843028, websites/production/maven/content/archetype/ websites/production/maven/content/archetype-archives/ - copied from r843028, websites/production/maven/content/archetype-archives/ websites/production/maven/content/core-its/ - copied from r843028, websites/production/maven/content/core-its/ websites/production/maven/content/enforcer/ - copied from r843028, websites/production/maven/content/enforcer/ websites/production/maven/content/jxr/ - copied from r843028, websites/production/maven/content/jxr/ websites/production/maven/content/maven-1.x/ - copied from r843028, websites/production/maven/content/maven-1.x/ websites/production/maven/content/maven-archetype-bundles/ - copied from r843028, websites/production/maven/content/maven-archetype-bundles/ websites/production/maven/content/maven-indexer/ - copied from r843028, websites/production/maven/content/maven-indexer/ websites/production/maven/content/maven-release/ - copied from r843028, websites/production/maven/content/maven-release/ websites/production/maven/content/maven-release-archives/ - copied from r843028, websites/production/maven/content/maven-release-archives/ websites/production/maven/content/plugin-testing/ - copied from r843028, websites/production/maven/content/plugin-testing/ websites/production/maven/content/plugin-tools/ - copied from r843028, websites/production/maven/content/plugin-tools/ websites/production/maven/content/plugin-tools-archives/ - copied from r843028, websites/production/maven/content/plugin-tools-archives/ websites/production/maven/content/plugins-archives/ - copied from r843028, websites/production/maven/content/plugins-archives/ websites/production/maven/content/plugins/maven-acr-plugin/ - copied from r843028, websites/production/maven/content/plugins/maven-acr-plugin/ websites/production/maven/content/plugins/maven-ant-plugin/ - copied from r843028, websites/production/maven/content/plugins/maven-ant-plugin/ websites/production/maven/content/plugins/maven-antrun-plugin/ - copied from r843028, websites/production/maven/content/plugins/maven-antrun-plugin/ websites/production/maven/content/plugins/maven-archetype-plugin/ - copied from r843028, websites/production/maven/content/plugins/maven-archetype-plugin/ websites/production/maven/content/plugins/maven-assembly-plugin/ - copied from r843028, websites/production/maven/content/plugins/maven-assembly-plugin/ websites/production/maven/content/plugins/maven-changelog-plugin/ - copied from r843028, websites/production/maven/content/plugins/maven-changelog-plugin/ websites/production/maven/content/plugins/maven-changes-plugin/ - copied from r843028, websites/production/maven/content/plugins/maven-changes-plugin/ websites/production/maven/content/plugins/maven-checkstyle-plugin/ - copied from r843028, websites/production/maven/content/plugins/maven-checkstyle-plugin/ websites/production/maven/content/plugins/maven-clean-plugin/ - copied from r843028, websites/production/maven/content/plugins/maven-clean-plugin/ websites/production/maven/content/plugins/maven-compiler-plugin/ - copied from r843028, websites/production/maven/content/plugins/maven-compiler-plugin/ websites/production/maven/content/plugins/maven-dependency-plugin/ - copied from r843028, websites/production/maven/content/plugins/maven-dependency-plugin/ websites/production/maven/content/plugins/maven-deploy-plugin/ - copied from r843028, websites/production/maven/content/plugins/maven-deploy-plugin/ websites/production/maven/content/plugins/maven-doap-plugin/ - copied from r843028, websites/production/maven/content/plugins/maven-doap-plugin/ websites/production/maven/content/plugins/maven-docck-plugin/ - copied from r843028, websites/production/maven/content/plugins/maven-docck-plugin/ websites/production/maven/content/plugins/maven-ear-plugin/ - copied from r843028, websites/production/maven/content/plugins/maven-ear-plugin/ websites/production/maven/content/plugins/maven-eclipse-plu
git commit: added Slf4jConfigurationFactory to detect actual slf4j logging implementation and load appropriate Slf4jConfiguration implementation from META-INF/maven/slf4j-configuration.properties
Updated Branches:
refs/heads/master eb190f029 -> 3511b09d1
added Slf4jConfigurationFactory to detect actual slf4j logging
implementation and load appropriate Slf4jConfiguration implementation
from META-INF/maven/slf4j-configuration.properties
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/3511b09d
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/3511b09d
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/3511b09d
Branch: refs/heads/master
Commit: 3511b09d1e0fbea5a6e77593c297704a0b77600c
Parents: eb190f0
Author: Hervé Boutemy
Authored: Tue Dec 18 23:44:18 2012 +0100
Committer: Hervé Boutemy
Committed: Tue Dec 18 23:44:18 2012 +0100
--
.../main/java/org/apache/maven/cli/MavenCli.java |8 +-
.../cli/logging/AbstractSlf4jConfiguration.java| 46
.../maven/cli/logging/BaseSlf4jConfiguration.java | 46
.../cli/logging/Slf4jConfigurationFactory.java | 81 +++
.../cli/logging/impl/Slf4jSimpleConfiguration.java |4 +-
.../META-INF/maven/slf4j-configuration.properties |3 +
6 files changed, 136 insertions(+), 52 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven/blob/3511b09d/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 23d2ba1..6737463 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
@@ -40,9 +40,9 @@ import org.apache.maven.Maven;
import org.apache.maven.cli.event.DefaultEventSpyContext;
import org.apache.maven.cli.event.ExecutionEventLogger;
import org.apache.maven.cli.logging.Slf4jConfiguration;
+import org.apache.maven.cli.logging.Slf4jConfigurationFactory;
import org.apache.maven.cli.logging.Slf4jLoggerManager;
import org.apache.maven.cli.logging.Slf4jStdoutLogger;
-import org.apache.maven.cli.logging.impl.Slf4jSimpleConfiguration;
import org.apache.maven.cli.transfer.ConsoleMavenTransferListener;
import org.apache.maven.cli.transfer.QuietMavenTransferListener;
import org.apache.maven.cli.transfer.Slf4jMavenTransferListener;
@@ -133,8 +133,6 @@ public class MavenCli
private DefaultSecDispatcher dispatcher;
-private Slf4jConfiguration slf4jConfiguration = new
Slf4jSimpleConfiguration();
-
public MavenCli()
{
this( null );
@@ -307,6 +305,9 @@ public class MavenCli
cliRequest.quiet = !cliRequest.debug &&
cliRequest.commandLine.hasOption( CLIManager.QUIET );
cliRequest.showErrors = cliRequest.debug ||
cliRequest.commandLine.hasOption( CLIManager.ERRORS );
+slf4jLoggerFactory = LoggerFactory.getILoggerFactory();
+Slf4jConfiguration slf4jConfiguration =
Slf4jConfigurationFactory.getConfiguration( slf4jLoggerFactory );
+
if ( cliRequest.debug )
{
cliRequest.request.setLoggingLevel(
MavenExecutionRequest.LOGGING_LEVEL_DEBUG );
@@ -346,7 +347,6 @@ public class MavenCli
}
plexusLoggerManager = new Slf4jLoggerManager();
-slf4jLoggerFactory = LoggerFactory.getILoggerFactory();
slf4jLogger = slf4jLoggerFactory.getLogger( this.getClass().getName()
);
}
http://git-wip-us.apache.org/repos/asf/maven/blob/3511b09d/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
deleted file mode 100644
index 4f89a94..000
---
a/maven-embedder/src/main/java/org/apache/maven/cli/logging/AbstractSlf4jConfiguration.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package org.apache.maven.cli.logging;
-
-/*
- * 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 permission
svn commit: r843003 - 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: Tue Dec 18 18:35:09 2012 New Revision: 843003 Log: Publishing svnmucc operation to maven site by rfscholte Added: websites/production/maven/content/ - copied from r843002, websites/staging/maven/trunk/content/ websites/production/maven/content/ant-tasks - copied unchanged from r843002, websites/production/maven/content/ant-tasks websites/production/maven/content/ant-tasks-archives/ - copied from r843002, websites/production/maven/content/ant-tasks-archives/ websites/production/maven/content/apache-resource-bundles/ - copied from r843002, websites/production/maven/content/apache-resource-bundles/ websites/production/maven/content/archetype/ - copied from r843002, websites/production/maven/content/archetype/ websites/production/maven/content/archetype-archives/ - copied from r843002, websites/production/maven/content/archetype-archives/ websites/production/maven/content/core-its/ - copied from r843002, websites/production/maven/content/core-its/ websites/production/maven/content/enforcer/ - copied from r843002, websites/production/maven/content/enforcer/ websites/production/maven/content/jxr/ - copied from r843002, websites/production/maven/content/jxr/ websites/production/maven/content/maven-1.x/ - copied from r843002, websites/production/maven/content/maven-1.x/ websites/production/maven/content/maven-archetype-bundles/ - copied from r843002, websites/production/maven/content/maven-archetype-bundles/ websites/production/maven/content/maven-indexer/ - copied from r843002, websites/production/maven/content/maven-indexer/ websites/production/maven/content/maven-release/ - copied from r843002, websites/production/maven/content/maven-release/ websites/production/maven/content/maven-release-archives/ - copied from r843002, websites/production/maven/content/maven-release-archives/ websites/production/maven/content/plugin-testing/ - copied from r843002, websites/production/maven/content/plugin-testing/ websites/production/maven/content/plugin-tools/ - copied from r843002, websites/production/maven/content/plugin-tools/ websites/production/maven/content/plugin-tools-archives/ - copied from r843002, websites/production/maven/content/plugin-tools-archives/ websites/production/maven/content/plugins-archives/ - copied from r843002, websites/production/maven/content/plugins-archives/ websites/production/maven/content/plugins/maven-acr-plugin/ - copied from r843002, websites/production/maven/content/plugins/maven-acr-plugin/ websites/production/maven/content/plugins/maven-ant-plugin/ - copied from r843002, websites/production/maven/content/plugins/maven-ant-plugin/ websites/production/maven/content/plugins/maven-antrun-plugin/ - copied from r843002, websites/production/maven/content/plugins/maven-antrun-plugin/ websites/production/maven/content/plugins/maven-archetype-plugin/ - copied from r843002, websites/production/maven/content/plugins/maven-archetype-plugin/ websites/production/maven/content/plugins/maven-assembly-plugin/ - copied from r843002, websites/production/maven/content/plugins/maven-assembly-plugin/ websites/production/maven/content/plugins/maven-changelog-plugin/ - copied from r843002, websites/production/maven/content/plugins/maven-changelog-plugin/ websites/production/maven/content/plugins/maven-changes-plugin/ - copied from r843002, websites/production/maven/content/plugins/maven-changes-plugin/ websites/production/maven/content/plugins/maven-checkstyle-plugin/ - copied from r843002, websites/production/maven/content/plugins/maven-checkstyle-plugin/ websites/production/maven/content/plugins/maven-clean-plugin/ - copied from r843002, websites/production/maven/content/plugins/maven-clean-plugin/ websites/production/maven/content/plugins/maven-compiler-plugin/ - copied from r843002, websites/production/maven/content/plugins/maven-compiler-plugin/ websites/production/maven/content/plugins/maven-dependency-plugin/ - copied from r843002, websites/production/maven/content/plugins/maven-dependency-plugin/ websites/production/maven/content/plugins/maven-deploy-plugin/ - copied from r843002, websites/production/maven/content/plugins/maven-deploy-plugin/ websites/production/maven/content/plugins/maven-doap-plugin/ - copied from r843002, websites/production/maven/content/plugins/maven-doap-plugin/ websites/production/maven/content/plugins/maven-docck-plugin/ - copied from r843002, websites/production/maven/content/plugins/maven-docck-plugin/ websites/production/maven/content/plugins/maven-ear-plugin/ - copied from r843002, websites/production/maven/content/plugins/maven-ear-plugin/ websites/production/maven/content/plugins/maven-eclipse-plu
svn commit: r1423570 - /maven/site/trunk/content/filtered-resources/.htaccess
Author: rfscholte Date: Tue Dec 18 18:34:50 2012 New Revision: 1423570 URL: http://svn.apache.org/viewvc?rev=1423570&view=rev Log: CMS commit to maven by rfscholte Modified: maven/site/trunk/content/filtered-resources/.htaccess Modified: maven/site/trunk/content/filtered-resources/.htaccess URL: http://svn.apache.org/viewvc/maven/site/trunk/content/filtered-resources/.htaccess?rev=1423570&r1=1423569&r2=1423570&view=diff == --- maven/site/trunk/content/filtered-resources/.htaccess (original) +++ maven/site/trunk/content/filtered-resources/.htaccess Tue Dec 18 18:34:50 2012 @@ -56,6 +56,7 @@ RedirectMatch permanent ^/plugins/maven- RedirectMatch permanent ^/plugins/maven-scm-plugin/(.*)$ http://maven.apache.org/scm/maven-scm-plugin/$1 RedirectMatch permanent ^/plugins/maven-plugin-plugin/(.*)$ http://maven.apache.org/plugin-tools/maven-plugin-plugin/$1 RedirectMatch permanent ^/plugins/maven-failsafe-plugin/(.*)$ http://maven.apache.org/surefire/maven-failsafe-plugin/$1 +RedirectMatch permanent ^/plugins/maven-release-plugin/(.*)$ http://maven.apache.org/maven-release/maven-release-plugin/$1 RedirectMatch permanent ^/plugins/maven-surefire-plugin/(.*)$ http://maven.apache.org/surefire/maven-surefire-plugin/$1 RedirectMatch permanent ^/plugins/maven-surefire-report-plugin/(.*)$ http://maven.apache.org/surefire/maven-surefire-report-plugin/$1 RedirectMatch permanent ^/shared/maven-plugin-testing-harness/(.*)$ http://maven.apache.org/plugin-testing/maven-plugin-testing-harness/$1
svn commit: r843002 - 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: Tue Dec 18 18:27:37 2012 New Revision: 843002 Log: Publishing svnmucc operation to maven site by rfscholte Added: websites/production/maven/content/ - copied from r843001, websites/staging/maven/trunk/content/ websites/production/maven/content/ant-tasks - copied unchanged from r843001, websites/production/maven/content/ant-tasks websites/production/maven/content/ant-tasks-archives/ - copied from r843001, websites/production/maven/content/ant-tasks-archives/ websites/production/maven/content/apache-resource-bundles/ - copied from r843001, websites/production/maven/content/apache-resource-bundles/ websites/production/maven/content/archetype/ - copied from r843001, websites/production/maven/content/archetype/ websites/production/maven/content/archetype-archives/ - copied from r843001, websites/production/maven/content/archetype-archives/ websites/production/maven/content/core-its/ - copied from r843001, websites/production/maven/content/core-its/ websites/production/maven/content/enforcer/ - copied from r843001, websites/production/maven/content/enforcer/ websites/production/maven/content/jxr/ - copied from r843001, websites/production/maven/content/jxr/ websites/production/maven/content/maven-1.x/ - copied from r843001, websites/production/maven/content/maven-1.x/ websites/production/maven/content/maven-archetype-bundles/ - copied from r843001, websites/production/maven/content/maven-archetype-bundles/ websites/production/maven/content/maven-indexer/ - copied from r843001, websites/production/maven/content/maven-indexer/ websites/production/maven/content/maven-release/ - copied from r843001, websites/production/maven/content/maven-release/ websites/production/maven/content/maven-release-archives/ - copied from r843001, websites/production/maven/content/maven-release-archives/ websites/production/maven/content/plugin-testing/ - copied from r843001, websites/production/maven/content/plugin-testing/ websites/production/maven/content/plugin-tools/ - copied from r843001, websites/production/maven/content/plugin-tools/ websites/production/maven/content/plugin-tools-archives/ - copied from r843001, websites/production/maven/content/plugin-tools-archives/ websites/production/maven/content/plugins-archives/ - copied from r843001, websites/production/maven/content/plugins-archives/ websites/production/maven/content/plugins/maven-acr-plugin/ - copied from r843001, websites/production/maven/content/plugins/maven-acr-plugin/ websites/production/maven/content/plugins/maven-ant-plugin/ - copied from r843001, websites/production/maven/content/plugins/maven-ant-plugin/ websites/production/maven/content/plugins/maven-antrun-plugin/ - copied from r843001, websites/production/maven/content/plugins/maven-antrun-plugin/ websites/production/maven/content/plugins/maven-archetype-plugin/ - copied from r843001, websites/production/maven/content/plugins/maven-archetype-plugin/ websites/production/maven/content/plugins/maven-assembly-plugin/ - copied from r843001, websites/production/maven/content/plugins/maven-assembly-plugin/ websites/production/maven/content/plugins/maven-changelog-plugin/ - copied from r843001, websites/production/maven/content/plugins/maven-changelog-plugin/ websites/production/maven/content/plugins/maven-changes-plugin/ - copied from r843001, websites/production/maven/content/plugins/maven-changes-plugin/ websites/production/maven/content/plugins/maven-checkstyle-plugin/ - copied from r843001, websites/production/maven/content/plugins/maven-checkstyle-plugin/ websites/production/maven/content/plugins/maven-clean-plugin/ - copied from r843001, websites/production/maven/content/plugins/maven-clean-plugin/ websites/production/maven/content/plugins/maven-compiler-plugin/ - copied from r843001, websites/production/maven/content/plugins/maven-compiler-plugin/ websites/production/maven/content/plugins/maven-dependency-plugin/ - copied from r843001, websites/production/maven/content/plugins/maven-dependency-plugin/ websites/production/maven/content/plugins/maven-deploy-plugin/ - copied from r843001, websites/production/maven/content/plugins/maven-deploy-plugin/ websites/production/maven/content/plugins/maven-doap-plugin/ - copied from r843001, websites/production/maven/content/plugins/maven-doap-plugin/ websites/production/maven/content/plugins/maven-docck-plugin/ - copied from r843001, websites/production/maven/content/plugins/maven-docck-plugin/ websites/production/maven/content/plugins/maven-ear-plugin/ - copied from r843001, websites/production/maven/content/plugins/maven-ear-plugin/ websites/production/maven/content/plugins/maven-eclipse-plu
git commit: o Temporarily reverted to the boring verifier 1.3 to allow release now
Updated Branches:
refs/heads/master faae29c22 -> cd35301a0
o Temporarily reverted to the boring verifier 1.3 to allow release now
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/cd35301a
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/cd35301a
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/cd35301a
Branch: refs/heads/master
Commit: cd35301a0affe10ee73acd37f3704cae901fe3eb
Parents: faae29c
Author: Kristian Rosenvold
Authored: Tue Dec 18 17:12:46 2012 +0100
Committer: Kristian Rosenvold
Committed: Tue Dec 18 17:12:46 2012 +0100
--
surefire-integration-tests/pom.xml |2 +-
.../maven/surefire/its/fixture/MavenLauncher.java |2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/cd35301a/surefire-integration-tests/pom.xml
--
diff --git a/surefire-integration-tests/pom.xml
b/surefire-integration-tests/pom.xml
index 55191dd..a0ab513 100644
--- a/surefire-integration-tests/pom.xml
+++ b/surefire-integration-tests/pom.xml
@@ -46,7 +46,7 @@
org.apache.maven.shared
maven-verifier
- 1.4-SNAPSHOT
+ 1.3
org.apache.maven
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/cd35301a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/MavenLauncher.java
--
diff --git
a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/MavenLauncher.java
b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/MavenLauncher.java
index bbf910c..dd6f587 100755
---
a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/MavenLauncher.java
+++
b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/MavenLauncher.java
@@ -404,7 +404,7 @@ public class MavenLauncher
try
{
FileUtils.deleteDirectory( testDir );
-File file = ResourceExtractor.extractResourceToDestination( cl,
resourcePath, tempDir, true );
+File file = ResourceExtractor.extractResourcePath( cl,
resourcePath, tempDir, true );
return file.getCanonicalFile();
}
catch ( IOException e )
git commit: o Added documentation about the new brief summary format
Updated Branches:
refs/heads/master 24eff24de -> faae29c22
o Added documentation about the new brief summary format
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/faae29c2
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/faae29c2
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/faae29c2
Branch: refs/heads/master
Commit: faae29c22a2ef18b4169b2a61007388521b17632
Parents: 24eff24
Author: Kristian Rosenvold
Authored: Tue Dec 18 16:43:20 2012 +0100
Committer: Kristian Rosenvold
Committed: Tue Dec 18 16:43:20 2012 +0100
--
.../src/site/markdown/newerrorsummary.md | 45 +++
maven-surefire-plugin/src/site/site.xml|1 +
pom.xml|5 ++
3 files changed, 51 insertions(+), 0 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/faae29c2/maven-surefire-plugin/src/site/markdown/newerrorsummary.md
--
diff --git a/maven-surefire-plugin/src/site/markdown/newerrorsummary.md
b/maven-surefire-plugin/src/site/markdown/newerrorsummary.md
new file mode 100644
index 000..f33a2d6
--- /dev/null
+++ b/maven-surefire-plugin/src/site/markdown/newerrorsummary.md
@@ -0,0 +1,45 @@
+The 1-line error summary
+
+
+Surefire 2.13 introduced a compact one-line format for quickly being able to
locate test failures. This format
+is intended to give an overview and does necessarily lose some details, which
can be found in the main
+report of the run or the files on disk.
+
+### Example output:
+
+Failed tests:
+ Test1#assertion1(59) Bending maths expected:<[123]> but was:<[312]>
+ Test1#assertion2(64) True is false
+
+Tests in error:
+ Test1#nullPointerInLibrary(38) >> NullPointerException
+ Test1#failInNestedLibInMethod(54).nestedLibFailure(72) >>
NullPointerException
+ Test1#failInLibInMethod(48) >> NullPointerException
+ Test1#failInMethod(43).innerFailure(68) NullPointerException Fail here
+ Test2#test6281(33) RuntimeException FailHere
+
+The format of the report is quite "packed", so some explanation is required,
there are three different formats:
+
+
+### Format 1, assertion failure.
+ Class#method(line number)...methodN(lineN) "Assertion failure message"
+
+Test1#assertion2(64) True is false
+Test1#assertion1(59) Bending maths expected:<[123]> but was:<[312]>
+
+### Format 2, Exception in test.
+ Class#method(line number)...methodN(lineN) Exception "Message"
+In this case the exception was actually thrown on the line in question.
+
+Test1#failInMethod(43).innerFailure(68) NullPointerException Fail here
+Test2#test6281(33) RuntimeException FailHere
+
+### Format 3: Exception in code called by test.
+ Same format as 2 but >> added before exception
+In this case the exception is thrown inside some code that was called from
this line of the
+test. We do not show where the actual exception happened, only which line(s)
of the test
+that were involved in the call.
+
+Test1#failInLibInMethod(48) >> NullPointerException
+Test1#failInNestedLibInMethod(54).nestedLibFailure(72) >>
NullPointerException
+
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/faae29c2/maven-surefire-plugin/src/site/site.xml
--
diff --git a/maven-surefire-plugin/src/site/site.xml
b/maven-surefire-plugin/src/site/site.xml
index 78db8d6..aa4b476 100644
--- a/maven-surefire-plugin/src/site/site.xml
+++ b/maven-surefire-plugin/src/site/site.xml
@@ -47,6 +47,7 @@
+
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/faae29c2/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 5079ce8..0d3d386 100644
--- a/pom.xml
+++ b/pom.xml
@@ -375,6 +375,11 @@
surefire-shadefire
${project.version}
+
+ org.apache.maven.doxia
+ doxia-module-markdown
+ 1.3
+
svn commit: r1423355 - in /maven/plugins/trunk/maven-changes-plugin: ./ src/main/java/org/apache/maven/plugin/changes/ src/main/java/org/apache/maven/plugin/issues/ src/main/resources/ src/test/java/o
Author: ltheussl
Date: Tue Dec 18 09:03:16 2012
New Revision: 1423355
URL: http://svn.apache.org/viewvc?rev=1423355&view=rev
Log:
[MCHANGES-46] add rss feed generation using rome library
Added:
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/FeedGenerator.java
(with props)
maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugin/changes/FeedGeneratorTest.java
(with props)
Modified:
maven/plugins/trunk/maven-changes-plugin/pom.xml
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ChangesMojo.java
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ChangesReportGenerator.java
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/issues/AbstractIssuesReportGenerator.java
maven/plugins/trunk/maven-changes-plugin/src/main/resources/changes-report.properties
maven/plugins/trunk/maven-changes-plugin/src/main/resources/changes-report_de.properties
maven/plugins/trunk/maven-changes-plugin/src/main/resources/changes-report_fr.properties
maven/plugins/trunk/maven-changes-plugin/src/main/resources/changes-report_pt_BR.properties
maven/plugins/trunk/maven-changes-plugin/src/main/resources/changes-report_sv.properties
Modified: maven/plugins/trunk/maven-changes-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/pom.xml?rev=1423355&r1=1423354&r2=1423355&view=diff
==
--- maven/plugins/trunk/maven-changes-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-changes-plugin/pom.xml Tue Dec 18 09:03:16 2012
@@ -356,6 +356,13 @@ under the License.
4.1.2
+
+
+ rome
+ rome
+ 1.0
+
+
junit
Modified:
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ChangesMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ChangesMojo.java?rev=1423355&r1=1423354&r2=1423355&view=diff
==
---
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ChangesMojo.java
(original)
+++
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ChangesMojo.java
Tue Dec 18 09:03:16 2012
@@ -20,9 +20,14 @@ package org.apache.maven.plugin.changes;
*/
import java.io.File;
+import java.io.FileWriter;
import java.io.IOException;
+import java.io.Writer;
+
import java.net.URL;
+
import java.text.SimpleDateFormat;
+
import java.util.Collections;
import java.util.Date;
import java.util.Iterator;
@@ -42,9 +47,9 @@ import org.apache.maven.reporting.MavenR
import org.apache.maven.shared.filtering.MavenFileFilter;
import org.apache.maven.shared.filtering.MavenFileFilterRequest;
import org.apache.maven.shared.filtering.MavenFilteringException;
+
import org.codehaus.plexus.util.FileUtils;
import org.codehaus.plexus.util.IOUtil;
-import org.codehaus.plexus.util.ReaderFactory;
import org.codehaus.plexus.util.StringUtils;
import org.apache.commons.io.input.XmlStreamReader;
@@ -203,6 +208,22 @@ public class ChangesMojo
private String url;
/**
+ * The type of the feed to generate.
+ *
+ *
+ * Supported values are:
+ * "rss_0.9", "rss_0.91N" (RSS 0.91 Netscape), "rss_0.91U" (RSS 0.91
Userland),
+ * "rss_0.92", "rss_0.93", "rss_0.94", "rss_1.0", "rss_2.0", "atom_0.3",
"atom_1.0".
+ *
+ *
+ * If not specified, no feed is generated.
+ *
+ * @since 2.9
+ */
+@Parameter
+private String feedType;
+
+/**
* The path of the changes.xml file that will be converted
into an HTML report.
*/
@Parameter( property = "changes.xmlPath", defaultValue =
"src/changes/changes.xml" )
@@ -314,6 +335,15 @@ public class ChangesMojo
getLog().warn( "No issue management URL defined in POM. Links to
your issues will not work correctly." );
}
+boolean feedGenerated = false;
+
+if ( StringUtils.isNotEmpty( feedType ) )
+{
+feedGenerated = generateFeed( changesXml, locale );
+}
+
+report.setLinkToFeed( feedGenerated );
+
report.doGenerateReport( getBundle( locale ), getSink() );
// Copy the images
@@ -473,4 +503,48 @@ public class ChangesMojo
}
}
}
+
+private boolean generateFeed( final ChangesXML changesXml, final Locale
locale )
+{
+getLog().debug( "Generating " + feedType + " feed." );
+
+boolean success = true;
+
+final FeedGenerator feed = new FeedGenerator( locale );
+feed.setLink( project.getUrl() + "/changes-report.html" ); // TODO:
better way?
+feed.setTitle( project.ge
