activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject svn commit: r1387528 - in /activemq/trunk/activemq-rar: pom.xml src/main/rar/META-INF/NOTICE src/main/rar/broker-config.xml
Date Wed, 19 Sep 2012 11:25:30 GMT
Author: davsclaus
Date: Wed Sep 19 11:25:29 2012
New Revision: 1387528

URL: http://svn.apache.org/viewvc?rev=1387528&view=rev
Log:
AMQ-4063: RAR should not include derby.

Modified:
    activemq/trunk/activemq-rar/pom.xml
    activemq/trunk/activemq-rar/src/main/rar/META-INF/NOTICE
    activemq/trunk/activemq-rar/src/main/rar/broker-config.xml

Modified: activemq/trunk/activemq-rar/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-rar/pom.xml?rev=1387528&r1=1387527&r2=1387528&view=diff
==============================================================================
--- activemq/trunk/activemq-rar/pom.xml (original)
+++ activemq/trunk/activemq-rar/pom.xml Wed Sep 19 11:25:29 2012
@@ -122,8 +122,8 @@
            <artifactId>regexp</artifactId>
         </exclusion>
         <exclusion>
-           <groupId>org.apache.activemq</groupId>
-           <artifactId>activemq-jmdns_1.0</artifactId>
+           <groupId>javax.jmdns</groupId>
+           <artifactId>jmdns</artifactId>
         </exclusion>
         <exclusion>
            <groupId>xalan</groupId>
@@ -198,10 +198,6 @@
         <artifactId>spring-context</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.derby</groupId>
-      <artifactId>derby</artifactId>
-    </dependency>
-    <dependency>
       <groupId>org.apache.geronimo.specs</groupId>
       <artifactId>geronimo-j2ee-management_1.1_spec</artifactId>
     </dependency>

Modified: activemq/trunk/activemq-rar/src/main/rar/META-INF/NOTICE
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-rar/src/main/rar/META-INF/NOTICE?rev=1387528&r1=1387527&r2=1387528&view=diff
==============================================================================
--- activemq/trunk/activemq-rar/src/main/rar/META-INF/NOTICE (original)
+++ activemq/trunk/activemq-rar/src/main/rar/META-INF/NOTICE Wed Sep 19 11:25:29 2012
@@ -1,27 +1,10 @@
 Apache ActiveMQ
-Copyright 2005-2008 The Apache Software Foundation
+Copyright 2005-2012 The Apache Software Foundation
 
 This product includes software developed by
 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                                                      ==
 =========================================================================
 

Modified: activemq/trunk/activemq-rar/src/main/rar/broker-config.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-rar/src/main/rar/broker-config.xml?rev=1387528&r1=1387527&r2=1387528&view=diff
==============================================================================
--- activemq/trunk/activemq-rar/src/main/rar/broker-config.xml (original)
+++ activemq/trunk/activemq-rar/src/main/rar/broker-config.xml Wed Sep 19 11:25:29 2012
@@ -20,7 +20,7 @@
   xmlns="http://www.springframework.org/schema/beans"
   xmlns:amq="http://activemq.apache.org/schema/core"
   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">
 
   <!--  shutdown hook is disabled as RAR classloader may be gone at shutdown -->



Mime
View raw message