diff --git a/dev-java/joda-time/Manifest b/dev-java/joda-time/Manifest
index 4ecfc932224e8..c5d994c41bd17 100644
--- a/dev-java/joda-time/Manifest
+++ b/dev-java/joda-time/Manifest
@@ -1,4 +1 @@
-DIST joda-time-1.6-src.tar.gz 1270950 SHA256 4dc645d2ef3c19eebdb388cf22d27fa1c51abcfae87f48f12e2477a91207f92f SHA512 30c1cf558b8dfce67de357dec72c6d64358639f83999eae4f637e436e2e1a4870d09fd4ff86547ece992e49d96fc5113d44cc1dceed910c4de9a65ebc1075c01 WHIRLPOOL fae630d09e01b058e95ebbbceb0f1725580171e0746135dab35f247d1455c712f4f4f6fde7e6edf2cb578cc94fae6b87c202ce581675809b054d05ebcd5c0037
-DIST joda-time-2.2-dist.tar.gz 4397101 SHA256 1cf6176f222f0155b20693dc2a9939e10c766d986d68b144e30f446772596c48 SHA512 8a67b420b4cd179bd80166c930efdf9e32b4813b431329dae7844a078c23688220130c8466993aae4a865bf01e593a8e22b992726d9a1fe64eb0b6f911197f10 WHIRLPOOL 4afb42425e72deaaf25067810538191b6fec1c8e7a214c2230ca98a445d7c5134d881d62bcc9d6b4eedd4776803dcf32a734c8d5c24acd169101a7197d924c57
-DIST joda-time-2.3-dist.tar.gz 3440289 SHA256 f27acf5361e50e0560b349aecf3211e6265b4546d3de0362583390c18cbf4c57 SHA512 b20b0c77878971af99a2e60f01ca73510d4244fc4a069d21a657c79bd3ec482494edd3945c6a98e5313e41e53ede51f1cc98a5396f97e3c3775659a982c0fa0c WHIRLPOOL 6c9c6fe1a4e06e7634a34864f85a70024ddf058c8c3d1a33d83285b1fcee57fc122ce0615e1bca0d15d0387841b91565591a533bcf61a5679a4b69c2efe2c949
 DIST joda-time-2.7-dist.tar.gz 4007765 SHA256 6f29f22ff88d39d988c600f1e274e7a59c451184d7d6d400e2ddb9e4bbb2ceeb SHA512 2a9bf91024bf20c4f1a28c87e5c6e560994ba6f7e131757c83a5ab6984ea79549e1d00452dcf767fc5cab374e531649759703acbaed724a1e49436cae0799209 WHIRLPOOL eb2f91d5bbff641495d3a7763872321718415e49c8adb864805a84a73c583ee562f145821621ffd38ce1b41a813a15f4dcf609c5130b7557ef4d5e9fed86b17f
diff --git a/dev-java/joda-time/files/1.5.1-ecj.patch b/dev-java/joda-time/files/1.5.1-ecj.patch
deleted file mode 100644
index 79f3f7863a76e..0000000000000
--- a/dev-java/joda-time/files/1.5.1-ecj.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -ur joda-time-1.5.1-src.old/src/test/org/joda/time/convert/MockUnknownCalendar.java joda-time-1.5.1-src/src/test/org/joda/time/convert/MockUnknownCalendar.java
---- joda-time-1.5.1-src.old/src/test/org/joda/time/convert/MockUnknownCalendar.java	2007-12-21 00:43:52.000000000 +0200
-+++ joda-time-1.5.1-src/src/test/org/joda/time/convert/MockUnknownCalendar.java	2007-12-21 00:46:42.000000000 +0200
-@@ -34,7 +34,10 @@
-     MockUnknownCalendar(TimeZone zone) {
-         this.zone = zone;
-     }
--    
-+
-+    public int compareTo(Object o) {
-+        return super.compareTo((Calendar) o);
-+    }
-     public long getTimeInMillis() {
-         return millis;
-     }
diff --git a/dev-java/joda-time/files/joda-time-2.2-build.xml b/dev-java/joda-time/files/joda-time-2.2-build.xml
deleted file mode 100644
index c90c2273e3ee3..0000000000000
--- a/dev-java/joda-time/files/joda-time-2.2-build.xml
+++ /dev/null
@@ -1,270 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- ====================================================================== -->
-<!-- Ant build file (http://ant.apache.org/) for Ant 1.6.2 or above.        -->
-<!-- ====================================================================== -->
-
-<!-- ====================================================================== -->
-<!-- ===================== - DO NOT EDIT THIS FILE! - ===================== -->
-<!-- ====================================================================== -->
-<!--                                                                        -->
-<!-- Any modifications will be overwritten.                                 -->
-<!--                                                                        -->
-<!-- Generated by Maven Ant Plugin on 5/9/13 4:05 PM                        -->
-<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/                 -->
-<!--                                                                        -->
-<!-- ====================================================================== -->
-
-<project name="joda-time-from-maven" default="package" basedir=".">
-
-  <!-- ====================================================================== -->
-  <!-- Build environment properties                                           -->
-  <!-- ====================================================================== -->
-
-  <property file="${user.home}/.m2/maven.properties"/>
-  <property file="maven-build.properties"/>
-
-  <property name="maven.build.finalName" value="joda-time-2.2"/>
-  <property name="maven.build.dir" value="target"/>
-  <property name="maven.build.outputDir" value="${maven.build.dir}/classes"/>
-  <property name="maven.build.srcDir.0" value="src/main/java"/>
-  <property name="maven.build.resourceDir.0" value="src/main/resources"/>
-  <property name="maven.build.resourceDir.1" value="."/>
-  <property name="maven.build.resourceDir.2" value="src/main/java"/>
-  <property name="maven.build.testOutputDir" value="${maven.build.dir}/test-classes"/>
-  <property name="maven.build.testDir.0" value="src/test/java"/>
-  <property name="maven.build.testResourceDir.0" value="src/test/resources"/>
-  <property name="maven.test.reports" value="${maven.build.dir}/test-reports"/>
-  <property name="maven.reporting.outputDirectory" value="${maven.build.dir}/site"/>
-
-  <property name="maven.repo.local" value="${user.home}/.m2/repository"/>
-  <property name="maven.settings.offline" value="false"/>
-  <property name="maven.settings.interactiveMode" value="true"/>
-
-  <!-- ====================================================================== -->
-  <!-- Defining classpaths                                                    -->
-  <!-- ====================================================================== -->
-
-  <path id="build.classpath">
-    <pathelement location="${maven.repo.local}/org/joda/joda-convert/1.2/joda-convert-1.2.jar"/>
-  </path>
-  <path id="build.test.classpath">
-    <pathelement location="${maven.repo.local}/org/joda/joda-convert/1.2/joda-convert-1.2.jar"/>
-    <pathelement location="${maven.repo.local}/junit/junit/3.8.2/junit-3.8.2.jar"/>
-  </path>
-
-  <!-- ====================================================================== -->
-  <!-- Cleaning up target                                                     -->
-  <!-- ====================================================================== -->
-
-  <target name="clean" description="Clean the output directory">
-    <delete dir="${maven.build.dir}"/>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Compilation target                                                     -->
-  <!-- ====================================================================== -->
-
-  <target name="compile" depends="get-deps" description="Compile the code">
-    <mkdir dir="${maven.build.outputDir}"/>
-    <javac destdir="${maven.build.outputDir}" 
-           nowarn="false" 
-           debug="true" 
-           optimize="true" 
-           deprecation="false" 
-           target="1.5" 
-           verbose="true" 
-           fork="true" 
-           source="1.5">
-      <src>
-        <pathelement location="${maven.build.srcDir.0}"/>
-      </src>
-      <classpath refid="build.classpath"/>
-    </javac>
-    <mkdir dir="${maven.build.outputDir}/META-INF"/>
-    <copy todir="${maven.build.outputDir}/META-INF">
-      <fileset dir="${maven.build.resourceDir.1}">
-        <include name="LICENSE.txt"/>
-        <include name="NOTICE.txt"/>
-      </fileset>
-    </copy>
-    <mkdir dir="${maven.build.outputDir}/."/>
-    <copy todir="${maven.build.outputDir}/.">
-      <fileset dir="${maven.build.resourceDir.2}">
-        <include name="org/joda/time/tz/data/**"/>
-        <include name="**/*.properties"/>
-      </fileset>
-    </copy>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Test-compilation target                                                -->
-  <!-- ====================================================================== -->
-
-  <target name="compile-tests" 
-          depends="compile" 
-          description="Compile the test code" 
-          unless="maven.test.skip">
-    <mkdir dir="${maven.build.testOutputDir}"/>
-    <javac destdir="${maven.build.testOutputDir}" 
-           nowarn="false" 
-           debug="true" 
-           optimize="true" 
-           deprecation="false" 
-           target="1.5" 
-           verbose="true" 
-           fork="true" 
-           source="1.5">
-      <src>
-        <pathelement location="${maven.build.testDir.0}"/>
-      </src>
-      <classpath>
-        <path refid="build.test.classpath"/>
-        <pathelement location="${maven.build.outputDir}"/>
-      </classpath>
-    </javac>
-    <copy todir="${maven.build.testOutputDir}">
-      <fileset dir="${maven.build.testResourceDir.0}"/>
-    </copy>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Run all tests                                                          -->
-  <!-- ====================================================================== -->
-
-  <target name="test" 
-          depends="compile-tests, junit-missing" 
-          unless="junit.skipped" 
-          description="Run the test cases">
-    <mkdir dir="${maven.test.reports}"/>
-    <junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir=".">
-      <sysproperty key="basedir" value="."/>
-      <formatter type="xml"/>
-      <formatter type="plain" usefile="false"/>
-      <classpath>
-        <path refid="build.test.classpath"/>
-        <pathelement location="${maven.build.outputDir}"/>
-        <pathelement location="${maven.build.testOutputDir}"/>
-      </classpath>
-      <batchtest todir="${maven.test.reports}" unless="test">
-        <fileset dir="${maven.build.testDir.0}">
-          <include name="**/TestAllPackages.java"/>
-          <exclude name="**/*Abstract*Test.java"/>
-        </fileset>
-      </batchtest>
-      <batchtest todir="${maven.test.reports}" if="test">
-        <fileset dir="${maven.build.testDir.0}">
-          <include name="**/${test}.java"/>
-          <exclude name="**/*Abstract*Test.java"/>
-        </fileset>
-      </batchtest>
-    </junit>
-  </target>
-
-  <target name="test-junit-present">
-    <available classname="junit.framework.Test" property="junit.present"/>
-  </target>
-
-  <target name="test-junit-status" 
-          depends="test-junit-present">
-    <condition property="junit.missing">
-      <and>
-        <isfalse value="${junit.present}"/>
-        <isfalse value="${maven.test.skip}"/>
-      </and>
-    </condition>
-    <condition property="junit.skipped">
-      <or>
-        <isfalse value="${junit.present}"/>
-        <istrue value="${maven.test.skip}"/>
-      </or>
-    </condition>
-  </target>
-
-  <target name="junit-missing" 
-          depends="test-junit-status" 
-          if="junit.missing">
-    <echo>=================================== WARNING ===================================</echo>
-    <echo> JUnit is not present in your $ANT_HOME/lib directory. Tests not executed.</echo>
-    <echo>===============================================================================</echo>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Javadoc target                                                         -->
-  <!-- ====================================================================== -->
-
-  <target name="javadoc" description="Generates the Javadoc of the application">
-    <javadoc sourcepath="${maven.build.srcDir.0}" 
-             packagenames="*" 
-             destdir="${maven.reporting.outputDirectory}/apidocs" 
-             access="protected" 
-             old="false" 
-             verbose="false" 
-             encoding="UTF-8" 
-             version="true" 
-             use="true" 
-             author="true" 
-             splitindex="false" 
-             nodeprecated="false" 
-             nodeprecatedlist="false" 
-             notree="false" 
-             noindex="false" 
-             nohelp="false" 
-             nonavbar="false" 
-             serialwarn="false" 
-             charset="ISO-8859-1" 
-             linksource="true" 
-             breakiterator="false">
-      <link href="http://download.oracle.com/javase/1.5.0/docs/api/"/>
-      <group title="User packages"/>
-      <group title="Implementation packages"/>
-    </javadoc>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Package target                                                         -->
-  <!-- ====================================================================== -->
-
-  <target name="package" depends="compile,test" description="Package the application">
-    <jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar" 
-         compress="true" 
-         index="false" 
-         manifest="src/conf/MANIFEST.MF" 
-         basedir="${maven.build.outputDir}" 
-         excludes="**/package.html"/>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- A dummy target for the package named after the type it creates         -->
-  <!-- ====================================================================== -->
-
-  <target name="jar" depends="package" description="Builds the jar for the application"/>
-
-  <!-- ====================================================================== -->
-  <!-- Download dependencies target                                           -->
-  <!-- ====================================================================== -->
-
-  <target name="test-offline">
-    <condition property="maven.mode.offline">
-      <equals arg1="${maven.settings.offline}" arg2="true"/>
-    </condition>
-  </target>
-
-  <target name="get-deps" 
-          depends="test-offline" 
-          description="Download all dependencies" 
-          unless="maven.mode.offline">
-    <mkdir dir="${maven.repo.local}"/>
-    <mkdir dir="${maven.repo.local}/org/joda/joda-convert/1.2"/>
-    <get src="http://repo.maven.apache.org/maven2/org/joda/joda-convert/1.2/joda-convert-1.2.jar" 
-         dest="${maven.repo.local}/org/joda/joda-convert/1.2/joda-convert-1.2.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <mkdir dir="${maven.repo.local}/junit/junit/3.8.2"/>
-    <get src="http://repo.maven.apache.org/maven2/junit/junit/3.8.2/junit-3.8.2.jar" 
-         dest="${maven.repo.local}/junit/junit/3.8.2/junit-3.8.2.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-  </target>
-
-</project>
diff --git a/dev-java/joda-time/files/joda-time-2.3-build.xml b/dev-java/joda-time/files/joda-time-2.3-build.xml
deleted file mode 100644
index 5327843a0b9d2..0000000000000
--- a/dev-java/joda-time/files/joda-time-2.3-build.xml
+++ /dev/null
@@ -1,267 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- ====================================================================== -->
-<!-- Ant build file (http://ant.apache.org/) for Ant 1.6.2 or above.        -->
-<!-- ====================================================================== -->
-
-<!-- ====================================================================== -->
-<!-- ===================== - DO NOT EDIT THIS FILE! - ===================== -->
-<!-- ====================================================================== -->
-<!--                                                                        -->
-<!-- Any modifications will be overwritten.                                 -->
-<!--                                                                        -->
-<!-- Generated by Maven Ant Plugin on 1/25/14 5:06 AM                       -->
-<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/                 -->
-<!--                                                                        -->
-<!-- ====================================================================== -->
-
-<project name="joda-time-from-maven" default="package" basedir=".">
-
-  <!-- ====================================================================== -->
-  <!-- Build environment properties                                           -->
-  <!-- ====================================================================== -->
-
-  <property file="${user.home}/.m2/maven.properties"/>
-  <property file="maven-build.properties"/>
-
-  <property name="maven.build.finalName" value="joda-time-2.3"/>
-  <property name="maven.build.dir" value="target"/>
-  <property name="maven.build.outputDir" value="${maven.build.dir}/classes"/>
-  <property name="maven.build.srcDir.0" value="src/main/java"/>
-  <property name="maven.build.resourceDir.0" value="."/>
-  <property name="maven.build.resourceDir.1" value="src/main/java"/>
-  <property name="maven.build.testOutputDir" value="${maven.build.dir}/test-classes"/>
-  <property name="maven.build.testDir.0" value="src/test/java"/>
-  <property name="maven.build.testResourceDir.0" value="src/test/resources"/>
-  <property name="maven.test.reports" value="${maven.build.dir}/test-reports"/>
-  <property name="maven.reporting.outputDirectory" value="${maven.build.dir}/site"/>
-
-  <property name="maven.repo.local" value="${user.home}/.m2/repository"/>
-  <property name="maven.settings.offline" value="false"/>
-  <property name="maven.settings.interactiveMode" value="true"/>
-
-  <!-- ====================================================================== -->
-  <!-- Defining classpaths                                                    -->
-  <!-- ====================================================================== -->
-
-  <path id="build.classpath">
-    <pathelement location="${maven.repo.local}/org/joda/joda-convert/1.2/joda-convert-1.2.jar"/>
-  </path>
-  <path id="build.test.classpath">
-    <pathelement location="${maven.repo.local}/org/joda/joda-convert/1.2/joda-convert-1.2.jar"/>
-    <pathelement location="${maven.repo.local}/junit/junit/3.8.2/junit-3.8.2.jar"/>
-  </path>
-
-  <!-- ====================================================================== -->
-  <!-- Cleaning up target                                                     -->
-  <!-- ====================================================================== -->
-
-  <target name="clean" description="Clean the output directory">
-    <delete dir="${maven.build.dir}"/>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Compilation target                                                     -->
-  <!-- ====================================================================== -->
-
-  <target name="compile" depends="get-deps" description="Compile the code">
-    <mkdir dir="${maven.build.outputDir}"/>
-    <javac destdir="${maven.build.outputDir}" 
-           nowarn="false" 
-           debug="true" 
-           optimize="true" 
-           deprecation="false" 
-           target="1.5" 
-           verbose="true" 
-           fork="true" 
-           source="1.5">
-      <src>
-        <pathelement location="${maven.build.srcDir.0}"/>
-      </src>
-      <classpath refid="build.classpath"/>
-    </javac>
-    <mkdir dir="${maven.build.outputDir}/META-INF"/>
-    <copy todir="${maven.build.outputDir}/META-INF">
-      <fileset dir="${maven.build.resourceDir.0}">
-        <include name="LICENSE.txt"/>
-        <include name="NOTICE.txt"/>
-      </fileset>
-    </copy>
-    <copy todir="${maven.build.outputDir}">
-      <fileset dir="${maven.build.resourceDir.1}">
-        <include name="**/*.properties"/>
-      </fileset>
-    </copy>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Test-compilation target                                                -->
-  <!-- ====================================================================== -->
-
-  <target name="compile-tests" 
-          depends="compile" 
-          description="Compile the test code" 
-          unless="maven.test.skip">
-    <mkdir dir="${maven.build.testOutputDir}"/>
-    <javac destdir="${maven.build.testOutputDir}" 
-           nowarn="false" 
-           debug="true" 
-           optimize="true" 
-           deprecation="false" 
-           target="1.5" 
-           verbose="true" 
-           fork="true" 
-           source="1.5">
-      <src>
-        <pathelement location="${maven.build.testDir.0}"/>
-      </src>
-      <classpath>
-        <path refid="build.test.classpath"/>
-        <pathelement location="${maven.build.outputDir}"/>
-      </classpath>
-    </javac>
-    <copy todir="${maven.build.testOutputDir}">
-      <fileset dir="${maven.build.testResourceDir.0}"/>
-    </copy>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Run all tests                                                          -->
-  <!-- ====================================================================== -->
-
-  <target name="test" 
-          depends="compile-tests, junit-missing" 
-          unless="junit.skipped" 
-          description="Run the test cases">
-    <mkdir dir="${maven.test.reports}"/>
-    <junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir=".">
-      <sysproperty key="basedir" value="."/>
-      <formatter type="xml"/>
-      <formatter type="plain" usefile="false"/>
-      <classpath>
-        <path refid="build.test.classpath"/>
-        <pathelement location="${maven.build.outputDir}"/>
-        <pathelement location="${maven.build.testOutputDir}"/>
-      </classpath>
-      <batchtest todir="${maven.test.reports}" unless="test">
-        <fileset dir="${maven.build.testDir.0}">
-          <include name="**/TestAllPackages.java"/>
-          <exclude name="**/*Abstract*Test.java"/>
-        </fileset>
-      </batchtest>
-      <batchtest todir="${maven.test.reports}" if="test">
-        <fileset dir="${maven.build.testDir.0}">
-          <include name="**/${test}.java"/>
-          <exclude name="**/*Abstract*Test.java"/>
-        </fileset>
-      </batchtest>
-    </junit>
-  </target>
-
-  <target name="test-junit-present">
-    <available classname="junit.framework.Test" property="junit.present"/>
-  </target>
-
-  <target name="test-junit-status" 
-          depends="test-junit-present">
-    <condition property="junit.missing">
-      <and>
-        <isfalse value="${junit.present}"/>
-        <isfalse value="${maven.test.skip}"/>
-      </and>
-    </condition>
-    <condition property="junit.skipped">
-      <or>
-        <isfalse value="${junit.present}"/>
-        <istrue value="${maven.test.skip}"/>
-      </or>
-    </condition>
-  </target>
-
-  <target name="junit-missing" 
-          depends="test-junit-status" 
-          if="junit.missing">
-    <echo>=================================== WARNING ===================================</echo>
-    <echo> JUnit is not present in your $ANT_HOME/lib directory. Tests not executed.</echo>
-    <echo>===============================================================================</echo>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Javadoc target                                                         -->
-  <!-- ====================================================================== -->
-
-  <target name="javadoc" description="Generates the Javadoc of the application">
-    <javadoc sourcepath="${maven.build.srcDir.0}" 
-             packagenames="*" 
-             destdir="${maven.reporting.outputDirectory}/apidocs" 
-             access="protected" 
-             old="false" 
-             verbose="false" 
-             encoding="UTF-8" 
-             version="true" 
-             use="true" 
-             author="true" 
-             splitindex="false" 
-             nodeprecated="false" 
-             nodeprecatedlist="false" 
-             notree="false" 
-             noindex="false" 
-             nohelp="false" 
-             nonavbar="false" 
-             serialwarn="false" 
-             charset="ISO-8859-1" 
-             linksource="true" 
-             breakiterator="false">
-      <link href="http://download.oracle.com/javase/1.5.0/docs/api/"/>
-      <group title="User packages"/>
-      <group title="Implementation packages"/>
-    </javadoc>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Package target                                                         -->
-  <!-- ====================================================================== -->
-
-  <target name="package" depends="compile,test" description="Package the application">
-    <jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar" 
-         compress="true" 
-         index="false" 
-         manifest="src/conf/MANIFEST.MF" 
-         basedir="${maven.build.outputDir}" 
-         excludes="**/package.html"/>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- A dummy target for the package named after the type it creates         -->
-  <!-- ====================================================================== -->
-
-  <target name="jar" depends="package" description="Builds the jar for the application"/>
-
-  <!-- ====================================================================== -->
-  <!-- Download dependencies target                                           -->
-  <!-- ====================================================================== -->
-
-  <target name="test-offline">
-    <condition property="maven.mode.offline">
-      <equals arg1="${maven.settings.offline}" arg2="true"/>
-    </condition>
-  </target>
-
-  <target name="get-deps" 
-          depends="test-offline" 
-          description="Download all dependencies" 
-          unless="maven.mode.offline">
-    <mkdir dir="${maven.repo.local}"/>
-    <mkdir dir="${maven.repo.local}/org/joda/joda-convert/1.2"/>
-    <get src="http://repo.maven.apache.org/maven2/org/joda/joda-convert/1.2/joda-convert-1.2.jar" 
-         dest="${maven.repo.local}/org/joda/joda-convert/1.2/joda-convert-1.2.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <mkdir dir="${maven.repo.local}/junit/junit/3.8.2"/>
-    <get src="http://repo.maven.apache.org/maven2/junit/junit/3.8.2/junit-3.8.2.jar" 
-         dest="${maven.repo.local}/junit/junit/3.8.2/junit-3.8.2.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-  </target>
-
-</project>
diff --git a/dev-java/joda-time/joda-time-1.6.ebuild b/dev-java/joda-time/joda-time-1.6.ebuild
deleted file mode 100644
index 8d3aec4cc56c4..0000000000000
--- a/dev-java/joda-time/joda-time-1.6.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-JAVA_PKG_IUSE="doc examples source test"
-
-inherit java-pkg-2 java-ant-2
-
-MY_P="${P}-src"
-
-DESCRIPTION="A quality open-source replacement for the Java Date and Time classes"
-HOMEPAGE="http://joda-time.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND="
-	>=virtual/jdk-1.4
-	test? ( dev-java/ant-junit )"
-RDEPEND=">=virtual/jre-1.4"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	rm -v *.jar || die
-	# https://sourceforge.net/tracker/index.php?func=detail&aid=1855430&group_id=97367&atid=617889
-	epatch "${FILESDIR}/1.5.1-ecj.patch"
-}
-
-# chokes on static inner class making instance of non-static inner class
-EANT_FILTER_COMPILER="jikes"
-# little trick so it doesn't try to download junit
-EANT_EXTRA_ARGS="-Djunit.ant=1 -Djunit.present=1"
-
-src_test() {
-	ANT_TASKS="ant-junit" eant -Djunit.jar="$(java-pkg_getjars junit)" test
-}
-
-src_install() {
-	java-pkg_newjar build/${P}.jar
-
-	dodoc LICENSE.txt NOTICE.txt RELEASE-NOTES.txt ToDo.txt || die
-	use doc && java-pkg_dojavadoc build/docs
-	use examples && java-pkg_doexamples src/example
-	use source && java-pkg_dosrc src/java/org
-}
diff --git a/dev-java/joda-time/joda-time-2.2.ebuild b/dev-java/joda-time/joda-time-2.2.ebuild
deleted file mode 100644
index fb1ba07cd91d0..0000000000000
--- a/dev-java/joda-time/joda-time-2.2.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc examples source test"
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="A quality open-source replacement for the Java Date and Time classes"
-HOMEPAGE="http://joda-time.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}-dist.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-
-DEPEND=">=virtual/jdk-1.5
-	dev-java/joda-convert:0
-	test? (
-		dev-java/junit:0
-		dev-java/ant-junit:0
-	)"
-RDEPEND=">=virtual/jre-1.5"
-
-java_prepare() {
-	rm -v *.jar || die "Failed to remove bundled jars."
-	cp "${FILESDIR}"/${P}-build.xml "${S}"/build.xml || die "Failed to copy build file."
-
-	mkdir -p "${S}"/target/classes || die "Failed to create target classes directory."
-	cp -Rv "${S}"/src/tz-data/* "${S}"/target/classes/ || die "Failed to copy timezone data."
-}
-
-src_compile() {
-	EANT_EXTRA_ARGS="-Dgentoo.classpath=$(java-pkg_getjar --build-only joda-convert joda-convert.jar)"
-
-	java-pkg-2_src_compile
-}
-
-src_test() {
-	EANT_EXTRA_ARGS="-Dgentoo.classpath=$(java-pkg_getjar --build-only joda-convert joda-convert.jar):$(java-pkg_getjar --build-only junit junit.jar)"
-
-	java-pkg-2_src_test
-}
-
-src_install() {
-	java-pkg_newjar target/${P}.jar
-
-	dodoc NOTICE.txt RELEASE-NOTES.txt
-
-	use doc && java-pkg_dojavadoc target/site/apidocs
-	use examples && java-pkg_doexamples src/example
-	use source && java-pkg_dosrc src/main/java/*
-}
diff --git a/dev-java/joda-time/joda-time-2.3.ebuild b/dev-java/joda-time/joda-time-2.3.ebuild
deleted file mode 100644
index 26bf61b721930..0000000000000
--- a/dev-java/joda-time/joda-time-2.3.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-JAVA_PKG_IUSE="doc examples source test"
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="A quality open-source replacement for the Java Date and Time classes"
-HOMEPAGE="http://www.joda.org/joda-time/ https://github.com/JodaOrg/joda-time/"
-SRC_URI="mirror://sourceforge/${PN}/${P}-dist.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-
-DEPEND=">=virtual/jdk-1.5
-	dev-java/joda-convert:0
-	test? (
-		dev-java/junit:0
-		dev-java/ant-junit:0
-	)"
-RDEPEND=">=virtual/jre-1.5"
-
-java_prepare() {
-	rm -v *.jar || die "Failed to remove bundled jars."
-	cp "${FILESDIR}"/${P}-build.xml "${S}"/build.xml || die "Failed to copy build file."
-
-	mkdir -p "${S}"/target/classes || die "Failed to create target classes directory."
-	cp -Rv "${S}"/src/tz-data/* "${S}"/target/classes/ || die "Failed to copy timezone data."
-}
-
-src_compile() {
-	EANT_EXTRA_ARGS="-Dgentoo.classpath=$(java-pkg_getjar --build-only joda-convert joda-convert.jar)"
-
-	java-pkg-2_src_compile
-}
-
-src_test() {
-	EANT_EXTRA_ARGS="-Dgentoo.classpath=$(java-pkg_getjar --build-only joda-convert joda-convert.jar):$(java-pkg_getjar --build-only junit junit.jar)"
-
-	java-pkg-2_src_test
-}
-
-src_install() {
-	java-pkg_newjar target/${P}.jar
-
-	dodoc NOTICE.txt RELEASE-NOTES.txt
-
-	use doc && java-pkg_dojavadoc target/site/apidocs
-	use examples && java-pkg_doexamples src/example
-	use source && java-pkg_dosrc src/main/java/*
-}