Merge remote-tracking branch 'origin/master'

Author: angryziber

CHANGELOG

@@ -2,6 +2,9 @@ Changes in 3.9.3:
 - Bundle Java 21 with Windows and Mac builds
 - Updated SWT for all platforms, improved loading of correct SWT library on Linux
 - Add support for plugin jars containing their own messages.properties
+- The UDP pinger now uses the same port as traceroute programs.
+- Switch from the legacy Date API to Java's new Time API
+- Time is now specified in 24-hour format in XML export
 - Enable exporting very long lines as .txt
 
 Changes in 3.9.2:

src/net/azib/ipscan/core/net/UDPPinger.java

@@ -25,7 +25,7 @@
 public class UDPPinger implements Pinger {
 	private static final Logger LOG = LoggerFactory.getLogger();
 
-	private static final int PROBE_UDP_PORT = 37381;
+	private static final int PROBE_UDP_PORT = 33435;
 
 	private int timeout;
 

src/net/azib/ipscan/exporters/TXTExporter.java

@@ -13,7 +13,9 @@
 import java.io.IOException;
 import java.io.OutputStream;
 import java.net.InetAddress;
-import java.text.DateFormat;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.time.format.FormatStyle;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -55,7 +57,7 @@ public void start(OutputStream outputStream, String feederInfo) throws IOExcepti
 			output.print(Labels.getLabel("exporter.txt.scanned"));
 			output.print(' ');
 			output.println(feederInfo);
-			output.println(DateFormat.getDateTimeInstance().format(new Date()));
+			output.println(LocalDateTime.now().format(DateTimeFormatter.ofLocalizedDateTime(FormatStyle.MEDIUM)));
 			output.println();
 		}
 	}

src/net/azib/ipscan/exporters/XMLExporter.java

@@ -8,7 +8,9 @@
 import net.azib.ipscan.config.Version;
 
 import java.io.*;
-import java.text.SimpleDateFormat;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.time.format.FormatStyle;
 import java.util.Date;
 
 /**
@@ -45,8 +47,8 @@ public void start(OutputStream outputStream, String feederInfo) throws IOExcepti
 		output.println("<!-- This file has been generated by " + Version.getFullName() + " -->");
 		output.println("<!-- Visit the website at " + Version.WEBSITE + " -->");
 
-		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
-		output.println("<scanning_report time=\"" + sdf.format(new Date()) + "\">");
+		DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+		output.println("<scanning_report time=\"" + LocalDateTime.now().format(dtf) + "\">");
 
 		// this is a hack to extract feeder name from the feederInfo
 		// this may not work with some non-standard feeders