You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cl...@apache.org on 2014/12/04 14:19:53 UTC
[1/2] activemq-6 git commit: ACTIVEMQ6-11 - fix distribution build
for Apache
Repository: activemq-6
Updated Branches:
refs/heads/master b61747de0 -> 28ca327b8
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.
Project: http://git-wip-us.apache.org/repos/asf/activemq-6/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-6/commit/8fc35ad3
Tree: http://git-wip-us.apache.org/repos/asf/activemq-6/tree/8fc35ad3
Diff: http://git-wip-us.apache.org/repos/asf/activemq-6/diff/8fc35ad3
Branch: refs/heads/master
Commit: 8fc35ad371a7ab88ef74f5c508426f83d4ee8ff6
Parents: b61747d
Author: Andy Taylor <an...@apache.org>
Authored: Wed Dec 3 10:42:54 2014 +0000
Committer: Andy Taylor <an...@apache.org>
Committed: Wed Dec 3 11:43:56 2014 +0000
----------------------------------------------------------------------
pom.xml | 85 ++++++++++++++----------------------------------------------
1 file changed, 19 insertions(+), 66 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8fc35ad3/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 912fa6a..55dafc6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,14 +12,6 @@
<name>ActiveMQ6 Parent</name>
<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>
<license>
@@ -34,6 +26,8 @@
</prerequisites>
<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>
<activemq.version.versionName>Active Hornet</activemq.version.versionName>
<activemq.version.majorVersion>2</activemq.version.majorVersion>
@@ -83,27 +77,31 @@
</properties>
<scm>
- <connection>scm:git:git://github.com/activemq/activemq.git</connection>
- <developerConnection>scm:git://github.com/activemq/activemq.git</developerConnection>
- <url>https://github.com/activemq/activemq</url>
+ <connection>scm:git:http://git-wip-us.apache.org/repos/asf/activemq-6.git</connection>
+ <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/activemq-6.git</developerConnection>
+ <url>https://fisheye6.atlassian.com/browse/~br=master/activemq-6-git</url>
+ <tag>HEAD</tag>
</scm>
<distributionManagement>
- <repository>
- <id>jboss-releases-repository</id>
- <name>JBoss Releases Repository</name>
- <url>https://repository.jboss.org/nexus/service/local/staging/deploy/maven2/</url>
- </repository>
+ <site>
+ <!-- this needs to match a server in your settings.xml with upload settings -->
+ <id>activemq-website</id>
+ <!-- set the staging.siteURL in your ~/.m2/settings.xml in a release or other profile -->
+ <url>${staging.siteURL}/maven/${project.version}</url>
+ <!--<url>${site-repo-url}</url>-->
+ </site>
<snapshotRepository>
- <id>jboss-snapshots-repository</id>
- <name>JBoss Snapshots Repository</name>
- <url>https://repository.jboss.org/nexus/content/repositories/snapshots/</url>
+ <id>apache.snapshots.https</id>
+ <name>Apache Development Snapshot Repository</name>
+ <url>https://repository.apache.org/content/repositories/snapshots</url>
+ <uniqueVersion>false</uniqueVersion>
</snapshotRepository>
</distributionManagement>
<issueManagement>
<system>JIRA</system>
- <url>http://jira.jboss.com/jira/browse/HORNETQ</url>
+ <url>https://issues.apache.org/jira/browse/ACTIVEMQ6</url>
</issueManagement>
<developers>
@@ -120,7 +118,7 @@
<developer>
<id>andytaylor</id>
<name>Andy Taylor</name>
- <email>ataylor@redhat.com</email>
+ <email>andytaylor@apache.org</email>
<url>http://hornetq.com</url>
<timezone>0</timezone>
</developer>
@@ -435,25 +433,6 @@
<name>JBoss releases</name>
<url>https://repository.jboss.org/nexus/content/groups/public/</url>
</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>
<pluginRepositories>
<pluginRepository>
@@ -503,32 +482,6 @@
</modules>
</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>
<id>release</id>
<modules>
<module>activemq-dto</module>
[2/2] activemq-6 git commit: Merge #31 on pom changes
Posted by cl...@apache.org.
Merge #31 on pom changes
Project: http://git-wip-us.apache.org/repos/asf/activemq-6/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-6/commit/28ca327b
Tree: http://git-wip-us.apache.org/repos/asf/activemq-6/tree/28ca327b
Diff: http://git-wip-us.apache.org/repos/asf/activemq-6/diff/28ca327b
Branch: refs/heads/master
Commit: 28ca327b858214f7167213b661a605a60a234314
Parents: b61747d 8fc35ad
Author: Clebert Suconic <cl...@apache.org>
Authored: Thu Dec 4 08:18:08 2014 -0500
Committer: Clebert Suconic <cl...@apache.org>
Committed: Thu Dec 4 08:18:08 2014 -0500
----------------------------------------------------------------------
pom.xml | 85 ++++++++++++++----------------------------------------------
1 file changed, 19 insertions(+), 66 deletions(-)
----------------------------------------------------------------------