[gradle-debian-helper] 01/03: Update to Gradle 3.1

[Kai-Chung Yan]

This is an automated email from the git hooks/post-receive script.

seamlik-guest pushed a commit to branch master
in repository gradle-debian-helper.

commit bfb2fa20ee2294c834aa2a55186d8c989eefc6b0
Author: Kai-Chung Yan (殷啟聰) <seamlikok at gmail.com>
Date:   Fri Nov 4 18:38:51 2016 +0800

    Update to Gradle 3.1
---
 debian/control                                     |  4 ++--
 gradle-helper-plugin/pom.xml                       | 24 +++++++++++++++++++++-
 .../gradle/MavenDebianArtifactRepository.java      |  9 ++++----
 3 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/debian/control b/debian/control
index 7109adc..3cbbf91 100644
--- a/debian/control
+++ b/debian/control
@@ -4,14 +4,14 @@ Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Emmanuel Bourg <ebourg at apache.org>,
            Kai-Chung Yan <seamlikok at gmail.com>
-Build-Depends: debhelper (>= 10), default-jdk-headless | default-jdk, maven-debian-helper, gradle (>= 2.5)
+Build-Depends: debhelper (>= 10), default-jdk-headless | default-jdk, maven-debian-helper, gradle (>= 3.1)
 Standards-Version: 3.9.8
 Vcs-Git: https://anonscm.debian.org/git/pkg-java/gradle-debian-helper.git
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/gradle-debian-helper.git
 
 Package: gradle-debian-helper
 Architecture: all
-Depends: ${misc:Depends}, default-jre-headless | java7-runtime-headless, maven-repo-helper, gradle (>= 2.5)
+Depends: ${misc:Depends}, default-jre-headless | java7-runtime-headless, maven-repo-helper, gradle (>= 3.1)
 Recommends: debhelper
 Description: Helper tools for building Debian packages with Gradle
  gradle-debian-helper contains helper tools to ease the packaging of Gradle
diff --git a/gradle-helper-plugin/pom.xml b/gradle-helper-plugin/pom.xml
index 6a3ae82..e7feafa 100644
--- a/gradle-helper-plugin/pom.xml
+++ b/gradle-helper-plugin/pom.xml
@@ -10,7 +10,8 @@
   <description>Gradle Plugin for resolving project dependencies with the system Maven repository</description>
 
   <properties>
-    <gradle.version>2.5</gradle.version>
+    <gradle.version>3.1</gradle.version>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
 
   <dependencies>
@@ -93,6 +94,27 @@
       <scope>system</scope>
       <systemPath>/usr/share/java/maven-model-3.x.jar</systemPath>
     </dependency>
+    <dependency>
+      <groupId>org.gradle</groupId>
+      <artifactId>gradle-language-java</artifactId>
+      <version>${gradle.version}</version>
+      <scope>system</scope>
+      <systemPath>${gradle.libs}/gradle-language-java.jar</systemPath>
+    </dependency>
+    <dependency>
+      <groupId>org.gradle</groupId>
+      <artifactId>gradle-plugins</artifactId>
+      <version>${gradle.version}</version>
+      <scope>system</scope>
+      <systemPath>${gradle.libs}/gradle-plugins.jar</systemPath>
+    </dependency>
+    <dependency>
+      <groupId>org.gradle</groupId>
+      <artifactId>gradle-logging</artifactId>
+      <version>${gradle.version}</version>
+      <scope>system</scope>
+      <systemPath>${gradle.libs}/gradle-logging.jar</systemPath>
+    </dependency>
   </dependencies>
 
   <!--
diff --git a/gradle-helper-plugin/src/main/java/org/debian/gradle/MavenDebianArtifactRepository.java b/gradle-helper-plugin/src/main/java/org/debian/gradle/MavenDebianArtifactRepository.java
index 4a9621b..685fe21 100644
--- a/gradle-helper-plugin/src/main/java/org/debian/gradle/MavenDebianArtifactRepository.java
+++ b/gradle-helper-plugin/src/main/java/org/debian/gradle/MavenDebianArtifactRepository.java
@@ -26,16 +26,15 @@ import org.debian.maven.repo.DependencyRuleSetFiles;
 import org.gradle.api.artifacts.component.ModuleComponentIdentifier;
 import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.ConfiguredModuleComponentRepository;
 import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.parser.GradlePomModuleDescriptorParser;
-import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.parser.MetaDataParser;
 import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.strategy.DefaultVersionComparator;
 import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.strategy.DefaultVersionSelectorScheme;
 import org.gradle.api.internal.artifacts.repositories.AbstractArtifactRepository;
 import org.gradle.api.internal.artifacts.repositories.ResolutionAwareRepository;
 import org.gradle.api.internal.artifacts.repositories.resolver.MavenResolver;
 import org.gradle.api.internal.filestore.ivy.ArtifactIdentifierFileStore;
-import org.gradle.internal.component.external.model.DefaultMavenModuleResolveMetaData;
 import org.gradle.internal.component.external.model.DefaultModuleComponentIdentifier;
-import org.gradle.internal.component.external.model.ModuleComponentArtifactMetaData;
+import org.gradle.internal.component.external.model.ModuleComponentArtifactMetadata;
+import org.gradle.internal.component.external.model.MutableModuleComponentResolveMetadata;
 import org.gradle.internal.component.model.ComponentOverrideMetadata;
 import org.gradle.internal.component.model.DefaultComponentOverrideMetadata;
 import org.gradle.internal.component.model.DefaultIvyArtifactName;
@@ -55,9 +54,9 @@ public class MavenDebianArtifactRepository extends AbstractArtifactRepository im
 
     private final Logger log = LoggerFactory.getLogger(MavenDebianArtifactRepository.class);
 
-    private final LocallyAvailableResourceFinder<ModuleComponentArtifactMetaData> locallyAvailableResourceFinder;
+    private final LocallyAvailableResourceFinder<ModuleComponentArtifactMetadata> locallyAvailableResourceFinder;
     private final ArtifactIdentifierFileStore artifactFileStore;
-    private final MetaDataParser<DefaultMavenModuleResolveMetaData> pomParser;
+    private final GradlePomModuleDescriptorParser pomParser;
     
     /** The substitution rules for the Maven dependencies */
     private DependencyRuleSetFiles rulesets;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/gradle-debian-helper.git