activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chir...@apache.org
Subject svn commit: r1236493 - in /activemq/activemq-apollo/trunk: apollo-distro/pom.xml apollo-openwire/pom.xml pom.xml
Date Fri, 27 Jan 2012 02:12:46 GMT
Author: chirino
Date: Fri Jan 27 02:12:46 2012
New Revision: 1236493

URL: http://svn.apache.org/viewvc?rev=1236493&view=rev
Log:
Take openwire out of the unstable profile.

Modified:
    activemq/activemq-apollo/trunk/apollo-distro/pom.xml
    activemq/activemq-apollo/trunk/apollo-openwire/pom.xml
    activemq/activemq-apollo/trunk/pom.xml

Modified: activemq/activemq-apollo/trunk/apollo-distro/pom.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-distro/pom.xml?rev=1236493&r1=1236492&r2=1236493&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-distro/pom.xml (original)
+++ activemq/activemq-apollo/trunk/apollo-distro/pom.xml Fri Jan 27 02:12:46 2012
@@ -70,6 +70,12 @@
     </dependency>
     <dependency>
       <groupId>org.apache.activemq</groupId>
+      <artifactId>apollo-openwire</artifactId>
+      <version>1.1-SNAPSHOT</version>
+    </dependency> 
+    
+    <dependency>
+      <groupId>org.apache.activemq</groupId>
       <artifactId>apollo-web</artifactId>
       <version>1.1-SNAPSHOT</version>
       <type>jar</type>
@@ -126,19 +132,12 @@
   </dependencies>
   
   <profiles>
-    
     <!-- to include the unstable modules -->
     <profile>
       <id>unstable</id>
       <dependencies>
-        <dependency>
-          <groupId>org.apache.activemq</groupId>
-          <artifactId>apollo-openwire</artifactId>
-          <version>${project.version}</version>
-        </dependency> 
       </dependencies>
     </profile>
-    
   </profiles>
     
   <build>

Modified: activemq/activemq-apollo/trunk/apollo-openwire/pom.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-openwire/pom.xml?rev=1236493&r1=1236492&r2=1236493&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-openwire/pom.xml (original)
+++ activemq/activemq-apollo/trunk/apollo-openwire/pom.xml Fri Jan 27 02:12:46 2012
@@ -148,11 +148,22 @@
         <openwire-src>${basedir}/src/main/scala</openwire-src>
         <openwire-version>8</openwire-version>
       </properties>
+      <dependencies>
+        <!-- we add this here so the reactor builds it first -->
+        <dependency>
+          <groupId>org.apache.activemq</groupId>
+          <artifactId>apollo-openwire-generator</artifactId>
+          <version>${project.version}</version>
+          <scope>test</scope>
+        </dependency>
+      </dependencies>
+    
       <build>
         <plugins>
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-antrun-plugin</artifactId>
+            <version>1.7</version>
             <executions>
               <execution>
                 <id>default</id>

Modified: activemq/activemq-apollo/trunk/pom.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/pom.xml?rev=1236493&r1=1236492&r2=1236493&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/pom.xml (original)
+++ activemq/activemq-apollo/trunk/pom.xml Fri Jan 27 02:12:46 2012
@@ -172,6 +172,7 @@
     <module>apollo-web</module>
     <module>apollo-cli</module>
     <module>apollo-website</module>
+    <module>apollo-openwire</module>
     <module>apollo-distro</module>
   </modules>
 
@@ -463,20 +464,24 @@
 
   <profiles>
     
+    <profile>
+      <id>itests</id>
+      <modules>
+        <module>apollo-itests</module>
+      </modules>
+    </profile>
+
     <!-- to build the unstable modules -->
     <profile>
       <id>unstable</id>
       <modules>
-        <module>apollo-openwire</module>
-        <module>apollo-openwire-generator</module>
       </modules>
     </profile>
 
     <profile>
-      <!-- TODO - for now until tests become stable -->
-      <id>itests</id>
+      <id>openwire-generate</id>
       <modules>
-        <module>apollo-itests</module>
+        <module>apollo-openwire-generator</module>
       </modules>
     </profile>
     



Mime
View raw message