Skip to content

Commit

Permalink
Iteration on logging
Browse files Browse the repository at this point in the history
  • Loading branch information
jasontedor committed Jun 9, 2018
1 parent 4f8a80b commit 297e33c
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@ public class DependenciesInfoTask extends DefaultTask {

final String url = createURL(dependency.group, dependency.name, dependency.version)
final String dependencyName = DependencyLicensesTask.getDependencyName(mappings, dependency.name)
logger.info("mapped dependency ${dependency.group}:${dependency.name} to ${dependencyName} for license info")

final String licenseType = getLicenseType(dependency.group, dependencyName)
output.append("${dependency.group}:${dependency.name},${dependency.version},${url},${licenseType}\n")
Expand Down Expand Up @@ -129,8 +130,6 @@ public class DependenciesInfoTask extends DefaultTask {
protected String getLicenseType(final String group, final String name) {
File license

logger.info("checking dependency group ${group} with name ${name} in ${licensesDir}")

if (licensesDir.exists()) {
licensesDir.eachFileMatch({ it ==~ /.*-LICENSE.*/ }) { File file ->
String prefix = file.name.split('-LICENSE.*')[0]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -162,9 +162,8 @@ public class DependencyLicensesTask extends DefaultTask {
checkSha(dependency, jarName, shaFiles)
}

logger.info("Checking license/notice for " + depName)
final String dependencyName = getDependencyName(mappings, depName)
logger.info("Mapped dependency name ${depName} to ${dependencyName} for license check")
logger.info("mapped dependency name ${depName} to ${dependencyName} for license/notice check")
checkFile(dependencyName, jarName, licenses, 'LICENSE')
checkFile(dependencyName, jarName, notices, 'NOTICE')
}
Expand Down

0 comments on commit 297e33c

Please sign in to comment.