update Apache commons-io jar file from 2.6 to 2.11.0

jayponder · jayponder · commit 2412421628b0 · 2021-10-10T11:39:48.000-05:00
diff --git a/source/ffe.tgz b/source/ffe.tgz
diff --git a/source/ffe/FFESetupLinux.csh b/source/ffe/FFESetupLinux.csh
@@ -54,9 +54,9 @@ endif
 # Add required JAR files to CLASSPATH variable
 #
 if !($?CLASSPATH) then
-   setenv CLASSPATH "$FFE_LIB/AppleJavaExtensions-1.6.jar:$FFE_LIB/commons-io-2.6.jar:$FFE_LIB/commons-lang-2.7.jar:$FFE_LIB/commons-logging-1.3.jar:$FFE_LIB/ffe-8.10.jar:$FFE_LIB/gluegen-rt-android-natives-macosx-universal.jar:$FFE_LIB/gluegen-rt.jar:$FFE_LIB/gluegen.jar:$FFE_LIB/groovy-all-2.4.4.jar:$FFE_LIB/j3dcore-1.7.jar:$FFE_LIB/j3dutils-1.7.jar:$FFE_LIB/jh-2.0.5.jar:$FFE_LIB/joal-natives-macosx-universal.jar:$FFE_LIB/joal.jar:$FFE_LIB/jogl-all-noawt-natives-macosx-universal.jar:$FFE_LIB/jogl-all.jar:$FFE_LIB/sunjce_provider.jar:$FFE_LIB/vecmath-1.7.jar:$OS_LIB"
+   setenv CLASSPATH "$FFE_LIB/AppleJavaExtensions-1.6.jar:$FFE_LIB/commons-io-2.11.0.jar:$FFE_LIB/commons-lang-2.7.jar:$FFE_LIB/commons-logging-1.3.jar:$FFE_LIB/ffe-8.10.jar:$FFE_LIB/gluegen-rt-android-natives-macosx-universal.jar:$FFE_LIB/gluegen-rt.jar:$FFE_LIB/gluegen.jar:$FFE_LIB/groovy-all-2.4.4.jar:$FFE_LIB/j3dcore-1.7.jar:$FFE_LIB/j3dutils-1.7.jar:$FFE_LIB/jh-2.0.5.jar:$FFE_LIB/joal-natives-macosx-universal.jar:$FFE_LIB/joal.jar:$FFE_LIB/jogl-all-noawt-natives-macosx-universal.jar:$FFE_LIB/jogl-all.jar:$FFE_LIB/sunjce_provider.jar:$FFE_LIB/vecmath-1.7.jar:$OS_LIB"
 else
-   setenv CLASSPATH "$FFE_LIB/AppleJavaExtensions-1.6.jar:$FFE_LIB/commons-io-2.6.jar:$FFE_LIB/commons-lang-2.7.jar:$FFE_LIB/commons-logging-1.3.jar:$FFE_LIB/ffe-8.10.jar:$FFE_LIB/gluegen-rt-android-natives-linux-amd64.jar:$FFE_LIB/gluegen-rt.jar:$FFE_LIB/gluegen.jar:$FFE_LIB/groovy-all-2.4.4.jar:$FFE_LIB/j3dcore-1.7.jar:$FFE_LIB/j3dutils-1.7.jar:$FFE_LIB/jh-2.0.5.jar:$FFE_LIB/joal-natives-linux-amd64.jar:$FFE_LIB/joal.jar:$FFE_LIB/jogl-all-noawt-natives-linux-amd64.jar:$FFE_LIB/jogl-all.jar:$FFE_LIB/sunjce_provider.jar:$FFE_LIB/vecmath-1.7.jar:$OS_LIB:$CLASSPATH"
+   setenv CLASSPATH "$FFE_LIB/AppleJavaExtensions-1.6.jar:$FFE_LIB/commons-io-2.11.0.jar:$FFE_LIB/commons-lang-2.7.jar:$FFE_LIB/commons-logging-1.3.jar:$FFE_LIB/ffe-8.10.jar:$FFE_LIB/gluegen-rt-android-natives-linux-amd64.jar:$FFE_LIB/gluegen-rt.jar:$FFE_LIB/gluegen.jar:$FFE_LIB/groovy-all-2.4.4.jar:$FFE_LIB/j3dcore-1.7.jar:$FFE_LIB/j3dutils-1.7.jar:$FFE_LIB/jh-2.0.5.jar:$FFE_LIB/joal-natives-linux-amd64.jar:$FFE_LIB/joal.jar:$FFE_LIB/jogl-all-noawt-natives-linux-amd64.jar:$FFE_LIB/jogl-all.jar:$FFE_LIB/sunjce_provider.jar:$FFE_LIB/vecmath-1.7.jar:$OS_LIB:$CLASSPATH"
 endif
 
 #
diff --git a/source/ffe/FFESetupLinux.sh b/source/ffe/FFESetupLinux.sh
@@ -56,9 +56,9 @@ export PATH
 #
 if [ -z "${CLASSPATH}" ]
 then
-   CLASSPATH="$FFE_LIB/AppleJavaExtensions-1.6.jar;$FFE_LIB/commons-io-2.6.jar;$FFE_LIB/commons-lang-2.7.jar;$FFE_LIB/commons-logging-1.3.jar;$FFE_LIB/ffe-8.10.jar;$FFE_LIB/gluegen-rt-android-natives-linux-amd64.jar;$FFE_LIB/gluegen-rt.jar:$FFE_LIB/gluegen.jar;$FFE_LIB/groovy-all-2.4.4.jar;$FFE_LIB/j3dcore-1.7.jar;$FFE_LIB/j3dutils-1.7.jar;$FFE_LIB/jh-2.0.5.jar;$FFE_LIB/joal-natives-linux-amd64.jar;$FFE_LIB/joal.jar;$FFE_LIB/jogl-all-noawt-natives-linux-amd64.jar;$FFE_LIB/jogl-all.jar;$FFE_LIB/sunjce_provider.jar;$FFE_LIB/vecmath-1.7.jar;$OS_LIB"
+   CLASSPATH="$FFE_LIB/AppleJavaExtensions-1.6.jar;$FFE_LIB/commons-io-2.11.0.jar;$FFE_LIB/commons-lang-2.7.jar;$FFE_LIB/commons-logging-1.3.jar;$FFE_LIB/ffe-8.10.jar;$FFE_LIB/gluegen-rt-android-natives-linux-amd64.jar;$FFE_LIB/gluegen-rt.jar:$FFE_LIB/gluegen.jar;$FFE_LIB/groovy-all-2.4.4.jar;$FFE_LIB/j3dcore-1.7.jar;$FFE_LIB/j3dutils-1.7.jar;$FFE_LIB/jh-2.0.5.jar;$FFE_LIB/joal-natives-linux-amd64.jar;$FFE_LIB/joal.jar;$FFE_LIB/jogl-all-noawt-natives-linux-amd64.jar;$FFE_LIB/jogl-all.jar;$FFE_LIB/sunjce_provider.jar;$FFE_LIB/vecmath-1.7.jar;$OS_LIB"
 else
-   CLASSPATH="$FFE_LIB/AppleJavaExtensions-1.6.jar;$FFE_LIB/commons-io-2.6.jar;$FFE_LIB/commons-lang-2.7.jar;$FFE_LIB/commons-logging-1.3.jar;$FFE_LIB/ffe-8.10.jar;$FFE_LIB/gluegen-rt-android-natives-linux-amd64.jar;$FFE_LIB/gluegen-rt.jar:$FFE_LIB/gluegen.jar;$FFE_LIB/groovy-all-2.4.4.jar;$FFE_LIB/j3dcore-1.7.jar;$FFE_LIB/j3dutils-1.7.jar;$FFE_LIB/jh-2.0.5.jar;$FFE_LIB/joal-natives-linux-amd64.jar;$FFE_LIB/joal.jar;$FFE_LIB/jogl-all-noawt-natives-linux-amd64.jar;$FFE_LIB/jogl-all.jar;$FFE_LIB/sunjce_provider.jar;$FFE_LIB/vecmath-1.7.jar;$OS_LIB;$CLASSPATH"
+   CLASSPATH="$FFE_LIB/AppleJavaExtensions-1.6.jar;$FFE_LIB/commons-io-2.11.0.jar;$FFE_LIB/commons-lang-2.7.jar;$FFE_LIB/commons-logging-1.3.jar;$FFE_LIB/ffe-8.10.jar;$FFE_LIB/gluegen-rt-android-natives-linux-amd64.jar;$FFE_LIB/gluegen-rt.jar:$FFE_LIB/gluegen.jar;$FFE_LIB/groovy-all-2.4.4.jar;$FFE_LIB/j3dcore-1.7.jar;$FFE_LIB/j3dutils-1.7.jar;$FFE_LIB/jh-2.0.5.jar;$FFE_LIB/joal-natives-linux-amd64.jar;$FFE_LIB/joal.jar;$FFE_LIB/jogl-all-noawt-natives-linux-amd64.jar;$FFE_LIB/jogl-all.jar;$FFE_LIB/sunjce_provider.jar;$FFE_LIB/vecmath-1.7.jar;$OS_LIB;$CLASSPATH"
 fi
 export CLASSPATH
 
diff --git a/source/ffe/FFESetupMac.csh b/source/ffe/FFESetupMac.csh
@@ -54,9 +54,9 @@ endif
 # Add required JAR files to CLASSPATH variable
 #
 if !($?CLASSPATH) then
-   setenv CLASSPATH "$FFE_LIB/AppleJavaExtensions-1.6.jar:$FFE_LIB/commons-io-2.6.jar:$FFE_LIB/commons-lang-2.7.jar:$FFE_LIB/commons-logging-1.3.jar:$FFE_LIB/ffe-8.10.jar:$FFE_LIB/gluegen-rt-android-natives-macosx-universal.jar:$FFE_LIB/gluegen-rt.jar:$FFE_LIB/gluegen.jar:$FFE_LIB/groovy-all-2.4.4.jar:$FFE_LIB/j3dcore-1.7.jar:$FFE_LIB/j3dutils-1.7.jar:$FFE_LIB/jh-2.0.5.jar:$FFE_LIB/joal-natives-macosx-universal.jar:$FFE_LIB/joal.jar:$FFE_LIB/jogl-all-noawt-natives-macosx-universal.jar:$FFE_LIB/jogl-all.jar:$FFE_LIB/sunjce_provider.jar:$FFE_LIB/vecmath-1.7.jar:$OS_LIB"
+   setenv CLASSPATH "$FFE_LIB/AppleJavaExtensions-1.6.jar:$FFE_LIB/commons-io-2.11.0.jar:$FFE_LIB/commons-lang-2.7.jar:$FFE_LIB/commons-logging-1.3.jar:$FFE_LIB/ffe-8.10.jar:$FFE_LIB/gluegen-rt-android-natives-macosx-universal.jar:$FFE_LIB/gluegen-rt.jar:$FFE_LIB/gluegen.jar:$FFE_LIB/groovy-all-2.4.4.jar:$FFE_LIB/j3dcore-1.7.jar:$FFE_LIB/j3dutils-1.7.jar:$FFE_LIB/jh-2.0.5.jar:$FFE_LIB/joal-natives-macosx-universal.jar:$FFE_LIB/joal.jar:$FFE_LIB/jogl-all-noawt-natives-macosx-universal.jar:$FFE_LIB/jogl-all.jar:$FFE_LIB/sunjce_provider.jar:$FFE_LIB/vecmath-1.7.jar:$OS_LIB"
 else
-   setenv CLASSPATH "$FFE_LIB/AppleJavaExtensions-1.6.jar:$FFE_LIB/commons-io-2.6.jar:$FFE_LIB/commons-lang-2.7.jar:$FFE_LIB/commons-logging-1.3.jar:$FFE_LIB/ffe-8.10.jar:$FFE_LIB/gluegen-rt-android-natives-macosx-universal.jar:$FFE_LIB/gluegen-rt.jar:$FFE_LIB/gluegen.jar:$FFE_LIB/groovy-all-2.4.4.jar:$FFE_LIB/j3dcore-1.7.jar:$FFE_LIB/j3dutils-1.7.jar:$FFE_LIB/jh-2.0.5.jar:$FFE_LIB/joal-natives-macosx-universal.jar:$FFE_LIB/joal.jar:$FFE_LIB/jogl-all-noawt-natives-macosx-universal.jar:$FFE_LIB/jogl-all.jar:$FFE_LIB/sunjce_provider.jar:$FFE_LIB/vecmath-1.7.jar:$OS_LIB:$CLASSPATH"
+   setenv CLASSPATH "$FFE_LIB/AppleJavaExtensions-1.6.jar:$FFE_LIB/commons-io-2.11.0.jar:$FFE_LIB/commons-lang-2.7.jar:$FFE_LIB/commons-logging-1.3.jar:$FFE_LIB/ffe-8.10.jar:$FFE_LIB/gluegen-rt-android-natives-macosx-universal.jar:$FFE_LIB/gluegen-rt.jar:$FFE_LIB/gluegen.jar:$FFE_LIB/groovy-all-2.4.4.jar:$FFE_LIB/j3dcore-1.7.jar:$FFE_LIB/j3dutils-1.7.jar:$FFE_LIB/jh-2.0.5.jar:$FFE_LIB/joal-natives-macosx-universal.jar:$FFE_LIB/joal.jar:$FFE_LIB/jogl-all-noawt-natives-macosx-universal.jar:$FFE_LIB/jogl-all.jar:$FFE_LIB/sunjce_provider.jar:$FFE_LIB/vecmath-1.7.jar:$OS_LIB:$CLASSPATH"
 endif
 
 #
diff --git a/source/ffe/FFESetupMac.sh b/source/ffe/FFESetupMac.sh
@@ -56,9 +56,9 @@ export PATH
 #
 if [ -z "${CLASSPATH}" ]
 then
-   CLASSPATH="$FFE_LIB/AppleJavaExtensions-1.6.jar;$FFE_LIB/commons-io-2.6.jar;$FFE_LIB/commons-lang-2.7.jar;$FFE_LIB/commons-logging-1.3.jar;$FFE_LIB/ffe-8.10.jar;$FFE_LIB/gluegen-rt-android-natives-macosx-universal.jar;$FFE_LIB/gluegen-rt.jar:$FFE_LIB/gluegen.jar;$FFE_LIB/groovy-all-2.4.4.jar;$FFE_LIB/j3dcore-1.7.jar;$FFE_LIB/j3dutils-1.7.jar;$FFE_LIB/jh-2.0.5.jar;$FFE_LIB/joal-natives-macosx-universal.jar;$FFE_LIB/joal.jar;$FFE_LIB/jogl-all-noawt-natives-macosx-universal.jar;$FFE_LIB/jogl-all.jar;$FFE_LIB/sunjce_provider.jar;$FFE_LIB/vecmath-1.7.jar;$OS_LIB"
+   CLASSPATH="$FFE_LIB/AppleJavaExtensions-1.6.jar;$FFE_LIB/commons-io-2.11.0.jar;$FFE_LIB/commons-lang-2.7.jar;$FFE_LIB/commons-logging-1.3.jar;$FFE_LIB/ffe-8.10.jar;$FFE_LIB/gluegen-rt-android-natives-macosx-universal.jar;$FFE_LIB/gluegen-rt.jar:$FFE_LIB/gluegen.jar;$FFE_LIB/groovy-all-2.4.4.jar;$FFE_LIB/j3dcore-1.7.jar;$FFE_LIB/j3dutils-1.7.jar;$FFE_LIB/jh-2.0.5.jar;$FFE_LIB/joal-natives-macosx-universal.jar;$FFE_LIB/joal.jar;$FFE_LIB/jogl-all-noawt-natives-macosx-universal.jar;$FFE_LIB/jogl-all.jar;$FFE_LIB/sunjce_provider.jar;$FFE_LIB/vecmath-1.7.jar;$OS_LIB"
 else
-   CLASSPATH="$FFE_LIB/AppleJavaExtensions-1.6.jar;$FFE_LIB/commons-io-2.6.jar;$FFE_LIB/commons-lang-2.7.jar;$FFE_LIB/commons-logging-1.3.jar;$FFE_LIB/ffe-8.10.jar;$FFE_LIB/gluegen-rt-android-natives-macosx-universal.jar;$FFE_LIB/gluegen-rt.jar:$FFE_LIB/gluegen.jar;$FFE_LIB/groovy-all-2.4.4.jar;$FFE_LIB/j3dcore-1.7.jar;$FFE_LIB/j3dutils-1.7.jar;$FFE_LIB/jh-2.0.5.jar;$FFE_LIB/joal-natives-macosx-universal.jar;$FFE_LIB/joal.jar;$FFE_LIB/jogl-all-noawt-natives-macosx-universal.jar;$FFE_LIB/jogl-all.jar;$FFE_LIB/sunjce_provider.jar;$FFE_LIB/vecmath-1.7.jar;$OS_LIB;$CLASSPATH"
+   CLASSPATH="$FFE_LIB/AppleJavaExtensions-1.6.jar;$FFE_LIB/commons-io-2.11.0.jar;$FFE_LIB/commons-lang-2.7.jar;$FFE_LIB/commons-logging-1.3.jar;$FFE_LIB/ffe-8.10.jar;$FFE_LIB/gluegen-rt-android-natives-macosx-universal.jar;$FFE_LIB/gluegen-rt.jar:$FFE_LIB/gluegen.jar;$FFE_LIB/groovy-all-2.4.4.jar;$FFE_LIB/j3dcore-1.7.jar;$FFE_LIB/j3dutils-1.7.jar;$FFE_LIB/jh-2.0.5.jar;$FFE_LIB/joal-natives-macosx-universal.jar;$FFE_LIB/joal.jar;$FFE_LIB/jogl-all-noawt-natives-macosx-universal.jar;$FFE_LIB/jogl-all.jar;$FFE_LIB/sunjce_provider.jar;$FFE_LIB/vecmath-1.7.jar;$OS_LIB;$CLASSPATH"
 fi
 export CLASSPATH
 
diff --git a/source/ffe/build.xml b/source/ffe/build.xml
@@ -110,7 +110,7 @@
 
 	<path id="project.class.path">
 		<pathelement location="${jar.dir}/AppleJavaExtensions-1.6.jar" />
-		<pathelement location="${jar.dir}/commons-io-2.6.jar" />
+		<pathelement location="${jar.dir}/commons-io-2.11.0.jar" />
 		<pathelement location="${jar.dir}/commons-lang-2.7.jar" />
 		<pathelement location="${jar.dir}/commons-logging-1.3.jar" />
 		<pathelement location="${jar.dir}/ffe-${ffe.version}.jar" />
diff --git a/source/ffe/lib/commons-io-2.11.0.jar b/source/ffe/lib/commons-io-2.11.0.jar
diff --git a/source/ffe/lib/commons-io-2.6.jar b/source/ffe/lib/commons-io-2.6.jar
diff --git a/source/ffe/pom.xml b/source/ffe/pom.xml
@@ -34,7 +34,7 @@
 			<groupId>commons-io</groupId>
 			<artifactId>commons-io</artifactId>
 			<type>jar</type>
-			<version>2.6</version>
+			<version>2.11.0</version>
 		</dependency>
 		<dependency>
 			<groupId>commons-lang</groupId>

Original file line number	Diff line number	Diff line change
`@@ -54,9 +54,9 @@ endif`
`54`	`54`	`# Add required JAR files to CLASSPATH variable`
`55`	`55`	`#`
`56`	`56`	`if !($?CLASSPATH) then`
`57`		- setenv CLASSPATH "$FFE_LIB/AppleJavaExtensions-1.6.jar:$FFE_LIB/commons-io-2.6.jar:$FFE_LIB/commons-lang-2.7.jar:$FFE_LIB/commons-logging-1.3.jar:$FFE_LIB/ffe-8.10.jar:$FFE_LIB/gluegen-rt-android-natives-macosx-universal.jar:$FFE_LIB/gluegen-rt.jar:$FFE_LIB/gluegen.jar:$FFE_LIB/groovy-all-2.4.4.jar:$FFE_LIB/j3dcore-1.7.jar:$FFE_LIB/j3dutils-1.7.jar:$FFE_LIB/jh-2.0.5.jar:$FFE_LIB/joal-natives-macosx-universal.jar:$FFE_LIB/joal.jar:$FFE_LIB/jogl-all-noawt-natives-macosx-universal.jar:$FFE_LIB/jogl-all.jar:$FFE_LIB/sunjce_provider.jar:$FFE_LIB/vecmath-1.7.jar:$OS_LIB"
	`57`	+ setenv CLASSPATH "$FFE_LIB/AppleJavaExtensions-1.6.jar:$FFE_LIB/commons-io-2.11.0.jar:$FFE_LIB/commons-lang-2.7.jar:$FFE_LIB/commons-logging-1.3.jar:$FFE_LIB/ffe-8.10.jar:$FFE_LIB/gluegen-rt-android-natives-macosx-universal.jar:$FFE_LIB/gluegen-rt.jar:$FFE_LIB/gluegen.jar:$FFE_LIB/groovy-all-2.4.4.jar:$FFE_LIB/j3dcore-1.7.jar:$FFE_LIB/j3dutils-1.7.jar:$FFE_LIB/jh-2.0.5.jar:$FFE_LIB/joal-natives-macosx-universal.jar:$FFE_LIB/joal.jar:$FFE_LIB/jogl-all-noawt-natives-macosx-universal.jar:$FFE_LIB/jogl-all.jar:$FFE_LIB/sunjce_provider.jar:$FFE_LIB/vecmath-1.7.jar:$OS_LIB"
`58`	`58`	`else`
`59`		- setenv CLASSPATH "$FFE_LIB/AppleJavaExtensions-1.6.jar:$FFE_LIB/commons-io-2.6.jar:$FFE_LIB/commons-lang-2.7.jar:$FFE_LIB/commons-logging-1.3.jar:$FFE_LIB/ffe-8.10.jar:$FFE_LIB/gluegen-rt-android-natives-linux-amd64.jar:$FFE_LIB/gluegen-rt.jar:$FFE_LIB/gluegen.jar:$FFE_LIB/groovy-all-2.4.4.jar:$FFE_LIB/j3dcore-1.7.jar:$FFE_LIB/j3dutils-1.7.jar:$FFE_LIB/jh-2.0.5.jar:$FFE_LIB/joal-natives-linux-amd64.jar:$FFE_LIB/joal.jar:$FFE_LIB/jogl-all-noawt-natives-linux-amd64.jar:$FFE_LIB/jogl-all.jar:$FFE_LIB/sunjce_provider.jar:$FFE_LIB/vecmath-1.7.jar:$OS_LIB:$CLASSPATH"
	`59`	+ setenv CLASSPATH "$FFE_LIB/AppleJavaExtensions-1.6.jar:$FFE_LIB/commons-io-2.11.0.jar:$FFE_LIB/commons-lang-2.7.jar:$FFE_LIB/commons-logging-1.3.jar:$FFE_LIB/ffe-8.10.jar:$FFE_LIB/gluegen-rt-android-natives-linux-amd64.jar:$FFE_LIB/gluegen-rt.jar:$FFE_LIB/gluegen.jar:$FFE_LIB/groovy-all-2.4.4.jar:$FFE_LIB/j3dcore-1.7.jar:$FFE_LIB/j3dutils-1.7.jar:$FFE_LIB/jh-2.0.5.jar:$FFE_LIB/joal-natives-linux-amd64.jar:$FFE_LIB/joal.jar:$FFE_LIB/jogl-all-noawt-natives-linux-amd64.jar:$FFE_LIB/jogl-all.jar:$FFE_LIB/sunjce_provider.jar:$FFE_LIB/vecmath-1.7.jar:$OS_LIB:$CLASSPATH"
`60`	`60`	`endif`
`61`	`61`
`62`	`62`	`#`