Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bump json from 20070829 to 20230227 in /src/it/add-third-party-missing-file #460

Merged
merged 2 commits into from
Jun 30, 2023
Merged

Bump json from 20070829 to 20230227 in /src/it/add-third-party-missing-file #460

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1e78206
Bump json in /src/it/add-third-party-missing-file
dependabot[bot] May 2, 2023
41bf1c6
Fix test
slawekjaranowski Jun 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 0 additions & 1 deletion src/it/add-third-party-missing-file/invoker.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,3 @@
# #L%
###
invoker.goals=clean generate-resources
invoker.failureBehavior=fail-fast
4 changes: 2 additions & 2 deletions src/it/add-third-party-missing-file/missing-licenses.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
org.json--json--20070829=The JSON License by file url
javax.resource--connector-api--1.5=CDDL + GPLv2 with classpath exception 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
2 changes: 1 addition & 1 deletion src/it/add-third-party-missing-file/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
<dependency>
<groupId>org.json</groupId>
<artifactId>json</artifactId>
<version>20070829</version>
<version>20230227</version>
</dependency>
<dependency>
<groupId>javax.resource</groupId>
Expand Down
2 changes: 1 addition & 1 deletion src/it/add-third-party-missing-file/postbuild.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,4 @@ file = new File(basedir, 'target/generated-sources/license/THIRD-PARTY-by-file.t
assert file.exists();
content = file.text;
assert content.contains('The JSON License by file url');
assert content.contains('CDDL + GPLv2 with classpath exception by file url');
assert content.contains('CDDL + GPLv2 with classpath exception by file url');
12 changes: 4 additions & 8 deletions src/it/add-third-party-missing-file/prebuild.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,19 +20,15 @@
* #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")));
licenseRepo.putNextEntry(new ZipEntry("missing-licenses.properties"));
licenseRepo.write(missingLicences.getBytes("UTF-8"));
licenseRepo.closeEntry();

licenseRepo.close();
licenseRepo.close();