mirror of https://github.com/apache/activemq.git
Making the m2 release look like the m1 release
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@398279 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Hiram R. Chirino
parent
b022a9d835
commit
29b5ae57a2
|
|
@ -36,26 +36,42 @@
|
|||
|
||||
<dependencies>
|
||||
|
||||
<!-- activemq related dependencies -->
|
||||
<!-- =============================== -->
|
||||
<!-- Required Dependencies -->
|
||||
<!-- =============================== -->
|
||||
<dependency>
|
||||
<groupId>backport-util-concurrent</groupId>
|
||||
<artifactId>backport-util-concurrent</artifactId>
|
||||
<optional>false</optional>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>commons-logging</groupId>
|
||||
<artifactId>commons-logging</artifactId>
|
||||
<optional>false</optional>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>${pom.groupId}</groupId>
|
||||
<artifactId>activeio-core</artifactId>
|
||||
<optional>false</optional>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>org.apache.geronimo.specs</groupId>
|
||||
<artifactId>geronimo-jms_1.1_spec</artifactId>
|
||||
<optional>false</optional>
|
||||
</dependency>
|
||||
|
||||
<!-- =============================== -->
|
||||
<!-- Optional Dependencies -->
|
||||
<!-- =============================== -->
|
||||
<dependency>
|
||||
<groupId>incubator-activemq</groupId>
|
||||
<artifactId>activemq-jaas</artifactId>
|
||||
<optional>true</optional>
|
||||
</dependency>
|
||||
|
||||
<!-- =============================== -->
|
||||
<!-- common dependencies -->
|
||||
<!-- =============================== -->
|
||||
|
||||
<!-- geronimo -->
|
||||
<dependency>
|
||||
<groupId>org.apache.geronimo.specs</groupId>
|
||||
<artifactId>geronimo-jms_1.1_spec</artifactId>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>org.apache.geronimo.specs</groupId>
|
||||
<artifactId>geronimo-jta_1.0.1B_spec</artifactId>
|
||||
|
|
|
|||
|
|
@ -188,10 +188,6 @@
|
|||
</exclusion>
|
||||
</exclusions>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.springframework</groupId>
|
||||
<artifactId>spring</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.xbean</groupId>
|
||||
<artifactId>xbean-spring</artifactId>
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@
|
|||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
<artifactId>activemq</artifactId>
|
||||
<artifactId>incubator-activemq</artifactId>
|
||||
<packaging>jar</packaging>
|
||||
<name>ActiveMQ :: Assembly</name>
|
||||
<description>Puts together the ActiveMQ distribution</description>
|
||||
|
|
@ -148,6 +148,18 @@
|
|||
</exclusion>
|
||||
</exclusions>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.geronimo.specs</groupId>
|
||||
<artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.geronimo.specs</groupId>
|
||||
<artifactId>geronimo-j2ee-jacc_1.0_spec</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.geronimo.specs</groupId>
|
||||
<artifactId>geronimo-j2ee-management_1.0_spec</artifactId>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>org.apache.xbean</groupId>
|
||||
|
|
@ -163,6 +175,10 @@
|
|||
<groupId>org.mortbay.jetty</groupId>
|
||||
<artifactId>jetty</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.mortbay.jetty</groupId>
|
||||
<artifactId>jetty-util</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.derby</groupId>
|
||||
<artifactId>derby</artifactId>
|
||||
|
|
@ -251,7 +267,7 @@
|
|||
<descriptors>
|
||||
<descriptor>src/main/descriptors/bin.xml</descriptor>
|
||||
</descriptors>
|
||||
<finalName>activemq-${pom.version}</finalName>
|
||||
<finalName>incubator-activemq-${pom.version}</finalName>
|
||||
<appendAssemblyId>false</appendAssemblyId>
|
||||
</configuration>
|
||||
</execution>
|
||||
|
|
|
|||
|
|
@ -87,6 +87,7 @@
|
|||
<include>commons-dbcp:commons-dbcp</include>
|
||||
<include>commons-pool:commons-pool</include>
|
||||
<include>org.mortbay.jetty:jetty</include>
|
||||
<include>org.mortbay.jetty:jetty-util</include>
|
||||
<include>org.mortbay.jetty:servlet-api-2.5</include>
|
||||
<include>log4j:log4j</include>
|
||||
<include>mx4j:mx4j-remote</include>
|
||||
|
|
|
|||
|
|
@ -0,0 +1,11 @@
|
|||
=========================================================================
|
||||
== NOTICE file corresponding to the section 4 d of ==
|
||||
== the Apache License, Version 2.0, ==
|
||||
== in this case for the Apache ActiveMQ distribution. ==
|
||||
=========================================================================
|
||||
|
||||
This product includes software developed by
|
||||
The Apache Software Foundation (http://www.apache.org/).
|
||||
|
||||
Please read the different LICENSE files present in the licenses directory of
|
||||
this distribution.
|
||||
|
|
@ -1,12 +1,12 @@
|
|||
Welcome to ActiveMQ
|
||||
===================
|
||||
|
||||
ActiveMQ is a high performance Apache 2.0 licenced Message Broker and JMS 1.1 implementation.
|
||||
|
||||
|
||||
Incubation Disclaimer
|
||||
=====================
|
||||
ActiveMQ is an effort undergoing incubation at the Apache Software Foundation (ASF), sponsored by the Geronimo PMC.
|
||||
|
||||
Incubation is required of all newly accepted projects until a further review indicates that the infrastructure,
|
||||
communications, and decision making process have stabilized in a manner consistent with other successful ASF projects.
|
||||
|
||||
|
|
@ -19,23 +19,21 @@ Getting Started
|
|||
To help you get started, try the following links:-
|
||||
|
||||
Getting Started
|
||||
http://activemq.org/Getting+Started
|
||||
http://incubator.apache.org/activemq/Getting+Started
|
||||
|
||||
Building
|
||||
http://activemq.org/Building
|
||||
http://incubator.apache.org/activemq/Building
|
||||
|
||||
Examples
|
||||
http://activemq.org/Examples
|
||||
http://incubator.apache.org/activemq/Examples
|
||||
|
||||
We welcome contributions of all kinds, for details of how you can help
|
||||
http://activemq.codehaus.org/Contributing
|
||||
http://incubator.apache.org/activemq/Contributing
|
||||
|
||||
Please refer to the website for details of finding the issue tracker, email lists, wiki or IRC channel
|
||||
http://activemq.org/
|
||||
|
||||
http://incubator.apache.org/activemq/
|
||||
|
||||
Please help us make ActiveMQ better - we appreciate any feedback you may have.
|
||||
|
||||
Enjoy!
|
||||
|
||||
-----------------
|
||||
|
|
@ -75,7 +75,7 @@ maven.repo.apache.scp.executable=scp
|
|||
ant_version=1.6
|
||||
geronimo_spec_j2ee_version=1.0
|
||||
concurrent_version=1.3.4
|
||||
commons_logging_version=1.0.3
|
||||
commons_logging_version=1.0.4
|
||||
log4j_version=1.2.12
|
||||
junit_version=3.8.1
|
||||
jmock_version=1.0.1
|
||||
|
|
@ -102,7 +102,7 @@ geronimo_j2ee_version=1.2-SNAPSHOT
|
|||
xmlbeans_version=1.0-DEV
|
||||
|
||||
<!-- used by spring module -->
|
||||
spring_version=1.2.4
|
||||
spring_version=1.2.6
|
||||
|
||||
xbean_spring_version=2.2
|
||||
|
||||
|
|
@ -145,7 +145,7 @@ geronimo_core_version=1.0-SNAPSHOT
|
|||
<!-- used by transport-http module -->
|
||||
commons_httpclient_version=2.0.1
|
||||
#servlet_api_version=2.5-6.0-SNAPSHOT
|
||||
servlet_api_version=2.5-6.0.0beta6
|
||||
servlet_api_version=2.5-6.0.0beta14
|
||||
jetty_version=6.0.0beta14
|
||||
tomcat_version=5.0.28
|
||||
xercesImpl_version=2.6.2
|
||||
|
|
@ -189,8 +189,8 @@ geronimo_spec_jsp_version=1.0
|
|||
<!-- used by activemq-ws -->
|
||||
activesoap_version=1.0-SNAPSHOT
|
||||
|
||||
mx4j_version=2.1.1
|
||||
mx4j_remote_version=2.1.1
|
||||
mx4j_version=3.0.1
|
||||
mx4j_remote_version=3.0.1
|
||||
|
||||
<!-- used by activemq-jaas -->
|
||||
antlr_version=2.7.2
|
||||
|
|
|
|||
39
pom.xml
39
pom.xml
|
|
@ -124,7 +124,7 @@
|
|||
</distributionManagement>
|
||||
|
||||
<modules>
|
||||
<module>activeio</module>
|
||||
|
||||
<module>activecluster</module>
|
||||
<module>activemq-jaas</module>
|
||||
<module>activemq-core</module>
|
||||
|
|
@ -252,7 +252,7 @@
|
|||
<dependency>
|
||||
<groupId>commons-logging</groupId>
|
||||
<artifactId>commons-logging</artifactId>
|
||||
<version>1.0.3</version>
|
||||
<version>1.0.4</version>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
|
|
@ -321,6 +321,34 @@
|
|||
<artifactId>xbean-spring</artifactId>
|
||||
<version>2.2</version>
|
||||
<optional>true</optional>
|
||||
|
||||
<exclusions>
|
||||
<exclusion>
|
||||
<groupId>backport-util-concurrent</groupId>
|
||||
<artifactId>backport-util-concurrent</artifactId>
|
||||
</exclusion>
|
||||
<exclusion>
|
||||
<groupId>ant</groupId>
|
||||
<artifactId>ant</artifactId>
|
||||
</exclusion>
|
||||
<exclusion>
|
||||
<groupId>commons-logging</groupId>
|
||||
<artifactId>commons-logging</artifactId>
|
||||
</exclusion>
|
||||
<exclusion>
|
||||
<groupId>mx4j</groupId>
|
||||
<artifactId>mx4j</artifactId>
|
||||
</exclusion>
|
||||
<exclusion>
|
||||
<groupId>qdox</groupId>
|
||||
<artifactId>qdox</artifactId>
|
||||
</exclusion>
|
||||
<exclusion>
|
||||
<groupId>stax</groupId>
|
||||
<artifactId>stax-api</artifactId>
|
||||
</exclusion>
|
||||
</exclusions>
|
||||
|
||||
</dependency>
|
||||
|
||||
<!-- Used to configure the activemq logs -->
|
||||
|
|
@ -620,13 +648,6 @@
|
|||
<version>1.0</version>
|
||||
</dependency>
|
||||
|
||||
<!-- ACTIVEMQ-CORE DEPENDENCIES -->
|
||||
<dependency>
|
||||
<groupId>activeio</groupId>
|
||||
<artifactId>activeio</artifactId>
|
||||
<version>2.1</version>
|
||||
</dependency>
|
||||
|
||||
<!-- ACTIVEMQ-JAAS Dependencies -->
|
||||
<dependency>
|
||||
<groupId>directory</groupId>
|
||||
|
|
|
|||
Loading…
Reference in New Issue