Merged with upstream/develop.

Author: xeno6696

.snyk

@@ -1,7 +1,2 @@
 # Snyk (https://snyk.io) policy file, patches or ignores known vulnerabilities.
 version: v1.14.0
-ignore:
-   SNYK-JAVA-COMMONSIO-1277109:
-     - commons-io:commons-io:
-       reason: ESAPI cannot upgrade past the current commons-io version and still maintain Java 7 compatibility
-       expires: '2025-12-30T00:00:00.000Z'

CONTRIBUTING-TO-ESAPI.txt

@@ -46,10 +46,9 @@ Overview:
             autocrlf = input
 
 Required Software:
-    We use Maven for building. Maven 3.1 or later is required. You also need
-    JDK 7 or later. (We generally use JDK 8, but compile ESAPI only to require
-    JDK 7, which means our code can't yet use any features exclusive to Java 8
-    or later.) [Note: If you use JDK 9 or later, there will be multiple
+    We use Maven for building. Maven 3.3.9 or later is required. You also need
+    JDK 8 or later.
+    [Note: If you use JDK 9 or later, there will be multiple
     failures when you try to run 'mvn test' as well as some general warnings.
     See ESAPI GitHub issue #496 for details.]
 

README.md

@@ -29,7 +29,7 @@ You will find that GitHub repository at [https://github.com/ESAPI/esapi-java-leg
 <b>IMPORTANT NOTES:</b>
 The default branch for ESAPI legacy is now the 'develop' branch (rather than the 'main' (formerly 'master') branch), where future development, bug fixes, etc. will now be done. The 'main' branch is now marked as "protected"; it reflects the latest stable ESAPI release (2.1.0.1 as of this date). Note that this change of making the 'develop' branch the default may affect any pull requests that you were intending to make.
 
-Also, the <i>minimal</i> baseline Java version to use ESAPI is Java 7. (This was changed from Java 6 during the 2.2.0.0 release.)
+Also, the <i>minimal</i> baseline Java version to use ESAPI is Java 8. (This was changed from Java 7 during the 2.4.0.0 release.)
 
 # Where can I find ESAPI 3.x?
 [https://github.com/ESAPI/esapi-java](https://github.com/ESAPI/esapi-java)