Apache
/
activemq
mirror of https://github.com/apache/activemq.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

AMQ-4063: RAR should not include derby. 

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1387528 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Claus Ibsen 2012-09-19 11:25:29 +00:00
parent aa5a625a61
commit 2bbc65ba9a
3 changed files with 4 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
activemq-rar/pom.xml
View File

@ -122,8 +122,8 @@
<artifactId>regexp</artifactId> <artifactId>regexp</artifactId>
</exclusion> </exclusion>
<exclusion> <exclusion>
<groupId>org.apache.activemq</groupId> <groupId>javax.jmdns</groupId>
<artifactId>activemq-jmdns_1.0</artifactId> <artifactId>jmdns</artifactId>
</exclusion> </exclusion>
<exclusion> <exclusion>
<groupId>xalan</groupId> <groupId>xalan</groupId>
@ -197,10 +197,6 @@
<groupId>org.springframework</groupId> <groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId> <artifactId>spring-context</artifactId>
</dependency> </dependency>
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
</dependency>
<dependency> <dependency>
<groupId>org.apache.geronimo.specs</groupId> <groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-j2ee-management_1.1_spec</artifactId> <artifactId>geronimo-j2ee-management_1.1_spec</artifactId>

19
activemq-rar/src/main/rar/META-INF/NOTICE
View File

@ -1,26 +1,9 @@
Apache ActiveMQ Apache ActiveMQ
Copyright 2005-2008 The Apache Software Foundation Copyright 2005-2012 The Apache Software Foundation
This product includes software developed by This product includes software developed by
The Apache Software Foundation (http://www.apache.org/). The Apache Software Foundation (http://www.apache.org/).
=========================================================================
== Derby Notice ==
=========================================================================
Portions of Derby were orginally developed by
International Business Machines Corporation and are
licensed to the Apache Software Foundation under the
"Software Grant and Corporate Contribution License Agreement",
informally known as the "Derby CLA".
The portion of the functionTests under 'nist' was originally
developed by the National Institute of Standards and Technology (NIST),
an agency of the United States Department of Commerce, and adapted by
International Business Machines Corporation in accordance with the NIST
Software Acknowledgment and Redistribution document at
http://www.itl.nist.gov/div897/ctg/sql_form.htm
========================================================================= =========================================================================
== Spring Notice == == Spring Notice ==
========================================================================= =========================================================================

2
activemq-rar/src/main/rar/broker-config.xml
View File

@ -20,7 +20,7 @@
xmlns="http://www.springframework.org/schema/beans" xmlns="http://www.springframework.org/schema/beans"
xmlns:amq="http://activemq.apache.org/schema/core" xmlns:amq="http://activemq.apache.org/schema/core"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd"> http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd">
<!-- shutdown hook is disabled as RAR classloader may be gone at shutdown --> <!-- shutdown hook is disabled as RAR classloader may be gone at shutdown -->