From ba7c7d783dbfe4ba3573bc7748b204e6489b2a01 Mon Sep 17 00:00:00 2001 From: Rene Groeschke Date: Fri, 13 Aug 2021 15:29:37 +0200 Subject: [PATCH] Update redline library to 1.2.10 (#76440) * Update redline library to 1.2.10 The redline team just released version 1.2.10 of the redline library which contains our fix of the rpm signatures / headers. Also a PR to update that dependency in the ospackage plugin has been raised at https://github.com/nebula-plugins/gradle-ospackage-plugin/pull/402 * Update common about enforcing redline 1.2.10 --- distribution/packages/build.gradle | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/distribution/packages/build.gradle b/distribution/packages/build.gradle index 7209f42f3457..aeeeafc2cae4 100644 --- a/distribution/packages/build.gradle +++ b/distribution/packages/build.gradle @@ -48,22 +48,18 @@ buildscript { maven { url 'https://jitpack.io' } } - // We rely on a patched version of the redline library used to build rpm packages + // We rely on a specific version of the redline library used to build rpm packages // to support sha256header in our elasticsearch RPMs - // TODO: Update / remove this dependency once https://github.com/craigwblake/redline/pull/157 got merged - // Be aware that it seems the redline project hasnt been active for a while + // TODO: Remove once https://github.com/nebula-plugins/gradle-ospackage-plugin/pull/402 got merged and released configurations.all { resolutionStrategy { - dependencySubstitution { - substitute module('org.redline-rpm:redline') using module('com.github.breskeby:redline:9c85270') - } + force 'org.redline-rpm:redline:1.2.10' } } dependencies { classpath "com.github.breskeby:gradle-ospackage-plugin:98455c1" } - } apply plugin: "nebula.ospackage-base"