Update to build files and dependencies

b6sftpSend/.classpath

@@ -6,28 +6,28 @@
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="lib" path="lib/app/asn-one-0.6.0.jar"/>
-	<classpathentry kind="lib" path="lib/app/bcpkix-jdk15on-1.70.jar"/>
-	<classpathentry kind="lib" path="lib/app/bcprov-jdk15on-1.70.jar"/>
-	<classpathentry kind="lib" path="lib/app/eddsa-0.3.0.jar"/>
-	<classpathentry kind="lib" path="lib/app/jzlib-1.1.3.jar"/>
-	<classpathentry kind="lib" path="lib/app/log4j-api-2.20.0.jar"/>
-	<classpathentry kind="lib" path="lib/app/log4j-core-2.20.0.jar"/>
-	<classpathentry kind="lib" path="lib/app/log4j-slf4j2-impl-2.20.0.jar"/>
-	<classpathentry kind="lib" path="lib/app/slf4j-api-2.0.7.jar"/>
-	<classpathentry kind="lib" path="lib/app/slf4j-simple-2.0.7.jar"/>
-	<classpathentry kind="lib" path="lib/app/sshj-0.35.0.jar" sourcepath="/Users/dave/Commander4j/workspace.development/sftpGet/lib/source/sshj-0.31.0-sources.jar">
+	<classpathentry kind="lib" path="lib/asn-one-0.6.0.jar"/>
+	<classpathentry kind="lib" path="lib/bcpkix-jdk18on-1.75.jar"/>
+	<classpathentry kind="lib" path="lib/bcprov-jdk18on-1.75.jar"/>
+	<classpathentry kind="lib" path="lib/eddsa-0.3.0.jar"/>
+	<classpathentry kind="lib" path="lib/jzlib-1.1.3.jar"/>
+	<classpathentry kind="lib" path="lib/log4j-api-2.23.1.jar"/>
+	<classpathentry kind="lib" path="lib/log4j-core-2.23.1.jar"/>
+	<classpathentry kind="lib" path="lib/log4j-slf4j-impl-2.23.1.jar"/>
+	<classpathentry kind="lib" path="lib/slf4j-api-2.0.13.jar"/>
+	<classpathentry kind="lib" path="lib/slf4j-simple-2.0.13.jar"/>
+	<classpathentry kind="lib" path="lib/sshj-0.38.0.jar" sourcepath="/Users/dave/Commander4j/workspace.development/sftpGet/lib/source/sshj-0.31.0-sources.jar">
 		<attributes>
 			<attribute name="javadoc_location" value="jar:platform:/resource/sftpGet/lib/javadoc/sshj-0.32.0-javadoc.jar!/"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="lib" path="lib/devonly/i4jruntime.jar"/>
-	<classpathentry kind="lib" path="lib/app/commons-io-2.13.0.jar"/>
-	<classpathentry kind="lib" path="lib/app/commons-codec-1.15.jar"/>
-	<classpathentry kind="lib" path="lib/app/slf4j-jdk14-2.0.7.jar"/>
-	<classpathentry kind="lib" path="lib/mail/angus-activation-2.0.1.jar"/>
-	<classpathentry kind="lib" path="lib/mail/angus-mail-2.0.2.jar"/>
-	<classpathentry kind="lib" path="lib/mail/jakarta.activation-api-2.1.2.jar"/>
-	<classpathentry kind="lib" path="lib/mail/jakarta.mail-api-2.1.2.jar"/>
+	<classpathentry kind="lib" path="lib/commons-io-2.16.1.jar"/>
+	<classpathentry kind="lib" path="lib/commons-codec-1.17.0.jar"/>
+	<classpathentry kind="lib" path="lib/slf4j-jdk14-2.0.13.jar"/>
+	<classpathentry kind="lib" path="lib/angus-activation-2.0.2.jar"/>
+	<classpathentry kind="lib" path="lib/angus-mail-2.0.3.jar"/>
+	<classpathentry kind="lib" path="lib/jakarta.activation-api-2.1.3.jar"/>
+	<classpathentry kind="lib" path="lib/jakarta.mail-api-2.1.3.jar"/>
+	<classpathentry kind="lib" path="lib/bcutil-jdk18on-1.75.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

b6sftpSend/MANIFEST.MF

@@ -1,21 +1,22 @@
 Manifest-Version: 1.0
 Main-Class: com.commander4j.sftp.Transfer
-Class-Path: lib/app/asn-one-0.6.0.jar 
- lib/app/bcpkix-jdk15on-1.70.jar 
- lib/app/bcprov-jdk15on-1.70.jar 
- lib/app/commons-codec-1.15.jar 
- lib/app/commons-io-2.13.0.jar 
- lib/app/eddsa-0.3.0.jar 
- lib/app/jzlib-1.1.3.jar 
- lib/app/log4j-api-2.20.0.jar 
- lib/app/log4j-core-2.20.0.jar 
- lib/app/log4j-slf4j2-impl-2.20.0.jar 
- lib/app/slf4j-api-2.0.7.jar 
- lib/app/slf4j-jdk14-2.0.7.jar 
- lib/app/slf4j-simple-2.0.7.jar 
- lib/app/sshj-0.35.0.jar 
- lib/mail/angus-activation-2.0.1.jar 
- lib/mail/angus-mail-2.0.2.jar 
- lib/mail/jakarta.activation-api-2.1.2.jar 
- lib/mail/jakarta.mail-api-2.1.2.jar 
+Class-Path: lib/angus-activation-2.0.2.jar 
+ lib/angus-mail-2.0.3.jar 
+ lib/asn-one-0.6.0.jar 
+ lib/bcpkix-jdk18on-1.75.jar 
+ lib/bcprov-jdk18on-1.75.jar 
+ lib/bcutil-jdk18on-1.75.jar 
+ lib/commons-codec-1.17.0.jar 
+ lib/commons-io-2.16.1.jar 
+ lib/eddsa-0.3.0.jar 
+ lib/jakarta.activation-api-2.1.3.jar 
+ lib/jakarta.mail-api-2.1.3.jar 
+ lib/jzlib-1.1.3.jar 
+ lib/log4j-api-2.23.1.jar 
+ lib/log4j-core-2.23.1.jar 
+ lib/log4j-slf4j-impl-2.23.1.jar 
+ lib/slf4j-api-2.0.13.jar 
+ lib/slf4j-jdk14-2.0.13.jar 
+ lib/slf4j-simple-2.0.13.jar 
+ lib/sshj-0.38.0.jar 
  sftpSend.jar 

b6sftpSend/b6sftpSend.install4j

@@ -1,15 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <install4j version="10.0.8" transformSequenceNumber="10">
-  <directoryPresets config="./Images/icons/SFTP_Send_Icons" />
-  <application name="SFTP Send" applicationId="1389-2676-6857-5998" mediaDir="../../../Distribution/java17/b6sftpSend" shortName="sftpSend" publisher="David Garratt" publisherWeb="https://www.commander4j.com" version="4.11" allPathsRelative="true" macVolumeId="7e8a68a2fd94926b" javaMinVersion="17" javaMaxVersion="17">
+  <directoryPresets config="." />
+  <application name="SFTP Send" applicationId="1389-2676-6857-5998" mediaDir="../../../Distribution/java17/b6sftpSend" shortName="sftpSend" publisher="David Garratt" publisherWeb="https://www.commander4j.com" version="4.12" allPathsRelative="true" macVolumeId="7e8a68a2fd94926b" javaMinVersion="17" javaMaxVersion="17">
     <jreBundles jdkProviderId="Zulu" release="17/17.0.11" />
   </application>
   <files globalExcludeSuffixes="dirClean.ok,.DS_Store">
     <mountPoints>
       <mountPoint id="58" location="lib" />
-      <mountPoint id="59" location="lib/app" />
-      <mountPoint id="368" location="lib/mail" />
-      <mountPoint id="579" location="lib/license" />
       <mountPoint id="60" location="ssh" />
       <mountPoint id="61" location="xml" />
       <mountPoint id="62" location="xml/config" />
@@ -20,9 +17,12 @@
       <mountPoint id="65" />
     </mountPoints>
     <entries>
-      <dirEntry mountPoint="59" file="./lib/app" overwriteMode="1" uninstallMode="2" overrideOverwriteMode="true" overrideUninstallMode="true" subDirectory="app" />
-      <dirEntry mountPoint="368" file="./lib/mail" overwriteMode="1" uninstallMode="2" overrideOverwriteMode="true" overrideUninstallMode="true" subDirectory="mail" />
-      <dirEntry mountPoint="579" file="./lib/license" overwriteMode="1" uninstallMode="2" overrideOverwriteMode="true" overrideUninstallMode="true" subDirectory="license" />
+      <dirEntry mountPoint="58" file="./lib" overwriteMode="1" uninstallMode="2" overrideOverwriteMode="true" overrideUninstallMode="true" subDirectory="lib">
+        <exclude>
+          <entry location=".DS_Store" />
+          <entry location="devonly" />
+        </exclude>
+      </dirEntry>
       <dirEntry mountPoint="60" file="./ssh" subDirectory="ssh">
         <exclude>
           <entry location=".DS_Store" />

b6sftpSend/b6sftpSend_pom.xml

@@ -0,0 +1,124 @@
+<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/maven-v4_0_0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>com.commander4j.middleware</groupId>
+	<artifactId>middleware-test</artifactId>
+	<version>1.0.0</version>
+	<packaging>pom</packaging>
+	<properties>
+		<revision>7.0.0</revision>
+	</properties>
+	<!-- 	<repositories>
+	    <repository>
+	      <id>com.install4j</id>
+	      <name>com.install4j</name>
+	      <url>https://maven.ej-technologies.com/repository/</url>
+	    </repository>
+  	</repositories> -->
+	<dependencies>
+		<!-- https://mvnrepository.com/artifact/com.hierynomus/sshj -->
+		<dependency>
+		    <groupId>com.hierynomus</groupId>
+		    <artifactId>sshj</artifactId>
+		    <version>0.38.0</version>
+		</dependency>
+
+		<!-- https://mvnrepository.com/artifact/commons-codec/commons-codec -->
+		<dependency>
+			<groupId>commons-codec</groupId>
+			<artifactId>commons-codec</artifactId>
+			<version>1.17.0</version>
+		</dependency>
+
+		<!-- https://mvnrepository.com/artifact/commons-io/commons-io -->
+		<dependency>
+		    <groupId>commons-io</groupId>
+		    <artifactId>commons-io</artifactId>
+		    <version>2.16.1</version>
+		</dependency>
+
+
+		<!-- https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-api -->
+		<dependency>
+			<groupId>org.apache.logging.log4j</groupId>
+			<artifactId>log4j-api</artifactId>
+			<version>2.23.1</version>
+		</dependency>
+		<!-- https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-core -->
+		<dependency>
+			<groupId>org.apache.logging.log4j</groupId>
+			<artifactId>log4j-core</artifactId>
+			<version>2.23.1</version>
+		</dependency>
+
+		<!-- https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-slf4j-impl -->
+		<dependency>
+		    <groupId>org.apache.logging.log4j</groupId>
+		    <artifactId>log4j-slf4j-impl</artifactId>
+		    <version>2.23.1</version>
+		    <scope>test</scope>
+		</dependency>
+
+
+		<!-- https://mvnrepository.com/artifact/org.slf4j/slf4j-api -->
+		<dependency>
+		    <groupId>org.slf4j</groupId>
+		    <artifactId>slf4j-api</artifactId>
+		    <version>2.0.13</version>
+		</dependency>
+
+		<!-- https://mvnrepository.com/artifact/org.slf4j/slf4j-simple -->
+		<dependency>
+		    <groupId>org.slf4j</groupId>
+		    <artifactId>slf4j-simple</artifactId>
+		    <version>2.0.13</version>
+		    <scope>test</scope>
+		</dependency>
+
+		<!-- https://mvnrepository.com/artifact/org.slf4j/slf4j-jdk14 -->
+		<dependency>
+		    <groupId>org.slf4j</groupId>
+		    <artifactId>slf4j-jdk14</artifactId>
+		    <version>2.0.13</version>
+		    <scope>test</scope>
+		</dependency>
+
+		<!-- https://mvnrepository.com/artifact/com.jcraft/jzlib -->
+		<dependency>
+		    <groupId>com.jcraft</groupId>
+		    <artifactId>jzlib</artifactId>
+		    <version>1.1.3</version>
+		</dependency>
+
+		<!-- https://mvnrepository.com/artifact/org.eclipse.angus/angus-mail -->
+		<dependency>
+			<groupId>org.eclipse.angus</groupId>
+			<artifactId>angus-mail</artifactId>
+			<version>2.0.3</version>
+		</dependency>
+		<!-- https://mvnrepository.com/artifact/org.eclipse.angus/angus-activation -->
+		<dependency>
+			<groupId>org.eclipse.angus</groupId>
+			<artifactId>angus-activation</artifactId>
+			<version>2.0.2</version>
+		</dependency>
+		<!-- https://mvnrepository.com/artifact/jakarta.activation/jakarta.activation-api -->
+		<dependency>
+			<groupId>jakarta.activation</groupId>
+			<artifactId>jakarta.activation-api</artifactId>
+			<version>2.1.3</version>
+		</dependency>
+		<!-- https://mvnrepository.com/artifact/jakarta.mail/jakarta.mail-api -->
+		<dependency>
+			<groupId>jakarta.mail</groupId>
+			<artifactId>jakarta.mail-api</artifactId>
+			<version>2.1.3</version>
+		</dependency>
+		<!-- https://mvnrepository.com/artifact/com.install4j/install4j-runtime -->
+		<!-- 		<dependency>
+		    <groupId>com.install4j</groupId>
+		    <artifactId>install4j-runtime</artifactId>
+		    <version>10.0.8</version>
+		    <scope>provided</scope>
+		</dependency> -->
+	</dependencies>
+</project>

b6sftpSend/build.xml

@@ -3,82 +3,39 @@
               Any modifications will be overwritten.
               To include a user specific buildfile here, simply create one in the same
               directory with the processing instruction <?eclipse.ant.import?>
-              as the first entry and export the buildfile again. --><project basedir="." default="build" name="b6sftpSend">
-    <property environment="env"/>
-    <property name="debuglevel" value="source,lines,vars"/>
-    <property name="target" value="17"/>
-    <property name="source" value="17"/>
-    <path id="b6sftpSend.classpath">
-        <pathelement location="bin"/>
-        <pathelement location="lib/app/asn-one-0.6.0.jar"/>
-        <pathelement location="lib/app/bcpkix-jdk15on-1.70.jar"/>
-        <pathelement location="lib/app/bcprov-jdk15on-1.70.jar"/>
-        <pathelement location="lib/app/eddsa-0.3.0.jar"/>
-        <pathelement location="lib/app/jzlib-1.1.3.jar"/>
-        <pathelement location="lib/app/log4j-api-2.20.0.jar"/>
-        <pathelement location="lib/app/log4j-core-2.20.0.jar"/>
-        <pathelement location="lib/app/log4j-slf4j2-impl-2.20.0.jar"/>
-        <pathelement location="lib/app/slf4j-api-2.0.7.jar"/>
-        <pathelement location="lib/app/slf4j-simple-2.0.7.jar"/>
-        <pathelement location="lib/app/sshj-0.35.0.jar"/>
-        <pathelement location="lib/devonly/i4jruntime.jar"/>
-        <pathelement location="lib/app/commons-io-2.13.0.jar"/>
-        <pathelement location="lib/app/commons-codec-1.15.jar"/>
-        <pathelement location="lib/app/slf4j-jdk14-2.0.7.jar"/>
-        <pathelement location="lib/mail/angus-activation-2.0.1.jar"/>
-        <pathelement location="lib/mail/angus-mail-2.0.2.jar"/>
-        <pathelement location="lib/mail/jakarta.activation-api-2.1.2.jar"/>
-        <pathelement location="lib/mail/jakarta.mail-api-2.1.2.jar"/>
-    </path>
-    <path id="run.Transfer.classpath">
-        <path refid="b6sftpSend.classpath"/>
-        <pathelement location="lib/app/asn-one-0.6.0.jar"/>
-        <pathelement location="lib/app/bcpkix-jdk15on-1.70.jar"/>
-        <pathelement location="lib/app/bcprov-jdk15on-1.70.jar"/>
-        <pathelement location="lib/app/eddsa-0.3.0.jar"/>
-        <pathelement location="lib/app/jzlib-1.1.3.jar"/>
-        <pathelement location="lib/app/log4j-api-2.20.0.jar"/>
-        <pathelement location="lib/app/log4j-core-2.20.0.jar"/>
-        <pathelement location="lib/app/log4j-slf4j2-impl-2.20.0.jar"/>
-        <pathelement location="lib/app/slf4j-api-2.0.7.jar"/>
-        <pathelement location="lib/app/slf4j-simple-2.0.7.jar"/>
-        <pathelement location="lib/app/sshj-0.35.0.jar"/>
-        <pathelement location="lib/devonly/i4jruntime.jar"/>
-        <pathelement location="lib/app/commons-io-2.13.0.jar"/>
-        <pathelement location="lib/app/commons-codec-1.15.jar"/>
-        <pathelement location="lib/app/slf4j-jdk14-2.0.7.jar"/>
-        <pathelement location="lib/mail/angus-activation-2.0.1.jar"/>
-        <pathelement location="lib/mail/angus-mail-2.0.2.jar"/>
-        <pathelement location="lib/mail/jakarta.activation-api-2.1.2.jar"/>
-        <pathelement location="lib/mail/jakarta.mail-api-2.1.2.jar"/>
-    </path>
-    <target name="init">
-        <mkdir dir="bin"/>
-        <copy includeemptydirs="false" todir="bin">
-            <fileset dir="src">
-                <exclude name="**/*.launch"/>
-                <exclude name="**/*.java"/>
-            </fileset>
-        </copy>
-    </target>
-    <target name="clean">
-        <delete dir="bin"/>
-    </target>
-    <target depends="clean" name="cleanall"/>
-    <target depends="build-subprojects,build-project" name="build"/>
-    <target name="build-subprojects"/>
-    <target depends="init" name="build-project">
-        <echo message="${ant.project.name}: ${ant.file}"/>
-        <javac debug="true" debuglevel="${debuglevel}" destdir="bin" includeantruntime="false" source="${source}" target="${target}">
-            <src path="src"/>
-            <classpath refid="b6sftpSend.classpath"/>
-        </javac>
-    </target>
-    <target description="Build all projects which reference this project. Useful to propagate changes." name="build-refprojects"/>
-
-    <target name="Transfer">
-        <java classname="com.commander4j.sftp.Transfer" failonerror="true" fork="yes">
-            <classpath refid="run.Transfer.classpath"/>
-        </java>
-    </target>
+              as the first entry and export the buildfile again. -->
+<project basedir="." default="build" name="b6sftpSend">
+	<property environment="env"/>
+	<property name="debuglevel" value="source,lines,vars"/>
+	<property name="target" value="17"/>
+	<property name="source" value="17"/>
+	<path id="b6sftpSend.classpath">
+		<pathelement location="bin"/>
+		<fileset dir="lib">
+			<include name="**/*.jar"/>
+		</fileset>
+	</path>
+	<target name="init">
+		<mkdir dir="bin"/>
+		<copy includeemptydirs="false" todir="bin">
+			<fileset dir="src">
+				<exclude name="**/*.launch"/>
+				<exclude name="**/*.java"/>
+			</fileset>
+		</copy>
+	</target>
+	<target name="clean">
+		<delete dir="bin"/>
+	</target>
+	<target depends="clean" name="cleanall"/>
+	<target depends="build-subprojects,build-project" name="build"/>
+	<target name="build-subprojects"/>
+	<target depends="init" name="build-project">
+		<echo message="${ant.project.name}: ${ant.file}"/>
+		<javac debug="true" debuglevel="${debuglevel}" destdir="bin" includeantruntime="false" source="${source}" target="${target}">
+			<src path="src"/>
+			<classpath refid="b6sftpSend.classpath"/>
+		</javac>
+	</target>
+	<target description="Build all projects which reference this project. Useful to propagate changes." name="build-refprojects"/>
 </project>

b6sftpSend/getdependencies.sh

@@ -0,0 +1 @@
+mvn -f b6sftpSend_pom.xml clean dependency:copy-dependencies

b6sftpSend/src/com/commander4j/sftp/Transfer.java

@@ -47,7 +47,7 @@ public class Transfer extends Thread
 	public static JUtility utils = new JUtility();
 	public static EmailQueue emailqueue = new EmailQueue();
 	public static EmailThread emailthread;
-	public static String version = "4.11";
+	public static String version = "4.12";
 	public static Long pollFrequencySeconds = (long) 0;
 
 	public static void main(String[] args)