Merge pull request #1448 from tazmaniax/dependencies_update_20230714

Updated 3rd party dependencies
playframework · Oct 16, 2023 · c6fe899 · c6fe899
2 parents 586609b + fade597
commit c6fe899
Show file tree

Hide file tree

Showing 30 changed files with 26 additions and 25 deletions.
diff --git a/framework/dependencies.yml b/framework/dependencies.yml
@@ -10,22 +10,22 @@ require:    &allDependencies
     - antlr 2.7.7
     - com.mchange -> c3p0 0.9.5.5
     - com.zaxxer -> HikariCP 5.0.1
-    - 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
+    - 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
     - cglib -> cglib 3.3.0
     - 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
+    - commons-codec 1.16.0
     - org.apache.commons -> commons-email 1.5
     - commons-fileupload 1.5
-    - commons-io 2.11.0
+    - commons-io 2.14.0
     - com.google.code.maven-play-plugin.org.apache.commons -> commons-javaflow 1590792
-    - org.apache.commons -> commons-lang3 3.12.0
+    - org.apache.commons -> commons-lang3 3.13.0
     - org.apache.commons -> commons-text 1.10.0
     - commons-logging 1.2
     - org.dom4j -> dom4j 2.1.4
@@ -39,42 +39,42 @@ require:    &allDependencies
     - org.hamcrest -> hamcrest-all 1.3
     - junit 4.13.2
     - jregex 1.2_01
-    - log4j-api 2.20.0
-    - log4j-core 2.20.0
+    - org.apache.logging.log4j -> log4j-api 2.20.0
+    - org.apache.logging.log4j -> 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.33
+    - com.mysql -> mysql-connector-j 8.1.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.1
-    - 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.apache.ivy -> ivy 2.5.2
+    - org.bouncycastle -> bcprov-jdk18on 1.76
+    - org.bouncycastle -> bcpkix-jdk18on 1.76
+    - org.codehaus.groovy -> groovy 3.0.19
+    - org.codehaus.groovy -> groovy-xml 3.0.19
     - 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.4
+    - net.bytebuddy -> byte-buddy 1.14.9
     - 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.1
-    - org.jboss.logging -> jboss-logging 3.5.0.Final
+    - io.smallrye -> jandex 3.1.5
+    - org.jboss.logging -> jboss-logging 3.5.3.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.8
-    - com.fasterxml -> classmate 1.5.1
+    - com.fasterxml -> classmate 1.6.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
     - org.javassist -> javassist 3.29.2-GA
     - io.netty -> netty 3.10.6.Final
     - org.postgresql -> postgresql 42.6.0
-    - org.slf4j -> slf4j-api 2.0.7
+    - org.slf4j -> slf4j-api 2.0.9
     - org.apache.logging.log4j -> log4j-slf4j2-impl 2.20.0
-    - org.yaml -> snakeyaml 2.0
+    - org.yaml -> snakeyaml 2.2
     - net.spy -> spymemcached 2.12.3
     - com.thoughtworks.xstream -> xstream 1.4.20
     - xmlpull 1.1.3.4d_b4_min

diff --git a/framework/lib/asm-9.5.jar b/framework/lib/asm-9.5.jar
diff --git a/framework/lib/asm-9.6.jar b/framework/lib/asm-9.6.jar
diff --git a/framework/lib/asm-analysis-9.5.jar b/framework/lib/asm-analysis-9.5.jar
diff --git a/framework/lib/asm-analysis-9.6.jar b/framework/lib/asm-analysis-9.6.jar
diff --git a/framework/lib/asm-commons-9.5.jar → framework/lib/asm-commons-9.6.jar b/framework/lib/asm-commons-9.5.jar → framework/lib/asm-commons-9.6.jar
diff --git a/framework/lib/asm-tree-9.5.jar → framework/lib/asm-tree-9.6.jar b/framework/lib/asm-tree-9.5.jar → framework/lib/asm-tree-9.6.jar
diff --git a/framework/lib/asm-util-9.5.jar → framework/lib/asm-util-9.6.jar b/framework/lib/asm-util-9.5.jar → framework/lib/asm-util-9.6.jar
diff --git a/framework/lib/bcpkix-jdk18on-1.73.jar → framework/lib/bcpkix-jdk18on-1.76.jar b/framework/lib/bcpkix-jdk18on-1.73.jar → framework/lib/bcpkix-jdk18on-1.76.jar
diff --git a/framework/lib/bcprov-jdk18on-1.73.jar → framework/lib/bcprov-jdk18on-1.76.jar b/framework/lib/bcprov-jdk18on-1.73.jar → framework/lib/bcprov-jdk18on-1.76.jar
diff --git a/framework/lib/byte-buddy-1.14.4.jar → framework/lib/byte-buddy-1.14.9.jar b/framework/lib/byte-buddy-1.14.4.jar → framework/lib/byte-buddy-1.14.9.jar
diff --git a/framework/lib/classmate-1.5.1.jar → framework/lib/classmate-1.6.0.jar b/framework/lib/classmate-1.5.1.jar → framework/lib/classmate-1.6.0.jar
diff --git a/framework/lib/commons-codec-1.15.jar b/framework/lib/commons-codec-1.15.jar
diff --git a/framework/lib/commons-codec-1.16.0.jar b/framework/lib/commons-codec-1.16.0.jar
diff --git a/framework/lib/commons-io-2.11.0.jar b/framework/lib/commons-io-2.11.0.jar
diff --git a/framework/lib/commons-io-2.14.0.jar b/framework/lib/commons-io-2.14.0.jar
diff --git a/framework/lib/commons-lang3-3.12.0.jar b/framework/lib/commons-lang3-3.12.0.jar
diff --git a/framework/lib/commons-lang3-3.13.0.jar b/framework/lib/commons-lang3-3.13.0.jar
diff --git a/framework/lib/groovy-3.0.17.jar → framework/lib/groovy-3.0.19.jar b/framework/lib/groovy-3.0.17.jar → framework/lib/groovy-3.0.19.jar
diff --git a/framework/lib/groovy-xml-3.0.17.jar → framework/lib/groovy-xml-3.0.19.jar b/framework/lib/groovy-xml-3.0.17.jar → framework/lib/groovy-xml-3.0.19.jar
diff --git a/framework/lib/ivy-2.5.1.jar → framework/lib/ivy-2.5.2.jar b/framework/lib/ivy-2.5.1.jar → framework/lib/ivy-2.5.2.jar
diff --git a/framework/lib/jandex-3.1.1.jar → framework/lib/jandex-3.1.5.jar b/framework/lib/jandex-3.1.1.jar → framework/lib/jandex-3.1.5.jar
diff --git a/framework/lib/jboss-logging-3.5.0.Final.jar b/framework/lib/jboss-logging-3.5.0.Final.jar
diff --git a/framework/lib/jboss-logging-3.5.3.Final.jar b/framework/lib/jboss-logging-3.5.3.Final.jar
diff --git a/framework/lib/mysql-connector-j-8.0.33.jar → framework/lib/mysql-connector-j-8.1.0.jar b/framework/lib/mysql-connector-j-8.0.33.jar → framework/lib/mysql-connector-j-8.1.0.jar
diff --git a/framework/lib/slf4j-api-2.0.7.jar → framework/lib/slf4j-api-2.0.9.jar b/framework/lib/slf4j-api-2.0.7.jar → framework/lib/slf4j-api-2.0.9.jar
diff --git a/framework/lib/snakeyaml-2.0.jar → framework/lib/snakeyaml-2.2.jar b/framework/lib/snakeyaml-2.0.jar → framework/lib/snakeyaml-2.2.jar
diff --git a/framework/src/play/libs/IO.java b/framework/src/play/libs/IO.java
@@ -11,6 +11,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.io.UncheckedIOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.List;
@@ -109,7 +110,7 @@ public static String readContentAsString(File file, String encoding) {
     public static List<String> readLines(InputStream is) {
         try {
             return IOUtils.readLines(is, defaultCharset());
-        } catch (IOException ex) {
+        } catch (UncheckedIOException ex) {
             throw new UnexpectedException(ex);
         }
     }

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 31.1-jre
+    - com.google.guava -> guava 32.1.2-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.1-jre
+    - com.google.guava -> guava 32.1.2-jre
 
 repositories:
     - tazmaniax: