Skip to content

Commit 5b4cba2

Browse files
authored
Merge pull request #1252 from tomparle/master
Update Play source for build compability with JDK9+
2 parents 5efaa08 + b6cf1f0 commit 5b4cba2

32 files changed

Lines changed: 85 additions & 87 deletions

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,7 @@ samples-and-tests/test-scala/logs
105105
samples-and-tests/i-am-a-developer/i-am-working-here
106106
samples-and-tests/i-am-a-developer/i-am-creating-jobs-here
107107
samples-and-tests/i-am-a-developer/i-am-testing-log-levels-here
108+
samples-and-tests/i-am-a-developer/i-am-testing-ssl-config-here
108109
samples-and-tests/just-test-cases/attachments
109110
samples-and-tests/booking/logs
110111
samples-and-tests/booking/tmp

framework/build.xml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -97,10 +97,9 @@
9797
<tag name="play.todo" scope="all" description="To do:"/>
9898
<tag name="todo" scope="all" description="To do:"/>
9999
<group title="Libs" packages="play.libs.*"/>
100-
<link offline="false" href="http://docs.oracle.com/javaee/7/api/" />
101-
<link offline="false" href="https://docs.oracle.com/javase/8/docs/api//" />
100+
<link offline="false" href="https://docs.oracle.com/javase/" />
102101
<link offline="false" href="http://commons.apache.org/proper/commons-fileupload/apidocs/" />
103-
<link offline="false" href="https://static.javadoc.io/com.google.code.gson/gson/2.8.0/" />
102+
<link offline="false" href="https://www.javadoc.io/doc/com.google.code.gson/gson" />
104103
<link offline="false" href="https://docs.jboss.org/hibernate/orm/4.2/javadocs/" />
105104
<link offline="false" href="http://www.mchange.com/projects/c3p0/apidocs/" />
106105
</javadoc>
@@ -234,7 +233,7 @@
234233
<!-- Tests -->
235234

236235
<target name="compile-tests" depends="compile">
237-
<javac encoding="utf-8" nowarn="${compile.nowarn}" debug="true" destdir="classes" classpathref="project.classpath" srcdir="tests/src" source="1.8" target="1.8">
236+
<javac encoding="utf-8" nowarn="${compile.nowarn}" debug="true" destdir="classes" classpathref="project.classpath" srcdir="tests/src" source="1.8" target="1.8">
238237
<include name="**/*.java"/>
239238
</javac>
240239
</target>

framework/dependencies.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ transitiveDependencies: false
99
require: &allDependencies
1010
- antlr 2.7.7
1111
- com.mchange -> c3p0 0.9.5.2
12-
- com.zaxxer -> HikariCP 2.7.9
13-
- org.ow2.asm -> asm-all 5.2
14-
- cglib -> cglib 3.2.4
15-
- com.google.code.gson -> gson 2.8.0
12+
- com.zaxxer -> HikariCP 3.2.0
13+
- org.ow2.asm -> asm 6.2
14+
- cglib -> cglib 3.2.7
15+
- com.google.code.gson -> gson 2.8.5
1616
- com.jamonapi -> jamon 2.81
1717
- com.ning -> async-http-client 1.9.40
1818
- commons-beanutils 1.9.2
@@ -45,15 +45,15 @@ require: &allDependencies
4545
- org.apache.ivy -> ivy 2.4.0
4646
- org.bouncycastle -> bcprov-jdk15on 1.60
4747
- org.bouncycastle -> bcpkix-jdk15on 1.60
48-
- org.codehaus.groovy -> groovy-all 2.4.15
49-
- org.eclipse.jdt.core 3.12.3
48+
- org.codehaus.groovy -> groovy 2.5.1
49+
- org.codehaus.groovy -> groovy-xml 2.5.1
50+
- org.eclipse.jdt -> org.eclipse.jdt.core 3.14.0
5051
- org.hibernate -> hibernate-core 5.2.10.patched
5152
- org.hibernate.common -> hibernate-commons-annotations 5.0.1.Final
52-
- org.hibernate -> hibernate-entitymanager 5.2.10.Final
5353
- org.hibernate -> hibernate-validator 5.4.1.Final
5454
- org.jboss.logging -> jboss-logging 3.3.0.Final
5555
- org.jboss.spec.javax.transaction -> jboss-transaction-api_1.2_spec 1.0.1.Final
56-
- org.hibernate.javax.persistence -> hibernate-jpa-2.1-api 1.0.0.Final
56+
- org.hibernate.javax.persistence -> hibernate-jpa-2.1-api 1.0.0.Final
5757
- com.fasterxml -> classmate 1.3.3
5858
- org.hibernate -> hibernate-c3p0 5.2.10.Final
5959
- org.hibernate -> hibernate-ehcache 5.2.10.Final
2.85 MB
Binary file not shown.
-1.18 MB
Binary file not shown.
550 KB
Binary file not shown.
54.4 KB
Binary file not shown.

framework/lib/HikariCP-2.7.9.jar

-140 KB
Binary file not shown.

framework/lib/HikariCP-3.2.0.jar

140 KB
Binary file not shown.

framework/lib/asm-6.2.jar

109 KB
Binary file not shown.

0 commit comments

Comments
 (0)