Группа :: Разработка/Java
Пакет: forbidden-apis
Главная Изменения Спек Патчи Sources Загрузить Gear Bugs and FR Repocop
Патч: fix-gradle-maven-build.patch
Скачать
Скачать
--- build.xml
+++ build.xml
@@ -212,7 +212,6 @@
<target name="-install-tasks" depends="-init" unless="installed.tasks">
<ivy:cachepath pathid="path.tasks" conf="buildtools" log="${ivy.logging}"/>
<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"/>
<property name="installed.tasks" value="true"/>
</target>
@@ -613,7 +612,6 @@
<target name="generate-deprecated" depends="compile-tools,-install-tasks" description="Generates deprecated API signature lists for current JDK">
<mkdir dir="${signatures.dir}"/>
<property name="deprecated.output.file" location="${signatures.dir}/jdk-deprecated-${build.java.runtime}.txt"/>
- <groovy classpathref="path.tools-run" src="${groovy-tools.dir}/generate-deprecated.groovy"/>
</target>
<target name="generate-internal" depends="compile-tools" description="Generates internal API signature lists for current JDK">
--- ivy.xml.orig 2018-04-18 14:00:02.327714780 +0100
+++ ivy.xml 2018-04-18 14:01:58.665183881 +0100
@@ -32,13 +32,10 @@
<dependency org="org.apache.ant" name="ant" rev="1.7.0" conf="build"/>
<dependency org="org.apache.maven" name="maven-plugin-api" rev="&maven.version;" conf="build"/>
<dependency org="org.apache.maven" name="maven-artifact" rev="&maven.version;" conf="build"/>
+ <dependency org="org.apache.maven" name="maven-core" rev="&maven.version;" conf="build"/>
+ <dependency org="org.apache.maven" name="maven-compat" rev="&maven.version;" conf="build"/>
<dependency org="org.apache.maven.plugin-tools" name="maven-plugin-annotations" rev="3.4" conf="build"/>
- <dependency org="org.gradle" name="gradle-core" rev="&gradle.version;" conf="build"/>
- <dependency org="org.gradle" name="gradle-base-services" rev="&gradle.version;" conf="build"/>
- <dependency org="org.gradle" name="gradle-base-services-groovy" rev="&gradle.version;" conf="build"/>
<dependency org="org.slf4j" name="slf4j-api" rev="1.7.5" conf="build"/>
- <!-- Gradle also needs Groovy, but we need it as build tool, too: -->
- <dependency org="org.codehaus.groovy" name="groovy-all" rev="2.4.15" conf="build,buildtools"/>
<!-- ASM minimal (latest version) required: -->
<dependency org="org.ow2.asm" name="asm" rev="&asm.version;" conf="build,bundle,buildtools"/>
<dependency org="org.ow2.asm" name="asm-commons" rev="&asm.version;" conf="build,bundle,buildtools"/>
--- src/main/java/de/thetaphi/forbiddenapis/gradle/CheckForbiddenApis.java.orig 2018-04-18 13:57:53.359303320 +0100
+++ src/main/java/de/thetaphi/forbiddenapis/gradle/CheckForbiddenApis.java 2018-04-18 13:57:59.455275501 +0100
@@ -45,7 +45,6 @@
import org.gradle.api.tasks.InputFiles;
import org.gradle.api.tasks.Optional;
import org.gradle.api.tasks.OutputDirectories;
-import org.gradle.api.tasks.ParallelizableTask;
import org.gradle.api.tasks.SkipWhenEmpty;
import org.gradle.api.tasks.TaskAction;
import org.gradle.api.tasks.VerificationTask;
@@ -103,7 +102,6 @@
*
* @since 2.0
*/
-@ParallelizableTask
public class CheckForbiddenApis extends DefaultTask implements PatternFilterable,VerificationTask,Constants {
private static final String NL = System.getProperty("line.separator", "\n");