--- ivy.xml.orig	2018-04-18 12:50:14.434879557 +0100

+++ ivy.xml	2018-04-18 12:50:41.064751141 +0100

@@ -18,16 +18,14 @@

   <!ENTITY maven.version "2.0">

   <!ENTITY gradle.version "2.3">

   <!ENTITY asm.version "6.1.1">

-  <!ENTITY jarjar.asm.version "5.2">

 ]>

 <ivy-module version="2.0">

   <info organisation="de.thetaphi" module="forbiddenapis"/>

-  <configurations defaultconfmapping="build-&gt;*;bundle-&gt;*;test-&gt;*;buildtools-&gt;*;jarjar-&gt;*">

+  <configurations defaultconfmapping="build-&gt;*;bundle-&gt;*;test-&gt;*;buildtools-&gt;*">

      <conf name="build" transitive="false" visibility="private" />

      <conf name="bundle" transitive="false" visibility="private" />

      <conf name="test" transitive="false" visibility="private" />

      <conf name="buildtools" transitive="false" visibility="private" />

-     <conf name="jarjar" transitive="false" visibility="private" />

   </configurations>

   <dependencies>

     <!-- we compile against the minimum ANT / Maven / Gradle versions: -->

@@ -58,10 +56,6 @@

     <!-- deps only needed for build tools and tasks: -->

     <dependency org="org.apache.maven" name="maven-ant-tasks" rev="2.1.3" conf="buildtools"/>

     <dependency org="org.apache.rat" name="apache-rat" rev="0.11" conf="buildtools"/>

-    <!-- JarJar needs older ASM version until it gets updated - add separate config: -->

-    <dependency org="org.ow2.asm" name="asm" rev="&jarjar.asm.version;" conf="jarjar"/>

-    <dependency org="org.ow2.asm" name="asm-commons" rev="&jarjar.asm.version;" conf="jarjar"/>

-    <dependency org="org.sonatype.plugins" name="jarjar-maven-plugin" rev="1.9" conf="jarjar"/>

     <!-- exclude sources and javadocs in Maven/Ivy downloads: -->

     <exclude org="*" ext="*" matcher="regexp" type="source|javadoc"/> 

   </dependencies>

--- build.xml.orig	2018-04-18 12:53:28.583943322 +0100

+++ build.xml	2018-04-18 12:59:08.082561554 +0100

@@ -183,7 +183,6 @@

     <ivy:cachepath pathid="path.main-build" conf="build" log="${ivy.logging}"/>

     <ivy:cachepath pathid="path.main-bundle" conf="bundle" log="${ivy.logging}"/>

     <ivy:cachepath pathid="path.test" conf="test" log="${ivy.logging}"/>

-    <ivy:cachepath pathid="path.jarjar" conf="jarjar" log="${ivy.logging}"/>

     <path id="path.main-run">

       <path refid="path.main-bundle"/>

       <pathelement path="build/main"/>

@@ -212,7 +211,6 @@

   <target name="-install-tasks" depends="-init" unless="installed.tasks">

     <ivy:cachepath pathid="path.tasks" conf="buildtools" log="${ivy.logging}"/>

-    <taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask" classpathref="path.jarjar"/>

     <taskdef uri="antlib:org.apache.maven.artifact.ant" classpathref="path.tasks"/>

     <taskdef name="groovy" classname="org.codehaus.groovy.ant.Groovy" classpathref="path.tasks"/>

     <typedef uri="antlib:org.apache.rat.anttasks" classpathref="path.tasks"/>

@@ -368,31 +366,17 @@

   </target>

   <target name="jar" depends="compile,-install-tasks,maven-descriptor" description="Create the binary JAR">

-    <ivy:cachefileset setid="fileset.bundle" conf="bundle" log="${ivy.logging}"/>

     <mkdir dir="dist"/>

-    <jarjar destfile="${jar-file}">

+    <jar destfile="${jar-file}">

       <zipfileset dir="build/main"/>

-      <restrict>

-        <name name="**/*.class" handledirsep="true"/>

-        <not>

-          <name name="module-info.class" handledirsep="true"/>

-        </not>

-        <archives>

-          <zips><fileset refid="fileset.bundle"/></zips>

-        </archives>

-      </restrict>

-      <keep pattern="de.thetaphi.forbiddenapis.**"/>

-      <rule pattern="org.objectweb.asm.**" result="de.thetaphi.forbiddenapis.asm.@1"/>

-      <rule pattern="org.apache.commons.**" result="de.thetaphi.forbiddenapis.commons.@1"/>

-      <rule pattern="org.codehaus.plexus.**" result="de.thetaphi.forbiddenapis.plexus.@1"/>

       <manifest>

         <attribute name="Implementation-Vendor" value="${groupId}"/>

         <attribute name="Implementation-Title" value="${artifactId}"/>

         <attribute name="Implementation-Version" value="${version}"/>

         <attribute name="Main-Class" value="${cli-classname}"/>

       </manifest>

-      <metainf dir="." includes="LICENSE.txt,NOTICE.txt,bundled-licenses/**"/>

-    </jarjar>

+      <metainf dir="." includes="LICENSE.txt,NOTICE.txt"/>

+    </jar>

   </target>

   <target name="jar-src" description="Create source distribution">