Apache/activemq
1
0
Fork 0
mirror of https://github.com/apache/activemq.git synced 2025-02-12 21:16:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Resolve merge conflict

Browse Source
This commit is contained in:
Hadrian Zbarcea 2014-03-12 12:03:09 -04:00
parent 62c056248f
commit 35bc78b24b
1 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pom.xml
View File

@ -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>