From 5c6a09ede05c9ab289b8a15bed728ad647d5e178 Mon Sep 17 00:00:00 2001 From: Slawomir Jaranowski Date: Fri, 30 Jun 2023 16:15:38 +0200 Subject: [PATCH] Fix test --- src/it/add-third-party-missing-file/invoker.properties | 3 +-- .../missing-licenses.properties | 2 +- src/it/add-third-party-missing-file/prebuild.groovy | 10 +++------- 3 files changed, 5 insertions(+), 10 deletions(-) diff --git a/src/it/add-third-party-missing-file/invoker.properties b/src/it/add-third-party-missing-file/invoker.properties index 95b9758d0..599b712b3 100644 --- a/src/it/add-third-party-missing-file/invoker.properties +++ b/src/it/add-third-party-missing-file/invoker.properties @@ -19,5 +19,4 @@ # . # #L% ### -invoker.goals=clean generate-resources -invoker.failureBehavior=fail-fast \ No newline at end of file +invoker.goals=clean generate-resources \ No newline at end of file diff --git a/src/it/add-third-party-missing-file/missing-licenses.properties b/src/it/add-third-party-missing-file/missing-licenses.properties index a1bfddfdc..d886846c5 100644 --- a/src/it/add-third-party-missing-file/missing-licenses.properties +++ b/src/it/add-third-party-missing-file/missing-licenses.properties @@ -1,2 +1,2 @@ -org.json--json--20070829=The JSON License by file url +org.json--json--20230227=The JSON License by file url javax.resource--connector-api--1.5=CDDL + GPLv2 with classpath exception by file url \ No newline at end of file diff --git a/src/it/add-third-party-missing-file/prebuild.groovy b/src/it/add-third-party-missing-file/prebuild.groovy index 3d080049b..1712a9187 100644 --- a/src/it/add-third-party-missing-file/prebuild.groovy +++ b/src/it/add-third-party-missing-file/prebuild.groovy @@ -20,14 +20,10 @@ * #L% */ -import java.io.ByteArrayOutputStream; -import java.io.File; -import java.io.FileOutputStream; -import java.util.jar.JarOutputStream; -import java.util.jar.Manifest; -import java.util.zip.ZipEntry; +import java.util.jar.JarOutputStream +import java.util.zip.ZipEntry -String missingLicences = "org.json--json--20070829=The JSON License by classpath url\n" + +String missingLicences = "org.json--json--20230227=The JSON License by classpath url\n" + "javax.resource--connector-api--1.5=CDDL + GPLv2 with classpath exception by classpath url"; JarOutputStream licenseRepo = new JarOutputStream(new FileOutputStream(new File(basedir, "license-repo.jar")));