From 8652d98ce42abb6e3b502f8f011e11e9d6798851 Mon Sep 17 00:00:00 2001 From: Gasper Kojek Date: Tue, 2 Sep 2025 16:56:27 +0200 Subject: [PATCH 1/3] Changed exception on hasBreakingChange to VerificationException --- .../java/me/champeau/gradle/japicmp/JApiCmpWorkerAction.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/me/champeau/gradle/japicmp/JApiCmpWorkerAction.java b/src/main/java/me/champeau/gradle/japicmp/JApiCmpWorkerAction.java index 3b61303..7bd8447 100644 --- a/src/main/java/me/champeau/gradle/japicmp/JApiCmpWorkerAction.java +++ b/src/main/java/me/champeau/gradle/japicmp/JApiCmpWorkerAction.java @@ -59,6 +59,7 @@ import me.champeau.gradle.japicmp.report.ViolationTransformerConfiguration; import me.champeau.gradle.japicmp.report.ViolationsGenerator; import org.gradle.api.GradleException; +import org.gradle.api.tasks.VerificationException; import javax.inject.Inject; import java.io.BufferedWriter; @@ -373,7 +374,7 @@ private void generateOutput(JarArchiveComparator jarArchiveComparator) { } catch (URISyntaxException e) { reportLink = null; } - StringBuilder message = new StringBuilder("Detected binary changes.\n") + StringBuilder message = new StringBuilder("Verification failed: Detected binary changes.\n") .append(" - current: ") .append(prettyPrint(current)) .append("\n - baseline: ") @@ -382,7 +383,7 @@ private void generateOutput(JarArchiveComparator jarArchiveComparator) { message.append(".").append(System.lineSeparator()).append(System.lineSeparator()); message.append("See failure report at ").append(reportLink); } - throw new GradleException(message.toString()); + throw new VerificationException(message.toString()); } } From e57f1b534d3baa5aede114da616e0d71f089c5fc Mon Sep 17 00:00:00 2001 From: Gasper Kojek Date: Thu, 18 Sep 2025 12:38:23 +0200 Subject: [PATCH 2/3] Removed the 'Verification failed' from message on detected changes --- .../java/me/champeau/gradle/japicmp/JApiCmpWorkerAction.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/me/champeau/gradle/japicmp/JApiCmpWorkerAction.java b/src/main/java/me/champeau/gradle/japicmp/JApiCmpWorkerAction.java index 7bd8447..76d08dc 100644 --- a/src/main/java/me/champeau/gradle/japicmp/JApiCmpWorkerAction.java +++ b/src/main/java/me/champeau/gradle/japicmp/JApiCmpWorkerAction.java @@ -374,7 +374,7 @@ private void generateOutput(JarArchiveComparator jarArchiveComparator) { } catch (URISyntaxException e) { reportLink = null; } - StringBuilder message = new StringBuilder("Verification failed: Detected binary changes.\n") + StringBuilder message = new StringBuilder("Detected binary changes.\n") .append(" - current: ") .append(prettyPrint(current)) .append("\n - baseline: ") From 2da8088d1a78aac4393f5093839193b1ce797809 Mon Sep 17 00:00:00 2001 From: Gasper Kojek Date: Tue, 23 Sep 2025 18:29:15 +0200 Subject: [PATCH 3/3] Migrated back to GradleException and added "Analysis failed:" to the exception message to support Gradle 6.6-7.4 --- .../java/me/champeau/gradle/japicmp/JApiCmpWorkerAction.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/main/java/me/champeau/gradle/japicmp/JApiCmpWorkerAction.java b/src/main/java/me/champeau/gradle/japicmp/JApiCmpWorkerAction.java index 76d08dc..13e4abf 100644 --- a/src/main/java/me/champeau/gradle/japicmp/JApiCmpWorkerAction.java +++ b/src/main/java/me/champeau/gradle/japicmp/JApiCmpWorkerAction.java @@ -59,7 +59,6 @@ import me.champeau.gradle.japicmp.report.ViolationTransformerConfiguration; import me.champeau.gradle.japicmp.report.ViolationsGenerator; import org.gradle.api.GradleException; -import org.gradle.api.tasks.VerificationException; import javax.inject.Inject; import java.io.BufferedWriter; @@ -374,7 +373,7 @@ private void generateOutput(JarArchiveComparator jarArchiveComparator) { } catch (URISyntaxException e) { reportLink = null; } - StringBuilder message = new StringBuilder("Detected binary changes.\n") + StringBuilder message = new StringBuilder("Analysis failed: Detected binary changes.\n") .append(" - current: ") .append(prettyPrint(current)) .append("\n - baseline: ") @@ -383,7 +382,7 @@ private void generateOutput(JarArchiveComparator jarArchiveComparator) { message.append(".").append(System.lineSeparator()).append(System.lineSeparator()); message.append("See failure report at ").append(reportLink); } - throw new VerificationException(message.toString()); + throw new GradleException(message.toString()); } }