THRIFT-5553: use newer gradle API (#2561)
Prepare for moving to Gradle 7 by removing use of older Gradle directives
(except the use of maven; the transition to maven-publish is not included here)
diff --git a/tutorial/java/build.xml b/tutorial/java/build.xml
index 55cdb8f..3f83776 100644
--- a/tutorial/java/build.xml
+++ b/tutorial/java/build.xml
@@ -16,22 +16,29 @@
specific language governing permissions and limitations
under the License.
-->
-<project name="tutorial" default="tutorial" basedir=".">
+<project name="tutorial" default="tutorial" basedir="."
+ xmlns:artifact="antlib:org.apache.maven.artifact.ant">
<description>Thrift Java Tutorial</description>
<property name="src" location="src" />
<property name="gen" location="gen-java" />
<property name="build" location="build" />
+ <property file="${basedir}/build.properties"/>
+
+ <!-- the root directory, where you unpack thrift distibution (e.g.: thrift-0.x.x.tar.gz) -->
+ <property name="thrift.dir" location="../.." />
+ <property name="thrift.java.dir" location="${thrift.dir}/lib/java" />
+ <property name="build.tools.dir" location="${thrift.java.dir}/build/tools/"/>
<path id="libs.classpath">
- <fileset dir="../../lib/java/build/libs">
+ <fileset dir="${thrift.java.dir}/build/libs">
<include name="libthrift*.jar" />
<exclude name="libthrift*test.jar" />
<exclude name="libthrift*javadoc.jar" />
<exclude name="libthrift*sources.jar" />
</fileset>
- <fileset dir="../../lib/java/build/deps">
+ <fileset dir="${build}/lib">
<include name="*.jar" />
</fileset>
</path>
@@ -47,11 +54,13 @@
<target name="init">
<tstamp />
+ <mkdir dir="${build.tools.dir}"/>
<mkdir dir="${build}"/>
<mkdir dir="${build}/log"/>
+ <mkdir dir="${build}/lib"/>
</target>
- <target name="compile" depends="init, generate">
+ <target name="compile" depends="init, generate, resolve">
<javac compiler="modern" includeantruntime="false" srcdir="${gen}" destdir="${build}" classpathref="libs.classpath" />
<javac compiler="modern" includeantruntime="false" srcdir="${src}" destdir="${build}" classpathref="build.classpath" />
</target>
@@ -112,4 +121,34 @@
<delete file="tutorial.jar" />
</target>
+ <target name="mvn.ant.tasks.download" depends="init, mvn.ant.tasks.check" unless="mvn.ant.tasks.found">
+ <get src="${mvn.ant.task.url}/${mvn.ant.task.jar}" dest="${build.tools.dir}/${mvn.ant.task.jar}" usetimestamp="true"/>
+ </target>
+
+ <target name="mvn.ant.tasks.check">
+ <condition property="mvn.ant.tasks.found">
+ <typefound uri="antlib:org.apache.maven.artifact.ant" name="artifact"/>
+ </condition>
+ </target>
+
+ <target name="resolve" depends="mvn.ant.tasks.download" unless="mvn.finished">
+ <typedef uri="antlib:org.apache.maven.artifact.ant" classpath="${thrift.java.dir}/build/tools/${mvn.ant.task.jar}"/>
+
+ <artifact:dependencies filesetId="tutorial.dependency.jars">
+ <dependency groupId="org.apache.httpcomponents" artifactId="httpclient" version="4.0.1"/>
+ <dependency groupId="com.googlecode.jslint4java" artifactId="jslint4java-ant" version="1.4.6"/>
+ <dependency groupId="eu.medsea.mimeutil" artifactId="mime-util" version="2.1.3"/>
+ <dependency groupId="javax.annotation" artifactId="javax.annotation-api" version="1.3.2"/>
+ <remoteRepository url="${mvn.repo}"/>
+ </artifact:dependencies>
+
+ <!-- Copy the dependencies to the build/lib dir -->
+ <copy todir="${build}/lib">
+ <fileset refid="tutorial.dependency.jars"/>
+ <mapper type="flatten"/>
+ </copy>
+
+ <property name="mvn.finished" value="true"/>
+ </target>
+
</project>