activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r646138 - in /activemq/branches/activemq-4.1: activemq-all/pom.xml assembly/pom.xml assembly/src/main/descriptors/unix-bin.xml pom.xml
Date Tue, 08 Apr 2008 23:46:37 GMT
Author: djencks
Date: Tue Apr  8 16:46:36 2008
New Revision: 646138

URL: http://svn.apache.org/viewvc?rev=646138&view=rev
Log:
Fix up some plugin usages

Modified:
    activemq/branches/activemq-4.1/activemq-all/pom.xml
    activemq/branches/activemq-4.1/assembly/pom.xml
    activemq/branches/activemq-4.1/assembly/src/main/descriptors/unix-bin.xml
    activemq/branches/activemq-4.1/pom.xml

Modified: activemq/branches/activemq-4.1/activemq-all/pom.xml
URL: http://svn.apache.org/viewvc/activemq/branches/activemq-4.1/activemq-all/pom.xml?rev=646138&r1=646137&r2=646138&view=diff
==============================================================================
--- activemq/branches/activemq-4.1/activemq-all/pom.xml (original)
+++ activemq/branches/activemq-4.1/activemq-all/pom.xml Tue Apr  8 16:46:36 2008
@@ -58,6 +58,17 @@
 
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <configuration>
+          <archive>
+          <manifest>
+            <mainClass>org.apache.activemq.console.Main</mainClass>
+          </manifest>
+        </archive>
+      </configuration>
+    </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-shade-plugin</artifactId>
         <version>1.0.1</version>
         <!-- n.b. the use of executions here is a bit weird.  The plugin doesn't clean
up between executions so the first one
@@ -70,9 +81,8 @@
               <goal>shade</goal>
             </goals>
             <configuration>
-              <shadedArtifactId>activemq-run</shadedArtifactId>
               <shadedArtifactAttached>true</shadedArtifactAttached>
-              <shadedClassifierName></shadedClassifierName>
+              <shadedClassifierName>run</shadedClassifierName>
               <artifactSet>
                 <includes>
                   <include>${project.groupId}:activemq-console</include>
@@ -86,9 +96,11 @@
                   </includes>
                 </filter>
               </filters>
-              <manifest>
-                <attribute name="Main-Class" value="org.apache.activemq.console.Main"/>
-              </manifest>
+              <archive>
+                <manifest>
+                  <attribute name="Main-Class" value="org.apache.activemq.console.Main"/>
+                </manifest>
+              </archive>
             </configuration>
           </execution>
           <execution>
@@ -113,15 +125,6 @@
                   <include>org.apache.derby:derby</include>
                 </includes>
               </artifactSet>
-
-              <filters>
-                <filter>
-                  <artifact>${project.groupId}:activemq-console</artifact>
-                  <excludes>
-                    <exclude>org/apache/activemq/console/Main*.class</exclude>
-                  </excludes>
-                </filter>
-              </filters>
               <transformers>
                 <transformer implementation="org.apache.maven.plugins.shade.resource.ApacheNoticeResourceTransformer">
                   <projectName>Apache ActiveMQ</projectName>

Modified: activemq/branches/activemq-4.1/assembly/pom.xml
URL: http://svn.apache.org/viewvc/activemq/branches/activemq-4.1/assembly/pom.xml?rev=646138&r1=646137&r2=646138&view=diff
==============================================================================
--- activemq/branches/activemq-4.1/assembly/pom.xml (original)
+++ activemq/branches/activemq-4.1/assembly/pom.xml Tue Apr  8 16:46:36 2008
@@ -56,7 +56,15 @@
       <type>rar</type>
       <optional>true</optional>
     </dependency>
-    
+    <dependency>
+      <groupId>${pom.groupId}</groupId>
+      <artifactId>activemq-all</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>${pom.groupId}</groupId>
+      <artifactId>activemq-run</artifactId>
+    </dependency>
+
     <!-- commons -->
     <dependency>
       <groupId>commons-httpclient</groupId>
@@ -126,7 +134,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-jacc_1.1_spec</artifactId>
+      <artifactId>geronimo-j2ee-jacc_1.0_spec</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.geronimo.specs</groupId>
@@ -207,29 +215,6 @@
         </executions>
       </plugin>
       <!-- Configure which tests are included/excuded -->
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-antrun-plugin</artifactId>
-        <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>
       <plugin>
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>

Modified: activemq/branches/activemq-4.1/assembly/src/main/descriptors/unix-bin.xml
URL: http://svn.apache.org/viewvc/activemq/branches/activemq-4.1/assembly/src/main/descriptors/unix-bin.xml?rev=646138&r1=646137&r2=646138&view=diff
==============================================================================
--- activemq/branches/activemq-4.1/assembly/src/main/descriptors/unix-bin.xml (original)
+++ activemq/branches/activemq-4.1/assembly/src/main/descriptors/unix-bin.xml Tue Apr  8 16:46:36
2008
@@ -88,23 +88,23 @@
       <lineEnding>unix</lineEnding>
     </fileSet>
 
-    <!-- Copy over jar files -->
-    <fileSet>
-      <directory>target</directory>
+  </fileSets>
+  <dependencySets>
+    <dependencySet>
       <outputDirectory>/</outputDirectory>
+      <unpack>false</unpack>
       <includes>
-        <include>${pom.artifactId}-${pom.version}.jar</include>
+        <include>${pom.groupId}:activemq-all</include>
       </includes>
-    </fileSet>
-    <fileSet>
-      <directory>target</directory>
+    </dependencySet>
+    <dependencySet>
       <outputDirectory>/bin</outputDirectory>
+      <unpack>false</unpack>
+      <outputFileNameMapping>run.jar</outputFileNameMapping>
       <includes>
-        <include>run.jar</include>
+        <include>${pom.groupId}:activemq-all:*:run</include>
       </includes>
-    </fileSet>
-  </fileSets>
-  <dependencySets>
+    </dependencySet>
     <dependencySet>
       <outputDirectory>/lib</outputDirectory>
       <unpack>false</unpack>
@@ -112,7 +112,6 @@
       <includes>
          <include>backport-util-concurrent:backport-util-concurrent</include>
          <include>commons-logging:commons-logging</include>
-         <include>geronimo-jms_1.1_spec:geronimo-jms_1.1_spec</include>
          <include>${pom.groupId}:activemq-core</include>
          <include>${pom.groupId}:activeio-core</include>
          <include>${pom.groupId}:activemq-console</include>         
@@ -147,6 +146,7 @@
          <include>org.apache.geronimo.specs:geronimo-j2ee-connector_1.5_spec</include>
          <include>org.apache.xbean:xbean-spring</include>
          <include>org.springframework:spring</include>
+         <include>org.springframework:beans</include>
          <include>xstream:xstream</include>
          <include>xmlpull:xmlpull</include>
          <include>org.apache.activemq:activemq-jmdns_1.0</include>

Modified: activemq/branches/activemq-4.1/pom.xml
URL: http://svn.apache.org/viewvc/activemq/branches/activemq-4.1/pom.xml?rev=646138&r1=646137&r2=646138&view=diff
==============================================================================
--- activemq/branches/activemq-4.1/pom.xml (original)
+++ activemq/branches/activemq-4.1/pom.xml Tue Apr  8 16:46:36 2008
@@ -83,6 +83,7 @@
     <module>activemq-web-demo</module>
     <module>activemq-web-console</module>
     <module>activemq-xmpp</module>
+    <module>activemq-all</module>
     <module>assembly</module>
     <module>activemq-jmdns_1.0</module>
   </modules>
@@ -172,6 +173,28 @@
         <artifactId>activemq-openwire-generator</artifactId>
         <version>${activemq-version}</version>
       </dependency>
+	  <dependency>
+        <groupId>org.apache.activemq</groupId>
+        <artifactId>activemq-all</artifactId>
+        <version>${activemq-version}</version>
+        <classifier>run</classifier>
+      </dependency>
+	  <dependency>
+        <groupId>org.apache.activemq</groupId>
+        <artifactId>activemq-all</artifactId>
+        <version>${activemq-version}</version>
+      </dependency>
+	  <dependency>
+        <groupId>org.apache.activemq</groupId>
+        <artifactId>activemq-all</artifactId>
+        <version>${activemq-version}</version>
+        <classifier>run</classifier>
+      </dependency>
+	  <dependency>
+        <groupId>org.apache.activemq</groupId>
+        <artifactId>activemq-run</artifactId>
+        <version>${activemq-version}</version>
+      </dependency>
 
       <!-- =============================== -->
       <!-- Required dependencies -->
@@ -208,7 +231,7 @@
 
       <dependency>
         <groupId>org.apache.geronimo.specs</groupId>
-        <artifactId>geronimo-jacc_1.1_spec</artifactId>
+        <artifactId>geronimo-j2ee-jacc_1.0_spec</artifactId>
         <version>1.0.1</version>
       </dependency>
 
@@ -699,7 +722,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-assembly-plugin</artifactId>
-          <version>2.1</version>
+          <version>2.2-beta-2</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>



Mime
View raw message