Merge pull request #7569 from mbien/lib-upgrades-nb23

Upgrade commons libs, freemarker, jackson, guava, gson, maven-indexer, junit and jgit
apache · Jul 16, 2024 · 34d371d · 34d371d
2 parents 54e4883 + 151d4d2
commit 34d371d
Show file tree

Hide file tree

Showing 83 changed files with 211 additions and 452 deletions.
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.
 
-880A742337010DA4C851F843D8CAC150E22DFF9F com.fasterxml.jackson.core:jackson-annotations:2.17.0
-A6E5058EF9720623C517252D17162F845306FF3A com.fasterxml.jackson.core:jackson-core:2.17.0
-7173E9E1D4BC6D7CA03BC4EEEDCD548B8B580B34 com.fasterxml.jackson.core:jackson-databind:2.17.0
-6833C8573452D583E4AF650A7424D547606B2501 com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.17.0
-3FAB507BBA9D477E52ED2302DC3DDBD23CBAE339 com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.17.0
-E07032CE170277213AC4835169CA79FA0340C7B5 com.fasterxml.jackson.module:jackson-module-jaxb-annotations:2.17.0
+147B7B9412FFFF24339F8ABA080B292448E08698 com.fasterxml.jackson.core:jackson-annotations:2.17.2
+969A35CB35C86512ACBADCDBBBFB044C877DB814 com.fasterxml.jackson.core:jackson-core:2.17.2
+E6DEB029E5901E027C129341FAC39E515066B68C com.fasterxml.jackson.core:jackson-databind:2.17.2
+57FA7C1B5104BBC4599278D13933A937EE058E68 com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.17.2
+267B85E9BA2892A37BE6D80AA9CA1438A0D8C210 com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.17.2
+C2978B818EF2F2B2738B387C143624EAB611D917 com.fasterxml.jackson.module:jackson-module-jaxb-annotations:2.17.2
diff --git a/...ckson/external/jackson-2.17.0-license.txt → ...ckson/external/jackson-2.17.2-license.txt b/...ckson/external/jackson-2.17.0-license.txt → ...ckson/external/jackson-2.17.2-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.17.0
-Files: jackson-annotations-2.17.0.jar, jackson-core-2.17.0.jar, jackson-databind-2.17.0.jar, jackson-dataformat-cbor-2.17.0.jar, jackson-datatype-jsr310-2.17.0.jar, jackson-module-jaxb-annotations-2.17.0.jar
+Version: 2.17.2
+Files: jackson-annotations-2.17.2.jar, jackson-core-2.17.2.jar, jackson-databind-2.17.2.jar, jackson-dataformat-cbor-2.17.2.jar, jackson-datatype-jsr310-2.17.2.jar, jackson-module-jaxb-annotations-2.17.2.jar
 
 
                                  Apache License

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.17.0.jar=modules/ext/jackson/jackson-annotations-2.17.0.jar
-release.external/jackson-core-2.17.0.jar=modules/ext/jackson/jackson-core-2.17.0.jar
-release.external/jackson-databind-2.17.0.jar=modules/ext/jackson/jackson-databind-2.17.0.jar
-release.external/jackson-dataformat-cbor-2.17.0.jar=modules/ext/jackson/jackson-dataformat-cbor-2.17.0.jar
-release.external/jackson-datatype-jsr310-2.17.0.jar=modules/ext/jackson/jackson-datatype-jsr310-2.17.0.jar
-release.external/jackson-module-jaxb-annotations-2.17.0.jar=modules/ext/jackson/jackson-module-jaxb-annotations-2.17.0.jar
+release.external/jackson-annotations-2.17.2.jar=modules/ext/jackson/jackson-annotations-2.17.2.jar
+release.external/jackson-core-2.17.2.jar=modules/ext/jackson/jackson-core-2.17.2.jar
+release.external/jackson-databind-2.17.2.jar=modules/ext/jackson/jackson-databind-2.17.2.jar
+release.external/jackson-dataformat-cbor-2.17.2.jar=modules/ext/jackson/jackson-dataformat-cbor-2.17.2.jar
+release.external/jackson-datatype-jsr310-2.17.2.jar=modules/ext/jackson/jackson-datatype-jsr310-2.17.2.jar
+release.external/jackson-module-jaxb-annotations-2.17.2.jar=modules/ext/jackson/jackson-module-jaxb-annotations-2.17.2.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.17.0.jar</runtime-relative-path>
-                <binary-origin>external/jackson-annotations-2.17.0.jar</binary-origin>
+                <runtime-relative-path>ext/jackson/jackson-annotations-2.17.2.jar</runtime-relative-path>
+                <binary-origin>external/jackson-annotations-2.17.2.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/jackson/jackson-core-2.17.0.jar</runtime-relative-path>
-                <binary-origin>external/jackson-core-2.17.0.jar</binary-origin>
+                <runtime-relative-path>ext/jackson/jackson-core-2.17.2.jar</runtime-relative-path>
+                <binary-origin>external/jackson-core-2.17.2.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/jackson/jackson-databind-2.17.0.jar</runtime-relative-path>
-                <binary-origin>external/jackson-databind-2.17.0.jar</binary-origin>
+                <runtime-relative-path>ext/jackson/jackson-databind-2.17.2.jar</runtime-relative-path>
+                <binary-origin>external/jackson-databind-2.17.2.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/jackson/jackson-dataformat-cbor-2.17.0.jar</runtime-relative-path>
-                <binary-origin>external/jackson-dataformat-cbor-2.17.0.jar</binary-origin>
+                <runtime-relative-path>ext/jackson/jackson-dataformat-cbor-2.17.2.jar</runtime-relative-path>
+                <binary-origin>external/jackson-dataformat-cbor-2.17.2.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/jackson/jackson-datatype-jsr310-2.17.0.jar</runtime-relative-path>
-                <binary-origin>external/jackson-datatype-jsr310-2.17.0.jar</binary-origin>
+                <runtime-relative-path>ext/jackson/jackson-datatype-jsr310-2.17.2.jar</runtime-relative-path>
+                <binary-origin>external/jackson-datatype-jsr310-2.17.2.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/jackson/jackson-module-jaxb-annotations-2.17.0.jar</runtime-relative-path>
-                <binary-origin>external/jackson-module-jaxb-annotations-2.17.0.jar</binary-origin>
+                <runtime-relative-path>ext/jackson/jackson-module-jaxb-annotations-2.17.2.jar</runtime-relative-path>
+                <binary-origin>external/jackson-module-jaxb-annotations-2.17.2.jar</binary-origin>
             </class-path-extension>
         </data>
     </configuration>

diff --git a/ide/c.google.gson/external/binaries-list b/ide/c.google.gson/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.
-8A432C1D6825781E21A02DB2E2C33C5FDE2833B9 com.google.code.gson:gson:2.8.9
+527175CA6D81050B53BDD4C457A6D6E017626B0E com.google.code.gson:gson:2.11.0
diff --git a/....indexer/external/gson-2.11.0-license.txt → ...gle.gson/external/gson-2.11.0-license.txt b/....indexer/external/gson-2.11.0-license.txt → ...gle.gson/external/gson-2.11.0-license.txt
@@ -3,7 +3,6 @@ Description: JSon serialization/deserialization library
 Origin: GitHub
 Version: 2.11.0
 License: Apache-2.0
-Source: https://github.com/google/gson
 
                                  Apache License
                            Version 2.0, January 2004

diff --git a/ide/c.google.gson/external/gson-2.8.9-license.txt b/ide/c.google.gson/external/gson-2.8.9-license.txt
diff --git a/ide/c.google.gson/nbproject/project.properties b/ide/c.google.gson/nbproject/project.properties
@@ -14,7 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-release.external/gson-2.8.9.jar=modules/com-google-gson.jar
+release.external/gson-2.11.0.jar=modules/com-google-gson.jar
 is.autoload=true
 javac.compilerargs=-Xlint -Xlint:-serial
 javac.source=1.8

diff --git a/ide/c.google.gson/nbproject/project.xml b/ide/c.google.gson/nbproject/project.xml
@@ -28,7 +28,7 @@
            <public-packages/>
            <class-path-extension>
                <runtime-relative-path>com-google-gson.jar</runtime-relative-path>
-               <binary-origin>external/gson-2.8.9.jar</binary-origin>
+               <binary-origin>external/gson-2.11.0.jar</binary-origin>
             </class-path-extension>
         </data>
     </configuration>

diff --git a/ide/c.google.guava/external/binaries-list b/ide/c.google.guava/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.
-161BA27964A62F241533807A46B8711B13C1D94B com.google.guava:guava:33.0.0-jre
+818E780DA2C66C63BBB6480FEF1F3855EEAFA3E4 com.google.guava:guava:33.2.1-jre
diff --git a/...ava/external/guava-33.0.0-jre-license.txt → ...ava/external/guava-33.2.1-jre-license.txt b/...ava/external/guava-33.0.0-jre-license.txt → ...ava/external/guava-33.2.1-jre-license.txt
@@ -1,5 +1,5 @@
 Name: Guava
-Version: 33.0.0
+Version: 33.2.1
 License: Apache-2.0
 Origin: https://github.com/google/guava
 Description: Guava is a set of core libraries that includes new collection types (such as multimap and multiset), immutable collections, a graph library, and utilities for concurrency, I/O, hashing, primitives, strings, and more.

diff --git a/ide/c.google.guava/nbproject/project.properties b/ide/c.google.guava/nbproject/project.properties
@@ -17,6 +17,6 @@
 javac.compilerargs=-Xlint -Xlint:-serial
 javac.source=1.8
 spec.version.base=27.18.0
-release.external/guava-33.0.0-jre.jar=modules/com-google-guava.jar
+release.external/guava-33.2.1-jre.jar=modules/com-google-guava.jar
 is.autoload=true
 nbm.module.author=Tomas Stupka