diff --git a/documentation/manual/configuration.textile b/documentation/manual/configuration.textile index 3c4bd74b13..a1c70f6e0c 100644 --- a/documentation/manual/configuration.textile +++ b/documentation/manual/configuration.textile @@ -758,7 +758,7 @@ Java source level, which overrides the @java.version@ system property. For examp bc. java.source=11 -Values: @1.7@ (No longer supported since 1.5.0), @1.8@ (No longer supported since 1.7.0), @9@ (No longer supported since 1.7.0), @10@ (No longer supported since 1.7.0), @11@, @12@, @13@, @14@, @15@, @17@, @18@. +Values: @1.7@ (No longer supported since 1.5.0), @1.8@ (No longer supported since 1.7.0), @9@ (No longer supported since 1.7.0), @10@ (No longer supported since 1.7.0), @11@, @12@, @13@, @14@, @15@, @17@, @18@, @19@. Default: @11@ diff --git a/framework/dependencies.yml b/framework/dependencies.yml index 3d8f3fa9b9..cd31b5bfce 100644 --- a/framework/dependencies.yml +++ b/framework/dependencies.yml @@ -10,13 +10,13 @@ require: &allDependencies - antlr 2.7.7 - com.mchange -> c3p0 0.9.5.5 - com.zaxxer -> HikariCP 5.0.1 - - org.ow2.asm -> asm 9.3 - - org.ow2.asm -> asm-commons 9.3 - - org.ow2.asm -> asm-util 9.3 - - org.ow2.asm -> asm-tree 9.3 - - org.ow2.asm -> asm-analysis 9.3 + - org.ow2.asm -> asm 9.4 + - org.ow2.asm -> asm-commons 9.4 + - org.ow2.asm -> asm-util 9.4 + - org.ow2.asm -> asm-tree 9.4 + - org.ow2.asm -> asm-analysis 9.4 - cglib -> cglib 3.3.0 - - com.google.code.gson -> gson 2.9.1 + - com.google.code.gson -> gson 2.10 - com.jamonapi -> jamon 2.82 - com.ning -> async-http-client 1.9.40 - commons-beanutils 1.9.4 @@ -34,45 +34,45 @@ require: &allDependencies - javax.inject 1.0 - javax.validation -> validation-api 1.1.0.Final - jaxen 1.2.0 - - joda-time 2.11.1 + - joda-time 2.12.2 - org.hamcrest -> hamcrest-all 1.3 - junit 4.13.2 - jregex 1.2_01 - - log4j-api 2.18.0 - - log4j-core 2.18.0 + - log4j-api 2.19.0 + - log4j-core 2.19.0 - 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 - - mysql -> mysql-connector-java 8.0.30 + - com.mysql -> mysql-connector-j 8.0.31 - 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.0 - - org.bouncycastle -> bcprov-jdk18on 1.71.1 - - org.bouncycastle -> bcpkix-jdk18on 1.71.1 - - org.codehaus.groovy -> groovy 3.0.12 - - org.codehaus.groovy -> groovy-xml 3.0.12 - - org.eclipse.jdt -> org.eclipse.jdt.core 3.31.0 + - org.apache.ivy -> ivy 2.5.1 + - org.bouncycastle -> bcprov-jdk18on 1.72 + - org.bouncycastle -> bcpkix-jdk18on 1.72 + - org.codehaus.groovy -> groovy 3.0.13 + - org.codehaus.groovy -> groovy-xml 3.0.13 + - org.eclipse.jdt -> org.eclipse.jdt.core 3.32.0 - org.hibernate -> hibernate-core 5.6.5.Final.patched - - net.bytebuddy -> byte-buddy 1.12.16 + - net.bytebuddy -> byte-buddy 1.12.19 - javax.persistence -> javax.persistence-api 2.2 - org.hibernate.common -> hibernate-commons-annotations 5.1.2.Final - - org.hibernate -> hibernate-validator 5.4.1.Final - - org.jboss -> jandex 2.4.3.Final + - org.hibernate -> hibernate-validator 5.4.3.Final + - io.smallrye -> jandex 3.0.5 - org.jboss.logging -> jboss-logging 3.5.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.6 + - org.glassfish.jaxb -> jaxb-runtime 2.3.7 - com.fasterxml -> classmate 1.5.1 - - org.hibernate -> hibernate-c3p0 5.6.11.Final - - org.hibernate -> hibernate-ehcache 5.6.11.Final + - org.hibernate -> hibernate-c3p0 5.6.14.Final + - org.hibernate -> hibernate-ehcache 5.6.14.Final - com.mchange -> mchange-commons-java 0.2.20 - - org.javassist -> javassist 3.29.1-GA + - org.javassist -> javassist 3.29.2-GA - io.netty -> netty 3.10.6.Final - - org.postgresql -> postgresql 42.5.0 - - org.slf4j -> slf4j-api 1.7.36 - - org.apache.logging.log4j -> log4j-slf4j-impl 2.18.0 - - org.yaml -> snakeyaml 1.32 + - org.postgresql -> postgresql 42.5.1 + - org.slf4j -> slf4j-api 2.0.5 + - org.apache.logging.log4j -> log4j-slf4j2-impl 2.19.0 + - org.yaml -> snakeyaml 1.33 - net.spy -> spymemcached 2.12.3 - com.thoughtworks.xstream -> xstream 1.4.19 - xmlpull 1.1.3.4d_b4_min diff --git a/framework/lib/asm-9.3.jar b/framework/lib/asm-9.4.jar similarity index 74% rename from framework/lib/asm-9.3.jar rename to framework/lib/asm-9.4.jar index bd8b948601..01cb52ee3a 100644 Binary files a/framework/lib/asm-9.3.jar and b/framework/lib/asm-9.4.jar differ diff --git a/framework/lib/asm-analysis-9.3.jar b/framework/lib/asm-analysis-9.4.jar similarity index 72% rename from framework/lib/asm-analysis-9.3.jar rename to framework/lib/asm-analysis-9.4.jar index 6bbfb05cbc..29f78f006f 100644 Binary files a/framework/lib/asm-analysis-9.3.jar and b/framework/lib/asm-analysis-9.4.jar differ diff --git a/framework/lib/asm-commons-9.3.jar b/framework/lib/asm-commons-9.4.jar similarity index 57% rename from framework/lib/asm-commons-9.3.jar rename to framework/lib/asm-commons-9.4.jar index 3ce4b82cb6..593621ac9b 100644 Binary files a/framework/lib/asm-commons-9.3.jar and b/framework/lib/asm-commons-9.4.jar differ diff --git a/framework/lib/asm-tree-9.3.jar b/framework/lib/asm-tree-9.4.jar similarity index 63% rename from framework/lib/asm-tree-9.3.jar rename to framework/lib/asm-tree-9.4.jar index 55ef2a925e..c56030525e 100644 Binary files a/framework/lib/asm-tree-9.3.jar and b/framework/lib/asm-tree-9.4.jar differ diff --git a/framework/lib/asm-util-9.3.jar b/framework/lib/asm-util-9.3.jar deleted file mode 100644 index 15e5efde41..0000000000 Binary files a/framework/lib/asm-util-9.3.jar and /dev/null differ diff --git a/framework/lib/asm-util-9.4.jar b/framework/lib/asm-util-9.4.jar new file mode 100644 index 0000000000..fbe1fcbe0f Binary files /dev/null and b/framework/lib/asm-util-9.4.jar differ diff --git a/framework/lib/bcpkix-jdk18on-1.71.1.jar b/framework/lib/bcpkix-jdk18on-1.72.jar similarity index 64% rename from framework/lib/bcpkix-jdk18on-1.71.1.jar rename to framework/lib/bcpkix-jdk18on-1.72.jar index 40c84725f9..b4902c8d73 100644 Binary files a/framework/lib/bcpkix-jdk18on-1.71.1.jar and b/framework/lib/bcpkix-jdk18on-1.72.jar differ diff --git a/framework/lib/bcprov-jdk18on-1.71.1.jar b/framework/lib/bcprov-jdk18on-1.71.1.jar deleted file mode 100644 index 2bec110f1d..0000000000 Binary files a/framework/lib/bcprov-jdk18on-1.71.1.jar and /dev/null differ diff --git a/framework/lib/bcprov-jdk18on-1.72.jar b/framework/lib/bcprov-jdk18on-1.72.jar new file mode 100644 index 0000000000..fa22e6ab15 Binary files /dev/null and b/framework/lib/bcprov-jdk18on-1.72.jar differ diff --git a/framework/lib/byte-buddy-1.12.16.jar b/framework/lib/byte-buddy-1.12.19.jar similarity index 71% rename from framework/lib/byte-buddy-1.12.16.jar rename to framework/lib/byte-buddy-1.12.19.jar index 3f70b08f8a..2cd272d3de 100644 Binary files a/framework/lib/byte-buddy-1.12.16.jar and b/framework/lib/byte-buddy-1.12.19.jar differ diff --git a/framework/lib/groovy-3.0.12.jar b/framework/lib/groovy-3.0.13.jar similarity index 90% rename from framework/lib/groovy-3.0.12.jar rename to framework/lib/groovy-3.0.13.jar index fc1b0378f1..9f3a433238 100644 Binary files a/framework/lib/groovy-3.0.12.jar and b/framework/lib/groovy-3.0.13.jar differ diff --git a/framework/lib/groovy-xml-3.0.12.jar b/framework/lib/groovy-xml-3.0.13.jar similarity index 89% rename from framework/lib/groovy-xml-3.0.12.jar rename to framework/lib/groovy-xml-3.0.13.jar index c49f8d8674..db37751b91 100644 Binary files a/framework/lib/groovy-xml-3.0.12.jar and b/framework/lib/groovy-xml-3.0.13.jar differ diff --git a/framework/lib/gson-2.10.jar b/framework/lib/gson-2.10.jar new file mode 100644 index 0000000000..4b57f5bec7 Binary files /dev/null and b/framework/lib/gson-2.10.jar differ diff --git a/framework/lib/gson-2.9.1.jar b/framework/lib/gson-2.9.1.jar deleted file mode 100644 index 8a663ecceb..0000000000 Binary files a/framework/lib/gson-2.9.1.jar and /dev/null differ diff --git a/framework/lib/hibernate-c3p0-5.6.11.Final.jar b/framework/lib/hibernate-c3p0-5.6.14.Final.jar similarity index 72% rename from framework/lib/hibernate-c3p0-5.6.11.Final.jar rename to framework/lib/hibernate-c3p0-5.6.14.Final.jar index 5f03d02273..06df4a4935 100644 Binary files a/framework/lib/hibernate-c3p0-5.6.11.Final.jar and b/framework/lib/hibernate-c3p0-5.6.14.Final.jar differ diff --git a/framework/lib/hibernate-ehcache-5.6.11.Final.jar b/framework/lib/hibernate-ehcache-5.6.14.Final.jar similarity index 93% rename from framework/lib/hibernate-ehcache-5.6.11.Final.jar rename to framework/lib/hibernate-ehcache-5.6.14.Final.jar index 4692e2080a..dba8ed772f 100644 Binary files a/framework/lib/hibernate-ehcache-5.6.11.Final.jar and b/framework/lib/hibernate-ehcache-5.6.14.Final.jar differ diff --git a/framework/lib/hibernate-validator-5.4.1.Final.jar b/framework/lib/hibernate-validator-5.4.3.Final.jar similarity index 76% rename from framework/lib/hibernate-validator-5.4.1.Final.jar rename to framework/lib/hibernate-validator-5.4.3.Final.jar index 1975846ff4..e9870ebf29 100644 Binary files a/framework/lib/hibernate-validator-5.4.1.Final.jar and b/framework/lib/hibernate-validator-5.4.3.Final.jar differ diff --git a/framework/lib/ivy-2.5.0.jar b/framework/lib/ivy-2.5.0.jar deleted file mode 100644 index eb7569f78b..0000000000 Binary files a/framework/lib/ivy-2.5.0.jar and /dev/null differ diff --git a/framework/lib/ivy-2.5.1.jar b/framework/lib/ivy-2.5.1.jar new file mode 100644 index 0000000000..46374bc68a Binary files /dev/null and b/framework/lib/ivy-2.5.1.jar differ diff --git a/framework/lib/jandex-2.4.3.Final.jar b/framework/lib/jandex-2.4.3.Final.jar deleted file mode 100644 index 7f8e2a05f3..0000000000 Binary files a/framework/lib/jandex-2.4.3.Final.jar and /dev/null differ diff --git a/framework/lib/jandex-3.0.5.jar b/framework/lib/jandex-3.0.5.jar new file mode 100644 index 0000000000..157169a1ed Binary files /dev/null and b/framework/lib/jandex-3.0.5.jar differ diff --git a/framework/lib/javassist-3.29.1-GA.jar b/framework/lib/javassist-3.29.2-GA.jar similarity index 91% rename from framework/lib/javassist-3.29.1-GA.jar rename to framework/lib/javassist-3.29.2-GA.jar index aa7b5a98e2..68fc301018 100644 Binary files a/framework/lib/javassist-3.29.1-GA.jar and b/framework/lib/javassist-3.29.2-GA.jar differ diff --git a/framework/lib/jaxb-runtime-2.3.6.jar b/framework/lib/jaxb-runtime-2.3.7.jar similarity index 88% rename from framework/lib/jaxb-runtime-2.3.6.jar rename to framework/lib/jaxb-runtime-2.3.7.jar index dbc5e50d36..4b7354a19c 100644 Binary files a/framework/lib/jaxb-runtime-2.3.6.jar and b/framework/lib/jaxb-runtime-2.3.7.jar differ diff --git a/framework/lib/joda-time-2.11.1.jar b/framework/lib/joda-time-2.11.1.jar deleted file mode 100644 index b1697b5510..0000000000 Binary files a/framework/lib/joda-time-2.11.1.jar and /dev/null differ diff --git a/framework/lib/joda-time-2.12.2.jar b/framework/lib/joda-time-2.12.2.jar new file mode 100644 index 0000000000..0d924205a7 Binary files /dev/null and b/framework/lib/joda-time-2.12.2.jar differ diff --git a/framework/lib/log4j-api-2.18.0.jar b/framework/lib/log4j-api-2.19.0.jar similarity index 80% rename from framework/lib/log4j-api-2.18.0.jar rename to framework/lib/log4j-api-2.19.0.jar index b4e933f7ec..e55547df39 100644 Binary files a/framework/lib/log4j-api-2.18.0.jar and b/framework/lib/log4j-api-2.19.0.jar differ diff --git a/framework/lib/log4j-core-2.18.0.jar b/framework/lib/log4j-core-2.19.0.jar similarity index 83% rename from framework/lib/log4j-core-2.18.0.jar rename to framework/lib/log4j-core-2.19.0.jar index d6486fdf3d..cdc6fe725d 100644 Binary files a/framework/lib/log4j-core-2.18.0.jar and b/framework/lib/log4j-core-2.19.0.jar differ diff --git a/framework/lib/log4j-slf4j-impl-2.18.0.jar b/framework/lib/log4j-slf4j-impl-2.18.0.jar deleted file mode 100644 index cc41910c32..0000000000 Binary files a/framework/lib/log4j-slf4j-impl-2.18.0.jar and /dev/null differ diff --git a/framework/lib/log4j-slf4j2-impl-2.19.0.jar b/framework/lib/log4j-slf4j2-impl-2.19.0.jar new file mode 100644 index 0000000000..12e226f4e4 Binary files /dev/null and b/framework/lib/log4j-slf4j2-impl-2.19.0.jar differ diff --git a/framework/lib/mysql-connector-java-8.0.30.jar b/framework/lib/mysql-connector-j-8.0.31.jar similarity index 75% rename from framework/lib/mysql-connector-java-8.0.30.jar rename to framework/lib/mysql-connector-j-8.0.31.jar index 92ebe1b54a..f9154ffd07 100644 Binary files a/framework/lib/mysql-connector-java-8.0.30.jar and b/framework/lib/mysql-connector-j-8.0.31.jar differ diff --git a/framework/lib/org.eclipse.jdt.core-3.31.0.jar b/framework/lib/org.eclipse.jdt.core-3.32.0.jar similarity index 72% rename from framework/lib/org.eclipse.jdt.core-3.31.0.jar rename to framework/lib/org.eclipse.jdt.core-3.32.0.jar index 3a49c313b8..9e518ef028 100644 Binary files a/framework/lib/org.eclipse.jdt.core-3.31.0.jar and b/framework/lib/org.eclipse.jdt.core-3.32.0.jar differ diff --git a/framework/lib/postgresql-42.5.0.jar b/framework/lib/postgresql-42.5.1.jar similarity index 80% rename from framework/lib/postgresql-42.5.0.jar rename to framework/lib/postgresql-42.5.1.jar index 49b9556223..b5837224f8 100644 Binary files a/framework/lib/postgresql-42.5.0.jar and b/framework/lib/postgresql-42.5.1.jar differ diff --git a/framework/lib/slf4j-api-1.7.36.jar b/framework/lib/slf4j-api-1.7.36.jar deleted file mode 100644 index 7d3ce68d25..0000000000 Binary files a/framework/lib/slf4j-api-1.7.36.jar and /dev/null differ diff --git a/framework/lib/slf4j-api-2.0.5.jar b/framework/lib/slf4j-api-2.0.5.jar new file mode 100644 index 0000000000..27925b4081 Binary files /dev/null and b/framework/lib/slf4j-api-2.0.5.jar differ diff --git a/framework/lib/snakeyaml-1.32.jar b/framework/lib/snakeyaml-1.32.jar deleted file mode 100644 index cd73a293a6..0000000000 Binary files a/framework/lib/snakeyaml-1.32.jar and /dev/null differ diff --git a/framework/lib/snakeyaml-1.33.jar b/framework/lib/snakeyaml-1.33.jar new file mode 100644 index 0000000000..5a95195e56 Binary files /dev/null and b/framework/lib/snakeyaml-1.33.jar differ diff --git a/framework/src/play/classloading/ApplicationCompiler.java b/framework/src/play/classloading/ApplicationCompiler.java index f0ce32ef34..c025a75824 100644 --- a/framework/src/play/classloading/ApplicationCompiler.java +++ b/framework/src/play/classloading/ApplicationCompiler.java @@ -43,7 +43,8 @@ public class ApplicationCompiler { "15", CompilerOptions.VERSION_15, "16", CompilerOptions.VERSION_16, "17", CompilerOptions.VERSION_17, - "18", CompilerOptions.VERSION_18 + "18", CompilerOptions.VERSION_18, + "19", CompilerOptions.VERSION_19 ); final Map packagesCache = new HashMap<>();