AMQ-4063: RAR should not include derby.

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1387528 13f79535-47bb-0310-9956-ffa450edef68

activemq-rar/pom.xml

@@ -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>
@@ -197,10 +197,6 @@
         <groupId>org.springframework</groupId>
         <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>

activemq-rar/src/main/rar/META-INF/NOTICE

@@ -1,26 +1,9 @@
 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                                                      ==
 =========================================================================

activemq-rar/src/main/rar/broker-config.xml

@@ -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 -->