Merge pull request #6918 from mbien/minor-lib-upgrades

Upgrade commons libs, freemarker, jackson, batik and flexmark
apache · Jan 6, 2024 · 943a253 · 943a253
2 parents 0375f4a + ae5a15b
commit 943a253
Show file tree

Hide file tree

Showing 71 changed files with 1,926 additions and 653 deletions.
diff --git a/enterprise/libs.commons_fileupload/external/binaries-list b/enterprise/libs.commons_fileupload/external/binaries-list
@@ -14,4 +14,4 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-F95188E3D372E20E7328706C37EF366E5D7859B0 commons-fileupload:commons-fileupload:1.4
+AD4AD2AB2961B4E1891472BD1A33FABEFB0385F3 commons-fileupload:commons-fileupload:1.5
diff --git a/...ternal/commons-fileupload-1.4-license.txt → ...ternal/commons-fileupload-1.5-license.txt b/...ternal/commons-fileupload-1.4-license.txt → ...ternal/commons-fileupload-1.5-license.txt
@@ -1,5 +1,5 @@
 Name: Apache Commons FileUpload
-Version: 1.4
+Version: 1.5
 License: Apache-2.0
 OSR: 2970
 Description: File upload component

diff --git a/...xternal/commons-fileupload-1.4-notice.txt → ...xternal/commons-fileupload-1.5-notice.txt b/...xternal/commons-fileupload-1.4-notice.txt → ...xternal/commons-fileupload-1.5-notice.txt
diff --git a/enterprise/libs.commons_fileupload/nbproject/project.properties b/enterprise/libs.commons_fileupload/nbproject/project.properties
@@ -18,6 +18,6 @@
 is.autoload=true
 javac.compilerargs=-Xlint:all -Xlint:-serial
 javac.source=1.8
-release.external/commons-fileupload-1.4.jar=modules/ext/commons-fileupload-1.4.jar
+release.external/commons-fileupload-1.5.jar=modules/ext/commons-fileupload-1.5.jar
 jnlp.indirect.jars=\
-    modules/ext/commons-fileupload-1.4.jar
+    modules/ext/commons-fileupload-1.5.jar
diff --git a/enterprise/libs.jackson/external/binaries-list b/enterprise/libs.jackson/external/binaries-list
@@ -15,9 +15,9 @@
 # specific language governing permissions and limitations
 # under the License.
 
-136F77AB424F302C9E27230B4482E8000E142EDF com.fasterxml.jackson.core:jackson-annotations:2.13.5
-0D07C97D3DE9EA658CAF1FF1809FD9DE930A286A com.fasterxml.jackson.core:jackson-core:2.13.5
-AA95E46DBC32454F3983221D420E78EF19DDF844 com.fasterxml.jackson.core:jackson-databind:2.13.5
-76F77A8427BF8F387CFDAE5773CC5BEC8CC4F604 com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.13.5
-8BA3B868E81D7FC6EAD686BD2353859B111D9EAF com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.13.5
-5A2A6083A13D550F5FC2E1490CDB5952CDBD391C com.fasterxml.jackson.module:jackson-module-jaxb-annotations:2.13.5
+FD441D574A71E7D10A4F73DE6609F881D8CDFEEC com.fasterxml.jackson.core:jackson-annotations:2.16.1
+9456BB3CDD0F79F91A5F730A1B1BB041A380C91F com.fasterxml.jackson.core:jackson-core:2.16.1
+02A16EFEB840C45AF1E2F31753DFE76795278B73 com.fasterxml.jackson.core:jackson-databind:2.16.1
+1BE7098DCCC079171464DCA7E386BD8DF623B031 com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.16.1
+36A418325C618E440E5CCB80B75C705D894F50BD com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.16.1
+E9DF364A2695E66EB8D2803D6725424842760125 com.fasterxml.jackson.module:jackson-module-jaxb-annotations:2.16.1
diff --git a/...ckson/external/jackson-2.13.5-license.txt → ...ckson/external/jackson-2.16.1-license.txt b/...ckson/external/jackson-2.13.5-license.txt → ...ckson/external/jackson-2.16.1-license.txt
@@ -2,8 +2,8 @@ Name: Jackson
 Description: Jackson is a high-performance JSON processor for Java.
 License: Apache-2.0
 Origin: https://github.com/FasterXML/jackson
-Version: 2.13.5
-Files: jackson-annotations-2.13.5.jar, jackson-core-2.13.5.jar, jackson-databind-2.13.5.jar, jackson-dataformat-cbor-2.13.5.jar, jackson-datatype-jsr310-2.13.5.jar, jackson-module-jaxb-annotations-2.13.5.jar
+Version: 2.16.1
+Files: jackson-annotations-2.16.1.jar, jackson-core-2.16.1.jar, jackson-databind-2.16.1.jar, jackson-dataformat-cbor-2.16.1.jar, jackson-datatype-jsr310-2.16.1.jar, jackson-module-jaxb-annotations-2.16.1.jar
 
 
                                  Apache License

diff --git a/enterprise/libs.jackson/nbproject/org-netbeans-libs-jackson.sig b/enterprise/libs.jackson/nbproject/org-netbeans-libs-jackson.sig
diff --git a/enterprise/libs.jackson/nbproject/project.properties b/enterprise/libs.jackson/nbproject/project.properties
@@ -19,9 +19,9 @@ is.autoload=true
 javac.compilerargs=-Xlint -Xlint:-serial
 javac.source=1.8
 sigtest.gen.fail.on.error=false
-release.external/jackson-annotations-2.13.5.jar=modules/ext/jackson/jackson-annotations-2.13.5.jar
-release.external/jackson-core-2.13.5.jar=modules/ext/jackson/jackson-core-2.13.5.jar
-release.external/jackson-databind-2.13.5.jar=modules/ext/jackson/jackson-databind-2.13.5.jar
-release.external/jackson-dataformat-cbor-2.13.5.jar=modules/ext/jackson/jackson-dataformat-cbor-2.13.5.jar
-release.external/jackson-datatype-jsr310-2.13.5.jar=modules/ext/jackson/jackson-datatype-jsr310-2.13.5.jar
-release.external/jackson-module-jaxb-annotations-2.13.5.jar=modules/ext/jackson/jackson-module-jaxb-annotations-2.13.5.jar
+release.external/jackson-annotations-2.16.1.jar=modules/ext/jackson/jackson-annotations-2.16.1.jar
+release.external/jackson-core-2.16.1.jar=modules/ext/jackson/jackson-core-2.16.1.jar
+release.external/jackson-databind-2.16.1.jar=modules/ext/jackson/jackson-databind-2.16.1.jar
+release.external/jackson-dataformat-cbor-2.16.1.jar=modules/ext/jackson/jackson-dataformat-cbor-2.16.1.jar
+release.external/jackson-datatype-jsr310-2.16.1.jar=modules/ext/jackson/jackson-datatype-jsr310-2.16.1.jar
+release.external/jackson-module-jaxb-annotations-2.16.1.jar=modules/ext/jackson/jackson-module-jaxb-annotations-2.16.1.jar
diff --git a/enterprise/libs.jackson/nbproject/project.xml b/enterprise/libs.jackson/nbproject/project.xml
@@ -85,28 +85,28 @@
                 <package>com.fasterxml.jackson.module.jaxb.ser</package>
             </public-packages>
             <class-path-extension>
-                <runtime-relative-path>ext/jackson/jackson-annotations-2.13.5.jar</runtime-relative-path>
-                <binary-origin>external/jackson-annotations-2.13.5.jar</binary-origin>
+                <runtime-relative-path>ext/jackson/jackson-annotations-2.16.1.jar</runtime-relative-path>
+                <binary-origin>external/jackson-annotations-2.16.1.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/jackson/jackson-core-2.13.5.jar</runtime-relative-path>
-                <binary-origin>external/jackson-core-2.13.5.jar</binary-origin>
+                <runtime-relative-path>ext/jackson/jackson-core-2.16.1.jar</runtime-relative-path>
+                <binary-origin>external/jackson-core-2.16.1.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/jackson/jackson-databind-2.13.5.jar</runtime-relative-path>
-                <binary-origin>external/jackson-databind-2.13.5.jar</binary-origin>
+                <runtime-relative-path>ext/jackson/jackson-databind-2.16.1.jar</runtime-relative-path>
+                <binary-origin>external/jackson-databind-2.16.1.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/jackson/jackson-dataformat-cbor-2.13.5.jar</runtime-relative-path>
-                <binary-origin>external/jackson-dataformat-cbor-2.13.5.jar</binary-origin>
+                <runtime-relative-path>ext/jackson/jackson-dataformat-cbor-2.16.1.jar</runtime-relative-path>
+                <binary-origin>external/jackson-dataformat-cbor-2.16.1.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/jackson/jackson-datatype-jsr310-2.13.5.jar</runtime-relative-path>
-                <binary-origin>external/jackson-datatype-jsr310-2.13.5.jar</binary-origin>
+                <runtime-relative-path>ext/jackson/jackson-datatype-jsr310-2.16.1.jar</runtime-relative-path>
+                <binary-origin>external/jackson-datatype-jsr310-2.16.1.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/jackson/jackson-module-jaxb-annotations-2.13.5.jar</runtime-relative-path>
-                <binary-origin>external/jackson-module-jaxb-annotations-2.13.5.jar</binary-origin>
+                <runtime-relative-path>ext/jackson/jackson-module-jaxb-annotations-2.16.1.jar</runtime-relative-path>
+                <binary-origin>external/jackson-module-jaxb-annotations-2.16.1.jar</binary-origin>
             </class-path-extension>
         </data>
     </configuration>

diff --git a/ide/libs.commons_compress/external/binaries-list b/ide/libs.commons_compress/external/binaries-list
@@ -14,4 +14,4 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-B4B1B5A3D9573B2970FDDAB236102C0A4D27D35E org.apache.commons:commons-compress:1.24.0
+9D35AEC423DA6C8A7F93D7E9E1C6B1D9FE14BB5E org.apache.commons:commons-compress:1.25.0
diff --git a/...ernal/commons-compress-1.24.0-license.txt → ...ernal/commons-compress-1.25.0-license.txt b/...ernal/commons-compress-1.24.0-license.txt → ...ernal/commons-compress-1.25.0-license.txt
@@ -1,5 +1,5 @@
 Name: Commons Compress
-Version: 1.24.0
+Version: 1.25.0
 Description: The Apache Commons Compress library defines an API for working with ar, cpio, Unix dump, tar, zip, gzip, XZ, Pack200, bzip2, 7z, arj, lzma, snappy, DEFLATE, lz4, Brotli, Zstandard, DEFLATE64 and Z files.
 Origin: https://commons.apache.org/proper/commons-compress/index.html
 License: Apache-2.0

diff --git a/...ternal/commons-compress-1.24.0-notice.txt → ...ternal/commons-compress-1.25.0-notice.txt b/...ternal/commons-compress-1.24.0-notice.txt → ...ternal/commons-compress-1.25.0-notice.txt