From ab3173f8402123b218b88eb81e064e37bdc7b2f7 Mon Sep 17 00:00:00 2001
From: jamesagnew <jamesagnew@gmail.com>
Date: Thu, 24 Apr 2014 07:24:27 -0400
Subject: [PATCH] add assembly

---
 hapi-fhir-base/pom.xml                        | 43 ++++++++++-----
 hapi-fhir-base/src/assembly/hapi-fhir-all.xml | 42 +++++++++++++++
 .../rest/server/ResfulServerMethodTest.java   |  2 +-
 hapi-fhir-structures-dstu/pom.xml             |  2 +-
 hapi-tinder-plugin/pom.xml                    |  4 +-
 hapi-tinder-test/pom.xml                      |  2 +-
 pom.xml                                       | 52 +++++++++++--------
 7 files changed, 107 insertions(+), 40 deletions(-)
 create mode 100644 hapi-fhir-base/src/assembly/hapi-fhir-all.xml

diff --git a/hapi-fhir-base/pom.xml b/hapi-fhir-base/pom.xml
index 50e3d7f9e83..bcbb4ce7194 100644
--- a/hapi-fhir-base/pom.xml
+++ b/hapi-fhir-base/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>ca.uhn.hapi.fhir</groupId>
 		<artifactId>hapi-fhir</artifactId>
-		<version>0.1</version>
+		<version>0.2</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
@@ -47,9 +47,9 @@
 		<!-- <dependency> <groupId>org.codehaus.woodstox</groupId> <artifactId>stax2-api</artifactId> <version>3.1.3</version> </dependency> -->
 
 		<dependency>
-		    <groupId>org.thymeleaf</groupId>
-		    <artifactId>thymeleaf</artifactId>
-		    <version>2.1.2.RELEASE</version>
+			<groupId>org.thymeleaf</groupId>
+			<artifactId>thymeleaf</artifactId>
+			<version>2.1.2.RELEASE</version>
 			<optional>true</optional>
 		</dependency>
 
@@ -161,12 +161,12 @@
 			<version>9.1.1.v20140108</version>
 			<scope>test</scope>
 		</dependency>
-        <dependency>
-            <groupId>org.eclipse.jetty</groupId>
-            <artifactId>jetty-util</artifactId>
-            <version>9.1.1.v20140108</version>
-            <scope>test</scope>
-        </dependency>
+		<dependency>
+			<groupId>org.eclipse.jetty</groupId>
+			<artifactId>jetty-util</artifactId>
+			<version>9.1.1.v20140108</version>
+			<scope>test</scope>
+		</dependency>
 
 		<dependency>
 			<groupId>commons-httpclient</groupId>
@@ -192,7 +192,7 @@
 
 
 	<reporting>
-	
+
 		<plugins>
 			<plugin>
 				<artifactId>maven-site-plugin</artifactId>
@@ -298,7 +298,7 @@
 								</replace>
 							</target>
 						</configuration>
-					</execution>				
+					</execution>
 					<execution>
 						<id>addAnalytics</id>
 						<phase>post-site</phase>
@@ -413,6 +413,25 @@
 					</execution>
 				</executions>
 			</plugin>
+			<plugin>
+				<artifactId>maven-assembly-plugin</artifactId>
+				<version>2.4</version>
+				<executions>
+					<execution>
+						<phase>package</phase>
+						<goals>
+							<goal>single</goal>
+						</goals>
+						<configuration>
+							<attach>false</attach>
+							<descriptors>
+								<descriptor>${project.basedir}/src/assembly/hapi-fhir-all.xml</descriptor>
+								<!-- <descriptor>src/assembly/hapi-jdk14.xml</descriptor> -->
+							</descriptors>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
 		</plugins>
 		<resources>
 			<resource>
diff --git a/hapi-fhir-base/src/assembly/hapi-fhir-all.xml b/hapi-fhir-base/src/assembly/hapi-fhir-all.xml
new file mode 100644
index 00000000000..55bdb67b3c5
--- /dev/null
+++ b/hapi-fhir-base/src/assembly/hapi-fhir-all.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<assembly xmlns="urn:assembly" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:assembly http://maven.apache.org/xsd/assembly-1.1.2.xsd">
+
+	<id>all</id>
+
+	<formats>
+		<format>zip</format>
+		<format>tar.bz2</format>
+	</formats>
+
+	<includeBaseDirectory>false</includeBaseDirectory>
+
+	<fileSets>
+		<fileSet>
+			<directory>${project.basedir}</directory>
+			<outputDirectory>/</outputDirectory>
+			<includes>
+				<include>README*</include>
+				<include>LICENSE*</include>
+				<include>NOTICE*</include>
+			</includes>
+		</fileSet>
+		<fileSet>
+			<directory>${project.build.directory}</directory>
+			<outputDirectory>/lib</outputDirectory>
+			<includes>
+				<include>*.jar</include>
+			</includes>
+		</fileSet>
+	</fileSets>
+
+	<dependencySets>
+		<dependencySet>
+			<outputDirectory>/lib/dependency</outputDirectory>
+			<useProjectArtifact>true</useProjectArtifact>
+			<unpack>false</unpack>
+			<scope>runtime</scope>
+		</dependencySet>
+	</dependencySets>
+	
+
+</assembly>
diff --git a/hapi-fhir-base/src/test/java/ca/uhn/fhir/rest/server/ResfulServerMethodTest.java b/hapi-fhir-base/src/test/java/ca/uhn/fhir/rest/server/ResfulServerMethodTest.java
index e6eb8641ed4..58a358b8332 100644
--- a/hapi-fhir-base/src/test/java/ca/uhn/fhir/rest/server/ResfulServerMethodTest.java
+++ b/hapi-fhir-base/src/test/java/ca/uhn/fhir/rest/server/ResfulServerMethodTest.java
@@ -682,7 +682,7 @@ public class ResfulServerMethodTest {
 		responseContent = IOUtils.toString(status.getEntity().getContent());
 		ourLog.info("Response was:\n{}", responseContent);
 
-		assertEquals(404, status.getStatusLine().getStatusCode());
+		assertEquals(200, status.getStatusLine().getStatusCode());
 
 	}
 
diff --git a/hapi-fhir-structures-dstu/pom.xml b/hapi-fhir-structures-dstu/pom.xml
index e08cea5db0c..58fe722a7d1 100644
--- a/hapi-fhir-structures-dstu/pom.xml
+++ b/hapi-fhir-structures-dstu/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>ca.uhn.hapi.fhir</groupId>
 		<artifactId>hapi-fhir</artifactId>
-		<version>0.1</version>
+		<version>0.2</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/hapi-tinder-plugin/pom.xml b/hapi-tinder-plugin/pom.xml
index 781e5c5c1cb..59557a49862 100644
--- a/hapi-tinder-plugin/pom.xml
+++ b/hapi-tinder-plugin/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>ca.uhn.hapi.fhir</groupId>
 		<artifactId>hapi-fhir</artifactId>
-		<version>0.1</version>
+		<version>0.2</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
@@ -20,7 +20,7 @@
 		<dependency>
 			<groupId>ca.uhn.hapi.fhir</groupId>
 			<artifactId>hapi-fhir-base</artifactId>
-			<version>0.1</version>
+			<version>0.2</version>
 		</dependency>
 
 		<dependency>
diff --git a/hapi-tinder-test/pom.xml b/hapi-tinder-test/pom.xml
index 99d06544251..f3b19723443 100644
--- a/hapi-tinder-test/pom.xml
+++ b/hapi-tinder-test/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>ca.uhn.hapi.fhir</groupId>
 		<artifactId>hapi-fhir</artifactId>
-		<version>0.1</version>
+		<version>0.2</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/pom.xml b/pom.xml
index a29417726fe..2a1a45b4a8a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
 	<groupId>ca.uhn.hapi.fhir</groupId>
 	<artifactId>hapi-fhir</artifactId>
 	<packaging>pom</packaging>
-	<version>0.1</version>
+	<version>0.2</version>
 	<name>HAPI</name>
 	<url>http://hl7api.sourceforge.net/</url>
 	<description>
@@ -30,10 +30,8 @@
 	<modules>
 		<module>hapi-fhir-base</module>
 		<module>hapi-tinder-plugin</module>
-		<!--
 		<module>hapi-tinder-test</module>
 		<module>hapi-fhir-structures-dstu</module>
-		-->
 	</modules>
 
 	<properties>
@@ -86,27 +84,35 @@
 			</plugins>
 		</pluginManagement>
 
-	<plugins>
-
-<plugin>
-                  <groupId>org.apache.maven.plugins</groupId>
-                  <artifactId>maven-gpg-plugin</artifactId>
-                  <version>1.5</version>
-                  <executions>
-                     <execution>
-                        <id>sign-artifacts</id>
-                        <phase>verify</phase>
-                        <goals>
-                           <goal>sign</goal>
-                        </goals>
-                     </execution>
-                  </executions>
-               </plugin>
-
-	</plugins>
-
 	</build>
 
-
+	<profiles>
+		<profile>
+			<id>SIGN_ARTIFACTS</id>
+			<activation>
+				<property>
+					<name>gpg.passphrase</name>
+				</property>
+			</activation>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-gpg-plugin</artifactId>
+						<version>1.5</version>
+						<executions>
+							<execution>
+								<id>sign-artifacts</id>
+								<phase>verify</phase>
+								<goals>
+									<goal>sign</goal>
+								</goals>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+	</profiles>
 
 </project>