activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chir...@apache.org
Subject svn commit: r398279 - in /incubator/activemq/trunk: ./ activemq-core/ activemq-rar/ assembly/ assembly/src/main/descriptors/ assembly/src/release/ etc/
Date Sun, 30 Apr 2006 05:01:53 GMT
Author: chirino
Date: Sat Apr 29 22:01:50 2006
New Revision: 398279

URL: http://svn.apache.org/viewcvs?rev=398279&view=rev
Log:
Making the m2 release look like the m1 release

Added:
    incubator/activemq/trunk/assembly/src/release/NOTICE
      - copied unchanged from r398254, incubator/activemq/trunk/NOTICE
    incubator/activemq/trunk/assembly/src/release/README.txt
      - copied unchanged from r398254, incubator/activemq/trunk/README.txt
Removed:
    incubator/activemq/trunk/assembly/README.txt
Modified:
    incubator/activemq/trunk/activemq-core/pom.xml
    incubator/activemq/trunk/activemq-rar/pom.xml
    incubator/activemq/trunk/assembly/pom.xml
    incubator/activemq/trunk/assembly/src/main/descriptors/bin.xml
    incubator/activemq/trunk/etc/project.properties
    incubator/activemq/trunk/pom.xml

Modified: incubator/activemq/trunk/activemq-core/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/pom.xml?rev=398279&r1=398278&r2=398279&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/pom.xml (original)
+++ incubator/activemq/trunk/activemq-core/pom.xml Sat Apr 29 22:01:50 2006
@@ -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>incubator-activemq</groupId>
-      <artifactId>activemq-jaas</artifactId>
-      <optional>true</optional>
+      <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-jms_1.1_spec</artifactId>
+      <optional>false</optional>
     </dependency>
-    
+
     <!-- =============================== -->
-    <!-- common dependencies -->
+    <!-- Optional Dependencies -->
     <!-- =============================== -->
-    
-    <!-- geronimo -->
     <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-jms_1.1_spec</artifactId>
+      <groupId>incubator-activemq</groupId>
+      <artifactId>activemq-jaas</artifactId>
+      <optional>true</optional>
     </dependency>
+ 
     <dependency>
       <groupId>org.apache.geronimo.specs</groupId>
       <artifactId>geronimo-jta_1.0.1B_spec</artifactId>

Modified: incubator/activemq/trunk/activemq-rar/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-rar/pom.xml?rev=398279&r1=398278&r2=398279&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-rar/pom.xml (original)
+++ incubator/activemq/trunk/activemq-rar/pom.xml Sat Apr 29 22:01:50 2006
@@ -189,10 +189,6 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring</artifactId>
-    </dependency>
-    <dependency>
       <groupId>org.apache.xbean</groupId>
       <artifactId>xbean-spring</artifactId>
     </dependency>

Modified: incubator/activemq/trunk/assembly/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/assembly/pom.xml?rev=398279&r1=398278&r2=398279&view=diff
==============================================================================
--- incubator/activemq/trunk/assembly/pom.xml (original)
+++ incubator/activemq/trunk/assembly/pom.xml Sat Apr 29 22:01:50 2006
@@ -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>
@@ -164,6 +176,10 @@
       <artifactId>jetty</artifactId>
     </dependency>
     <dependency>
+      <groupId>org.mortbay.jetty</groupId>
+      <artifactId>jetty-util</artifactId>
+    </dependency>
+    <dependency>
       <groupId>org.apache.derby</groupId>
       <artifactId>derby</artifactId>
       <optional>true</optional>
@@ -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>

Modified: incubator/activemq/trunk/assembly/src/main/descriptors/bin.xml
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/assembly/src/main/descriptors/bin.xml?rev=398279&r1=398278&r2=398279&view=diff
==============================================================================
--- incubator/activemq/trunk/assembly/src/main/descriptors/bin.xml (original)
+++ incubator/activemq/trunk/assembly/src/main/descriptors/bin.xml Sat Apr 29 22:01:50 2006
@@ -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>

Modified: incubator/activemq/trunk/etc/project.properties
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/etc/project.properties?rev=398279&r1=398278&r2=398279&view=diff
==============================================================================
--- incubator/activemq/trunk/etc/project.properties (original)
+++ incubator/activemq/trunk/etc/project.properties Sat Apr 29 22:01:50 2006
@@ -75,7 +75,7 @@
 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 @@
 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 @@
 <!-- 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 @@
 <!-- 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

Modified: incubator/activemq/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/pom.xml?rev=398279&r1=398278&r2=398279&view=diff
==============================================================================
--- incubator/activemq/trunk/pom.xml (original)
+++ incubator/activemq/trunk/pom.xml Sat Apr 29 22:01:50 2006
@@ -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 -->
@@ -618,13 +646,6 @@
         <groupId>jdom</groupId> 
         <artifactId>jdom</artifactId>
         <version>1.0</version>
-      </dependency>
-      
-      <!-- ACTIVEMQ-CORE DEPENDENCIES -->
-      <dependency>
-        <groupId>activeio</groupId>
-        <artifactId>activeio</artifactId>
-        <version>2.1</version>
       </dependency>
       
       <!-- ACTIVEMQ-JAAS Dependencies -->



Mime
View raw message