svn commit: r852233 - in /websites/production/maven-doxia/content/doxia-tools: ./ apidocs/ apidocs/org/ apidocs/org/apache/ apidocs/org/apache/maven/ apidocs/org/apache/maven/doxia/ apidocs/org/apache
Author: olamy Date: Wed Feb 27 14:16:23 2013 New Revision: 852233 Log: restore doxia-tools conte,t [This commit notification would consist of 177 parts, which exceeds the limit of 50 ones, so it was shortened to the summary.]
svn commit: r1450897 - /maven/shared/trunk/maven-shared-utils/pom.xml
Author: krosenvold Date: Wed Feb 27 18:21:30 2013 New Revision: 1450897 URL: http://svn.apache.org/r1450897 Log: [maven-release-plugin] prepare release maven-shared-utils-0.3 Modified: maven/shared/trunk/maven-shared-utils/pom.xml Modified: maven/shared/trunk/maven-shared-utils/pom.xml URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils/pom.xml?rev=1450897r1=1450896r2=1450897view=diff == --- maven/shared/trunk/maven-shared-utils/pom.xml (original) +++ maven/shared/trunk/maven-shared-utils/pom.xml Wed Feb 27 18:21:30 2013 @@ -28,7 +28,7 @@ /parent artifactIdmaven-shared-utils/artifactId - version0.3-SNAPSHOT/version + version0.3/version properties mavenVersion2.1.0/mavenVersion @@ -42,10 +42,10 @@ /prerequisites scm - connectionscm:svn:http://svn.apache.org/repos/asf/maven/shared/trunk/maven-shared-utils/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/shared/trunk/maven-shared-utils + connectionscm:svn:http://svn.apache.org/repos/asf/maven/shared/tags/maven-shared-utils-0.3/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/shared/tags/maven-shared-utils-0.3 /developerConnection - urlhttp://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils/url + urlhttp://svn.apache.org/viewvc/maven/shared/tags/maven-shared-utils-0.3/url /scm issueManagement systemjira/system
svn commit: r1450899 - /maven/shared/tags/maven-shared-utils-0.3/
Author: krosenvold Date: Wed Feb 27 18:21:39 2013 New Revision: 1450899 URL: http://svn.apache.org/r1450899 Log: [maven-release-plugin] copy for tag maven-shared-utils-0.3 Added: maven/shared/tags/maven-shared-utils-0.3/ - copied from r1450897, maven/shared/trunk/maven-shared-utils/
svn commit: r1450900 - /maven/shared/trunk/maven-shared-utils/pom.xml
Author: krosenvold Date: Wed Feb 27 18:21:47 2013 New Revision: 1450900 URL: http://svn.apache.org/r1450900 Log: [maven-release-plugin] prepare for next development iteration Modified: maven/shared/trunk/maven-shared-utils/pom.xml Modified: maven/shared/trunk/maven-shared-utils/pom.xml URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils/pom.xml?rev=1450900r1=1450899r2=1450900view=diff == --- maven/shared/trunk/maven-shared-utils/pom.xml (original) +++ maven/shared/trunk/maven-shared-utils/pom.xml Wed Feb 27 18:21:47 2013 @@ -28,7 +28,7 @@ /parent artifactIdmaven-shared-utils/artifactId - version0.3/version + version0.4-SNAPSHOT/version properties mavenVersion2.1.0/mavenVersion @@ -42,10 +42,10 @@ /prerequisites scm - connectionscm:svn:http://svn.apache.org/repos/asf/maven/shared/tags/maven-shared-utils-0.3/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/shared/tags/maven-shared-utils-0.3 + connectionscm:svn:http://svn.apache.org/repos/asf/maven/shared/trunk/maven-shared-utils/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/shared/trunk/maven-shared-utils /developerConnection - urlhttp://svn.apache.org/viewvc/maven/shared/tags/maven-shared-utils-0.3/url + urlhttp://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils/url /scm issueManagement systemjira/system
git commit: o Upped m-s-u to 0.3 for release
Updated Branches: refs/heads/master 88f66f8c7 - ae6ccdc5b o Upped m-s-u to 0.3 for release Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/ae6ccdc5 Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/ae6ccdc5 Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/ae6ccdc5 Branch: refs/heads/master Commit: ae6ccdc5bfa4cbb94fb998312a22a48b5953248f Parents: 88f66f8 Author: Kristian Rosenvold kristian.rosenv...@gmail.com Authored: Wed Feb 27 20:12:25 2013 +0100 Committer: Kristian Rosenvold kristian.rosenv...@gmail.com Committed: Wed Feb 27 20:12:25 2013 +0100 -- pom.xml |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/ae6ccdc5/pom.xml -- diff --git a/pom.xml b/pom.xml index 22ab636..654a67a 100644 --- a/pom.xml +++ b/pom.xml @@ -241,7 +241,7 @@ dependency groupIdorg.apache.maven.shared/groupId artifactIdmaven-shared-utils/artifactId -version0.3-SNAPSHOT/version +version0.3/version /dependency dependency groupIdorg.apache.maven.shared/groupId
git commit: [maven-release-plugin] prepare release surefire-2.14
Updated Branches: refs/heads/master ae6ccdc5b - 1d572f20c [maven-release-plugin] prepare release surefire-2.14 Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/1d572f20 Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/1d572f20 Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/1d572f20 Branch: refs/heads/master Commit: 1d572f20cf88d5741daee2da2595b287f7f25a69 Parents: ae6ccdc Author: Kristian Rosenvold kristian.rosenv...@gmail.com Authored: Wed Feb 27 20:44:58 2013 +0100 Committer: Kristian Rosenvold kristian.rosenv...@gmail.com Committed: Wed Feb 27 20:44:58 2013 +0100 -- maven-failsafe-plugin/pom.xml|2 +- maven-surefire-common/pom.xml|2 +- maven-surefire-plugin/pom.xml|2 +- maven-surefire-report-plugin/pom.xml |2 +- pom.xml |2 +- surefire-api/pom.xml |2 +- surefire-booter/pom.xml |2 +- surefire-grouper/pom.xml |2 +- surefire-integration-tests/pom.xml |2 +- surefire-providers/common-java5/pom.xml |2 +- surefire-providers/common-junit3/pom.xml |2 +- surefire-providers/common-junit4/pom.xml |2 +- surefire-providers/common-junit48/pom.xml|2 +- surefire-providers/pom.xml |2 +- surefire-providers/surefire-junit3/pom.xml |2 +- surefire-providers/surefire-junit4/pom.xml |2 +- surefire-providers/surefire-junit47/pom.xml |2 +- surefire-providers/surefire-testng-utils/pom.xml |2 +- surefire-providers/surefire-testng/pom.xml |2 +- surefire-report-parser/pom.xml |2 +- surefire-setup-integration-tests/pom.xml |2 +- surefire-shadefire/pom.xml |2 +- 22 files changed, 22 insertions(+), 22 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/1d572f20/maven-failsafe-plugin/pom.xml -- diff --git a/maven-failsafe-plugin/pom.xml b/maven-failsafe-plugin/pom.xml index 952aa66..fbebea8 100644 --- a/maven-failsafe-plugin/pom.xml +++ b/maven-failsafe-plugin/pom.xml @@ -24,7 +24,7 @@ parent groupIdorg.apache.maven.surefire/groupId artifactIdsurefire/artifactId -version2.14-SNAPSHOT/version +version2.14/version relativePath../pom.xml/relativePath /parent http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/1d572f20/maven-surefire-common/pom.xml -- diff --git a/maven-surefire-common/pom.xml b/maven-surefire-common/pom.xml index 85a8a22..534bf0b 100644 --- a/maven-surefire-common/pom.xml +++ b/maven-surefire-common/pom.xml @@ -24,7 +24,7 @@ parent groupIdorg.apache.maven.surefire/groupId artifactIdsurefire/artifactId -version2.14-SNAPSHOT/version +version2.14/version relativePath../pom.xml/relativePath /parent http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/1d572f20/maven-surefire-plugin/pom.xml -- diff --git a/maven-surefire-plugin/pom.xml b/maven-surefire-plugin/pom.xml index 4039bb3..034e0fc 100644 --- a/maven-surefire-plugin/pom.xml +++ b/maven-surefire-plugin/pom.xml @@ -24,7 +24,7 @@ parent groupIdorg.apache.maven.surefire/groupId artifactIdsurefire/artifactId -version2.14-SNAPSHOT/version +version2.14/version relativePath../pom.xml/relativePath /parent http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/1d572f20/maven-surefire-report-plugin/pom.xml -- diff --git a/maven-surefire-report-plugin/pom.xml b/maven-surefire-report-plugin/pom.xml index 3c2666b..7ffe7f3 100644 --- a/maven-surefire-report-plugin/pom.xml +++ b/maven-surefire-report-plugin/pom.xml @@ -24,7 +24,7 @@ parent groupIdorg.apache.maven.surefire/groupId artifactIdsurefire/artifactId -version2.14-SNAPSHOT/version +version2.14/version relativePath../pom.xml/relativePath /parent http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/1d572f20/pom.xml -- diff --git a/pom.xml b/pom.xml index 654a67a..527bc9d 100644 --- a/pom.xml +++ b/pom.xml @@ -29,7 +29,7 @@ groupIdorg.apache.maven.surefire/groupId artifactIdsurefire/artifactId - version2.14-SNAPSHOT/version + version2.14/version packagingpom/packaging nameApache Maven Surefire/name
Git Push Summary
Updated Tags: refs/tags/surefire-2.14 [created] b190a5746
git commit: [maven-release-plugin] prepare for next development iteration
Updated Branches: refs/heads/master 1d572f20c - 348e203d6 [maven-release-plugin] prepare for next development iteration Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/348e203d Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/348e203d Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/348e203d Branch: refs/heads/master Commit: 348e203d6e86c5e5719bb779a6c376143ad20f25 Parents: 1d572f2 Author: Kristian Rosenvold kristian.rosenv...@gmail.com Authored: Wed Feb 27 20:45:07 2013 +0100 Committer: Kristian Rosenvold kristian.rosenv...@gmail.com Committed: Wed Feb 27 20:45:07 2013 +0100 -- maven-failsafe-plugin/pom.xml|2 +- maven-surefire-common/pom.xml|2 +- maven-surefire-plugin/pom.xml|2 +- maven-surefire-report-plugin/pom.xml |2 +- pom.xml |2 +- surefire-api/pom.xml |2 +- surefire-booter/pom.xml |2 +- surefire-grouper/pom.xml |2 +- surefire-integration-tests/pom.xml |2 +- surefire-providers/common-java5/pom.xml |2 +- surefire-providers/common-junit3/pom.xml |2 +- surefire-providers/common-junit4/pom.xml |2 +- surefire-providers/common-junit48/pom.xml|2 +- surefire-providers/pom.xml |2 +- surefire-providers/surefire-junit3/pom.xml |2 +- surefire-providers/surefire-junit4/pom.xml |2 +- surefire-providers/surefire-junit47/pom.xml |2 +- surefire-providers/surefire-testng-utils/pom.xml |2 +- surefire-providers/surefire-testng/pom.xml |2 +- surefire-report-parser/pom.xml |2 +- surefire-setup-integration-tests/pom.xml |2 +- surefire-shadefire/pom.xml |2 +- 22 files changed, 22 insertions(+), 22 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/348e203d/maven-failsafe-plugin/pom.xml -- diff --git a/maven-failsafe-plugin/pom.xml b/maven-failsafe-plugin/pom.xml index fbebea8..4a4ceed 100644 --- a/maven-failsafe-plugin/pom.xml +++ b/maven-failsafe-plugin/pom.xml @@ -24,7 +24,7 @@ parent groupIdorg.apache.maven.surefire/groupId artifactIdsurefire/artifactId -version2.14/version +version2.15-SNAPSHOT/version relativePath../pom.xml/relativePath /parent http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/348e203d/maven-surefire-common/pom.xml -- diff --git a/maven-surefire-common/pom.xml b/maven-surefire-common/pom.xml index 534bf0b..e5bb2aa 100644 --- a/maven-surefire-common/pom.xml +++ b/maven-surefire-common/pom.xml @@ -24,7 +24,7 @@ parent groupIdorg.apache.maven.surefire/groupId artifactIdsurefire/artifactId -version2.14/version +version2.15-SNAPSHOT/version relativePath../pom.xml/relativePath /parent http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/348e203d/maven-surefire-plugin/pom.xml -- diff --git a/maven-surefire-plugin/pom.xml b/maven-surefire-plugin/pom.xml index 034e0fc..30c191a 100644 --- a/maven-surefire-plugin/pom.xml +++ b/maven-surefire-plugin/pom.xml @@ -24,7 +24,7 @@ parent groupIdorg.apache.maven.surefire/groupId artifactIdsurefire/artifactId -version2.14/version +version2.15-SNAPSHOT/version relativePath../pom.xml/relativePath /parent http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/348e203d/maven-surefire-report-plugin/pom.xml -- diff --git a/maven-surefire-report-plugin/pom.xml b/maven-surefire-report-plugin/pom.xml index 7ffe7f3..918690e 100644 --- a/maven-surefire-report-plugin/pom.xml +++ b/maven-surefire-report-plugin/pom.xml @@ -24,7 +24,7 @@ parent groupIdorg.apache.maven.surefire/groupId artifactIdsurefire/artifactId -version2.14/version +version2.15-SNAPSHOT/version relativePath../pom.xml/relativePath /parent http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/348e203d/pom.xml -- diff --git a/pom.xml b/pom.xml index 527bc9d..1465f17 100644 --- a/pom.xml +++ b/pom.xml @@ -29,7 +29,7 @@ groupIdorg.apache.maven.surefire/groupId artifactIdsurefire/artifactId - version2.14/version + version2.15-SNAPSHOT/version packagingpom/packaging nameApache Maven Surefire/name
svn commit: r852274 - /websites/production/maven/content/surefire-archives/maven-surefire-2.14/
Author: krosenvold Date: Wed Feb 27 20:03:14 2013 New Revision: 852274 Log: Automatic svn path creation: https://svn.apache.org/repos/infra/websites/production/maven/content/surefire-archives/maven-surefire-2.14 Added: websites/production/maven/content/surefire-archives/maven-surefire-2.14/
svn commit: r852279 - /websites/production/maven/content/shared-archives/maven-shared-utils-0.3/
Author: krosenvold Date: Wed Feb 27 20:38:57 2013 New Revision: 852279 Log: Automatic svn path creation: https://svn.apache.org/repos/infra/websites/production/maven/content/shared-archives/maven-shared-utils-0.3 Added: websites/production/maven/content/shared-archives/maven-shared-utils-0.3/
svn commit: r852281 - in /websites/production/maven/content/surefire-archives/maven-surefire-2.14: ./ css/ images/ images/logos/ images/profiles/ img/ js/ maven-failsafe-plugin/ maven-failsafe-plugin/
Author: krosenvold Date: Wed Feb 27 20:48:54 2013 New Revision: 852281 Log: Apache Maven Surefire site deployment [This commit notification would consist of 163 parts, which exceeds the limit of 50 ones, so it was shortened to the summary.]
svn commit: r1451088 - in /maven/plugins/trunk/maven-dependency-plugin/src: main/java/org/apache/maven/plugin/dependency/ main/java/org/apache/maven/plugin/dependency/fromConfiguration/ main/java/org/
Author: brianf
Date: Thu Feb 28 04:22:41 2013
New Revision: 1451088
URL: http://svn.apache.org/r1451088
Log:
MDEP-403 add skip parameter (patch from henning)
Added:
maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/TestSkip.java
maven/plugins/trunk/maven-dependency-plugin/src/test/resources/unit/skip-test/
maven/plugins/trunk/maven-dependency-plugin/src/test/resources/unit/skip-test/plugin-analyze-report-config.xml
maven/plugins/trunk/maven-dependency-plugin/src/test/resources/unit/skip-test/plugin-config.xml
maven/plugins/trunk/maven-dependency-plugin/src/test/resources/unit/skip-test/plugin-get-config.xml
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractAnalyzeMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractDependencyMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AnalyzeDepMgt.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AnalyzeDuplicateMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AnalyzeReportMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/BuildClasspathMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/CopyDependenciesMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/GetMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/PropertiesMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/PurgeLocalRepositoryMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/TreeMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/UnpackDependenciesMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromConfiguration/AbstractFromConfigurationMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromConfiguration/CopyMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromConfiguration/UnpackMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/resolvers/GoOfflineMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/resolvers/ListRepositoriesMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/resolvers/ResolveDependenciesMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/resolvers/ResolveDependencySourcesMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/resolvers/ResolvePluginsMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/TestCopyDependenciesMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/TestUnpackDependenciesMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/TestUnpackDependenciesMojo2.java
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractAnalyzeMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractAnalyzeMojo.java?rev=1451088r1=1451087r2=1451088view=diff
==
---
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractAnalyzeMojo.java
(original)
+++
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractAnalyzeMojo.java
Thu Feb 28 04:22:41 2013
@@ -147,6 +147,14 @@ public abstract class AbstractAnalyzeMoj
@Parameter
private String[] usedDependencies;
+/**
+ * Skip plugin execution completely.
+ *
+ * @since 2.7
+ */
+@Parameter( property = skip, defaultValue = false )
+private boolean skip;
+
// Mojo methods ---
/*
@@ -155,6 +163,12 @@ public abstract class AbstractAnalyzeMoj
public void execute()
throws MojoExecutionException, MojoFailureException
{
+if ( isSkip() )
+{
+getLog().info( Skipping plugin execution );
+return;
+}
+
if (
svn commit: r1451090 - /maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/DefaultProjectDependencyAnalyzer.java
Author: brianf
Date: Thu Feb 28 04:34:01 2013
New Revision: 1451090
URL: http://svn.apache.org/r1451090
Log:
MSHARED-276 analyzer ignores project directories in a multi-module build -
don't just look at jars, accept classes files also. Patch by henning.
Modified:
maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/DefaultProjectDependencyAnalyzer.java
Modified:
maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/DefaultProjectDependencyAnalyzer.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/DefaultProjectDependencyAnalyzer.java?rev=1451090r1=1451089r2=1451090view=diff
==
---
maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/DefaultProjectDependencyAnalyzer.java
(original)
+++
maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/DefaultProjectDependencyAnalyzer.java
Thu Feb 28 04:34:01 2013
@@ -145,7 +145,7 @@ public class DefaultProjectDependencyAna
{
File file = artifact.getFile();
-if ( file != null file.getName().endsWith( .jar ) )
+if ( file != null (file.getName().endsWith( .jar ) ||
file.isDirectory()))
{
URL url = file.toURL();
svn commit: r1451091 - /maven/plugins/trunk/maven-dependency-plugin/pom.xml
Author: brianf Date: Thu Feb 28 04:36:37 2013 New Revision: 1451091 URL: http://svn.apache.org/r1451091 Log: MDEP-399 Multi-module dependencies incorrectly marked as unused - pick up the shared dependency analyzer 1.4 for MSHARED-276 Modified: maven/plugins/trunk/maven-dependency-plugin/pom.xml Modified: maven/plugins/trunk/maven-dependency-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/pom.xml?rev=1451091r1=1451090r2=1451091view=diff == --- maven/plugins/trunk/maven-dependency-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-dependency-plugin/pom.xml Thu Feb 28 04:36:37 2013 @@ -168,7 +168,7 @@ under the License. dependency groupIdorg.apache.maven.shared/groupId artifactIdmaven-dependency-analyzer/artifactId - version1.3/version + version1.4-SNAPSHOT/version /dependency dependency groupIdorg.apache.maven.shared/groupId
svn commit: r1451101 - /maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/RestJiraDownloader.java
Author: bimargulies
Date: Thu Feb 28 05:32:52 2013
New Revision: 1451101
URL: http://svn.apache.org/r1451101
Log:
MCHANGES-299: ClassNotFoundException when running jira-report using Maven 2.2.1
o work around failure of maven 2 to set the context class loader.
Modified:
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/RestJiraDownloader.java
Modified:
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/RestJiraDownloader.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/RestJiraDownloader.java?rev=1451101r1=1451100r2=1451101view=diff
==
---
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/RestJiraDownloader.java
(original)
+++
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/RestJiraDownloader.java
Thu Feb 28 05:32:52 2013
@@ -95,68 +95,73 @@ public class RestJiraDownloader extends
resolvedPriorityIds = new ArrayListString( );
}
-public void doExecute() throws Exception
+public void doExecute()
+throws Exception
{
MapString, String urlMap = JiraHelper.getJiraUrlAndProjectName(
project.getIssueManagement().getUrl() );
String jiraUrl = urlMap.get( url );
jiraProject = urlMap.get( project );
-WebClient client = setupWebClient( jiraUrl );
-// We use version 2 of the REST API, that first appeared in JIRA 5
-// Check if version 2 of the REST API is supported
-// http://docs.atlassian.com/jira/REST/5.0/
-// Note that serverInfo can always be accessed without authentication
-client.replacePath( /rest/api/2/serverInfo );
-client.accept( MediaType.APPLICATION_JSON );
-Response siResponse = client.get();
-if ( siResponse.getStatus() != Response.Status.OK.getStatusCode() )
+// This classloader juggling is a workaround for a classic Maven 2
class loader management bug.
+ClassLoader ccl = Thread.currentThread().getContextClassLoader();
+try
{
-throw new NoRest( This JIRA server does not support version 2 of
the REST API, which maven-changes-plugin requires. );
-}
+Thread.currentThread().setContextClassLoader(
WebClient.class.getClassLoader( ) );
+WebClient client = setupWebClient( jiraUrl );
+
+// We use version 2 of the REST API, that first appeared in JIRA 5
+// Check if version 2 of the REST API is supported
+// http://docs.atlassian.com/jira/REST/5.0/
+// Note that serverInfo can always be accessed without
authentication
+client.replacePath( /rest/api/2/serverInfo );
+client.accept( MediaType.APPLICATION_JSON );
+Response siResponse = client.get();
+if ( siResponse.getStatus() != Response.Status.OK.getStatusCode() )
+{
+throw new NoRest(
+This JIRA server does not support version 2 of the REST
API, which maven-changes-plugin requires. );
+}
-doSessionAuth( client );
+doSessionAuth( client );
-resolveIds( client, jiraProject );
-
-String jqlQuery = new JqlQueryBuilder( log )
-.urlEncode( false )
-.project( jiraProject )
-.fixVersion( getFixFor() )
-.fixVersionIds( resolvedFixVersionIds )
-.statusIds( resolvedStatusIds )
-.priorityIds( resolvedPriorityIds )
-.resolutionIds( resolvedResolutionIds )
-.components( resolvedComponentIds )
-.typeIds( resolvedTypeIds )
-.sortColumnNames( sortColumnNames )
-.build();
-
-StringWriter searchParamStringWriter = new StringWriter( );
-JsonGenerator gen = jsonFactory.createGenerator(
searchParamStringWriter );
-gen.writeStartObject();
-gen.writeStringField( jql, jqlQuery );
-gen.writeNumberField( maxResults, nbEntriesMax );
-gen.writeArrayFieldStart( fields );
-// Retrieve all fields. If that seems slow, we can reconsider.
-gen.writeString( *all );
-gen.writeEndArray();
-gen.writeEndObject();
-gen.close();
-client.replacePath( /rest/api/2/search );
-client.type( MediaType.APPLICATION_JSON_TYPE );
-client.accept( MediaType.APPLICATION_JSON_TYPE );
-Response searchResponse = client.post(
searchParamStringWriter.toString() );
-if ( searchResponse.getStatus() != Response.Status.OK.getStatusCode() )
-{
-reportErrors( searchResponse );
-}
-
-JsonNode issueTree = getResponseTree( searchResponse );
-assert issueTree.isObject();
-JsonNode issuesNode = issueTree.get( issues );
svn commit: r1451102 - /maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/trac/TracDownloader.java
Author: bimargulies Date: Thu Feb 28 05:34:17 2013 New Revision: 1451102 URL: http://svn.apache.org/r1451102 Log: MCHANGES-289: Please add support for HTTP digest authentication to the 'trac-report' plugin. Modified: maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/trac/TracDownloader.java Modified: maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/trac/TracDownloader.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/trac/TracDownloader.java?rev=1451102r1=1451101r2=1451102view=diff == --- maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/trac/TracDownloader.java (original) +++ maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/trac/TracDownloader.java Thu Feb 28 05:34:17 2013 @@ -24,6 +24,7 @@ import org.apache.maven.project.MavenPro import org.apache.xmlrpc.XmlRpcException; import org.apache.xmlrpc.client.XmlRpcClient; import org.apache.xmlrpc.client.XmlRpcClientConfigImpl; +import org.apache.xmlrpc.client.XmlRpcCommonsTransportFactory; import org.codehaus.plexus.util.StringUtils; import java.net.MalformedURLException; @@ -112,6 +113,8 @@ public class TracDownloader client.setConfig( config ); +client.setTransportFactory( new XmlRpcCommonsTransportFactory( client ) ); + // Fetch issues String qstr = ;
