diff --git a/example/fixtures/merge/expected-artifact-definition.yml b/example/fixtures/merge/expected-artifact-definition.yml index e185397..2ecc86c 100644 --- a/example/fixtures/merge/expected-artifact-definition.yml +++ b/example/fixtures/merge/expected-artifact-definition.yml @@ -38,6 +38,18 @@ yellowBlueRelease: url: null copyrightHolders: [] licenses: [] + com.sun.istack: + - key: istack-commons-runtime + displayName: istack common utility code runtime + url: null + copyrightHolders: [] + licenses: [] + com.sun.xml.fastinfoset: + - key: FastInfoset + displayName: fastinfoset + url: null + copyrightHolders: [] + licenses: [] com.xwray: - key: groupie displayName: Groupie @@ -104,6 +116,18 @@ yellowBlueRelease: licenses: - new-dummy-license keep: true + jakarta.activation: + - key: jakarta.activation-api + displayName: JavaBeans Activation Framework API jar + url: null + copyrightHolders: [] + licenses: [] + jakarta.xml.bind: + - key: jakarta.xml.bind-api + displayName: jakarta.xml.bind-api + url: null + copyrightHolders: [] + licenses: [] javax.activation: - key: activation displayName: JavaBeans Activation Framework (JAF) @@ -145,6 +169,17 @@ yellowBlueRelease: url: null copyrightHolders: [] licenses: [] + org.glassfish.jaxb: + - key: jaxb-runtime + displayName: JAXB Runtime + url: null + copyrightHolders: [] + licenses: [] + - key: txw2 + displayName: TXW2 Runtime + url: null + copyrightHolders: [] + licenses: [] org.jetbrains: - key: annotations displayName: IntelliJ IDEA Annotations @@ -156,12 +191,12 @@ yellowBlueRelease: org.jvnet.staxex: - key: stax-ex displayName: Extended StAX API - url: http://stax-ex.java.net/ + url: https://github.com/eclipse-ee4j/jaxb-stax-ex copyrightHolders: - - Jitendra Kotamraju - - Martin Grebac + - Roman Grigoriadi + - Zheng Jun Li licenses: - - Dual license consisting of the CDDL v1.1 and GPL v2@55 + - Eclipse Distribution License - v 1.0@48 test: junit: - key: junit diff --git a/example/fixtures/merge/expected-license-catalog.yml b/example/fixtures/merge/expected-license-catalog.yml index 922d224..9bf8876 100644 --- a/example/fixtures/merge/expected-license-catalog.yml +++ b/example/fixtures/merge/expected-license-catalog.yml @@ -4,9 +4,9 @@ - key: Common Development and Distribution License (CDDL) v1.0@51 name: Common Development and Distribution License (CDDL) v1.0 url: https://glassfish.dev.java.net/public/CDDLv1.0.html - - key: Dual license consisting of the CDDL v1.1 and GPL v2@55 - name: Dual license consisting of the CDDL v1.1 and GPL v2 - url: https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html + - key: Eclipse Distribution License - v 1.0@48 + name: Eclipse Distribution License - v 1.0 + url: http://www.eclipse.org/org/documents/edl-v10.php - key: Mozilla Public License 1.1 (MPL 1.1)@39 name: Mozilla Public License 1.1 (MPL 1.1) url: http://www.mozilla.org/MPL/MPL-1.1.html diff --git a/example/fixtures/merge/license-catalog.yml b/example/fixtures/merge/license-catalog.yml index b615b2c..84dfb26 100644 --- a/example/fixtures/merge/license-catalog.yml +++ b/example/fixtures/merge/license-catalog.yml @@ -15,4 +15,7 @@ url: https://raw.githubusercontent.com/jmatsu/license-list-plugin/master/license-files/mit.txt - key: new-dummy-license name: Dummy License - url: http://example.com \ No newline at end of file + url: http://example.com + - key: Eclipse Distribution License - v 1.0@48 + name: Eclipse Distribution License - v 1.0 + url: http://www.eclipse.org/org/documents/edl-v10.php \ No newline at end of file