activemq-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Bill Dudney <bdud...@apache.org>
Subject root patch
Date Tue, 20 Dec 2005 05:05:55 GMT
Finally the patch for the root pom.

The RAR bug in the rar plugin for m2 is finally fixed and released so  
you should be able to apply these patches and work with m2 and stop  
using m1. I did not try to generate a site and I ignored tests as  
well just get through the build (except for activecluster which had a  
couple of files that meet the default filter but are not tests, I  
excluded them, please take a quick look at that patch and make sure I  
did not exclude something by mistake).

I noticed that I mistakenly marked everything with 4.0M2 instead of  
4.0M4 - I'd be glad to repatch but I'd guess that would be more  
irritating than helpful.

Sorry the patches were not in a more palatable form. There are lots  
of files that are not ignored (via svn:ignore) that would have made  
for ugly patches from the root.

Here is the output from svn status with the list of files that are  
not ignored. the target dirs are particularly ugly for patches :-)

$ svn status
?      activemq-jaas/surefire.properties
?      activemq-jaas/.wtpmodules
?      activemq-jaas/surefire-classloader.properties
?      activemq-jaas/.settings
M      activemq-jaas/pom.xml
M      pom.xml
?      activemq-core/.wtpmodules
?      activemq-core/.settings
M      activemq-core/pom.xml
?      activeio/pom.xml
?      activeio/activeio-core/.classpath
?      activeio/activeio-core/.wtpmodules
?      activeio/activeio-core/.project
?      activeio/activeio-core/target
?      activeio/activeio-core/.settings
M      activeio/activeio-core/pom.xml
?      activeio/activeio-aio/.classpath
?      activeio/activeio-aio/.wtpmodules
?      activeio/activeio-aio/.project
?      activeio/activeio-aio/target
?      activeio/activeio-aio/.settings
M      activeio/activeio-aio/pom.xml
?      activemq-ra/.wtpmodules
?      activemq-ra/.settings
M      activemq-ra/pom.xml
?      activecluster/.wtpmodules
?      activecluster/target
M      activecluster/.classpath
M      activecluster/.project
A      activecluster/pom.xml

Hope this helps,

Bill Dudney
MyFaces - myfaces.apache.org
Wadi - incubator.apache.org/wadi


Index: pom.xml
===================================================================
--- pom.xml     (revision 357904)
+++ pom.xml     (working copy)
@@ -1,15 +1,24 @@
<model>
-
    <modelVersion>4.0.0</modelVersion>
-  <groupId>activemq</groupId>
+  <groupId>org.apache.activemq</groupId>
    <artifactId>activemq</artifactId>
-  <version>4.0-SNAPSHOT</version>
+  <version>4.0M2</version>
+  <packaging>pom</packaging>
    <name>ActiveMQ JMS Broker Project</name>
+  <mailingLists>
+    <mailingList>
+      <name>Development List</name>
+      <subscribe>activemq-dev@geronimo.apache.org</subscribe>
+      <unsubscribe>activemq-dev@geronimo.apache.org</unsubscribe>
+      <post>activemq-dev@geronimo.apache.org</post>
+    </mailingList>
+  </mailingLists>
+
    <repositories>
      <repository>
        <snapshots>
-        <enabled/>
+        <enabled>true</enabled>
        </snapshots>
        <id>codehaus</id>
        <name>Codehaus Repository</name>
@@ -80,6 +89,8 @@
      <module>activemq-core</module>
      <module>activemq-ra</module>
      <module>activemq-jaas</module>
+    <module>activeio</module>
+    <module>activecluster</module>
    </modules>
    <licenses>
@@ -130,21 +141,25 @@
          <artifactId>geronimo-spec-jms</artifactId>
          <version>1.1-rc4</version>
        </dependency>
+
        <dependency>
          <groupId>geronimo-spec</groupId>
          <artifactId>geronimo-spec-jta</artifactId>
          <version>1.0.1B-rc4</version>
        </dependency>
+
        <dependency>
          <groupId>geronimo-spec</groupId>
          <artifactId>geronimo-spec-j2ee-management</artifactId>
          <version>1.0-rc4</version>
        </dependency>
+
        <dependency>
          <groupId>geronimo-spec</groupId>
          <artifactId>geronimo-spec-j2ee-jacc</artifactId>
          <version>1.0-rc4</version>
        </dependency>
+
        <dependency>
          <groupId>geronimo-spec</groupId>
          <artifactId>geronimo-spec-j2ee-connector</artifactId>
@@ -158,7 +173,7 @@
        <dependency>
          <groupId>xbean</groupId>
          <artifactId>xbean-spring</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.0</version>
        </dependency>

        <!-- Used to configure the activemq logs -->
@@ -186,7 +201,7 @@

        <!-- Optional Spring Support -->
        <dependency>
-        <groupId>springframework</groupId>
+        <groupId>org.springframework</groupId>
          <artifactId>spring</artifactId>
          <version>1.2.4</version>
        </dependency>
@@ -211,11 +226,13 @@
          <artifactId>axion</artifactId>
          <version>1.0-M3-dev</version>
        </dependency>
+
        <dependency>
          <groupId>commons-primitives</groupId>
          <artifactId>commons-primitives</artifactId>
          <version>1.0</version>
        </dependency>
+
        <dependency>
          <groupId>regexp</groupId>
          <artifactId>regexp</artifactId>
@@ -257,6 +274,7 @@
          <artifactId>smack</artifactId>
          <version>1.5.0</version>
        </dependency>
+
        <dependency>
          <groupId>activemq</groupId>
          <artifactId>smackx</artifactId>
@@ -341,7 +359,7 @@
        </dependency>
        <dependency>
-        <groupId>activemq</groupId>
+        <groupId>org.apache.activemq</groupId>
          <artifactId>activemq-jaas</artifactId>
          <version>${project.version}</version>
        </dependency>


Mime
View raw message