ICE-8361 - Use only official Ice Builder for Gradle plugin

6 files changed, 42 insertions, 6 deletions

diff --git a/java-compat/android/gradle.properties b/java-compat/android/gradle.properties
index ecb3f378330..3a8e1d3c9a7 100644
--- a/java-compat/android/gradle.properties
+++ b/java-compat/android/gradle.properties
@@ -45,11 +45,18 @@ debug = true
 // iceHome =
 
 //
-// Set the version of the Ice Builder to use for building
+// Set the version of the Ice Builder to use for building it must set to debian
+// when using the gradle-ice-builder-plugin package.
 //
 iceBuilderVersion = 1.4.1
 
 //
+// Set the builder artifact class path, it must be set to com.zeroc.gradle.ice-builder
+// when using the gradle-ice-builder-plugin package.
+//
+iceBuilderClassPath = gradle.plugin.com.zeroc.gradle.ice-builder
+
+//
 // Set the location of a local Ice Builder for Gradle source directory
 //
 iceBuilderHome =
diff --git a/java-compat/gradle.properties b/java-compat/gradle.properties
index b995168dc20..ce4278bcbb0 100644
--- a/java-compat/gradle.properties
+++ b/java-compat/gradle.properties
@@ -28,11 +28,18 @@ prefix =
 debug = true
 
 //
-// Set the version of the Ice Builder to use for building
+// Set the version of the Ice Builder to use for building it must set to debian
+// when using the gradle-ice-builder-plugin package.
 //
 iceBuilderVersion = 1.4.1
 
 //
+// Set the builder artifact class path, it must be set to com.zeroc.gradle.ice-builder
+// when using the gradle-ice-builder-plugin package.
+//
+iceBuilderClassPath = gradle.plugin.com.zeroc.gradle.ice-builder
+
+//
 // Set the location of a local Ice Builder for Gradle source directory
 //
 iceBuilderHome =
diff --git a/java/android/gradle.properties b/java/android/gradle.properties
index b3079d5d7c0..135dd769943 100644
--- a/java/android/gradle.properties
+++ b/java/android/gradle.properties
@@ -45,11 +45,18 @@ debug = true
 // iceHome =
 
 //
-// Set the version of the Ice Builder to use for building
+// Set the version of the Ice Builder to use for building it must set to debian
+// when using the gradle-ice-builder-plugin package.
 //
 iceBuilderVersion = 1.4.1
 
 //
+// Set the builder artifact class path, it must be set to com.zeroc.gradle.ice-builder
+// when using the gradle-ice-builder-plugin package.
+//
+iceBuilderClassPath = gradle.plugin.com.zeroc.gradle.ice-builder
+
+//
 // Set the location of a local Ice Builder for Gradle source directory
 //
 iceBuilderHome =
diff --git a/java/build.gradle b/java/build.gradle
index 1b896d84cbf..1f98501355d 100644
--- a/java/build.gradle
+++ b/java/build.gradle
@@ -39,6 +39,9 @@ subprojects {
 
         mavenCentral()
 
+        //
+        // The thirdparty repository is required on macOS for appblunder
+        //
         maven {
             url 'https://repo.zeroc.com/nexus/content/repositories/thirdparty'
         }
diff --git a/java/gradle.properties b/java/gradle.properties
index 234ae7e126d..795a7088c0b 100644
--- a/java/gradle.properties
+++ b/java/gradle.properties
@@ -40,11 +40,18 @@ icegridguiProguard = true
 debug = true
 
 //
-// Set the version of the Ice Builder to use for building
+// Set the version of the Ice Builder to use for building it must set to debian
+// when using the gradle-ice-builder-plugin package.
 //
 iceBuilderVersion = 1.4.1
 
 //
+// Set the builder artifact class path, it must be set to com.zeroc.gradle.ice-builder
+// when using the gradle-ice-builder-plugin package.
+//
+iceBuilderClassPath = gradle.plugin.com.zeroc.gradle.ice-builder
+
+//
 // Set the location of a local Ice Builder for Gradle source directory
 //
 iceBuilderHome =
diff --git a/java/gradle/ice.gradle b/java/gradle/ice.gradle
index 9daaf170813..b22ea8d7f24 100644
--- a/java/gradle/ice.gradle
+++ b/java/gradle/ice.gradle
@@ -33,14 +33,19 @@ buildscript {
         mavenCentral()
 
         maven {
-            url "https://repo.zeroc.com/nexus/content/repositories/releases"
+            url "https://plugins.gradle.org/m2/"
         }
     }
     dependencies {
-        classpath group: 'com.zeroc.gradle.ice-builder', name: 'slice', version: "${iceBuilderVersion}"
+        classpath group: "${iceBuilderClassPath}", name: 'slice', version: "${iceBuilderVersion}"
     }
 }
 
+//
+// We do not use the new gradle Plugin DSL because on debian we want to use the plug-in
+// from gradle-ice-builder-plugin package and this is not possible when using gradle 3.2
+// included in stretch and the Plugin DSL.
+//
 if (!project.plugins.findPlugin(com.zeroc.gradle.icebuilder.slice.SlicePlugin)) {
     project.apply(plugin: com.zeroc.gradle.icebuilder.slice.SlicePlugin)
 }