[hornetq-commits] JBoss hornetq SVN: r11113 - in branches/HORNETQ-720_Replication: hornetq-bootstrap and 4 other directories.

[do-not-reply at jboss.org]

Author: borges
Date: 2011-08-04 06:53:18 -0400 (Thu, 04 Aug 2011)
New Revision: 11113

Modified:
   branches/HORNETQ-720_Replication/
   branches/HORNETQ-720_Replication/.project
   branches/HORNETQ-720_Replication/hornetq-bootstrap/pom.xml
   branches/HORNETQ-720_Replication/hornetq-ra/pom.xml
   branches/HORNETQ-720_Replication/hornetq-rest/hornetq-rest/pom.xml
   branches/HORNETQ-720_Replication/tests/joram-tests/pom.xml
   branches/HORNETQ-720_Replication/tests/pom.xml
Log:
merge from trunk


Property changes on: branches/HORNETQ-720_Replication
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk:10878-11100
   + /trunk:10878-11112

Modified: branches/HORNETQ-720_Replication/.project
===================================================================
--- branches/HORNETQ-720_Replication/.project	2011-08-04 09:48:05 UTC (rev 11112)
+++ branches/HORNETQ-720_Replication/.project	2011-08-04 10:53:18 UTC (rev 11113)
@@ -20,8 +20,14 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.maven.ide.eclipse.maven2Nature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>net.sourceforge.metrics.nature</nature>

Modified: branches/HORNETQ-720_Replication/hornetq-bootstrap/pom.xml
===================================================================
--- branches/HORNETQ-720_Replication/hornetq-bootstrap/pom.xml	2011-08-04 09:48:05 UTC (rev 11112)
+++ branches/HORNETQ-720_Replication/hornetq-bootstrap/pom.xml	2011-08-04 10:53:18 UTC (rev 11113)
@@ -10,7 +10,6 @@
 
     <artifactId>hornetq-bootstrap</artifactId>
     <packaging>jar</packaging>
-    <version>2.2.3-SNAPSHOT</version>
     <name>HornetQ Bootstrap</name>
 
     <dependencies>
@@ -22,12 +21,10 @@
         <dependency>
             <groupId>org.jboss.microcontainer</groupId>
             <artifactId>jboss-kernel</artifactId>
-            <version>2.0.6.GA</version>
         </dependency>
         <dependency>
             <groupId>org.jboss</groupId>
             <artifactId>jboss-common-core</artifactId>
-            <version>2.2.14.GA</version>
         </dependency>
     </dependencies>
 

Modified: branches/HORNETQ-720_Replication/hornetq-ra/pom.xml
===================================================================
--- branches/HORNETQ-720_Replication/hornetq-ra/pom.xml	2011-08-04 09:48:05 UTC (rev 11112)
+++ branches/HORNETQ-720_Replication/hornetq-ra/pom.xml	2011-08-04 10:53:18 UTC (rev 11113)
@@ -1,4 +1,5 @@
-<project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
    <name>HornetQ RAR POM</name>
    <modelVersion>4.0.0</modelVersion>
 

Modified: branches/HORNETQ-720_Replication/hornetq-rest/hornetq-rest/pom.xml
===================================================================
--- branches/HORNETQ-720_Replication/hornetq-rest/hornetq-rest/pom.xml	2011-08-04 09:48:05 UTC (rev 11112)
+++ branches/HORNETQ-720_Replication/hornetq-rest/hornetq-rest/pom.xml	2011-08-04 10:53:18 UTC (rev 11113)
@@ -7,7 +7,6 @@
         <version>2.2.3-SNAPSHOT</version>
     </parent>
 
-    <groupId>org.hornetq.rest</groupId>
     <artifactId>hornetq-rest</artifactId>
     <packaging>jar</packaging>
     <name>HornetQ REST Interface Implementation</name>

Modified: branches/HORNETQ-720_Replication/tests/joram-tests/pom.xml
===================================================================
--- branches/HORNETQ-720_Replication/tests/joram-tests/pom.xml	2011-08-04 09:48:05 UTC (rev 11112)
+++ branches/HORNETQ-720_Replication/tests/joram-tests/pom.xml	2011-08-04 10:53:18 UTC (rev 11113)
@@ -20,7 +20,6 @@
       <version>2.2.3-SNAPSHOT</version>
    </parent>
 
-   <groupId>org.hornetq.tests</groupId>
    <artifactId>joram-tests</artifactId>
    <packaging>jar</packaging>
    <name>HornetQ Joram Tests</name>

Modified: branches/HORNETQ-720_Replication/tests/pom.xml
===================================================================
--- branches/HORNETQ-720_Replication/tests/pom.xml	2011-08-04 09:48:05 UTC (rev 11112)
+++ branches/HORNETQ-720_Replication/tests/pom.xml	2011-08-04 10:53:18 UTC (rev 11113)
@@ -1,4 +1,5 @@
-<project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
    <parent>
       <groupId>org.hornetq</groupId>
       <artifactId>hornetq-pom</artifactId>