Merge 1.5.5 changes to patch branch.

apache · Mar 25, 2024 · 8b96e9c · 8b96e9c
2 parents 4f8848d + df6f9f3
commit 8b96e9c
Show file tree

Hide file tree

Showing 33 changed files with 42 additions and 342 deletions.
diff --git a/doc/licenses/byte-buddy-1.14.9/NOTICE b/doc/licenses/byte-buddy-1.14.9/NOTICE
@@ -0,0 +1 @@
+Copyright 2014 - Present Rafael Winterhalter
diff --git a/doc/licenses/byte-buddy-1.14.9/README b/doc/licenses/byte-buddy-1.14.9/README
@@ -0,0 +1,8 @@
+Byte Buddy (https://bytebuddy.net/)
+-----------------------------------
+
+    Version: 1.14.9
+    From: 'Rafael Winterhalter' (https://github.com/raphw)
+    License(s):
+        Apache v2.0
+
diff --git a/doc/licenses/byte-buddy-1.14.9/dep-coordinates.txt b/doc/licenses/byte-buddy-1.14.9/dep-coordinates.txt
@@ -0,0 +1 @@
+net.bytebuddy:byte-buddy:jar:1.14.9
diff --git a/doc/licenses/jackson-2.16.1/NOTICE → doc/licenses/jackson-2.17.0/NOTICE b/doc/licenses/jackson-2.16.1/NOTICE → doc/licenses/jackson-2.17.0/NOTICE
diff --git a/doc/licenses/jackson-2.16.1/README → doc/licenses/jackson-2.17.0/README b/doc/licenses/jackson-2.16.1/README → doc/licenses/jackson-2.17.0/README
@@ -1,7 +1,7 @@
 Jackson (https://github.com/FasterXML/jackson)
 ----------------------------------------------
 
-    Version: 2.16.1
+    Version: 2.17.0
     From: 'FasterXML, LLC' (https://github.com/FasterXML)
     License(s):
         Apache v2.0

diff --git a/...censes/jackson-2.16.1/dep-coordinates.txt → ...censes/jackson-2.17.0/dep-coordinates.txt b/...censes/jackson-2.16.1/dep-coordinates.txt → ...censes/jackson-2.17.0/dep-coordinates.txt
@@ -1,4 +1,4 @@
-com.fasterxml.jackson.core:jackson-core:jar:2.16.1
-com.fasterxml.jackson.core:jackson-annotations:jar:2.16.1
-com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:jar:2.16.1
-com.fasterxml.jackson.module:jackson-module-jaxb-annotations:jar:2.16.1
+com.fasterxml.jackson.core:jackson-core:jar:2.17.0
+com.fasterxml.jackson.core:jackson-annotations:jar:2.17.0
+com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:jar:2.17.0
+com.fasterxml.jackson.module:jackson-module-jaxb-annotations:jar:2.17.0
diff --git a/doc/licenses/jackson-databind-2.16.1/dep-coordinates.txt b/doc/licenses/jackson-databind-2.16.1/dep-coordinates.txt
diff --git a/doc/licenses/jackson-databind-2.16.1/NOTICE → doc/licenses/jackson-databind-2.17.0/NOTICE b/doc/licenses/jackson-databind-2.16.1/NOTICE → doc/licenses/jackson-databind-2.17.0/NOTICE
diff --git a/doc/licenses/jackson-databind-2.16.1/README → doc/licenses/jackson-databind-2.17.0/README b/doc/licenses/jackson-databind-2.16.1/README → doc/licenses/jackson-databind-2.17.0/README
@@ -1,7 +1,7 @@
 Jackson-databind (https://github.com/FasterXML/jackson-databind)
 ----------------------------------------------
 
-    Version: 2.16.1
+    Version: 2.17.0
     From: 'FasterXML, LLC' (https://github.com/FasterXML)
     License(s):
         Apache v2.0

diff --git a/doc/licenses/jackson-databind-2.17.0/dep-coordinates.txt b/doc/licenses/jackson-databind-2.17.0/dep-coordinates.txt
@@ -0,0 +1 @@
+com.fasterxml.jackson.core:jackson-databind:jar:2.17.0
diff --git a/doc/licenses/javassist-3.29.2-ga/dep-coordinates.txt b/doc/licenses/javassist-3.29.2-ga/dep-coordinates.txt
diff --git a/doc/licenses/javassist-3.29.2-ga/README → doc/licenses/javassist-3.30.2-ga/README b/doc/licenses/javassist-3.29.2-ga/README → doc/licenses/javassist-3.30.2-ga/README
@@ -1,7 +1,7 @@
 Javassist (https://www.javassist.org/)
 --------------------------------------
 
-    Version: 3.29.2-GA
+    Version: 3.30.2-GA
     From: 'Shigeru Chiba' (https://github.com/chibash)
     License(s):
         Apache v2.0

diff --git a/doc/licenses/javassist-3.30.2-ga/dep-coordinates.txt b/doc/licenses/javassist-3.30.2-ga/dep-coordinates.txt
@@ -0,0 +1 @@
+org.javassist:javassist:jar:3.30.2-GA
diff --git a/doc/licenses/jaxb-istack-commons-3.0.5/Licence.txt b/doc/licenses/jaxb-istack-commons-3.0.5/Licence.txt
diff --git a/doc/licenses/jaxb-istack-commons-3.0.5/README b/doc/licenses/jaxb-istack-commons-3.0.5/README
diff --git a/doc/licenses/jaxb-istack-commons-3.0.5/dep-coordinates.txt b/doc/licenses/jaxb-istack-commons-3.0.5/dep-coordinates.txt
diff --git a/doc/licenses/jersey-2.41/dep-coordinates.txt b/doc/licenses/jersey-2.41/dep-coordinates.txt
diff --git a/doc/licenses/jersey-2.41/LICENSE.md → doc/licenses/jersey-2.42/LICENSE.md b/doc/licenses/jersey-2.41/LICENSE.md → doc/licenses/jersey-2.42/LICENSE.md
diff --git a/doc/licenses/jersey-2.41/README → doc/licenses/jersey-2.42/README b/doc/licenses/jersey-2.41/README → doc/licenses/jersey-2.42/README
@@ -1,8 +1,8 @@
 Jersey (https://jersey.java.net/)
 ---------------------------------
 
-    Version: 2.41
+    Version: 2.42
     From: 'Eclipse Foundation' (https://www.eclipse.org/)
     License(s):
-        EPL v2.0 (bundled/jersey-2.41/LICENSE.md)
+        EPL v2.0 (bundled/jersey-2.42/LICENSE.md)
 
diff --git a/doc/licenses/jersey-2.42/dep-coordinates.txt b/doc/licenses/jersey-2.42/dep-coordinates.txt
@@ -0,0 +1,7 @@
+org.glassfish.jersey.containers:jersey-container-servlet-core:jar:2.42
+org.glassfish.jersey.core:jersey-common:jar:2.42
+org.glassfish.jersey.core:jersey-server:jar:2.42
+org.glassfish.jersey.core:jersey-client:jar:2.42
+org.glassfish.jersey.inject:jersey-hk2:jar:2.42
+org.glassfish.jersey.media:jersey-media-json-jackson:jar:2.42
+org.glassfish.jersey.ext:jersey-entity-filtering:jar:2.42
diff --git a/doc/licenses/kotlin-1.9.22/dep-coordinates.txt b/doc/licenses/kotlin-1.9.22/dep-coordinates.txt
diff --git a/doc/licenses/kotlin-1.9.22/NOTICE.txt → doc/licenses/kotlin-1.9.23/NOTICE.txt b/doc/licenses/kotlin-1.9.22/NOTICE.txt → doc/licenses/kotlin-1.9.23/NOTICE.txt
diff --git a/doc/licenses/kotlin-1.9.22/README → doc/licenses/kotlin-1.9.23/README b/doc/licenses/kotlin-1.9.22/README → doc/licenses/kotlin-1.9.23/README
@@ -1,7 +1,7 @@
 Kotlin (https://kotlinlang.org/)
 --------------------------------
 
-    Version: 1.9.22
+    Version: 1.9.23
     From: 'JetBrains s.r.o and respective authors and developers'
     License(s):
         Apache v2.0

diff --git a/doc/licenses/kotlin-1.9.23/dep-coordinates.txt b/doc/licenses/kotlin-1.9.23/dep-coordinates.txt
@@ -0,0 +1,5 @@
+org.jetbrains.kotlin:kotlin-reflect:jar:1.9.23
+org.jetbrains.kotlin:kotlin-stdlib:jar:1.9.23
+org.jetbrains.kotlin:kotlin-stdlib-common:jar:1.9.23
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:jar:1.9.23
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:jar:1.9.23
diff --git a/doc/licenses/logback-1.5.2/LICENSE.txt b/doc/licenses/logback-1.5.2/LICENSE.txt
diff --git a/doc/licenses/logback-1.5.2/README b/doc/licenses/logback-1.5.2/README
diff --git a/doc/licenses/logback-1.5.2/dep-coordinates.txt b/doc/licenses/logback-1.5.2/dep-coordinates.txt
diff --git a/doc/licenses/woodstox-stax2-api-4.2.1/dep-coordinates.txt b/doc/licenses/woodstox-stax2-api-4.2.1/dep-coordinates.txt
diff --git a/...licenses/woodstox-stax2-api-4.2.1/LICENSE → doc/licenses/woodstox-stax2-api-4.2/LICENSE b/...licenses/woodstox-stax2-api-4.2.1/LICENSE → doc/licenses/woodstox-stax2-api-4.2/LICENSE
diff --git a/doc/licenses/woodstox-stax2-api-4.2.1/README → doc/licenses/woodstox-stax2-api-4.2/README b/doc/licenses/woodstox-stax2-api-4.2.1/README → doc/licenses/woodstox-stax2-api-4.2/README
@@ -1,8 +1,8 @@
 Woodstox Stax2-API (https://github.com/FasterXML/stax2-api)
 ------------------------------------------------------------
 
-    Version: 4.2.1
+    Version: 4.2
     From: 'FasterXML, LLC' (http://fasterxml.com/)
     License(s):
-        BSD Simplified (bundled/woodstox-stax2-api-4.2.1/LICENSE)
+        BSD Simplified (bundled/woodstox-stax2-api-4.2/LICENSE)
 
diff --git a/doc/licenses/woodstox-stax2-api-4.2/dep-coordinates.txt b/doc/licenses/woodstox-stax2-api-4.2/dep-coordinates.txt
@@ -0,0 +1 @@
+org.codehaus.woodstox:stax2-api:jar:4.2
diff --git a/extensions/guacamole-vault/modules/guacamole-vault-ksm/pom.xml b/extensions/guacamole-vault/modules/guacamole-vault-ksm/pom.xml
@@ -38,7 +38,7 @@
     </parent>
 
     <properties>
-        <kotlin.version>1.9.22</kotlin.version>
+        <kotlin.version>1.9.23</kotlin.version>
     </properties>
 
     <dependencies>

diff --git a/pom.xml b/pom.xml
@@ -39,9 +39,9 @@
         <guava.version>32.1.3-jre</guava.version>
         <guice.version>5.1.0</guice.version>
         <hk2.version>2.6.1</hk2.version>
-        <jackson.version>2.16.1</jackson.version>
-        <jackson-databind.version>2.16.1</jackson-databind.version>
-        <jersey.version>2.41</jersey.version>
+        <jackson.version>2.17.0</jackson.version>
+        <jackson-databind.version>2.17.0</jackson-databind.version>
+        <jersey.version>2.42</jersey.version>
         <junit.version>5.10.2</junit.version>
         <junit4.version>4.13.2</junit4.version>
         <logback.version>1.3.14</logback.version>
@@ -522,7 +522,7 @@
                                         <ignoreVersions>
                                             <ignoreVersion>
                                                 <type>regex</type>
-                                                <version>1\.4\..+</version>
+                                                <version>1\.[45]\..+</version>
                                             </ignoreVersion>
                                         </ignoreVersions>
                                     </rule>