svn commit: r1069308 - in /maven/doxia: doxia-sitetools/trunk/pom.xml doxia-tools/trunk/pom.xml doxia/trunk/pom.xml site/pom.xml
Author: ltheussl Date: Thu Feb 10 09:45:21 2011 New Revision: 1069308 URL: http://svn.apache.org/viewvc?rev=1069308view=rev Log: add ciManagement to point to the Apache Hudson server Modified: maven/doxia/doxia-sitetools/trunk/pom.xml maven/doxia/doxia-tools/trunk/pom.xml maven/doxia/doxia/trunk/pom.xml maven/doxia/site/pom.xml Modified: maven/doxia/doxia-sitetools/trunk/pom.xml URL: http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/pom.xml?rev=1069308r1=1069307r2=1069308view=diff == --- maven/doxia/doxia-sitetools/trunk/pom.xml (original) +++ maven/doxia/doxia-sitetools/trunk/pom.xml Thu Feb 10 09:45:21 2011 @@ -102,10 +102,17 @@ under the License. developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/doxia/doxia-sitetools/trunk/developerConnection urlhttp://svn.apache.org/viewcvs.cgi/maven/doxia/doxia-sitetools/trunk/url /scm + issueManagement systemjira/system urlhttp://jira.codehaus.org/browse/DOXIASITETOOLS/url /issueManagement + + ciManagement +systemHudson/system +urlhttps://hudson.apache.org/hudson//url + /ciManagement + distributionManagement site idapache.website/id Modified: maven/doxia/doxia-tools/trunk/pom.xml URL: http://svn.apache.org/viewvc/maven/doxia/doxia-tools/trunk/pom.xml?rev=1069308r1=1069307r2=1069308view=diff == --- maven/doxia/doxia-tools/trunk/pom.xml (original) +++ maven/doxia/doxia-tools/trunk/pom.xml Thu Feb 10 09:45:21 2011 @@ -97,10 +97,17 @@ under the License. developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/doxia/doxia-tools/trunk/developerConnection urlhttp://svn.apache.org/viewcvs.cgi/maven/doxia/doxia-tools/trunk/url /scm + issueManagement systemjira/system urlhttp://jira.codehaus.org/browse/DOXIA/url /issueManagement + + ciManagement +systemHudson/system +urlhttps://hudson.apache.org/hudson//url + /ciManagement + distributionManagement site idapache.website/id Modified: maven/doxia/doxia/trunk/pom.xml URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/pom.xml?rev=1069308r1=1069307r2=1069308view=diff == --- maven/doxia/doxia/trunk/pom.xml (original) +++ maven/doxia/doxia/trunk/pom.xml Thu Feb 10 09:45:21 2011 @@ -106,10 +106,17 @@ under the License. developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/doxia/doxia/trunk/developerConnection urlhttp://svn.apache.org/viewcvs.cgi/maven/doxia/doxia/trunk/url /scm + issueManagement systemjira/system urlhttp://jira.codehaus.org/browse/DOXIA/url /issueManagement + + ciManagement +systemHudson/system +urlhttps://hudson.apache.org/hudson//url + /ciManagement + distributionManagement site idapache.website/id Modified: maven/doxia/site/pom.xml URL: http://svn.apache.org/viewvc/maven/doxia/site/pom.xml?rev=1069308r1=1069307r2=1069308view=diff == --- maven/doxia/site/pom.xml (original) +++ maven/doxia/site/pom.xml Thu Feb 10 09:45:21 2011 @@ -116,10 +116,17 @@ under the License. developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/doxia/site//developerConnection urlhttp://svn.apache.org/viewvc/maven/doxia/site//url /scm + issueManagement systemjira/system urlhttp://jira.codehaus.org/browse/DOXIA/url /issueManagement + + ciManagement +systemHudson/system +urlhttps://hudson.apache.org/hudson//url + /ciManagement + distributionManagement site idapache.website/id
svn commit: r1069337 - /maven/doxia/site/pom.xml
Author: ltheussl
Date: Thu Feb 10 10:55:16 2011
New Revision: 1069337
URL: http://svn.apache.org/viewvc?rev=1069337view=rev
Log:
use latest antrun plugin and snapshots of site and pdf plugin
Modified:
maven/doxia/site/pom.xml
Modified: maven/doxia/site/pom.xml
URL:
http://svn.apache.org/viewvc/maven/doxia/site/pom.xml?rev=1069337r1=1069336r2=1069337view=diff
==
--- maven/doxia/site/pom.xml (original)
+++ maven/doxia/site/pom.xml Thu Feb 10 10:55:16 2011
@@ -152,17 +152,17 @@ under the License.
plugin
groupIdorg.apache.maven.plugins/groupId
artifactIdmaven-antrun-plugin/artifactId
- version1.3/version
+ version1.6/version
/plugin
plugin
groupIdorg.apache.maven.plugins/groupId
artifactIdmaven-site-plugin/artifactId
- version2.2/version
+ version2.3-SNAPSHOT/version
/plugin
plugin
groupIdorg.apache.maven.plugins/groupId
artifactIdmaven-pdf-plugin/artifactId
- version1.1/version
+ version1.2-SNAPSHOT/version
/plugin
/plugins
/pluginManagement
@@ -213,7 +213,7 @@ under the License.
idsite/id
phasesite/phase
configuration
- tasks
+ target
copy
todir=${project.reporting.outputDirectory}/doxia-example-book/
fileset
dir=${project.build.directory}/generated-site/pdf/doxia-example-book
@@ -224,7 +224,7 @@ under the License.
/fileset
/copy
- /tasks
+ /target
/configuration
goals
goalrun/goal
svn commit: r1069323 - /maven/plugins/trunk/maven-pdf-plugin/pom.xml
Author: ltheussl Date: Thu Feb 10 10:19:19 2011 New Revision: 1069323 URL: http://svn.apache.org/viewvc?rev=1069323view=rev Log: upgrade to newest plugin-plugin Modified: maven/plugins/trunk/maven-pdf-plugin/pom.xml Modified: maven/plugins/trunk/maven-pdf-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pdf-plugin/pom.xml?rev=1069323r1=1069322r2=1069323view=diff == --- maven/plugins/trunk/maven-pdf-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-pdf-plugin/pom.xml Thu Feb 10 10:19:19 2011 @@ -363,7 +363,7 @@ under the License. plugin groupIdorg.apache.maven.plugins/groupId artifactIdmaven-plugin-plugin/artifactId -version2.6/version +version2.7/version /plugin /plugins /reporting @@ -446,7 +446,7 @@ under the License. plugin groupIdorg.apache.maven.plugins/groupId artifactIdmaven-plugin-plugin/artifactId -version2.6/version +version2.7/version /plugin plugin artifactIdmaven-project-info-reports-plugin/artifactId
svn commit: r1069326 - /maven/doxia/site/pom.xml
Author: ltheussl Date: Thu Feb 10 10:24:49 2011 New Revision: 1069326 URL: http://svn.apache.org/viewvc?rev=1069326view=rev Log: upgrade to latest plugins Modified: maven/doxia/site/pom.xml Modified: maven/doxia/site/pom.xml URL: http://svn.apache.org/viewvc/maven/doxia/site/pom.xml?rev=1069326r1=1069325r2=1069326view=diff == --- maven/doxia/site/pom.xml (original) +++ maven/doxia/site/pom.xml Thu Feb 10 10:24:49 2011 @@ -143,7 +143,7 @@ under the License. /pluginRepositories properties -doxiaVersion1.1.3/doxiaVersion +doxiaVersion1.1.4/doxiaVersion /properties build @@ -258,7 +258,7 @@ under the License. plugin groupIdorg.apache.maven.plugins/groupId artifactIdmaven-project-info-reports-plugin/artifactId -version2.1.2/version +version2.3.1/version reportSets reportSet reports @@ -282,7 +282,7 @@ under the License. plugin groupIdorg.apache.maven.plugins/groupId artifactIdmaven-changes-plugin/artifactId -version2.3/version +version2.4/version configuration columnNamesFix Version,Type,Key,Summary,Resolution/columnNames resolutionIdsClosed/resolutionIds
svn commit: r1069389 - in /maven/release/trunk/maven-release-manager: ./ src/main/java/org/apache/maven/shared/release/scm/ src/main/resources/ src/main/resources/META-INF/ src/main/resources/META-INF
Author: bentmann
Date: Thu Feb 10 13:46:48 2011
New Revision: 1069389
URL: http://svn.apache.org/viewvc?rev=1069389view=rev
Log:
[MRELEASE-648] Putting SVN password in settings.xml doesn't support password
encryption
Added:
maven/release/trunk/maven-release-manager/src/main/resources/
maven/release/trunk/maven-release-manager/src/main/resources/META-INF/
maven/release/trunk/maven-release-manager/src/main/resources/META-INF/plexus/
maven/release/trunk/maven-release-manager/src/main/resources/META-INF/plexus/components.xml
(with props)
maven/release/trunk/maven-release-manager/src/test/resources/settings-security.xml
(with props)
Modified:
maven/release/trunk/maven-release-manager/pom.xml
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/scm/DefaultScmRepositoryConfigurator.java
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/scm/DefaultScmRepositoryConfiguratorTest.java
Modified: maven/release/trunk/maven-release-manager/pom.xml
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/pom.xml?rev=1069389r1=1069388r2=1069389view=diff
==
--- maven/release/trunk/maven-release-manager/pom.xml (original)
+++ maven/release/trunk/maven-release-manager/pom.xml Thu Feb 10 13:46:48 2011
@@ -68,6 +68,12 @@
/dependency
dependency
+ groupIdorg.sonatype.plexus/groupId
+ artifactIdplexus-sec-dispatcher/artifactId
+ version1.3/version
+/dependency
+
+dependency
groupIdorg.apache.maven/groupId
artifactIdmaven-model/artifactId
version${mavenVersion}/version
@@ -223,6 +229,9 @@
!-- Disabled for now - we can't mock classes from plexus-utils in
surefire --
exclude**/ForkedMavenExecutorTest.java/exclude
/excludes
+ systemPropertyVariables
+
settings.security${project.build.testOutputDirectory}/settings-security.xml/settings.security
+ /systemPropertyVariables
/configuration
/plugin
plugin
Modified:
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/scm/DefaultScmRepositoryConfigurator.java
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/scm/DefaultScmRepositoryConfigurator.java?rev=1069389r1=1069388r2=1069389view=diff
==
---
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/scm/DefaultScmRepositoryConfigurator.java
(original)
+++
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/scm/DefaultScmRepositoryConfigurator.java
Thu Feb 10 13:46:48 2011
@@ -32,6 +32,8 @@ import org.apache.maven.settings.Setting
import org.apache.maven.shared.release.config.ReleaseDescriptor;
import org.codehaus.plexus.logging.AbstractLogEnabled;
import org.codehaus.plexus.util.StringUtils;
+import org.sonatype.plexus.components.sec.dispatcher.SecDispatcher;
+import org.sonatype.plexus.components.sec.dispatcher.SecDispatcherException;
/**
* Tool that gets a configured SCM repository from release configuration.
@@ -50,6 +52,14 @@ public class DefaultScmRepositoryConfigu
*/
private ScmManager scmManager;
+/**
+ * When this plugin requires Maven 3.0 as minimum, this component can be
removed and o.a.m.s.c.SettingsDecrypter be
+ * used instead.
+ *
+ * @plexus.requirement role-hint=mng-4384
+ */
+private SecDispatcher secDispatcher;
+
public ScmRepository getConfiguredRepository( ReleaseDescriptor
releaseDescriptor, Settings settings )
throws ScmRepositoryException, NoSuchScmProviderException
{
@@ -99,7 +109,7 @@ public class DefaultScmRepositoryConfigu
if ( password == null )
{
-password = server.getPassword();
+password = decrypt( server.getPassword(), host );
}
if ( privateKey == null )
@@ -109,7 +119,7 @@ public class DefaultScmRepositoryConfigu
if ( passphrase == null )
{
-passphrase = server.getPassphrase();
+passphrase = decrypt( server.getPassphrase(), host );
}
}
}
@@ -158,6 +168,29 @@ public class DefaultScmRepositoryConfigu
return repository;
}
+private String decrypt( String str, String server )
+{
+try
+{
+return secDispatcher.decrypt( str );
+}
+catch ( SecDispatcherException e )
+{
+String msg =
+Failed to decrypt password/passphrase for server + server +
, using auth
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: r1069522 - /maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java
Author: bentmann Date: Thu Feb 10 18:47:41 2011 New Revision: 1069522 URL: http://svn.apache.org/viewvc?rev=1069522view=rev Log: o Disabled IT for unfinished feature Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java?rev=1069522r1=1069521r2=1069522view=diff == --- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java (original) +++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java Thu Feb 10 18:47:41 2011 @@ -83,7 +83,7 @@ public class IntegrationTestSuite // - // suite.addTestSuite( MavenIT0108SnapshotUpdateTest.class ); -- MNG-3137 -suite.addTestSuite( MavenITmng4992MapStylePropertiesParamConfigTest.class ); +// suite.addTestSuite( MavenITmng4992MapStylePropertiesParamConfigTest.class ); suite.addTestSuite( MavenITmng4975ProfileInjectedPluginExecutionOrderTest.class ); suite.addTestSuite( MavenITmng4973ExtensionVisibleToPluginInReactorTest.class ); suite.addTestSuite( MavenITmng4966AbnormalUrlPreservationTest.class );
svn commit: r1069524 - /maven/core-integration-testing/trunk/core-it-suite/src/test/resources/bootstrap/settings.xml
Author: bentmann Date: Thu Feb 10 18:48:43 2011 New Revision: 1069524 URL: http://svn.apache.org/viewvc?rev=1069524view=rev Log: o Fixed IT bootstrap to fetch only from the desired IT repos Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/bootstrap/settings.xml Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/bootstrap/settings.xml URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/bootstrap/settings.xml?rev=1069524r1=1069523r2=1069524view=diff == --- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/bootstrap/settings.xml (original) +++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/bootstrap/settings.xml Thu Feb 10 18:48:43 2011 @@ -20,5 +20,37 @@ under the License. -- settings - !-- empty and just here to disable any custom settings from the user's environment -- + profiles +profile + idit-bootstrap/id + !-- NOTE: We want everything to be fetched from the repo configured in the global settings -- + repositories +repository + idapache.snapshots/id + urlfile:target/null/url + releases +enabledfalse/enabled + /releases + snapshots +enabledfalse/enabled + /snapshots +/repository + /repositories + pluginRepositories +pluginRepository + idapache.snapshots/id + urlfile:target/null/url + releases +enabledfalse/enabled + /releases + snapshots +enabledfalse/enabled + /snapshots +/pluginRepository + /pluginRepositories +/profile + /profiles + activeProfiles +activeProfileit-bootstrap/activeProfile + /activeProfiles /settings
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: r1069584 - in /maven/surefire/trunk: maven-failsafe-plugin/pom.xml maven-surefire-plugin/pom.xml maven-surefire-report-plugin/pom.xml
Author: krosenvold Date: Thu Feb 10 21:54:24 2011 New Revision: 1069584 URL: http://svn.apache.org/viewvc?rev=1069584view=rev Log: Upped to plugin-plugin 2.7 Modified: maven/surefire/trunk/maven-failsafe-plugin/pom.xml maven/surefire/trunk/maven-surefire-plugin/pom.xml maven/surefire/trunk/maven-surefire-report-plugin/pom.xml Modified: maven/surefire/trunk/maven-failsafe-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-failsafe-plugin/pom.xml?rev=1069584r1=1069583r2=1069584view=diff == --- maven/surefire/trunk/maven-failsafe-plugin/pom.xml (original) +++ maven/surefire/trunk/maven-failsafe-plugin/pom.xml Thu Feb 10 21:54:24 2011 @@ -167,7 +167,7 @@ plugin groupIdorg.apache.maven.plugins/groupId artifactIdmaven-plugin-plugin/artifactId -version2.6/version +version2.7/version executions execution idgenerated-helpmojo/id @@ -237,7 +237,7 @@ plugin groupIdorg.apache.maven.plugins/groupId artifactIdmaven-plugin-plugin/artifactId -version2.6/version +version2.7/version configuration requirements jdk1.4/jdk Modified: maven/surefire/trunk/maven-surefire-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-plugin/pom.xml?rev=1069584r1=1069583r2=1069584view=diff == --- maven/surefire/trunk/maven-surefire-plugin/pom.xml (original) +++ maven/surefire/trunk/maven-surefire-plugin/pom.xml Thu Feb 10 21:54:24 2011 @@ -173,7 +173,7 @@ plugin groupIdorg.apache.maven.plugins/groupId artifactIdmaven-plugin-plugin/artifactId -version2.6/version +version2.7/version executions execution idgenerated-helpmojo/id @@ -197,7 +197,7 @@ plugin groupIdorg.apache.maven.plugins/groupId artifactIdmaven-plugin-plugin/artifactId -version2.6/version +version2.7/version configuration requirements jdk1.4/jdk Modified: maven/surefire/trunk/maven-surefire-report-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-report-plugin/pom.xml?rev=1069584r1=1069583r2=1069584view=diff == --- maven/surefire/trunk/maven-surefire-report-plugin/pom.xml (original) +++ maven/surefire/trunk/maven-surefire-report-plugin/pom.xml Thu Feb 10 21:54:24 2011 @@ -133,7 +133,7 @@ plugin groupIdorg.apache.maven.plugins/groupId artifactIdmaven-plugin-plugin/artifactId -version2.6/version +version2.7/version executions execution idgenerated-helpmojo/id @@ -158,7 +158,7 @@ plugin groupIdorg.apache.maven.plugins/groupId artifactIdmaven-plugin-plugin/artifactId -version2.6/version +version2.7/version configuration requirements jdk1.4/jdk
svn commit: r1069586 - in /maven/surefire/trunk: pom.xml surefire-providers/common-junit3/ surefire-providers/common-junit4/ surefire-providers/surefire-junit3/
Author: olamy
Date: Thu Feb 10 21:58:02 2011
New Revision: 1069586
URL: http://svn.apache.org/viewvc?rev=1069586view=rev
Log:
ide files ignore
add a m2e profile pour incremental build
Modified:
maven/surefire/trunk/pom.xml
maven/surefire/trunk/surefire-providers/common-junit3/ (props changed)
maven/surefire/trunk/surefire-providers/common-junit4/ (props changed)
maven/surefire/trunk/surefire-providers/surefire-junit3/ (props changed)
Modified: maven/surefire/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/pom.xml?rev=1069586r1=1069585r2=1069586view=diff
==
--- maven/surefire/trunk/pom.xml (original)
+++ maven/surefire/trunk/pom.xml Thu Feb 10 21:58:02 2011
@@ -254,6 +254,11 @@
/configuration
/plugin
plugin
+ groupIdorg.apache.maven.plugins/groupId
+ artifactIdmaven-resources-plugin/artifactId
+ version2.4.3/version
+/plugin
+plugin
artifactIdmaven-site-plugin/artifactId
version2.2/version
/plugin
@@ -288,5 +293,37 @@
/pluginManagement
/build
/profile
+profile
+ idm2e/id
+ properties
+m2BuildDirectorytarget/m2BuildDirectory
+ /properties
+ activation
+property
+ namem2e.version/name
+/property
+ /activation
+ build
+directory${m2BuildDirectory}/directory
+plugins
+ plugin
+groupIdorg.maven.ide.eclipse/groupId
+artifactIdlifecycle-mapping/artifactId
+version0.10.0/version
+configuration
+ mappingIdcustomizable/mappingId
+ configurators
+configurator id=org.maven.ide.eclipse.jdt.javaConfigurator
/
+configurator
id=org.maven.ide.eclipse.modello.modelloConfigurator /
+configurator
id=org.maven.ide.eclipse.plexus.annotations.plexusConfigurator /
+ /configurators
+ mojoExecutions
+
mojoExecutionorg.apache.maven.plugins:maven-resources-plugin::/mojoExecution
+ /mojoExecutions
+/configuration
+ /plugin
+/plugins
+ /build
+/profile
/profiles
/project
Propchange: maven/surefire/trunk/surefire-providers/common-junit3/
--
--- svn:ignore (added)
+++ svn:ignore Thu Feb 10 21:58:02 2011
@@ -0,0 +1,4 @@
+target
+.classpath
+.project
+.settings
Propchange: maven/surefire/trunk/surefire-providers/common-junit4/
--
--- svn:ignore (added)
+++ svn:ignore Thu Feb 10 21:58:02 2011
@@ -0,0 +1,4 @@
+.settings
+target
+.classpath
+.project
Propchange: maven/surefire/trunk/surefire-providers/surefire-junit3/
--
--- svn:ignore (added)
+++ svn:ignore Thu Feb 10 21:58:02 2011
@@ -0,0 +1,4 @@
+.settings
+target
+.classpath
+.project
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: r1069612 - /maven/pom/trunk/maven/pom.xml
Author: bentmann Date: Thu Feb 10 23:28:43 2011 New Revision: 1069612 URL: http://svn.apache.org/viewvc?rev=1069612view=rev Log: o Fixed indentation 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=1069612r1=1069611r2=1069612view=diff == --- maven/pom/trunk/maven/pom.xml (original) +++ maven/pom/trunk/maven/pom.xml Thu Feb 10 23:28:43 2011 @@ -784,11 +784,11 @@ under the License. /file /activation build -!-- we need to attach the descriptor for this pom -- + !-- we need to attach the descriptor for this pom -- plugins plugin artifactIdmaven-site-plugin/artifactId - inheritedfalse/inherited +inheritedfalse/inherited executions execution idattach-descriptor/id @@ -800,6 +800,6 @@ under the License. /plugin /plugins /build -/profile +/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
