Kapt3: Replace kapt2 in Ant and Maven artifacts with kapt3

build.xml

@@ -844,17 +844,21 @@
     
     <target name="annotation-processing">
         <cleandir dir="${output}/classes/annotation-processing"/>
-        <javac2 destdir="${output}/classes/annotation-processing" debug="true" debuglevel="lines,vars,source" 
+
+        <property environment="env"/>
+
+        <javac2 destdir="${output}/classes/annotation-processing" debug="true" debuglevel="lines,vars,source"
                 includeAntRuntime="false" source="${java.target}" target="${java.target}">
             <withKotlin modulename="annotation-processing">
                 <compilerarg value="-version"/>
             </withKotlin>
             <skip pattern="kotlin/Metadata"/>
             <src>
-                <pathelement path="plugins/annotation-processing/src"/>
-                <pathelement path="plugins/java-model-wrappers/src"/>
+                <pathelement path="plugins/kapt3/src"/>
             </src>
             <classpath>
+                <!-- JAVA_HOME is set in annotation-processing-under-jdk8 -->
+                <pathelement path="${env.JAVA_HOME}/lib/tools.jar"/>
                 <pathelement path="${idea.sdk}/core/intellij-core.jar"/>
                 <pathelement path="${kotlin-home}/lib/kotlin-compiler.jar"/>
                 <pathelement path="${bootstrap.runtime}"/>
@@ -866,7 +870,7 @@
         <jar destfile="${kotlin-home}/lib/kotlin-annotation-processing.jar">
             <fileset dir="${output}/classes/annotation-processing"/>
             <zipfileset file="${kotlin-home}/build.txt" prefix="META-INF"/>
-            <fileset dir="${basedir}/plugins/annotation-processing/src" includes="META-INF/services/**"/>
+            <fileset dir="${basedir}/plugins/kapt3/src" includes="META-INF/services/**"/>
         </jar>
     </target>