Use shared assembly to package modules

frascati/intents/pom.xml

@@ -39,15 +39,19 @@
     <module>authentication</module>
     <module>uml-sequence-diagram</module>
   </modules>
-   
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-      </plugin>
-    </plugins>
-  </build>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+			</plugin>
+			<plugin>
+				<artifactId>maven-assembly-plugin</artifactId>
+      			<groupId>org.apache.maven.plugins</groupId>
+			</plugin>
+		</plugins>
+	</build>
 
   <dependencies>
     <dependency>

frascati/intents/uml-sequence-diagram/pom.xml

@@ -75,25 +75,6 @@
 
 	<build>
 		<plugins>
-			<!-- Create jar for this intent -->
-			<plugin>
-				<artifactId>maven-assembly-plugin</artifactId>
-				<version>2.2</version>
-				<configuration>
-					<descriptorRefs>
-						<descriptorRef>jar-with-dependencies</descriptorRef>
-					</descriptorRefs>
-				</configuration>
-				<executions>
-					<execution>
-						<id>make-assembly</id>
-						<phase>package</phase>
-						<goals>
-							<goal>single</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
 
 			<!-- Create ZIP for this intent. -->
 <!-- TODO

frascati/maven-plugins/frascati-assembly-descriptor/pom.xml

+<?xml version="1.0"?>
+<!--
+  * OW2 FraSCAti: Compiler Maven Plugin
+  *
+  * Copyright (c) 2007-2010 INRIA
+  *
+  * This library is free software; you can redistribute it and/or
+  * modify it under the terms of the GNU Lesser General Public
+  * License as published by the Free Software Foundation; either
+  * version 2 of the License, or (at your option) any later version.
+  *
+  * This library is distributed in the hope that it will be useful,
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  * Lesser General Public License for more details.
+  *
+  * You should have received a copy of the GNU Lesser General Public
+  * License along with this library; if not, write to the Free Software
+  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+-->
+<project
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+	xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+	<modelVersion>4.0.0</modelVersion>
+	
+    <!-- ===================== -->
+    <!-- General Information   -->
+    <!-- ===================== -->
+	<parent>
+		<groupId>org.ow2.frascati.mojo</groupId>
+		<artifactId>maven-plugins-parent</artifactId>
+		<version>1.4-SNAPSHOT</version>
+	</parent>
+
+	<groupId>org.ow2.frascati.mojo</groupId>
+	<artifactId>frascati-assemby-descriptor</artifactId>
+</project>
\ No newline at end of file

frascati/assembly-bin.xml → frascati/maven-plugins/frascati-assembly-descriptor/src/main/resources/assembly-bin.xml

@@ -27,7 +27,7 @@
 
 <assembly>
 
-    <id>bin</id>
+    <id>assembly-bin</id>
 
     <formats>
         <format>zip</format>

frascati/maven-plugins/pom.xml

@@ -80,6 +80,7 @@
         <module>frascati-compiler</module>
         <module>frascati-contribution</module>
         <module>frascati-launcher</module>
+        <module>frascati-assembly-descriptor</module>
     </modules>
 
 </project>

frascati/modules/pom.xml

@@ -139,8 +139,12 @@
       </plugins>
     </pluginManagement>
 
-    <plugins>
-    </plugins>
+	<plugins>
+		<plugin>
+			<artifactId>maven-assembly-plugin</artifactId>
+        	<groupId>org.apache.maven.plugins</groupId>
+		</plugin>
+	</plugins>
 
     <!-- Exclude .composite_diagram from generated JARs. -->
     <resources>

frascati/pom.xml

@@ -67,7 +67,6 @@
   <properties>
     <frascati.basedir>../..</frascati.basedir>
     <frascati.logging.properties>${frascati.basedir}/logging.properties</frascati.logging.properties>
-    <frascati.assembly-bin.xml>${frascati.basedir}/assembly-bin.xml</frascati.assembly-bin.xml>
   </properties>
 
   <!-- ======= -->
@@ -142,20 +141,31 @@
         <artifactId>maven-depgraph-plugin</artifactId>
       </plugin>
 
-      <!-- Build the binary assembly. -->
-      <!-- To use this plugin, type: 'mvn assembly:assembly' -->
-      <plugin>
-        <artifactId>maven-assembly-plugin</artifactId>
-        <groupId>org.apache.maven.plugins</groupId>
-        <configuration>
-          <descriptors>
-            <descriptor>${frascati.assembly-bin.xml}</descriptor>
-          </descriptors>
-        </configuration>
-      </plugin>
-
     </plugins>
 
+	<pluginManagement>
+		<plugins>
+     	<!-- Create jar for this intent -->
+			<plugin>
+				<artifactId>maven-assembly-plugin</artifactId>
+				<version>2.2</version>
+				<dependencies>
+					<dependency>
+						<groupId>org.ow2.frascati.mojo</groupId>
+						<artifactId>frascati-assemby-descriptor</artifactId>
+						<version>${project.version}</version>
+					</dependency>
+				</dependencies>
+				<configuration>
+              <!-- This is where we use our shared assembly descriptor -->
+					<descriptorRefs>
+						<descriptorRef>bin</descriptorRef>
+					</descriptorRefs>
+				</configuration>
+			</plugin>
+		</plugins>
+	</pluginManagement>
+
   </build>
 
   <!-- ============ -->