Skip to content

Commit

Permalink
Merge pull request #1375 from xael-fry/1374_travis_fix
Browse files Browse the repository at this point in the history
#1374 travis fix
  • Loading branch information
xael-fry authored Jan 31, 2022
2 parents 8b2871b + 3287fd7 commit ec96e5a
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ sudo: required
dist: trusty
language: java
jdk:
- oraclejdk8
- openjdk11
install:
- sudo apt-get install ant-optional
addons:
Expand Down
20 changes: 10 additions & 10 deletions framework/build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
</path>

<target name="clean" description="clean resources">
<delete dir="classes" />
<delete dir="classes" />
<delete dir="dist" />
<delete dir="tests-results" />
<delete dir="tests-tmp" />
Expand All @@ -46,7 +46,7 @@
<include name="**/data/**"/>
<include name="**/logs/**"/>
<include name="**/i-am-working-here/**"/>
</fileset>
</fileset>
</delete>
<antcall target="clean-unittest"/>
</target>
Expand Down Expand Up @@ -97,7 +97,7 @@
<tag name="play.todo" scope="all" description="To do:"/>
<tag name="todo" scope="all" description="To do:"/>
<group title="Libs" packages="play.libs.*"/>
<link offline="false" href="https://docs.oracle.com/javase/" />
<link offline="false" href="https://docs.oracle.com/javase/" />
<link offline="false" href="http://commons.apache.org/proper/commons-fileupload/apidocs/" />
<link offline="false" href="https://www.javadoc.io/doc/com.google.code.gson/gson" />
<link offline="false" href="https://docs.jboss.org/hibernate/orm/4.2/javadocs/" />
Expand Down Expand Up @@ -162,7 +162,7 @@
<jvmarg value="-Xrunjdwp:transport=dt_socket,address=${jpda.port},server=y,suspend=n"/>
<jvmarg value="${profiler.info.jvmargs.agent}"/>
<jvmarg value="${jvm.memory}"/>
</java>
</java>
</target>

<target name="nb-run-application">
Expand All @@ -189,7 +189,7 @@
<jvmarg value="-Xdebug"/>
<jvmarg value="-Xrunjdwp:transport=dt_socket,address=${jpda.port},server=y,suspend=n"/>
<jvmarg value="${jvm.memory}"/>
</java>
</java>
</target>

<target name="nb-debug">
Expand Down Expand Up @@ -223,7 +223,7 @@
<jvmarg value="-javaagent:${basedir}/play-${version}.jar" />
<jvmarg value="-Xdebug"/>
<jvmarg value="-Xrunjdwp:transport=dt_socket,address=${jpda.port},server=y,suspend=n"/>
</java>
</java>
</target>

<target name="test-in-nb" depends="test">
Expand All @@ -237,7 +237,7 @@
<include name="**/*.java"/>
</javac>
</target>

<target name="build-test-modules">
<ant antfile="build.xml" target="build" dir="../samples-and-tests/modules/testModule" >
<property name="play.path" value="../../../"/>
Expand All @@ -263,7 +263,7 @@
<echo message="Testing unittests" />

<antcall target="unittest" />

<echo message="Testing development lifecycle (wait ...)" />

<exec executable="${pythonExecutable}" failonerror="true">
Expand Down Expand Up @@ -388,7 +388,7 @@

<target name="compile-unittest" depends="compile">
<mkdir dir="test-classes"/>
<javac encoding="utf-8" srcdir="test-src" destdir="test-classes" debug="true" source="1.8" target="1.8">
<javac encoding="utf-8" srcdir="test-src" destdir="test-classes" debug="true" source="11" target="11">
<classpath refid="classpath.test" />
</javac>
<copy todir="test-classes">
Expand Down Expand Up @@ -421,7 +421,7 @@
</target>

<target name="package" depends="clean,version,jar,javadoc">
<mkdir dir="dist" />
<mkdir dir="dist" />
<zip destfile="dist/play-${version}.zip" comment="Play! ${version}" update="false">
<zipfileset prefix="play-${version}" dir=".." includes="**/*" excludes="**/cobertura.ser,**/*.pyc,hs_err*,.*,.*/*,framework/dist/**,id,play,nbproject/**,**/.bzr/**,**/.git/**,*.bzrignore,support/textmate/**,framework/classes/**,framework/tests-results/**,samples-and-tests/**/test-result,samples-and-tests/**/i-am-working-here,samples-and-tests/**/data,samples-and-tests/**/logs,samples-and-tests/**/tmp,samples-and-tests/**/db,samples-and-tests/**/attachments,modules/**" />
<zipfileset prefix="play-${version}" dir=".." includes="play" filemode="777" />
Expand Down

0 comments on commit ec96e5a

Please sign in to comment.