Build tweaks

rokoren · May 28, 2013 · e8b0cb4 · e8b0cb4
1 parent 452b448
commit e8b0cb4
Show file tree

Hide file tree

Showing 5 changed files with 54 additions and 6 deletions.
diff --git a/hapi-dist/pom.xml b/hapi-dist/pom.xml
@@ -42,7 +42,7 @@
 		<dependency>
 			<groupId>ca.uhn.hapi</groupId>
 			<artifactId>hapi-examples</artifactId>
-			<version>${hapi.version.structures}</version>
+			<version>${hapi.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>ca.uhn.hapi</groupId>

diff --git a/hapi-hl7overhttp/pom.xml b/hapi-hl7overhttp/pom.xml
@@ -389,14 +389,28 @@
 						<inherited>false</inherited>
 						<executions>
 							<execution>
+								<id>api</id>
 								<phase>package</phase>
 								<goals>
 									<goal>single</goal>
 								</goals>
 								<configuration>
 									<attach>false</attach>
 									<descriptors>
-										<descriptor>${project.basedir}/src/assembly/hapi-hl7overhttp.xml</descriptor>
+										<descriptor>${project.basedir}/src/assembly/hapi-hl7overhttp-api.xml</descriptor>
+									</descriptors>
+								</configuration>
+							</execution>
+							<execution>
+								<id>relay</id>
+								<phase>package</phase>
+								<goals>
+									<goal>single</goal>
+								</goals>
+								<configuration>
+									<attach>false</attach>
+									<descriptors>
+										<descriptor>${project.basedir}/src/assembly/hapi-hl7overhttp-relay.xml</descriptor>
 									</descriptors>
 								</configuration>
 							</execution>

diff --git a/hapi-testpanel/.classpath b/hapi-testpanel/.classpath
@@ -82,8 +82,8 @@
 			<attribute name="javadoc_location" value="jar:file:/Users/james/.m2/repository/org/objenesis/objenesis/1.0/objenesis-1.0-javadoc.jar!/"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="var" path="M2_REPO/org/netbeans/api/org-netbeans-swing-outline/RELEASE701/org-netbeans-swing-outline-RELEASE701-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/netbeans/api/org-netbeans-swing-outline/RELEASE701/org-netbeans-swing-outline-RELEASE701.jar" sourcepath="M2_REPO/org/netbeans/api/org-netbeans-swing-outline/RELEASE701/org-netbeans-swing-outline-RELEASE701-sources.jar"/>
+	<classpathentry kind="var" path="M2_REPO/org/netbeans/api/org-netbeans-swing-outline/RELEASE73/org-netbeans-swing-outline-RELEASE73-sources.jar"/>
+	<classpathentry kind="var" path="M2_REPO/org/netbeans/api/org-netbeans-swing-outline/RELEASE73/org-netbeans-swing-outline-RELEASE73.jar" sourcepath="M2_REPO/org/netbeans/api/org-netbeans-swing-outline/RELEASE73/org-netbeans-swing-outline-RELEASE73-sources.jar"/>
 	<classpathentry kind="var" path="M2_REPO/org/netbeans/api/org-openide-awt/RELEASE701/org-openide-awt-RELEASE701.jar" sourcepath="M2_REPO/org/netbeans/api/org-openide-awt/RELEASE701/org-openide-awt-RELEASE701-sources.jar">
 		<attributes>
 			<attribute name="javadoc_location" value="jar:file:/Users/james/.m2/repository/org/netbeans/api/org-openide-awt/RELEASE701/org-openide-awt-RELEASE701-javadoc.jar!/"/>

diff --git a/hapi-testpanel/pom.xml b/hapi-testpanel/pom.xml
@@ -53,12 +53,12 @@
 		<dependency>
 			<groupId>org.netbeans.api</groupId>
 			<artifactId>org-netbeans-swing-outline</artifactId>
-			<version>RELEASE701</version>
+			<version>RELEASE73</version>
 		</dependency>
 		<dependency>
 			<groupId>org.netbeans.api</groupId>
 			<artifactId>org-netbeans-swing-outline</artifactId>
-			<version>RELEASE701</version>
+			<version>RELEASE73</version>
 			<classifier>sources</classifier>
 			<scope>provided</scope>
 		</dependency>

diff --git a/pom.xml b/pom.xml
@@ -208,6 +208,39 @@
 		</pluginManagement>
 		<plugins>
 			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>buildnumber-maven-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>num</id>
+						<phase>initialize</phase>
+						<goals>
+							<goal>create</goal>
+						</goals>
+						<configuration>
+							<doCheck>false</doCheck>
+							<doUpdate>false</doUpdate>
+							<format>{0} ({1,date,yyyy-MM-dd HH:mm:ss})</format>
+							<items>
+								<item>scmVersion</item>
+								<item>timestamp</item>
+							</items>
+						</configuration>
+					</execution>
+					<execution>
+						<id>ts</id>
+						<phase>initialize</phase>
+						<goals>
+							<goal>create-timestamp</goal>
+						</goals>
+						<configuration>
+							<doCheck>false</doCheck>
+							<doUpdate>false</doUpdate>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+   			<plugin>
 				<artifactId>maven-site-plugin</artifactId>
 				<version>3.1</version>
 				<executions>
@@ -513,6 +546,7 @@
 				<module>hapi-base</module>
 				<module>hapi-sourcegen</module>
 				<module>hapi-hl7overhttp</module>
+				<module>hapi-examples</module>
 				<module>hapi-dist</module>
 			</modules>
 		</profile>