Skip to content

Commit 3db1fe7

Browse files
authored
Remove version from license file name for GCS SDK (#31221)
Most of our license file names strip the version off the artifact name when deducing the license filename. However, the version on the GCS SDK (google-api-services-storage) does not match the usual format and instead starts with a vee. This means that the license filename for this license ended up carrying the version and we should not do that. This commit adjusts the regex the deduces the license filename to account for this case, and adjusts the google-api-services-storage license files accordingly.
1 parent bdb0fb2 commit 3db1fe7

File tree

3 files changed

+1
-1
lines changed

3 files changed

+1
-1
lines changed

buildSrc/src/main/groovy/org/elasticsearch/gradle/precommit/DependencyLicensesTask.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ public class DependencyLicensesTask extends DefaultTask {
151151

152152
for (File dependency : dependencies) {
153153
String jarName = dependency.getName()
154-
String depName = jarName - ~/\-\d+.*/
154+
String depName = jarName - ~/\-v?\d+.*/
155155
if (ignoreShas.contains(depName)) {
156156
// local deps should not have sha files!
157157
if (getShaFile(jarName).exists()) {

0 commit comments

Comments
 (0)