Skip to content

Commit

Permalink
Remove version from license file name for GCS SDK (#31221)
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
jasontedor committed Jun 9, 2018
1 parent 49ea435 commit 62bf333
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ public class DependencyLicensesTask extends DefaultTask {

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

0 comments on commit 62bf333

Please sign in to comment.