Skip to content

Commit 3d67f38

Browse files
authored
chore: choose proper license & remove GPL/CC in multiple licenses (#228)
1 parent 4e6edcb commit 3d67f38

33 files changed

+40
-12694
lines changed

computer-dist/release-docs/LICENSE

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -394,21 +394,21 @@ The following components are provided under the Apache 2.0 License.
394394
(Apache License, Version 2.0) * Sundrio :: Code generation(io.sundrsundr-codegen0.13.1https://github.com/sundrio/sundrio)
395395
(Apache License, Version 2.0) * Sundrio :: Core(io.sundrsundr-core0.13.1https://github.com/sundrio/sundrio)
396396
(Apache License, Version 2.0) * zjsonpatch(com.flipkart.zjsonpatchzjsonpatch0.3.0https://github.com/flipkart-incubator/zjsonpatch/)
397-
(Apache License, Version 2.0,BSD,CC0 1.0,CDDL 1.1,Public) * jersey-inject-hk2(org.glassfish.jersey.inject:jersey-hk2:3.0.3-none )
398-
(Apache License, Version 2.0,BSD,EPL 2.0,GPL 2.0) * Jakarta Annotations API(jakarta.annotation:jakarta.annotation-api:2.0.0-https://projects.eclipse.org/projects/ee4j.ca )
399-
(Apache License, Version 2.0,BSD,EPL 2.0,GPL 2.0) * jersey-core-server(org.glassfish.jersey.core:jersey-server:3.0.3-none )
400-
(Apache License, Version 2.0,EPL 1.0) * Jetty :: Http Utility(org.eclipse.jetty:jetty-http:9.3.24.v20180605-http://www.eclipse.org/jetty )
401-
(Apache License, Version 2.0,EPL 1.0) * Jetty :: IO Utility(org.eclipse.jetty:jetty-io:9.3.24.v20180605-http://www.eclipse.org/jetty )
402-
(Apache License, Version 2.0,EPL 1.0) * Jetty :: Security(org.eclipse.jetty:jetty-security:9.3.24.v20180605-http://www.eclipse.org/jetty )
403-
(Apache License, Version 2.0,EPL 1.0) * Jetty :: Server Core(org.eclipse.jetty:jetty-server:9.3.24.v20180605-http://www.eclipse.org/jetty )
404-
(Apache License, Version 2.0,EPL 1.0) * Jetty :: Servlet Handling(org.eclipse.jetty:jetty-servlet:9.3.24.v20180605-http://www.eclipse.org/jetty )
405-
(Apache License, Version 2.0,EPL 1.0) * Jetty :: Utilities(org.eclipse.jetty:jetty-util:9.3.24.v20180605-http://www.eclipse.org/jetty )
406-
(Apache License, Version 2.0,EPL 1.0) * Jetty :: Webapp Application Support(org.eclipse.jetty:jetty-webapp:9.3.24.v20180605-http://www.eclipse.org/jetty )
407-
(Apache License, Version 2.0,EPL 1.0) * Jetty :: XML utilities(org.eclipse.jetty:jetty-xml:9.3.24.v20180605-http://www.eclipse.org/jetty )
408-
(Apache License, Version 2.0,EPL 2.0) * Jetty :: Utilities :: Ajax(JSON)(org.eclipse.jetty:jetty-util-ajax:9.3.27.v20190418-http://www.eclipse.org/jetty )
409-
(Apache License, Version 2.0,LGPL 2.1) * JAX-RS provider for JSON content type(org.codehaus.jackson:jackson-jaxrs:1.9.2-http://jackson.codehaus.org )
410-
(Apache License, Version 2.0,LGPL 2.1) * Xml Compatibility extensions for Jackson(org.codehaus.jackson:jackson-xc:1.9.2-http://jackson.codehaus.org )
411-
(Apache License, Version 2.0,LGPL 2.1,MPL 1.1) * Javassist(org.javassist:javassist:3.21.0-GA-http://www.javassist.org/ )
397+
(Apache License, Version 2.0) * jersey-inject-hk2(org.glassfish.jersey.inject:jersey-hk2:3.0.3-none )
398+
(Apache License, Version 2.0) * Jakarta Annotations API(jakarta.annotation:jakarta.annotation-api:2.0.0-https://projects.eclipse.org/projects/ee4j.ca )
399+
(Apache License, Version 2.0) * jersey-core-server(org.glassfish.jersey.core:jersey-server:3.0.3-none )
400+
(Apache License, Version 2.0) * Jetty :: Http Utility(org.eclipse.jetty:jetty-http:9.3.24.v20180605-http://www.eclipse.org/jetty )
401+
(Apache License, Version 2.0) * Jetty :: IO Utility(org.eclipse.jetty:jetty-io:9.3.24.v20180605-http://www.eclipse.org/jetty )
402+
(Apache License, Version 2.0) * Jetty :: Security(org.eclipse.jetty:jetty-security:9.3.24.v20180605-http://www.eclipse.org/jetty )
403+
(Apache License, Version 2.0) * Jetty :: Server Core(org.eclipse.jetty:jetty-server:9.3.24.v20180605-http://www.eclipse.org/jetty )
404+
(Apache License, Version 2.0) * Jetty :: Servlet Handling(org.eclipse.jetty:jetty-servlet:9.3.24.v20180605-http://www.eclipse.org/jetty )
405+
(Apache License, Version 2.0) * Jetty :: Utilities(org.eclipse.jetty:jetty-util:9.3.24.v20180605-http://www.eclipse.org/jetty )
406+
(Apache License, Version 2.0) * Jetty :: Webapp Application Support(org.eclipse.jetty:jetty-webapp:9.3.24.v20180605-http://www.eclipse.org/jetty )
407+
(Apache License, Version 2.0) * Jetty :: XML utilities(org.eclipse.jetty:jetty-xml:9.3.24.v20180605-http://www.eclipse.org/jetty )
408+
(Apache License, Version 2.0) * Jetty :: Utilities :: Ajax(JSON)(org.eclipse.jetty:jetty-util-ajax:9.3.27.v20190418-http://www.eclipse.org/jetty )
409+
(Apache License, Version 2.0) * JAX-RS provider for JSON content type(org.codehaus.jackson:jackson-jaxrs:1.9.2-http://jackson.codehaus.org )
410+
(Apache License, Version 2.0) * Xml Compatibility extensions for Jackson(org.codehaus.jackson:jackson-xc:1.9.2-http://jackson.codehaus.org )
411+
(Apache License, Version 2.0) * Javassist(org.javassist:javassist:3.21.0-GA-http://www.javassist.org/ )
412412

413413
========================================================================
414414
Third party BSD licenses
@@ -435,13 +435,13 @@ Third party CDDL licenses
435435
The following components are provided under the CDDL License.
436436
See licenses/ for text of these licenses.
437437

438-
(CDDL,GPL1.1,GPL2.0) * HK2 API module(org.glassfish.hk2:hk2-api:2.4.0-b31-none )
439-
(CDDL,GPL1.1,GPL2.0) * HK2 Implementation Utilities(org.glassfish.hk2:hk2-utils:2.4.0-b31-none )
440-
(CDDL,GPL1.1,GPL2.0) * ServiceLocator Default Implementation(org.glassfish.hk2:hk2-locator:2.4.0-b31-none )
441-
(CDDL,GPL1.1,GPL2.0) * aopalliance version 2.4.0-b31 repackaged as a module(org.glassfish.hk2.external:aopalliance-repackaged:2.4.0-b31-none )
442-
(CDDL,GPL2.0) * jsp-api(javax.servlet.jsp:jsp-api:2.1-none )
443-
(CDDL,GPL,GPL2.0) * Java Servlet API(javax.servlet:javax.servlet-api:3.1.0-http://servlet-spec.java.net )
444-
(CDDL,GPL,GPL2.0) * OSGi resource locator bundle - used by various API providers that rely on META-INF/services mechanism to locate providers.(org.glassfish.hk2:osgi-resource-locator:1.0.1-none )
438+
(CDDL) * HK2 API module(org.glassfish.hk2:hk2-api:2.4.0-b31-none )
439+
(CDDL) * HK2 Implementation Utilities(org.glassfish.hk2:hk2-utils:2.4.0-b31-none )
440+
(CDDL) * ServiceLocator Default Implementation(org.glassfish.hk2:hk2-locator:2.4.0-b31-none )
441+
(CDDL) * aopalliance version 2.4.0-b31 repackaged as a module(org.glassfish.hk2.external:aopalliance-repackaged:2.4.0-b31-none )
442+
(CDDL) * jsp-api(javax.servlet.jsp:jsp-api:2.1-none )
443+
(CDDL) * Java Servlet API(javax.servlet:javax.servlet-api:3.1.0-http://servlet-spec.java.net )
444+
(CDDL) * OSGi resource locator bundle - used by various API providers that rely on META-INF/services mechanism to locate providers.(org.glassfish.hk2:osgi-resource-locator:1.0.1-none )
445445

446446
========================================================================
447447
Third party EPL licenses
@@ -455,7 +455,7 @@ See licenses/ for text of these licenses.
455455
(EPL1.0) * Jakarta Activation(com.sun.activation:jakarta.activation:2.0.1-https://jakarta.ee/ )
456456
(EPL1.0) * Jakarta Activation API jar(jakarta.activation:jakarta.activation-api:1.2.2-https://jakarta.ee/specifications/activation/1.2/ )
457457
(EPL1.0) * Old JAXB Core(com.sun.xml.bind:jaxb-core:3.0.2-https://eclipse-ee4j.github.io/jaxb-ri/ )
458-
(EPL2.0,GPL2.0) * jakarta.ws.rs-api(jakarta.ws.rs:jakarta.ws.rs-api:3.0.0-https://github.com/eclipse-ee4j/jaxrs-api )
458+
(EPL2.0) * jakarta.ws.rs-api(jakarta.ws.rs:jakarta.ws.rs-api:3.0.0-https://github.com/eclipse-ee4j/jaxrs-api )
459459

460460
========================================================================
461461
Third party MIT licenses
@@ -464,7 +464,7 @@ Third party MIT licenses
464464
The following components are provided under the MIT License.
465465
See licenses/ for text of these licenses.
466466

467-
(The MIT License,GPL) * Checker Qual(org.checkerframework:checker-qual:2.0.0-http://checkerframework.org )
467+
(The MIT License) * Checker Qual(org.checkerframework:checker-qual:2.0.0-http://checkerframework.org )
468468
(The MIT License) * lightning-csv(org.simpleflatmapper:lightning-csv:8.2.1-http://github.com/arnaudroger/SimpleFlatMapper/lightning-csv )
469469
(The MIT License) * sfm-converter(org.simpleflatmapper:sfm-converter:8.2.1-http://github.com/arnaudroger/SimpleFlatMapper/sfm-converter )
470470
(The MIT License) * sfm-csv(org.simpleflatmapper:sfm-csv:8.2.1-http://github.com/arnaudroger/SimpleFlatMapper/sfm-csv )

0 commit comments

Comments
 (0)