diff --git a/framework/dependencies.yml b/framework/dependencies.yml index 3237fe47f9..27cb6832b1 100644 --- a/framework/dependencies.yml +++ b/framework/dependencies.yml @@ -8,26 +8,26 @@ transitiveDependencies: false # This core dependencies are required by Play framework require: &allDependencies - antlr 2.7.7 - - com.mchange -> c3p0 0.9.5.5 + - com.mchange -> c3p0 0.10.1 - com.zaxxer -> HikariCP 5.1.0 - - org.ow2.asm -> asm 9.6 - - org.ow2.asm -> asm-commons 9.6 - - org.ow2.asm -> asm-util 9.6 - - org.ow2.asm -> asm-tree 9.6 - - org.ow2.asm -> asm-analysis 9.6 + - org.ow2.asm -> asm 9.7 + - org.ow2.asm -> asm-commons 9.7 + - org.ow2.asm -> asm-util 9.7 + - org.ow2.asm -> asm-tree 9.7 + - org.ow2.asm -> asm-analysis 9.7 - cglib -> cglib 3.3.0 - - com.google.code.gson -> gson 2.10.1 + - com.google.code.gson -> gson 2.11.0 - com.jamonapi -> jamon 2.82 - com.ning -> async-http-client 1.9.40 - commons-beanutils 1.9.4 - - commons-codec 1.16.1 + - commons-codec 1.17.1 - org.apache.commons -> commons-email 1.6.0 - commons-fileupload 1.5 - - commons-io 2.15.1 + - commons-io 2.16.1 - com.google.code.maven-play-plugin.org.apache.commons -> commons-javaflow 1590792 - - org.apache.commons -> commons-lang3 3.14.0 - - org.apache.commons -> commons-text 1.11.0 - - commons-logging 1.3.0 + - org.apache.commons -> commons-lang3 3.16.0 + - org.apache.commons -> commons-text 1.12.0 + - commons-logging 1.3.4 - org.dom4j -> dom4j 2.1.4 - com.h2database -> h2 1.4.200 - javax.activation -> javax.activation-api 1.2.0 @@ -39,41 +39,41 @@ require: &allDependencies - org.hamcrest -> hamcrest-all 1.3 - junit 4.13.2 - jregex 1.2_01 - - org.apache.logging.log4j -> log4j-api 2.23.0 - - org.apache.logging.log4j -> log4j-core 2.23.0 + - org.apache.logging.log4j -> log4j-api 2.23.1 + - org.apache.logging.log4j -> log4j-core 2.23.1 - net.sf.ehcache -> ehcache 2.10.9.2 - net.sf.ezmorph -> ezmorph 1.0.6 - net.sf.jsr107cache -> jsr107cache 1.1 - net.sf.oval -> oval 1.90 - - com.mysql -> mysql-connector-j 8.3.0 + - com.mysql -> mysql-connector-j 9.0.0 - oauth.signpost -> signpost-core 1.2.1.2 - org.apache.geronimo.specs -> geronimo-servlet_2.5_spec 1.2 - org.apache.ivy -> ivy 2.5.2 - - org.bouncycastle -> bcprov-jdk18on 1.77 - - org.bouncycastle -> bcpkix-jdk18on 1.77 - - org.codehaus.groovy -> groovy 3.0.20 - - org.codehaus.groovy -> groovy-xml 3.0.20 + - org.bouncycastle -> bcprov-jdk18on 1.78.1 + - org.bouncycastle -> bcpkix-jdk18on 1.78.1 + - org.codehaus.groovy -> groovy 3.0.22 + - org.codehaus.groovy -> groovy-xml 3.0.22 - org.eclipse.jdt -> org.eclipse.jdt.core 3.33.0 - org.eclipse.jdt -> ecj 3.33.0 - org.hibernate -> hibernate-core 5.6.5.Final.patched - - net.bytebuddy -> byte-buddy 1.14.12 + - net.bytebuddy -> byte-buddy 1.15.0 - javax.persistence -> javax.persistence-api 2.2 - org.hibernate.common -> hibernate-commons-annotations 5.1.2.Final - org.hibernate -> hibernate-validator 5.4.3.Final - - io.smallrye -> jandex 3.1.6 - - org.jboss.logging -> jboss-logging 3.5.3.Final + - io.smallrye -> jandex 3.2.2 + - org.jboss.logging -> jboss-logging 3.6.0.Final - org.jboss.spec.javax.transaction -> jboss-transaction-api_1.2_spec 1.1.1.Final - javax.xml.bind -> jaxb-api 2.3.1 - org.glassfish.jaxb -> jaxb-runtime 2.3.9 - com.fasterxml -> classmate 1.7.0 - org.hibernate -> hibernate-c3p0 5.6.15.Final - org.hibernate -> hibernate-ehcache 5.6.15.Final - - com.mchange -> mchange-commons-java 0.2.20 + - com.mchange -> mchange-commons-java 0.3.1 - org.javassist -> javassist 3.30.2-GA - io.netty -> netty 3.10.6.Final - - org.postgresql -> postgresql 42.7.2 - - org.slf4j -> slf4j-api 2.0.12 - - org.apache.logging.log4j -> log4j-slf4j2-impl 2.23.0 + - org.postgresql -> postgresql 42.7.4 + - org.slf4j -> slf4j-api 2.0.16 + - org.apache.logging.log4j -> log4j-slf4j2-impl 2.23.1 - org.yaml -> snakeyaml 2.2 - net.spy -> spymemcached 2.12.3 - com.thoughtworks.xstream -> xstream 1.4.20 diff --git a/framework/lib/asm-9.6.jar b/framework/lib/asm-9.6.jar deleted file mode 100644 index cc1c2cd8e4..0000000000 Binary files a/framework/lib/asm-9.6.jar and /dev/null differ diff --git a/framework/lib/asm-9.7.jar b/framework/lib/asm-9.7.jar new file mode 100644 index 0000000000..fee9b028a3 Binary files /dev/null and b/framework/lib/asm-9.7.jar differ diff --git a/framework/lib/asm-analysis-9.6.jar b/framework/lib/asm-analysis-9.6.jar deleted file mode 100644 index f4e8691b97..0000000000 Binary files a/framework/lib/asm-analysis-9.6.jar and /dev/null differ diff --git a/framework/lib/asm-analysis-9.7.jar b/framework/lib/asm-analysis-9.7.jar new file mode 100644 index 0000000000..b2a1194ce0 Binary files /dev/null and b/framework/lib/asm-analysis-9.7.jar differ diff --git a/framework/lib/asm-commons-9.6.jar b/framework/lib/asm-commons-9.6.jar deleted file mode 100644 index 75f3bad86a..0000000000 Binary files a/framework/lib/asm-commons-9.6.jar and /dev/null differ diff --git a/framework/lib/asm-commons-9.7.jar b/framework/lib/asm-commons-9.7.jar new file mode 100644 index 0000000000..6a7d3a1083 Binary files /dev/null and b/framework/lib/asm-commons-9.7.jar differ diff --git a/framework/lib/asm-tree-9.6.jar b/framework/lib/asm-tree-9.7.jar similarity index 91% rename from framework/lib/asm-tree-9.6.jar rename to framework/lib/asm-tree-9.7.jar index 9fe5275876..bbb3ca3bd6 100644 Binary files a/framework/lib/asm-tree-9.6.jar and b/framework/lib/asm-tree-9.7.jar differ diff --git a/framework/lib/asm-util-9.6.jar b/framework/lib/asm-util-9.6.jar deleted file mode 100644 index cc109b03d0..0000000000 Binary files a/framework/lib/asm-util-9.6.jar and /dev/null differ diff --git a/framework/lib/asm-util-9.7.jar b/framework/lib/asm-util-9.7.jar new file mode 100644 index 0000000000..61bf86d993 Binary files /dev/null and b/framework/lib/asm-util-9.7.jar differ diff --git a/framework/lib/bcpkix-jdk18on-1.77.jar b/framework/lib/bcpkix-jdk18on-1.77.jar deleted file mode 100644 index e8b6021a2a..0000000000 Binary files a/framework/lib/bcpkix-jdk18on-1.77.jar and /dev/null differ diff --git a/framework/lib/bcpkix-jdk18on-1.78.1.jar b/framework/lib/bcpkix-jdk18on-1.78.1.jar new file mode 100644 index 0000000000..dca7170eeb Binary files /dev/null and b/framework/lib/bcpkix-jdk18on-1.78.1.jar differ diff --git a/framework/lib/bcprov-jdk18on-1.77.jar b/framework/lib/bcprov-jdk18on-1.78.1.jar similarity index 67% rename from framework/lib/bcprov-jdk18on-1.77.jar rename to framework/lib/bcprov-jdk18on-1.78.1.jar index 651d2fba5e..6726f83391 100644 Binary files a/framework/lib/bcprov-jdk18on-1.77.jar and b/framework/lib/bcprov-jdk18on-1.78.1.jar differ diff --git a/framework/lib/byte-buddy-1.14.12.jar b/framework/lib/byte-buddy-1.15.0.jar similarity index 61% rename from framework/lib/byte-buddy-1.14.12.jar rename to framework/lib/byte-buddy-1.15.0.jar index f9c0f47cd1..5349b6469e 100644 Binary files a/framework/lib/byte-buddy-1.14.12.jar and b/framework/lib/byte-buddy-1.15.0.jar differ diff --git a/framework/lib/c3p0-0.10.1.jar b/framework/lib/c3p0-0.10.1.jar new file mode 100644 index 0000000000..86823e711e Binary files /dev/null and b/framework/lib/c3p0-0.10.1.jar differ diff --git a/framework/lib/c3p0-0.9.5.5.jar b/framework/lib/c3p0-0.9.5.5.jar deleted file mode 100644 index 043263e5ac..0000000000 Binary files a/framework/lib/c3p0-0.9.5.5.jar and /dev/null differ diff --git a/framework/lib/commons-codec-1.16.1.jar b/framework/lib/commons-codec-1.16.1.jar deleted file mode 100644 index f896649735..0000000000 Binary files a/framework/lib/commons-codec-1.16.1.jar and /dev/null differ diff --git a/framework/lib/commons-codec-1.17.1.jar b/framework/lib/commons-codec-1.17.1.jar new file mode 100644 index 0000000000..5023670d73 Binary files /dev/null and b/framework/lib/commons-codec-1.17.1.jar differ diff --git a/framework/lib/commons-io-2.15.1.jar b/framework/lib/commons-io-2.15.1.jar deleted file mode 100644 index d53be1f140..0000000000 Binary files a/framework/lib/commons-io-2.15.1.jar and /dev/null differ diff --git a/framework/lib/commons-io-2.16.1.jar b/framework/lib/commons-io-2.16.1.jar new file mode 100644 index 0000000000..eb3c2b0b82 Binary files /dev/null and b/framework/lib/commons-io-2.16.1.jar differ diff --git a/framework/lib/commons-lang3-3.14.0.jar b/framework/lib/commons-lang3-3.14.0.jar deleted file mode 100644 index da9302ff29..0000000000 Binary files a/framework/lib/commons-lang3-3.14.0.jar and /dev/null differ diff --git a/framework/lib/commons-lang3-3.16.0.jar b/framework/lib/commons-lang3-3.16.0.jar new file mode 100644 index 0000000000..fca0ce0b0c Binary files /dev/null and b/framework/lib/commons-lang3-3.16.0.jar differ diff --git a/framework/lib/commons-logging-1.3.0.jar b/framework/lib/commons-logging-1.3.0.jar deleted file mode 100644 index 127dd00d30..0000000000 Binary files a/framework/lib/commons-logging-1.3.0.jar and /dev/null differ diff --git a/framework/lib/commons-logging-1.3.4.jar b/framework/lib/commons-logging-1.3.4.jar new file mode 100644 index 0000000000..b6339bb06d Binary files /dev/null and b/framework/lib/commons-logging-1.3.4.jar differ diff --git a/framework/lib/commons-text-1.11.0.jar b/framework/lib/commons-text-1.11.0.jar deleted file mode 100644 index 78154978a0..0000000000 Binary files a/framework/lib/commons-text-1.11.0.jar and /dev/null differ diff --git a/framework/lib/commons-text-1.12.0.jar b/framework/lib/commons-text-1.12.0.jar new file mode 100644 index 0000000000..a2daab1488 Binary files /dev/null and b/framework/lib/commons-text-1.12.0.jar differ diff --git a/framework/lib/groovy-3.0.20.jar b/framework/lib/groovy-3.0.22.jar similarity index 86% rename from framework/lib/groovy-3.0.20.jar rename to framework/lib/groovy-3.0.22.jar index d3b704edcf..82553274e3 100644 Binary files a/framework/lib/groovy-3.0.20.jar and b/framework/lib/groovy-3.0.22.jar differ diff --git a/framework/lib/groovy-xml-3.0.20.jar b/framework/lib/groovy-xml-3.0.22.jar similarity index 84% rename from framework/lib/groovy-xml-3.0.20.jar rename to framework/lib/groovy-xml-3.0.22.jar index 5e1e17728e..fd769f4bb9 100644 Binary files a/framework/lib/groovy-xml-3.0.20.jar and b/framework/lib/groovy-xml-3.0.22.jar differ diff --git a/framework/lib/gson-2.10.1.jar b/framework/lib/gson-2.10.1.jar deleted file mode 100644 index a88c5bd9b5..0000000000 Binary files a/framework/lib/gson-2.10.1.jar and /dev/null differ diff --git a/framework/lib/gson-2.11.0.jar b/framework/lib/gson-2.11.0.jar new file mode 100644 index 0000000000..18e59c8c41 Binary files /dev/null and b/framework/lib/gson-2.11.0.jar differ diff --git a/framework/lib/jandex-3.1.6.jar b/framework/lib/jandex-3.1.6.jar deleted file mode 100644 index bd64a7239d..0000000000 Binary files a/framework/lib/jandex-3.1.6.jar and /dev/null differ diff --git a/framework/lib/jandex-3.2.2.jar b/framework/lib/jandex-3.2.2.jar new file mode 100644 index 0000000000..ba5add79fc Binary files /dev/null and b/framework/lib/jandex-3.2.2.jar differ diff --git a/framework/lib/jboss-logging-3.5.3.Final.jar b/framework/lib/jboss-logging-3.5.3.Final.jar deleted file mode 100644 index a922e47523..0000000000 Binary files a/framework/lib/jboss-logging-3.5.3.Final.jar and /dev/null differ diff --git a/framework/lib/jboss-logging-3.6.0.Final.jar b/framework/lib/jboss-logging-3.6.0.Final.jar new file mode 100644 index 0000000000..778ea55723 Binary files /dev/null and b/framework/lib/jboss-logging-3.6.0.Final.jar differ diff --git a/framework/lib/log4j-api-2.23.0.jar b/framework/lib/log4j-api-2.23.1.jar similarity index 79% rename from framework/lib/log4j-api-2.23.0.jar rename to framework/lib/log4j-api-2.23.1.jar index dd00e8fb12..0e8e3f5e59 100644 Binary files a/framework/lib/log4j-api-2.23.0.jar and b/framework/lib/log4j-api-2.23.1.jar differ diff --git a/framework/lib/log4j-core-2.23.0.jar b/framework/lib/log4j-core-2.23.1.jar similarity index 87% rename from framework/lib/log4j-core-2.23.0.jar rename to framework/lib/log4j-core-2.23.1.jar index cba2887db6..4a5d553d89 100644 Binary files a/framework/lib/log4j-core-2.23.0.jar and b/framework/lib/log4j-core-2.23.1.jar differ diff --git a/framework/lib/log4j-slf4j2-impl-2.23.0.jar b/framework/lib/log4j-slf4j2-impl-2.23.1.jar similarity index 78% rename from framework/lib/log4j-slf4j2-impl-2.23.0.jar rename to framework/lib/log4j-slf4j2-impl-2.23.1.jar index cae4d1e121..f4f7c8cd38 100644 Binary files a/framework/lib/log4j-slf4j2-impl-2.23.0.jar and b/framework/lib/log4j-slf4j2-impl-2.23.1.jar differ diff --git a/framework/lib/mchange-commons-java-0.2.20.jar b/framework/lib/mchange-commons-java-0.2.20.jar deleted file mode 100644 index 7ff9c0280f..0000000000 Binary files a/framework/lib/mchange-commons-java-0.2.20.jar and /dev/null differ diff --git a/framework/lib/mchange-commons-java-0.3.1.jar b/framework/lib/mchange-commons-java-0.3.1.jar new file mode 100644 index 0000000000..e920abeabb Binary files /dev/null and b/framework/lib/mchange-commons-java-0.3.1.jar differ diff --git a/framework/lib/mysql-connector-j-8.3.0.jar b/framework/lib/mysql-connector-j-8.3.0.jar deleted file mode 100644 index 5c720abe68..0000000000 Binary files a/framework/lib/mysql-connector-j-8.3.0.jar and /dev/null differ diff --git a/framework/lib/mysql-connector-j-9.0.0.jar b/framework/lib/mysql-connector-j-9.0.0.jar new file mode 100644 index 0000000000..247db109a6 Binary files /dev/null and b/framework/lib/mysql-connector-j-9.0.0.jar differ diff --git a/framework/lib/postgresql-42.7.2.jar b/framework/lib/postgresql-42.7.2.jar deleted file mode 100644 index 729776b004..0000000000 Binary files a/framework/lib/postgresql-42.7.2.jar and /dev/null differ diff --git a/framework/lib/postgresql-42.7.4.jar b/framework/lib/postgresql-42.7.4.jar new file mode 100644 index 0000000000..091b4d13a4 Binary files /dev/null and b/framework/lib/postgresql-42.7.4.jar differ diff --git a/framework/lib/slf4j-api-2.0.12.jar b/framework/lib/slf4j-api-2.0.12.jar deleted file mode 100644 index bfa1de399d..0000000000 Binary files a/framework/lib/slf4j-api-2.0.12.jar and /dev/null differ diff --git a/framework/lib/slf4j-api-2.0.16.jar b/framework/lib/slf4j-api-2.0.16.jar new file mode 100644 index 0000000000..cbb5448d07 Binary files /dev/null and b/framework/lib/slf4j-api-2.0.16.jar differ diff --git a/modules/docviewer/build.xml b/modules/docviewer/build.xml index e120dcc18f..0745b79bef 100644 --- a/modules/docviewer/build.xml +++ b/modules/docviewer/build.xml @@ -31,7 +31,7 @@ - + diff --git a/modules/grizzly/build.xml b/modules/grizzly/build.xml index 0ca4ebdd77..0d73c76920 100644 --- a/modules/grizzly/build.xml +++ b/modules/grizzly/build.xml @@ -34,7 +34,7 @@ - + diff --git a/modules/testrunner/build.xml b/modules/testrunner/build.xml index 52ebfcf51d..b5b91394b8 100644 --- a/modules/testrunner/build.xml +++ b/modules/testrunner/build.xml @@ -15,7 +15,7 @@ - + diff --git a/samples-and-tests/modules/testModule/build.xml b/samples-and-tests/modules/testModule/build.xml index 02b98806fc..55b02836f2 100644 --- a/samples-and-tests/modules/testModule/build.xml +++ b/samples-and-tests/modules/testModule/build.xml @@ -41,7 +41,7 @@ - +