activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tab...@apache.org
Subject svn commit: r788724 - in /activemq/activemq-cpp/trunk: activemq-cpp-openwire-generator/pom.xml activemq-cpp/pom.xml maven-cpptools-plugin/pom.xml
Date Fri, 26 Jun 2009 14:54:46 GMT
Author: tabish
Date: Fri Jun 26 14:54:45 2009
New Revision: 788724

URL: http://svn.apache.org/viewvc?rev=788724&view=rev
Log:
Update for latest Apache Release recommendations

Modified:
    activemq/activemq-cpp/trunk/activemq-cpp-openwire-generator/pom.xml
    activemq/activemq-cpp/trunk/activemq-cpp/pom.xml
    activemq/activemq-cpp/trunk/maven-cpptools-plugin/pom.xml

Modified: activemq/activemq-cpp/trunk/activemq-cpp-openwire-generator/pom.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp-openwire-generator/pom.xml?rev=788724&r1=788723&r2=788724&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp-openwire-generator/pom.xml (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp-openwire-generator/pom.xml Fri Jun 26 14:54:45
2009
@@ -32,7 +32,6 @@
   <packaging>jar</packaging>
   <name>ActiveMQ-CPP Openwire Generator</name>
   <description>The ActiveMQ-CPP Openwire Command Generator</description>
-  <version>2.0</version>
 
   <dependencies>
     <dependency>

Modified: activemq/activemq-cpp/trunk/activemq-cpp/pom.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/pom.xml?rev=788724&r1=788723&r2=788724&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/pom.xml (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/pom.xml Fri Jun 26 14:54:45 2009
@@ -33,37 +33,17 @@
   <packaging>pom</packaging>
   <name>ActiveMQ-CPP Library</name>
   <description>The ActiveMQ-CPP Library</description>
-  <version>3.0.1-SNAPSHOT</version>
 
   <dependencies>
     <dependency>
       <groupId>org.apache.activemq</groupId>
       <artifactId>activemq-cpp-openwire-generator</artifactId>
-      <version>${activemq-cpp-openwire-generator-version}</version>
+      <version>${project.version}</version>
     </dependency>
   </dependencies>
 
   <build>
     <plugins>
-      <!-- Used to generate the openwire commands and marshalers -->
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-antrun-plugin</artifactId>
-        <inherited>false</inherited>
-        <configuration>
-          <tasks>
-            <taskdef name="generate" classname="org.apache.activemq.openwire.tool.AmqCppGeneratorTask"/>
-            <generate maxVersion="3" source="${activemq-core-dir}" target="${basedir}"/>
-          </tasks>
-        </configuration>
-        <dependencies>
-          <dependency>
-            <groupId>org.apache.activemq</groupId>
-            <artifactId>activemq-cpp-openwire-generator</artifactId>
-            <version>${activemq-cpp-openwire-generator-version}</version>
-          </dependency>
-        </dependencies>
-      </plugin>
       <plugin>
         <groupId>org.apache.activemq.maven</groupId>
         <artifactId>maven-cpptools-plugin</artifactId>
@@ -200,6 +180,42 @@
   </build>
 
   <profiles>
+
+    <profile>
+      <id>openwire-generate</id>
+      <dependencies>
+        <dependency>
+          <groupId>org.apache.activemq</groupId>
+          <artifactId>activemq-cpp-openwire-generator</artifactId>
+          <version>${project.version}</version>
+        </dependency>
+      </dependencies>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-antrun-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>default</id>
+                <phase>generate-sources</phase>
+                <configuration>
+                  <tasks>
+                    <echo>Running OpenWire Generator</echo>
+                    <taskdef name="generate" classname="org.apache.activemq.openwire.tool.AmqCppGeneratorTask"
classpathref="maven.compile.classpath" />
+                    <generate maxVersion="3" source="${activemq-core-dir}" target="${basedir}"/>
+                  </tasks>
+                </configuration>
+                <goals>
+                  <goal>run</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+
     <profile>
       <id>Unix Make</id>
       <activation>

Modified: activemq/activemq-cpp/trunk/maven-cpptools-plugin/pom.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/maven-cpptools-plugin/pom.xml?rev=788724&r1=788723&r2=788724&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/maven-cpptools-plugin/pom.xml (original)
+++ activemq/activemq-cpp/trunk/maven-cpptools-plugin/pom.xml Fri Jun 26 14:54:45 2009
@@ -21,12 +21,18 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
   <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apache.activemq.maven</groupId>
+
+  <parent>
+    <groupId>org.apache.activemq</groupId>
+    <artifactId>activemq-cpp-parent</artifactId>
+    <version>3.0.1-SNAPSHOT</version>
+    <relativePath>../pom.xml</relativePath>
+  </parent>
+
+  <groupId>org.apache.activemq</groupId>
   <artifactId>maven-cpptools-plugin</artifactId>
   <packaging>maven-plugin</packaging>
-  <version>1.0-SNAPSHOT</version>
-  <name>CPP Tools Plugin</name>
-  <url>http://maven.apache.org</url>
+  <name>CPP Maven Project Tools Plugin</name>
 
   <dependencies>
     <dependency>
@@ -83,7 +89,7 @@
         <version>2.4</version>
         <configuration>
           <links>
-            <link>http://java.sun.com/j2se/1.6.0/docs/api/</link>
+            <link>http://java.sun.com/j2se/1.5.0/docs/api/</link>
           </links>
           <linksource>true</linksource>
           <maxmemory>900m</maxmemory>



Mime
View raw message