You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ol...@apache.org on 2014/04/10 02:38:51 UTC

[1/2] git commit: fix scm information

Repository: archiva
Updated Branches:
  refs/heads/archiva-1.3.x e84c725a7 -> c6d3d927f


fix scm information


Project: http://git-wip-us.apache.org/repos/asf/archiva/repo
Commit: http://git-wip-us.apache.org/repos/asf/archiva/commit/1115ae2c
Tree: http://git-wip-us.apache.org/repos/asf/archiva/tree/1115ae2c
Diff: http://git-wip-us.apache.org/repos/asf/archiva/diff/1115ae2c

Branch: refs/heads/archiva-1.3.x
Commit: 1115ae2c2f46493b164b04e21f2a66ee39c3a273
Parents: e84c725
Author: Olivier Lamy <ol...@apache.org>
Authored: Thu Apr 10 10:36:54 2014 +1000
Committer: Olivier Lamy <ol...@apache.org>
Committed: Thu Apr 10 10:36:54 2014 +1000

----------------------------------------------------------------------
 pom.xml | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/archiva/blob/1115ae2c/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 5bed089..a114f23 100644
--- a/pom.xml
+++ b/pom.xml
@@ -37,9 +37,9 @@
   <version>1.3.8-SNAPSHOT</version>
   <url>http://archiva.apache.org</url>
   <scm>
-    <connection>scm:svn:http://svn.apache.org/repos/asf/archiva/branches/archiva-1.3.x</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/archiva/branches/archiva-1.3.x</developerConnection>
-    <url>http://svn.apache.org/repos/asf/archiva/branches/archiva-1.3.x</url>
+    <connection>scm:git:https://git-wip-us.apache.org/repos/asf/archiva-site.git</connection>
+    <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/archiva-site.git</developerConnection>
+    <url>https://github.com/apache/archiva-site</url>
   </scm>
 
   <build>
@@ -180,7 +180,6 @@
           <artifactId>maven-release-plugin</artifactId>
           <version>2.4.1</version>
           <configuration>
-            <tagBase>https://svn.apache.org/repos/asf/archiva/tags</tagBase>
             <useReleaseProfile>false</useReleaseProfile>
             <autoVersionSubmodules>true</autoVersionSubmodules>
             <goals>deploy</goals>


[2/2] git commit: fix release plugin configuration for git

Posted by ol...@apache.org.
fix release plugin configuration for git


Project: http://git-wip-us.apache.org/repos/asf/archiva/repo
Commit: http://git-wip-us.apache.org/repos/asf/archiva/commit/c6d3d927
Tree: http://git-wip-us.apache.org/repos/asf/archiva/tree/c6d3d927
Diff: http://git-wip-us.apache.org/repos/asf/archiva/diff/c6d3d927

Branch: refs/heads/archiva-1.3.x
Commit: c6d3d927fd463c410d6950aef7dca9dfb2f0b261
Parents: 1115ae2
Author: Olivier Lamy <ol...@apache.org>
Authored: Thu Apr 10 10:38:32 2014 +1000
Committer: Olivier Lamy <ol...@apache.org>
Committed: Thu Apr 10 10:38:32 2014 +1000

----------------------------------------------------------------------
 pom.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/archiva/blob/c6d3d927/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index a114f23..634b9de 100644
--- a/pom.xml
+++ b/pom.xml
@@ -178,8 +178,9 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-release-plugin</artifactId>
-          <version>2.4.1</version>
+          <version>2.5</version>
           <configuration>
+            <localCheckout>true</localCheckout>
             <useReleaseProfile>false</useReleaseProfile>
             <autoVersionSubmodules>true</autoVersionSubmodules>
             <goals>deploy</goals>