You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2013/09/19 23:00:30 UTC
git commit: update parent pom
Updated Branches:
refs/heads/master 8fb4f7f42 -> 7bdc8b3b6
update parent pom
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/7bdc8b3b
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/7bdc8b3b
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/7bdc8b3b
Branch: refs/heads/master
Commit: 7bdc8b3b69522be9b611bf231c350c0d156b6533
Parents: 8fb4f7f
Author: Hervé Boutemy <hb...@apache.org>
Authored: Thu Sep 19 23:00:27 2013 +0200
Committer: Hervé Boutemy <hb...@apache.org>
Committed: Thu Sep 19 23:00:27 2013 +0200
----------------------------------------------------------------------
pom.xml | 14 +-------------
1 file changed, 1 insertion(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/7bdc8b3b/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 5e0abcf..2e0c5fc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
<parent>
<artifactId>maven-parent</artifactId>
<groupId>org.apache.maven</groupId>
- <version>22</version>
+ <version>23</version>
<relativePath>../pom/maven/pom.xml</relativePath>
</parent>
@@ -119,7 +119,6 @@
<maven.surefire.scm.devConnection>scm:git:https://git-wip-us.apache.org/repos/asf/maven-surefire.git</maven.surefire.scm.devConnection>
- <maven.site.cache>${user.home}/maven-sites</maven.site.cache>
<maven.surefire.siteFilePath>${maven.site.cache}/surefire-${project.version}</maven.surefire.siteFilePath>
<maven.surefire.siteUrlDeployment>file://${maven.surefire.siteFilePath}</maven.surefire.siteUrlDeployment>
<maven.surefire.scmPubCheckoutDirectory>${maven.site.cache}/maven-surefire-site-content-${project.version}</maven.surefire.scmPubCheckoutDirectory>
@@ -303,7 +302,6 @@
<artifactId>maven-release-plugin</artifactId>
<version>2.2.1</version>
<configuration>
- <tagBase>https://svn.apache.org/repos/asf/maven/surefire/tags</tagBase>
<autoVersionSubmodules>true</autoVersionSubmodules>
<preparationGoals>clean install</preparationGoals>
</configuration>
@@ -316,7 +314,6 @@
<artifactId>maven-plugin-plugin</artifactId>
<version>${mavenPluginPluginVersion}</version>
<configuration>
- <useJava5>true</useJava5>
<skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound>
</configuration>
</plugin>
@@ -324,18 +321,10 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<version>3.3</version>
- <dependencies>
- <dependency>
- <groupId>org.apache.maven.doxia</groupId>
- <artifactId>doxia-module-markdown</artifactId>
- <version>1.3</version>
- </dependency>
- </dependencies>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-scm-publish-plugin</artifactId>
- <version>1.0-beta-2</version>
<configuration>
<checkoutDirectory>${maven.surefire.scmPubCheckoutDirectory}</checkoutDirectory>
<pubScmUrl>scm:svn:${maven.surefire.scmPubUrl}</pubScmUrl>
@@ -378,7 +367,6 @@
<configuration>
<dependencyLocationsEnabled>false</dependencyLocationsEnabled><!-- waiting for MPIR-267 -->
<!-- pin down urls to to avoid interpolation in the modules -->
- <webAccessUrl>${maven.surefire.scm.url}</webAccessUrl>
<anonymousConnection>${maven.surefire.scm.devConnection}</anonymousConnection>
<developerConnection>${maven.surefire.scm.devConnection}</developerConnection>
</configuration>