diff --git a/README.md b/README.md index c7bfedf8a6..3be9354eae 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # Welcome to Play framework [![GitHub Discussions](https://img.shields.io/github/discussions/playframework/play1?&logo=github&color=brightgreen)](https://github.com/playframework/play1/discussions) -[![Gitter](https://img.shields.io/gitter/room/playframework/play1)](https://gitter.im/playframework/play1) +[![Discord](https://img.shields.io/discord/931647755942776882?logo=discord&logoColor=white)](https://discord.gg/YVRgAp2Zj4) [![Contributors](https://img.shields.io/github/contributors/playframework/play1)](https://github.com/playframework/play1/graphs/contributors) [![StackOverflow](https://img.shields.io/static/v1?label=stackoverflow&logo=stackoverflow&logoColor=fe7a16&color=brightgreen&message=playframework)](https://stackoverflow.com/tags/playframework) diff --git a/documentation/manual/home.textile b/documentation/manual/home.textile index 3ed0415926..61bbbebf3e 100644 --- a/documentation/manual/home.textile +++ b/documentation/manual/home.textile @@ -189,6 +189,7 @@ h2. Version notes New versions of Play include certain changes. Check older release notes for: # "About Play releases":releases/releases +# "Play 1.9.0":releases/release1.9.x/releasenotes-1.9.0 # "Play 1.8.0":releases/release1.8.x/releasenotes-1.8.0 # "Play 1.7.1":releases/release1.7.x/releasenotes-1.7.1 # "Play 1.7.0":releases/release1.7.x/releasenotes-1.7.0 diff --git a/documentation/manual/releases/release1.9.x/releasenotes-1.9.0.textile b/documentation/manual/releases/release1.9.x/releasenotes-1.9.0.textile new file mode 100644 index 0000000000..fa3e6fb204 --- /dev/null +++ b/documentation/manual/releases/release1.9.x/releasenotes-1.9.0.textile @@ -0,0 +1,24 @@ +# Play 1.9.0 -- Release notes + +Play 1.9.0 has been released of the master branch. + +The changes in this release are listed in the "1.9.0":https://github.com/playframework/play1/milestone/10624965 including 12 resolved tickets. + + +## What's new in Play 1.9.0 + + +## What's fixed in Play 1.9.0 + +* "#1358":https://github.com/playframework/play1/issues/1358 : Update the README, use Markdown instead of Textile +* "#1472":https://github.com/playframework/play1/issues/1472 : Fix "play build-module" by replacing yaml.load with yaml.safe_load +* "#1473":https://github.com/playframework/play1/issues/1473 : feat(dependabot): add dependabot.yml configuration +* "#1474":https://github.com/playframework/play1/issues/1474 : Convert README from textile to markdown +* "#1475":https://github.com/playframework/play1/issues/1475 : Bump actions/setup-python from 4 to 5 +* "#1476":https://github.com/playframework/play1/issues/1476 : Bump actions/setup-java from 3 to 4 +* "#1477":https://github.com/playframework/play1/issues/1477 : GitHub actions configuration +* "#1478":https://github.com/playframework/play1/issues/1478 : Update issue templates +* "#1479":https://github.com/playframework/play1/issues/1479 : fix(release-draft): fix version number +* "#1482":https://github.com/playframework/play1/issues/1482 : Updated dependencies +* "#1502":https://github.com/playframework/play1/issues/1502 : dependencies upgrade: +* "#1503":https://github.com/playframework/play1/issues/1503 : 1502 update dependencies diff --git a/documentation/manual/releases/releases.textile b/documentation/manual/releases/releases.textile index 90d795b38f..0fa15cb8ac 100644 --- a/documentation/manual/releases/releases.textile +++ b/documentation/manual/releases/releases.textile @@ -2,6 +2,11 @@ h1. About Play releases You can download Play releases "here":https://www.playframework.com/download. Each release has a Migration Guide that explains how to upgrade from the previous release. +h2. Play 1.9.x + +# "Play 1.9.0":release1.9.x/releasenotes-1.9.0 + + h2. Play 1.8.x # "Play 1.8.0":release1.8.x/releasenotes-1.8.0 diff --git a/framework/dependencies.yml b/framework/dependencies.yml index befcde1eb0..8b035aa983 100644 --- a/framework/dependencies.yml +++ b/framework/dependencies.yml @@ -8,37 +8,37 @@ transitiveDependencies: false # This core dependencies are required by Play framework require: &allDependencies - antlr 2.7.7 - - 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.8 + - org.ow2.asm -> asm-commons 9.8 + - org.ow2.asm -> asm-util 9.8 + - org.ow2.asm -> asm-tree 9.8 + - org.ow2.asm -> asm-analysis 9.8 - cglib -> cglib 3.3.0 - - com.google.code.gson -> gson 2.10.1 + - com.google.code.gson -> gson 2.13.1 - com.jamonapi -> jamon 2.82 - com.ning -> async-http-client 1.9.40 - - commons-beanutils 1.9.4 - - commons-codec 1.16.1 + - commons-beanutils 1.11.0 + - commons-codec 1.18.0 - org.apache.commons -> commons-email 1.6.0 - - commons-fileupload 1.5 - - commons-io 2.15.1 + - commons-fileupload 1.6.0 + - commons-io 2.19.0 - 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.dom4j -> dom4j 2.1.4 + - org.apache.commons -> commons-lang3 3.18.0 + - org.apache.commons -> commons-text 1.13.1 + - commons-logging 1.3.5 + - org.dom4j -> dom4j 2.2.0 - javax.activation -> javax.activation-api 1.2.0 - com.sun.mail -> javax.mail 1.6.2 - jakarta.inject -> jakarta.inject-api 1.0 - javax.validation -> validation-api 1.1.0.Final - javax.activation -> activation 1.1.1 - jaxen 2.0.0 - - joda-time 2.12.7 + - joda-time 2.14.0 - org.hamcrest -> hamcrest-all 1.3 - junit 4.13.2 - - net.sourceforge.jregex -> jregex 1.2_01 - - org.apache.logging.log4j -> log4j-api 2.23.0 - - org.apache.logging.log4j -> log4j-core 2.23.0 + - net.sourceforge.jregex -> jregex 1.2_01 + - 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 @@ -46,29 +46,29 @@ require: &allDependencies - oauth.signpost -> signpost-core 1.2.1.2 - javax.servlet -> javax.servlet-api 3.0.1 - jakarta.servlet -> jakarta.servlet-api 6.0.0 - - org.apache.ivy -> ivy 2.5.2 - - org.bouncycastle -> bcprov-jdk18on 1.78.1 - - org.bouncycastle -> bcpkix-jdk18on 1.78.1 - - org.bouncycastle -> bcutil-jdk18on 1.78.1 - - org.codehaus.groovy -> groovy 3.0.20 - - org.codehaus.groovy -> groovy-xml 3.0.20 - - org.eclipse.jdt -> org.eclipse.jdt.core 3.36.0 - - org.eclipse.jdt -> ecj 3.36.0 - - net.bytebuddy -> byte-buddy 1.14.19 - - io.smallrye -> jandex 3.1.6 - - org.jboss.logging -> jboss-logging 3.5.3.Final + - org.apache.ivy -> ivy 2.5.3 + - org.bouncycastle -> bcprov-jdk18on 1.81 + - org.bouncycastle -> bcpkix-jdk18on 1.81 + - org.bouncycastle -> bcutil-jdk18on 1.81 + - org.codehaus.groovy -> groovy 3.0.25 + - org.codehaus.groovy -> groovy-xml 3.0.25 + - org.eclipse.jdt -> org.eclipse.jdt.core 3.43.0 + - org.eclipse.jdt -> ecj 3.43.0 + - net.bytebuddy -> byte-buddy 1.17.8 + - io.smallrye -> jandex 3.2.7 + - org.jboss.logging -> jboss-logging 3.6.1.Final - org.jboss.spec.javax.transaction -> jboss-transaction-api_1.2_spec 1.1.1.Final - javax.persistence -> javax.persistence-api 2.2 - javax.xml.bind -> jaxb-api 2.3.1 - org.glassfish.jaxb -> jaxb-runtime 2.3.9 - com.fasterxml -> classmate 1.7.0 - - com.mchange -> mchange-commons-java 0.2.20 + - com.mchange -> mchange-commons-java 0.3.2 - org.javassist -> javassist 3.30.2-GA - io.netty -> netty 3.10.6.Final.Nosto20250401 - - org.postgresql -> postgresql 42.7.2 - - org.slf4j -> slf4j-api 2.0.12 - - org.apache.logging.log4j -> log4j-slf4j2-impl 2.23.0 - - org.yaml -> snakeyaml 2.2 + - org.postgresql -> postgresql 42.7.7 + - org.slf4j -> slf4j-api 2.0.17 + - org.apache.logging.log4j -> log4j-slf4j2-impl 2.23.1 + - org.yaml -> snakeyaml 2.4 - net.spy -> spymemcached 2.12.3 - com.thoughtworks.xstream -> xstream 1.4.21 - xmlpull 1.1.3.4d_b4_min 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.8.jar b/framework/lib/asm-9.8.jar new file mode 100644 index 0000000000..4f0c86e08b Binary files /dev/null and b/framework/lib/asm-9.8.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.8.jar b/framework/lib/asm-analysis-9.8.jar new file mode 100644 index 0000000000..d03a1f8e57 Binary files /dev/null and b/framework/lib/asm-analysis-9.8.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.8.jar b/framework/lib/asm-commons-9.8.jar new file mode 100644 index 0000000000..d6e4780711 Binary files /dev/null and b/framework/lib/asm-commons-9.8.jar differ diff --git a/framework/lib/asm-tree-9.6.jar b/framework/lib/asm-tree-9.8.jar similarity index 91% rename from framework/lib/asm-tree-9.6.jar rename to framework/lib/asm-tree-9.8.jar index 9fe5275876..83d38631d6 100644 Binary files a/framework/lib/asm-tree-9.6.jar and b/framework/lib/asm-tree-9.8.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.8.jar b/framework/lib/asm-util-9.8.jar new file mode 100644 index 0000000000..f628b2f5d7 Binary files /dev/null and b/framework/lib/asm-util-9.8.jar differ diff --git a/framework/lib/bcpkix-jdk18on-1.78.1.jar b/framework/lib/bcpkix-jdk18on-1.81.jar similarity index 56% rename from framework/lib/bcpkix-jdk18on-1.78.1.jar rename to framework/lib/bcpkix-jdk18on-1.81.jar index dca7170eeb..11f73d689d 100644 Binary files a/framework/lib/bcpkix-jdk18on-1.78.1.jar and b/framework/lib/bcpkix-jdk18on-1.81.jar differ diff --git a/framework/lib/bcprov-jdk18on-1.78.1.jar b/framework/lib/bcprov-jdk18on-1.81.jar similarity index 69% rename from framework/lib/bcprov-jdk18on-1.78.1.jar rename to framework/lib/bcprov-jdk18on-1.81.jar index 6726f83391..d0410eb115 100644 Binary files a/framework/lib/bcprov-jdk18on-1.78.1.jar and b/framework/lib/bcprov-jdk18on-1.81.jar differ diff --git a/framework/lib/bcutil-jdk18on-1.78.1.jar b/framework/lib/bcutil-jdk18on-1.81.jar similarity index 64% rename from framework/lib/bcutil-jdk18on-1.78.1.jar rename to framework/lib/bcutil-jdk18on-1.81.jar index 348a2fff6d..26fc9e0d68 100644 Binary files a/framework/lib/bcutil-jdk18on-1.78.1.jar and b/framework/lib/bcutil-jdk18on-1.81.jar differ diff --git a/framework/lib/byte-buddy-1.14.19.jar b/framework/lib/byte-buddy-1.14.19.jar deleted file mode 100644 index a7f2921196..0000000000 Binary files a/framework/lib/byte-buddy-1.14.19.jar and /dev/null differ diff --git a/framework/lib/byte-buddy-1.17.8.jar b/framework/lib/byte-buddy-1.17.8.jar new file mode 100644 index 0000000000..7cca201f46 Binary files /dev/null and b/framework/lib/byte-buddy-1.17.8.jar differ diff --git a/framework/lib/c3p0-0.10.2.jar b/framework/lib/c3p0-0.10.2.jar new file mode 100644 index 0000000000..6b63862dd9 Binary files /dev/null and b/framework/lib/c3p0-0.10.2.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-beanutils-1.11.0.jar b/framework/lib/commons-beanutils-1.11.0.jar new file mode 100644 index 0000000000..6b7b993661 Binary files /dev/null and b/framework/lib/commons-beanutils-1.11.0.jar differ diff --git a/framework/lib/commons-beanutils-1.9.4.jar b/framework/lib/commons-beanutils-1.9.4.jar deleted file mode 100644 index b73543cbac..0000000000 Binary files a/framework/lib/commons-beanutils-1.9.4.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.18.0.jar b/framework/lib/commons-codec-1.18.0.jar new file mode 100644 index 0000000000..9cb58515be Binary files /dev/null and b/framework/lib/commons-codec-1.18.0.jar differ diff --git a/framework/lib/commons-fileupload-1.5.jar b/framework/lib/commons-fileupload-1.5.jar deleted file mode 100644 index 5e608753c1..0000000000 Binary files a/framework/lib/commons-fileupload-1.5.jar and /dev/null differ diff --git a/framework/lib/commons-fileupload-1.6.0.jar b/framework/lib/commons-fileupload-1.6.0.jar new file mode 100644 index 0000000000..63af9e1294 Binary files /dev/null and b/framework/lib/commons-fileupload-1.6.0.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.19.0.jar b/framework/lib/commons-io-2.19.0.jar new file mode 100644 index 0000000000..38e7fd20a4 Binary files /dev/null and b/framework/lib/commons-io-2.19.0.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.18.0.jar b/framework/lib/commons-lang3-3.18.0.jar new file mode 100644 index 0000000000..9359e524af Binary files /dev/null and b/framework/lib/commons-lang3-3.18.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.5.jar b/framework/lib/commons-logging-1.3.5.jar new file mode 100644 index 0000000000..75d93a15cf Binary files /dev/null and b/framework/lib/commons-logging-1.3.5.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.13.1.jar b/framework/lib/commons-text-1.13.1.jar new file mode 100644 index 0000000000..ddba18d10e Binary files /dev/null and b/framework/lib/commons-text-1.13.1.jar differ diff --git a/framework/lib/dom4j-2.1.4.jar b/framework/lib/dom4j-2.1.4.jar deleted file mode 100644 index 0769bed921..0000000000 Binary files a/framework/lib/dom4j-2.1.4.jar and /dev/null differ diff --git a/framework/lib/dom4j-2.2.0.jar b/framework/lib/dom4j-2.2.0.jar new file mode 100644 index 0000000000..f7d2d124cd Binary files /dev/null and b/framework/lib/dom4j-2.2.0.jar differ diff --git a/framework/lib/ecj-3.36.0.jar b/framework/lib/ecj-3.36.0.jar deleted file mode 100644 index 5fe2e5dc71..0000000000 Binary files a/framework/lib/ecj-3.36.0.jar and /dev/null differ diff --git a/framework/lib/ecj-3.43.0.jar b/framework/lib/ecj-3.43.0.jar new file mode 100644 index 0000000000..0f24404dd5 Binary files /dev/null and b/framework/lib/ecj-3.43.0.jar differ diff --git a/framework/lib/groovy-3.0.20.jar b/framework/lib/groovy-3.0.25.jar similarity index 83% rename from framework/lib/groovy-3.0.20.jar rename to framework/lib/groovy-3.0.25.jar index d3b704edcf..dfa97405e3 100644 Binary files a/framework/lib/groovy-3.0.20.jar and b/framework/lib/groovy-3.0.25.jar differ diff --git a/framework/lib/groovy-xml-3.0.20.jar b/framework/lib/groovy-xml-3.0.25.jar similarity index 84% rename from framework/lib/groovy-xml-3.0.20.jar rename to framework/lib/groovy-xml-3.0.25.jar index 5e1e17728e..93d48f0c5a 100644 Binary files a/framework/lib/groovy-xml-3.0.20.jar and b/framework/lib/groovy-xml-3.0.25.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.13.1.jar b/framework/lib/gson-2.13.1.jar new file mode 100644 index 0000000000..159b930f92 Binary files /dev/null and b/framework/lib/gson-2.13.1.jar differ diff --git a/framework/lib/ivy-2.5.2.jar b/framework/lib/ivy-2.5.2.jar deleted file mode 100644 index 7d2648a898..0000000000 Binary files a/framework/lib/ivy-2.5.2.jar and /dev/null differ diff --git a/framework/lib/ivy-2.5.3.jar b/framework/lib/ivy-2.5.3.jar new file mode 100644 index 0000000000..88d88d4928 Binary files /dev/null and b/framework/lib/ivy-2.5.3.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.7.jar b/framework/lib/jandex-3.2.7.jar new file mode 100644 index 0000000000..c9e5cacdce Binary files /dev/null and b/framework/lib/jandex-3.2.7.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.1.Final.jar b/framework/lib/jboss-logging-3.6.1.Final.jar new file mode 100644 index 0000000000..6bb6f7fe06 Binary files /dev/null and b/framework/lib/jboss-logging-3.6.1.Final.jar differ diff --git a/framework/lib/joda-time-2.12.7.jar b/framework/lib/joda-time-2.14.0.jar similarity index 56% rename from framework/lib/joda-time-2.12.7.jar rename to framework/lib/joda-time-2.14.0.jar index 7994777eda..e9509ba6d8 100644 Binary files a/framework/lib/joda-time-2.12.7.jar and b/framework/lib/joda-time-2.14.0.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.2.jar b/framework/lib/mchange-commons-java-0.3.2.jar new file mode 100644 index 0000000000..b7ddccf988 Binary files /dev/null and b/framework/lib/mchange-commons-java-0.3.2.jar differ diff --git a/framework/lib/mysql-connector-j-9.3.0.jar b/framework/lib/mysql-connector-j-9.3.0.jar new file mode 100644 index 0000000000..b7f8142b74 Binary files /dev/null and b/framework/lib/mysql-connector-j-9.3.0.jar differ diff --git a/framework/lib/org.eclipse.jdt.core-3.36.0.jar b/framework/lib/org.eclipse.jdt.core-3.36.0.jar deleted file mode 100644 index c7a65695a9..0000000000 Binary files a/framework/lib/org.eclipse.jdt.core-3.36.0.jar and /dev/null differ diff --git a/framework/lib/org.eclipse.jdt.core-3.43.0.jar b/framework/lib/org.eclipse.jdt.core-3.43.0.jar new file mode 100644 index 0000000000..d6c4ee86a2 Binary files /dev/null and b/framework/lib/org.eclipse.jdt.core-3.43.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.7.jar b/framework/lib/postgresql-42.7.7.jar new file mode 100644 index 0000000000..886dce112c Binary files /dev/null and b/framework/lib/postgresql-42.7.7.jar differ diff --git a/framework/lib/slf4j-api-2.0.12.jar b/framework/lib/slf4j-api-2.0.17.jar similarity index 54% rename from framework/lib/slf4j-api-2.0.12.jar rename to framework/lib/slf4j-api-2.0.17.jar index bfa1de399d..26b1545546 100644 Binary files a/framework/lib/slf4j-api-2.0.12.jar and b/framework/lib/slf4j-api-2.0.17.jar differ diff --git a/framework/lib/snakeyaml-2.2.jar b/framework/lib/snakeyaml-2.2.jar deleted file mode 100644 index 275dd5700a..0000000000 Binary files a/framework/lib/snakeyaml-2.2.jar and /dev/null differ diff --git a/framework/lib/snakeyaml-2.4.jar b/framework/lib/snakeyaml-2.4.jar new file mode 100644 index 0000000000..697acde8ca Binary files /dev/null and b/framework/lib/snakeyaml-2.4.jar differ diff --git a/framework/src/play/classloading/ApplicationCompiler.java b/framework/src/play/classloading/ApplicationCompiler.java index 83d8276284..b6d35f942b 100644 --- a/framework/src/play/classloading/ApplicationCompiler.java +++ b/framework/src/play/classloading/ApplicationCompiler.java @@ -303,11 +303,12 @@ public void cleanup() { applicationClasses.getApplicationClass(clazzName.toString()).compiled(clazzFile.getBytes()); } }; + CompilerOptions options = new CompilerOptions(settings); /** * The JDT compiler */ - Compiler jdtCompiler = new Compiler(nameEnvironment, policy, settings, compilerRequestor, problemFactory) { + Compiler jdtCompiler = new Compiler(nameEnvironment, policy, options, compilerRequestor, problemFactory) { @Override protected void handleInternalException(Throwable e, CompilationUnitDeclaration ud, CompilationResult result) { 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 @@ - +