Version bump

comradms · Jun 25, 2011 · 0060cb0 · 0060cb0
1 parent c2f3697
commit 0060cb0
Show file tree

Hide file tree

Showing 21 changed files with 392 additions and 314 deletions.
diff --git a/hapi-base/pom.xml b/hapi-base/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>hapi</artifactId>
 		<groupId>ca.uhn.hapi</groupId>
-		<version>1.2-alpha2</version>
+		<version>1.2-beta1</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
@@ -57,6 +57,18 @@
 
 	<reporting>
 		<plugins>
+			<plugin>
+				<artifactId>maven-javadoc-plugin</artifactId>
+				<version>2.8</version>
+				<inherited>true</inherited>
+				<configuration>
+					<minmemory>128m</minmemory>
+					<maxmemory>1g</maxmemory>
+					<linksource>true</linksource>
+					<detectLinks>true</detectLinks>
+					<verbose>true</verbose>
+				</configuration>
+			</plugin>
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>taglist-maven-plugin</artifactId>

diff --git a/hapi-examples/pom.xml b/hapi-examples/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>hapi</artifactId>
 		<groupId>ca.uhn.hapi</groupId>
-		<version>1.2-alpha2</version>
+		<version>1.2-beta1</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 

diff --git a/hapi-osgi-base/pom.xml b/hapi-osgi-base/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>hapi</artifactId>
 		<groupId>ca.uhn.hapi</groupId>
-		<version>1.2-alpha2</version>
+		<version>1.2-beta1</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 

diff --git a/hapi-sourcegen/pom.xml b/hapi-sourcegen/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>hapi</artifactId>
 		<groupId>ca.uhn.hapi</groupId>
-		<version>1.2-alpha2</version>
+		<version>1.2-beta1</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 

diff --git a/hapi-structures-v21/pom.xml b/hapi-structures-v21/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>hapi</artifactId>
 		<groupId>ca.uhn.hapi</groupId>
-		<version>1.2-alpha2</version>
+		<version>1.2-beta1</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
@@ -89,7 +89,7 @@
 		<plugins>
 			<plugin>
 				<artifactId>maven-javadoc-plugin</artifactId>
-				<version>2.6.1</version>
+				<version>2.8</version>
 				<inherited>true</inherited>
 				<configuration>
 					<minmemory>128m</minmemory>

diff --git a/hapi-structures-v22/pom.xml b/hapi-structures-v22/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>hapi</artifactId>
 		<groupId>ca.uhn.hapi</groupId>
-		<version>1.2-alpha2</version>
+		<version>1.2-beta1</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
@@ -89,7 +89,7 @@
 		<plugins>
 			<plugin>
 				<artifactId>maven-javadoc-plugin</artifactId>
-				<version>2.6.1</version>
+				<version>2.8</version>
 				<inherited>true</inherited>
 				<configuration>
 					<minmemory>128m</minmemory>

diff --git a/hapi-structures-v23/pom.xml b/hapi-structures-v23/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>hapi</artifactId>
 		<groupId>ca.uhn.hapi</groupId>
-		<version>1.2-alpha2</version>
+		<version>1.2-beta1</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
@@ -90,7 +90,7 @@
 		<plugins>
 			<plugin>
 				<artifactId>maven-javadoc-plugin</artifactId>
-				<version>2.6.1</version>
+				<version>2.8</version>
 				<inherited>true</inherited>
 				<configuration>
 					<minmemory>128m</minmemory>

diff --git a/hapi-structures-v231/pom.xml b/hapi-structures-v231/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>hapi</artifactId>
 		<groupId>ca.uhn.hapi</groupId>
-		<version>1.2-alpha2</version>
+		<version>1.2-beta1</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
@@ -90,7 +90,7 @@
 		<plugins>
 			<plugin>
 				<artifactId>maven-javadoc-plugin</artifactId>
-				<version>2.6.1</version>
+				<version>2.8</version>
 				<inherited>true</inherited>
 				<configuration>
 					<minmemory>128m</minmemory>

diff --git a/hapi-structures-v24/pom.xml b/hapi-structures-v24/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>hapi</artifactId>
 		<groupId>ca.uhn.hapi</groupId>
-		<version>1.2-alpha2</version>
+		<version>1.2-beta1</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
@@ -89,7 +89,7 @@
 		<plugins>
 			<plugin>
 				<artifactId>maven-javadoc-plugin</artifactId>
-				<version>2.6.1</version>
+				<version>2.8</version>
 				<inherited>true</inherited>
 				<configuration>
 					<minmemory>128m</minmemory>

diff --git a/hapi-structures-v25/pom.xml b/hapi-structures-v25/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>hapi</artifactId>
 		<groupId>ca.uhn.hapi</groupId>
-		<version>1.2-alpha2</version>
+		<version>1.2-beta1</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
@@ -89,13 +89,14 @@
 		<plugins>
 			<plugin>
 				<artifactId>maven-javadoc-plugin</artifactId>
-				<version>2.6.1</version>
+				<version>2.8</version>
 				<inherited>true</inherited>
 				<configuration>
 					<minmemory>128m</minmemory>
 					<maxmemory>1g</maxmemory>
 					<linksource>true</linksource>
 					<detectLinks>true</detectLinks>
+					<verbose>true</verbose>
 					<links>
 					   <link>http://hl7api.sourceforge.net/apidocs/</link>
 					</links>

diff --git a/hapi-structures-v251/pom.xml b/hapi-structures-v251/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>hapi</artifactId>
 		<groupId>ca.uhn.hapi</groupId>
-		<version>1.2-alpha2</version>
+		<version>1.2-beta1</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
@@ -89,13 +89,14 @@
 		<plugins>
 			<plugin>
 				<artifactId>maven-javadoc-plugin</artifactId>
-				<version>2.6.1</version>
+				<version>2.8</version>
 				<inherited>true</inherited>
 				<configuration>
 					<minmemory>128m</minmemory>
 					<maxmemory>1g</maxmemory>
 					<linksource>true</linksource>
 					<detectLinks>true</detectLinks>
+					<verbose>true</verbose>
 					<links>
 					   <link>http://hl7api.sourceforge.net/apidocs/</link>
 					</links>

diff --git a/hapi-structures-v26/pom.xml b/hapi-structures-v26/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>hapi</artifactId>
 		<groupId>ca.uhn.hapi</groupId>
-		<version>1.2-alpha2</version>
+		<version>1.2-beta1</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
@@ -90,13 +90,14 @@
 		<plugins>
 			<plugin>
 				<artifactId>maven-javadoc-plugin</artifactId>
-				<version>2.6.1</version>
+				<version>2.8</version>
 				<inherited>true</inherited>
 				<configuration>
 					<minmemory>128m</minmemory>
 					<maxmemory>1g</maxmemory>
 					<linksource>true</linksource>
 					<detectLinks>true</detectLinks>
+					<verbose>true</verbose>
 					<links>
 					   <link>http://hl7api.sourceforge.net/apidocs/</link>
 					</links>

diff --git a/hapi-test/pom.xml b/hapi-test/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>hapi</artifactId>
 		<groupId>ca.uhn.hapi</groupId>
-		<version>1.2-alpha2</version>
+		<version>1.2-beta1</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 

diff --git a/pom.xml b/pom.xml
@@ -12,7 +12,7 @@
 	<groupId>ca.uhn.hapi</groupId>
 	<artifactId>hapi</artifactId>
 	<packaging>pom</packaging>
-	<version>1.2-alpha2</version>
+	<version>1.2-beta1</version>
 	<name>HAPI - Open Source Java HL7 Parser and API</name>
 	<url>http://hl7api.sourceforge.net/</url>
 	<description>
@@ -80,6 +80,9 @@
 	</developers>
 
 	<contributors>
+		<contributor>
+			<name>Axel Biernat</name>
+		</contributor>
 		<contributor>
 			<name>Rodolfo Chavez</name>
 		</contributor>
@@ -194,17 +197,6 @@
 					<maxmem>1024m</maxmem>
 				</configuration>
 			</plugin>
-			<plugin>
-				<artifactId>maven-assembly-plugin</artifactId>
-				<inherited>false</inherited>
-				<configuration>
-					<descriptors>
-						<descriptor>src/assembly/hapi-all.xml</descriptor>
-						<descriptor>src/assembly/hapi-src.xml</descriptor>
-						<descriptor>src/assembly/hapi-jdk14.xml</descriptor>
-					</descriptors>
-				</configuration>
-			</plugin>
 		</plugins>
 		<extensions>
 			<extension>
@@ -218,12 +210,13 @@
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<netbeans.compile.on.save>all</netbeans.compile.on.save>
-		<hapi.version>1.2-alpha2</hapi.version>
-		<hapi.version.structures>1.2-alpha2</hapi.version.structures>
+		<hapi.version>1.2-beta1</hapi.version>
+		<hapi.version.structures>1.2-beta1</hapi.version.structures>
 	</properties>
 
 	<reporting>
 		<plugins>
+			<!-- 
 			<plugin>
 				<artifactId>maven-javadoc-plugin</artifactId>
 				<version>2.7</version>
@@ -233,9 +226,10 @@
 					<maxmemory>1g</maxmemory>
 					<linksource>true</linksource>
 					<destDir>apidocs</destDir>
-					<reportOutputDirectory>{project.reporting.outputDirectory}/apidocs</reportOutputDirectory>
+					<reportOutputDirectory>${project.reporting.outputDirectory}/apidocs</reportOutputDirectory>
 				</configuration>
 			</plugin>
+			-->
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-jxr-plugin</artifactId>
@@ -382,6 +376,7 @@
 				<module>hapi-structures-v26</module>
 				<module>hapi-test</module>
 				<module>hapi-osgi-base</module>
+				<module>hapi-dist</module>
 			</modules>
 		</profile>
 		<profile>

diff --git a/src/assembly/hapi-all.xml b/src/assembly/hapi-all.xml