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

[Backport] [2.x] Update to Gradle 8.5 (#617) #619

Merged
merged 1 commit into from
Feb 7, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
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
20 changes: 9 additions & 11 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ buildscript {

plugins {
id 'java'
id 'nebula.ospackage' version "8.3.0"
id 'com.netflix.nebula.ospackage' version "11.6.0"
id 'com.github.spotbugs' version '5.0.13'
id 'jacoco'
id 'com.diffplug.spotless' version '5.11.0'
Expand Down Expand Up @@ -217,9 +217,9 @@ jacoco {

jacocoTestReport {
reports {
xml.enabled true
html.enabled true
csv.enabled false
xml.required = true
html.required = true
csv.required = false
}
afterEvaluate {
classDirectories.from = files(classDirectories.files.collect {
Expand Down Expand Up @@ -301,7 +301,7 @@ dependencies {
implementation 'org.jooq:jooq:3.10.8'
implementation 'org.apache.commons:commons-lang3:3.9'
implementation 'org.bouncycastle:bcprov-jdk15to18:1.75'
implementation 'org.bouncycastle:bcpkix-jdk15on:1.70'
implementation 'org.bouncycastle:bcpkix-jdk18on:1.74'
implementation "org.opensearch:performance-analyzer-commons:${paCommonsVersion}"
implementation "com.fasterxml.jackson.core:jackson-annotations:${jacksonVersion}"
implementation "com.fasterxml.jackson.core:jackson-databind:${jacksonDataBindVersion}"
Expand Down Expand Up @@ -872,10 +872,9 @@ afterEvaluate {
task renameRpm(type: Copy) {
from("$buildDir/distributions")
into("$buildDir/distributions")
include archiveName
rename archiveName, "${packageName}-${version}.rpm"
rename "$archiveFileName", "${packageName}-${version}.rpm"
doLast {
delete file("$buildDir/distributions/$archiveName")
delete file("$buildDir/distributions/$archiveFileName")
}
}
}
Expand All @@ -889,10 +888,9 @@ afterEvaluate {
task renameDeb(type: Copy) {
from("$buildDir/distributions")
into("$buildDir/distributions")
include archiveName
rename archiveName, "${packageName}-${version}.deb"
rename "$archiveFileName", "${packageName}-${version}.deb"
doLast {
delete file("$buildDir/distributions/$archiveName")
delete file("$buildDir/distributions/$archiveFileName")
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
1 change: 0 additions & 1 deletion licenses/bcpkix-jdk15on-1.70.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions licenses/bcpkix-jdk18on-1.74.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
a197fb87f0697c1925e7248865ee84516fdb6d9c
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
LICENSE
Copyright (c) 2000 - 2019 The Legion of the Bouncy Castle Inc. (https://www.bouncycastle.org)
Copyright (c) 2000 - 2024 The Legion of the Bouncy Castle Inc. (https://www.bouncycastle.org)

Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:

Expand Down
1 change: 0 additions & 1 deletion licenses/jackson-annotations-2.15.2.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions licenses/jackson-annotations-2.16.1.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
fd441d574a71e7d10a4f73de6609f881d8cdfeec
1 change: 0 additions & 1 deletion licenses/jackson-databind-2.15.2.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions licenses/jackson-databind-2.16.1.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
02a16efeb840c45af1e2f31753dfe76795278b73
1 change: 0 additions & 1 deletion licenses/jackson-module-paranamer-2.15.2.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions licenses/jackson-module-paranamer-2.16.1.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
8ccd968bf3c07b7a67f099ca8709b3fed5ffedae
1 change: 1 addition & 0 deletions licenses/netty-buffer-4.1.104.Final.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
756797174b94a3aee11ce83522473f3c18287a43
1 change: 0 additions & 1 deletion licenses/netty-buffer-4.1.97.Final.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions licenses/netty-codec-4.1.104.Final.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
f51fcfd3baac88b2c0b8dc715932ad5622d17429
1 change: 0 additions & 1 deletion licenses/netty-codec-4.1.97.Final.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions licenses/netty-codec-http-4.1.104.Final.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
2db1556de1b8dc07695604bf51a0a133263ad63f
1 change: 0 additions & 1 deletion licenses/netty-codec-http-4.1.97.Final.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions licenses/netty-codec-http2-4.1.104.Final.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
5bb757929f7c4d1bf12740a378a99643caaad1ac
1 change: 0 additions & 1 deletion licenses/netty-codec-http2-4.1.97.Final.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions licenses/netty-codec-socks-4.1.104.Final.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
5b126ceba61275f38297cacd5ea0cd6d3addee04
1 change: 0 additions & 1 deletion licenses/netty-codec-socks-4.1.97.Final.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions licenses/netty-common-4.1.104.Final.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ec5fc4a7c5475eb20805e14f7274aa28872b5ba1
1 change: 0 additions & 1 deletion licenses/netty-common-4.1.97.Final.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions licenses/netty-handler-4.1.104.Final.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
18c0e659950cdef5f12c36eccfa14cbd2ad2049d
1 change: 0 additions & 1 deletion licenses/netty-handler-4.1.97.Final.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions licenses/netty-handler-proxy-4.1.104.Final.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
50a2d899a8f8a68daed1a9b6d7750184310cc45f
1 change: 0 additions & 1 deletion licenses/netty-handler-proxy-4.1.97.Final.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions licenses/netty-resolver-4.1.104.Final.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
dfa4fe5c3a6eabb7af09902eb63266829876d8a2
1 change: 0 additions & 1 deletion licenses/netty-resolver-4.1.97.Final.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions licenses/netty-transport-4.1.104.Final.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
da7b263b6fedc5add70e78ee8927c8bd2b9bb589
1 change: 0 additions & 1 deletion licenses/netty-transport-4.1.97.Final.jar.sha1

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
d4da9f7237ac3ac292891e0b2d5364acbce128cf

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
a7390b56028ff0ec41c0114036cec55a511bfe91
Loading