From 299c83e49c3db63bfe2789c8d376d5fa2aeeff9a Mon Sep 17 00:00:00 2001 From: James Baiera Date: Thu, 10 Jun 2021 14:10:25 -0400 Subject: [PATCH 1/3] Remove pentaho dependency failing builds --- .../groovy/org/elasticsearch/hadoop/gradle/BuildPlugin.groovy | 2 +- hive/build.gradle | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/buildSrc/src/main/groovy/org/elasticsearch/hadoop/gradle/BuildPlugin.groovy b/buildSrc/src/main/groovy/org/elasticsearch/hadoop/gradle/BuildPlugin.groovy index eca4267b5..48134b65f 100644 --- a/buildSrc/src/main/groovy/org/elasticsearch/hadoop/gradle/BuildPlugin.groovy +++ b/buildSrc/src/main/groovy/org/elasticsearch/hadoop/gradle/BuildPlugin.groovy @@ -172,7 +172,7 @@ class BuildPlugin implements Plugin { project.repositories.mavenCentral() project.repositories.maven { url "https://conjars.org/repo" } project.repositories.maven { url "https://clojars.org/repo" } - project.repositories.maven { url 'https://repo.spring.io/plugins-release' } + project.repositories.maven { url 'https://repo.spring.io/plugins-release-local' } // Elastic artifacts project.repositories.maven { url "https://artifacts.elastic.co/maven/" } // default diff --git a/hive/build.gradle b/hive/build.gradle index 481465f00..07845133b 100644 --- a/hive/build.gradle +++ b/hive/build.gradle @@ -33,6 +33,7 @@ sourcesJar { dependencies { provided("org.apache.hive:hive-service:$hiveVersion") { exclude module: "log4j-slf4j-impl" + exclude module: "pentaho-aggdesigner-algorithm" } itestRuntime("org.apache.hive:hive-jdbc:$hiveVersion") { From 8269174a5c8e523fdfda7c6a16cf21243c843b04 Mon Sep 17 00:00:00 2001 From: James Baiera Date: Mon, 14 Jun 2021 12:53:31 -0400 Subject: [PATCH 2/3] undo unneeded repository change --- .../groovy/org/elasticsearch/hadoop/gradle/BuildPlugin.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildSrc/src/main/groovy/org/elasticsearch/hadoop/gradle/BuildPlugin.groovy b/buildSrc/src/main/groovy/org/elasticsearch/hadoop/gradle/BuildPlugin.groovy index 48134b65f..c6a89b570 100644 --- a/buildSrc/src/main/groovy/org/elasticsearch/hadoop/gradle/BuildPlugin.groovy +++ b/buildSrc/src/main/groovy/org/elasticsearch/hadoop/gradle/BuildPlugin.groovy @@ -172,7 +172,7 @@ class BuildPlugin implements Plugin { project.repositories.mavenCentral() project.repositories.maven { url "https://conjars.org/repo" } project.repositories.maven { url "https://clojars.org/repo" } - project.repositories.maven { url 'https://repo.spring.io/plugins-release-local' } +// project.repositories.maven { url 'https://repo.spring.io/plugins-release' } // Elastic artifacts project.repositories.maven { url "https://artifacts.elastic.co/maven/" } // default From 9128567a6381d7d21f5a8843c5151d6654e488f0 Mon Sep 17 00:00:00 2001 From: James Baiera Date: Mon, 14 Jun 2021 12:54:26 -0400 Subject: [PATCH 3/3] actually undo unneeded repository change --- .../groovy/org/elasticsearch/hadoop/gradle/BuildPlugin.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildSrc/src/main/groovy/org/elasticsearch/hadoop/gradle/BuildPlugin.groovy b/buildSrc/src/main/groovy/org/elasticsearch/hadoop/gradle/BuildPlugin.groovy index c6a89b570..eca4267b5 100644 --- a/buildSrc/src/main/groovy/org/elasticsearch/hadoop/gradle/BuildPlugin.groovy +++ b/buildSrc/src/main/groovy/org/elasticsearch/hadoop/gradle/BuildPlugin.groovy @@ -172,7 +172,7 @@ class BuildPlugin implements Plugin { project.repositories.mavenCentral() project.repositories.maven { url "https://conjars.org/repo" } project.repositories.maven { url "https://clojars.org/repo" } -// project.repositories.maven { url 'https://repo.spring.io/plugins-release' } + project.repositories.maven { url 'https://repo.spring.io/plugins-release' } // Elastic artifacts project.repositories.maven { url "https://artifacts.elastic.co/maven/" } // default