[Git][java-team/gradle-debian-helper][master] 3 commits: Fixed the build failure with Gradle 4.4

[Emmanuel Bourg]

Emmanuel Bourg pushed to branch master at Debian Java Maintainers / gradle-debian-helper


Commits:
2781c811 by Emmanuel Bourg at 2018-10-10T12:57:04Z
Fixed the build failure with Gradle 4.4

- - - - -
92a44abd by Emmanuel Bourg at 2018-10-10T12:58:07Z
Switch to debhelper level 11

- - - - -
6922ce27 by Emmanuel Bourg at 2018-10-10T13:10:36Z
Upload to unstable

- - - - -


5 changed files:

- debian/changelog
- debian/compat
- debian/control
- gradle-helper-plugin/pom.xml
- gradle-helper-plugin/src/main/java/org/debian/gradle/tasks/MavenPom.java


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+gradle-debian-helper (2.0.2) unstable; urgency=medium
+
+  * Fixed the build failure with Gradle 4.4
+  * Switch to debhelper level 11
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Wed, 10 Oct 2018 15:10:21 +0200
+
 gradle-debian-helper (2.0.1) unstable; urgency=medium
 
   * Inject the hook into the bootclasspath of the forked Gradle daemons


=====================================
debian/compat
=====================================
@@ -1 +1 @@
-10
\ No newline at end of file
+11


=====================================
debian/control
=====================================
@@ -6,9 +6,9 @@ Uploaders:
  Emmanuel Bourg <ebourg at apache.org>,
  Kai-Chung Yan <seamlikok at gmail.com>
 Build-Depends:
- debhelper (>= 10),
+ debhelper (>= 11),
  default-jdk-headless | default-jdk,
- gradle (>= 3.2),
+ gradle (>= 4.4),
  maven-debian-helper
 Standards-Version: 4.2.1
 Vcs-Git: https://salsa.debian.org/java-team/gradle-debian-helper.git


=====================================
gradle-helper-plugin/pom.xml
=====================================
@@ -10,7 +10,7 @@
   <description>Gradle Plugin for resolving project dependencies with the system Maven repository</description>
 
   <properties>
-    <gradle.version>3.1</gradle.version>
+    <gradle.version>4.4</gradle.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
 
@@ -48,6 +48,13 @@
       <scope>system</scope>
       <systemPath>${gradle.libs}/gradle-core.jar</systemPath>
     </dependency>
+    <dependency>
+      <groupId>org.gradle</groupId>
+      <artifactId>gradle-core-api</artifactId>
+      <version>${gradle.version}</version>
+      <scope>system</scope>
+      <systemPath>${gradle.libs}/gradle-core-api.jar</systemPath>
+    </dependency>
     <dependency>
       <groupId>org.gradle</groupId>
       <artifactId>gradle-tooling-api</artifactId>


=====================================
gradle-helper-plugin/src/main/java/org/debian/gradle/tasks/MavenPom.java
=====================================
@@ -23,7 +23,6 @@ import org.gradle.api.plugins.BasePluginConvention;
 import org.gradle.api.plugins.MavenPluginConvention;
 import org.gradle.api.tasks.OutputDirectory;
 import org.gradle.api.tasks.OutputFile;
-import org.gradle.api.tasks.ParallelizableTask;
 import org.gradle.api.tasks.TaskAction;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -32,7 +31,6 @@ import java.io.File;
 import java.util.Collections;
 import java.util.Comparator;
 
- at ParallelizableTask
 public class MavenPom extends DefaultTask {
 
     private final Logger log = LoggerFactory.getLogger(MavenPom.class);
@@ -150,4 +148,4 @@ public class MavenPom extends DefaultTask {
         log.info("\tGenerating pom file " + getDestinationPomFile());
         effectivePom.writeTo(getDestinationPomFile());
     }
-}
\ No newline at end of file
+}



View it on GitLab: https://salsa.debian.org/java-team/gradle-debian-helper/compare/ea5fa9504c5ac6af145254c04da919d560ed5119...6922ce279b2ec9d348609db9bac9ffee620dca53

-- 
View it on GitLab: https://salsa.debian.org/java-team/gradle-debian-helper/compare/ea5fa9504c5ac6af145254c04da919d560ed5119...6922ce279b2ec9d348609db9bac9ffee620dca53
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20181010/32cad0b3/attachment.html>