activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hadr...@apache.org
Subject [16/16] git commit: Resolve merge conflict
Date Wed, 12 Mar 2014 16:03:42 GMT
Resolve merge conflict


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

Branch: refs/heads/activemq-5.9
Commit: 35bc78b24b09285c5be6c5fb581280ceddf9a41b
Parents: 62c0562
Author: Hadrian Zbarcea <hadrian@apache.org>
Authored: Wed Mar 12 12:03:09 2014 -0400
Committer: Hadrian Zbarcea <hadrian@apache.org>
Committed: Wed Mar 12 12:03:09 2014 -0400

----------------------------------------------------------------------
 pom.xml | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq/blob/35bc78b2/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index f1ac999..ac01899 100755
--- a/pom.xml
+++ b/pom.xml
@@ -1584,20 +1584,13 @@
   </profiles>
 
   <repositories>
-    <!-- for the proton dependency -->
+    <!-- for the paho dependency -->
     <repository>
-      <id>com.fusesource.m2</id>
-      <url>http://repo.fusesource.com/nexus/content/groups/public/</url>
+      <id>eclipse.m2</id>
+      <url>https://repo.eclipse.org/content/groups/releases/</url>
       <releases><enabled>true</enabled></releases>
       <snapshots><enabled>false</enabled></snapshots>
     </repository>
-    <repository>
-        <id>com.fusesource.m2.snapshot</id>
-        <url>http://repo.fusesource.com/nexus/content/repositories/snapshots/</url>
-        <releases><enabled>false</enabled></releases>
-        <snapshots><enabled>true</enabled></snapshots>
-      </repository>
-
   </repositories>
 
 </project>


Mime
View raw message