activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From foco...@apache.org
Subject svn commit: r448814 - in /incubator/activemq/branches/activemq-4.0: activemq-core/pom.xml assembly/pom.xml
Date Fri, 22 Sep 2006 04:50:41 GMT
Author: foconer
Date: Thu Sep 21 21:50:40 2006
New Revision: 448814

URL: http://svn.apache.org/viewvc?view=rev&rev=448814
Log:
Issue: AMQ-934
Description:
1. Updated version of javacc-maven-plugin and maven-assembly-plugin.xml because it was unable
to download the snapshot versions.
2. Removed run.java assembly execution and replaced it using maven-antlr-plugin to build the
run.jar artifact.

Modified:
    incubator/activemq/branches/activemq-4.0/activemq-core/pom.xml
    incubator/activemq/branches/activemq-4.0/assembly/pom.xml

Modified: incubator/activemq/branches/activemq-4.0/activemq-core/pom.xml
URL: http://svn.apache.org/viewvc/incubator/activemq/branches/activemq-4.0/activemq-core/pom.xml?view=diff&rev=448814&r1=448813&r2=448814
==============================================================================
--- incubator/activemq/branches/activemq-4.0/activemq-core/pom.xml (original)
+++ incubator/activemq/branches/activemq-4.0/activemq-core/pom.xml Thu Sep 21 21:50:40 2006
@@ -311,7 +311,7 @@
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>javacc-maven-plugin</artifactId>
-        <version>0.6.1-SNAPSHOT</version>
+        <version>2.1</version>
         <executions>
           <execution>
             <phase>generate-sources</phase>

Modified: incubator/activemq/branches/activemq-4.0/assembly/pom.xml
URL: http://svn.apache.org/viewvc/incubator/activemq/branches/activemq-4.0/assembly/pom.xml?view=diff&rev=448814&r1=448813&r2=448814
==============================================================================
--- incubator/activemq/branches/activemq-4.0/assembly/pom.xml (original)
+++ incubator/activemq/branches/activemq-4.0/assembly/pom.xml Thu Sep 21 21:50:40 2006
@@ -217,9 +217,32 @@
     
   </dependencies>
 
-  <build>
-    
+  <build>    
     <plugins>
+	  <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-antrun-plugin</artifactId>
+        <version>1.1</version>
+        <executions>
+          <execution>
+            <id>run-jar</id>
+            <phase>package</phase>
+            <configuration>
+              <tasks>
+                <jar destfile="target/run.jar" basedir="target/classes">
+		          <include name="org/apache/activemq/console/Main*.class"/>
+		          <manifest>
+		            <attribute name="Main-Class" value="org.apache.activemq.console.Main"/>
+		          </manifest>
+                </jar>
+              </tasks>
+            </configuration>
+            <goals>
+              <goal>run</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
       <!-- Configure which tests are included/excuded -->
       <plugin>
         <artifactId>maven-surefire-plugin</artifactId>
@@ -257,27 +280,8 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-assembly-plugin</artifactId>
-        <version>2.1-SNAPSHOT</version>
+        <version>2.1</version>
         <executions>
-          <execution>
-            <id>run</id>
-            <phase>package</phase>
-            <goals>
-              <goal>assembly</goal>
-            </goals>
-            <configuration>
-              <descriptors>
-                 <descriptor>src/main/descriptors/run-jar.xml</descriptor>
-              </descriptors>
-              <finalName>run</finalName>
-              <appendAssemblyId>false</appendAssemblyId>
-              <archive>
-                <manifest>
-                  <mainClass>org.apache.activemq.console.Main</mainClass>
-                </manifest>
-              </archive>
-            </configuration>
-          </execution>
           <execution>
             <id>bin</id>
             <phase>package</phase>



Mime
View raw message