Merge 1.5.4 changes back to master.

This commit is contained in:
James Muehlner
2023-12-04 17:23:53 +00:00
66 changed files with 176 additions and 83 deletions

View File

@@ -0,0 +1,5 @@
Apache Commons Codec
Copyright 2002-2023 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (https://www.apache.org/).

View File

@@ -1,7 +1,7 @@
Apache Commons Codec (http://commons.apache.org/proper/commons-codec/)
-----------------------------------------------------------------------
Version: 1.15
Version: 1.16.0
From: 'Apache Software Foundation' (https://www.apache.org/)
License(s):
Apache v2.0

View File

@@ -0,0 +1 @@
commons-codec:commons-codec:jar:1.16.0

View File

@@ -1,17 +0,0 @@
Apache Commons Codec
Copyright 2002-2020 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (https://www.apache.org/).
src/test/org/apache/commons/codec/language/DoubleMetaphoneTest.java
contains test data from http://aspell.net/test/orig/batch0.tab.
Copyright (C) 2002 Kevin Atkinson (kevina@gnu.org)
===============================================================================
The content of package org.apache.commons.codec.language.bm has been translated
from the original php source code available at http://stevemorse.org/phoneticinfo.htm
with permission from the original authors.
Original source copyright:
Copyright (c) 2008 Alexander Beider & Stephen P. Morse.

View File

@@ -1 +0,0 @@
commons-codec:commons-codec:jar:1.15

View File

@@ -1 +0,0 @@
org.apache.commons:commons-lang3:jar:3.12.0

View File

@@ -1,5 +1,5 @@
Apache Commons Lang
Copyright 2001-2021 The Apache Software Foundation
Copyright 2001-2023 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (https://www.apache.org/).

View File

@@ -1,7 +1,7 @@
Apache Commons Lang (http://commons.apache.org/proper/commons-lang/)
--------------------------------------------------------------------
Version: 3.12.0
Version: 3.14.0
From: 'Apache Software Foundation' (https://www.apache.org/)
License(s):
Apache v2.0

View File

@@ -0,0 +1 @@
org.apache.commons:commons-lang3:jar:3.14.0

View File

@@ -1 +0,0 @@
org.apache.commons:commons-pool2:jar:2.11.1

View File

@@ -1,5 +1,5 @@
Apache Commons Pool
Copyright 2001-2021 The Apache Software Foundation
Copyright 2001-2023 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (https://www.apache.org/).

View File

@@ -1,7 +1,7 @@
Apache Commons Pool (http://commons.apache.org/proper/commons-pool/)
--------------------------------------------------------------------
Version: 2.11.1
Version: 2.12.0
From: 'Apache Software Foundation' (https://www.apache.org/)
License(s):
Apache v2.0

View File

@@ -0,0 +1 @@
org.apache.commons:commons-pool2:jar:2.12.0

View File

@@ -1 +0,0 @@
org.apache.mina:mina-core:jar:2.2.2

View File

@@ -1,7 +1,7 @@
Apache Mina (https://mina.apache.org/)
--------------------------------------
Version: 2.2.2
Version: 2.2.3
From: 'Apache Software Foundation' (https://www.apache.org/)
License(s):
Apache v2.0

View File

@@ -0,0 +1 @@
org.apache.mina:mina-core:jar:2.2.3

View File

@@ -1 +0,0 @@
org.apache.santuario:xmlsec:jar:2.2.3

View File

@@ -1,5 +1,5 @@
Apache Santuario - XML Security for Java
Copyright 1999-2021 The Apache Software Foundation
Copyright 1999-2022 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
@@ -10,3 +10,5 @@ Data Communications Systems, <http://www.nue.et-inf.uni-siegen.de/>.
The development of this software was partly funded by the European
Commission in the <WebSig> project in the ISIS Programme.
This product contains software that is
copyright (c) 2021, Oracle and/or its affiliates.

View File

@@ -1,7 +1,7 @@
Apache Santuario (https://santuario.apache.org/)
-------------------------------------------------
Version: 2.2.3
Version: 2.2.6
From: 'Apache Software Foundation' (https://www.apache.org/)
License(s):
Apache v2.0

View File

@@ -0,0 +1 @@
org.apache.santuario:xmlsec:jar:2.2.6

View File

@@ -1 +0,0 @@
org.checkerframework:checker-qual:jar:3.33.0

View File

@@ -1,8 +1,8 @@
Checker Framework qualifiers (https://checkerframework.org/)
------------------------------------------------------------
Version: 3.33.0
Version: 3.37.0
From: 'Checker Framework developers' (https://checkerframework.org/)
License(s):
MIT (bundled/checker-qual-3.33.0/LICENSE.txt)
MIT (bundled/checker-qual-3.37.0/LICENSE.txt)

View File

@@ -0,0 +1 @@
org.checkerframework:checker-qual:jar:3.37.0

View File

@@ -1 +0,0 @@
org.apache.directory.api:api-all:jar:2.1.4

View File

@@ -1,7 +1,7 @@
Apache Directory LDAP API (http://directory.apache.org)
-------------------------------------------------------
Version: 2.1.4
Version: 2.1.5
From: 'Apache Software Foundation' (https://www.apache.org/)
License(s):
Apache v2.0

View File

@@ -0,0 +1 @@
org.apache.directory.api:api-all:jar:2.1.5

View File

@@ -1 +0,0 @@
com.google.errorprone:error_prone_annotations:jar:2.18.0

View File

@@ -1,7 +1,7 @@
Error Prone (https://errorprone.info/)
--------------------------------------
Version: 2.18.0
Version: 2.21.1
From: 'Google Inc.' (http://www.google.com/)
License(s):
Apache v2.0

View File

@@ -0,0 +1 @@
com.google.errorprone:error_prone_annotations:jar:2.21.1

View File

@@ -1,7 +1,7 @@
Guava: Google Core Libraries for Java (https://github.com/google/guava)
-----------------------------------------------------------------------
Version: 32.1.2-jre
Version: 32.1.3-jre
From: 'Google Inc.' (http://www.google.com/)
License(s):
Apache v2.0

View File

@@ -1,3 +1,3 @@
com.google.guava:failureaccess:jar:1.0.1
com.google.guava:guava:jar:32.1.2-jre
com.google.guava:guava:jar:32.1.3-jre
com.google.guava:listenablefuture:jar:9999.0-empty-to-avoid-conflict-with-guava

View File

@@ -1,7 +1,7 @@
Jackson (https://github.com/FasterXML/jackson)
----------------------------------------------
Version: 2.15.2
Version: 2.16.0
From: 'FasterXML, LLC' (https://github.com/FasterXML)
License(s):
Apache v2.0

View File

@@ -1,4 +1,4 @@
com.fasterxml.jackson.core:jackson-core:jar:2.15.2
com.fasterxml.jackson.core:jackson-annotations:jar:2.15.2
com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:jar:2.15.2
com.fasterxml.jackson.module:jackson-module-jaxb-annotations:jar:2.15.2
com.fasterxml.jackson.core:jackson-core:jar:2.16.0
com.fasterxml.jackson.core:jackson-annotations:jar:2.16.0
com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:jar:2.16.0
com.fasterxml.jackson.module:jackson-module-jaxb-annotations:jar:2.16.0

View File

@@ -1 +0,0 @@
com.fasterxml.jackson.core:jackson-databind:jar:2.15.2

View File

@@ -1,7 +1,7 @@
Jackson-databind (https://github.com/FasterXML/jackson-databind)
----------------------------------------------
Version: 2.15.2
Version: 2.16.0
From: 'FasterXML, LLC' (https://github.com/FasterXML)
License(s):
Apache v2.0

View File

@@ -0,0 +1 @@
com.fasterxml.jackson.core:jackson-databind:jar:2.16.0

View File

@@ -1,7 +0,0 @@
org.glassfish.jersey.containers:jersey-container-servlet-core:jar:2.40
org.glassfish.jersey.core:jersey-common:jar:2.40
org.glassfish.jersey.core:jersey-server:jar:2.40
org.glassfish.jersey.core:jersey-client:jar:2.40
org.glassfish.jersey.inject:jersey-hk2:jar:2.40
org.glassfish.jersey.media:jersey-media-json-jackson:jar:2.40
org.glassfish.jersey.ext:jersey-entity-filtering:jar:2.40

View File

@@ -1,8 +1,8 @@
Jersey (https://jersey.java.net/)
---------------------------------
Version: 2.40
Version: 2.41
From: 'Eclipse Foundation' (https://www.eclipse.org/)
License(s):
EPL v2.0 (bundled/jersey-2.40/LICENSE.md)
EPL v2.0 (bundled/jersey-2.41/LICENSE.md)

View File

@@ -0,0 +1,7 @@
org.glassfish.jersey.containers:jersey-container-servlet-core:jar:2.41
org.glassfish.jersey.core:jersey-common:jar:2.41
org.glassfish.jersey.core:jersey-server:jar:2.41
org.glassfish.jersey.core:jersey-client:jar:2.41
org.glassfish.jersey.inject:jersey-hk2:jar:2.41
org.glassfish.jersey.media:jersey-media-json-jackson:jar:2.41
org.glassfish.jersey.ext:jersey-entity-filtering:jar:2.41

View File

@@ -1,5 +0,0 @@
org.jetbrains.kotlin:kotlin-reflect:jar:1.9.10
org.jetbrains.kotlin:kotlin-stdlib:jar:1.9.10
org.jetbrains.kotlin:kotlin-stdlib-common:jar:1.9.10
org.jetbrains.kotlin:kotlin-stdlib-jdk8:jar:1.9.10
org.jetbrains.kotlin:kotlin-stdlib-jdk7:jar:1.9.10

View File

@@ -1,7 +1,7 @@
Kotlin (https://kotlinlang.org/)
--------------------------------
Version: 1.9.10
Version: 1.9.21
From: 'JetBrains s.r.o and respective authors and developers'
License(s):
Apache v2.0

View File

@@ -0,0 +1,5 @@
org.jetbrains.kotlin:kotlin-reflect:jar:1.9.21
org.jetbrains.kotlin:kotlin-stdlib:jar:1.9.21
org.jetbrains.kotlin:kotlin-stdlib-common:jar:1.9.21
org.jetbrains.kotlin:kotlin-stdlib-jdk8:jar:1.9.21
org.jetbrains.kotlin:kotlin-stdlib-jdk7:jar:1.9.21

View File

@@ -1,2 +0,0 @@
ch.qos.logback:logback-classic:jar:1.3.11
ch.qos.logback:logback-core:jar:1.3.11

View File

@@ -1,8 +1,8 @@
Logback (http://logback.qos.ch/)
--------------------------------
Version: 1.3.11
Version: 1.3.14
From: 'QOS.ch Sàrl' (http://qos.ch/)
License(s):
EPL v1.0 (bundled/logback-1.3.11/LICENSE.txt)
EPL v1.0 (bundled/logback-1.3.14/LICENSE.txt)

View File

@@ -0,0 +1,2 @@
ch.qos.logback:logback-classic:jar:1.3.14
ch.qos.logback:logback-core:jar:1.3.14

View File

@@ -1 +0,0 @@
org.mybatis:mybatis:jar:3.5.13

View File

@@ -1,7 +1,7 @@
MyBatis (http://www.mybatis.org/mybatis-3/)
-------------------------------------------
Version: 3.5.13
Version: 3.5.14
From: 'MyBatis' (http://www.mybatis.org/)
License(s):
Apache v2.0

View File

@@ -0,0 +1 @@
org.mybatis:mybatis:jar:3.5.14

View File

@@ -1 +0,0 @@
org.yaml:snakeyaml:jar:2.0

View File

@@ -1,7 +1,7 @@
SnakeYAML (https://bitbucket.org/snakeyaml/snakeyaml/
-----------------------------------------------------
Version: 2.0
Version: 2.2
From: 'Andrey Somov' (https://bitbucket.org/asomov/)
License(s):
Apache v2.0

View File

@@ -0,0 +1 @@
org.yaml:snakeyaml:jar:2.2