ACTIVEMQ6-11 - fix distribution build for Apache

https://issues.apache.org/jira/browse/ACTIVEMQ6-11

Fixed the build so that the correct snapshot and release repositories are used for the releases.

Also corrected the scm and issue management in the pom.
This commit is contained in:
Andy Taylor 2014-12-03 10:42:54 +00:00
parent b61747de09
commit 8fc35ad371
1 changed files with 19 additions and 66 deletions

85
pom.xml
View File

@ -12,14 +12,6 @@
<name>ActiveMQ6 Parent</name> <name>ActiveMQ6 Parent</name>
<url>http://apache.org/activemq</url> <url>http://apache.org/activemq</url>
<description>
Putting the buzz in messaging
</description>
<organization>
<name>JBoss, a division of Red Hat</name>
<url>http://www.jboss.org/</url>
</organization>
<licenses> <licenses>
<license> <license>
@ -34,6 +26,8 @@
</prerequisites> </prerequisites>
<properties> <properties>
<!-- base url for site deployment. See distribution management for full url. Override this in settings.xml for staging -->
<staging.siteURL>scp://people.apache.org/x1/www/activemq.apache.org</staging.siteURL>
<netty.version>4.0.20.Final</netty.version> <netty.version>4.0.20.Final</netty.version>
<activemq.version.versionName>Active Hornet</activemq.version.versionName> <activemq.version.versionName>Active Hornet</activemq.version.versionName>
<activemq.version.majorVersion>2</activemq.version.majorVersion> <activemq.version.majorVersion>2</activemq.version.majorVersion>
@ -83,27 +77,31 @@
</properties> </properties>
<scm> <scm>
<connection>scm:git:git://github.com/activemq/activemq.git</connection> <connection>scm:git:http://git-wip-us.apache.org/repos/asf/activemq-6.git</connection>
<developerConnection>scm:git://github.com/activemq/activemq.git</developerConnection> <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/activemq-6.git</developerConnection>
<url>https://github.com/activemq/activemq</url> <url>https://fisheye6.atlassian.com/browse/~br=master/activemq-6-git</url>
<tag>HEAD</tag>
</scm> </scm>
<distributionManagement> <distributionManagement>
<repository> <site>
<id>jboss-releases-repository</id> <!-- this needs to match a server in your settings.xml with upload settings -->
<name>JBoss Releases Repository</name> <id>activemq-website</id>
<url>https://repository.jboss.org/nexus/service/local/staging/deploy/maven2/</url> <!-- set the staging.siteURL in your ~/.m2/settings.xml in a release or other profile -->
</repository> <url>${staging.siteURL}/maven/${project.version}</url>
<!--<url>${site-repo-url}</url>-->
</site>
<snapshotRepository> <snapshotRepository>
<id>jboss-snapshots-repository</id> <id>apache.snapshots.https</id>
<name>JBoss Snapshots Repository</name> <name>Apache Development Snapshot Repository</name>
<url>https://repository.jboss.org/nexus/content/repositories/snapshots/</url> <url>https://repository.apache.org/content/repositories/snapshots</url>
<uniqueVersion>false</uniqueVersion>
</snapshotRepository> </snapshotRepository>
</distributionManagement> </distributionManagement>
<issueManagement> <issueManagement>
<system>JIRA</system> <system>JIRA</system>
<url>http://jira.jboss.com/jira/browse/HORNETQ</url> <url>https://issues.apache.org/jira/browse/ACTIVEMQ6</url>
</issueManagement> </issueManagement>
<developers> <developers>
@ -120,7 +118,7 @@
<developer> <developer>
<id>andytaylor</id> <id>andytaylor</id>
<name>Andy Taylor</name> <name>Andy Taylor</name>
<email>ataylor@redhat.com</email> <email>andytaylor@apache.org</email>
<url>http://hornetq.com</url> <url>http://hornetq.com</url>
<timezone>0</timezone> <timezone>0</timezone>
</developer> </developer>
@ -435,25 +433,6 @@
<name>JBoss releases</name> <name>JBoss releases</name>
<url>https://repository.jboss.org/nexus/content/groups/public/</url> <url>https://repository.jboss.org/nexus/content/groups/public/</url>
</repository> </repository>
<!--
This is a repository for intermediate releases from Proton.
In case there's an API broken, we will release an intermediate release here, on that case we will uncomment this and
use this repository again
<repository>
<snapshots>
<enabled>false</enabled>
<updatePolicy>never</updatePolicy>
</snapshots>
<releases>
<enabled>true</enabled>
<updatePolicy>interval:10080</updatePolicy>
</releases>
<id>fuse.release</id>
<name>Fuse releases</name>
<url>https://repository.jboss.org/nexus/content/repositories/fs-releases/</url>
</repository>
-->
</repositories> </repositories>
<pluginRepositories> <pluginRepositories>
<pluginRepository> <pluginRepository>
@ -502,32 +481,6 @@
<module>tests</module> <module>tests</module>
</modules> </modules>
</profile> </profile>
<profile>
<id>maven-release</id>
<modules>
<module>activemq-dto</module>
<module>activemq-web</module>
<module>activemq-website</module>
<module>activemq-bootstrap</module>
<module>activemq-commons</module>
<module>activemq-selector</module>
<module>activemq-core-client</module>
<module>activemq-server</module>
<module>activemq-jms-client</module>
<module>activemq-jms-server</module>
<module>activemq-journal</module>
<module>activemq-native</module>
<module>activemq-ra</module>
<module>activemq-rest</module>
<module>activemq-tools</module>
<module>activemq-service-extensions</module>
<module>integration/activemq-jboss-as-integration</module>
<module>integration/activemq-spring-integration</module>
<module>integration/activemq-aerogear-integration</module>
<module>integration/activemq-vertx-integration</module>
<module>examples</module>
</modules>
</profile>
<profile> <profile>
<id>release</id> <id>release</id>
<modules> <modules>