git commit: use latest plexus-utils bugfix
Repository: maven
Updated Branches:
refs/heads/master e31c84cb4 - 8506c638c
use latest plexus-utils bugfix
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/8506c638
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/8506c638
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/8506c638
Branch: refs/heads/master
Commit: 8506c638c6a21a902e85831185e2121d8ddcb55b
Parents: e31c84c
Author: Hervé Boutemy hbout...@apache.org
Authored: Sun Oct 12 09:10:37 2014 +0200
Committer: Hervé Boutemy hbout...@apache.org
Committed: Sun Oct 12 09:10:37 2014 +0200
--
pom.xml | 1306 +-
1 file changed, 653 insertions(+), 653 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven/blob/8506c638/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 270358a..75d29a3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,653 +1,653 @@
-?xml version=1.0 encoding=UTF-8?
-
- !--
-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.
- --
-
-project xmlns=http://maven.apache.org/POM/4.0.0;
xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance;
xsi:schemaLocation=http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd;
- modelVersion4.0.0/modelVersion
-
- parent
-groupIdorg.apache.maven/groupId
-artifactIdmaven-parent/artifactId
-version24/version
-relativePath../pom/maven/pom.xml/relativePath
- /parent
-
- artifactIdmaven/artifactId
- version3.2.4-SNAPSHOT/version
- packagingpom/packaging
-
- nameApache Maven/name
- descriptionMaven is a software build management and
-comprehension tool. Based on the concept of a project object model:
-builds, dependency management, documentation creation, site
-publication, and distribution publication are all controlled from
-the declarative file. Maven can be extended by plugins to utilise a
-number of other development tools for reporting or the build
-process.
- /description
- urlhttp://maven.apache.org/ref/${project.version}/url
- inceptionYear2001/inceptionYear
-
- properties
-maven.compiler.source1.6/maven.compiler.source
-maven.compiler.target1.6/maven.compiler.target
-classWorldsVersion2.5.2/classWorldsVersion
-commonsCliVersion1.2/commonsCliVersion
-junitVersion3.8.2/junitVersion
-plexusVersion1.5.5/plexusVersion
-plexusInterpolationVersion1.19/plexusInterpolationVersion
-plexusUtilsVersion3.0.17/plexusUtilsVersion
-!-- Latest version of Guava that works with Sisu --
-guavaVersion14.0.1/guavaVersion
-guiceVersion3.2.3/guiceVersion
-sisuInjectVersion0.3.0.M1/sisuInjectVersion
-wagonVersion2.6/wagonVersion
-securityDispatcherVersion1.3/securityDispatcherVersion
-cipherVersion1.7/cipherVersion
-modelloVersion1.8.1/modelloVersion
-jxpathVersion1.3/jxpathVersion
-aetherVersion1.0.0.v20140518/aetherVersion
-slf4jVersion1.7.5/slf4jVersion
-
maven.test.redirectTestOutputToFiletrue/maven.test.redirectTestOutputToFile
-!-- Control the name of the distribution and information output by mvn --
-distributionIdapache-maven/distributionId
-distributionShortNameMaven/distributionShortName
-distributionNameApache Maven/distributionName
-maven.site.pathref/3-LATEST/maven.site.path
- /properties
-
- modules
-modulemaven-plugin-api/module
-modulemaven-model/module
-modulemaven-model-builder/module
-modulemaven-core/module
-modulemaven-settings/module
-modulemaven-settings-builder/module
-modulemaven-artifact/module
-modulemaven-aether-provider/module
-modulemaven-repository-metadata/module
-modulemaven-embedder/module
-modulemaven-compat/module
-moduleapache-maven/module
- /modules
-
- scm
-
connectionscm:git:https://git-wip-us.apache.org/repos/asf/maven.git/connection
-
developerConnectionscm:git:https://git-wip-us.apache.org/repos/asf/maven.git/developerConnection
-
svn commit: r1631150 - /maven/plugins/trunk/maven-site-plugin/pom.xml
Author: hboutemy Date: Sun Oct 12 07:33:04 2014 New Revision: 1631150 URL: http://svn.apache.org/r1631150 Log: updated plexus-archiver to 2.6.4 Modified: maven/plugins/trunk/maven-site-plugin/pom.xml Modified: maven/plugins/trunk/maven-site-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/pom.xml?rev=1631150r1=1631149r2=1631150view=diff == --- maven/plugins/trunk/maven-site-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-site-plugin/pom.xml Sun Oct 12 07:33:04 2014 @@ -364,7 +364,7 @@ under the License. dependency groupIdorg.codehaus.plexus/groupId artifactIdplexus-archiver/artifactId - version2.6.3/version + version2.6.4/version /dependency dependency
git commit: [SUREFIRE-1105] Surefire build should check Java 1.5 API signatures with JDK version 5
Repository: maven-surefire
Updated Branches:
refs/heads/master 080aa5f61 - 5c793434a
[SUREFIRE-1105] Surefire build should check Java 1.5 API signatures with JDK
version 5
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/5c793434
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/5c793434
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/5c793434
Branch: refs/heads/master
Commit: 5c793434a61d957f304d2af481701ab00cc3e6e3
Parents: 080aa5f
Author: tibordigana tibo...@lycos.com
Authored: Sun Oct 12 00:05:02 2014 +0200
Committer: tibordigana tibo...@lycos.com
Committed: Sun Oct 12 00:05:02 2014 +0200
--
pom.xml | 26 ++
1 file changed, 26 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/5c793434/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 6c5efa3..ef0e009 100644
--- a/pom.xml
+++ b/pom.xml
@@ -250,6 +250,26 @@
version2.5.1/version
/plugin
plugin
+ groupIdorg.codehaus.mojo/groupId
+ artifactIdanimal-sniffer-maven-plugin/artifactId
+ version1.11/version
+ executions
+execution
+ idsignature-check/id
+ goals
+goalcheck/goal
+ /goals
+/execution
+ /executions
+ configuration
+signature
+ groupIdorg.codehaus.mojo.signature/groupId
+ artifactIdjava15/artifactId
+ version1.0/version
+/signature
+ /configuration
+/plugin
+plugin
artifactIdmaven-surefire-plugin/artifactId
version${shadedVersion}/version
configuration
@@ -306,6 +326,12 @@
/plugin
/plugins
/pluginManagement
+plugins
+ plugin
+groupIdorg.codehaus.mojo/groupId
+artifactIdanimal-sniffer-maven-plugin/artifactId
+ /plugin
+/plugins
/build
reporting
git commit: Account the the jsoup license URL which appears to have changed.
Repository: maven
Updated Branches:
refs/heads/master 8506c638c - 71f8d04be
Account the the jsoup license URL which appears to have changed.
The JSoup license URL was recorded as http://jsoup.com/license but the
site appears to now be http://jsoup.org/ and so the URL is now
http://jsoup.org/license
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/71f8d04b
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/71f8d04b
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/71f8d04b
Branch: refs/heads/master
Commit: 71f8d04be62b970dd730053bdf6b75ebaa04c8de
Parents: 8506c63
Author: Jason van Zyl ja...@tesla.io
Authored: Sun Oct 12 07:23:56 2014 -0400
Committer: Jason van Zyl ja...@tesla.io
Committed: Sun Oct 12 07:23:56 2014 -0400
--
apache-maven/src/main/appended-resources/META-INF/LICENSE.vm | 4
1 file changed, 4 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/maven/blob/71f8d04b/apache-maven/src/main/appended-resources/META-INF/LICENSE.vm
--
diff --git a/apache-maven/src/main/appended-resources/META-INF/LICENSE.vm
b/apache-maven/src/main/appended-resources/META-INF/LICENSE.vm
index 1a46225..f453976 100644
--- a/apache-maven/src/main/appended-resources/META-INF/LICENSE.vm
+++ b/apache-maven/src/main/appended-resources/META-INF/LICENSE.vm
@@ -35,6 +35,10 @@ subject to the terms and conditions of the following
licenses.
#if ($url == https://glassfish.dev.java.net/public/CDDLv1.0.html;)
#set ( $url = 'https://glassfish.java.net/public/CDDLv1.0.html' )
#end
+## JSoup URL is now invalid, use a fixed one
+#if ($url == http://jsoup.com/license;)
+#set ( $url = 'http://jsoup.org/license' )
+#end
#if ($url)
#set ( $licFile = 'lib/' + $artId + '.license' )
#set ( $downloaded = $lf.getResourceAsFile($url, licenses/${licFile}) )
svn commit: r6761 - /release/maven/plugins/
Author: khmarbaise Date: Sun Oct 12 12:35:26 2014 New Revision: 6761 Log: - Added Apache Maven WAR Plugin Version 2.5 Added: release/maven/plugins/maven-war-plugin-2.5-source-release.zip (with props) release/maven/plugins/maven-war-plugin-2.5-source-release.zip.asc release/maven/plugins/maven-war-plugin-2.5-source-release.zip.md5 Removed: release/maven/plugins/maven-war-plugin-2.4-source-release.zip release/maven/plugins/maven-war-plugin-2.4-source-release.zip.asc release/maven/plugins/maven-war-plugin-2.4-source-release.zip.md5 Added: release/maven/plugins/maven-war-plugin-2.5-source-release.zip == Binary file - no diff available. Propchange: release/maven/plugins/maven-war-plugin-2.5-source-release.zip -- svn:mime-type = application/octet-stream Added: release/maven/plugins/maven-war-plugin-2.5-source-release.zip.asc == --- release/maven/plugins/maven-war-plugin-2.5-source-release.zip.asc (added) +++ release/maven/plugins/maven-war-plugin-2.5-source-release.zip.asc Sun Oct 12 12:35:26 2014 @@ -0,0 +1,28 @@ +-BEGIN PGP SIGNATURE- +Version: GnuPG/MacGPG2 v2.0.19 (Darwin) +Comment: GPGTools - http://gpgtools.org + +iQQcBAABCgAGBQJUNW0mAAoJECGiSz+LD1lKlTMgAJB02ezrQjS/rFoGrFX0q3m1 +ccZIQHPdq2gtSWksgCCTM2Ft/zqPdPPOdQUhSTJwJ9JNyV5CqGPReZjUO5U/MqoO +WBbbY5h77J2ij7vhEOc9JH+haVZP6yuX/9GkDfCMnIalxeIHf5lEYuH+zzSYfSzg +75flGV8VMECN2BikhOepn55qnkI0Qt0AKAlVa11338FLXEIbIicRVJB8tt+BX3nn +4w88TmK7X5mIEEE7WiDV6crLSWzt7is1EWC/YWZH28B4QcMUBCCc42XI3h/YeNnu +mClezmgxQlhdUVYbGi0jA1iXbnl9I0+Nt3bgQq6XQHr76QKpgFtadO4TZVuhOKim +zZvzfmHtl3EBVChYmnQt9N5ioLNaVg7S1/6dF3M84Qy57dhz3mSJ3FchFUeQ/m99 +wAwlMmEz8cmpKFadWGUe5cashBCBhbrnht/xd05hTHxwDlftHUgIopeu7J/2QxSH +vvsp2xeHCeH89dVMCj1XY0Y0ue4aBoGQnknY9o4h76v+EjY0lb3noowp3MM0GJC6 +GfjX7en04lq+EANYC8HATebO4OdqDye4c4RSa4s9aE8N1wQT3mllnj7JoNEO2B7o +cdJbci14Bv6Resj4ThPEyshqEJHK9w+vU95FfpfV1OylDTM1tCe/2YWTTIFE91Lg +mdHdfNkQU+5pV2ihZs4DqLTmDJZCb3CinGXl6rFIVNECtJTeX/XfdrYZcgBlFZo6 +E2JBBgXXuutIZlQQzCqE0Yvq0XTsMPtFiAJneknjoVfArLLYZm+3/Q+HCp80kvpK +l+f30vZETi6g0xBdfKVbSfgO6nUL/iiNvl6rwFGAYorDVRBI6DlOOisnKjlKqXhy ++iabmh0b8hi1c+jJ9DyKQ6gHm1HDX0tJ3CAbHbAGj7SxiugCq5609ZUzwoT0WREb +2pL1YhgVpZCWi029aJgpqSVnMiXVWPDY/q3wpRcq1PLSGz7GXYqAwt1MtgKW89MX +1QEaQ/QhhI96I78dvjTQlr2raG58OwBKEOb80XClihM+ZqEB0RMrdK1gCjCOI5fs +X7UDENiRfgb3UVMZ9nLBBFt68SLlx8doMO2Zno6uuGXRAyUopP2SrlEX4+tKl6W5 +/E/dwdR7G5dVxCfVOK/pdjknhNCLtdi66S2abOTRoHUPPwJyDTM9tCGSOJL0YWGx +LsXo2ZClaFQg+6XSU/1DPnKZScSz6H3l9+fKB030IrNDI9M9I7SAuqOyiyvGxrOW +Dvqrl13e1oJ4ualfe5ow8RwBd8pL3wVHK0t5yugiTs2I0vqzyT9xc8YOUVt2d5Fr +pm4ksWwpDTWtVFXnlgBNFVx9zZpnPQfdLmWhIhjsO1tUykYj871PdgWN8hV7ji0= +=rdWx +-END PGP SIGNATURE- Added: release/maven/plugins/maven-war-plugin-2.5-source-release.zip.md5 == --- release/maven/plugins/maven-war-plugin-2.5-source-release.zip.md5 (added) +++ release/maven/plugins/maven-war-plugin-2.5-source-release.zip.md5 Sun Oct 12 12:35:26 2014 @@ -0,0 +1 @@ +66f334f0b94fa3d865fc7cf031fd241f \ No newline at end of file
svn commit: r1631166 - /maven/site/trunk/content/apt/plugins/index.apt
Author: khmarbaise
Date: Sun Oct 12 12:35:30 2014
New Revision: 1631166
URL: http://svn.apache.org/r1631166
Log:
- Apache Maven WAR Plugin Version 2.5 Released.
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=1631166r1=1631165r2=1631166view=diff
==
--- maven/site/trunk/content/apt/plugins/index.apt (original)
+++ maven/site/trunk/content/apt/plugins/index.apt Sun Oct 12 12:35:30 2014
@@ -95,7 +95,7 @@ Available Plugins
*--++--++--+++
| {{{/plugins/maven-rar-plugin/} rar}} | B |
2.4 | 2014-09-08 | Build a RAR from the current project. |
{{{http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-rar-plugin}SVN}} |
{{{http://jira.codehaus.org/browse/MRAR}JIRA}}
*--++--++--+++
-| {{{/plugins/maven-war-plugin/} war}} | B |
2.4 | 2013-07-07 | Build a WAR from the current project. |
{{{http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-war-plugin}SVN}} |
{{{http://jira.codehaus.org/browse/MWAR}JIRA}}
+| {{{/plugins/maven-war-plugin/} war}} | B |
2.5 | 2014-10-08 | Build a WAR from the current project. |
{{{http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-war-plugin}SVN}} |
{{{http://jira.codehaus.org/browse/MWAR}JIRA}}
*--++--++--+++
| {{{/plugins/maven-acr-plugin/} app-client/acr}}| B |
1.1 | 2014-09-02 | Build a JavaEE application client from the current
project. |
{{{http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-acr-plugin}SVN}} |
{{{http://jira.codehaus.org/browse/MACR}JIRA}}
*--++--++--+++
git commit: Normalize all the line endings
Repository: maven
Updated Branches:
refs/heads/master 71f8d04be - 46b3467a2
Normalize all the line endings
Signed-off-by: Igor Fedorenko ifedore...@apache.org
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/46b3467a
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/46b3467a
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/46b3467a
Branch: refs/heads/master
Commit: 46b3467a26cb4cc0bc365203936b777d642b160c
Parents: 71f8d04
Author: Igor Fedorenko ifedore...@apache.org
Authored: Sun Oct 12 08:52:30 2014 -0400
Committer: Igor Fedorenko ifedore...@apache.org
Committed: Sun Oct 12 08:52:30 2014 -0400
--
pom.xml | 1306 +-
1 file changed, 653 insertions(+), 653 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven/blob/46b3467a/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 75d29a3..df29fc1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,653 +1,653 @@
-?xml version=1.0 encoding=UTF-8?
-
- !--
-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.
- --
-
-project xmlns=http://maven.apache.org/POM/4.0.0;
xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance;
xsi:schemaLocation=http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd;
- modelVersion4.0.0/modelVersion
-
- parent
-groupIdorg.apache.maven/groupId
-artifactIdmaven-parent/artifactId
-version24/version
-relativePath../pom/maven/pom.xml/relativePath
- /parent
-
- artifactIdmaven/artifactId
- version3.2.4-SNAPSHOT/version
- packagingpom/packaging
-
- nameApache Maven/name
- descriptionMaven is a software build management and
-comprehension tool. Based on the concept of a project object model:
-builds, dependency management, documentation creation, site
-publication, and distribution publication are all controlled from
-the declarative file. Maven can be extended by plugins to utilise a
-number of other development tools for reporting or the build
-process.
- /description
- urlhttp://maven.apache.org/ref/${project.version}/url
- inceptionYear2001/inceptionYear
-
- properties
-maven.compiler.source1.6/maven.compiler.source
-maven.compiler.target1.6/maven.compiler.target
-classWorldsVersion2.5.2/classWorldsVersion
-commonsCliVersion1.2/commonsCliVersion
-junitVersion3.8.2/junitVersion
-plexusVersion1.5.5/plexusVersion
-plexusInterpolationVersion1.19/plexusInterpolationVersion
-plexusUtilsVersion3.0.18/plexusUtilsVersion
-!-- Latest version of Guava that works with Sisu --
-guavaVersion14.0.1/guavaVersion
-guiceVersion3.2.3/guiceVersion
-sisuInjectVersion0.3.0.M1/sisuInjectVersion
-wagonVersion2.6/wagonVersion
-securityDispatcherVersion1.3/securityDispatcherVersion
-cipherVersion1.7/cipherVersion
-modelloVersion1.8.1/modelloVersion
-jxpathVersion1.3/jxpathVersion
-aetherVersion1.0.0.v20140518/aetherVersion
-slf4jVersion1.7.5/slf4jVersion
-
maven.test.redirectTestOutputToFiletrue/maven.test.redirectTestOutputToFile
-!-- Control the name of the distribution and information output by mvn --
-distributionIdapache-maven/distributionId
-distributionShortNameMaven/distributionShortName
-distributionNameApache Maven/distributionName
-maven.site.pathref/3-LATEST/maven.site.path
- /properties
-
- modules
-modulemaven-plugin-api/module
-modulemaven-model/module
-modulemaven-model-builder/module
-modulemaven-core/module
-modulemaven-settings/module
-modulemaven-settings-builder/module
-modulemaven-artifact/module
-modulemaven-aether-provider/module
-modulemaven-repository-metadata/module
-modulemaven-embedder/module
-modulemaven-compat/module
-moduleapache-maven/module
- /modules
-
- scm
-
connectionscm:git:https://git-wip-us.apache.org/repos/asf/maven.git/connection
-
svn commit: r1631212 - /maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/resources/dist-tool.conf
Author: dennisl Date: Sun Oct 12 17:04:27 2014 New Revision: 1631212 URL: http://svn.apache.org/r1631212 Log: Comment out maven-idea-plugin, maven-one-plugin and maven-model-converter. Mark them as retired. Modified: maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/resources/dist-tool.conf Modified: maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/resources/dist-tool.conf URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/resources/dist-tool.conf?rev=1631212r1=1631211r2=1631212view=diff == --- maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/resources/dist-tool.conf (original) +++ maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/resources/dist-tool.conf Sun Oct 12 17:04:27 2014 @@ -95,7 +95,8 @@ * maven-failsafe-plugin maven-gpg-plugin maven-help-plugin - maven-idea-plugin +## Retired +## maven-idea-plugin maven-install-plugin maven-invoker-plugin maven-jar-plugin @@ -103,7 +104,8 @@ maven-javadoc-plugin * maven-jxr-plugin maven-linkcheck-plugin - maven-one-plugin +## Retired +## maven-one-plugin maven-patch-plugin maven-pdf-plugin * maven-plugin-plugin @@ -176,7 +178,8 @@ maven-invoker maven-jarsigner maven-mapping - maven-model-converter +## Retired +## maven-model-converter maven-repository-builder maven-runtime maven-script-interpreter
svn commit: r1631225 - /maven/sandbox/trunk/dist-tools/dist-tool-plugin/pom.xml
Author: dennisl Date: Sun Oct 12 17:24:12 2014 New Revision: 1631225 URL: http://svn.apache.org/r1631225 Log: Add SCM URLs, to make the links to the sources on the site in Jenkins correct. Modified: maven/sandbox/trunk/dist-tools/dist-tool-plugin/pom.xml Modified: maven/sandbox/trunk/dist-tools/dist-tool-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/dist-tools/dist-tool-plugin/pom.xml?rev=1631225r1=1631224r2=1631225view=diff == --- maven/sandbox/trunk/dist-tools/dist-tool-plugin/pom.xml (original) +++ maven/sandbox/trunk/dist-tools/dist-tool-plugin/pom.xml Sun Oct 12 17:24:12 2014 @@ -35,6 +35,12 @@ maven3.0.4/maven /prerequisites + scm + connectionscm:svn:http://svn.apache.org/repos/asf/maven/sandbox/trunk/dist-tools/dist-tool-plugin//connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/sandbox/trunk/dist-tools/dist-tool-plugin//developerConnection + urlhttp://svn.apache.org/viewvc/maven/sandbox/trunk/dist-tools/dist-tool-plugin//url + /scm + properties netbeans.checkstyle.formattrue/netbeans.checkstyle.format mvnversion3.0.4/mvnversion
svn commit: r1631226 - /maven/sandbox/trunk/dist-tools/dist-tool-plugin/
Author: dennisl Date: Sun Oct 12 17:25:05 2014 New Revision: 1631226 URL: http://svn.apache.org/r1631226 Log: Ignore IDEA directory. Modified: maven/sandbox/trunk/dist-tools/dist-tool-plugin/ (props changed) Propchange: maven/sandbox/trunk/dist-tools/dist-tool-plugin/ -- --- svn:ignore (original) +++ svn:ignore Sun Oct 12 17:25:05 2014 @@ -6,3 +6,4 @@ target *.ipr *.iws bin +.idea
svn commit: r6763 - in /release/maven/plugins: maven-linkcheck-plugin-1.2-source-release.zip.md5 maven-linkcheck-plugin-1.2-source-release.zip.sha1 maven-source-plugin-2.4-source-release.zip.md5 maven
Author: khmarbaise Date: Sun Oct 12 17:25:54 2014 New Revision: 6763 Log: - Replaced accidently added .sha1 files with .md5 files maven-linkcheck-plugin 1.2 maven-source-plugin 2.4 Added: release/maven/plugins/maven-linkcheck-plugin-1.2-source-release.zip.md5 release/maven/plugins/maven-source-plugin-2.4-source-release.zip.md5 Removed: release/maven/plugins/maven-linkcheck-plugin-1.2-source-release.zip.sha1 release/maven/plugins/maven-source-plugin-2.4-source-release.zip.sha1 Added: release/maven/plugins/maven-linkcheck-plugin-1.2-source-release.zip.md5 == --- release/maven/plugins/maven-linkcheck-plugin-1.2-source-release.zip.md5 (added) +++ release/maven/plugins/maven-linkcheck-plugin-1.2-source-release.zip.md5 Sun Oct 12 17:25:54 2014 @@ -0,0 +1 @@ +1b8380dcbdd6af14a13c83dd100366d5 \ No newline at end of file Added: release/maven/plugins/maven-source-plugin-2.4-source-release.zip.md5 == --- release/maven/plugins/maven-source-plugin-2.4-source-release.zip.md5 (added) +++ release/maven/plugins/maven-source-plugin-2.4-source-release.zip.md5 Sun Oct 12 17:25:54 2014 @@ -0,0 +1 @@ +bc35892f5d4d31f760f969df05cedc0e \ No newline at end of file
git commit: [SUREFIRE-1088] fix handling of @Ignored test cases
Repository: maven-surefire
Updated Branches:
refs/heads/master 5c793434a - 3ab27f473
[SUREFIRE-1088] fix handling of @Ignored test cases
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/3ab27f47
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/3ab27f47
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/3ab27f47
Branch: refs/heads/master
Commit: 3ab27f473c88e9b1ad9fc975dc89c7d5af297616
Parents: 5c79343
Author: Andreas Gudian agud...@apache.org
Authored: Sun Oct 12 19:46:48 2014 +0200
Committer: Andreas Gudian agud...@apache.org
Committed: Sun Oct 12 19:46:48 2014 +0200
--
.../maven/plugin/surefire/report/TestSetRunListener.java | 11 +--
1 file changed, 9 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/3ab27f47/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/TestSetRunListener.java
--
diff --git
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/TestSetRunListener.java
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/TestSetRunListener.java
index d4c0263..35b923c 100644
---
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/TestSetRunListener.java
+++
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/TestSetRunListener.java
@@ -130,6 +130,8 @@ public class TestSetRunListener
public void testSetCompleted( ReportEntry report )
{
+clearLastSkipMarker();
+
WrappedReportEntry wrap = wrapTestSet( report );
ListString testResults = briefOrPlainFormat ?
detailsForThis.getTestResults() : null;
if ( fileReporter != null )
@@ -231,13 +233,18 @@ public class TestSetRunListener
private void checkForUnfinishedTestSetDueToSkip( ReportEntry reportEntry )
{
-if ( lastSkipped != null !StringUtils.equals(
lastSkipped.getSourceName(), reportEntry.getSourceName() ) ) {
+if ( lastSkipped != null !StringUtils.equals(
lastSkipped.getSourceName(), reportEntry.getSourceName() ) )
+{
// a new test class was started to be processed, but a skipped
test class was not yet marked as completed
testSetCompleted( lastSkipped );
-lastSkipped = null;
}
}
+private void clearLastSkipMarker()
+{
+lastSkipped = null;
+}
+
public void testAssumptionFailure( ReportEntry report )
{
testSkipped( report );
svn commit: r1631233 - in /maven/sandbox/trunk/dist-tools/dist-tool-plugin: ./ src/it/check-prerequisites-report/ src/main/java/org/apache/maven/dist/tools/ src/site/ src/site/markdown/ src/test/java/
Author: khmarbaise Date: Sun Oct 12 18:07:04 2014 New Revision: 1631233 URL: http://svn.apache.org/r1631233 Log: - Enhancement of the dist-tool Creating a report about the prerequisites + JDK versions of maven plugins as they are published at the moment. This is the first implementation and code looks ugly many things are hard coded at the moment. Added: maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/it/check-prerequisites-report/ maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/it/check-prerequisites-report/invoker.properties maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/it/check-prerequisites-report/pom.xml maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/DistPrerequisiteMojo.java maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/GetPrerequisites.java maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/MavenJDKInformation.java Modified: maven/sandbox/trunk/dist-tools/dist-tool-plugin/pom.xml maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/site/markdown/index.md maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/site/site.xml maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/test/java/org/apache/maven/dist/tools/PatternTest.java Modified: maven/sandbox/trunk/dist-tools/dist-tool-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/dist-tools/dist-tool-plugin/pom.xml?rev=1631233r1=1631232r2=1631233view=diff == --- maven/sandbox/trunk/dist-tools/dist-tool-plugin/pom.xml (original) +++ maven/sandbox/trunk/dist-tools/dist-tool-plugin/pom.xml Sun Oct 12 18:07:04 2014 @@ -236,6 +236,7 @@ plugin groupIdorg.apache.maven.plugins/groupId artifactIdmaven-jxr-plugin/artifactId +version2.4/version configuration aggregatetrue/aggregate /configuration @@ -278,6 +279,7 @@ reportcheck-site/report reportcheck-source-release/report reportcheck-index-page/report + reportcheck-prerequisites-site/report /reports /reportSet reportSet @@ -331,4 +333,4 @@ /build /profile /profiles -/project \ No newline at end of file +/project Added: maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/it/check-prerequisites-report/invoker.properties URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/it/check-prerequisites-report/invoker.properties?rev=1631233view=auto == --- maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/it/check-prerequisites-report/invoker.properties (added) +++ maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/it/check-prerequisites-report/invoker.properties Sun Oct 12 18:07:04 2014 @@ -0,0 +1,18 @@ +# 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. + +invoker.goals = -X site \ No newline at end of file Added: maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/it/check-prerequisites-report/pom.xml URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/it/check-prerequisites-report/pom.xml?rev=1631233view=auto == --- maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/it/check-prerequisites-report/pom.xml (added) +++ maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/it/check-prerequisites-report/pom.xml Sun Oct 12 18:07:04 2014 @@ -0,0 +1,37 @@ +?xml version=1.0 encoding=UTF-8? +!-- ~ 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
svn commit: r1631234 - in /maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools: GetPrerequisites.java MavenJDKInformation.java
Author: khmarbaise
Date: Sun Oct 12 18:19:23 2014
New Revision: 1631234
URL: http://svn.apache.org/r1631234
Log:
- Added missing License header.
Modified:
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/GetPrerequisites.java
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/MavenJDKInformation.java
Modified:
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/GetPrerequisites.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/GetPrerequisites.java?rev=1631234r1=1631233r2=1631234view=diff
==
---
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/GetPrerequisites.java
(original)
+++
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/GetPrerequisites.java
Sun Oct 12 18:19:23 2014
@@ -1,5 +1,24 @@
package org.apache.maven.dist.tools;
+/*
+ * 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.IOException;
import java.util.ArrayList;
import java.util.HashMap;
@@ -12,6 +31,10 @@ import org.jsoup.nodes.Document;
import org.jsoup.nodes.Element;
import org.jsoup.select.Elements;
+/**
+ * @author Karl Heinz Marbaiase
+ *
+ */
public class GetPrerequisites
{
/**
Modified:
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/MavenJDKInformation.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/MavenJDKInformation.java?rev=1631234r1=1631233r2=1631234view=diff
==
---
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/MavenJDKInformation.java
(original)
+++
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/MavenJDKInformation.java
Sun Oct 12 18:19:23 2014
@@ -1,8 +1,31 @@
package org.apache.maven.dist.tools;
+/*
+ * 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 org.apache.maven.artifact.versioning.ArtifactVersion;
import org.apache.maven.artifact.versioning.DefaultArtifactVersion;
+/**
+ * @author Karl Heinz Marbaise
+ *
+ */
public class MavenJDKInformation
{
private String pluginName;
svn commit: r1631281 - /maven/plugins/trunk/maven-assembly-plugin/pom.xml
Author: krosenvold Date: Mon Oct 13 03:48:36 2014 New Revision: 1631281 URL: http://svn.apache.org/r1631281 Log: Upgraded to plexus-archiver 2.7 and io 2.2 Modified: maven/plugins/trunk/maven-assembly-plugin/pom.xml Modified: maven/plugins/trunk/maven-assembly-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/pom.xml?rev=1631281r1=1631280r2=1631281view=diff == --- maven/plugins/trunk/maven-assembly-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-assembly-plugin/pom.xml Mon Oct 13 03:48:36 2014 @@ -125,7 +125,7 @@ under the License. dependency groupIdorg.codehaus.plexus/groupId artifactIdplexus-archiver/artifactId - version2.6.3/version + version2.7/version exclusions exclusion groupIdorg.codehaus.plexus/groupId @@ -151,7 +151,7 @@ under the License. dependency groupIdorg.codehaus.plexus/groupId artifactIdplexus-io/artifactId - version2.1.3/version + version2.2/version exclusions exclusion groupIdorg.codehaus.plexus/groupId
svn commit: r925489 - in /websites/production/maven/content: ./ ant-tasks-archives/ ant-tasks/ archetype-archives/ archetype/ archives/maven-1.x/ core-its/ enforcer-archives/ enforcer/ jxr-archives/ j
Author: khmarbaise Date: Sun Oct 12 12:45:00 2014 New Revision: 925489 Log: Apache Maven WAR Plugin Version 2.5 Released. Added: websites/production/maven/content/ - copied from r925488, websites/staging/maven/trunk/content/ websites/production/maven/content/ant-tasks/ - copied from r925488, websites/production/maven/content/ant-tasks/ websites/production/maven/content/ant-tasks-archives/ - copied from r925488, websites/production/maven/content/ant-tasks-archives/ websites/production/maven/content/archetype/ - copied from r925488, websites/production/maven/content/archetype/ websites/production/maven/content/archetype-archives/ - copied from r925488, websites/production/maven/content/archetype-archives/ websites/production/maven/content/archives/maven-1.x/ - copied from r925488, websites/production/maven/content/archives/maven-1.x/ websites/production/maven/content/core-its/ - copied from r925488, websites/production/maven/content/core-its/ websites/production/maven/content/enforcer/ - copied from r925488, websites/production/maven/content/enforcer/ websites/production/maven/content/enforcer-archives/ - copied from r925488, websites/production/maven/content/enforcer-archives/ websites/production/maven/content/jxr/ - copied from r925488, websites/production/maven/content/jxr/ websites/production/maven/content/jxr-archives/ - copied from r925488, websites/production/maven/content/jxr-archives/ websites/production/maven/content/maven-archetype-bundles/ - copied from r925488, websites/production/maven/content/maven-archetype-bundles/ websites/production/maven/content/maven-indexer/ - copied from r925488, websites/production/maven/content/maven-indexer/ websites/production/maven/content/maven-indexer-archives/ - copied from r925488, websites/production/maven/content/maven-indexer-archives/ websites/production/maven/content/maven-release/ - copied from r925488, websites/production/maven/content/maven-release/ websites/production/maven/content/maven-release-archives/ - copied from r925488, websites/production/maven/content/maven-release-archives/ websites/production/maven/content/plugin-testing/ - copied from r925488, websites/production/maven/content/plugin-testing/ websites/production/maven/content/plugin-testing-archives/ - copied from r925488, websites/production/maven/content/plugin-testing-archives/ websites/production/maven/content/plugin-tools/ - copied from r925488, websites/production/maven/content/plugin-tools/ websites/production/maven/content/plugin-tools-archives/ - copied from r925488, websites/production/maven/content/plugin-tools-archives/ websites/production/maven/content/plugins-archives/ - copied from r925488, websites/production/maven/content/plugins-archives/ websites/production/maven/content/plugins/maven-acr-plugin/ - copied from r925488, websites/production/maven/content/plugins/maven-acr-plugin/ websites/production/maven/content/plugins/maven-ant-plugin/ - copied from r925488, websites/production/maven/content/plugins/maven-ant-plugin/ websites/production/maven/content/plugins/maven-antrun-plugin/ - copied from r925488, websites/production/maven/content/plugins/maven-antrun-plugin/ websites/production/maven/content/plugins/maven-archetype-plugin/ - copied from r925488, websites/production/maven/content/plugins/maven-archetype-plugin/ websites/production/maven/content/plugins/maven-assembly-plugin/ - copied from r925488, websites/production/maven/content/plugins/maven-assembly-plugin/ websites/production/maven/content/plugins/maven-changelog-plugin/ - copied from r925488, websites/production/maven/content/plugins/maven-changelog-plugin/ websites/production/maven/content/plugins/maven-changes-plugin/ - copied from r925488, websites/production/maven/content/plugins/maven-changes-plugin/ websites/production/maven/content/plugins/maven-checkstyle-plugin/ - copied from r925488, websites/production/maven/content/plugins/maven-checkstyle-plugin/ websites/production/maven/content/plugins/maven-clean-plugin/ - copied from r925488, websites/production/maven/content/plugins/maven-clean-plugin/ websites/production/maven/content/plugins/maven-compiler-plugin/ - copied from r925488, websites/production/maven/content/plugins/maven-compiler-plugin/ websites/production/maven/content/plugins/maven-dependency-plugin/ - copied from r925488, websites/production/maven/content/plugins/maven-dependency-plugin/ websites/production/maven/content/plugins/maven-deploy-plugin/ - copied from r925488, websites/production/maven/content/plugins/maven-deploy-plugin/ websites/production/maven/content/plugins/maven-doap-plugin/ - copied from r925488,
