Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update redline library to 1.2.10 #76440

Merged
merged 2 commits into from
Aug 13, 2021
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Update common about enforcing redline 1.2.10
breskeby committed Aug 13, 2021

Verified

This commit was signed with the committer’s verified signature. The key has expired.
breskeby Rene Groeschke
commit 7126891ef3e45287be7e9f10a5b38a1221270b85
6 changes: 2 additions & 4 deletions distribution/packages/build.gradle
Original file line number Diff line number Diff line change
@@ -48,10 +48,9 @@ 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 {
force 'org.redline-rpm:redline:1.2.10'
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How come we force it? Does Gradle ship its own, or something like that?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what that means is that we enforce a particular version (1.2.10). Otherwise redline 1.2.9 would be brought in as a transitive dependency by the nebula.ospackage plugin that has 1.2.9 declared. (There's an open PR on ospackage to fix this).

@@ -61,7 +60,6 @@ buildscript {
dependencies {
classpath "com.github.breskeby:gradle-ospackage-plugin:98455c1"
}

}

apply plugin: "nebula.ospackage-base"