Deprecation of Apache Ant (#1025)

* Gradle: Use Maven central repository instead of lib folder

Closes #881

* Gradle: Disable doclint for Javadoc tasks

Fixes #1024

* Deprecate Apache Ant

This commit fully deprecates Apache Ant and migrates existing scripts,
etc to use Gradle over Apache Ant.

The build.xml file is not removed, the tasks has been modified to use
gradle via the wrapper to prevent system breakage for some users.

Closes #1022

.travis.yml

@@ -12,8 +12,6 @@ install:
 - pip install --user flake8
 script:
 - gradle build
-- gradle clean
-- ant
 - bin/start.sh
 - flake8 bin
 - docker build -t loklak_server -f docker/Dockerfile .

.utility/push-docs-to-gh-pages.sh

@@ -6,7 +6,7 @@ cp .utility/CNAME $HOME
 
 echo -e "Creating javadoc...\n"
 
-ant javadoc
+./gradlew javadoc
 
 echo -e "Publishing javadoc...\n"
 

bin/.preload.sh

@@ -1,5 +1,6 @@
 #!/usr/bin/env bash
 
+JARFILE="build/libs/loklak_server-all.jar"
 INSTALLATIONCONFIG="data/settings/installation.txt"
 PIDFILE="data/loklak.pid"
 DFAULTCONFIG="conf/config.properties"
@@ -31,20 +32,12 @@ if [ -f $CUSTOMCONFIG ]; then
     if [ -n $j ]; then CUSTOMXmx="$j"; fi;
 fi
 
-CLASSPATH=""
-for N in lib/*.jar; do CLASSPATH="$CLASSPATH$N:"; done
-
-if [ -d "./classes" ]; then
-    CLASSPATH=".:./classes/:$CLASSPATH"
-elif [ -d "./build/classes/main" ]; then
-    CLASSPATH=".:./build/classes/main:$CLASSPATH"
+if [ -f $JARFILE ]; then
+    CLASSPATH="$JARFILE"
 else
     echo "It seems you haven't compile Loklak"
-    echo "You can use either Gradle or Ant to build Loklak"
-    echo "If you want to build with Ant,"
-    echo "$ ant"
-    echo "If you want to build with Gradle,"
-    echo "$ gradle build"
+    echo "To build Loklak,"
+    echo "$ ./gradlew build"
     exit 1
 fi
 
@@ -58,3 +51,4 @@ fi
 export INSTALLATIONCONFIG
 export LOGCONFIG
 export STARTUPFILE
+export CLASSPATH

bin/upgrade.sh

@@ -3,7 +3,7 @@ cd `dirname $0`/..
 echo "loading latest code changes"
 git pull origin master
 echo "clean up"
-ant clean
+./gradlew clean
 echo "building loklak"
-ant
+./gradlew build
 bin/restart.sh

build.gradle

@@ -42,90 +42,91 @@ shadowJar {
     into 'ssi'
   }
 }
-
 assemble.dependsOn shadowJar
 
 repositories {
-  flatDir {
-    dirs 'lib'
-  }
+  mavenCentral()
 }
 
 dependencies {
-  compile name: 'antlr-runtime-3.5'
-  compile name: 'asm-4.1'
-  compile name: 'asm-commons-4.1'
-  compile name: 'bcprov-jdk15on-154'
-  compile name: 'bcpkix-jdk15on-154'
-  compile name: 'boilerpipe-1.2-dev'
-  compile name: 'commons-cli-1.3.1'
-  compile name: 'commons-logging-1.2'
-  compile name: 'compiler-0.8.13'
-  compile name: 'compress-lzf-1.0.2'
-  compile name: 'elasticsearch-2.4.0'
-  compile name: 'groovy-all-2.4.4-indy'
-  compile name: 'guava-18.0'
-  compile name: 'hamcrest-core-1.3'
-  compile name: 'HdrHistogram-2.1.6'
-  compile name: 'hppc-0.7.1'
-  compile name: 'httpclient-4.5.2'
-  compile name: 'httpcore-4.4.4'
-  compile name: 'httpmime-4.5.2'
-  compile name: 'jackson-core-2.8.1'
-  compile name: 'jackson-dataformat-cbor-2.8.1'
-  compile name: 'jackson-dataformat-smile-2.8.1'
-  compile name: 'jackson-dataformat-yaml-2.8.1'
-  compile name: 'javax.mail-1.5.5'
-  compile name: 'javax.servlet-api-3.1.0'
-  compile name: 'jcommon-1.0.18'
-  compile name: 'jdom-1.1.3'
-  compile name: 'jetty-http-9.3.11.v20160721'
-  compile name: 'jetty-io-9.3.11.v20160721'
-  compile name: 'jetty-rewrite-9.3.11.v20160721'
-  compile name: 'jetty-security-9.3.11.v20160721'
-  compile name: 'jetty-server-9.3.11.v20160721'
-  compile name: 'jetty-servlet-9.3.11.v20160721'
-  compile name: 'jetty-servlets-9.3.11.v20160721'
-  compile name: 'jetty-util-9.3.11.v20160721'
-  compile name: 'jetty-webapp-9.3.11.v20160721'
-  compile name: 'jfreechart-1.0.19'
-  compile name: 'jna-4.1.0'
-  compile name: 'joda-convert-1.2'
-  compile name: 'joda-time-2.9.4'
-  compile name: 'json-schema-validator-2.2.6-lib'
-  compile name: 'jsoup-1.9.2'
-  compile name: 'jsr166e-1.1.0'
-  compile name: 'jts-1.13'
-  compile name: 'junit-4.12'
-  compile name: 'log4j-1.2-api-2.6.2'
-  compile name: 'log4j-api-2.6.2'
-  compile name: 'log4j-core-2.6.2'
-  compile name: 'log4j-slf4j-impl-2.6.2'
-  compile name: 'lucene-analyzers-common-5.5.2'
-  compile name: 'lucene-backward-codecs-5.5.2'
-  compile name: 'lucene-core-5.5.2'
-  compile name: 'lucene-grouping-5.5.2'
-  compile name: 'lucene-highlighter-5.5.2'
-  compile name: 'lucene-join-5.5.2'
-  compile name: 'lucene-memory-5.5.2'
-  compile name: 'lucene-misc-5.5.2'
-  compile name: 'lucene-queries-5.5.2'
-  compile name: 'lucene-queryparser-5.5.2'
-  compile name: 'lucene-sandbox-5.5.2'
-  compile name: 'lucene-spatial-5.5.2'
-  compile name: 'lucene-spatial3d-5.5.2'
-  compile name: 'lucene-suggest-5.5.2'
-  compile name: 'nekohtml-1.9.17'
-  compile name: 'netty-3.10.6.Final'
-  compile name: 'rome-1.0'
-  compile name: 'securesm-1.0'
-  compile name: 'slf4j-api-1.7.21'
-  compile name: 'snakeyaml-1.15'
-  compile name: 'spatial4j-0.5'
-  compile name: 't-digest-3.0'
-  compile name: 'twitter4j-core-4.0.2'
-  compile name: 'twitter4j-stream-4.0.2'
-  compile name: 'xerces-2.9.1'
+  compile group: 'org.antlr', name: 'antlr-runtime', version: '3.5'
+  compile group: 'org.ow2.asm', name: 'asm', version: '4.1'
+  compile group: 'org.ow2.asm', name: 'asm-commons', version: '4.1'
+  compile group: 'org.bouncycastle', name: 'bcprov-jdk15on', version: '1.54'
+  compile group: 'org.bouncycastle', name: 'bcpkix-jdk15on', version: '1.54'
+  compile group: 'com.robbypond', name: 'boilerpipe', version: '1.2.3'
+  compile group: 'commons-cli', name: 'commons-cli', version: '1.3.1'
+  compile group: 'commons-logging', name: 'commons-logging', version: '1.2'
+  compile group: 'com.github.spullara.mustache.java', name: 'compiler', version: '0.8.13'
+  compile group: 'com.ning', name: 'compress-lzf', version: '1.0.2'
+  compile group: 'org.elasticsearch', name: 'elasticsearch', version: '2.4.0'
+  compile group: 'org.codehaus.groovy', name: 'groovy-all', version: '2.4.4'
+  compile group: 'com.google.guava', name: 'guava', version: '18.0'
+  compile group: 'org.hamcrest', name: 'hamcrest-core', version: '1.3'
+  compile group: 'org.hdrhistogram', name: 'HdrHistogram', version: '2.1.6'
+  compile group: 'com.carrotsearch', name: 'hppc', version: '0.7.1'
+  compile group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.5.2'
+  compile group: 'org.apache.httpcomponents', name: 'httpcore', version: '4.4.4'
+  compile group: 'org.apache.httpcomponents', name: 'httpmime', version: '4.5.2'
+  compile group: 'com.fasterxml.jackson.core', name: 'jackson-core', version: '2.8.1'
+  compile group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-cbor', version: '2.8.1'
+  compile group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-smile', version: '2.8.1'
+  compile group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-yaml', version: '2.8.1'
+  compile group: 'com.sun.mail', name: 'javax.mail', version: '1.5.5'
+  compile group: 'javax.servlet', name: 'javax.servlet-api', version: '3.1.0'
+  compile group: 'net.sf.jcommon', name: 'jcommon', version: '1.0.1'
+  compile group: 'org.jdom', name: 'jdom', version: '1.1.3'
+  compile group: 'org.eclipse.jetty', name: 'jetty-http', version: '9.3.11.v20160721'
+  compile group: 'org.eclipse.jetty', name: 'jetty-io', version: '9.3.11.v20160721'
+  compile group: 'org.eclipse.jetty', name: 'jetty-rewrite', version: '9.3.11.v20160721'
+  compile group: 'org.eclipse.jetty', name: 'jetty-security', version: '9.3.11.v20160721'
+  compile group: 'org.eclipse.jetty', name: 'jetty-server', version: '9.3.11.v20160721'
+  compile group: 'org.eclipse.jetty', name: 'jetty-servlet', version: '9.3.11.v20160721'
+  compile group: 'org.eclipse.jetty', name: 'jetty-servlets', version: '9.3.11.v20160721'
+  compile group: 'org.eclipse.jetty', name: 'jetty-util', version: '9.3.11.v20160721'
+  compile group: 'org.eclipse.jetty', name: 'jetty-webapp', version: '9.3.11.v20160721'
+  compile group: 'org.jfree', name: 'jfreechart', version: '1.0.19'
+  compile group: 'net.java.dev.jna', name: 'jna', version: '4.1.0'
+  compile group: 'org.joda', name: 'joda-convert', version: '1.2'
+  compile group: 'joda-time', name: 'joda-time', version: '2.9.4'
+  compile group: 'com.github.fge', name: 'json-schema-validator', version: '2.2.6'
+  compile group: 'org.jsoup', name: 'jsoup', version: '1.9.2'
+  compile group: 'com.twitter', name: 'jsr166e', version: '1.1.0'
+  compile group: 'com.vividsolutions', name: 'jts', version: '1.13'
+  compile group: 'junit', name: 'junit', version: '4.12'
+  compile group: 'org.apache.logging.log4j', name: 'log4j-1.2-api', version: '2.6.2'
+  compile group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.6.2'
+  compile group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.6.2'
+  compile group: 'org.apache.logging.log4j', name: 'log4j-slf4j-impl', version: '2.6.2'
+  compile group: 'org.apache.lucene', name: 'lucene-analyzers-common', version: '5.5.2'
+  compile group: 'org.apache.lucene', name: 'lucene-backward-codecs', version: '5.5.2'
+  compile group: 'org.apache.lucene', name: 'lucene-core', version: '5.5.2'
+  compile group: 'org.apache.lucene', name: 'lucene-grouping', version: '5.5.2'
+  compile group: 'org.apache.lucene', name: 'lucene-highlighter', version: '5.5.2'
+  compile group: 'org.apache.lucene', name: 'lucene-join', version: '5.5.2'
+  compile group: 'org.apache.lucene', name: 'lucene-memory', version: '5.5.2'
+  compile group: 'org.apache.lucene', name: 'lucene-misc', version: '5.5.2'
+  compile group: 'org.apache.lucene', name: 'lucene-queries', version: '5.5.2'
+  compile group: 'org.apache.lucene', name: 'lucene-queryparser', version: '5.5.2'
+  compile group: 'org.apache.lucene', name: 'lucene-sandbox', version: '5.5.2'
+  compile group: 'org.apache.lucene', name: 'lucene-spatial', version: '5.5.2'
+  compile group: 'org.apache.lucene', name: 'lucene-spatial3d', version: '5.5.2'
+  compile group: 'org.apache.lucene', name: 'lucene-suggest', version: '5.5.2'
+  compile group: 'net.sourceforge.nekohtml', name: 'nekohtml', version: '1.9.17'
+  compile group: 'io.netty', name: 'netty', version: '3.10.6.Final'
+  compile group: 'rome', name: 'rome', version: '1.0'
+  compile group: 'org.elasticsearch', name: 'securesm', version: '1.0'
+  compile group: 'org.slf4j', name: 'slf4j-api', version: '1.7.21'
+  compile group: 'org.yaml', name: 'snakeyaml', version: '1.15'
+  compile group: 'com.spatial4j', name: 'spatial4j', version: '0.5'
+  compile group: 'com.tdunning', name: 't-digest', version: '3.0'
+  compile group: 'org.twitter4j', name: 'twitter4j-core', version: '4.0.2'
+  compile group: 'org.twitter4j', name: 'twitter4j-stream', version: '4.0.2'
+  compile group: 'xerces', name: 'xerces', version: '2.4.0'
+}
+
+tasks.withType(Javadoc) {
+  options.addBooleanOption('Xdoclint:none', true)
 }
 
 task setup(type: JavaExec, dependsOn: classes) {

build.xml

@@ -1,69 +1,77 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <project basedir="." default="build" name="loklak">
-    <property environment="env"/>
-    <property name="target" value="1.8"/>
-    <property name="source" value="1.8"/>
-    <path id="loklak.classpath">
-        <pathelement location="classes"/>
-        <fileset dir="lib">
-            <include name="**/*.jar"/>
-        </fileset>
-    </path>
+
+    <condition property="windows">
+        <os family="windows"/>
+    </condition>
+
+    <condition property="nix">
+        <os family="unix"/>
+    </condition>
 
-    <target name="init">
-        <copy includeemptydirs="false" todir="classes">
-            <fileset dir="src">
-                <exclude name="**/*.launch"/>
-                <exclude name="**/*.java"/>
-            </fileset>
-        </copy>
+    <target name="set-exec-win" if="windows">
+        <property name="gradlew-path"
+                  location="./gradlew.bat"/>
+        <echo message="It's a Windows system, gradlew-path has been set to ${gradlew-path} "/>
+    </target>
+
+    <target name="set-exec-nix" if="nix">
+        <property name="gradlew-path"
+                  location="./gradlew"/>
+        <echo message="It's a UNIX system, gradlew-path has been set to ${gradlew-path} "/>
+    </target>
+
+    <target depends="set-exec-win, set-exec-nix" name="init">
+        <echo>
+            ======================================================
+            -- ATTENTION --
+
+            THE ANT BUILD SYSTEM IS DEPRECATED - PLEASE USE GRADLE
+
+            TO BUILD WITH GRADLE WITHOUT HAVING TO INSTALL IT RUN
+            $ ./gradlew build
+
+            THIS BUILD SCRIPT WILL USE GRADLE VIA EXEC
+
+            THANK YOU
+            ======================================================
+	</echo>
     </target>
 
-    <target name="clean">
-        <delete dir="classes"/>
-        <delete dir="html/javadoc"/>
+    <target depends="init" name="clean">
+        <exec executable="${gradlew-path}">
+            <arg value="clean"/>
+        </exec>
     </target>
 
     <target depends="init" name="build">
-        <delete dir="classes"/>
-        <mkdir dir="classes"/>
-        <echo message="${ant.project.name}: ${ant.file}"/>
-        <javac debug="true" destdir="classes" includeantruntime="false" source="${source}" target="${target}" encoding="UTF-8">
-            <src path="src"/>
-            <classpath refid="loklak.classpath"/>
-        </javac>
+        <exec executable="${gradlew-path}">
+            <arg value="build"/>
+        </exec>
+        <copy todir="classes">
+            <fileset dir="build/classes"/>
+        </copy>
     </target>
 
     <target name="javadoc" depends="init" description="make javadoc">
-        <delete dir="html/javadoc"/>
-        <javadoc destdir="html/javadoc" windowtitle="loklak javadoc" encoding="UTF-8" charset="UTF-8" access="private">
-            <classpath refid="loklak.classpath"/>
-            <fileset dir="src">
-                <include name="**/*.java"/>
-            </fileset>
-        </javadoc>
+        <exec executable="${gradlew-path}">
+            <arg value="javadoc"/>
+        </exec>
     </target>
 
     <target depends="build,javadoc" name="all"/>
 
     <target name="start">
-        <java classname="org.loklak.Main" failonerror="true" fork="yes">
-            <jvmarg line="-ea"/>
-            <classpath refid="loklak.classpath"/>
-        </java>
+        <exec executable="${gradlew-path}">
+            <arg value="start"/>
+        </exec>
     </target>
 
     <target name="jar" depends="build">
         <mkdir dir="dist"/>
-	    <manifestclasspath property="jar.classpath" jarfile="dist/loklak.jar">
-		    <classpath refid="loklak.classpath" />
-	    </manifestclasspath>
-	    <jar destfile="dist/loklak.jar" basedir="classes/">
-		    <manifest>
-			    <attribute name="Class-Path" value="${jar.classpath}" />
-			    <attribute name="Main-Class" value="org.loklak.LoklakServer" />
-		    </manifest>
-	    </jar>
+        <copy todir="dist">
+            <fileset dir="build/libs"/>
+        </copy>
     </target>
 
 </project>

cloud9-setup.sh

@@ -1,8 +1,8 @@
 sudo apt-get update
-sudo apt-get install -y ant openjdk-8-jdk; git clone https://github.com/loklak/loklak_server.git loklak_server
+sudo apt-get install -y openjdk-8-jdk; git clone https://github.com/loklak/loklak_server.git loklak_server
 cd loklak_server;
 sed -i.bak 's/^\(port.http=\).*/\180/'                conf/config.properties
 sed -i.bak 's/^\(port.https=\).*/\1443/'              conf/config.properties
 sed -i.bak 's/^\(upgradeInterval=\).*/\186400000000/' conf/config.properties
-ant
+./gradlew build
 bin/start.sh

docker/Dockerfile

@@ -11,21 +11,23 @@ EXPOSE 80 443
 ADD bin /loklak_server/bin/
 ADD conf /loklak_server/conf/
 ADD src /loklak_server/src/
-ADD lib /loklak_server/lib/
 ADD html /loklak_server/html/
 ADD installation /loklak_server/installation/
 ADD ssi /loklak_server/ssi/
-ADD build.xml /loklak_server/
+ADD gradle /loklak_server/gradle/
+ADD gradlew /loklak_server/
+ADD build.gradle /loklak_server/
+ADD settings.gradle /loklak_server/
 
 # install OpenJDK 8 JDK, Ant, and Bash
-RUN apk update && apk add openjdk8 apache-ant git bash && \
+RUN apk update && apk add openjdk8 git bash && \
     # compile loklak
-    cd /loklak_server && ant && \
+    cd /loklak_server && ./gradlew build && \
     # change config file
     sed -i 's/^\(port.http=\).*/\180/;s/^\(port.https=\).*/\1443/;s/^\(upgradeInterval=\).*/\186400000000/' \
         conf/config.properties && \
     # remove OpenJDK 8 JDK and Ant
-    apk del openjdk8 apache-ant git && \
+    apk del openjdk8 git && \
     # install OpenJDK 8 JRE without GUI support
     apk add openjdk8-jre-base