Merge pull request #270 from starsareintherose/master

fix: build under 1.8
AtlasOfLivingAustralia · Jul 31, 2024 · 63f63cd · 63f63cd
2 parents 3188f6a + 96836a5
commit 63f63cd
Show file tree

Hide file tree

Showing 8 changed files with 78 additions and 56 deletions.
diff --git a/confor/pom.xml b/confor/pom.xml
@@ -1,15 +1,15 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="https://maven.apache.org/POM/4.0.0" xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="https://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>au.org.ala.delta</groupId>
 	<artifactId>confor</artifactId>
 	<version>1.0.3-SNAPSHOT</version>
 	<name>CONFOR</name>
 
 	<scm>
-		<connection>scm:svn:http://open-delta.googlecode.com/svn/trunk/</connection>
+		<connection>scm:svn:https://open-delta.googlecode.com/svn/trunk/</connection>
 		<developerConnection>scm:svn:https://open-delta.googlecode.com/svn/trunk/</developerConnection>
-		<url>http://code.google.com/p/open-delta/</url>
+		<url>https://code.google.com/p/open-delta/</url>
 	</scm>
 	<build>
 		<plugins>
@@ -77,8 +77,8 @@
 				<artifactId>maven-compiler-plugin</artifactId>
 				<version>2.0.2</version>
 				<configuration>
-					<source>1.6</source>
-					<target>1.6</target>
+					<source>1.8</source>
+					<target>1.8</target>
 					<encoding>Cp1252</encoding>
 				</configuration>
 			</plugin>
@@ -252,4 +252,4 @@
 			</build>
 		</profile>
 	</profiles>
-</project>
+</project>
diff --git a/delfor/pom.xml b/delfor/pom.xml
@@ -1,5 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="https://maven.apache.org/POM/4.0.0" xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="https://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>au.org.ala.delta</groupId>
 	<artifactId>delfor</artifactId>
@@ -9,9 +9,9 @@
 
 
 	<scm>
-		<connection>scm:svn:http://open-delta.googlecode.com/svn/trunk/</connection>
+		<connection>scm:svn:https://open-delta.googlecode.com/svn/trunk/</connection>
 		<developerConnection>scm:svn:https://open-delta.googlecode.com/svn/trunk/</developerConnection>
-		<url>http://code.google.com/p/open-delta/</url>
+		<url>https://code.google.com/p/open-delta/</url>
 	</scm>
 	<build>
 
@@ -21,8 +21,8 @@
 				<artifactId>maven-compiler-plugin</artifactId>
 				<version>2.0.2</version>
 				<configuration>
-					<source>1.6</source>
-					<target>1.6</target>
+					<source>1.8</source>
+					<target>1.8</target>
 					<encoding>Cp1252</encoding>
 				</configuration>
 			</plugin>
@@ -193,4 +193,4 @@
 			</build>
 		</profile>
 	</profiles>
-</project>
+</project>
diff --git a/delta-editor/pom.xml b/delta-editor/pom.xml
@@ -1,5 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="https://maven.apache.org/POM/4.0.0" xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="https://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>au.org.ala.delta</groupId>
 	<artifactId>delta-editor</artifactId>
@@ -9,18 +9,18 @@
 		<repository>
 			<id>maven2-repository.dev.java.net</id>
 			<name>Java.net Repository for Maven</name>
-			<url>http://download.java.net/maven/2/</url>
+			<url>https://download.java.net/maven/2/</url>
 			<layout>default</layout>
 		</repository>
 		<repository>
 			<id>shell-sourceforge-jp</id>
 			<name>maven repository on sourceforge.jp shell server</name>
-			<url>http://jfontchooser.sourceforge.jp/repository/say/swing/jfontchooser</url>		
+			<url>https://jfontchooser.sourceforge.jp/repository/say/swing/jfontchooser</url>		
 		</repository>
 	</repositories>
 
 	<scm>
-		<connection>scm:svn:http://open-delta.googlecode.com/svn/trunk/</connection>
+		<connection>scm:svn:https://open-delta.googlecode.com/svn/trunk/</connection>
 		<developerConnection>scm:svn:https://open-delta.googlecode.com/svn/trunk/</developerConnection>
 	</scm>
 	<build>
@@ -75,8 +75,8 @@
 				<artifactId>maven-compiler-plugin</artifactId>
 				<version>2.0.2</version>
 				<configuration>
-					<source>1.6</source>
-					<target>1.6</target>
+					<source>1.8</source>
+					<target>1.8</target>
 					<encoding>Cp1252</encoding>
 				</configuration>
 			</plugin>
@@ -356,4 +356,4 @@
 			</build>
 		</profile>
 	</profiles>
-</project>
+</project>
diff --git a/dist/pom.xml b/dist/pom.xml
@@ -1,5 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="https://maven.apache.org/POM/4.0.0" xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="https://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>au.org.ala.delta</groupId>
 	<artifactId>dist</artifactId>
@@ -9,9 +9,9 @@
 
 
 	<scm>
-		<connection>scm:svn:http://open-delta.googlecode.com/svn/trunk/</connection>
+		<connection>scm:svn:https://open-delta.googlecode.com/svn/trunk/</connection>
 		<developerConnection>scm:svn:https://open-delta.googlecode.com/svn/trunk/</developerConnection>
-		<url>http://code.google.com/p/open-delta/</url>
+		<url>https://code.google.com/p/open-delta/</url>
 	</scm>
 	<build>
 
@@ -21,8 +21,8 @@
 				<artifactId>maven-compiler-plugin</artifactId>
 				<version>2.0.2</version>
 				<configuration>
-					<source>1.6</source>
-					<target>1.6</target>
+					<source>1.8</source>
+					<target>1.8</target>
 					<encoding>Cp1252</encoding>
 				</configuration>
 			</plugin>
@@ -186,4 +186,4 @@
 			</build>
 		</profile>
 	</profiles>
-</project>
+</project>
diff --git a/intkey/pom.xml b/intkey/pom.xml
@@ -1,5 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="https://maven.apache.org/POM/4.0.0" xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="https://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>delta-intkey</groupId>
 	<artifactId>delta-intkey</artifactId>
@@ -9,25 +9,25 @@
 		<repository>
 			<id>maven2-repository.dev.java.net</id>
 			<name>Java.net Repository for Maven</name>
-			<url>http://download.java.net/maven/2/</url>
+			<url>https://download.java.net/maven/2/</url>
 			<layout>default</layout>
 		</repository>
 		<repository>
 			<id>shell-sourceforge-jp</id>
 			<name>maven repository on sourceforge.jp shell server</name>
-			<url>http://jfontchooser.sourceforge.jp/repository/say/swing/jfontchooser</url>
+			<url>https://jfontchooser.sourceforge.jp/repository/say/swing/jfontchooser</url>
 		</repository>
 		<repository>
 			<id>ala-repository</id>
 			<name>ala-repository</name>
-			<url>http://nexus.ala.org.au/content/groups/public/</url>
+			<url>https://nexus.ala.org.au/content/groups/public/</url>
 		</repository>
 	</repositories>
 
 	<scm>
-		<connection>scm:svn:http://open-delta.googlecode.com/svn/trunk/</connection>
+		<connection>scm:svn:https://open-delta.googlecode.com/svn/trunk/</connection>
 		<developerConnection>scm:svn:https://open-delta.googlecode.com/svn/trunk/</developerConnection>
-		<url>http://code.google.com/p/open-delta/</url>
+		<url>https://code.google.com/p/open-delta/</url>
 	</scm>
 	<build>
 		<resources>
@@ -82,8 +82,8 @@
 				<artifactId>maven-compiler-plugin</artifactId>
 				<version>2.0.2</version>
 				<configuration>
-					<source>1.6</source>
-					<target>1.6</target>
+					<source>1.8</source>
+					<target>1.8</target>
 					<encoding>Cp1252</encoding>
 				</configuration>
 			</plugin>
@@ -201,6 +201,10 @@
 		</pluginManagement>
 	</build>
 
+	<properties>
+        	<local.jnlp.path>/usr/share/icedtea-web/javaws.jar</local.jnlp.path>
+	</properties>
+
 	<dependencies>
 		<dependency>
 			<groupId>au.org.ala.delta</groupId>
@@ -253,6 +257,13 @@
 			<type>jar</type>
 			<scope>compile</scope>
 		</dependency>
+		<dependency>
+			<groupId>javax.jnlp</groupId>
+			<artifactId>jnlp</artifactId>
+			<version>1.6</version>
+			<scope>system</scope>
+			<systemPath>${local.jnlp.path}</systemPath>
+		</dependency>
 		<dependency>
 			<groupId>com.l2fprod.common</groupId>
 			<artifactId>l2fprod-common-fontchooser</artifactId>

diff --git a/key/pom.xml b/key/pom.xml
@@ -1,15 +1,15 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="https://maven.apache.org/POM/4.0.0" xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="https://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>au.org.ala.delta</groupId>
 	<artifactId>key</artifactId>
 	<version>1.0.3-SNAPSHOT</version>
 	<name>KEY</name>
 
 	<scm>
-		<connection>scm:svn:http://open-delta.googlecode.com/svn/trunk/</connection>
+		<connection>scm:svn:https://open-delta.googlecode.com/svn/trunk/</connection>
 		<developerConnection>scm:svn:https://open-delta.googlecode.com/svn/trunk/</developerConnection>
-		<url>http://code.google.com/p/open-delta/</url>
+		<url>https://code.google.com/p/open-delta/</url>
 	</scm>
 	<build>
 		<plugins>
@@ -54,8 +54,8 @@
 				<artifactId>maven-compiler-plugin</artifactId>
 				<version>2.0.2</version>
 				<configuration>
-					<source>1.6</source>
-					<target>1.6</target>
+					<source>1.8</source>
+					<target>1.8</target>
 					<encoding>Cp1252</encoding>
 				</configuration>
 			</plugin>

diff --git a/pom.xml b/pom.xml
@@ -1,15 +1,15 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="https://maven.apache.org/POM/4.0.0" xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="https://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>au.org.ala.delta</groupId>
 	<artifactId>open-delta</artifactId>
 	<version>1.0.3-SNAPSHOT</version>
 	<name>Open DELTA suite</name>
 	<packaging>pom</packaging>
 	<scm>
-		<connection>scm:svn:http://open-delta.googlecode.com/svn/trunk/</connection>
+		<connection>scm:svn:https://open-delta.googlecode.com/svn/trunk/</connection>
 		<developerConnection>scm:svn:https://open-delta.googlecode.com/svn/trunk/</developerConnection>
-		<url>http://code.google.com/p/open-delta/</url>
+		<url>https://code.google.com/p/open-delta/</url>
 	</scm>
 
 	<modules>

diff --git a/ui-common/pom.xml b/ui-common/pom.xml
@@ -1,5 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="https://maven.apache.org/POM/4.0.0" xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="https://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>au.org.ala.delta</groupId>
 	<artifactId>delta-ui-common</artifactId>
@@ -10,16 +10,16 @@
 		<repository>
 			<id>maven2-repository.dev.java.net</id>
 			<name>Java.net Repository for Maven</name>
-			<url>http://download.java.net/maven/2/</url>
+			<url>https://download.java.net/maven/2/</url>
 			<layout>default</layout>
 		</repository>
 	</repositories>
 
 
 	<scm>
-		<connection>scm:svn:http://open-delta.googlecode.com/svn/trunk/</connection>
+		<connection>scm:svn:https://open-delta.googlecode.com/svn/trunk/</connection>
 		<developerConnection>scm:svn:https://open-delta.googlecode.com/svn/trunk/</developerConnection>
-		<url>http://code.google.com/p/open-delta/</url>
+		<url>https://code.google.com/p/open-delta/</url>
 	</scm>
 	<build>
 
@@ -40,8 +40,8 @@
 				<artifactId>maven-compiler-plugin</artifactId>
 				<version>2.0.2</version>
 				<configuration>
-					<source>1.6</source>
-					<target>1.6</target>
+					<source>1.8</source>
+					<target>1.8</target>
 					<encoding>Cp1252</encoding>
 				</configuration>
 			</plugin>
@@ -140,6 +140,10 @@
 		</pluginManagement>
 	</build>
 
+	<properties>
+        	<local.jnlp.path>/usr/share/icedtea-web/javaws.jar</local.jnlp.path>
+	</properties>
+
 	<dependencies>
 		<dependency>
 			<groupId>au.org.ala.delta</groupId>
@@ -157,6 +161,13 @@
 			<version>2.0.05</version>
 			<type>jar</type>
 		</dependency>
+		<dependency>
+			<groupId>javax.jnlp</groupId>
+			<artifactId>jnlp</artifactId>
+			<version>1.6</version>
+			<scope>system</scope>
+			<systemPath>${local.jnlp.path}</systemPath>
+		</dependency>
 		<dependency>
 			<groupId>commons-lang</groupId>
 			<artifactId>commons-lang</artifactId>
@@ -212,4 +223,4 @@
 			<url>${ala.repository.url}</url>
 		</snapshotRepository>
 	</distributionManagement>
-</project>
+</project>