forbidden-apis/fix-gradle-maven-build.patch
2020-08-19 14:32:15 +08:00

35 lines
2.1 KiB
Diff

--- ivy.xml.orig 2018-04-18 14:00:02.327714780 +0100
+++ ivy.xml 2018-04-18 14:01:58.665183881 +0100
@@ -32,8 +32,13 @@
<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-core-api" rev="&gradle.version;" conf="build"/>
+ <dependency org="org.gradle" name="gradle-resources" rev="&gradle.version;" conf="build"/>
+ <dependency org="org.gradle" name="gradle-logging" 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"/>
--- 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");