From 04fb26a02a653413e3c32aa40c7d08f3d3918d4c Mon Sep 17 00:00:00 2001
From: Paul Buonopane <paul+git@earth2me.com>
Date: Mon, 29 Dec 2014 12:19:50 -0500
Subject: [PATCH] Better packaging for distribution

---
 .../assembly/{all-individual.xml => bin.xml}  | 18 +++++++++++++--
 Assembly/pom.xml                              | 22 ++++---------------
 ForgePluginBukkit/pom.xml                     |  3 ---
 pom.xml                                       |  6 +----
 4 files changed, 21 insertions(+), 28 deletions(-)
 rename Assembly/assembly/{all-individual.xml => bin.xml} (62%)
 mode change 100755 => 100644

diff --git a/Assembly/assembly/all-individual.xml b/Assembly/assembly/bin.xml
old mode 100755
new mode 100644
similarity index 62%
rename from Assembly/assembly/all-individual.xml
rename to Assembly/assembly/bin.xml
index 6287ca4..7a9f51f
--- a/Assembly/assembly/all-individual.xml
+++ b/Assembly/assembly/bin.xml
@@ -4,10 +4,12 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
 
-	<id>all-individual</id>
+	<id>bin</id>
 	<formats>
 		<format>dir</format>
+		<format>zip</format>
 	</formats>
+
 	<includeBaseDirectory>false</includeBaseDirectory>
 
 	<files>
@@ -19,12 +21,24 @@
 
 	<dependencySets>
 		<dependencySet>
-			<outputDirectory>/</outputDirectory>
+			<outputDirectory>/plugins</outputDirectory>
+			<useProjectArtifact>false</useProjectArtifact>
+			<useProjectAttachments>false</useProjectAttachments>
+			<includes>
+				<include>${project.groupId}:ForgePluginBukkit</include>
+			</includes>
+			<outputFileNameMapping>${artifact.build.finalName}.${artifact.extension}</outputFileNameMapping>
+		</dependencySet>
+		<dependencySet>
+			<outputDirectory>/mods</outputDirectory>
 			<useProjectArtifact>false</useProjectArtifact>
 			<useProjectAttachments>false</useProjectAttachments>
 			<includes>
 				<include>${project.groupId}:*</include>
 			</includes>
+			<excludes>
+				<exclude>${project.groupId}:ForgePluginBukkit</exclude>
+			</excludes>
 			<outputFileNameMapping>${artifact.build.finalName}.${artifact.extension}</outputFileNameMapping>
 		</dependencySet>
 	</dependencySets>
diff --git a/Assembly/pom.xml b/Assembly/pom.xml
index 1fda388..d4cfe4e 100755
--- a/Assembly/pom.xml
+++ b/Assembly/pom.xml
@@ -50,34 +50,20 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-assembly-plugin</artifactId>
-				<version>2.4</version>
+				<version>2.5.3</version>
 				<executions>
 					<execution>
-						<id>all-individual</id>
+						<id>bin</id>
 						<phase>package</phase>
 						<goals>
 							<goal>single</goal>
 						</goals>
 						<configuration>
-							<outputDirectory>${dir.artifacts.individual}</outputDirectory>
+							<outputDirectory>${dir.artifacts}</outputDirectory>
 							<finalName>ForgePlugin</finalName>
 							<attach>false</attach>
 							<descriptors>
-								<descriptor>${assembly.all.individual}</descriptor>
-							</descriptors>
-						</configuration>
-					</execution>
-					<execution>
-						<id>all-packaged</id>
-						<phase>package</phase>
-						<goals>
-							<goal>single</goal>
-						</goals>
-						<configuration>
-							<outputDirectory>${dir.artifacts.packaged}</outputDirectory>
-							<finalName>ForgePlugin-${project.version}</finalName>
-							<descriptors>
-								<descriptor>${assembly.all.packaged}</descriptor>
+								<descriptor>${project.basedir}/assembly/bin.xml</descriptor>
 							</descriptors>
 						</configuration>
 					</execution>
diff --git a/ForgePluginBukkit/pom.xml b/ForgePluginBukkit/pom.xml
index c3ef391..258e7ea 100755
--- a/ForgePluginBukkit/pom.xml
+++ b/ForgePluginBukkit/pom.xml
@@ -42,9 +42,6 @@
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-jar-plugin</artifactId>
 				<version>2.4</version>
-				<configuration>
-					<outputDirectory>${dir.artifacts}</outputDirectory>
-				</configuration>
 			</plugin>
 		</plugins>
 	</build>
diff --git a/pom.xml b/pom.xml
index 57db5b3..b3c61a0 100755
--- a/pom.xml
+++ b/pom.xml
@@ -67,11 +67,7 @@
 
 	<properties>
 		<dir.base>${project.basedir}/..</dir.base>
-		<dir.artifacts.individual>${project.basedir}/../artifacts/individual</dir.artifacts.individual>
-		<dir.artifacts.packaged>${project.basedir}/../artifacts/packaged</dir.artifacts.packaged>
-
-		<assembly.all.individual>${project.basedir}/../Assembly/assembly/all-individual.xml</assembly.all.individual>
-		<assembly.all.packaged>${project.basedir}/../Assembly/assembly/all-packaged.xml</assembly.all.packaged>
+		<dir.artifacts>${project.basedir}/../artifacts</dir.artifacts>
 
 		<name.plugin>${project.name}</name.plugin>
 		<name.mod>mod_${project.name}</name.mod>