From 0d9e4a29d57f42047b7e7207e106ad724dfa595e Mon Sep 17 00:00:00 2001 From: John Rokicki Date: Fri, 4 Sep 2020 18:39:32 -0400 Subject: [PATCH] fix last review comments --- examples/groovy/build.gradle | 3 ++- .../gradle/versions/reporter/HtmlReporter.groovy | 12 +++++++----- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/examples/groovy/build.gradle b/examples/groovy/build.gradle index 6a58dc15..c03627f5 100644 --- a/examples/groovy/build.gradle +++ b/examples/groovy/build.gradle @@ -66,7 +66,8 @@ dependencies { 'com.google.code.gson:gson', 'dom4j:dom4j' upToDate 'backport-util-concurrent:backport-util-concurrent:3.1', - 'backport-util-concurrent:backport-util-concurrent-java12:3.1' + 'backport-util-concurrent:backport-util-concurrent-java12:3.1', + 'org.openjdk.jmh:jmh-parent:1.25.2' exceedLatest 'com.google.guava:guava:99.0-SNAPSHOT', 'com.google.guava:guava-tests:99.0-SNAPSHOT' upgradesFound 'com.google.guava:guava:15.0', diff --git a/src/main/groovy/com/github/benmanes/gradle/versions/reporter/HtmlReporter.groovy b/src/main/groovy/com/github/benmanes/gradle/versions/reporter/HtmlReporter.groovy index 4e01fb00..9a930499 100644 --- a/src/main/groovy/com/github/benmanes/gradle/versions/reporter/HtmlReporter.groovy +++ b/src/main/groovy/com/github/benmanes/gradle/versions/reporter/HtmlReporter.groovy @@ -200,10 +200,12 @@ class HtmlReporter extends AbstractReporter { } private def String getDisplayableVersion(DependencyOutdated item) { - if (getRevision().equalsIgnoreCase("release-candidate")) { - return item.getAvailable() + if (getRevision().equalsIgnoreCase("milestone")) { + return item.getAvailable().getMilestone() } else if (getRevision().equalsIgnoreCase("release")) { return item.getVersion() + } else if (getRevision().equalsIgnoreCase("integration")) { + return item.getAvailable().getIntegration() } return "" } @@ -308,12 +310,12 @@ class HtmlReporter extends AbstractReporter { } private def getMvnVersionString(String group, String name, String version) { - // https://mvnrepository.com/artifact/com.azure/azure-core-http-netty/1.5.4 + // https://search.maven.org/artifact/com.azure/azure-core-http-netty/1.5.4 if (version == null) { return ""; } - String versionUrl = String.format("https://mvnrepository.com/artifact/%s/%s/%s", group, name, version) - return String.format("%s", versionUrl, "Mvn") + String versionUrl = String.format("https://search.maven.org/artifact/%s/%s/%s/bundle", group, name, version) + return String.format("%s", versionUrl, "Sonatype") } private def getBintrayVersionString(String group, String name, String version) {