git commit: default to ssl for central
Repository: maven Updated Branches: refs/heads/master 693f8f660 - 921619186 default to ssl for central Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/92161918 Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/92161918 Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/92161918 Branch: refs/heads/master Commit: 92161918698c55f4c108acb8c6042ad86e705b15 Parents: 693f8f6 Author: brianf bri...@apache.org Authored: Mon Aug 11 08:41:48 2014 -0400 Committer: brianf bri...@apache.org Committed: Mon Aug 11 08:41:48 2014 -0400 -- .../main/java/org/apache/maven/repository/RepositorySystem.java | 2 +- .../src/main/resources/org/apache/maven/model/pom-4.0.0.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven/blob/92161918/maven-core/src/main/java/org/apache/maven/repository/RepositorySystem.java -- diff --git a/maven-core/src/main/java/org/apache/maven/repository/RepositorySystem.java b/maven-core/src/main/java/org/apache/maven/repository/RepositorySystem.java index 0f3cd56..d334f6b 100644 --- a/maven-core/src/main/java/org/apache/maven/repository/RepositorySystem.java +++ b/maven-core/src/main/java/org/apache/maven/repository/RepositorySystem.java @@ -52,7 +52,7 @@ public interface RepositorySystem String DEFAULT_REMOTE_REPO_ID = central; -String DEFAULT_REMOTE_REPO_URL = http://repo.maven.apache.org/maven2;; +String DEFAULT_REMOTE_REPO_URL = https://repo.maven.apache.org/maven2;; Artifact createArtifact( String groupId, String artifactId, String version, String packaging ); http://git-wip-us.apache.org/repos/asf/maven/blob/92161918/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.0.0.xml -- diff --git a/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.0.0.xml b/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.0.0.xml index e8b42d8..91492a9 100644 --- a/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.0.0.xml +++ b/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.0.0.xml @@ -27,7 +27,7 @@ under the License. repository idcentral/id nameCentral Repository/name - urlhttp://repo.maven.apache.org/maven2/url + urlhttps://repo.maven.apache.org/maven2/url layoutdefault/layout snapshots enabledfalse/enabled @@ -39,7 +39,7 @@ under the License. pluginRepository idcentral/id nameCentral Repository/name - urlhttp://repo.maven.apache.org/maven2/url + urlhttps://repo.maven.apache.org/maven2/url layoutdefault/layout snapshots enabledfalse/enabled
svn commit: r1453580 - /maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractDependencyMojo.java
Author: brianf Date: Wed Mar 6 21:44:52 2013 New Revision: 1453580 URL: http://svn.apache.org/r1453580 Log: MDEP-391 restore permission compat with previous versions of the plugin. Modified: maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractDependencyMojo.java Modified: maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractDependencyMojo.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractDependencyMojo.java?rev=1453580r1=1453579r2=1453580view=diff == --- maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractDependencyMojo.java (original) +++ maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractDependencyMojo.java Wed Mar 6 21:44:52 2013 @@ -111,7 +111,7 @@ public abstract class AbstractDependency * ignore to set file permissions when unpacking a dependency * @since 2.7 */ -@Parameter( property = dependency.ignorePermissions, defaultValue = true ) +@Parameter( property = dependency.ignorePermissions, defaultValue = false ) protected boolean ignorePermissions = true; /**
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
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
Re: I created an alternative dashboard for mGSD based on Mark Forster's AutoFocus systems
Hello, This system looks great. I am just getting started with the whole GTD thing and I was thinking it might be best to start with AutoFocus built in. I understand that the whole system put together can be downloaded at http://af4-demo.tiddlyspot.com/download Is there any way to delete all the content that comes with the demo, so I can start off from scratch with GTD and autofocus? Thank you, Brian -- You received this message because you are subscribed to the Google Groups GTD TiddlyWiki group. To post to this group, send email to gtd-tiddlywiki@googlegroups.com. To unsubscribe from this group, send email to gtd-tiddlywiki+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/gtd-tiddlywiki?hl=en.
Re: I created an alternative dashboard for mGSD based on Mark Forster's AutoFocus systems
Hello, Great addition. I wanted to start out with this functionality built in so I downloaded the file from the demo: http://af4-demo.tiddlyspot.com/download First, is this the proper way of getting everything built in and ready to go, second how do I get rid of the download and upload text in the right side menu. Finally, is there anything else I need to do to get this up and running (meaning do I need to delete any connections with tiddlyspot or the demo or anything?)? Thanks, Brian -- You received this message because you are subscribed to the Google Groups GTD TiddlyWiki group. To post to this group, send email to gtd-tiddlywiki@googlegroups.com. To unsubscribe from this group, send email to gtd-tiddlywiki+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/gtd-tiddlywiki?hl=en.
svn commit: r1069485 - /maven/pom/trunk/asf/src/site/apt/index.apt
Author: brianf Date: Thu Feb 10 17:29:03 2011 New Revision: 1069485 URL: http://svn.apache.org/viewvc?rev=1069485view=rev Log: fix small grammatical error Modified: maven/pom/trunk/asf/src/site/apt/index.apt Modified: maven/pom/trunk/asf/src/site/apt/index.apt URL: http://svn.apache.org/viewvc/maven/pom/trunk/asf/src/site/apt/index.apt?rev=1069485r1=1069484r2=1069485view=diff == --- maven/pom/trunk/asf/src/site/apt/index.apt (original) +++ maven/pom/trunk/asf/src/site/apt/index.apt Thu Feb 10 17:29:03 2011 @@ -51,7 +51,7 @@ Apache Software Foundation Shared POM https://repository.apache.org/service/local/staging/deploy/maven2 and snapshots to https://repository.apache.org/content/repositories/snapshots. Note -that there is are POM parameters that you can override to change +that there is POM parameters that you can override to change the snapshot location. ** mailingLists: The POM sets up generic Apache announcement
svn commit: r1069499 - in /maven/pom/trunk: asf/pom.xml maven/pom.xml
Author: brianf Date: Thu Feb 10 17:55:49 2011 New Revision: 1069499 URL: http://svn.apache.org/viewvc?rev=1069499view=rev Log: revert r1065772 see MPOM-1 for updated information Modified: maven/pom/trunk/asf/pom.xml maven/pom/trunk/maven/pom.xml Modified: maven/pom/trunk/asf/pom.xml URL: http://svn.apache.org/viewvc/maven/pom/trunk/asf/pom.xml?rev=1069499r1=1069498r2=1069499view=diff == --- maven/pom/trunk/asf/pom.xml (original) +++ maven/pom/trunk/asf/pom.xml Thu Feb 10 17:55:49 2011 @@ -194,7 +194,8 @@ under the License. version2.1/version configuration useReleaseProfilefalse/useReleaseProfile -goalsdeploy/goals +goalsdeploy/goals +arguments-Papache-release/arguments /configuration /plugin !-- END SNIPPET: release-plugin-configuration -- Modified: maven/pom/trunk/maven/pom.xml URL: http://svn.apache.org/viewvc/maven/pom/trunk/maven/pom.xml?rev=1069499r1=1069498r2=1069499view=diff == --- maven/pom/trunk/maven/pom.xml (original) +++ maven/pom/trunk/maven/pom.xml Thu Feb 10 17:55:49 2011 @@ -603,20 +603,6 @@ under the License. urlscp://people.apache.org/www/maven.apache.org/url /site /distributionManagement - - build -pluginManagement - plugins -plugin - groupIdorg.apache.maven.plugins/groupId - artifactIdmaven-release-plugin/artifactId - configuration -arguments-Papache-release/arguments - /configuration -/plugin - /plugins -/pluginManagement - /build reporting plugins
svn commit: r1069581 - in /maven/pom/trunk/asf: README.txt pom.xml src/
Author: brianf Date: Thu Feb 10 21:51:08 2011 New Revision: 1069581 URL: http://svn.apache.org/viewvc?rev=1069581view=rev Log: revert the site additions to the asf pom MPOM-1 MPOM-5 MPOM-7 Removed: maven/pom/trunk/asf/README.txt maven/pom/trunk/asf/src/ Modified: maven/pom/trunk/asf/pom.xml Modified: maven/pom/trunk/asf/pom.xml URL: http://svn.apache.org/viewvc/maven/pom/trunk/asf/pom.xml?rev=1069581r1=1069580r2=1069581view=diff == --- maven/pom/trunk/asf/pom.xml (original) +++ maven/pom/trunk/asf/pom.xml Thu Feb 10 21:51:08 2011 @@ -52,11 +52,7 @@ under the License. nameThe Apache Software Foundation/name urlhttp://www.apache.org//url /organization - urlhttp://maven.apache.org/asf-pom//url - issueManagement -systemjira/system -urlhttps://issues.apache.org/jira/browse/MPOM/url - /issueManagement + urlhttp://www.apache.org//url repositories repository idapache.snapshots/id @@ -86,7 +82,6 @@ under the License. nameApache Announce List/name subscribeannounce-subscr...@apache.org/subscribe unsubscribeannounce-unsubscr...@apache.org/unsubscribe - postannou...@apache.org/post archivehttp://mail-archives.apache.org/mod_mbox/www-announce//archive /mailingList @@ -220,7 +215,7 @@ under the License. plugin groupIdorg.apache.maven.plugins/groupId artifactIdmaven-site-plugin/artifactId - version2.2/version + version2.0.1/version /plugin plugin groupIdorg.apache.maven.plugins/groupId @@ -406,15 +401,6 @@ under the License. /plugins /build /profile -profile - idasf-pom-site/id - distributionManagement -site - idapache.website/id - urlscp://people.apache.org/www/maven.apache.org/asf-pom/url -/site - /distributionManagement -/profile /profiles /project
svn commit: r1069582 - /maven/pom/trunk/maven/src/site/site.xml
Author: brianf Date: Thu Feb 10 21:53:47 2011 New Revision: 1069582 URL: http://svn.apache.org/viewvc?rev=1069582view=rev Log: revert r1067523 since the site isn't inherited from the ASF pom. Modified: maven/pom/trunk/maven/src/site/site.xml Modified: maven/pom/trunk/maven/src/site/site.xml URL: http://svn.apache.org/viewvc/maven/pom/trunk/maven/src/site/site.xml?rev=1069582r1=1069581r2=1069582view=diff == --- maven/pom/trunk/maven/src/site/site.xml (original) +++ maven/pom/trunk/maven/src/site/site.xml Thu Feb 10 21:53:47 2011 @@ -50,6 +50,7 @@ under the License. !-- Breadcrumbs that every project will inherit -- breadcrumbs + item name=Apache href=http://www.apache.org/; / !-- NOTE: This only works with stylus-skin-1.3, remove again if reverting to 1.2 --
svn commit: r1069599 - /maven/pom/trunk/asf/pom.xml
Author: brianf Date: Thu Feb 10 22:50:03 2011 New Revision: 1069599 URL: http://svn.apache.org/viewvc?rev=1069599view=rev Log: set the site version back to 2.2 Modified: maven/pom/trunk/asf/pom.xml Modified: maven/pom/trunk/asf/pom.xml URL: http://svn.apache.org/viewvc/maven/pom/trunk/asf/pom.xml?rev=1069599r1=1069598r2=1069599view=diff == --- maven/pom/trunk/asf/pom.xml (original) +++ maven/pom/trunk/asf/pom.xml Thu Feb 10 22:50:03 2011 @@ -215,7 +215,7 @@ under the License. plugin groupIdorg.apache.maven.plugins/groupId artifactIdmaven-site-plugin/artifactId - version2.0.1/version + version2.2/version /plugin plugin groupIdorg.apache.maven.plugins/groupId
svn commit: r1069606 - /maven/plugins/trunk/maven-plugins/pom.xml
Author: brianf Date: Thu Feb 10 22:59:42 2011 New Revision: 1069606 URL: http://svn.apache.org/viewvc?rev=1069606view=rev Log: allow the plgMgt to be inherited for site, bump the reporting version. Modified: maven/plugins/trunk/maven-plugins/pom.xml Modified: maven/plugins/trunk/maven-plugins/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-plugins/pom.xml?rev=1069606r1=1069605r2=1069606view=diff == --- maven/plugins/trunk/maven-plugins/pom.xml (original) +++ maven/plugins/trunk/maven-plugins/pom.xml Thu Feb 10 22:59:42 2011 @@ -165,7 +165,6 @@ under the License. plugin groupIdorg.apache.maven.plugins/groupId artifactIdmaven-plugin-plugin/artifactId -version2.6/version executions execution idgenerated-helpmojo/id @@ -183,7 +182,7 @@ under the License. plugin groupIdorg.apache.maven.plugins/groupId artifactIdmaven-plugin-plugin/artifactId -version2.6/version +version2.7/version /plugin /plugins /reporting
svn commit: r1069610 - in /maven/pom/trunk: asf/pom.xml maven/pom.xml
Author: brianf
Date: Thu Feb 10 23:26:14 2011
New Revision: 1069610
URL: http://svn.apache.org/viewvc?rev=1069610view=rev
Log:
move the attach descriptor to the maven pom since there's no site with the asf
pom. Also set the inherited flag to false so it's not run for every child of
maven.
Modified:
maven/pom/trunk/asf/pom.xml
maven/pom/trunk/maven/pom.xml
Modified: maven/pom/trunk/asf/pom.xml
URL:
http://svn.apache.org/viewvc/maven/pom/trunk/asf/pom.xml?rev=1069610r1=1069609r2=1069610view=diff
==
--- maven/pom/trunk/asf/pom.xml (original)
+++ maven/pom/trunk/asf/pom.xml Thu Feb 10 23:26:14 2011
@@ -386,19 +386,6 @@ under the License.
/plugin
/plugins
/pluginManagement
-plugins
- plugin
-artifactIdmaven-site-plugin/artifactId
-executions
- execution
-idattach-descriptor/id
-goals
- goalattach-descriptor/goal
-/goals
- /execution
-/executions
- /plugin
-/plugins
/build
/profile
/profiles
Modified: maven/pom/trunk/maven/pom.xml
URL:
http://svn.apache.org/viewvc/maven/pom/trunk/maven/pom.xml?rev=1069610r1=1069609r2=1069610view=diff
==
--- maven/pom/trunk/maven/pom.xml (original)
+++ maven/pom/trunk/maven/pom.xml Thu Feb 10 23:26:14 2011
@@ -775,5 +775,31 @@ under the License.
/plugins
/reporting
/profile
+profile
+ idmaven-3/id
+ activation
+file
+ !-- This employs that the basedir expression is only recognized by
Maven 3.x (see MNG-2363) --
+ exists${basedir}/exists
+/file
+ /activation
+ build
+!-- we need to attach the descriptor for this pom --
+plugins
+ plugin
+artifactIdmaven-site-plugin/artifactId
+ inheritedfalse/inherited
+executions
+ execution
+idattach-descriptor/id
+goals
+ goalattach-descriptor/goal
+/goals
+ /execution
+/executions
+ /plugin
+/plugins
+ /build
+/profile
/profiles
/project
svn commit: r1069613 - /maven/plugins/trunk/maven-plugins/pom.xml
Author: brianf
Date: Thu Feb 10 23:31:38 2011
New Revision: 1069613
URL: http://svn.apache.org/viewvc?rev=1069613view=rev
Log:
leave just the attach-descriptor
Modified:
maven/plugins/trunk/maven-plugins/pom.xml
Modified: maven/plugins/trunk/maven-plugins/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-plugins/pom.xml?rev=1069613r1=1069612r2=1069613view=diff
==
--- maven/plugins/trunk/maven-plugins/pom.xml (original)
+++ maven/plugins/trunk/maven-plugins/pom.xml Thu Feb 10 23:31:38 2011
@@ -250,7 +250,6 @@ under the License.
/plugins
/reporting
/profile
-!-- FIXME add this in the maven parent --
profile
idmaven-3/id
activation
@@ -259,25 +258,12 @@ under the License.
exists${basedir}/exists
/file
/activation
- properties
-sitePluginVersion3.0-beta-3/sitePluginVersion
- /properties
build
-pluginManagement
- plugins
-plugin
- groupIdorg.apache.maven.plugins/groupId
- artifactIdmaven-site-plugin/artifactId
- version${sitePluginVersion}/version
-/plugin
- /plugins
-/pluginManagement
plugins
!-- if releasing current pom with maven 3 site descriptor must be
attached --
plugin
groupIdorg.apache.maven.plugins/groupId
artifactIdmaven-site-plugin/artifactId
-version${sitePluginVersion}/version
inheritedfalse/inherited
executions
execution
@@ -289,8 +275,7 @@ under the License.
/executions
/plugin
/plugins
- /build
-
-/profile
+ /build
+/profile
/profiles
/project
svn commit: r1069614 - /maven/plugins/trunk/maven-dependency-plugin/pom.xml
Author: brianf Date: Thu Feb 10 23:32:52 2011 New Revision: 1069614 URL: http://svn.apache.org/viewvc?rev=1069614view=rev Log: revert the staged release 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=1069614r1=1069613r2=1069614view=diff == --- maven/plugins/trunk/maven-dependency-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-dependency-plugin/pom.xml Thu Feb 10 23:32:52 2011 @@ -19,7 +19,7 @@ specific language governing permissions 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; +project 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' xmlns='http://maven.apache.org/POM/4.0.0' modelVersion4.0.0/modelVersion parent @@ -29,7 +29,7 @@ under the License. /parent artifactIdmaven-dependency-plugin/artifactId - version2.3-SNAPSHOT/version + version2.2-SNAPSHOT/version packagingmaven-plugin/packaging nameMaven Dependency Plugin/name
svn commit: r1069615 - /maven/shared/trunk/maven-dependency-analyzer/pom.xml
Author: brianf Date: Thu Feb 10 23:34:57 2011 New Revision: 1069615 URL: http://svn.apache.org/viewvc?rev=1069615view=rev Log: revert the staged release Modified: maven/shared/trunk/maven-dependency-analyzer/pom.xml Modified: maven/shared/trunk/maven-dependency-analyzer/pom.xml URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-dependency-analyzer/pom.xml?rev=1069615r1=1069614r2=1069615view=diff == --- maven/shared/trunk/maven-dependency-analyzer/pom.xml (original) +++ maven/shared/trunk/maven-dependency-analyzer/pom.xml Thu Feb 10 23:34:57 2011 @@ -18,7 +18,7 @@ * 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; +project 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' xmlns='http://maven.apache.org/POM/4.0.0' modelVersion4.0.0/modelVersion parent @@ -31,7 +31,7 @@ groupIdorg.apache.maven.shared/groupId artifactIdmaven-dependency-analyzer/artifactId packagingjar/packaging - version1.3-SNAPSHOT/version + version1.2-SNAPSHOT/version nameMaven Dependency Analyzer/name description @@ -135,7 +135,7 @@ plugin artifactIdmaven-surefire-plugin/artifactId configuration - systemProperties combine.children=append + systemProperties combine.children='append' property !-- Pass this through to the tests (if set!) to have them pick the right repository -- namemaven.repo.local/name
svn commit: r1069616 - /maven/shared/trunk/maven-shared-components/pom.xml
Author: brianf
Date: Thu Feb 10 23:38:15 2011
New Revision: 1069616
URL: http://svn.apache.org/viewvc?rev=1069616view=rev
Log:
fix up the site profile
Modified:
maven/shared/trunk/maven-shared-components/pom.xml
Modified: maven/shared/trunk/maven-shared-components/pom.xml
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-components/pom.xml?rev=1069616r1=1069615r2=1069616view=diff
==
--- maven/shared/trunk/maven-shared-components/pom.xml (original)
+++ maven/shared/trunk/maven-shared-components/pom.xml Thu Feb 10 23:38:15 2011
@@ -196,7 +196,6 @@ under the License.
/plugins
/build
/profile
-!-- FIXME add this in the maven parent --
profile
idmaven-3/id
activation
@@ -205,25 +204,12 @@ under the License.
exists${basedir}/exists
/file
/activation
- properties
-sitePluginVersion3.0-beta-3/sitePluginVersion
- /properties
build
-pluginManagement
- plugins
-plugin
- groupIdorg.apache.maven.plugins/groupId
- artifactIdmaven-site-plugin/artifactId
- version${sitePluginVersion}/version
-/plugin
- /plugins
-/pluginManagement
plugins
!-- if releasing current pom with maven 3 site descriptor must be
attached --
plugin
groupIdorg.apache.maven.plugins/groupId
artifactIdmaven-site-plugin/artifactId
-version${sitePluginVersion}/version
inheritedfalse/inherited
executions
execution
@@ -239,17 +225,4 @@ under the License.
/profile
/profiles
- !-- TODO remove when the parent will be released --
- repositories
-repository
- idapache.snapshots/id
- urlhttps://repository.apache.org/content/groups/snapshots-group//url
- releases
-enabledfalse/enabled
- /releases
- snapshots
-enabledtrue/enabled
- /snapshots
-/repository
- /repositories
/project
svn commit: r1069620 - /maven/pom/trunk/asf/pom.xml
Author: brianf Date: Thu Feb 10 23:56:21 2011 New Revision: 1069620 URL: http://svn.apache.org/viewvc?rev=1069620view=rev Log: [maven-release-plugin] prepare release apache-9 Modified: maven/pom/trunk/asf/pom.xml Modified: maven/pom/trunk/asf/pom.xml URL: http://svn.apache.org/viewvc/maven/pom/trunk/asf/pom.xml?rev=1069620r1=1069619r2=1069620view=diff == --- maven/pom/trunk/asf/pom.xml (original) +++ maven/pom/trunk/asf/pom.xml Thu Feb 10 23:56:21 2011 @@ -31,7 +31,7 @@ under the License. -- groupIdorg.apache/groupId artifactIdapache/artifactId - version9-SNAPSHOT/version + version9/version packagingpom/packaging nameThe Apache Software Foundation/name description @@ -94,9 +94,9 @@ under the License. sourceReleaseAssemblyDescriptorsource-release/sourceReleaseAssemblyDescriptor /properties scm - connectionscm:svn:http://svn.apache.org/repos/asf/maven/pom/trunk/asf/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/pom/trunk/asf/developerConnection -urlhttp://svn.apache.org/viewvc/maven/pom/trunk/asf/url + connectionscm:svn:http://svn.apache.org/repos/asf/maven/pom/tags/apache-9/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/pom/tags/apache-9/developerConnection +urlhttp://svn.apache.org/viewvc/maven/pom/tags/apache-9/url /scm build
svn commit: r1069621 - /maven/pom/tags/apache-9/
Author: brianf Date: Thu Feb 10 23:56:26 2011 New Revision: 1069621 URL: http://svn.apache.org/viewvc?rev=1069621view=rev Log: [maven-release-plugin] copy for tag apache-9 Added: maven/pom/tags/apache-9/ - copied from r1069620, maven/pom/trunk/asf/
svn commit: r1069623 - /maven/pom/trunk/asf/pom.xml
Author: brianf Date: Thu Feb 10 23:56:29 2011 New Revision: 1069623 URL: http://svn.apache.org/viewvc?rev=1069623view=rev Log: [maven-release-plugin] prepare for next development iteration Modified: maven/pom/trunk/asf/pom.xml Modified: maven/pom/trunk/asf/pom.xml URL: http://svn.apache.org/viewvc/maven/pom/trunk/asf/pom.xml?rev=1069623r1=1069622r2=1069623view=diff == --- maven/pom/trunk/asf/pom.xml (original) +++ maven/pom/trunk/asf/pom.xml Thu Feb 10 23:56:29 2011 @@ -31,7 +31,7 @@ under the License. -- groupIdorg.apache/groupId artifactIdapache/artifactId - version9/version + version10-SNAPSHOT/version packagingpom/packaging nameThe Apache Software Foundation/name description @@ -94,9 +94,9 @@ under the License. sourceReleaseAssemblyDescriptorsource-release/sourceReleaseAssemblyDescriptor /properties scm - connectionscm:svn:http://svn.apache.org/repos/asf/maven/pom/tags/apache-9/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/pom/tags/apache-9/developerConnection -urlhttp://svn.apache.org/viewvc/maven/pom/tags/apache-9/url + connectionscm:svn:http://svn.apache.org/repos/asf/maven/pom/trunk/asf/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/pom/trunk/asf/developerConnection +urlhttp://svn.apache.org/viewvc/maven/pom/trunk/asf/url /scm build
svn commit: r1069625 - /maven/pom/trunk/maven/pom.xml
Author: brianf Date: Thu Feb 10 23:58:44 2011 New Revision: 1069625 URL: http://svn.apache.org/viewvc?rev=1069625view=rev Log: use the released parent Modified: maven/pom/trunk/maven/pom.xml Modified: maven/pom/trunk/maven/pom.xml URL: http://svn.apache.org/viewvc/maven/pom/trunk/maven/pom.xml?rev=1069625r1=1069624r2=1069625view=diff == --- maven/pom/trunk/maven/pom.xml (original) +++ maven/pom/trunk/maven/pom.xml Thu Feb 10 23:58:44 2011 @@ -25,7 +25,7 @@ under the License. parent groupIdorg.apache/groupId artifactIdapache/artifactId -version9-SNAPSHOT/version +version9/version relativePath../asf/pom.xml/relativePath /parent
svn commit: r1069626 - /maven/pom/trunk/maven/pom.xml
Author: brianf Date: Thu Feb 10 23:59:02 2011 New Revision: 1069626 URL: http://svn.apache.org/viewvc?rev=1069626view=rev Log: [maven-release-plugin] prepare release maven-parent-19 Modified: maven/pom/trunk/maven/pom.xml Modified: maven/pom/trunk/maven/pom.xml URL: http://svn.apache.org/viewvc/maven/pom/trunk/maven/pom.xml?rev=1069626r1=1069625r2=1069626view=diff == --- maven/pom/trunk/maven/pom.xml (original) +++ maven/pom/trunk/maven/pom.xml Thu Feb 10 23:59:02 2011 @@ -31,7 +31,7 @@ under the License. groupIdorg.apache.maven/groupId artifactIdmaven-parent/artifactId - version19-SNAPSHOT/version + version19/version packagingpom/packaging nameApache Maven/name @@ -581,9 +581,9 @@ under the License. /mailingLists scm - connectionscm:svn:http://svn.apache.org/repos/asf/maven/pom/trunk/maven/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/pom/trunk/maven/developerConnection -urlhttp://svn.apache.org/viewvc/maven/pom/trunk/maven/url + connectionscm:svn:http://svn.apache.org/repos/asf/maven/pom/tags/maven-parent-19/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/pom/tags/maven-parent-19/developerConnection +urlhttp://svn.apache.org/viewvc/maven/pom/tags/maven-parent-19/url /scm ciManagement systemHudson/system
svn commit: r1069627 - /maven/pom/tags/maven-parent-19/
Author: brianf Date: Thu Feb 10 23:59:08 2011 New Revision: 1069627 URL: http://svn.apache.org/viewvc?rev=1069627view=rev Log: [maven-release-plugin] copy for tag maven-parent-19 Added: maven/pom/tags/maven-parent-19/ - copied from r1069626, maven/pom/trunk/maven/
svn commit: r1069628 - /maven/pom/trunk/maven/pom.xml
Author: brianf Date: Thu Feb 10 23:59:11 2011 New Revision: 1069628 URL: http://svn.apache.org/viewvc?rev=1069628view=rev Log: [maven-release-plugin] prepare for next development iteration Modified: maven/pom/trunk/maven/pom.xml Modified: maven/pom/trunk/maven/pom.xml URL: http://svn.apache.org/viewvc/maven/pom/trunk/maven/pom.xml?rev=1069628r1=1069627r2=1069628view=diff == --- maven/pom/trunk/maven/pom.xml (original) +++ maven/pom/trunk/maven/pom.xml Thu Feb 10 23:59:11 2011 @@ -31,7 +31,7 @@ under the License. groupIdorg.apache.maven/groupId artifactIdmaven-parent/artifactId - version19/version + version20-SNAPSHOT/version packagingpom/packaging nameApache Maven/name @@ -581,9 +581,9 @@ under the License. /mailingLists scm - connectionscm:svn:http://svn.apache.org/repos/asf/maven/pom/tags/maven-parent-19/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/pom/tags/maven-parent-19/developerConnection -urlhttp://svn.apache.org/viewvc/maven/pom/tags/maven-parent-19/url + connectionscm:svn:http://svn.apache.org/repos/asf/maven/pom/trunk/maven/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/pom/trunk/maven/developerConnection +urlhttp://svn.apache.org/viewvc/maven/pom/trunk/maven/url /scm ciManagement systemHudson/system
svn commit: r1069630 - in /maven/plugins/trunk: maven-plugins/pom.xml pom.xml
Author: brianf Date: Fri Feb 11 00:01:25 2011 New Revision: 1069630 URL: http://svn.apache.org/viewvc?rev=1069630view=rev Log: use the released parent Modified: maven/plugins/trunk/maven-plugins/pom.xml maven/plugins/trunk/pom.xml Modified: maven/plugins/trunk/maven-plugins/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-plugins/pom.xml?rev=1069630r1=1069629r2=1069630view=diff == --- maven/plugins/trunk/maven-plugins/pom.xml (original) +++ maven/plugins/trunk/maven-plugins/pom.xml Fri Feb 11 00:01:25 2011 @@ -23,7 +23,7 @@ under the License. parent groupIdorg.apache.maven/groupId artifactIdmaven-parent/artifactId -version19-SNAPSHOT/version +version19/version relativePath../../pom/maven/pom.xml/relativePath /parent Modified: maven/plugins/trunk/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/pom.xml?rev=1069630r1=1069629r2=1069630view=diff == --- maven/plugins/trunk/pom.xml (original) +++ maven/plugins/trunk/pom.xml Fri Feb 11 00:01:25 2011 @@ -23,7 +23,7 @@ under the License. parent groupIdorg.apache.maven/groupId artifactIdmaven-parent/artifactId -version18/version +version19/version relativePath../pom/maven/pom.xml/relativePath /parent
svn commit: r1069631 - /maven/plugins/trunk/maven-plugins/pom.xml
Author: brianf Date: Fri Feb 11 00:02:30 2011 New Revision: 1069631 URL: http://svn.apache.org/viewvc?rev=1069631view=rev Log: [maven-release-plugin] prepare release maven-plugins-19 Modified: maven/plugins/trunk/maven-plugins/pom.xml Modified: maven/plugins/trunk/maven-plugins/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-plugins/pom.xml?rev=1069631r1=1069630r2=1069631view=diff == --- maven/plugins/trunk/maven-plugins/pom.xml (original) +++ maven/plugins/trunk/maven-plugins/pom.xml Fri Feb 11 00:02:30 2011 @@ -29,7 +29,7 @@ under the License. groupIdorg.apache.maven.plugins/groupId artifactIdmaven-plugins/artifactId - version19-SNAPSHOT/version + version19/version packagingpom/packaging nameMaven Plugins/name @@ -111,9 +111,9 @@ under the License. /mailingLists scm - connectionscm:svn:http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-plugins//connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-plugins//developerConnection -urlhttp://svn.apache.org/viewvc/maven/plugins/trunk/maven-plugins//url + connectionscm:svn:http://svn.apache.org/repos/asf/maven/plugins/tags/maven-plugins-19/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/plugins/tags/maven-plugins-19/developerConnection +urlhttp://svn.apache.org/viewvc/maven/plugins/tags/maven-plugins-19/url /scm distributionManagement site
svn commit: r1069632 - /maven/plugins/tags/maven-plugins-19/
Author: brianf Date: Fri Feb 11 00:02:36 2011 New Revision: 1069632 URL: http://svn.apache.org/viewvc?rev=1069632view=rev Log: [maven-release-plugin] copy for tag maven-plugins-19 Added: maven/plugins/tags/maven-plugins-19/ - copied from r1069631, maven/plugins/trunk/maven-plugins/
svn commit: r1069633 - /maven/plugins/trunk/maven-plugins/pom.xml
Author: brianf Date: Fri Feb 11 00:02:38 2011 New Revision: 1069633 URL: http://svn.apache.org/viewvc?rev=1069633view=rev Log: [maven-release-plugin] prepare for next development iteration Modified: maven/plugins/trunk/maven-plugins/pom.xml Modified: maven/plugins/trunk/maven-plugins/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-plugins/pom.xml?rev=1069633r1=1069632r2=1069633view=diff == --- maven/plugins/trunk/maven-plugins/pom.xml (original) +++ maven/plugins/trunk/maven-plugins/pom.xml Fri Feb 11 00:02:38 2011 @@ -29,7 +29,7 @@ under the License. groupIdorg.apache.maven.plugins/groupId artifactIdmaven-plugins/artifactId - version19/version + version20-SNAPSHOT/version packagingpom/packaging nameMaven Plugins/name @@ -111,9 +111,9 @@ under the License. /mailingLists scm - connectionscm:svn:http://svn.apache.org/repos/asf/maven/plugins/tags/maven-plugins-19/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/plugins/tags/maven-plugins-19/developerConnection -urlhttp://svn.apache.org/viewvc/maven/plugins/tags/maven-plugins-19/url + connectionscm:svn:http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-plugins//connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-plugins//developerConnection +urlhttp://svn.apache.org/viewvc/maven/plugins/trunk/maven-plugins//url /scm distributionManagement site
svn commit: r1069634 - /maven/shared/trunk/maven-shared-components/pom.xml
Author: brianf Date: Fri Feb 11 00:05:02 2011 New Revision: 1069634 URL: http://svn.apache.org/viewvc?rev=1069634view=rev Log: use the released parent Modified: maven/shared/trunk/maven-shared-components/pom.xml Modified: maven/shared/trunk/maven-shared-components/pom.xml URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-components/pom.xml?rev=1069634r1=1069633r2=1069634view=diff == --- maven/shared/trunk/maven-shared-components/pom.xml (original) +++ maven/shared/trunk/maven-shared-components/pom.xml Fri Feb 11 00:05:02 2011 @@ -25,7 +25,7 @@ under the License. parent groupIdorg.apache.maven/groupId artifactIdmaven-parent/artifactId -version19-SNAPSHOT/version +version19/version relativePath../../pom/maven/pom.xml/relativePath /parent
svn commit: r1069635 - /maven/shared/trunk/maven-shared-components/pom.xml
Author: brianf Date: Fri Feb 11 00:05:14 2011 New Revision: 1069635 URL: http://svn.apache.org/viewvc?rev=1069635view=rev Log: [maven-release-plugin] prepare release maven-shared-components-16 Modified: maven/shared/trunk/maven-shared-components/pom.xml Modified: maven/shared/trunk/maven-shared-components/pom.xml URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-components/pom.xml?rev=1069635r1=1069634r2=1069635view=diff == --- maven/shared/trunk/maven-shared-components/pom.xml (original) +++ maven/shared/trunk/maven-shared-components/pom.xml Fri Feb 11 00:05:14 2011 @@ -31,7 +31,7 @@ under the License. groupIdorg.apache.maven.shared/groupId artifactIdmaven-shared-components/artifactId - version16-SNAPSHOT/version + version16/version packagingpom/packaging nameMaven Shared Components/name @@ -114,9 +114,9 @@ under the License. scm - connectionscm:svn:http://svn.apache.org/repos/asf/maven/shared/trunk/maven-shared-components/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/shared/trunk/maven-shared-components/developerConnection - urlhttp://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-components/url + connectionscm:svn:http://svn.apache.org/repos/asf/maven/shared/tags/maven-shared-components-16/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/shared/tags/maven-shared-components-16/developerConnection + urlhttp://svn.apache.org/viewvc/maven/shared/tags/maven-shared-components-16/url /scm issueManagement systemjira/system
svn commit: r1069636 - /maven/shared/tags/maven-shared-components-16/
Author: brianf Date: Fri Feb 11 00:05:20 2011 New Revision: 1069636 URL: http://svn.apache.org/viewvc?rev=1069636view=rev Log: [maven-release-plugin] copy for tag maven-shared-components-16 Added: maven/shared/tags/maven-shared-components-16/ - copied from r1069635, maven/shared/trunk/maven-shared-components/
svn commit: r1069637 - /maven/shared/trunk/maven-shared-components/pom.xml
Author: brianf Date: Fri Feb 11 00:05:22 2011 New Revision: 1069637 URL: http://svn.apache.org/viewvc?rev=1069637view=rev Log: [maven-release-plugin] prepare for next development iteration Modified: maven/shared/trunk/maven-shared-components/pom.xml Modified: maven/shared/trunk/maven-shared-components/pom.xml URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-components/pom.xml?rev=1069637r1=1069636r2=1069637view=diff == --- maven/shared/trunk/maven-shared-components/pom.xml (original) +++ maven/shared/trunk/maven-shared-components/pom.xml Fri Feb 11 00:05:22 2011 @@ -31,7 +31,7 @@ under the License. groupIdorg.apache.maven.shared/groupId artifactIdmaven-shared-components/artifactId - version16/version + version17-SNAPSHOT/version packagingpom/packaging nameMaven Shared Components/name @@ -114,9 +114,9 @@ under the License. scm - connectionscm:svn:http://svn.apache.org/repos/asf/maven/shared/tags/maven-shared-components-16/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/shared/tags/maven-shared-components-16/developerConnection - urlhttp://svn.apache.org/viewvc/maven/shared/tags/maven-shared-components-16/url + connectionscm:svn:http://svn.apache.org/repos/asf/maven/shared/trunk/maven-shared-components/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/shared/trunk/maven-shared-components/developerConnection + urlhttp://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-components/url /scm issueManagement systemjira/system
svn commit: r1069642 - /maven/shared/trunk/maven-dependency-analyzer/pom.xml
Author: brianf Date: Fri Feb 11 00:48:30 2011 New Revision: 1069642 URL: http://svn.apache.org/viewvc?rev=1069642view=rev Log: use the released parent Modified: maven/shared/trunk/maven-dependency-analyzer/pom.xml Modified: maven/shared/trunk/maven-dependency-analyzer/pom.xml URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-dependency-analyzer/pom.xml?rev=1069642r1=1069641r2=1069642view=diff == --- maven/shared/trunk/maven-dependency-analyzer/pom.xml (original) +++ maven/shared/trunk/maven-dependency-analyzer/pom.xml Fri Feb 11 00:48:30 2011 @@ -24,7 +24,7 @@ parent groupIdorg.apache.maven.shared/groupId artifactIdmaven-shared-components/artifactId -version15/version +version16/version relativePath../maven-shared-components/pom.xml/relativePath /parent
svn commit: r1069643 - /maven/shared/trunk/maven-dependency-analyzer/pom.xml
Author: brianf Date: Fri Feb 11 00:49:20 2011 New Revision: 1069643 URL: http://svn.apache.org/viewvc?rev=1069643view=rev Log: [maven-release-plugin] prepare release maven-dependency-analyzer-1.2 Modified: maven/shared/trunk/maven-dependency-analyzer/pom.xml Modified: maven/shared/trunk/maven-dependency-analyzer/pom.xml URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-dependency-analyzer/pom.xml?rev=1069643r1=1069642r2=1069643view=diff == --- maven/shared/trunk/maven-dependency-analyzer/pom.xml (original) +++ maven/shared/trunk/maven-dependency-analyzer/pom.xml Fri Feb 11 00:49:20 2011 @@ -18,7 +18,7 @@ * under the License. * -- -project 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' xmlns='http://maven.apache.org/POM/4.0.0' +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 @@ -31,7 +31,7 @@ groupIdorg.apache.maven.shared/groupId artifactIdmaven-dependency-analyzer/artifactId packagingjar/packaging - version1.2-SNAPSHOT/version + version1.2/version nameMaven Dependency Analyzer/name description @@ -39,9 +39,9 @@ /description scm - connectionscm:svn:http://svn.apache.org/repos/asf/maven/shared/trunk/maven-dependency-analyzer/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/shared/trunk/maven-dependency-analyzer/developerConnection - urlhttp://svn.apache.org/viewvc/maven/shared/trunk/maven-dependency-analyzer/url + connectionscm:svn:http://svn.apache.org/repos/asf/maven/shared/tags/maven-dependency-analyzer-1.2/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/shared/tags/maven-dependency-analyzer-1.2/developerConnection + urlhttp://svn.apache.org/viewvc/maven/shared/tags/maven-dependency-analyzer-1.2/url /scm issueManagement systemjira/system @@ -135,7 +135,7 @@ plugin artifactIdmaven-surefire-plugin/artifactId configuration - systemProperties combine.children='append' + systemProperties combine.children=append property !-- Pass this through to the tests (if set!) to have them pick the right repository -- namemaven.repo.local/name
svn commit: r1069644 - /maven/shared/tags/maven-dependency-analyzer-1.2/
Author: brianf Date: Fri Feb 11 00:49:25 2011 New Revision: 1069644 URL: http://svn.apache.org/viewvc?rev=1069644view=rev Log: [maven-release-plugin] copy for tag maven-dependency-analyzer-1.2 Added: maven/shared/tags/maven-dependency-analyzer-1.2/ - copied from r1069643, maven/shared/trunk/maven-dependency-analyzer/
svn commit: r1069645 - /maven/shared/trunk/maven-dependency-analyzer/pom.xml
Author: brianf Date: Fri Feb 11 00:49:28 2011 New Revision: 1069645 URL: http://svn.apache.org/viewvc?rev=1069645view=rev Log: [maven-release-plugin] prepare for next development iteration Modified: maven/shared/trunk/maven-dependency-analyzer/pom.xml Modified: maven/shared/trunk/maven-dependency-analyzer/pom.xml URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-dependency-analyzer/pom.xml?rev=1069645r1=1069644r2=1069645view=diff == --- maven/shared/trunk/maven-dependency-analyzer/pom.xml (original) +++ maven/shared/trunk/maven-dependency-analyzer/pom.xml Fri Feb 11 00:49:28 2011 @@ -31,7 +31,7 @@ groupIdorg.apache.maven.shared/groupId artifactIdmaven-dependency-analyzer/artifactId packagingjar/packaging - version1.2/version + version1.3-SNAPSHOT/version nameMaven Dependency Analyzer/name description @@ -39,9 +39,9 @@ /description scm - connectionscm:svn:http://svn.apache.org/repos/asf/maven/shared/tags/maven-dependency-analyzer-1.2/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/shared/tags/maven-dependency-analyzer-1.2/developerConnection - urlhttp://svn.apache.org/viewvc/maven/shared/tags/maven-dependency-analyzer-1.2/url + connectionscm:svn:http://svn.apache.org/repos/asf/maven/shared/trunk/maven-dependency-analyzer/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/shared/trunk/maven-dependency-analyzer/developerConnection + urlhttp://svn.apache.org/viewvc/maven/shared/trunk/maven-dependency-analyzer/url /scm issueManagement systemjira/system
svn commit: r1069646 - /maven/plugins/trunk/maven-dependency-plugin/pom.xml
Author: brianf Date: Fri Feb 11 00:50:02 2011 New Revision: 1069646 URL: http://svn.apache.org/viewvc?rev=1069646view=rev Log: use the released parent 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=1069646r1=1069645r2=1069646view=diff == --- maven/plugins/trunk/maven-dependency-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-dependency-plugin/pom.xml Fri Feb 11 00:50:02 2011 @@ -25,7 +25,7 @@ under the License. parent artifactIdmaven-plugins/artifactId groupIdorg.apache.maven.plugins/groupId -version18/version +version19/version /parent artifactIdmaven-dependency-plugin/artifactId
svn commit: r1069648 - /maven/plugins/trunk/maven-dependency-plugin/pom.xml
Author: brianf Date: Fri Feb 11 00:55:22 2011 New Revision: 1069648 URL: http://svn.apache.org/viewvc?rev=1069648view=rev Log: [maven-release-plugin] prepare release maven-dependency-plugin-2.2 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=1069648r1=1069647r2=1069648view=diff == --- maven/plugins/trunk/maven-dependency-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-dependency-plugin/pom.xml Fri Feb 11 00:55:22 2011 @@ -19,7 +19,7 @@ specific language governing permissions under the License. -- -project 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' xmlns='http://maven.apache.org/POM/4.0.0' +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 @@ -29,7 +29,7 @@ under the License. /parent artifactIdmaven-dependency-plugin/artifactId - version2.2-SNAPSHOT/version + version2.2/version packagingmaven-plugin/packaging nameMaven Dependency Plugin/name @@ -72,9 +72,9 @@ under the License. /prerequisites scm - connectionscm:svn:http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-dependency-plugin//connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-dependency-plugin//developerConnection - urlhttp://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin//url + connectionscm:svn:http://svn.apache.org/repos/asf/maven/plugins/tags/maven-dependency-plugin-2.2/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/plugins/tags/maven-dependency-plugin-2.2/developerConnection + urlhttp://svn.apache.org/viewvc/maven/plugins/tags/maven-dependency-plugin-2.2/url /scm issueManagement systemJIRA/system
svn commit: r1069649 - /maven/plugins/tags/maven-dependency-plugin-2.2/
Author: brianf Date: Fri Feb 11 00:55:28 2011 New Revision: 1069649 URL: http://svn.apache.org/viewvc?rev=1069649view=rev Log: [maven-release-plugin] copy for tag maven-dependency-plugin-2.2 Added: maven/plugins/tags/maven-dependency-plugin-2.2/ - copied from r1069648, maven/plugins/trunk/maven-dependency-plugin/
svn commit: r1069650 - /maven/plugins/trunk/maven-dependency-plugin/pom.xml
Author: brianf Date: Fri Feb 11 00:55:31 2011 New Revision: 1069650 URL: http://svn.apache.org/viewvc?rev=1069650view=rev Log: [maven-release-plugin] prepare for next development iteration 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=1069650r1=1069649r2=1069650view=diff == --- maven/plugins/trunk/maven-dependency-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-dependency-plugin/pom.xml Fri Feb 11 00:55:31 2011 @@ -29,7 +29,7 @@ under the License. /parent artifactIdmaven-dependency-plugin/artifactId - version2.2/version + version2.3-SNAPSHOT/version packagingmaven-plugin/packaging nameMaven Dependency Plugin/name @@ -72,9 +72,9 @@ under the License. /prerequisites scm - connectionscm:svn:http://svn.apache.org/repos/asf/maven/plugins/tags/maven-dependency-plugin-2.2/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/plugins/tags/maven-dependency-plugin-2.2/developerConnection - urlhttp://svn.apache.org/viewvc/maven/plugins/tags/maven-dependency-plugin-2.2/url + connectionscm:svn:http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-dependency-plugin//connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-dependency-plugin//developerConnection + urlhttp://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin//url /scm issueManagement systemJIRA/system
svn commit: r1068708 - /maven/plugins/trunk/maven-dependency-plugin/pom.xml
Author: brianf Date: Wed Feb 9 00:36:40 2011 New Revision: 1068708 URL: http://svn.apache.org/viewvc?rev=1068708view=rev Log: bump the parent 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=1068708r1=1068707r2=1068708view=diff == --- maven/plugins/trunk/maven-dependency-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-dependency-plugin/pom.xml Wed Feb 9 00:36:40 2011 @@ -25,7 +25,7 @@ under the License. parent artifactIdmaven-plugins/artifactId groupIdorg.apache.maven.plugins/groupId -version17/version +version18/version /parent artifactIdmaven-dependency-plugin/artifactId
svn commit: r1068731 - /maven/shared/trunk/maven-dependency-analyzer/pom.xml
Author: brianf Date: Wed Feb 9 01:46:16 2011 New Revision: 1068731 URL: http://svn.apache.org/viewvc?rev=1068731view=rev Log: use the last released parent Modified: maven/shared/trunk/maven-dependency-analyzer/pom.xml Modified: maven/shared/trunk/maven-dependency-analyzer/pom.xml URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-dependency-analyzer/pom.xml?rev=1068731r1=1068730r2=1068731view=diff == --- maven/shared/trunk/maven-dependency-analyzer/pom.xml (original) +++ maven/shared/trunk/maven-dependency-analyzer/pom.xml Wed Feb 9 01:46:16 2011 @@ -24,7 +24,7 @@ parent groupIdorg.apache.maven.shared/groupId artifactIdmaven-shared-components/artifactId -version16-SNAPSHOT/version +version15/version relativePath../maven-shared-components/pom.xml/relativePath /parent
svn commit: r1068732 - /maven/shared/trunk/maven-dependency-analyzer/pom.xml
Author: brianf Date: Wed Feb 9 01:47:18 2011 New Revision: 1068732 URL: http://svn.apache.org/viewvc?rev=1068732view=rev Log: [maven-release-plugin] prepare release maven-dependency-analyzer-1.2 Modified: maven/shared/trunk/maven-dependency-analyzer/pom.xml Modified: maven/shared/trunk/maven-dependency-analyzer/pom.xml URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-dependency-analyzer/pom.xml?rev=1068732r1=1068731r2=1068732view=diff == --- maven/shared/trunk/maven-dependency-analyzer/pom.xml (original) +++ maven/shared/trunk/maven-dependency-analyzer/pom.xml Wed Feb 9 01:47:18 2011 @@ -18,7 +18,7 @@ * under the License. * -- -project 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' xmlns='http://maven.apache.org/POM/4.0.0' +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 @@ -31,7 +31,7 @@ groupIdorg.apache.maven.shared/groupId artifactIdmaven-dependency-analyzer/artifactId packagingjar/packaging - version1.2-SNAPSHOT/version + version1.2/version nameMaven Dependency Analyzer/name description @@ -39,9 +39,9 @@ /description scm - connectionscm:svn:http://svn.apache.org/repos/asf/maven/shared/trunk/maven-dependency-analyzer/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/shared/trunk/maven-dependency-analyzer/developerConnection - urlhttp://svn.apache.org/viewvc/maven/shared/trunk/maven-dependency-analyzer/url + connectionscm:svn:http://svn.apache.org/repos/asf/maven/shared/tags/maven-dependency-analyzer-1.2/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/shared/tags/maven-dependency-analyzer-1.2/developerConnection + urlhttp://svn.apache.org/viewvc/maven/shared/tags/maven-dependency-analyzer-1.2/url /scm issueManagement systemjira/system @@ -135,7 +135,7 @@ plugin artifactIdmaven-surefire-plugin/artifactId configuration - systemProperties combine.children='append' + systemProperties combine.children=append property !-- Pass this through to the tests (if set!) to have them pick the right repository -- namemaven.repo.local/name
svn commit: r1068733 - /maven/shared/tags/maven-dependency-analyzer-1.2/
Author: brianf Date: Wed Feb 9 01:47:24 2011 New Revision: 1068733 URL: http://svn.apache.org/viewvc?rev=1068733view=rev Log: [maven-scm] copy for tag maven-dependency-analyzer-1.2 Added: maven/shared/tags/maven-dependency-analyzer-1.2/ - copied from r1068732, maven/shared/trunk/maven-dependency-analyzer/
svn commit: r1068734 - /maven/shared/trunk/maven-dependency-analyzer/pom.xml
Author: brianf Date: Wed Feb 9 01:47:26 2011 New Revision: 1068734 URL: http://svn.apache.org/viewvc?rev=1068734view=rev Log: [maven-release-plugin] prepare for next development iteration Modified: maven/shared/trunk/maven-dependency-analyzer/pom.xml Modified: maven/shared/trunk/maven-dependency-analyzer/pom.xml URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-dependency-analyzer/pom.xml?rev=1068734r1=1068733r2=1068734view=diff == --- maven/shared/trunk/maven-dependency-analyzer/pom.xml (original) +++ maven/shared/trunk/maven-dependency-analyzer/pom.xml Wed Feb 9 01:47:26 2011 @@ -31,7 +31,7 @@ groupIdorg.apache.maven.shared/groupId artifactIdmaven-dependency-analyzer/artifactId packagingjar/packaging - version1.2/version + version1.3-SNAPSHOT/version nameMaven Dependency Analyzer/name description @@ -39,9 +39,9 @@ /description scm - connectionscm:svn:http://svn.apache.org/repos/asf/maven/shared/tags/maven-dependency-analyzer-1.2/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/shared/tags/maven-dependency-analyzer-1.2/developerConnection - urlhttp://svn.apache.org/viewvc/maven/shared/tags/maven-dependency-analyzer-1.2/url + connectionscm:svn:http://svn.apache.org/repos/asf/maven/shared/trunk/maven-dependency-analyzer/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/shared/trunk/maven-dependency-analyzer/developerConnection + urlhttp://svn.apache.org/viewvc/maven/shared/trunk/maven-dependency-analyzer/url /scm issueManagement systemjira/system
svn commit: r1068735 - /maven/plugins/trunk/maven-dependency-plugin/pom.xml
Author: brianf Date: Wed Feb 9 01:49:36 2011 New Revision: 1068735 URL: http://svn.apache.org/viewvc?rev=1068735view=rev Log: use released analyzer 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=1068735r1=1068734r2=1068735view=diff == --- maven/plugins/trunk/maven-dependency-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-dependency-plugin/pom.xml Wed Feb 9 01:49:36 2011 @@ -179,7 +179,7 @@ under the License. dependency groupIdorg.apache.maven.shared/groupId artifactIdmaven-dependency-analyzer/artifactId - version1.2-SNAPSHOT/version + version1.2/version /dependency dependency groupIdorg.apache.maven.shared/groupId
svn commit: r1068736 - /maven/plugins/trunk/maven-dependency-plugin/pom.xml
Author: brianf Date: Wed Feb 9 01:51:00 2011 New Revision: 1068736 URL: http://svn.apache.org/viewvc?rev=1068736view=rev Log: [maven-release-plugin] prepare release maven-dependency-plugin-2.2 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=1068736r1=1068735r2=1068736view=diff == --- maven/plugins/trunk/maven-dependency-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-dependency-plugin/pom.xml Wed Feb 9 01:51:00 2011 @@ -19,7 +19,7 @@ specific language governing permissions under the License. -- -project 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' xmlns='http://maven.apache.org/POM/4.0.0' +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 @@ -29,7 +29,7 @@ under the License. /parent artifactIdmaven-dependency-plugin/artifactId - version2.2-SNAPSHOT/version + version2.2/version packagingmaven-plugin/packaging nameMaven Dependency Plugin/name @@ -72,9 +72,9 @@ under the License. /prerequisites scm - connectionscm:svn:http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-dependency-plugin//connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-dependency-plugin//developerConnection - urlhttp://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin//url + connectionscm:svn:http://svn.apache.org/repos/asf/maven/plugins/tags/maven-dependency-plugin-2.2/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/plugins/tags/maven-dependency-plugin-2.2/developerConnection + urlhttp://svn.apache.org/viewvc/maven/plugins/tags/maven-dependency-plugin-2.2/url /scm issueManagement systemJIRA/system
svn commit: r1068737 - /maven/plugins/tags/maven-dependency-plugin-2.2/
Author: brianf Date: Wed Feb 9 01:51:05 2011 New Revision: 1068737 URL: http://svn.apache.org/viewvc?rev=1068737view=rev Log: [maven-scm] copy for tag maven-dependency-plugin-2.2 Added: maven/plugins/tags/maven-dependency-plugin-2.2/ - copied from r1068736, maven/plugins/trunk/maven-dependency-plugin/
svn commit: r1068738 - /maven/plugins/trunk/maven-dependency-plugin/pom.xml
Author: brianf Date: Wed Feb 9 01:51:08 2011 New Revision: 1068738 URL: http://svn.apache.org/viewvc?rev=1068738view=rev Log: [maven-release-plugin] prepare for next development iteration 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=1068738r1=1068737r2=1068738view=diff == --- maven/plugins/trunk/maven-dependency-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-dependency-plugin/pom.xml Wed Feb 9 01:51:08 2011 @@ -29,7 +29,7 @@ under the License. /parent artifactIdmaven-dependency-plugin/artifactId - version2.2/version + version2.3-SNAPSHOT/version packagingmaven-plugin/packaging nameMaven Dependency Plugin/name @@ -72,9 +72,9 @@ under the License. /prerequisites scm - connectionscm:svn:http://svn.apache.org/repos/asf/maven/plugins/tags/maven-dependency-plugin-2.2/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/plugins/tags/maven-dependency-plugin-2.2/developerConnection - urlhttp://svn.apache.org/viewvc/maven/plugins/tags/maven-dependency-plugin-2.2/url + connectionscm:svn:http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-dependency-plugin//connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-dependency-plugin//developerConnection + urlhttp://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin//url /scm issueManagement systemJIRA/system
svn commit: r1066323 - in /maven/plugins/trunk/maven-dependency-plugin/src: main/java/org/apache/maven/plugin/dependency/utils/markers/DefaultFileMarkerHandler.java test/java/org/apache/maven/plugin/d
Author: brianf
Date: Wed Feb 2 04:05:27 2011
New Revision: 1066323
URL: http://svn.apache.org/viewvc?rev=1066323view=rev
Log:
MDEP-225 applied patch to touch marker file timestamps if they already exist.
Patch from Phillip Hellewell
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/markers/DefaultFileMarkerHandler.java
maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/utils/filters/TestMarkerFileFilter.java
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/markers/DefaultFileMarkerHandler.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/markers/DefaultFileMarkerHandler.java?rev=1066323r1=1066322r2=1066323view=diff
==
---
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/markers/DefaultFileMarkerHandler.java
(original)
+++
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/markers/DefaultFileMarkerHandler.java
Wed Feb 2 04:05:27 2011
@@ -113,7 +113,25 @@ public class DefaultFileMarkerHandler
{
throw new MojoExecutionException( Unable to create Marker: +
marker.getAbsolutePath(), e );
}
-
+
+// update marker file timestamp
+try
+{
+long ts;
+if ( this.artifact != null this.artifact.getFile() != null )
+{
+ts = this.artifact.getFile().lastModified();
+}
+else
+{
+ts = System.currentTimeMillis();
+}
+marker.setLastModified( ts );
+}
+catch ( Exception e )
+{
+throw new MojoExecutionException( Unable to update Marker
timestamp: + marker.getAbsolutePath(), e );
+}
}
/**
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/utils/filters/TestMarkerFileFilter.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/utils/filters/TestMarkerFileFilter.java?rev=1066323r1=1066322r2=1066323view=diff
==
---
maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/utils/filters/TestMarkerFileFilter.java
(original)
+++
maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/utils/filters/TestMarkerFileFilter.java
Wed Feb 2 04:05:27 2011
@@ -123,19 +123,27 @@ public class TestMarkerFileFilter
public void testMarkerTimestamp()
throws IOException, MojoExecutionException, ArtifactFilterException
{
+// filter includes release artifact because no marker present
+// filter includes snapshot artifact becaues it is newer than marker
DependencyArtifactStubFactory fileFact = new
DependencyArtifactStubFactory( outputFolder, true );
Artifact snap = fileFact.getSnapshotArtifact();
Artifact release = fileFact.getReleaseArtifact();
HashSet tempArtifacts = new HashSet();
tempArtifacts.add( snap );
tempArtifacts.add( release );
-snap.getFile().setLastModified( snap.getFile().lastModified() + 1500 );
DefaultFileMarkerHandler handler = new DefaultFileMarkerHandler( snap,
outputFolder );
handler.setMarker();
+snap.getFile().setLastModified( snap.getFile().lastModified() + 1500 );
MarkerFileFilter filter = new MarkerFileFilter( false, false, true,
new DefaultFileMarkerHandler( outputFolder ) );
Set result = filter.filter( tempArtifacts);
assertEquals( 2, result.size() );
+// update marker; filter won't include snapshot because timestamps
equal
+handler.setMarker();
+result = filter.filter( tempArtifacts );
+assertEquals( 1, result.size() );
+
+// filter won't include snapshot because it is older than marker
snap.getFile().setLastModified( snap.getFile().lastModified() - 1
);
result = filter.filter( tempArtifacts );
svn commit: r1031611 - in /maven/plugins/trunk/maven-dependency-plugin: pom.xml src/main/java/org/apache/maven/plugin/dependency/AbstractAnalyzeMojo.java
Author: brianf
Date: Fri Nov 5 15:02:16 2010
New Revision: 1031611
URL: http://svn.apache.org/viewvc?rev=1031611view=rev
Log:
MDEP-262 patch from Tobias Glerke
Modified:
maven/plugins/trunk/maven-dependency-plugin/pom.xml
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractAnalyzeMojo.java
Modified: maven/plugins/trunk/maven-dependency-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/pom.xml?rev=1031611r1=1031610r2=1031611view=diff
==
--- maven/plugins/trunk/maven-dependency-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-dependency-plugin/pom.xml Fri Nov 5 15:02:16 2010
@@ -282,6 +282,9 @@ under the License.
pomIncludes
pomInclude*/pom.xml/pomInclude
/pomIncludes
+ setupIncludes
+setupIncludesetup-custom-analyzer/pom.xml/setupInclude
+ /setupIncludes
preBuildHookScriptsetup/preBuildHookScript
postBuildHookScriptvalidate/postBuildHookScript
localRepositoryPath${project.build.directory}/local-repo/localRepositoryPath
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=1031611r1=1031610r2=1031611view=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
Fri Nov 5 15:02:16 2010
@@ -34,6 +34,12 @@ import org.apache.maven.project.MavenPro
import org.apache.maven.shared.dependency.analyzer.ProjectDependencyAnalysis;
import org.apache.maven.shared.dependency.analyzer.ProjectDependencyAnalyzer;
import
org.apache.maven.shared.dependency.analyzer.ProjectDependencyAnalyzerException;
+import org.codehaus.plexus.PlexusConstants;
+import org.codehaus.plexus.PlexusContainer;
+import
org.codehaus.plexus.component.repository.exception.ComponentLookupException;
+import org.codehaus.plexus.context.Context;
+import org.codehaus.plexus.context.ContextException;
+import org.codehaus.plexus.personality.plexus.lifecycle.phase.Contextualizable;
import org.codehaus.plexus.util.xml.PrettyPrintXMLWriter;
/**
@@ -46,10 +52,17 @@ import org.codehaus.plexus.util.xml.Pret
*/
public abstract class AbstractAnalyzeMojo
extends AbstractMojo
+implements Contextualizable
{
// fields -
/**
+ * The plexus context to look-up the right {...@link
ProjectDependencyAnalyzer} implementation depending on the mojo
+ * configuration.
+ */
+private Context context;
+
+/**
* The Maven project to analyze.
*
* @parameter expression=${project}
@@ -59,13 +72,12 @@ public abstract class AbstractAnalyzeMoj
private MavenProject project;
/**
- * The Maven project dependency analyzer to use.
+ * Project dependency analyzer to use (plexus component role-hint).
*
- * @component
- * @required
- * @readonly
+ * @parameter expression=${analyzer} default-value=default
+ * @since 2.2
*/
-private ProjectDependencyAnalyzer analyzer;
+private String analyzer;
/**
* Whether to fail the build if a dependency warning is found.
@@ -158,6 +170,32 @@ public abstract class AbstractAnalyzeMoj
}
}
+protected ProjectDependencyAnalyzer createProjectDependencyAnalyzer()
+throws MojoExecutionException
+{
+
+final String role = ProjectDependencyAnalyzer.ROLE;
+final String roleHint = analyzer;
+
+try
+{
+final PlexusContainer container = (PlexusContainer) context.get(
PlexusConstants.PLEXUS_KEY );
+
+return (ProjectDependencyAnalyzer) container.lookup( role,
roleHint );
+}
+catch ( Exception exception )
+{
+throw new MojoExecutionException( Failed to instantiate +
ProjectDependencyAnalyser with role + role
++ / role-hint + roleHint,exception );
+}
+}
+
+public void contextualize( Context context )
+throws ContextException
+{
+this.context = context;
+}
+
// private methods
private boolean checkDependencies()
@@ -166,7 +204,7 @@ public abstract class AbstractAnalyzeMoj
ProjectDependencyAnalysis analysis;
try
{
-analysis = analyzer.analyze( project
svn commit: r1031612 - in /maven/shared/trunk/maven-dependency-analyzer: pom.xml src/main/java/org/apache/maven/shared/dependency/analyzer/DefaultProjectDependencyAnalyzer.java
Author: brianf
Date: Fri Nov 5 15:02:34 2010
New Revision: 1031612
URL: http://svn.apache.org/viewvc?rev=1031612view=rev
Log:
MDEP-262 patch from Tobias Glerke
Modified:
maven/shared/trunk/maven-dependency-analyzer/pom.xml
maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/DefaultProjectDependencyAnalyzer.java
Modified: maven/shared/trunk/maven-dependency-analyzer/pom.xml
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-dependency-analyzer/pom.xml?rev=1031612r1=1031611r2=1031612view=diff
==
--- maven/shared/trunk/maven-dependency-analyzer/pom.xml (original)
+++ maven/shared/trunk/maven-dependency-analyzer/pom.xml Fri Nov 5 15:02:34
2010
@@ -24,7 +24,7 @@
parent
groupIdorg.apache.maven.shared/groupId
artifactIdmaven-shared-components/artifactId
-version12/version
+version16-SNAPSHOT/version
/parent
groupIdorg.apache.maven.shared/groupId
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=1031612r1=1031611r2=1031612view=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
Fri Nov 5 15:02:34 2010
@@ -38,7 +38,7 @@ import org.apache.maven.project.MavenPro
*
* @author a href=mailto:markhob...@gmail.com;Mark Hobson/a
* @version $Id$
- * @plexus.component
role=org.apache.maven.shared.dependency.analyzer.ProjectDependencyAnalyzer
+ * @plexus.component
role=org.apache.maven.shared.dependency.analyzer.ProjectDependencyAnalyzer
role-hint=default
*/
public class DefaultProjectDependencyAnalyzer
implements ProjectDependencyAnalyzer
@@ -71,7 +71,7 @@ public class DefaultProjectDependencyAna
{
Map artifactClassMap = buildArtifactClassMap( project );
-Set dependencyClasses = buildDependencyClasses( project );
+Set dependencyClasses = buildDependencyClasses( project ,
artifactClassMap );
Set declaredArtifacts = buildDeclaredArtifacts( project );
@@ -159,7 +159,7 @@ public class DefaultProjectDependencyAna
return artifactClassMap;
}
-private Set buildDependencyClasses( MavenProject project )
+protected Set buildDependencyClasses( MavenProject project , Map
artifactClassMap )
throws IOException
{
Set dependencyClasses = new HashSet();
@@ -212,7 +212,7 @@ public class DefaultProjectDependencyAna
return usedArtifacts;
}
-private Artifact findArtifactForClassName( Map artifactClassMap, String
className )
+protected Artifact findArtifactForClassName( Map artifactClassMap, String
className )
{
for ( Iterator artifactIterator =
artifactClassMap.keySet().iterator(); artifactIterator.hasNext(); )
{
svn commit: r1031684 - in /maven/plugins/trunk/maven-dependency-plugin/src: main/java/org/apache/maven/plugin/dependency/ main/java/org/apache/maven/plugin/dependency/utils/ test/java/org/apache/maven
Author: brianf
Date: Fri Nov 5 18:00:17 2010
New Revision: 1031684
URL: http://svn.apache.org/viewvc?rev=1031684view=rev
Log:
MDEP-211 patch from Oumar Aziz OUATTARA
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractDependencyFilterMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractFromDependenciesMojo.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/utils/DependencyUtil.java
maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/TestBuildClasspathMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/TestCopyDependenciesMojo.java
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractDependencyFilterMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractDependencyFilterMojo.java?rev=1031684r1=1031683r2=1031684view=diff
==
---
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractDependencyFilterMojo.java
(original)
+++
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractDependencyFilterMojo.java
Fri Nov 5 18:00:17 2010
@@ -206,6 +206,16 @@ public abstract class AbstractDependency
* @parameter expression=${overWriteIfNewer} default-value=true
*/
protected boolean overWriteIfNewer;
+
+/**
+ * Prepend the groupId during copy.
+ *
+ * @optional
+ * @since 2.2
+ * @parameter expression=${mdep.prependGroupId} default-value=false
+ * @parameter
+ */
+protected boolean prependGroupId = false;
protected abstract ArtifactsFilter getMarkedArtifactFilter();
@@ -383,4 +393,19 @@ public abstract class AbstractDependency
}
// TODO: Set marker files.
+
+/**
+ * @return true, if the groupId should be prepended to the filename.
+ */
+public boolean isPrependGroupId() {
+return prependGroupId;
+}
+
+/**
+ * @param prependGroupId -
+ *true if the groupId must be prepended during the copy.
+ */
+public void setPrependGroupId(boolean prependGroupId) {
+this.prependGroupId = prependGroupId;
+}
}
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractFromDependenciesMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractFromDependenciesMojo.java?rev=1031684r1=1031683r2=1031684view=diff
==
---
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractFromDependenciesMojo.java
(original)
+++
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractFromDependenciesMojo.java
Fri Nov 5 18:00:17 2010
@@ -40,7 +40,7 @@ public abstract class AbstractFromDepend
* @parameter
*/
protected boolean stripVersion = false;
-
+
/**
* Default location used for mojo unless overridden in ArtifactItem
*
@@ -233,4 +233,5 @@ public abstract class AbstractFromDepend
{
this.copyPom = copyPom;
}
+
}
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/BuildClasspathMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/BuildClasspathMojo.java?rev=1031684r1=1031683r2=1031684view=diff
==
---
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/BuildClasspathMojo.java
(original)
+++
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/BuildClasspathMojo.java
Fri Nov 5 18:00:17 2010
@@ -288,7 +288,7 @@ public class BuildClasspathMojo
// TODO: add param for prepending groupId and version.
sb.append( prefix );
sb.append( File.separator );
-sb.append( DependencyUtil.getFormattedFileName( art,
this.stripVersion ) );
+sb.append( DependencyUtil.getFormattedFileName( art,
this.stripVersion, this.prependGroupId) );
}
}
Modified:
maven
svn commit: r1031688 - /maven/plugins/trunk/maven-dependency-plugin/src/it/build-classpath/validate.bsh
Author: brianf Date: Fri Nov 5 18:16:01 2010 New Revision: 1031688 URL: http://svn.apache.org/viewvc?rev=1031688view=rev Log: fixing the IT broken by MDEP-192. The classpath order was changed on purpose Modified: maven/plugins/trunk/maven-dependency-plugin/src/it/build-classpath/validate.bsh Modified: maven/plugins/trunk/maven-dependency-plugin/src/it/build-classpath/validate.bsh URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/it/build-classpath/validate.bsh?rev=1031688r1=1031687r2=1031688view=diff == --- maven/plugins/trunk/maven-dependency-plugin/src/it/build-classpath/validate.bsh (original) +++ maven/plugins/trunk/maven-dependency-plugin/src/it/build-classpath/validate.bsh Fri Nov 5 18:16:01 2010 @@ -10,18 +10,18 @@ classpath = StringUtils.replace( classpa List actual = Arrays.asList( classpath.split( : ) ); List expected = new ArrayList(); -expected.add( junit-3.8.1.jar ); -expected.add( maven-artifact-2.0.6.jar ); -expected.add( maven-artifact-manager-2.0.6.jar ); +expected.add( maven-project-2.0.6.jar ); +expected.add( maven-settings-2.0.6.jar ); expected.add( maven-model-2.0.6.jar ); -expected.add( maven-plugin-registry-2.0.6.jar ); +expected.add( plexus-utils-1.4.1.jar ); +expected.add( plexus-container-default-1.0-alpha-9-stable-1.jar ); +expected.add( junit-3.8.1.jar ); expected.add( maven-profile-2.0.6.jar ); -expected.add( maven-project-2.0.6.jar ); +expected.add( maven-artifact-manager-2.0.6.jar ); expected.add( maven-repository-metadata-2.0.6.jar ); -expected.add( maven-settings-2.0.6.jar ); +expected.add( maven-artifact-2.0.6.jar ); expected.add( wagon-provider-api-1.0-beta-2.jar ); -expected.add( plexus-container-default-1.0-alpha-9-stable-1.jar ); -expected.add( plexus-utils-1.4.1.jar ); +expected.add( maven-plugin-registry-2.0.6.jar ); System.out.println( Checking classpath... ); System.out.println( Actual : + actual );
svn commit: r1031144 - in /maven/shared/trunk/maven-dependency-analyzer/src: main/java/org/apache/maven/shared/dependency/analyzer/asm/DependencyVisitor.java test/java/org/apache/maven/shared/dependen
Author: brianf
Date: Thu Nov 4 18:48:19 2010
New Revision: 1031144
URL: http://svn.apache.org/viewvc?rev=1031144view=rev
Log:
MDEP-149
Modified:
maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/DependencyVisitor.java
maven/shared/trunk/maven-dependency-analyzer/src/test/java/org/apache/maven/shared/dependency/analyzer/asm/DependencyVisitorTest.java
Modified:
maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/DependencyVisitor.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/DependencyVisitor.java?rev=1031144r1=1031143r2=1031144view=diff
==
---
maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/DependencyVisitor.java
(original)
+++
maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/DependencyVisitor.java
Thu Nov 4 18:48:19 2010
@@ -229,7 +229,12 @@ public class DependencyVisitor
public void visitFieldInsn( final int opcode, final String owner, final
String name, final String desc )
{
addName( owner );
-addDesc( desc );
+/*
+ * NOTE: Merely accessing a field does not impose a direct dependency
on its type. For example, the code line
+ * codejava.lang.Object var = bean.field;/code does not directly
depend on the type of the field. A direct
+ * dependency is only introduced when the code explicitly references
the field's type by means of a variable
+ * declaration or a type check/cast. Those cases are handled by other
visitor callbacks.
+ */
}
/*
@@ -238,7 +243,12 @@ public class DependencyVisitor
public void visitMethodInsn( final int opcode, final String owner, final
String name, final String desc )
{
addName( owner );
-addMethodDesc( desc );
+/*
+ * NOTE: Merely invoking a method does not impose a direct dependency
on its return type nor its parameter
+ * types. For example, the code line codebean.method(null);/code
only depends on the owner type of the
+ * method. A direct dependency is only introduced when the code
explicitly references the method's types by
+ * means of a variable declaration or a type check/cast. Those cases
are handled by other visitor callbacks.
+ */
}
/*
Modified:
maven/shared/trunk/maven-dependency-analyzer/src/test/java/org/apache/maven/shared/dependency/analyzer/asm/DependencyVisitorTest.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-dependency-analyzer/src/test/java/org/apache/maven/shared/dependency/analyzer/asm/DependencyVisitorTest.java?rev=1031144r1=1031143r2=1031144view=diff
==
---
maven/shared/trunk/maven-dependency-analyzer/src/test/java/org/apache/maven/shared/dependency/analyzer/asm/DependencyVisitorTest.java
(original)
+++
maven/shared/trunk/maven-dependency-analyzer/src/test/java/org/apache/maven/shared/dependency/analyzer/asm/DependencyVisitorTest.java
Thu Nov 4 18:48:19 2010
@@ -446,7 +446,7 @@ public class DependencyVisitorTest exten
{
visitor.visitFieldInsn( Opcodes.GETFIELD, a/b/c, x, Lx/y/z; );
-assertClasses( a.b.c, x.y.z );
+assertClasses( a.b.c );
}
// visitMethodInsn tests --
@@ -476,21 +476,21 @@ public class DependencyVisitorTest exten
{
visitor.visitMethodInsn( Opcodes.INVOKEVIRTUAL, a/b/c, x,
(Lx/y/z;)V );
-assertClasses( a.b.c, x.y.z );
+assertClasses( a.b.c );
}
public void testVisitMethodInsnWithObjectArguments()
{
visitor.visitMethodInsn( Opcodes.INVOKEVIRTUAL, a/b/c, x,
(Lp/q/r;Lx/y/z;)V );
-assertClasses( a.b.c, p.q.r, x.y.z );
+assertClasses( a.b.c );
}
public void testVisitMethodInsnWithObjectArrayArgument()
{
visitor.visitMethodInsn( Opcodes.INVOKEVIRTUAL, a/b/c, x,
([Lx/y/z;)V );
-assertClasses( a.b.c, x.y.z );
+assertClasses( a.b.c );
}
public void testVisitMethodInsnWithPrimitiveReturnType()
@@ -511,14 +511,14 @@ public class DependencyVisitorTest exten
{
visitor.visitMethodInsn( Opcodes.INVOKEVIRTUAL, a/b/c, x,
()Lx/y/z; );
-assertClasses( a.b.c, x.y.z );
+assertClasses( a.b.c );
}
public void testVisitMethodInsnWithObjectArrayReturnType()
{
visitor.visitMethodInsn( Opcodes.INVOKEVIRTUAL, a/b/c, x,
()[Lx/y/z; );
-assertClasses( a.b.c, x.y.z );
+assertClasses( a.b.c );
}
// visitJumpInsn tests
svn commit: r1031147 - /maven/shared/trunk/pom.xml
Author: brianf Date: Thu Nov 4 18:49:49 2010 New Revision: 1031147 URL: http://svn.apache.org/viewvc?rev=1031147view=rev Log: use the latest parent Modified: maven/shared/trunk/pom.xml Modified: maven/shared/trunk/pom.xml URL: http://svn.apache.org/viewvc/maven/shared/trunk/pom.xml?rev=1031147r1=1031146r2=1031147view=diff == --- maven/shared/trunk/pom.xml (original) +++ maven/shared/trunk/pom.xml Thu Nov 4 18:49:49 2010 @@ -25,7 +25,7 @@ under the License. parent groupIdorg.apache.maven/groupId artifactIdmaven-parent/artifactId -version16/version +version17/version relativePath../pom/maven/pom.xml/relativePath /parent
svn commit: r1031212 - 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 Nov 4 20:17:28 2010
New Revision: 1031212
URL: http://svn.apache.org/viewvc?rev=1031212view=rev
Log:
MDEP-215 - applied patch by Jo Odland. Adds useSubDirectoryPerArtifact
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractFromDependenciesMojo.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/CopyDependenciesMojo.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/CopyMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/DependencyUtil.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/filters/DestFileFilter.java
maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/TestAnalyzeDepMgt.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/TestCopyDependenciesMojo2.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
maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/utils/TestDependencyUtil.java
maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/utils/filters/TestDestFileFilter.java
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractFromDependenciesMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractFromDependenciesMojo.java?rev=1031212r1=1031211r2=1031212view=diff
==
---
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractFromDependenciesMojo.java
(original)
+++
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractFromDependenciesMojo.java
Thu Nov 4 20:17:28 2010
@@ -72,6 +72,16 @@ public abstract class AbstractFromDepend
/**
* Place each type of file in a separate subdirectory. (example
+ * /outputDirectory/runtime /outputDirectory/provided etc)
+ *
+ * @parameter expression=${mdep.useSubDirectoryPerScope}
default-value=false
+ * @optional
+ * @since 2.1-alpha-1
+ */
+protected boolean useSubDirectoryPerScope;
+
+/**
+ * Place each type of file in a separate subdirectory. (example
* /outputDirectory/jars /outputDirectory/wars etc)
*
* @since 2.0-alpha-1
@@ -136,6 +146,23 @@ public abstract class AbstractFromDepend
}
/**
+ * @return Returns the useSubDirectoryPerScope
+ */
+public boolean isUseSubDirectoryPerScope()
+{
+return this.useSubDirectoryPerScope;
+}
+
+/**
+ * @param theUseSubDirectoryPerScope
+ * The useSubDirectoryPerScope to set.
+ */
+public void setUseSubDirectoryPerScope( boolean theUseSubDirectoryPerScope
)
+{
+this.useSubDirectoryPerScope = theUseSubDirectoryPerScope;
+}
+
+/**
* @return Returns the useSubDirectoryPerType.
*/
public boolean isUseSubDirectoryPerType()
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AnalyzeDepMgt.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AnalyzeDepMgt.java?rev=1031212r1=1031211r2=1031212view=diff
==
---
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AnalyzeDepMgt.java
(original)
+++
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AnalyzeDepMgt.java
Thu Nov 4 20:17:28 2010
@@ -172,6 +172,7 @@ public class AnalyzeDepMgt
Artifact resolvedArtifact = (Artifact) mismatchIter.next();
Dependency depMgtDependency = (Dependency) mismatch.get(
resolvedArtifact );
logMismatch( resolvedArtifact, depMgtDependency );
+foundError = true;
}
if ( !foundError
svn commit: r1031218 - /maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/PurgeLocalRepositoryMojo.java
Author: brianf
Date: Thu Nov 4 20:24:36 2010
New Revision: 1031218
URL: http://svn.apache.org/viewvc?rev=1031218view=rev
Log:
MDEP-292 applied patch from Greg Vanore
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/PurgeLocalRepositoryMojo.java
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/PurgeLocalRepositoryMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/PurgeLocalRepositoryMojo.java?rev=1031218r1=1031217r2=1031218view=diff
==
---
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/PurgeLocalRepositoryMojo.java
(original)
+++
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/PurgeLocalRepositoryMojo.java
Thu Nov 4 20:24:36 2010
@@ -306,11 +306,30 @@ public class PurgeLocalRepositoryMojo
{
for ( Iterator it = exclusionPatterns.iterator(); it.hasNext(); )
{
-String excludedKey = (String) it.next();
-
-verbose( Excluding: + excludedKey + from refresh
operation for project: + project.getId() );
-
-deps.remove( excludedKey );
+ String excludedKey = (String) it.next();
+
+ if (GROUP_ID_FUZZINESS.equals(resolutionFuzziness))
+ {
+ verbose( Excluding groupId: + excludedKey + from
refresh operation for project: + project.getId() );
+
+ for ( Iterator deps_it = deps.entrySet().iterator();
deps_it.hasNext(); )
+ {
+ Map.Entry dependency = (Map.Entry)
deps_it.next();
+
+ Artifact artifact = (Artifact)
dependency.getValue();
+
+ if (artifact.getGroupId().equals(excludedKey))
+ {
+ deps_it.remove();
+ }
+ }
+ }
+ else
+ {
+ verbose( Excluding: + excludedKey + from refresh
operation for project: + project.getId() );
+
+ deps.remove( excludedKey );
+ }
}
}
svn commit: r1031245 - in /maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency: ./ resolvers/ utils/
Author: brianf
Date: Thu Nov 4 21:04:45 2010
New Revision: 1031245
URL: http://svn.apache.org/viewvc?rev=1031245view=rev
Log:
MDEP-281 applied patch from Selim Ok
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractResolveMojo.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/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/utils/DependencyUtil.java
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractResolveMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractResolveMojo.java?rev=1031245r1=1031244r2=1031245view=diff
==
---
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractResolveMojo.java
(original)
+++
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractResolveMojo.java
Thu Nov 4 21:04:45 2010
@@ -69,6 +69,15 @@ public abstract class AbstractResolveMoj
* @throws ArtifactNotFoundException
* @throws InvalidDependencyVersionException
*/
+
+ /**
+* Whether to append outputs into the output file or overwrite it.
+*
+* @parameter expression=${appendOutput} default-value=false
+* @since 2.2
+*/
+ protected boolean appendOutput;
+
protected Set resolveDependencyArtifacts( MavenProject theProject )
throws ArtifactResolutionException, ArtifactNotFoundException,
InvalidDependencyVersionException
{
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/TreeMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/TreeMojo.java?rev=1031245r1=1031244r2=1031245view=diff
==
---
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/TreeMojo.java
(original)
+++
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/TreeMojo.java
Thu Nov 4 21:04:45 2010
@@ -224,7 +224,15 @@ public class TreeMojo extends AbstractMo
* The computed dependency tree root node of the Maven project.
*/
private DependencyNode rootNode;
-
+
+ /**
+* Whether to append outputs into the output file or overwrite it.
+*
+* @parameter expression=${appendOutput} default-value=false
+* @since 2.2
+*/
+ private boolean appendOutput;
+
// Mojo methods ---
/*
@@ -270,7 +278,7 @@ public class TreeMojo extends AbstractMo
if ( outputFile != null )
{
-DependencyUtil.write( dependencyTreeString, outputFile,
getLog() );
+DependencyUtil.write( dependencyTreeString, outputFile,
this.appendOutput ,getLog() );
getLog().info( Wrote dependency tree to: + outputFile );
}
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/resolvers/ResolveDependenciesMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/resolvers/ResolveDependenciesMojo.java?rev=1031245r1=1031244r2=1031245view=diff
==
---
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/resolvers/ResolveDependenciesMojo.java
(original)
+++
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/resolvers/ResolveDependenciesMojo.java
Thu Nov 4 21:04:45 2010
@@ -76,7 +76,7 @@ public class ResolveDependenciesMojo
}
else
{
-DependencyUtil.write( output, outputFile, getLog() );
+DependencyUtil.write( output, outputFile, appendOutput,
getLog() );
}
}
catch ( IOException e )
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/resolvers/ResolveDependencySourcesMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin
svn commit: r1031251 - /maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/DependencyStatusSets.java
Author: brianf
Date: Thu Nov 4 21:15:44 2010
New Revision: 1031251
URL: http://svn.apache.org/viewvc?rev=1031251view=rev
Log:
MDEP-192 patch from Nikola Petrov
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/DependencyStatusSets.java
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/DependencyStatusSets.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/DependencyStatusSets.java?rev=1031251r1=1031250r2=1031251view=diff
==
---
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/DependencyStatusSets.java
(original)
+++
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/DependencyStatusSets.java
Thu Nov 4 21:15:44 2010
@@ -24,9 +24,8 @@ package org.apache.maven.plugin.dependen
*/
import java.util.Iterator;
+import java.util.LinkedHashSet;
import java.util.Set;
-import java.util.SortedSet;
-import java.util.TreeSet;
import org.apache.maven.artifact.Artifact;
@@ -37,11 +36,11 @@ import org.apache.maven.artifact.Artifac
public class DependencyStatusSets
{
-TreeSet resolvedDependencies = null;
+Set resolvedDependencies = null;
-TreeSet unResolvedDependencies = null;
+Set unResolvedDependencies = null;
-TreeSet skippedDependencies = null;
+Set skippedDependencies = null;
public DependencyStatusSets()
{
@@ -52,15 +51,15 @@ public class DependencyStatusSets
{
if ( resolved != null )
{
-this.resolvedDependencies = new TreeSet( resolved );
+this.resolvedDependencies = new LinkedHashSet( resolved );
}
if ( unResolved != null )
{
-this.unResolvedDependencies = new TreeSet( unResolved );
+this.unResolvedDependencies = new LinkedHashSet( unResolved );
}
if ( skipped != null )
{
-this.skippedDependencies = new TreeSet( skipped );
+this.skippedDependencies = new LinkedHashSet( skipped );
}
}
@@ -80,7 +79,7 @@ public class DependencyStatusSets
{
if ( resolvedDependencies != null )
{
-this.resolvedDependencies = new TreeSet( resolvedDependencies );
+this.resolvedDependencies = new LinkedHashSet(
resolvedDependencies );
}
else
{
@@ -104,7 +103,7 @@ public class DependencyStatusSets
{
if ( skippedDependencies != null )
{
-this.skippedDependencies = new TreeSet( skippedDependencies );
+this.skippedDependencies = new LinkedHashSet( skippedDependencies
);
}
else
{
@@ -128,7 +127,7 @@ public class DependencyStatusSets
{
if ( unResolvedDependencies != null )
{
-this.unResolvedDependencies = new TreeSet( unResolvedDependencies
);
+this.unResolvedDependencies = new LinkedHashSet(
unResolvedDependencies );
}
else
{
@@ -180,9 +179,9 @@ public class DependencyStatusSets
{
sb.append( \n );
sb.append( The following files were skipped:\n );
-SortedSet sortedSkippedDependencies = new TreeSet();
-sortedSkippedDependencies.addAll( this.skippedDependencies );
-for ( Iterator i = sortedSkippedDependencies.iterator();
i.hasNext(); )
+Set skippedDependencies = new LinkedHashSet();
+skippedDependencies.addAll( this.skippedDependencies );
+for ( Iterator i = skippedDependencies.iterator(); i.hasNext(); )
{
sb.append( + ( (Artifact) i.next() ).getId() + \n );
}
@@ -192,9 +191,9 @@ public class DependencyStatusSets
{
sb.append( \n );
sb.append( The following files have NOT been resolved:\n );
-SortedSet sortedUnResolvedDependencies = new TreeSet();
-sortedUnResolvedDependencies.addAll( this.unResolvedDependencies );
-for ( Iterator i = sortedUnResolvedDependencies.iterator();
i.hasNext(); )
+Set unResolvedDependencies = new LinkedHashSet();
+unResolvedDependencies.addAll( this.unResolvedDependencies );
+for ( Iterator i = unResolvedDependencies.iterator(); i.hasNext();
)
{
sb.append( + ( (Artifact) i.next() ).getId() + \n );
}
svn commit: r1030748 [21/21] - in /maven/indexer: branches/ tags/ trunk/ trunk/indexer-artifact/ trunk/indexer-artifact/src/ trunk/indexer-artifact/src/main/ trunk/indexer-artifact/src/main/java/ trun
Added: maven/indexer/trunk/indexer-core/src/test/resources/index-updater/server-root/nexus-maven-repository-index.gz URL: http://svn.apache.org/viewvc/maven/indexer/trunk/indexer-core/src/test/resources/index-updater/server-root/nexus-maven-repository-index.gz?rev=1030748view=auto == Binary file - no diff available. Propchange: maven/indexer/trunk/indexer-core/src/test/resources/index-updater/server-root/nexus-maven-repository-index.gz -- svn:mime-type = application/octet-stream Added: maven/indexer/trunk/indexer-core/src/test/resources/index-updater/server-root/nexus-maven-repository-index.properties URL: http://svn.apache.org/viewvc/maven/indexer/trunk/indexer-core/src/test/resources/index-updater/server-root/nexus-maven-repository-index.properties?rev=1030748view=auto == --- maven/indexer/trunk/indexer-core/src/test/resources/index-updater/server-root/nexus-maven-repository-index.properties (added) +++ maven/indexer/trunk/indexer-core/src/test/resources/index-updater/server-root/nexus-maven-repository-index.properties Wed Nov 3 22:51:12 2010 @@ -0,0 +1,4 @@ +nexus.index.id=test + +# MMddHHmmss.SSS Z +nexus.index.timestamp=20090831023300.000 + Propchange: maven/indexer/trunk/indexer-core/src/test/resources/index-updater/server-root/nexus-maven-repository-index.properties -- svn:eol-style = native Propchange: maven/indexer/trunk/indexer-core/src/test/resources/index-updater/server-root/nexus-maven-repository-index.properties -- svn:keywords = Author Date Id Revision Added: maven/indexer/trunk/indexer-core/src/test/resources/index-updater/server-root/protected/nexus-maven-repository-index.gz URL: http://svn.apache.org/viewvc/maven/indexer/trunk/indexer-core/src/test/resources/index-updater/server-root/protected/nexus-maven-repository-index.gz?rev=1030748view=auto == Binary file - no diff available. Propchange: maven/indexer/trunk/indexer-core/src/test/resources/index-updater/server-root/protected/nexus-maven-repository-index.gz -- svn:mime-type = application/octet-stream Added: maven/indexer/trunk/indexer-core/src/test/resources/index-updater/server-root/protected/nexus-maven-repository-index.properties URL: http://svn.apache.org/viewvc/maven/indexer/trunk/indexer-core/src/test/resources/index-updater/server-root/protected/nexus-maven-repository-index.properties?rev=1030748view=auto == --- maven/indexer/trunk/indexer-core/src/test/resources/index-updater/server-root/protected/nexus-maven-repository-index.properties (added) +++ maven/indexer/trunk/indexer-core/src/test/resources/index-updater/server-root/protected/nexus-maven-repository-index.properties Wed Nov 3 22:51:12 2010 @@ -0,0 +1,4 @@ +nexus.index.id=test + +# MMddHHmmss.SSS Z +nexus.index.timestamp=20090831023300.000 + Propchange: maven/indexer/trunk/indexer-core/src/test/resources/index-updater/server-root/protected/nexus-maven-repository-index.properties -- svn:eol-style = native Propchange: maven/indexer/trunk/indexer-core/src/test/resources/index-updater/server-root/protected/nexus-maven-repository-index.properties -- svn:keywords = Author Date Id Revision Added: maven/indexer/trunk/indexer-core/src/test/resources/index-updater/server-root/slow/nexus-maven-repository-index.gz URL: http://svn.apache.org/viewvc/maven/indexer/trunk/indexer-core/src/test/resources/index-updater/server-root/slow/nexus-maven-repository-index.gz?rev=1030748view=auto == Binary file - no diff available. Propchange: maven/indexer/trunk/indexer-core/src/test/resources/index-updater/server-root/slow/nexus-maven-repository-index.gz -- svn:mime-type = application/octet-stream Added: maven/indexer/trunk/indexer-core/src/test/resources/index-updater/server-root/slow/nexus-maven-repository-index.properties URL: http://svn.apache.org/viewvc/maven/indexer/trunk/indexer-core/src/test/resources/index-updater/server-root/slow/nexus-maven-repository-index.properties?rev=1030748view=auto == ---
svn commit: r1030216 - in /maven/enforcer/trunk: enforcer-api/pom.xml enforcer-rules/pom.xml maven-enforcer-plugin/pom.xml pom.xml
Author: brianf Date: Tue Nov 2 21:03:29 2010 New Revision: 1030216 URL: http://svn.apache.org/viewvc?rev=1030216view=rev Log: revert the release Modified: maven/enforcer/trunk/enforcer-api/pom.xml maven/enforcer/trunk/enforcer-rules/pom.xml maven/enforcer/trunk/maven-enforcer-plugin/pom.xml maven/enforcer/trunk/pom.xml Modified: maven/enforcer/trunk/enforcer-api/pom.xml URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-api/pom.xml?rev=1030216r1=1030215r2=1030216view=diff == --- maven/enforcer/trunk/enforcer-api/pom.xml (original) +++ maven/enforcer/trunk/enforcer-api/pom.xml Tue Nov 2 21:03:29 2010 @@ -24,11 +24,11 @@ parent groupIdorg.apache.maven.enforcer/groupId artifactIdenforcer/artifactId -version1.1-SNAPSHOT/version +version1.0-beta-2-SNAPSHOT/version /parent artifactIdenforcer-api/artifactId - version1.1-SNAPSHOT/version + version1.0-beta-2-SNAPSHOT/version packagingjar/packaging nameEnforcer API/name Modified: maven/enforcer/trunk/enforcer-rules/pom.xml URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/pom.xml?rev=1030216r1=1030215r2=1030216view=diff == --- maven/enforcer/trunk/enforcer-rules/pom.xml (original) +++ maven/enforcer/trunk/enforcer-rules/pom.xml Tue Nov 2 21:03:29 2010 @@ -24,11 +24,11 @@ parent groupIdorg.apache.maven.enforcer/groupId artifactIdenforcer/artifactId -version1.1-SNAPSHOT/version +version1.0-beta-2-SNAPSHOT/version /parent artifactIdenforcer-rules/artifactId - version1.1-SNAPSHOT/version + version1.0-beta-2-SNAPSHOT/version packagingjar/packaging nameEnforcer Rules/name Modified: maven/enforcer/trunk/maven-enforcer-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/maven-enforcer-plugin/pom.xml?rev=1030216r1=1030215r2=1030216view=diff == --- maven/enforcer/trunk/maven-enforcer-plugin/pom.xml (original) +++ maven/enforcer/trunk/maven-enforcer-plugin/pom.xml Tue Nov 2 21:03:29 2010 @@ -24,12 +24,12 @@ parent groupIdorg.apache.maven.enforcer/groupId artifactIdenforcer/artifactId -version1.1-SNAPSHOT/version +version1.0-beta-2-SNAPSHOT/version /parent groupIdorg.apache.maven.plugins/groupId artifactIdmaven-enforcer-plugin/artifactId - version1.1-SNAPSHOT/version + version1.0-beta-2-SNAPSHOT/version packagingmaven-plugin/packaging nameMaven Enforcer Plugin/name Modified: maven/enforcer/trunk/pom.xml URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/pom.xml?rev=1030216r1=1030215r2=1030216view=diff == --- maven/enforcer/trunk/pom.xml (original) +++ maven/enforcer/trunk/pom.xml Tue Nov 2 21:03:29 2010 @@ -28,7 +28,7 @@ /parent groupIdorg.apache.maven.enforcer/groupId artifactIdenforcer/artifactId - version1.1-SNAPSHOT/version + version1.0-beta-2-SNAPSHOT/version packagingpom/packaging nameEnforcer/name
svn commit: r1030217 - /maven/enforcer/tags/enforcer-1.0/
Author: brianf Date: Tue Nov 2 21:04:22 2010 New Revision: 1030217 URL: http://svn.apache.org/viewvc?rev=1030217view=rev Log: revert Removed: maven/enforcer/tags/enforcer-1.0/
svn commit: r1030225 - in /maven/enforcer/trunk/enforcer-rules/src: main/java/org/apache/maven/plugins/enforcer/DependencyConvergence.java site/apt/dependencyConvergence.apt.vm
Author: brianf
Date: Tue Nov 2 21:16:24 2010
New Revision: 1030225
URL: http://svn.apache.org/viewvc?rev=1030225view=rev
Log:
MENFORCER-109 applied patch to fix output from Rex Hoffman
Modified:
maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/DependencyConvergence.java
maven/enforcer/trunk/enforcer-rules/src/site/apt/dependencyConvergence.apt.vm
Modified:
maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/DependencyConvergence.java
URL:
http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/DependencyConvergence.java?rev=1030225r1=1030224r2=1030225view=diff
==
---
maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/DependencyConvergence.java
(original)
+++
maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/DependencyConvergence.java
Tue Nov 2 21:16:24 2010
@@ -109,14 +109,14 @@ public class DependencyConvergence imple
}
private String getFullArtifactName(Artifact artifact){
-return artifact.getGroupId() + : + artifact.getArtifactId() +
artifact.getVersion();
+return artifact.getGroupId() + : + artifact.getArtifactId() +:+
artifact.getVersion();
}
private StringBuilder buildTreeString(DependencyNode node) {
ListString loc = new ArrayListString();
DependencyNode currentNode = node;
while (currentNode != null) {
- loc.add(getFullArtifactName(node.getArtifact()));
+ loc.add(getFullArtifactName(currentNode.getArtifact()));
currentNode = currentNode.getParent();
}
Collections.reverse(loc);
@@ -145,7 +145,7 @@ public class DependencyConvergence imple
if (nodeList.size() 0){
builder.append(buildTreeString(nodeList.get(0)));
}
-for (DependencyNode node: nodeList){
+for (DependencyNode node: nodeList.subList(1,nodeList.size())){
builder.append(and\n);
builder.append(buildTreeString(node));
}
Modified:
maven/enforcer/trunk/enforcer-rules/src/site/apt/dependencyConvergence.apt.vm
URL:
http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/site/apt/dependencyConvergence.apt.vm?rev=1030225r1=1030224r2=1030225view=diff
==
---
maven/enforcer/trunk/enforcer-rules/src/site/apt/dependencyConvergence.apt.vm
(original)
+++
maven/enforcer/trunk/enforcer-rules/src/site/apt/dependencyConvergence.apt.vm
Tue Nov 2 21:16:24 2010
@@ -22,7 +22,7 @@
2008-09-13
-
- This rule requires that dependency version numbers converge. If it has two
dependencies, A and B, both depending on the same artifact, c, this rule will
fail the build if A depends on a different version of C then the version of C
depended on by B.
+ This rule requires that dependency version numbers converge. If a project
has two dependencies, A and B, both depending on the same artifact, C, this
rule will fail the build if A depends on a different version of C then the
version of C depended on by B.
Here is a concrete example.
@@ -49,13 +49,16 @@
---
Dependency convergence error for org.slf4j:slf4j-api1.6.1 paths to dependency
are:
-+-org.slf4j:slf4j-api1.6.1
- +-org.slf4j:slf4j-api1.6.1
-+-org.slf4j:slf4j-api1.6.1
+[ERROR]
+Dependency convergence error for org.slf4j:slf4j-api:1.6.1 paths to dependency
are:
++-org.myorg:my-project:1.0.0-SNAPSHOT
+ +-org.slf4j:slf4j-jdk14:1.6.1
++-org.slf4j:slf4j-api:1.6.1
and
-+-org.slf4j:slf4j-api1.6.0
- +-org.slf4j:slf4j-api1.6.0
-+-org.slf4j:slf4j-api1.6.0
++-org.myorg:my-project:1.0.0-SNAPSHOT
+ +-org.slf4j:slf4j-nop:1.6.0
++-org.slf4j:slf4j-api:1.6.0
+
---
svn commit: r1030226 - in /maven/enforcer/trunk: enforcer-api/pom.xml enforcer-rules/pom.xml maven-enforcer-plugin/pom.xml pom.xml
Author: brianf Date: Tue Nov 2 21:17:54 2010 New Revision: 1030226 URL: http://svn.apache.org/viewvc?rev=1030226view=rev Log: [maven-release-plugin] prepare release enforcer-1.0 Modified: maven/enforcer/trunk/enforcer-api/pom.xml maven/enforcer/trunk/enforcer-rules/pom.xml maven/enforcer/trunk/maven-enforcer-plugin/pom.xml maven/enforcer/trunk/pom.xml Modified: maven/enforcer/trunk/enforcer-api/pom.xml URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-api/pom.xml?rev=1030226r1=1030225r2=1030226view=diff == --- maven/enforcer/trunk/enforcer-api/pom.xml (original) +++ maven/enforcer/trunk/enforcer-api/pom.xml Tue Nov 2 21:17:54 2010 @@ -24,11 +24,11 @@ parent groupIdorg.apache.maven.enforcer/groupId artifactIdenforcer/artifactId -version1.0-beta-2-SNAPSHOT/version +version1.0/version /parent artifactIdenforcer-api/artifactId - version1.0-beta-2-SNAPSHOT/version + version1.0/version packagingjar/packaging nameEnforcer API/name Modified: maven/enforcer/trunk/enforcer-rules/pom.xml URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/pom.xml?rev=1030226r1=1030225r2=1030226view=diff == --- maven/enforcer/trunk/enforcer-rules/pom.xml (original) +++ maven/enforcer/trunk/enforcer-rules/pom.xml Tue Nov 2 21:17:54 2010 @@ -24,11 +24,11 @@ parent groupIdorg.apache.maven.enforcer/groupId artifactIdenforcer/artifactId -version1.0-beta-2-SNAPSHOT/version +version1.0/version /parent artifactIdenforcer-rules/artifactId - version1.0-beta-2-SNAPSHOT/version + version1.0/version packagingjar/packaging nameEnforcer Rules/name Modified: maven/enforcer/trunk/maven-enforcer-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/maven-enforcer-plugin/pom.xml?rev=1030226r1=1030225r2=1030226view=diff == --- maven/enforcer/trunk/maven-enforcer-plugin/pom.xml (original) +++ maven/enforcer/trunk/maven-enforcer-plugin/pom.xml Tue Nov 2 21:17:54 2010 @@ -24,12 +24,12 @@ parent groupIdorg.apache.maven.enforcer/groupId artifactIdenforcer/artifactId -version1.0-beta-2-SNAPSHOT/version +version1.0/version /parent groupIdorg.apache.maven.plugins/groupId artifactIdmaven-enforcer-plugin/artifactId - version1.0-beta-2-SNAPSHOT/version + version1.0/version packagingmaven-plugin/packaging nameMaven Enforcer Plugin/name Modified: maven/enforcer/trunk/pom.xml URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/pom.xml?rev=1030226r1=1030225r2=1030226view=diff == --- maven/enforcer/trunk/pom.xml (original) +++ maven/enforcer/trunk/pom.xml Tue Nov 2 21:17:54 2010 @@ -28,7 +28,7 @@ /parent groupIdorg.apache.maven.enforcer/groupId artifactIdenforcer/artifactId - version1.0-beta-2-SNAPSHOT/version + version1.0/version packagingpom/packaging nameEnforcer/name @@ -132,9 +132,9 @@ /modules scm - connectionscm:svn:http://svn.apache.org/repos/asf/maven/enforcer/trunk//connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/enforcer/trunk//developerConnection -urlhttp://svn.apache.org/viewcvs.cgi/maven/enforcer/trunk/url + connectionscm:svn:http://svn.apache.org/repos/asf/maven/enforcer/tags/enforcer-1.0/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/enforcer/tags/enforcer-1.0/developerConnection + urlhttp://svn.apache.org/viewcvs.cgi/maven/enforcer/tags/enforcer-1.0/url /scm issueManagement systemjira/system
svn commit: r1030227 - /maven/enforcer/tags/enforcer-1.0/
Author: brianf Date: Tue Nov 2 21:18:00 2010 New Revision: 1030227 URL: http://svn.apache.org/viewvc?rev=1030227view=rev Log: [maven-scm] copy for tag enforcer-1.0 Added: maven/enforcer/tags/enforcer-1.0/ - copied from r1030226, maven/enforcer/trunk/
svn commit: r1029850 - /maven/pom/trunk/maven/pom.xml
Author: brianf Date: Mon Nov 1 21:36:22 2010 New Revision: 1029850 URL: http://svn.apache.org/viewvc?rev=1029850view=rev Log: [maven-release-plugin] prepare release maven-parent-17 Modified: maven/pom/trunk/maven/pom.xml Modified: maven/pom/trunk/maven/pom.xml URL: http://svn.apache.org/viewvc/maven/pom/trunk/maven/pom.xml?rev=1029850r1=1029849r2=1029850view=diff == --- maven/pom/trunk/maven/pom.xml (original) +++ maven/pom/trunk/maven/pom.xml Mon Nov 1 21:36:22 2010 @@ -31,7 +31,7 @@ under the License. groupIdorg.apache.maven/groupId artifactIdmaven-parent/artifactId - version17-SNAPSHOT/version + version17/version packagingpom/packaging nameApache Maven/name @@ -571,9 +571,9 @@ under the License. /mailingLists scm - connectionscm:svn:http://svn.apache.org/repos/asf/maven/pom/trunk/maven/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/pom/trunk/maven/developerConnection -urlhttp://svn.apache.org/viewvc/maven/pom/trunk/maven/url + connectionscm:svn:http://svn.apache.org/repos/asf/maven/pom/tags/maven-parent-17/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/pom/tags/maven-parent-17/developerConnection +urlhttp://svn.apache.org/viewvc/maven/pom/tags/maven-parent-17/url /scm ciManagement systemHudson/system
svn commit: r1029851 - /maven/pom/tags/maven-parent-17/
Author: brianf Date: Mon Nov 1 21:36:27 2010 New Revision: 1029851 URL: http://svn.apache.org/viewvc?rev=1029851view=rev Log: [maven-scm] copy for tag maven-parent-17 Added: maven/pom/tags/maven-parent-17/ - copied from r1029850, maven/pom/trunk/maven/
svn commit: r1029852 - /maven/pom/trunk/maven/pom.xml
Author: brianf Date: Mon Nov 1 21:36:30 2010 New Revision: 1029852 URL: http://svn.apache.org/viewvc?rev=1029852view=rev Log: [maven-release-plugin] prepare for next development iteration Modified: maven/pom/trunk/maven/pom.xml Modified: maven/pom/trunk/maven/pom.xml URL: http://svn.apache.org/viewvc/maven/pom/trunk/maven/pom.xml?rev=1029852r1=1029851r2=1029852view=diff == --- maven/pom/trunk/maven/pom.xml (original) +++ maven/pom/trunk/maven/pom.xml Mon Nov 1 21:36:30 2010 @@ -31,7 +31,7 @@ under the License. groupIdorg.apache.maven/groupId artifactIdmaven-parent/artifactId - version17/version + version18-SNAPSHOT/version packagingpom/packaging nameApache Maven/name @@ -571,9 +571,9 @@ under the License. /mailingLists scm - connectionscm:svn:http://svn.apache.org/repos/asf/maven/pom/tags/maven-parent-17/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/pom/tags/maven-parent-17/developerConnection -urlhttp://svn.apache.org/viewvc/maven/pom/tags/maven-parent-17/url + connectionscm:svn:http://svn.apache.org/repos/asf/maven/pom/trunk/maven/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/pom/trunk/maven/developerConnection +urlhttp://svn.apache.org/viewvc/maven/pom/trunk/maven/url /scm ciManagement systemHudson/system
svn commit: r1029860 - /maven/enforcer/trunk/pom.xml
Author: brianf Date: Mon Nov 1 21:56:34 2010 New Revision: 1029860 URL: http://svn.apache.org/viewvc?rev=1029860view=rev Log: use the latest released parent. Modified: maven/enforcer/trunk/pom.xml Modified: maven/enforcer/trunk/pom.xml URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/pom.xml?rev=1029860r1=1029859r2=1029860view=diff == --- maven/enforcer/trunk/pom.xml (original) +++ maven/enforcer/trunk/pom.xml Mon Nov 1 21:56:34 2010 @@ -23,7 +23,7 @@ parent artifactIdmaven-parent/artifactId groupIdorg.apache.maven/groupId -version17-SNAPSHOT/version +version17/version relativePath../pom/maven/pom.xml/relativePath /parent groupIdorg.apache.maven.enforcer/groupId
svn commit: r1029862 - in /maven/enforcer/trunk: enforcer-api/pom.xml enforcer-rules/pom.xml maven-enforcer-plugin/pom.xml pom.xml
Author: brianf Date: Mon Nov 1 21:58:21 2010 New Revision: 1029862 URL: http://svn.apache.org/viewvc?rev=1029862view=rev Log: [maven-release-plugin] prepare release enforcer-1.0 Modified: maven/enforcer/trunk/enforcer-api/pom.xml maven/enforcer/trunk/enforcer-rules/pom.xml maven/enforcer/trunk/maven-enforcer-plugin/pom.xml maven/enforcer/trunk/pom.xml Modified: maven/enforcer/trunk/enforcer-api/pom.xml URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-api/pom.xml?rev=1029862r1=1029861r2=1029862view=diff == --- maven/enforcer/trunk/enforcer-api/pom.xml (original) +++ maven/enforcer/trunk/enforcer-api/pom.xml Mon Nov 1 21:58:21 2010 @@ -24,11 +24,11 @@ parent groupIdorg.apache.maven.enforcer/groupId artifactIdenforcer/artifactId -version1.0-beta-2-SNAPSHOT/version +version1.0/version /parent artifactIdenforcer-api/artifactId - version1.0-beta-2-SNAPSHOT/version + version1.0/version packagingjar/packaging nameEnforcer API/name Modified: maven/enforcer/trunk/enforcer-rules/pom.xml URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/pom.xml?rev=1029862r1=1029861r2=1029862view=diff == --- maven/enforcer/trunk/enforcer-rules/pom.xml (original) +++ maven/enforcer/trunk/enforcer-rules/pom.xml Mon Nov 1 21:58:21 2010 @@ -24,11 +24,11 @@ parent groupIdorg.apache.maven.enforcer/groupId artifactIdenforcer/artifactId -version1.0-beta-2-SNAPSHOT/version +version1.0/version /parent artifactIdenforcer-rules/artifactId - version1.0-beta-2-SNAPSHOT/version + version1.0/version packagingjar/packaging nameEnforcer Rules/name Modified: maven/enforcer/trunk/maven-enforcer-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/maven-enforcer-plugin/pom.xml?rev=1029862r1=1029861r2=1029862view=diff == --- maven/enforcer/trunk/maven-enforcer-plugin/pom.xml (original) +++ maven/enforcer/trunk/maven-enforcer-plugin/pom.xml Mon Nov 1 21:58:21 2010 @@ -24,12 +24,12 @@ parent groupIdorg.apache.maven.enforcer/groupId artifactIdenforcer/artifactId -version1.0-beta-2-SNAPSHOT/version +version1.0/version /parent groupIdorg.apache.maven.plugins/groupId artifactIdmaven-enforcer-plugin/artifactId - version1.0-beta-2-SNAPSHOT/version + version1.0/version packagingmaven-plugin/packaging nameMaven Enforcer Plugin/name Modified: maven/enforcer/trunk/pom.xml URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/pom.xml?rev=1029862r1=1029861r2=1029862view=diff == --- maven/enforcer/trunk/pom.xml (original) +++ maven/enforcer/trunk/pom.xml Mon Nov 1 21:58:21 2010 @@ -28,7 +28,7 @@ /parent groupIdorg.apache.maven.enforcer/groupId artifactIdenforcer/artifactId - version1.0-beta-2-SNAPSHOT/version + version1.0/version packagingpom/packaging nameEnforcer/name @@ -132,9 +132,9 @@ /modules scm - connectionscm:svn:http://svn.apache.org/repos/asf/maven/enforcer/trunk//connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/enforcer/trunk//developerConnection -urlhttp://svn.apache.org/viewcvs.cgi/maven/enforcer/trunk/url + connectionscm:svn:http://svn.apache.org/repos/asf/maven/enforcer/tags/enforcer-1.0/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/enforcer/tags/enforcer-1.0/developerConnection + urlhttp://svn.apache.org/viewcvs.cgi/maven/enforcer/tags/enforcer-1.0/url /scm issueManagement systemjira/system
svn commit: r1029863 - /maven/enforcer/tags/enforcer-1.0/
Author: brianf Date: Mon Nov 1 21:58:26 2010 New Revision: 1029863 URL: http://svn.apache.org/viewvc?rev=1029863view=rev Log: [maven-scm] copy for tag enforcer-1.0 Added: maven/enforcer/tags/enforcer-1.0/ - copied from r1029862, maven/enforcer/trunk/
svn commit: r1029864 - in /maven/enforcer/trunk: enforcer-api/pom.xml enforcer-rules/pom.xml maven-enforcer-plugin/pom.xml pom.xml
Author: brianf Date: Mon Nov 1 21:58:30 2010 New Revision: 1029864 URL: http://svn.apache.org/viewvc?rev=1029864view=rev Log: [maven-release-plugin] prepare for next development iteration Modified: maven/enforcer/trunk/enforcer-api/pom.xml maven/enforcer/trunk/enforcer-rules/pom.xml maven/enforcer/trunk/maven-enforcer-plugin/pom.xml maven/enforcer/trunk/pom.xml Modified: maven/enforcer/trunk/enforcer-api/pom.xml URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-api/pom.xml?rev=1029864r1=1029863r2=1029864view=diff == --- maven/enforcer/trunk/enforcer-api/pom.xml (original) +++ maven/enforcer/trunk/enforcer-api/pom.xml Mon Nov 1 21:58:30 2010 @@ -24,11 +24,11 @@ parent groupIdorg.apache.maven.enforcer/groupId artifactIdenforcer/artifactId -version1.0/version +version1.1-SNAPSHOT/version /parent artifactIdenforcer-api/artifactId - version1.0/version + version1.1-SNAPSHOT/version packagingjar/packaging nameEnforcer API/name Modified: maven/enforcer/trunk/enforcer-rules/pom.xml URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/pom.xml?rev=1029864r1=1029863r2=1029864view=diff == --- maven/enforcer/trunk/enforcer-rules/pom.xml (original) +++ maven/enforcer/trunk/enforcer-rules/pom.xml Mon Nov 1 21:58:30 2010 @@ -24,11 +24,11 @@ parent groupIdorg.apache.maven.enforcer/groupId artifactIdenforcer/artifactId -version1.0/version +version1.1-SNAPSHOT/version /parent artifactIdenforcer-rules/artifactId - version1.0/version + version1.1-SNAPSHOT/version packagingjar/packaging nameEnforcer Rules/name Modified: maven/enforcer/trunk/maven-enforcer-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/maven-enforcer-plugin/pom.xml?rev=1029864r1=1029863r2=1029864view=diff == --- maven/enforcer/trunk/maven-enforcer-plugin/pom.xml (original) +++ maven/enforcer/trunk/maven-enforcer-plugin/pom.xml Mon Nov 1 21:58:30 2010 @@ -24,12 +24,12 @@ parent groupIdorg.apache.maven.enforcer/groupId artifactIdenforcer/artifactId -version1.0/version +version1.1-SNAPSHOT/version /parent groupIdorg.apache.maven.plugins/groupId artifactIdmaven-enforcer-plugin/artifactId - version1.0/version + version1.1-SNAPSHOT/version packagingmaven-plugin/packaging nameMaven Enforcer Plugin/name Modified: maven/enforcer/trunk/pom.xml URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/pom.xml?rev=1029864r1=1029863r2=1029864view=diff == --- maven/enforcer/trunk/pom.xml (original) +++ maven/enforcer/trunk/pom.xml Mon Nov 1 21:58:30 2010 @@ -28,7 +28,7 @@ /parent groupIdorg.apache.maven.enforcer/groupId artifactIdenforcer/artifactId - version1.0/version + version1.1-SNAPSHOT/version packagingpom/packaging nameEnforcer/name @@ -132,9 +132,9 @@ /modules scm - connectionscm:svn:http://svn.apache.org/repos/asf/maven/enforcer/tags/enforcer-1.0/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/enforcer/tags/enforcer-1.0/developerConnection - urlhttp://svn.apache.org/viewcvs.cgi/maven/enforcer/tags/enforcer-1.0/url + connectionscm:svn:http://svn.apache.org/repos/asf/maven/enforcer/trunk//connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/enforcer/trunk//developerConnection +urlhttp://svn.apache.org/viewcvs.cgi/maven/enforcer/trunk/url /scm issueManagement systemjira/system
svn commit: r1028552 - in /maven/enforcer/trunk: enforcer-rules/ enforcer-rules/src/it/builds_a_pom_noop/ enforcer-rules/src/it/dependencies_converge/ enforcer-rules/src/it/dependencies_not_converging
Author: brianf
Date: Thu Oct 28 23:56:58 2010
New Revision: 1028552
URL: http://svn.apache.org/viewvc?rev=1028552view=rev
Log:
moved the its to the plugin project.
Added:
maven/enforcer/trunk/maven-enforcer-plugin/src/it/builds_a_pom_noop/
- copied from r1028163,
maven/enforcer/trunk/enforcer-rules/src/it/builds_a_pom_noop/
maven/enforcer/trunk/maven-enforcer-plugin/src/it/dependencies_converge/
- copied from r1028163,
maven/enforcer/trunk/enforcer-rules/src/it/dependencies_converge/
maven/enforcer/trunk/maven-enforcer-plugin/src/it/dependencies_not_converging/
- copied from r1028163,
maven/enforcer/trunk/enforcer-rules/src/it/dependencies_not_converging/
maven/enforcer/trunk/maven-enforcer-plugin/src/it/dependencies_not_converging_test_scope/
- copied from r1028163,
maven/enforcer/trunk/enforcer-rules/src/it/dependencies_not_converging_test_scope/
Removed:
maven/enforcer/trunk/enforcer-rules/src/it/builds_a_pom_noop/
maven/enforcer/trunk/enforcer-rules/src/it/dependencies_converge/
maven/enforcer/trunk/enforcer-rules/src/it/dependencies_not_converging/
maven/enforcer/trunk/enforcer-rules/src/it/dependencies_not_converging_test_scope/
Modified:
maven/enforcer/trunk/enforcer-rules/pom.xml
Modified: maven/enforcer/trunk/enforcer-rules/pom.xml
URL:
http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/pom.xml?rev=1028552r1=1028551r2=1028552view=diff
==
--- maven/enforcer/trunk/enforcer-rules/pom.xml (original)
+++ maven/enforcer/trunk/enforcer-rules/pom.xml Thu Oct 28 23:56:58 2010
@@ -121,33 +121,6 @@
/execution
/executions
/plugin
- plugin
-artifactIdmaven-invoker-plugin/artifactId
-version1.5/version
-configuration
- debugtrue/debug
- projectsDirectorysrc/it/projectsDirectory
- cloneProjectsTo${project.build.directory}/it/cloneProjectsTo
- pomIncludes
-pomInclude*/pom.xml/pomInclude
- /pomIncludes
- postBuildHookScriptverify/postBuildHookScript
-
localRepositoryPath${project.build.directory}/local-repo/localRepositoryPath
- settingsFilesrc/it/settings.xml/settingsFile
- goals
-goalverify/goal
- /goals
-/configuration
-executions
- execution
-idintegration-test/id
-goals
- goalinstall/goal
- goalrun/goal
-/goals
- /execution
-/executions
- /plugin
!--plugin
groupIdorg.codehaus.mojo/groupId
artifactIdshitty-maven-plugin/artifactId
svn commit: r1028133 - /maven/enforcer/trunk/enforcer-rules/src/site/apt/requirePluginVersions.apt.vm
Author: brianf Date: Wed Oct 27 23:21:29 2010 New Revision: 1028133 URL: http://svn.apache.org/viewvc?rev=1028133view=rev Log: MENFORCER-108 fix typos in parameter list Modified: maven/enforcer/trunk/enforcer-rules/src/site/apt/requirePluginVersions.apt.vm Modified: maven/enforcer/trunk/enforcer-rules/src/site/apt/requirePluginVersions.apt.vm URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/site/apt/requirePluginVersions.apt.vm?rev=1028133r1=1028132r2=1028133view=diff == --- maven/enforcer/trunk/enforcer-rules/src/site/apt/requirePluginVersions.apt.vm (original) +++ maven/enforcer/trunk/enforcer-rules/src/site/apt/requirePluginVersions.apt.vm Wed Oct 27 23:21:29 2010 @@ -46,7 +46,7 @@ Require Plugin Versions are plugins that may not be in the poms but are used anyway, like help, eclipse etc. The plugins should be specified in the form: group:artifactId. - * unCheckedPluginList - A comma separated list of plugins to skip version checking. Ie allow no version, or snapshots, etc. The plugins should be specified in the form: group:artifactId. + * unCheckedPluginsList - A comma separated list of plugins to skip version checking. Ie allow no version, or snapshots, etc. The plugins should be specified in the form: group:artifactId. [] @@ -80,7 +80,7 @@ Require Plugin Versions additionalPluginorg.apache.maven.plugins:maven-eclipse-plugin/additionalPlugin additionalPluginorg.apache.maven.plugins:maven-reactor-plugin/additionalPlugin /additionalPlugins - unCheckedPluginListorg.apache.maven.plugins:maven-enforcer-plugin,org.apache.maven.plugins:maven-idea-plugin/unCheckedPluginList + unCheckedPluginsListorg.apache.maven.plugins:maven-enforcer-plugin,org.apache.maven.plugins:maven-idea-plugin/unCheckedPluginsList /requirePluginVersions /rules /configuration
svn commit: r1028137 - /maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequirePluginVersions.java
Author: brianf Date: Wed Oct 27 23:28:12 2010 New Revision: 1028137 URL: http://svn.apache.org/viewvc?rev=1028137view=rev Log: MENFORCER-105 Modified: maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequirePluginVersions.java Modified: maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequirePluginVersions.java URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequirePluginVersions.java?rev=1028137r1=1028136r2=1028137view=diff == --- maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequirePluginVersions.java (original) +++ maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequirePluginVersions.java Wed Oct 27 23:28:12 2010 @@ -1012,7 +1012,7 @@ public class RequirePluginVersions // get all the pom models List models = utils.getModelsRecursively( project.getGroupId(), project.getArtifactId(), project.getVersion(), -new File( project.getBasedir(), pom.xml ) ); +new File( project.getBasedir(), project.getFile().getName() ) ); // now find all the plugin entries, either in // build.plugins or build.pluginManagement.plugins, profiles.plugins and reporting
svn commit: r1028144 - /maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequirePluginVersions.java
Author: brianf
Date: Thu Oct 28 00:10:58 2010
New Revision: 1028144
URL: http://svn.apache.org/viewvc?rev=1028144view=rev
Log:
MENFORCER-105
Modified:
maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequirePluginVersions.java
Modified:
maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequirePluginVersions.java
URL:
http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequirePluginVersions.java?rev=1028144r1=1028143r2=1028144view=diff
==
---
maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequirePluginVersions.java
(original)
+++
maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequirePluginVersions.java
Thu Oct 28 00:10:58 2010
@@ -1010,9 +1010,19 @@ public class RequirePluginVersions
{
List plugins = new ArrayList();
// get all the pom models
+
+String pomName = null;
+try
+{
+pomName = project.getFile().getName();
+}
+catch (Exception e)
+{
+pomName = pom.xml;
+}
List models =
utils.getModelsRecursively( project.getGroupId(),
project.getArtifactId(), project.getVersion(),
-new File( project.getBasedir(),
project.getFile().getName() ) );
+new File( project.getBasedir(),
pomName ) );
// now find all the plugin entries, either in
// build.plugins or build.pluginManagement.plugins, profiles.plugins
and reporting
svn commit: r1028159 - /maven/pom/trunk/maven/pom.xml
Author: brianf Date: Thu Oct 28 01:18:20 2010 New Revision: 1028159 URL: http://svn.apache.org/viewvc?rev=1028159view=rev Log: bump to the latest site plugin Modified: maven/pom/trunk/maven/pom.xml Modified: maven/pom/trunk/maven/pom.xml URL: http://svn.apache.org/viewvc/maven/pom/trunk/maven/pom.xml?rev=1028159r1=1028158r2=1028159view=diff == --- maven/pom/trunk/maven/pom.xml (original) +++ maven/pom/trunk/maven/pom.xml Thu Oct 28 01:18:20 2010 @@ -779,7 +779,7 @@ under the License. plugin groupIdorg.apache.maven.plugins/groupId artifactIdmaven-site-plugin/artifactId - version3.0-beta-1/version + version3.0-beta-3/version /plugin /plugins /pluginManagement
svn commit: r1028160 - in /maven/enforcer/trunk/enforcer-rules/src/it: requirePlugins1/ requirePluginsReports/ requirePluginsUnchecked/
Author: brianf Date: Thu Oct 28 01:27:14 2010 New Revision: 1028160 URL: http://svn.apache.org/viewvc?rev=1028160view=rev Log: these tests aren't used Removed: maven/enforcer/trunk/enforcer-rules/src/it/requirePlugins1/ maven/enforcer/trunk/enforcer-rules/src/it/requirePluginsReports/ maven/enforcer/trunk/enforcer-rules/src/it/requirePluginsUnchecked/
svn commit: r1028161 - /maven/enforcer/trunk/pom.xml
Author: brianf Date: Thu Oct 28 01:28:31 2010 New Revision: 1028161 URL: http://svn.apache.org/viewvc?rev=1028161view=rev Log: update parents and plugins Modified: maven/enforcer/trunk/pom.xml Modified: maven/enforcer/trunk/pom.xml URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/pom.xml?rev=1028161r1=1028160r2=1028161view=diff == --- maven/enforcer/trunk/pom.xml (original) +++ maven/enforcer/trunk/pom.xml Thu Oct 28 01:28:31 2010 @@ -23,10 +23,9 @@ parent artifactIdmaven-parent/artifactId groupIdorg.apache.maven/groupId -version16/version +version17-SNAPSHOT/version relativePath../pom/maven/pom.xml/relativePath /parent - groupIdorg.apache.maven.enforcer/groupId artifactIdenforcer/artifactId version1.0-beta-2-SNAPSHOT/version @@ -245,8 +244,8 @@ plugin artifactIdmaven-compiler-plugin/artifactId configuration -source1.4/source -target1.4/target +source1.5/source +target1.5/target /configuration /plugin plugin @@ -268,18 +267,18 @@ plugin groupIdorg.codehaus.mojo/groupId artifactIdcobertura-maven-plugin/artifactId -version2.2/version +version2.4/version /plugin plugin groupIdorg.apache.maven.plugins/groupId artifactIdmaven-javadoc-plugin/artifactId -version2.5/version +version2.7/version configuration tagletArtifacts tagletArtifact groupIdorg.apache.maven.plugin-tools/groupId artifactIdmaven-plugin-tools-javadoc/artifactId -version2.4.3/version +version2.6/version /tagletArtifact tagletArtifact groupIdorg.codehaus.plexus/groupId
svn commit: r1028162 - in /maven/site/trunk/src/site/apt/guides: introduction/introduction-to-repositories.apt mini/guide-configuring-maven.apt mini/guide-maven-evangelism.apt mini/guide-mirror-settin
Author: brianf
Date: Thu Oct 28 01:28:58 2010
New Revision: 1028162
URL: http://svn.apache.org/viewvc?rev=1028162view=rev
Log:
added uk repo
Modified:
maven/site/trunk/src/site/apt/guides/introduction/introduction-to-repositories.apt
maven/site/trunk/src/site/apt/guides/mini/guide-configuring-maven.apt
maven/site/trunk/src/site/apt/guides/mini/guide-maven-evangelism.apt
maven/site/trunk/src/site/apt/guides/mini/guide-mirror-settings.apt
Modified:
maven/site/trunk/src/site/apt/guides/introduction/introduction-to-repositories.apt
URL:
http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/guides/introduction/introduction-to-repositories.apt?rev=1028162r1=1028161r2=1028162view=diff
==
---
maven/site/trunk/src/site/apt/guides/introduction/introduction-to-repositories.apt
(original)
+++
maven/site/trunk/src/site/apt/guides/introduction/introduction-to-repositories.apt
Thu Oct 28 01:28:58 2010
@@ -18,9 +18,9 @@ Introduction to Repositories
build artifacts that you have not yet released.
Remote repositories refer to any other type of repository, accessed by a
variety of protocols such as
- file:// and http://. These repositories might be a truely remote
repository
+ file:// and http://. These repositories might be a truly remote
repository
set up by a third party to provide their artifacts for downloading (for
example,
- {{{http://repo1.maven.org/maven2/}repo1.maven.org}} houses Maven's central
repository).
+ {{{http://repo1.maven.org/maven2/}repo1.maven.org}} and
{{{http://uk.maven.org/maven2/}uk.maven.org}} house Maven's central repository).
Other remote repositories may be internal repositories
set up on a file or HTTP server within your company, used to share private
artifacts between development teams
and for releases.
@@ -67,22 +67,7 @@ Introduction to Repositories
repository (or for a SNAPSHOT, when the remote repository contains one
that is newer).
By default, Maven will download from the
{{{http://repo1.maven.org/maven2/}central}} repository.
- To override this, you need to specify a repositories element as follows:
-
-++
-
-project
- ...
- repositories
-repository
- idmy-internal-site/id
- urlhttp://myserver/repo/url
-/repository
- /repositories
- ...
-/project
-
-++
+ To override this, you need to specify a mirror as shown in
{{{../mini/guide-mirror-settings.html}Using Mirrors for Repositories}}
You can set this in your settings.xml file to globally use a certain
mirror, however
note that it is common for a project to customise the repository in their
pom.xml
@@ -93,7 +78,7 @@ Introduction to Repositories
** Using Mirrors for the Central Repository
- Like any server, the central repository sometimes goes down. If this happens
you can make
+ There are several official Central repositories geographically distributed.
You can make
changes to your settings.xml file to use one or more mirrors.
Instructions for this can be
found in the guide {{{../mini/guide-mirror-settings.html}Using Mirrors for
Repositories}}.
Modified: maven/site/trunk/src/site/apt/guides/mini/guide-configuring-maven.apt
URL:
http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/guides/mini/guide-configuring-maven.apt?rev=1028162r1=1028161r2=1028162view=diff
==
--- maven/site/trunk/src/site/apt/guides/mini/guide-configuring-maven.apt
(original)
+++ maven/site/trunk/src/site/apt/guides/mini/guide-configuring-maven.apt Thu
Oct 28 01:28:58 2010
@@ -105,39 +105,10 @@ export MAVEN_OPTS=-Dmaven.artifact.threa
Repositories can be declared inside a project, which means that if you have
your own custom repositories, those
sharing your project easily get the right settings out of the box. However,
you may want to use an alternative
- mirror for a particular repository without changing the project files.
-
- Some reasons to use a mirror are:
-
- * There is a synchronized mirror on the internet that is geographically
closer and faster
-
- * You want to replace a particular repository with your own internal
repository which you have greater control over
-
- * You want to run maven-proxy to provide a local cache to a mirror and need
to use its URL instead
-
- To configure a mirror of a given repository, you provide it in your settings
file, giving the new repository its own
- id and url, and specify the mirrorOf setting that is the
ID of the repository you are using a mirror
- of. For example, the id of the main Maven repository included by
default is central, so to use a Spanish
- mirror, you would configure the following:
-
--
-settings
- ...
- mirrors
- mirror
- idcica.es/id
- nameSpanish Mirror of http://repo1.maven.org/maven2//name
- urlhttp://ftp.cica.es/mirrors/maven2/url
- mirrorOfcentral/mirrorOf
-/mirror
svn commit: r1028163 - in /maven/enforcer/trunk/enforcer-rules: ./ src/it/ src/it/builds_a_pom_noop/ src/it/builds_a_pom_noop/module/ src/it/dependencies_converge/ src/it/dependencies_converge/module/
Author: brianf
Date: Thu Oct 28 01:30:16 2010
New Revision: 1028163
URL: http://svn.apache.org/viewvc?rev=1028163view=rev
Log:
MENFORCER-107 - dependencies_converge rule based on patch from Rex Hoffman
Added:
maven/enforcer/trunk/enforcer-rules/src/it/builds_a_pom_noop/
maven/enforcer/trunk/enforcer-rules/src/it/builds_a_pom_noop/module/
maven/enforcer/trunk/enforcer-rules/src/it/builds_a_pom_noop/module/pom.xml
(with props)
maven/enforcer/trunk/enforcer-rules/src/it/builds_a_pom_noop/pom.xml
(with props)
maven/enforcer/trunk/enforcer-rules/src/it/dependencies_converge/
maven/enforcer/trunk/enforcer-rules/src/it/dependencies_converge/module/
maven/enforcer/trunk/enforcer-rules/src/it/dependencies_converge/module/pom.xml
(with props)
maven/enforcer/trunk/enforcer-rules/src/it/dependencies_converge/pom.xml
(with props)
maven/enforcer/trunk/enforcer-rules/src/it/dependencies_not_converging/
maven/enforcer/trunk/enforcer-rules/src/it/dependencies_not_converging/invoker.properties
(with props)
maven/enforcer/trunk/enforcer-rules/src/it/dependencies_not_converging/module/
maven/enforcer/trunk/enforcer-rules/src/it/dependencies_not_converging/module/pom.xml
(with props)
maven/enforcer/trunk/enforcer-rules/src/it/dependencies_not_converging/pom.xml
(with props)
maven/enforcer/trunk/enforcer-rules/src/it/dependencies_not_converging_test_scope/
maven/enforcer/trunk/enforcer-rules/src/it/dependencies_not_converging_test_scope/invoker.properties
(with props)
maven/enforcer/trunk/enforcer-rules/src/it/dependencies_not_converging_test_scope/module/
maven/enforcer/trunk/enforcer-rules/src/it/dependencies_not_converging_test_scope/module/pom.xml
(with props)
maven/enforcer/trunk/enforcer-rules/src/it/dependencies_not_converging_test_scope/pom.xml
(with props)
maven/enforcer/trunk/enforcer-rules/src/it/settings.xml (with props)
maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/DependencyConvergence.java
(with props)
maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/utils/DependencyVersionMap.java
(with props)
maven/enforcer/trunk/enforcer-rules/src/site/apt/dependencyConvergence.apt.vm
(with props)
maven/enforcer/trunk/enforcer-rules/src/site/apt/rules/specific-dependencies-converge.apt
(with props)
Modified:
maven/enforcer/trunk/enforcer-rules/pom.xml
maven/enforcer/trunk/enforcer-rules/src/site/apt/index.apt
maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequirePluginVersions.java
Modified: maven/enforcer/trunk/enforcer-rules/pom.xml
URL:
http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/pom.xml?rev=1028163r1=1028162r2=1028163view=diff
==
--- maven/enforcer/trunk/enforcer-rules/pom.xml (original)
+++ maven/enforcer/trunk/enforcer-rules/pom.xml Thu Oct 28 01:30:16 2010
@@ -85,6 +85,16 @@
groupIdeasymock/groupId
artifactIdeasymock/artifactId
/dependency
+dependency
+ groupIdorg.apache.maven.shared/groupId
+ artifactIdmaven-dependency-tree/artifactId
+ version1.2/version
+/dependency
+dependency
+ groupIdorg.codehaus.plexus/groupId
+ artifactIdplexus-i18n/artifactId
+ version1.0-beta-6/version
+/dependency
/dependencies
build
@@ -111,6 +121,33 @@
/execution
/executions
/plugin
+ plugin
+artifactIdmaven-invoker-plugin/artifactId
+version1.5/version
+configuration
+ debugtrue/debug
+ projectsDirectorysrc/it/projectsDirectory
+ cloneProjectsTo${project.build.directory}/it/cloneProjectsTo
+ pomIncludes
+pomInclude*/pom.xml/pomInclude
+ /pomIncludes
+ postBuildHookScriptverify/postBuildHookScript
+
localRepositoryPath${project.build.directory}/local-repo/localRepositoryPath
+ settingsFilesrc/it/settings.xml/settingsFile
+ goals
+goalverify/goal
+ /goals
+/configuration
+executions
+ execution
+idintegration-test/id
+goals
+ goalinstall/goal
+ goalrun/goal
+/goals
+ /execution
+/executions
+ /plugin
!--plugin
groupIdorg.codehaus.mojo/groupId
artifactIdshitty-maven-plugin/artifactId
Added:
maven/enforcer/trunk/enforcer-rules/src/it/builds_a_pom_noop/module/pom.xml
URL:
http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/it/builds_a_pom_noop/module/pom.xml?rev=1028163view=auto
==
--- maven/enforcer/trunk/enforcer-rules/src/it/builds_a_pom_noop/module/pom.xml
(added)
+++ maven/enforcer/trunk/enforcer
svn commit: r1028164 - /maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/BannedDependencies.java
Author: brianf
Date: Thu Oct 28 01:40:06 2010
New Revision: 1028164
URL: http://svn.apache.org/viewvc?rev=1028164view=rev
Log:
MENFORCER-101
Modified:
maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/BannedDependencies.java
Modified:
maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/BannedDependencies.java
URL:
http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/BannedDependencies.java?rev=1028164r1=1028163r2=1028164view=diff
==
---
maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/BannedDependencies.java
(original)
+++
maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/BannedDependencies.java
Thu Oct 28 01:40:06 2010
@@ -163,7 +163,7 @@ public class BannedDependencies
{
result =
AbstractVersionEnforcer.containsVersion(
VersionRange.createFromVersionSpec( pattern[2] ),
- new
DefaultArtifactVersion( artifact.getVersion() ) );
+ new
DefaultArtifactVersion( artifact.getBaseVersion() ) );
}
catch ( InvalidVersionSpecificationException e )
{
svn commit: r1023822 - in /maven/repository-tools/trunk/src: bin-deprecated/ bin/ maven-key/ maven-key/README.apt maven-key/sample.conf mrmk/ mrsk/ site/
Author: brianf Date: Mon Oct 18 14:45:49 2010 New Revision: 1023822 URL: http://svn.apache.org/viewvc?rev=1023822view=rev Log: cleanup the old tools Added: maven/repository-tools/trunk/src/bin-deprecated/ - copied from r1023816, maven/repository-tools/trunk/src/bin/ maven/repository-tools/trunk/src/maven-key/ - copied from r819340, maven/repository-tools/trunk/src/mrsk/ Removed: maven/repository-tools/trunk/src/bin/ maven/repository-tools/trunk/src/maven-key/README.apt maven/repository-tools/trunk/src/maven-key/sample.conf maven/repository-tools/trunk/src/mrmk/ maven/repository-tools/trunk/src/mrsk/ maven/repository-tools/trunk/src/site/
svn commit: r1001740 - /maven/repository-tools/trunk/src/bin/synchronize/m2-sync/sync.csv
Author: brianf Date: Mon Sep 27 13:47:40 2010 New Revision: 1001740 URL: http://svn.apache.org/viewvc?rev=1001740view=rev Log: (empty) Modified: maven/repository-tools/trunk/src/bin/synchronize/m2-sync/sync.csv Modified: maven/repository-tools/trunk/src/bin/synchronize/m2-sync/sync.csv URL: http://svn.apache.org/viewvc/maven/repository-tools/trunk/src/bin/synchronize/m2-sync/sync.csv?rev=1001740r1=1001739r2=1001740view=diff == --- maven/repository-tools/trunk/src/bin/synchronize/m2-sync/sync.csv (original) +++ maven/repository-tools/trunk/src/bin/synchronize/m2-sync/sync.csv Mon Sep 27 13:47:40 2010 @@ -200,7 +200,6 @@ net.sourceforge.tink,mavens...@web.sourceforge.net:/home/groups/t/ti/tink/repository/release,rsync_ssh,Ivan Szkiba,szk...@users.sourceforge.net,, net.sourceforge.wicketwebbeans,mavens...@web.sourceforge.net:/home/groups/w/wi/wicketwebbeans/htdocs/repository,rsync_ssh,Dan Syrstad,dsyrs...@users.sourceforge.net,, net.sourceforge.wurfl,mavens...@dev.wurflpro.com:/home/nexus/sonatype-work/nexus/storage/public-releases,rsync_ssh,Filippo De Luca,filippo.del...@wurflpro.it,, -net.vidageek,maven_s...@vidageek.net:/home/maven_sync/maven.vidageek.net/,rsync_ssh,Jonas Abreu,jo...@vidageek.net,, no.tornado.brap,mavens...@brap.tornado.no:/home/brap/webapps/maven/repository,rsync_ssh,Edvin Syse,ed...@sysedata.no,, ognl,maven2.opensymphony.com:/opt/repository/maven2,rsync_ssh,Patrick Lightbody,pligh...@gmail.com,, opensymphony,maven2.opensymphony.com:/opt/repository/maven2,rsync_ssh,Patrick Lightbody,pligh...@gmail.com,, @@ -208,7 +207,6 @@ org.amplecode,mavens...@login.amplecode.org:/var/www/amplecode/maven2,rsync_ssh,Lars Helge Oeverland,larshe...@gmail.com,, org.antlr,mavens...@antlr.org:/home/mavensync/antlr-repo,rsync_ssh,Jim Idle,j...@temporal-wave.com,, org.apache,jvan...@people.apache.org:/www/people.apache.org/repo/m2-ibiblio-rsync-repository,rsync_ssh -org.aspectj,rs...@simonegianni.it:/home/mavenrsync/repo,rsync_ssh,Simone Gianni,simo...@apache.org,, org.asteriskjava,rsync://mavensync.reucon.com/opensource,rsync,Stefan Reuter,stefan.reu...@reucon.com,, org.bluestemsoftware,arch...@alakai.org:/var/archiva/data/repositories/internal,rsync_ssh,Todd Wolff,two...@bluestemsoftware.com,, org.bouncycastle,bcmavens...@access.bouncycastle.org:/home/users/bcmavensync/maven/maven2,rsync_ssh,David Hook,d...@bouncycastle.org,,
svn commit: r995105 - in /maven/site/trunk/src/site: apt/guides/mini/guide-central-repository-upload.apt resources/developers/release/ resources/developers/release/.htaccess xdoc/index.xml.vm
Author: brianf
Date: Wed Sep 8 15:45:10 2010
New Revision: 995105
URL: http://svn.apache.org/viewvc?rev=995105view=rev
Log:
update the front page to have links to Maven 3.x
Added:
maven/site/trunk/src/site/resources/developers/release/
maven/site/trunk/src/site/resources/developers/release/.htaccess (with
props)
Modified:
maven/site/trunk/src/site/apt/guides/mini/guide-central-repository-upload.apt
maven/site/trunk/src/site/xdoc/index.xml.vm
Modified:
maven/site/trunk/src/site/apt/guides/mini/guide-central-repository-upload.apt
URL:
http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/guides/mini/guide-central-repository-upload.apt?rev=995105r1=995104r2=995105view=diff
==
---
maven/site/trunk/src/site/apt/guides/mini/guide-central-repository-upload.apt
(original)
+++
maven/site/trunk/src/site/apt/guides/mini/guide-central-repository-upload.apt
Wed Sep 8 15:45:10 2010
@@ -20,56 +20,11 @@ Guide to uploading artifacts to the Cent
Only releases can be uploaded to the central repository, that means files
that won't change and that only depend on other files
already released and available in the repository.
- There are some requirements for the minimal information in the POMs that are
in the central repository. At least these must be present:
+ There are some requirements for the minimal information in the POMs that are
in the central repository. The updated list of requirements can be found
{{{https://docs.sonatype.org/display/Repository/Central+Sync+Requirements}here}}.
- * modelVersion
+{Choosing your coordinates}
- * groupId
-
- * artifactId
-
- * packaging
-
- * name
-
- * version
-
- * description
-
- * url
-
- * licenses
-
- * scm url
-
- * dependencies
-
- []
-
-* groupId
-
- The groupId will identify your project uniquely across all
- projects, so we need to enforce a naming schema. For projects with artifacts
already uploaded to the Central Repository it can
- be equal to the one used previously, but for new projects it has to follow
the package name rules, which
- means that has to be at least as a domain name you control, and you can
create as many subgroups
- as you want.
- There are a lot of poorly defined package names so you must provide proof
that you control the domain that
- matches the groupId. Provide proof means that the project is hosted at that
domain or it's owned by a member,
- in that case you must give the link to the registrar database (whois) where
the owner is listed and the page
- in the project web where the owner is associated with the project.
- eg. If you use a com.sun.xyz package name we expect that the project is
hosted at http://xyz.sun.com.
-
- Look at
{{{http://java.sun.com/docs/books/jls/third_edition/html/packages.html#7.7}
- More information about package names}}. Check also the guide about
- {{{./guide-naming-conventions.html}Maven naming conventions}}.
-
- Examples:
-
- * www.springframework.org - org.springframework
-
- * oness.sf.net - net.sf.oness
-
- []
+ Picking the appropriate coordinates for your project is important. See the
guidelines
{{{https://docs.sonatype.org/display/Repository/Choosing+your+Coordinates}here}}.
* Explanation
@@ -127,17 +82,17 @@ Guide to uploading artifacts to the Cent
When people download artifacts from Central Maven repository, they might want
to validate that these artifacts have valid PGP signatures that can be verified
against a public key server. If there is no signatures, then users have no
guarantee that they are downloading the original artifact.
- To improve the quality of the Central Maven repository, we require you to
provide PGP signatures for all your artifacts (all files except checksums), and
distribute your public key to a key server like hkp://pgp.mit.edu . If you are
not familiar with PGP, please read this blog:
{{{http://www.sonatype.com/people/2010/01/how-to-generate-pgp-signatures-with-maven/}How
to Generate PGP Signatures with Maven}}.
+ To improve the quality of the Central Maven repository, we require you to
provide PGP signatures for all your artifacts (all files except checksums), and
distribute your public key to a key server like hkp://pgp.mit.edu . Read
{{{https://docs.sonatype.org/display/Repository/How+To+Generate+PGP+Signatures+With+Maven}How
to Generate PGP Signatures with Maven}} for more information.
* FAQ and common mistakes
* I have other repositories or pluginRepositories listed in my
POM, is that a problem?
- Yes, the central repository must be self contained, which means that all your
dependencies must already be in the central repository.
- You need to remove the repositories and pluginRepositories
entries and make sure your project still builds when your local repository
cache is empty.
+ At present, this won't preclude your project from being included, but we do
strongly encourage making sure all your dependencies
svn commit: r979333 - in /maven/site/trunk/src/site: apt/developers/release/ resources/developers/
Author: brianf
Date: Mon Jul 26 16:01:33 2010
New Revision: 979333
URL: http://svn.apache.org/viewvc?rev=979333view=rev
Log:
updates to the site to leverage the new apache-wide maven docs
Added:
maven/site/trunk/src/site/apt/developers/release/maven-core-release.apt
- copied, changed from r978941,
maven/site/trunk/src/site/apt/developers/release/maven-proper-release.apt
maven/site/trunk/src/site/apt/developers/release/maven-project-release-proceedure.apt
- copied, changed from r978966,
maven/site/trunk/src/site/apt/developers/release/apache-release.apt
Removed:
maven/site/trunk/src/site/apt/developers/release/apache-release.apt
maven/site/trunk/src/site/apt/developers/release/maven-proper-release.apt
Modified:
maven/site/trunk/src/site/apt/developers/release/maven-plugin-release.apt
maven/site/trunk/src/site/apt/developers/release/maven-shared-release.apt
maven/site/trunk/src/site/apt/developers/release/pmc-gpg-keys.apt
maven/site/trunk/src/site/apt/developers/release/releasing.apt
maven/site/trunk/src/site/resources/developers/.htaccess
Copied: maven/site/trunk/src/site/apt/developers/release/maven-core-release.apt
(from r978941,
maven/site/trunk/src/site/apt/developers/release/maven-proper-release.apt)
URL:
http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/developers/release/maven-core-release.apt?p2=maven/site/trunk/src/site/apt/developers/release/maven-core-release.aptp1=maven/site/trunk/src/site/apt/developers/release/maven-proper-release.aptr1=978941r2=979333rev=979333view=diff
==
--- maven/site/trunk/src/site/apt/developers/release/maven-proper-release.apt
(original)
+++ maven/site/trunk/src/site/apt/developers/release/maven-core-release.apt Mon
Jul 26 16:01:33 2010
@@ -35,7 +35,7 @@ Releasing Maven
To produce a release candidate, follow the first seven steps only from the
following
procedure:
-* {{{apache-release.html} Releasing a Maven-based project at Apache}}
+* {{{maven-project-release-proceedure.html} Maven Project Common Release
Proceedure}}
The version used should be the eventual version with -RC1, -RC2, etc.
appended.
@@ -52,7 +52,7 @@ Releasing Maven
To produce a final release, the same process as for standard projects is
followed:
-* {{{apache-release.html} Releasing a Maven-based project at Apache}}
+* {{{maven-project-release-proceedure.html} Maven Project Common Release
Proceedure}}
Below describes the additional steps that need to be taken at the points
where the website are updated
in those instructions.
@@ -143,5 +143,5 @@ mvn -Preporting clean site-deploy
** Proceed with Announcement
You can now proceed with the steps outlined after deploying the website on
- {{{apache-release.html} Releasing a Maven-based project at Apache}}
+ {{{maven-project-release-proceedure.html} Maven Project Common Release
Proceedure}}
Modified:
maven/site/trunk/src/site/apt/developers/release/maven-plugin-release.apt
URL:
http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/developers/release/maven-plugin-release.apt?rev=979333r1=979332r2=979333view=diff
==
--- maven/site/trunk/src/site/apt/developers/release/maven-plugin-release.apt
(original)
+++ maven/site/trunk/src/site/apt/developers/release/maven-plugin-release.apt
Mon Jul 26 16:01:33 2010
@@ -28,7 +28,7 @@ Releasing A Maven Plugin
Releasing a Maven plugin is much the same as any other Maven project. The
following
guide walks through most of the steps:
-* {{{apache-release.html} Releasing a Maven-based project at Apache}}
+* {{{maven-project-release-proceedure.html} Maven Project Common Release
Proceedure}}
Note that plugins have particular conventions for deploying the project site.
When encountered in the release process above, perform the following steps:
Copied:
maven/site/trunk/src/site/apt/developers/release/maven-project-release-proceedure.apt
(from r978966,
maven/site/trunk/src/site/apt/developers/release/apache-release.apt)
URL:
http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/developers/release/maven-project-release-proceedure.apt?p2=maven/site/trunk/src/site/apt/developers/release/maven-project-release-proceedure.aptp1=maven/site/trunk/src/site/apt/developers/release/apache-release.aptr1=978966r2=979333rev=979333view=diff
==
--- maven/site/trunk/src/site/apt/developers/release/apache-release.apt
(original)
+++
maven/site/trunk/src/site/apt/developers/release/maven-project-release-proceedure.apt
Mon Jul 26 16:01:33 2010
@@ -23,9 +23,9 @@
~~ specific language governing permissions and limitations
~~ under the License.
-Releasing a Maven-based project at Apache
+Performing a Maven Project Release
- All Maven-based projects
svn commit: r979373 - in /maven/site/trunk/src/site/apt/developers/release: maven-plugin-release.apt maven-project-release-procedure.apt maven-project-release-proceedure.apt maven-shared-release.apt r
Author: brianf
Date: Mon Jul 26 17:31:25 2010
New Revision: 979373
URL: http://svn.apache.org/viewvc?rev=979373view=rev
Log: (empty)
Added:
maven/site/trunk/src/site/apt/developers/release/maven-project-release-procedure.apt
- copied, changed from r979333,
maven/site/trunk/src/site/apt/developers/release/maven-project-release-proceedure.apt
Removed:
maven/site/trunk/src/site/apt/developers/release/maven-project-release-proceedure.apt
Modified:
maven/site/trunk/src/site/apt/developers/release/maven-plugin-release.apt
maven/site/trunk/src/site/apt/developers/release/maven-shared-release.apt
maven/site/trunk/src/site/apt/developers/release/releasing.apt
Modified:
maven/site/trunk/src/site/apt/developers/release/maven-plugin-release.apt
URL:
http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/developers/release/maven-plugin-release.apt?rev=979373r1=979372r2=979373view=diff
==
--- maven/site/trunk/src/site/apt/developers/release/maven-plugin-release.apt
(original)
+++ maven/site/trunk/src/site/apt/developers/release/maven-plugin-release.apt
Mon Jul 26 17:31:25 2010
@@ -28,7 +28,7 @@ Releasing A Maven Plugin
Releasing a Maven plugin is much the same as any other Maven project. The
following
guide walks through most of the steps:
-* {{{maven-project-release-proceedure.html} Maven Project Common Release
Proceedure}}
+* {{{maven-project-release-procedure.html} Maven Project Common Release
procedure}}
Note that plugins have particular conventions for deploying the project site.
When encountered in the release process above, perform the following steps:
Copied:
maven/site/trunk/src/site/apt/developers/release/maven-project-release-procedure.apt
(from r979333,
maven/site/trunk/src/site/apt/developers/release/maven-project-release-proceedure.apt)
URL:
http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/developers/release/maven-project-release-procedure.apt?p2=maven/site/trunk/src/site/apt/developers/release/maven-project-release-procedure.aptp1=maven/site/trunk/src/site/apt/developers/release/maven-project-release-proceedure.aptr1=979333r2=979373rev=979373view=diff
==
---
maven/site/trunk/src/site/apt/developers/release/maven-project-release-proceedure.apt
(original)
+++
maven/site/trunk/src/site/apt/developers/release/maven-project-release-procedure.apt
Mon Jul 26 17:31:25 2010
@@ -25,7 +25,7 @@
Performing a Maven Project Release
- This document covers the common release proceedures used by the Maven team
to perform releases.
+ This document covers the common release procedures used by the Maven team to
perform releases.
* {Prerequisites}
Modified:
maven/site/trunk/src/site/apt/developers/release/maven-shared-release.apt
URL:
http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/developers/release/maven-shared-release.apt?rev=979373r1=979372r2=979373view=diff
==
--- maven/site/trunk/src/site/apt/developers/release/maven-shared-release.apt
(original)
+++ maven/site/trunk/src/site/apt/developers/release/maven-shared-release.apt
Mon Jul 26 17:31:25 2010
@@ -28,7 +28,7 @@ Releasing A Maven Shared Component
Releasing a Maven component is much the same as any other Maven project. The
following
guide walks through most of the steps:
-* {{{maven-project-release-proceedure.html} Maven Project Common Release
Proceedure}}
+* {{{maven-project-release-procedure.html} Maven Project Common Release
procedure}}
Note that components have particular conventions for deploying the project
site.
When encountered in the release process above, perform the following steps:
Modified: maven/site/trunk/src/site/apt/developers/release/releasing.apt
URL:
http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/developers/release/releasing.apt?rev=979373r1=979372r2=979373view=diff
==
--- maven/site/trunk/src/site/apt/developers/release/releasing.apt (original)
+++ maven/site/trunk/src/site/apt/developers/release/releasing.apt Mon Jul 26
17:31:25 2010
@@ -39,6 +39,6 @@ Releasing A Maven Project
The above links all provide specific information for those types of
releases, but they all refer back to the common documentation:
- * {{{maven-project-release-proceedure.html} Maven Project Common Release
Proceedure}}
+ * {{{maven-project-release-procedure.html} Maven Project Common Release
procedure}}
[]
svn commit: r978942 - /maven/pom/trunk/maven/pom.xml
Author: brianf Date: Sat Jul 24 23:06:50 2010 New Revision: 978942 URL: http://svn.apache.org/viewvc?rev=978942view=rev Log: update developer/emeritus list Modified: maven/pom/trunk/maven/pom.xml Modified: maven/pom/trunk/maven/pom.xml URL: http://svn.apache.org/viewvc/maven/pom/trunk/maven/pom.xml?rev=978942r1=978941r2=978942view=diff == --- maven/pom/trunk/maven/pom.xml (original) +++ maven/pom/trunk/maven/pom.xml Sat Jul 24 23:06:50 2010 @@ -240,16 +240,6 @@ under the License. timezone+1/timezone /developer developer - idtrygvis/id - nameTrygve Laugstol/name - emailtryg...@apache.org/email - organizationASF/organization - roles -rolePMC Member/role - /roles - timezone+1/timezone -/developer -developer idvmassol/id nameVincent Massol/name emailvmas...@apache.org/email @@ -281,15 +271,11 @@ under the License. !--Committers-- developer - idaramirez/id - nameAllan Q. Ramirez/name - roles -roleCommitter/role - /roles -/developer -developer - idbayard/id - nameHenri Yandell/name + idbdemers/id + nameBrian Demers/name + organizationSonatype/organization + emailbdem...@apache.org/email + timezone-5/timezone roles roleCommitter/role /roles @@ -302,8 +288,11 @@ under the License. /roles /developer developer - idchrisjs/id - nameChris Stevenson/name + idcstamas/id + nameTamas Cservanak/name + organizationSonatype/organization + emailcsta...@apache.org/email + timezone+1/timezone roles roleCommitter/role /roles @@ -316,28 +305,15 @@ under the License. /roles /developer developer - iddblevins/id - nameDavid Blevins/name + iddbradicich/id + nameDamian Bradicich/name + organizationSonatype/organization + emaildbradic...@apache.org/email + timezone-5/timezone roles roleCommitter/role /roles -/developer -developer - iddlr/id - nameDaniel Rall/name - roles -roleCommitter/role - /roles -/developer -developer - idepunzalan/id - nameEdwin Punzalan/name - emailepunza...@apache.org/email - roles -roleCommitter/role - /roles - timezone-8/timezone -/developer +/developer developer idifedorenko/id nameIgor Fedorenko/name @@ -359,13 +335,6 @@ under the License. timezone+1/timezone /developer developer - idfelipeal/id - nameFelipe Leme/name - roles -roleCommitter/role - /roles -/developer -developer idhandyande/id nameAndrew Williams/name emailhandya...@apache.org/email @@ -391,78 +360,75 @@ under the License. timezone+1/timezone /developer developer - idogusakov/id - nameOleg Gusakov/name + idrafale/id + nameRaphaël Piéroni/name + emailraf...@apache.org/email + organizationDexem/organization roles roleCommitter/role /roles + timezone+1/timezone /developer developer - idpschneider/id - namePatrick Schneider/name - emailpschnei...@gmail.com/email + idstephenc/id + nameStephen Connolly/name + emailsteph...@apache.org/email roles roleCommitter/role /roles - timezone-6/timezone + timezone0/timezone /developer +!--End Committers-- developer - idptahchiev/id - namePetar Tahchiev/name - emailptahch...@apache.org/email + idaramirez/id + nameAllan Q. Ramirez/name roles -roleCommitter/role +roleEmeritus/role /roles - timezone+2/timezone /developer developer - idrafale/id - nameRaphaël Piéroni/name - emailraf...@apache.org/email - organizationDexem/organization + idbayard/id + nameHenri Yandell/name roles -roleCommitter/role +roleEmeritus/role /roles - timezone+1/timezone /developer -developer - idrinku/id - nameRahul Thakur/name + developer + idchrisjs/id + nameChris Stevenson/name roles -roleCommitter/role +roleEmeritus/role /roles /developer developer - idshinobu/id - nameShinobu Kuwai/name + iddblevins/id + nameDavid Blevins/name roles -roleCommitter/role +roleEmeritus/role /roles /developer developer - idsmorgrav/id - nameTorbjorn Eikli Smorgrav/name + iddlr/id + nameDaniel Rall/name roles -roleCommitter/role +roleEmeritus/role /roles /developer developer - idstephenc/id - nameStephen Connolly/name
svn commit: r978943 - /maven/site/trunk/pom.xml
Author: brianf Date: Sat Jul 24 23:07:23 2010 New Revision: 978943 URL: http://svn.apache.org/viewvc?rev=978943view=rev Log: latest parent Modified: maven/site/trunk/pom.xml Modified: maven/site/trunk/pom.xml URL: http://svn.apache.org/viewvc/maven/site/trunk/pom.xml?rev=978943r1=978942r2=978943view=diff == --- maven/site/trunk/pom.xml (original) +++ maven/site/trunk/pom.xml Sat Jul 24 23:07:23 2010 @@ -23,7 +23,7 @@ parent groupIdorg.apache.maven/groupId artifactIdmaven-parent/artifactId -version16/version +version17-SNAPSHOT/version relativePath../pom/maven/pom.xml/relativePath /parent
svn commit: r978966 - /maven/site/trunk/src/site/apt/developers/release/apache-release.apt
Author: brianf
Date: Sun Jul 25 02:22:48 2010
New Revision: 978966
URL: http://svn.apache.org/viewvc?rev=978966view=rev
Log:
intermediate update to refer to the new apache centric docs. This page is now
Maven specific and will be merged with the others.
Modified:
maven/site/trunk/src/site/apt/developers/release/apache-release.apt
Modified: maven/site/trunk/src/site/apt/developers/release/apache-release.apt
URL:
http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/developers/release/apache-release.apt?rev=978966r1=978965r2=978966view=diff
==
--- maven/site/trunk/src/site/apt/developers/release/apache-release.apt
(original)
+++ maven/site/trunk/src/site/apt/developers/release/apache-release.apt Sun Jul
25 02:22:48 2010
@@ -3,7 +3,7 @@
-
Jason van Zyl
-
- 2009-03-22
+ 2010-7-25
-
~~ Licensed to the Apache Software Foundation (ASF) under one
@@ -31,156 +31,31 @@ Releasing a Maven-based project at Apach
Be sure that:
- * you have all Maven servers defined in your settings.xml. For more
information, please refer to
- {{{../committer-settings.html}Committer settings}}.
-
- * you have created your GPG keys. For more information, please refer to
{{{./pmc-gpg-keys.html}Making GPG Keys}}.
-
- * you have a GPG client installed and on your shell's path. See
{{{http://www.gnupg.org/}http://www.gnupg.org/}}.
-
* you have a Subversion 1.5+ client installed and on your shell's path. See
{{{http://subversion.tigris.org/}http://subversion.tigris.org/}}.
* you have JDK 5 installed and on your shell's path.
* if you receive an OutOfMemoryError during the build, make sure to have set
the environment variable MAVEN_OPTS=-Xmx512m
- * you must use Maven 2.2.1, as Maven 2.0.x cannot deploy over SCP to the
ASF, and Maven 2.1.0 and 2.2.0 produce
-incorrect GPG signatures and checksums respectively.
+ * you must use Maven 2.2.1+, as Maven 2.1.0 and 2.2.0 produce incorrect GPG
signatures and checksums respectively.
+
+ * follow the environment configuration steps outlined at:
{{{http://www.apache.org/dev/publishing-maven-artifacts.html#dev-env}Publishing
Maven Artifacts}}.
[]
- Formerly, a release profile was required in the
$\{user.home\}/.m2/settings.xml to define the staging
- repository. As of inheritance from the Apache parent POM version 5, a
repository manager will automatically handle
- staging (see below for details). Hence, configuration of
deploy.altRepository is no longer necessary and
- should be removed from your existing release profile.
-
- Here's what your release profile might look like in your
$\{user.home\}/.m2/settings.xml:
-
-+-+
-settings
- ...
- profiles
-profile
- idapache-release/id
- properties
-gpg.passphrase !-- YOUR KEY PASSPHRASE -- /gpg.passphrase
- /properties
-/profile
- /profiles
- ...
-/settings
-+-+
-
- Everything that you need to release has been configured in the POM all ASF
projects should inherit from. The release plugin configuration being used is
the following:
-
-%{snippet|id=release-plugin-configuration|url=http://svn.apache.org/repos/asf/maven/pom/trunk/asf/pom.xml}
-
- And the profile being used for releases is the following:
-
-%{snippet|id=release-profile|url=http://svn.apache.org/repos/asf/maven/pom/trunk/asf/pom.xml}
-
-* Before Release
-
- [[1]] Prepare your POMs for release:
-
- [[a]] Make sure there are no snapshots in the POMs to be released.
-
- [[b]] Check that your POMs will not lose content when they are rewritten
- during the release process.
+* Stage the Release
- * Verify that all pom.xml files have an SCM definition.
+ [[1]] Follow the release preparation, staging and closing the repository
steps outlined in
{{{http://www.apache.org/dev/publishing-maven-artifacts.html#stage-maven}Staging
a Maven release}}.
- * mvn release:prepare -DdryRun=true
-
- * Diff the original file pom.xml with the one called
- pom.xml.tag to see if the license or any other info has been
- removed. This has been known to happen if the starting
- \project\ tag is not on a single line.
- The only things that should be different between these files are the
- \version\ and \scm\ elements. Any other changes, you
- must backport yourself to the original pom.xml file and commit
- before proceeding with the release.
-
- []
-
- [[2]] Publish a snapshot:
-
-+-+
-mvn deploy
-...
-[INFO] [deploy:deploy]
-[INFO] Retrieving previous build number from apache.snapshots.https
-...
-+-+
-
- If you experience an error during deployment like a HTTP 401 check your
settings for the required server entries
- as outlined in the {{{Prerequisites}Prerequisites}}.
-
- Note: Be sure that the generated artifacts respect the
- {{{http://www.apache.org/dev/release.html#distribute-raw-artifact}Apache
release rules}}: NOTICE
svn commit: r965318 - /maven/pom/trunk/maven/pom.xml
Author: brianf Date: Sun Jul 18 23:24:32 2010 New Revision: 965318 URL: http://svn.apache.org/viewvc?rev=965318view=rev Log: (empty) Modified: maven/pom/trunk/maven/pom.xml Modified: maven/pom/trunk/maven/pom.xml URL: http://svn.apache.org/viewvc/maven/pom/trunk/maven/pom.xml?rev=965318r1=965317r2=965318view=diff == --- maven/pom/trunk/maven/pom.xml (original) +++ maven/pom/trunk/maven/pom.xml Sun Jul 18 23:24:32 2010 @@ -156,16 +156,6 @@ under the License. timezone-5/timezone /developer developer - idjmcconnell/id - nameJesse McConnell/name - emailjmcconn...@apache.org/email - organizationASF/organization - roles -rolePMC Member/role - /roles - timezone-6/timezone -/developer -developer idjvanzyl/id nameJason van Zyl/name emailja...@maven.org/email @@ -474,7 +464,17 @@ under the License. /roles timezone0/timezone /developer - developer +developer + idjmcconnell/id + nameJesse McConnell/name + emailjmcconn...@apache.org/email + organizationASF/organization + roles +roleEmeritus/role + /roles + timezone-6/timezone +/developer +developer idjoakime/id nameJoakim Erdfelt/name emailjoak...@apache.org/email
[repository.apache.org] releases
Repository changed == Repository: /export/home/nexus/nexus-professional/sonatype-work/nexus/storage/releases Added - [nexus] /org/apache/maven/jxr/jxr/2.2 [nexus] /org/apache/maven/jxr/jxr/2.2/jxr-2.2-source-release.zip.md5 [nexus] /org/apache/maven/jxr/jxr/2.2/jxr-2.2-source-release.zip.asc [nexus] /org/apache/maven/jxr/jxr/2.2/jxr-2.2.pom.asc [nexus] /org/apache/maven/jxr/jxr/2.2/jxr-2.2-source-release.zip.asc.md5 [nexus] /org/apache/maven/jxr/jxr/2.2/jxr-2.2.pom.md5 [nexus] /org/apache/maven/jxr/jxr/2.2/jxr-2.2-source-release.zip [nexus] /org/apache/maven/jxr/jxr/2.2/jxr-2.2.pom.asc.md5 [nexus] /org/apache/maven/jxr/jxr/2.2/jxr-2.2.pom.sha1 [nexus] /org/apache/maven/jxr/jxr/2.2/jxr-2.2.pom.asc.sha1 [nexus] /org/apache/maven/jxr/jxr/2.2/jxr-2.2-source-release.zip.asc.sha1 [nexus] /org/apache/maven/jxr/jxr/2.2/jxr-2.2.pom [nexus] /org/apache/maven/jxr/jxr/2.2/jxr-2.2-source-release.zip.sha1 [nexus] /org/apache/maven/maven-jxr/2.2 [nexus] /org/apache/maven/maven-jxr/2.2/maven-jxr-2.2-sources.jar.asc [nexus] /org/apache/maven/maven-jxr/2.2/maven-jxr-2.2-sources.jar.sha1 [nexus] /org/apache/maven/maven-jxr/2.2/maven-jxr-2.2-sources.jar.md5 [nexus] /org/apache/maven/maven-jxr/2.2/maven-jxr-2.2.jar.sha1 [nexus] /org/apache/maven/maven-jxr/2.2/maven-jxr-2.2-javadoc.jar.md5 [nexus] /org/apache/maven/maven-jxr/2.2/maven-jxr-2.2-sources.jar.asc.sha1 [nexus] /org/apache/maven/maven-jxr/2.2/maven-jxr-2.2.jar.asc.md5 [nexus] /org/apache/maven/maven-jxr/2.2/maven-jxr-2.2-javadoc.jar.asc [nexus] /org/apache/maven/maven-jxr/2.2/maven-jxr-2.2-javadoc.jar [nexus] /org/apache/maven/maven-jxr/2.2/maven-jxr-2.2.pom.asc.md5 [nexus] /org/apache/maven/maven-jxr/2.2/maven-jxr-2.2-sources.jar.asc.md5 [nexus] /org/apache/maven/maven-jxr/2.2/maven-jxr-2.2.pom.asc [nexus] /org/apache/maven/maven-jxr/2.2/maven-jxr-2.2.pom.sha1 [nexus] /org/apache/maven/maven-jxr/2.2/maven-jxr-2.2-javadoc.jar.asc.sha1 [nexus] /org/apache/maven/maven-jxr/2.2/maven-jxr-2.2-sources.jar [nexus] /org/apache/maven/maven-jxr/2.2/maven-jxr-2.2.pom.md5 [nexus] /org/apache/maven/maven-jxr/2.2/maven-jxr-2.2-javadoc.jar.sha1 [nexus] /org/apache/maven/maven-jxr/2.2/maven-jxr-2.2.pom.asc.sha1 [nexus] /org/apache/maven/maven-jxr/2.2/maven-jxr-2.2-javadoc.jar.asc.md5 [nexus] /org/apache/maven/maven-jxr/2.2/maven-jxr-2.2.jar.md5 [nexus] /org/apache/maven/maven-jxr/2.2/maven-jxr-2.2.jar [nexus] /org/apache/maven/maven-jxr/2.2/maven-jxr-2.2.pom [nexus] /org/apache/maven/maven-jxr/2.2/maven-jxr-2.2.jar.asc [nexus] /org/apache/maven/maven-jxr/2.2/maven-jxr-2.2.jar.asc.sha1 [nexus] /org/apache/maven/plugins/maven-jxr-plugin/2.2 [nexus] /org/apache/maven/plugins/maven-jxr-plugin/2.2/maven-jxr-plugin-2.2.jar.asc.md5 [nexus] /org/apache/maven/plugins/maven-jxr-plugin/2.2/maven-jxr-plugin-2.2-sources.jar.sha1 [nexus] /org/apache/maven/plugins/maven-jxr-plugin/2.2/maven-jxr-plugin-2.2.jar [nexus] /org/apache/maven/plugins/maven-jxr-plugin/2.2/maven-jxr-plugin-2.2.pom [nexus] /org/apache/maven/plugins/maven-jxr-plugin/2.2/maven-jxr-plugin-2.2-sources.jar.asc.md5 [nexus] /org/apache/maven/plugins/maven-jxr-plugin/2.2/maven-jxr-plugin-2.2.jar.sha1 [nexus] /org/apache/maven/plugins/maven-jxr-plugin/2.2/maven-jxr-plugin-2.2-sources.jar.asc.sha1 [nexus] /org/apache/maven/plugins/maven-jxr-plugin/2.2/maven-jxr-plugin-2.2-javadoc.jar [nexus] /org/apache/maven/plugins/maven-jxr-plugin/2.2/maven-jxr-plugin-2.2.pom.asc.md5 [nexus] /org/apache/maven/plugins/maven-jxr-plugin/2.2/maven-jxr-plugin-2.2.pom.asc.sha1 [nexus] /org/apache/maven/plugins/maven-jxr-plugin/2.2/maven-jxr-plugin-2.2-javadoc.jar.asc.md5 [nexus] /org/apache/maven/plugins/maven-jxr-plugin/2.2/maven-jxr-plugin-2.2.jar.asc.sha1 [nexus] /org/apache/maven/plugins/maven-jxr-plugin/2.2/maven-jxr-plugin-2.2.jar.md5 [nexus] /org/apache/maven/plugins/maven-jxr-plugin/2.2/maven-jxr-plugin-2.2-sources.jar.md5 [nexus] /org/apache/maven/plugins/maven-jxr-plugin/2.2/maven-jxr-plugin-2.2-sources.jar.asc [nexus] /org/apache/maven/plugins/maven-jxr-plugin/2.2/maven-jxr-plugin-2.2.jar.asc [nexus] /org/apache/maven/plugins/maven-jxr-plugin/2.2/maven-jxr-plugin-2.2.pom.sha1 [nexus] /org/apache/maven/plugins/maven-jxr-plugin/2.2/maven-jxr-plugin-2.2-javadoc.jar.asc [nexus] /org/apache/maven/plugins/maven-jxr-plugin/2.2/maven-jxr-plugin-2.2.pom.asc [nexus] /org/apache/maven/plugins/maven-jxr-plugin/2.2/maven-jxr-plugin-2.2-javadoc.jar.asc.sha1 [nexus] /org/apache/maven/plugins/maven-jxr-plugin/2.2/maven-jxr-plugin-2.2.pom.md5 [nexus] /org/apache/maven/plugins/maven-jxr-plugin/2.2/maven-jxr-plugin-2.2-javadoc.jar.sha1 [nexus] /org/apache/maven/plugins/maven-jxr-plugin/2.2/maven-jxr-plugin-2.2-javadoc.jar.md5 [nexus] /org/apache/maven/plugins/maven-jxr-plugin/2.2/maven-jxr-plugin-2.2-sources.jar [nexus] /org/apache/jackrabbit/jackrabbit-jcr2spi/1.6.2 [nexus] /org/apache/jackrabbit/jackrabbit-jcr2spi/1.6.2/jackrabbit-jcr2spi-1.6.2-tests.jar [nexus]
[repository.apache.org] releases
Repository changed == Repository: /export/home/nexus/nexus-professional/sonatype-work/nexus/storage/releases Added - [nexus] /org/apache/maven/plugins/maven-site-plugin/2.1.1 [nexus] /org/apache/maven/plugins/maven-site-plugin/2.1.1/maven-site-plugin-2.1.1-sources.jar.asc.md5 [nexus] /org/apache/maven/plugins/maven-site-plugin/2.1.1/maven-site-plugin-2.1.1-source-release.zip.asc [nexus] /org/apache/maven/plugins/maven-site-plugin/2.1.1/maven-site-plugin-2.1.1-source-release.zip.md5 [nexus] /org/apache/maven/plugins/maven-site-plugin/2.1.1/maven-site-plugin-2.1.1-sources.jar [nexus] /org/apache/maven/plugins/maven-site-plugin/2.1.1/maven-site-plugin-2.1.1.jar.asc [nexus] /org/apache/maven/plugins/maven-site-plugin/2.1.1/maven-site-plugin-2.1.1.jar.md5 [nexus] /org/apache/maven/plugins/maven-site-plugin/2.1.1/maven-site-plugin-2.1.1-javadoc.jar.asc.md5 [nexus] /org/apache/maven/plugins/maven-site-plugin/2.1.1/maven-site-plugin-2.1.1-source-release.zip.asc.sha1 [nexus] /org/apache/maven/plugins/maven-site-plugin/2.1.1/maven-site-plugin-2.1.1.jar.asc.sha1 [nexus] /org/apache/maven/plugins/maven-site-plugin/2.1.1/maven-site-plugin-2.1.1-source-release.zip.sha1 [nexus] /org/apache/maven/plugins/maven-site-plugin/2.1.1/maven-site-plugin-2.1.1-sources.jar.sha1 [nexus] /org/apache/maven/plugins/maven-site-plugin/2.1.1/maven-site-plugin-2.1.1.jar.sha1 [nexus] /org/apache/maven/plugins/maven-site-plugin/2.1.1/maven-site-plugin-2.1.1.pom.md5 [nexus] /org/apache/maven/plugins/maven-site-plugin/2.1.1/maven-site-plugin-2.1.1-sources.jar.asc.sha1 [nexus] /org/apache/maven/plugins/maven-site-plugin/2.1.1/maven-site-plugin-2.1.1.pom.asc.sha1 [nexus] /org/apache/maven/plugins/maven-site-plugin/2.1.1/maven-site-plugin-2.1.1-source-release.zip [nexus] /org/apache/maven/plugins/maven-site-plugin/2.1.1/maven-site-plugin-2.1.1.pom [nexus] /org/apache/maven/plugins/maven-site-plugin/2.1.1/maven-site-plugin-2.1.1.jar [nexus] /org/apache/maven/plugins/maven-site-plugin/2.1.1/maven-site-plugin-2.1.1.pom.asc [nexus] /org/apache/maven/plugins/maven-site-plugin/2.1.1/maven-site-plugin-2.1.1-source-release.zip.asc.md5 [nexus] /org/apache/maven/plugins/maven-site-plugin/2.1.1/maven-site-plugin-2.1.1-javadoc.jar.sha1 [nexus] /org/apache/maven/plugins/maven-site-plugin/2.1.1/maven-site-plugin-2.1.1-javadoc.jar.asc.sha1 [nexus] /org/apache/maven/plugins/maven-site-plugin/2.1.1/maven-site-plugin-2.1.1-sources.jar.md5 [nexus] /org/apache/maven/plugins/maven-site-plugin/2.1.1/maven-site-plugin-2.1.1-sources.jar.asc [nexus] /org/apache/maven/plugins/maven-site-plugin/2.1.1/maven-site-plugin-2.1.1.pom.asc.md5 [nexus] /org/apache/maven/plugins/maven-site-plugin/2.1.1/maven-site-plugin-2.1.1-javadoc.jar [nexus] /org/apache/maven/plugins/maven-site-plugin/2.1.1/maven-site-plugin-2.1.1-javadoc.jar.asc [nexus] /org/apache/maven/plugins/maven-site-plugin/2.1.1/maven-site-plugin-2.1.1.pom.sha1 [nexus] /org/apache/maven/plugins/maven-site-plugin/2.1.1/maven-site-plugin-2.1.1.jar.asc.md5 [nexus] /org/apache/maven/plugins/maven-site-plugin/2.1.1/maven-site-plugin-2.1.1-javadoc.jar.md5 Removed ---
[repository.apache.org] releases
Repository changed == Repository: /export/home/nexus/nexus-professional/sonatype-work/nexus/storage/releases Added - [nexus] /org/apache/maven/plugins/maven-gpg-plugin/1.1 [nexus] /org/apache/maven/plugins/maven-gpg-plugin/1.1/maven-gpg-plugin-1.1-javadoc.jar.asc.sha1 [nexus] /org/apache/maven/plugins/maven-gpg-plugin/1.1/maven-gpg-plugin-1.1.jar.asc [nexus] /org/apache/maven/plugins/maven-gpg-plugin/1.1/maven-gpg-plugin-1.1.jar.md5 [nexus] /org/apache/maven/plugins/maven-gpg-plugin/1.1/maven-gpg-plugin-1.1-source-release.zip.asc.md5 [nexus] /org/apache/maven/plugins/maven-gpg-plugin/1.1/maven-gpg-plugin-1.1-sources.jar.asc.md5 [nexus] /org/apache/maven/plugins/maven-gpg-plugin/1.1/maven-gpg-plugin-1.1-source-release.zip.sha1 [nexus] /org/apache/maven/plugins/maven-gpg-plugin/1.1/maven-gpg-plugin-1.1-source-release.zip [nexus] /org/apache/maven/plugins/maven-gpg-plugin/1.1/maven-gpg-plugin-1.1-sources.jar.sha1 [nexus] /org/apache/maven/plugins/maven-gpg-plugin/1.1/maven-gpg-plugin-1.1.pom.asc.md5 [nexus] /org/apache/maven/plugins/maven-gpg-plugin/1.1/maven-gpg-plugin-1.1.pom.md5 [nexus] /org/apache/maven/plugins/maven-gpg-plugin/1.1/maven-gpg-plugin-1.1.jar.sha1 [nexus] /org/apache/maven/plugins/maven-gpg-plugin/1.1/maven-gpg-plugin-1.1-javadoc.jar [nexus] /org/apache/maven/plugins/maven-gpg-plugin/1.1/maven-gpg-plugin-1.1.pom.asc [nexus] /org/apache/maven/plugins/maven-gpg-plugin/1.1/maven-gpg-plugin-1.1-source-release.zip.asc.sha1 [nexus] /org/apache/maven/plugins/maven-gpg-plugin/1.1/maven-gpg-plugin-1.1-javadoc.jar.asc.md5 [nexus] /org/apache/maven/plugins/maven-gpg-plugin/1.1/maven-gpg-plugin-1.1.jar.asc.md5 [nexus] /org/apache/maven/plugins/maven-gpg-plugin/1.1/maven-gpg-plugin-1.1-source-release.zip.asc [nexus] /org/apache/maven/plugins/maven-gpg-plugin/1.1/maven-gpg-plugin-1.1-javadoc.jar.sha1 [nexus] /org/apache/maven/plugins/maven-gpg-plugin/1.1/maven-gpg-plugin-1.1-source-release.zip.md5 [nexus] /org/apache/maven/plugins/maven-gpg-plugin/1.1/maven-gpg-plugin-1.1-sources.jar [nexus] /org/apache/maven/plugins/maven-gpg-plugin/1.1/maven-gpg-plugin-1.1-sources.jar.asc [nexus] /org/apache/maven/plugins/maven-gpg-plugin/1.1/maven-gpg-plugin-1.1-sources.jar.md5 [nexus] /org/apache/maven/plugins/maven-gpg-plugin/1.1/maven-gpg-plugin-1.1.pom [nexus] /org/apache/maven/plugins/maven-gpg-plugin/1.1/maven-gpg-plugin-1.1.jar [nexus] /org/apache/maven/plugins/maven-gpg-plugin/1.1/maven-gpg-plugin-1.1.jar.asc.sha1 [nexus] /org/apache/maven/plugins/maven-gpg-plugin/1.1/maven-gpg-plugin-1.1.pom.sha1 [nexus] /org/apache/maven/plugins/maven-gpg-plugin/1.1/maven-gpg-plugin-1.1.pom.asc.sha1 [nexus] /org/apache/maven/plugins/maven-gpg-plugin/1.1/maven-gpg-plugin-1.1-javadoc.jar.md5 [nexus] /org/apache/maven/plugins/maven-gpg-plugin/1.1/maven-gpg-plugin-1.1-javadoc.jar.asc [nexus] /org/apache/maven/plugins/maven-gpg-plugin/1.1/maven-gpg-plugin-1.1-sources.jar.asc.sha1 Removed ---
[repository.apache.org] releases
Repository changed == Repository: /export/home/nexus/nexus-professional/sonatype-work/nexus/storage/releases Added - [nexus] /org/apache/maven/shared/maven-doxia-tools/1.2.1 [nexus] /org/apache/maven/shared/maven-doxia-tools/1.2.1/maven-doxia-tools-1.2.1-javadoc.jar.asc [nexus] /org/apache/maven/shared/maven-doxia-tools/1.2.1/maven-doxia-tools-1.2.1.pom [nexus] /org/apache/maven/shared/maven-doxia-tools/1.2.1/maven-doxia-tools-1.2.1.jar [nexus] /org/apache/maven/shared/maven-doxia-tools/1.2.1/maven-doxia-tools-1.2.1-javadoc.jar [nexus] /org/apache/maven/shared/maven-doxia-tools/1.2.1/maven-doxia-tools-1.2.1.pom.asc.md5 [nexus] /org/apache/maven/shared/maven-doxia-tools/1.2.1/maven-doxia-tools-1.2.1.pom.asc.sha1 [nexus] /org/apache/maven/shared/maven-doxia-tools/1.2.1/maven-doxia-tools-1.2.1-source-release.zip.sha1 [nexus] /org/apache/maven/shared/maven-doxia-tools/1.2.1/maven-doxia-tools-1.2.1-javadoc.jar.md5 [nexus] /org/apache/maven/shared/maven-doxia-tools/1.2.1/maven-doxia-tools-1.2.1-source-release.zip.asc.md5 [nexus] /org/apache/maven/shared/maven-doxia-tools/1.2.1/maven-doxia-tools-1.2.1.jar.asc.sha1 [nexus] /org/apache/maven/shared/maven-doxia-tools/1.2.1/maven-doxia-tools-1.2.1-sources.jar.asc.sha1 [nexus] /org/apache/maven/shared/maven-doxia-tools/1.2.1/maven-doxia-tools-1.2.1.jar.asc.md5 [nexus] /org/apache/maven/shared/maven-doxia-tools/1.2.1/maven-doxia-tools-1.2.1.pom.sha1 [nexus] /org/apache/maven/shared/maven-doxia-tools/1.2.1/maven-doxia-tools-1.2.1-sources.jar.md5 [nexus] /org/apache/maven/shared/maven-doxia-tools/1.2.1/maven-doxia-tools-1.2.1-sources.jar.asc [nexus] /org/apache/maven/shared/maven-doxia-tools/1.2.1/maven-doxia-tools-1.2.1-javadoc.jar.sha1 [nexus] /org/apache/maven/shared/maven-doxia-tools/1.2.1/maven-doxia-tools-1.2.1-source-release.zip.md5 [nexus] /org/apache/maven/shared/maven-doxia-tools/1.2.1/maven-doxia-tools-1.2.1-source-release.zip.asc [nexus] /org/apache/maven/shared/maven-doxia-tools/1.2.1/maven-doxia-tools-1.2.1-source-release.zip.asc.sha1 [nexus] /org/apache/maven/shared/maven-doxia-tools/1.2.1/maven-doxia-tools-1.2.1-sources.jar.sha1 [nexus] /org/apache/maven/shared/maven-doxia-tools/1.2.1/maven-doxia-tools-1.2.1.jar.asc [nexus] /org/apache/maven/shared/maven-doxia-tools/1.2.1/maven-doxia-tools-1.2.1-javadoc.jar.asc.md5 [nexus] /org/apache/maven/shared/maven-doxia-tools/1.2.1/maven-doxia-tools-1.2.1.jar.md5 [nexus] /org/apache/maven/shared/maven-doxia-tools/1.2.1/maven-doxia-tools-1.2.1-javadoc.jar.asc.sha1 [nexus] /org/apache/maven/shared/maven-doxia-tools/1.2.1/maven-doxia-tools-1.2.1-sources.jar [nexus] /org/apache/maven/shared/maven-doxia-tools/1.2.1/maven-doxia-tools-1.2.1.jar.sha1 [nexus] /org/apache/maven/shared/maven-doxia-tools/1.2.1/maven-doxia-tools-1.2.1.pom.md5 [nexus] /org/apache/maven/shared/maven-doxia-tools/1.2.1/maven-doxia-tools-1.2.1-source-release.zip [nexus] /org/apache/maven/shared/maven-doxia-tools/1.2.1/maven-doxia-tools-1.2.1.pom.asc [nexus] /org/apache/maven/shared/maven-doxia-tools/1.2.1/maven-doxia-tools-1.2.1-sources.jar.asc.md5 Removed ---
svn commit: r949006 - in /maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/resolvers: GoOfflineMojo.java ListRepositoriesMojo.java
Author: brianf
Date: Thu May 27 21:35:22 2010
New Revision: 949006
URL: http://svn.apache.org/viewvc?rev=949006view=rev
Log:
new goal to list the repositories used by the current project.
Added:
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/resolvers/ListRepositoriesMojo.java
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/resolvers/GoOfflineMojo.java
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/resolvers/GoOfflineMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/resolvers/GoOfflineMojo.java?rev=949006r1=949005r2=949006view=diff
==
---
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/resolvers/GoOfflineMojo.java
(original)
+++
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/resolvers/GoOfflineMojo.java
Thu May 27 21:35:22 2010
@@ -1,5 +1,4 @@
package org.apache.maven.plugin.dependency.resolvers;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
Added:
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/resolvers/ListRepositoriesMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/resolvers/ListRepositoriesMojo.java?rev=949006view=auto
==
---
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/resolvers/ListRepositoriesMojo.java
(added)
+++
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/resolvers/ListRepositoriesMojo.java
Thu May 27 21:35:22 2010
@@ -0,0 +1,87 @@
+package org.apache.maven.plugin.dependency.resolvers;
+
+/*
+ * 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.util.ArrayList;
+import java.util.HashSet;
+import java.util.Iterator;
+
+import org.apache.maven.artifact.Artifact;
+import org.apache.maven.artifact.resolver.ArtifactResolutionException;
+import org.apache.maven.artifact.resolver.ArtifactResolutionResult;
+import org.apache.maven.artifact.resolver.ResolutionNode;
+import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugin.dependency.AbstractResolveMojo;
+import org.apache.maven.shared.artifact.filter.ScopeArtifactFilter;
+import org.apache.maven.shared.artifact.filter.collection.ArtifactsFilter;
+
+/**
+ * Goal that resolves all project dependencies, including plugins and reports
+ * and their dependencies.
+ *
+ * @goal list-repositories
+ * @requiresDependencyResolution test
+ * @author a href=mailto:bri...@apache.org;Brian Fox/a
+ * @version $Id: GoOfflineMojo.java 728546 2008-12-21 22:56:51Z bentmann $
+ * @since 2.2
+ */
+public class ListRepositoriesMojo extends AbstractResolveMojo
+{
+ /**
+ * Displays a list of the repositories used by this build.
+* @throws MojoExecutionException
+* with a message if an error occurs.
+*
+*/
+ public void execute() throws MojoExecutionException
+ {
+ try
+ {
+ ArtifactResolutionResult result =
this.artifactCollector.collect(
+ project.getArtifacts(),
project.getArtifact(), this.getLocal(),
+ this.remoteRepos,
this.artifactMetadataSource,
+ new
ScopeArtifactFilter(Artifact.SCOPE_TEST),
+ new ArrayList());
+ HashSet repos = new HashSet();
+ for (Iterator i =
result.getArtifactResolutionNodes().iterator(); i
+ .hasNext();)
+ {
+ ResolutionNode node
svn commit: r949009 - /maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/resolvers/ListRepositoriesMojo.java
Author: brianf
Date: Thu May 27 21:39:32 2010
New Revision: 949009
URL: http://svn.apache.org/viewvc?rev=949009view=rev
Log:
no print stacktrace. bad programmer!
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/resolvers/ListRepositoriesMojo.java
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/resolvers/ListRepositoriesMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/resolvers/ListRepositoriesMojo.java?rev=949009r1=949008r2=949009view=diff
==
---
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/resolvers/ListRepositoriesMojo.java
(original)
+++
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/resolvers/ListRepositoriesMojo.java
Thu May 27 21:39:32 2010
@@ -74,8 +74,7 @@ public class ListRepositoriesMojo extend
}
} catch (ArtifactResolutionException e)
{
- // TODO Auto-generated catch block
- e.printStackTrace();
+ throw new MojoExecutionException(Unable to resolve
artifacts,e);
}
}
svn commit: r949069 - /maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AnalyzeReportMojo.java
Author: brianf
Date: Fri May 28 02:12:24 2010
New Revision: 949069
URL: http://svn.apache.org/viewvc?rev=949069view=rev
Log:
MDEP-240 added the ignoreCompile to the report.
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AnalyzeReportMojo.java
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AnalyzeReportMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AnalyzeReportMojo.java?rev=949069r1=949068r2=949069view=diff
==
---
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AnalyzeReportMojo.java
(original)
+++
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AnalyzeReportMojo.java
Fri May 28 02:12:24 2010
@@ -20,9 +20,13 @@ package org.apache.maven.plugin.dependen
*/
import java.io.File;
+import java.util.HashSet;
+import java.util.Iterator;
import java.util.Locale;
import java.util.ResourceBundle;
+import java.util.Set;
+import org.apache.maven.artifact.Artifact;
import org.apache.maven.doxia.sink.Sink;
import org.apache.maven.doxia.siterenderer.Renderer;
import org.apache.maven.project.MavenProject;
@@ -35,10 +39,9 @@ import org.apache.maven.shared.dependenc
/**
* Analyzes the dependencies of this project and produces a report that
summarizes which are: used and declared; used
* and undeclared; unused and declared.
- *
+ *
* @version $Id$
* @since 2.0-alpha-5
- *
* @goal analyze-report
* @requiresDependencyResolution test
* @execute phase=test-compile
@@ -50,7 +53,7 @@ public class AnalyzeReportMojo
/**
* The Maven project to analyze.
- *
+ *
* @parameter expression=${project}
* @required
* @readonly
@@ -59,7 +62,7 @@ public class AnalyzeReportMojo
/**
* The Maven project dependency analyzer to use.
- *
+ *
* @component
* @required
* @readonly
@@ -67,8 +70,6 @@ public class AnalyzeReportMojo
private ProjectDependencyAnalyzer analyzer;
/**
- *
- *
* @component
* @required
* @readonly
@@ -77,13 +78,20 @@ public class AnalyzeReportMojo
/**
* Target folder
- *
+ *
* @parameter expression=${project.build.directory}
* @readonly
* @since 2.0-alpha-5
*/
private File outputDirectory;
+/**
+ * Ignore Runtime,Provide,Test,System scopes for unused dependency analysis
+ *
+ * @parameter expression=${ignoreNonCompile} default-value=false
+ */
+private boolean ignoreNonCompile;
+
// Mojo methods ---
/*
@@ -115,6 +123,26 @@ public class AnalyzeReportMojo
throw new MavenReportException( Cannot analyze dependencies,
exception );
}
+
+//remove everything that's not in the compile scope
+if ( ignoreNonCompile )
+{
+Set filteredUnusedDeclared = new HashSet(
analysis.getUnusedDeclaredArtifacts() );
+Iterator iter = filteredUnusedDeclared.iterator();
+while ( iter.hasNext() )
+{
+Artifact artifact = (Artifact) iter.next();
+if ( !artifact.getScope().equals( Artifact.SCOPE_COMPILE ) )
+{
+iter.remove();
+}
+}
+
+ProjectDependencyAnalysis analysisTemp = new
ProjectDependencyAnalysis(analysis.getUsedDeclaredArtifacts(),analysis.getUsedUndeclaredArtifacts(),filteredUnusedDeclared);
+analysis = analysisTemp;
+}
+
+
// Step 2: Create sink and bundle
Sink sink = getSink();
ResourceBundle bundle = getBundle( locale );
@@ -181,10 +209,7 @@ public class AnalyzeReportMojo
// protected methods --
/**
- *
- *
- * @param locale
- *the current locale
+ * @param locale the current locale
*/
protected ResourceBundle getBundle( Locale locale )
{
