Fixes20260424

README.testing.txt

@@ -95,7 +95,7 @@ JDRunit setup.
 11. Copy the ini/runitxx8Sx.ini to a file that represents the JVM used for the test.  The 8S is a sample configuration for a Java 8 test on a PC. 
 12. Download the latest JTOpen release. 
     java -cp JTOpen-test.jar test.JTOpenDownloadReleaseJars
-13. For the IFS tests, get a copy of jcifs.jar and copy into the jar directory.   
+13. For the NetServer tests, get a copy of jcifs-3.0.2.jar and copy into the jar directory.   
 14. Copy the java certificate store to $JTOPEN_TEST_DIR. Add the necessary certificates in order to establish 
     secure (TLS) connections to the server you are testing.   
 

pom.xml

@@ -65,12 +65,11 @@
     <scope>provided</scope>
 	</dependency>
 
-    <dependency>
-      <groupId>org.codelibs</groupId>
-      <artifactId>jcifs</artifactId>
-      <version>1.3.18.3</version>
-    </dependency>
-
-  </dependencies>
+<dependency>
+    <groupId>org.codelibs</groupId>
+    <artifactId>jcifs</artifactId>
+    <version>3.0.2</version>
+    <scope>compile</scope>
+</dependency>  </dependencies>
 </project>
 

pomWar.xml

@@ -63,12 +63,12 @@
     <artifactId>jakarta.servlet-api</artifactId>
     <version>6.0.0</version>
 </dependency>
-    <dependency>
-      <groupId>org.codelibs</groupId>
-      <artifactId>jcifs</artifactId>
-      <version>1.3.18.3</version>
-    </dependency>
-<!--    <dependency>
+<dependency>
+    <groupId>org.codelibs</groupId>
+    <artifactId>jcifs</artifactId>
+    <version>3.0.2</version>
+    <scope>compile</scope>
+</dependency><!--    <dependency>
       <groupId>com.sun</groupId>
       <artifactId>tools</artifactId>
       <version>1.8</version>

src/test/AllQshCompileScript

@@ -9,7 +9,7 @@ echo UNAME is $UNAME
 #
 UVERSION=`uname -v`
 URELEASE=`uname -r`
-CLASSPATH=".:/qibm/proddata/http/public/jt400/lib/java8/jt400.jar:/qibm/proddata/http/public/jt400/lib/jt400Servlet.jar:/home/jdbctest/jars/servlet.jar:/home/jdbctest/jars/sslightx.zip:/qibm/proddata/os400/java400/jdk/lib/tools.jar:/QOpenSys/QIBM/ProdData/JavaVM/jdk60/32bit/lib/tools.jar:/QOpenSys/QIBM/ProdData/JavaVM/jdk80/64bit/lib/tools.jar:/QOpenSys/QIBM/ProdData/JavaVM/jdk80/32bit/lib/tools.jar:./db2_classes.jar:/qibm/proddata/os400/java400/ext/mail.jar:/qibm/proddata/os400/java400/ext/activation.jar:/home/jdbctest/jars/jcifs.jar:/home/jdbctest/jars/jakarta.servlet-api-5.0.0.jar"
+CLASSPATH=".:/qibm/proddata/http/public/jt400/lib/java8/jt400.jar:/qibm/proddata/http/public/jt400/lib/jt400Servlet.jar:/home/jdbctest/jars/servlet.jar:/home/jdbctest/jars/sslightx.zip:/qibm/proddata/os400/java400/jdk/lib/tools.jar:/QOpenSys/QIBM/ProdData/JavaVM/jdk60/32bit/lib/tools.jar:/QOpenSys/QIBM/ProdData/JavaVM/jdk80/64bit/lib/tools.jar:/QOpenSys/QIBM/ProdData/JavaVM/jdk80/32bit/lib/tools.jar:./db2_classes.jar:/qibm/proddata/os400/java400/ext/mail.jar:/qibm/proddata/os400/java400/ext/activation.jar:/home/jdbctest/jars/jcifs-3.0.2.jar:/home/jdbctest/jars/jakarta.servlet-api-5.0.0.jar"
 
 
 
@@ -94,7 +94,8 @@ do #
   echo UVERSION is $UVERSION
   echo UNAME is '"'$UNAME'"'
   echo URELEASE is '"'$URELEASE'"'
-  JAVA_HOME=/QOpenSys/QIBM/ProdData/JavaVM/jdk80/64bit
+  # Compile now with Java 17 for Jjcifs-3.0.2
+  JAVA_HOME=/QOpenSys/QIBM/ProdData/JavaVM/jdk17/64bit
   export JAVA_HOME
   echo JAVA_HOME is $JAVA_HOME
   echo "javac -classpath $CLASSPATH -g -source 1.8  -target 1.8 $files"

src/test/IFS/IFSGenericTestcase.java

@@ -29,13 +29,13 @@
 import java.util.Hashtable;
 import java.util.Vector;
 
+
 import com.ibm.as400.access.AS400;
 import com.ibm.as400.access.AS400JDBCDriver;
 import com.ibm.as400.access.IFSFile;
 import com.ibm.as400.access.IFSFileOutputStream;
 import com.ibm.as400.access.IFSRandomAccessFile;
 
-import jcifs.smb.SmbException;
 import test.IFSTests;
 import test.JCIFSUtility;
 import test.JTOpenTestEnvironment;
@@ -1152,7 +1152,7 @@ public final void deleteIFSFile(String pathName)
 
 
 
-  public InputStream getNonIFSInputStream(String ifsPathName) throws FileNotFoundException, SmbException, MalformedURLException, UnknownHostException, SQLException {
+  public InputStream getNonIFSInputStream(String ifsPathName) throws Exception {
       InputStream fis = null; 
       if (IFSTests.IsRunningOnOS400) {
 	  fis = new FileInputStream(ifsPathName); 
@@ -1240,6 +1240,7 @@ public long checkFileLength(String ifsPathNameX) throws Exception {
   	// return (file.length());
       }
   }
+
 
   public boolean checkExpectedRead2(String ifsPathNameX, int x1, int x2) throws Exception  {  
     boolean passed = false; 
@@ -1253,12 +1254,11 @@ public boolean checkExpectedRead2(String ifsPathNameX, int x1, int x2) throws Ex
     }
 
   public DataInput openDataInput(String ifsPathNameX, String mode) throws Exception  {  
+
     return JCIFSUtility.openDataInput(systemName_, userId_, encryptedPassword_, ifsPathNameX, mode); 
-    }
+
+  }
 
-//  public DataOutput openDataOutput(String ifsPathNameX, String mode) throws Exception  {  
-//    return JCIFSUtility.openDataOutput(systemName_, userId_, encryptedPassword_, ifsPathNameX, mode); 
-//     }
 
 
 }