Merge pull request #1441 from tazmaniax/dependency-update-20230106

Dependency update 20230106
playframework · Jun 28, 2023 · 1e50f43 · 1e50f43
2 parents 557a968 + ee31e0a
commit 1e50f43
Show file tree

Hide file tree

Showing 43 changed files with 32 additions and 31 deletions.
diff --git a/framework/dependencies.yml b/framework/dependencies.yml
@@ -10,71 +10,72 @@ require:    &allDependencies
     - antlr 2.7.7
     - com.mchange -> c3p0 0.9.5.5
     - com.zaxxer -> HikariCP 5.0.1
-    - 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
+    - org.ow2.asm -> asm 9.5
+    - org.ow2.asm -> asm-commons 9.5
+    - org.ow2.asm -> asm-util 9.5
+    - org.ow2.asm -> asm-tree 9.5
+    - org.ow2.asm -> asm-analysis 9.5
     - cglib -> cglib 3.3.0
-    - com.google.code.gson -> gson 2.10
+    - com.google.code.gson -> gson 2.10.1
     - com.jamonapi -> jamon 2.82
     - com.ning -> async-http-client 1.9.40
     - commons-beanutils 1.9.4
     - commons-codec 1.15
     - org.apache.commons -> commons-email 1.5
-    - commons-fileupload 1.4
+    - commons-fileupload 1.5
     - commons-io 2.11.0
     - com.google.code.maven-play-plugin.org.apache.commons -> commons-javaflow 1590792
     - commons-lang 2.6
     - commons-logging 1.2
-    - org.dom4j -> dom4j 2.1.3
+    - org.dom4j -> dom4j 2.1.4
     - com.h2database -> h2 1.4.200
     - javax.activation -> javax.activation-api 1.2.0
     - com.sun.mail -> javax.mail 1.6.2
     - javax.inject 1.0
     - javax.validation -> validation-api 1.1.0.Final
-    - jaxen 1.2.0
-    - joda-time 2.12.2
+    - jaxen 2.0.0
+    - joda-time 2.12.5
     - org.hamcrest -> hamcrest-all 1.3
     - junit 4.13.2
     - jregex 1.2_01
-    - log4j-api 2.19.0
-    - log4j-core 2.19.0
+    - log4j-api 2.20.0
+    - log4j-core 2.20.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
-    - com.mysql -> mysql-connector-j 8.0.31
+    - com.mysql -> mysql-connector-j 8.0.33
     - 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.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.bouncycastle -> bcprov-jdk18on 1.73
+    - org.bouncycastle -> bcpkix-jdk18on 1.73
+    - org.codehaus.groovy -> groovy 3.0.17
+    - org.codehaus.groovy -> groovy-xml 3.0.17
+    - 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.12.19
+    - net.bytebuddy -> byte-buddy 1.14.4
     - 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.0.5
+    - io.smallrye -> jandex 3.1.1
     - 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.7
+    - org.glassfish.jaxb -> jaxb-runtime 2.3.8
     - com.fasterxml -> classmate 1.5.1
-    - org.hibernate -> hibernate-c3p0 5.6.14.Final
-    - org.hibernate -> hibernate-ehcache 5.6.14.Final
+    - org.hibernate -> hibernate-c3p0 5.6.15.Final
+    - org.hibernate -> hibernate-ehcache 5.6.15.Final
     - com.mchange -> mchange-commons-java 0.2.20
     - org.javassist -> javassist 3.29.2-GA
     - io.netty -> netty 3.10.6.Final
-    - 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
+    - org.postgresql -> postgresql 42.6.0
+    - org.slf4j -> slf4j-api 2.0.7
+    - org.apache.logging.log4j -> log4j-slf4j2-impl 2.20.0
+    - org.yaml -> snakeyaml 2.0
     - net.spy -> spymemcached 2.12.3
-    - com.thoughtworks.xstream -> xstream 1.4.19
+    - com.thoughtworks.xstream -> xstream 1.4.20
     - xmlpull 1.1.3.4d_b4_min
 
 # Default repositories, used for all projects

diff --git a/framework/lib/asm-9.4.jar → framework/lib/asm-9.5.jar b/framework/lib/asm-9.4.jar → framework/lib/asm-9.5.jar
diff --git a/framework/lib/asm-analysis-9.4.jar → framework/lib/asm-analysis-9.5.jar b/framework/lib/asm-analysis-9.4.jar → framework/lib/asm-analysis-9.5.jar
diff --git a/framework/lib/asm-commons-9.4.jar → framework/lib/asm-commons-9.5.jar b/framework/lib/asm-commons-9.4.jar → framework/lib/asm-commons-9.5.jar
diff --git a/framework/lib/asm-tree-9.4.jar → framework/lib/asm-tree-9.5.jar b/framework/lib/asm-tree-9.4.jar → framework/lib/asm-tree-9.5.jar
diff --git a/framework/lib/asm-util-9.4.jar → framework/lib/asm-util-9.5.jar b/framework/lib/asm-util-9.4.jar → framework/lib/asm-util-9.5.jar
diff --git a/framework/lib/bcpkix-jdk18on-1.72.jar → framework/lib/bcpkix-jdk18on-1.73.jar b/framework/lib/bcpkix-jdk18on-1.72.jar → framework/lib/bcpkix-jdk18on-1.73.jar
diff --git a/framework/lib/bcprov-jdk18on-1.72.jar → framework/lib/bcprov-jdk18on-1.73.jar b/framework/lib/bcprov-jdk18on-1.72.jar → framework/lib/bcprov-jdk18on-1.73.jar
diff --git a/framework/lib/byte-buddy-1.12.19.jar → framework/lib/byte-buddy-1.14.4.jar b/framework/lib/byte-buddy-1.12.19.jar → framework/lib/byte-buddy-1.14.4.jar
diff --git a/framework/lib/commons-fileupload-1.4.jar b/framework/lib/commons-fileupload-1.4.jar
diff --git a/framework/lib/commons-fileupload-1.5.jar b/framework/lib/commons-fileupload-1.5.jar
diff --git a/framework/lib/dom4j-2.1.3.jar b/framework/lib/dom4j-2.1.3.jar
diff --git a/framework/lib/dom4j-2.1.4.jar b/framework/lib/dom4j-2.1.4.jar
diff --git a/framework/lib/ecj-3.33.0.jar b/framework/lib/ecj-3.33.0.jar
diff --git a/framework/lib/groovy-3.0.13.jar → framework/lib/groovy-3.0.17.jar b/framework/lib/groovy-3.0.13.jar → framework/lib/groovy-3.0.17.jar
diff --git a/framework/lib/groovy-xml-3.0.13.jar → framework/lib/groovy-xml-3.0.17.jar b/framework/lib/groovy-xml-3.0.13.jar → framework/lib/groovy-xml-3.0.17.jar
diff --git a/framework/lib/gson-2.10.1.jar b/framework/lib/gson-2.10.1.jar
diff --git a/framework/lib/gson-2.10.jar b/framework/lib/gson-2.10.jar
diff --git a/...ework/lib/hibernate-c3p0-5.6.14.Final.jar → ...ework/lib/hibernate-c3p0-5.6.15.Final.jar b/...ework/lib/hibernate-c3p0-5.6.14.Final.jar → ...ework/lib/hibernate-c3p0-5.6.15.Final.jar
diff --git a/...rk/lib/hibernate-ehcache-5.6.14.Final.jar → ...rk/lib/hibernate-ehcache-5.6.15.Final.jar b/...rk/lib/hibernate-ehcache-5.6.14.Final.jar → ...rk/lib/hibernate-ehcache-5.6.15.Final.jar
diff --git a/framework/lib/jandex-3.0.5.jar b/framework/lib/jandex-3.0.5.jar
diff --git a/framework/lib/jandex-3.1.1.jar b/framework/lib/jandex-3.1.1.jar
diff --git a/framework/lib/jaxb-runtime-2.3.7.jar → framework/lib/jaxb-runtime-2.3.8.jar b/framework/lib/jaxb-runtime-2.3.7.jar → framework/lib/jaxb-runtime-2.3.8.jar
diff --git a/framework/lib/jaxen-1.2.0.jar b/framework/lib/jaxen-1.2.0.jar
diff --git a/framework/lib/jaxen-2.0.0.jar b/framework/lib/jaxen-2.0.0.jar
diff --git a/framework/lib/joda-time-2.12.2.jar → framework/lib/joda-time-2.12.5.jar b/framework/lib/joda-time-2.12.2.jar → framework/lib/joda-time-2.12.5.jar
diff --git a/framework/lib/log4j-api-2.19.0.jar b/framework/lib/log4j-api-2.19.0.jar
diff --git a/framework/lib/log4j-api-2.20.0.jar b/framework/lib/log4j-api-2.20.0.jar
diff --git a/framework/lib/log4j-core-2.19.0.jar → framework/lib/log4j-core-2.20.0.jar b/framework/lib/log4j-core-2.19.0.jar → framework/lib/log4j-core-2.20.0.jar
diff --git a/framework/lib/log4j-slf4j2-impl-2.19.0.jar b/framework/lib/log4j-slf4j2-impl-2.19.0.jar
diff --git a/framework/lib/log4j-slf4j2-impl-2.20.0.jar b/framework/lib/log4j-slf4j2-impl-2.20.0.jar
diff --git a/framework/lib/mysql-connector-j-8.0.31.jar b/framework/lib/mysql-connector-j-8.0.31.jar
diff --git a/framework/lib/mysql-connector-j-8.0.33.jar b/framework/lib/mysql-connector-j-8.0.33.jar
diff --git a/framework/lib/org.eclipse.jdt.core-3.32.0.jar b/framework/lib/org.eclipse.jdt.core-3.32.0.jar
diff --git a/framework/lib/org.eclipse.jdt.core-3.33.0.jar b/framework/lib/org.eclipse.jdt.core-3.33.0.jar
diff --git a/framework/lib/postgresql-42.5.1.jar → framework/lib/postgresql-42.6.0.jar b/framework/lib/postgresql-42.5.1.jar → framework/lib/postgresql-42.6.0.jar
diff --git a/framework/lib/slf4j-api-2.0.5.jar → framework/lib/slf4j-api-2.0.7.jar b/framework/lib/slf4j-api-2.0.5.jar → framework/lib/slf4j-api-2.0.7.jar
diff --git a/framework/lib/snakeyaml-1.33.jar b/framework/lib/snakeyaml-1.33.jar
diff --git a/framework/lib/snakeyaml-2.0.jar b/framework/lib/snakeyaml-2.0.jar
diff --git a/framework/lib/xstream-1.4.19.jar → framework/lib/xstream-1.4.20.jar b/framework/lib/xstream-1.4.19.jar → framework/lib/xstream-1.4.20.jar
diff --git a/framework/src/play/test/Fixtures.java b/framework/src/play/test/Fixtures.java
@@ -438,7 +438,7 @@ public static List<?> loadYamlAsList(String name) {
      */
     @SuppressWarnings("unchecked")
     public static <T> T loadYaml(String name, Class<T> clazz) {
-        Yaml yaml = new Yaml(new CustomClassLoaderConstructor(clazz, Play.classloader));
+        Yaml yaml = new Yaml(new CustomClassLoaderConstructor(clazz, Play.classloader, null));
         yaml.setBeanAccess(BeanAccess.FIELD);
         return (T) loadYaml(name, yaml);
     }

diff --git a/samples-and-tests/java8Support/conf/dependencies.yml b/samples-and-tests/java8Support/conf/dependencies.yml
@@ -2,7 +2,7 @@
 
 require:
     - play
-    - com.google.guava -> guava r09
+    - com.google.guava -> guava 31.1-jre
     - org.hamcrest -> hamcrest-core 1.3
     - org.hamcrest -> hamcrest-library 1.3
 

diff --git a/samples-and-tests/nonstatic-app/conf/dependencies.yml b/samples-and-tests/nonstatic-app/conf/dependencies.yml
@@ -3,7 +3,7 @@
 require:
     - play
     - play-tazmaniax -> guice 1.11.1
-    - com.google.guava -> guava 31.0.1-jre
+    - com.google.guava -> guava 31.1-jre
 
 repositories:
     - tazmaniax: