From 94daefd148b88c30d32258b13169733a4a816620 Mon Sep 17 00:00:00 2001
From: Philip Jordan <p.j.nz@outlook.com>
Date: Fri, 27 Sep 2019 19:46:09 +1200
Subject: Pom.xml tidied up

---
 pom.xml | 147 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------
 1 file changed, 130 insertions(+), 17 deletions(-)

(limited to 'pom.xml')

diff --git a/pom.xml b/pom.xml
index 55228dc..2ce26ee 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<groupId>org.jogamp.java3d</groupId>
-	<artifactId>j3dutils</artifactId>
+	<artifactId>java3d-utils</artifactId>
 	<version>1.7.0</version>
 
 	<name>Java 3D Utils</name>
@@ -27,7 +27,7 @@
 		<developer>
 			<id>philjord</id>
 			<name>Philip Jordan</name>
-			<email>philjord@ihug.co.nz</email>
+			<email>p.j.nz@outlook.com</email>
 			<url>https://github.com/philjord</url>
 			<organization>JogAmp</organization>
 			<organizationUrl>http://jogamp.org/</organizationUrl>
@@ -44,6 +44,12 @@
 			<organization>JogAmp</organization>
 			<organizationUrl>http://jogamp.org/</organizationUrl>
 		</contributor>
+		<contributor>
+			<name>Curtis Rueden</name>
+			<url>http://loci.wisc.edu/people/curtis-rueden</url>
+			<organization>UW-Madison LOCI</organization>
+			<organizationUrl>http://loci.wisc.edu/</organizationUrl>
+		</contributor>
 		<contributor>
 			<name>Kevin Rushforth</name>
 			<url>https://www.linkedin.com/in/kevin-rushforth-8ba3b43</url>
@@ -56,12 +62,6 @@
 			<organization>Oracle Corporation</organization>
 			<organizationUrl>http://oracle.com/</organizationUrl>
 		</contributor>
-		<contributor>
-			<name>Curtis Rueden</name>
-			<url>http://loci.wisc.edu/people/curtis-rueden</url>
-			<organization>UW-Madison LOCI</organization>
-			<organizationUrl>http://loci.wisc.edu/</organizationUrl>
-		</contributor>
 		<contributor>
 			<name>Ken Mc Neill</name>
 		</contributor>
@@ -72,6 +72,13 @@
 			<name>Emmanuel Puybaret</name>
 		</contributor>
 	</contributors>
+	
+	<scm>
+		<connection>scm:git:http://github.com/philjord/java3d-utils</connection>
+		<developerConnection></developerConnection>
+		<tag>HEAD</tag>
+		<url>https://github.com/philjord/java3d-utils</url>
+	</scm>
 
 	<properties>
 		<jogamp.version>2.3.2</jogamp.version>
@@ -79,12 +86,15 @@
 		<!-- NB: Avoid platform encoding warning when copying resources. -->
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+		
+		<!-- Deploy to OSS Sonatype repository by default when releasing. -->
+		<releaseProfiles>sonatype-oss-release</releaseProfiles>
 	</properties>
 
 	<dependencies>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>j3dcore</artifactId>
+			<artifactId>java3d-core</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
@@ -95,13 +105,27 @@
 	</dependencies>
 
 	<build>
+		
+		<defaultGoal>install</defaultGoal>
+		
+		<sourceDirectory>${basedir}/src/main/java</sourceDirectory>
+		<resources>
+			<resource>
+				<directory>${project.basedir}/src/main/resources</directory>
+				<excludes>
+					<exclude>**/*.java</exclude>
+					<exclude>**/package.html</exclude>
+				</excludes>
+			</resource>
+		</resources>
+		
 		<plugins>
 			<plugin>
 				<artifactId>maven-compiler-plugin</artifactId>
-				<version>3.1</version>
+				<version>3.8.0</version>
 				<configuration>
-					<source>1.7</source>
-					<target>1.7</target>
+					<source>1.6</source>
+					<target>1.6</target>
 				</configuration>
 			</plugin>
 			<plugin>
@@ -117,16 +141,105 @@
 			</plugin>
 			<plugin>
 				<artifactId>maven-javadoc-plugin</artifactId>
-				<version>2.10.4</version>
+				<version>3.1.1</version>
 				<configuration>
-					<javadocDirectory>${project.basedir}/src/main/java</javadocDirectory>
-					<additionalparam>-Xdoclint:none</additionalparam>
+					<additionalJOption>-Xdoclint:none</additionalJOption>
 					<links>
 						<link>http://docs.oracle.com/javase/8/docs/api/</link>
 					</links>
-				</configuration>
+				</configuration>				
 			</plugin>
 		</plugins>
 	</build>
-
+	
+	<profiles>
+		<!-- This profile enables releasing to the OSS Sonatype repository. -->
+		<profile>
+			<id>sonatype-oss-release</id>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.sonatype.plugins</groupId>
+						<artifactId>nexus-staging-maven-plugin</artifactId>
+						<version>1.6.7</version>
+						<extensions>true</extensions>
+						<configuration>
+							<serverId>sonatype-nexus-releases</serverId>
+							<nexusUrl>https://oss.sonatype.org/</nexusUrl>
+							<autoReleaseAfterClose>true</autoReleaseAfterClose>
+							<stagingProgressTimeoutMinutes>15</stagingProgressTimeoutMinutes>
+							<stagingProgressPauseDurationSeconds>12</stagingProgressPauseDurationSeconds>
+							<!--
+							By having no explicit stagingProfileId, we use
+							Staging V2 in "auto" mode, profile will be
+							matched server side
+							-->
+						</configuration>
+					</plugin>
+					<plugin>
+						<inherited>true</inherited>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-deploy-plugin</artifactId>
+						<version>2.8.2</version>
+						<configuration>
+							<skip>true</skip>
+						</configuration>
+					</plugin>
+					<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>
+						<configuration>
+							<useAgent>true</useAgent>
+						</configuration>
+					</plugin>
+					<plugin>
+						<artifactId>maven-release-plugin</artifactId>
+						<version>2.5.3</version>
+					</plugin>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-source-plugin</artifactId>
+						<version>3.0.1</version>
+						<executions>
+							<execution>
+								<id>attach-sources</id>
+								<goals>
+									<goal>jar-no-fork</goal>
+								</goals>
+							</execution>
+						</executions>
+					</plugin>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-javadoc-plugin</artifactId>
+						<version>3.1.1</version>
+						<configuration>
+							<additionalJOption>-Xdoclint:none</additionalJOption>
+							<links>
+								<link>http://docs.oracle.com/javase/8/docs/api/</link>
+							</links>
+						</configuration>
+						<executions>
+							<execution>
+								<id>attach-javadocs</id>
+								<goals>
+									<goal>jar</goal>
+								</goals>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+	</profiles>
 </project>
-- 
cgit v1.2.3