Upgrade to JarHC 3.0.0. Bump dependencies.

Author: smarkwal

README.md

@@ -76,16 +76,12 @@ tasks {
         // Sections to include in the report.
         // See https://github.com/smarkwal/jarhc/wiki/Usage for more details.
         // Default: empty list = include all sections
-        sections.addAll("jf", "m", "cv", "jd", "d", "p", "dc", "bc", "bl")
+        sections.addAll("jf", "d", "dc", "bc", "bl", "jm", "m", "ob" )
 
         // Exclude sections without any issues from the report.
         // Default: false
         skipEmpty.set(true)
 
-        // Sort JAR files in reports by name.
-        // Default: false
-        sortRows.set(true)
-
         // Java release (8, 9, 10, ...) to use for analysis of multi-release JAR files.
         // Default: version of Java used to run Gradle build
         release.set(11)
@@ -94,14 +90,6 @@ tasks {
         // Default: "ParentLast"
         strategy.set("ParentFirst")
 
-        // Remove version numbers from JAR file names in the report.
-        // Default: false
-        removeVersion.set(true)
-
-        // Recreate JAR file names based on Maven coordinates if possible.
-        // Default: false
-        useArtifactName.set(true)
-
         // Ignore issues related to missing Java annotations.
         // Default: false
         ignoreMissingAnnotations.set(true)

build.gradle.kts

@@ -20,14 +20,14 @@ plugins {
 
     // Gradle Versions Plugin
     // https://github.com/ben-manes/gradle-versions-plugin
-    id("com.github.ben-manes.versions") version "0.51.0"
+    id("com.github.ben-manes.versions") version "0.52.0"
 
 }
 
 buildscript {
     dependencies {
         // fix CVE-2023-3635 in Okio < 3.4.0
-        // (indirect dependency of Gradle Versions Plugin 0.51.0)
+        // (indirect dependency of Gradle Versions Plugin 0.52.0)
         classpath("com.squareup.okio:okio:3.10.2")
         classpath("com.squareup.okio:okio-jvm:3.10.2")
     }

jarhc-gradle-plugin/build.gradle.kts

@@ -22,7 +22,7 @@ plugins {
 
     // Gradle Publish plugin
     // https://plugins.gradle.org/docs/publish-plugin
-    id("com.gradle.plugin-publish") version "1.3.0"
+    id("com.gradle.plugin-publish") version "1.3.1"
 
     // Gradle Shadow plugin
     id("com.github.johnrengelman.shadow") version "8.1.1"
@@ -53,17 +53,17 @@ gradle.taskGraph.whenReady {
 dependencies {
 
     // JarHC 2.2.2
-    implementation("org.jarhc:jarhc:2.2.2")
+    implementation("org.jarhc:jarhc:3.0.0")
 
     // Gradle API
     // (this is required because the Gradle API dependency gets removed by the Shadow plugin)
     api(gradleApi())
     testImplementation(gradleApi())
 
     // JUnit 5 and Mockito
-    testImplementation("org.junit.jupiter:junit-jupiter:5.11.4")
+    testImplementation("org.junit.jupiter:junit-jupiter:5.12.0")
     testRuntimeOnly("org.junit.platform:junit-platform-launcher")
-    testImplementation("org.mockito:mockito-junit-jupiter:5.15.2")
+    testImplementation("org.mockito:mockito-junit-jupiter:5.16.0")
 }
 
 gradlePlugin {

jarhc-gradle-plugin/src/functionalTest/resources/projects/default-config/expected-output.txt

@@ -1,4 +1,4 @@
-JarHC - JAR Health Check 2.2.2
+JarHC - JAR Health Check 3.0.0
 ==============================
 
 Load JAR files ...

jarhc-gradle-plugin/src/functionalTest/resources/projects/default-config/expected-report.txt

@@ -21,7 +21,7 @@ tasks {
     jarhcReport {
         classpath.setFrom(configurations.runtimeClasspath)
         dataDir.set(file("${layout.buildDirectory.get()}/jarhc-data"))
-        sections.addAll("jf", "m", "cv", "jd", "d", "p", "dc", "bc", "bl")
+        sections.addAll("jf", "d", "dc", "bc", "bl", "jm", "m", "ob")
         skipEmpty.set(true)
         sortRows.set(true)
         release.set(11)

jarhc-gradle-plugin/src/functionalTest/resources/projects/full-config/build.gradle.kts

@@ -1,4 +1,4 @@
-JarHC - JAR Health Check 2.2.2
+JarHC - JAR Health Check 3.0.0
 ==============================
 
 Load JAR files ...

jarhc-gradle-plugin/src/functionalTest/resources/projects/full-config/expected-output.txt

@@ -16,8 +16,6 @@
 
 package org.jarhc.gradle;
 
-import static org.jarhc.artifacts.MavenRepository.MAVEN_CENTRAL_URL;
-
 import java.io.File;
 import java.util.List;
 import org.gradle.api.DefaultTask;
@@ -159,10 +157,8 @@ Options createOptions(Project project, Logger logger) {
 			options.setSkipEmpty(skipEmpty);
 		}
 
-		if (getSortRows().isPresent()) {
-			boolean sortRows = getSortRows().get();
-			logger.info("Sort rows: {}", sortRows);
-			options.setSortRows(sortRows);
+		if (getSortRows() != null && getSortRows().isPresent()) {
+			logger.warn("Option 'sortRows' has been deprecated and is ignored.");
 		}
 
 		if (getRelease().isPresent() && getRelease().get() > 0) {
@@ -177,16 +173,12 @@ Options createOptions(Project project, Logger logger) {
 			options.setClassLoaderStrategy(ClassLoaderStrategy.valueOf(strategy));
 		}
 
-		if (getRemoveVersion().isPresent()) {
-			boolean removeVersion = getRemoveVersion().get();
-			logger.info("Remove version: {}", removeVersion);
-			options.setRemoveVersion(removeVersion);
+		if (getRemoveVersion() != null && getRemoveVersion().isPresent()) {
+			logger.warn("Option 'removeVersion' has been deprecated and is ignored.");
 		}
 
-		if (getUseArtifactName().isPresent()) {
-			boolean useArtifactName = getUseArtifactName().get();
-			logger.info("Use artifact name: {}", useArtifactName);
-			options.setUseArtifactName(useArtifactName);
+		if (getUseArtifactName() != null && getUseArtifactName().isPresent()) {
+			logger.warn("Option 'useArtifactName' has been deprecated and is ignored.");
 		}
 
 		if (getIgnoreMissingAnnotations().isPresent()) {
@@ -245,7 +237,7 @@ int runJarHC(Options options, Logger logger) {
 		ArtifactFinder artifactFinder = new MavenArtifactFinder(cacheDir, logger);
 
 		int javaVersion = options.getRelease();
-		Repository repository = new MavenRepository(javaVersion, MAVEN_CENTRAL_URL, dataPath, artifactFinder, logger);
+		Repository repository = new MavenRepository(javaVersion, options, dataPath, artifactFinder, logger);
 
 		Application application = new Application(logger);
 		application.setRepository(repository);

jarhc-gradle-plugin/src/functionalTest/resources/projects/full-config/expected-report.txt

@@ -237,8 +237,6 @@ void createOptions_withDefaultConfig() {
 		assertFalse(options.isSkipEmpty());
 		assertEquals(11, options.getRelease());
 		assertEquals(ClassLoaderStrategy.ParentLast, options.getClassLoaderStrategy());
-		assertFalse(options.isRemoveVersion());
-		assertFalse(options.isUseArtifactName());
 		assertFalse(options.isIgnoreMissingAnnotations());
 		assertFalse(options.isIgnoreExactCopy());
 		assertEquals("/jarhc/data", options.getDataPath());
@@ -337,8 +335,6 @@ void createOptions_withFullConfig() {
 		assertTrue(options.isSkipEmpty());
 		assertEquals(17, options.getRelease());
 		assertEquals(ClassLoaderStrategy.ParentFirst, options.getClassLoaderStrategy());
-		assertTrue(options.isRemoveVersion());
-		assertTrue(options.isUseArtifactName());
 		assertTrue(options.isIgnoreMissingAnnotations());
 		assertTrue(options.isIgnoreExactCopy());
 		assertEquals("/jarhc/data", options.getDataPath());