chore: pre-release prep

uPortal-Project · Jan 18, 2023 · 56520bb · 56520bb
1 parent 3b863f1
commit 56520bb
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 7 deletions.
diff --git a/NOTICE b/NOTICE
@@ -53,14 +53,17 @@ This project includes:
   Jackson-core under The Apache Software License, Version 2.0
   jackson-databind under The Apache Software License, Version 2.0
   Jackson-module-parameter-names under The Apache Software License, Version 2.0
-  Jakarta Activation API jar under EDL 1.0
+  Jakarta Activation under EDL 1.0
   Jakarta Annotations API under EPL 2.0 or GPL2 w/ CPE
   Jakarta XML Binding API under Eclipse Distribution License - v 1.0
   Java Servlet API under CDDL + GPLv2 with classpath exception
+  JavaBeans Activation Framework API jar under CDDL/GPLv2+CE
   JavaServer Pages(TM) API under CDDL + GPLv2 with classpath exception
   javax.annotation API under CDDL + GPLv2 with classpath exception
+  jaxb-api under CDDL 1.1 or GPL2 w/ CPE
   JAXB2 Basics - Runtime under BSD-Style License
   JCL 1.2 implemented over SLF4J under Apache License, Version 2.0
+  js under Mozilla Public License, Version 1.1
   JSON library from Android SDK under Apache License 2.0
   JSON Small and Fast Parser under The Apache Software License, Version 2.0
   JSONassert under The Apache Software License, Version 2.0
@@ -80,6 +83,7 @@ This project includes:
   mockito-core under The MIT License
   mockito-junit-jupiter under The MIT License
   Objenesis under Apache License, Version 2.0
+  Old JAXB Runtime under Eclipse Distribution License - v 1.0
   org.apiguardian:apiguardian-api under The Apache License, Version 2.0
   org.eclipse.sisu.inject under Eclipse Public License, Version 1.0
   org.eclipse.sisu.plexus under Eclipse Public License, Version 1.0
@@ -96,7 +100,6 @@ This project includes:
   Resource Server Plugin under Apache License Version 2.0
   Resource Server Utilities under Apache License Version 2.0
   Resource Server Webapp under Apache License, Version 2.0
-  Rhino under Mozilla Public License
   SLF4J API Module under MIT License
   SnakeYAML under Apache License, Version 2.0
   Spring AOP under Apache License, Version 2.0
@@ -123,7 +126,6 @@ This project includes:
   tomcat-embed-core under Apache License, Version 2.0
   tomcat-embed-el under Apache License, Version 2.0
   tomcat-embed-websocket under Apache License, Version 2.0
-  webjars-locator under MIT
   webjars-locator-core under MIT
   XMLUnit for Java under BSD License
   yui compressor under BSD License

diff --git a/resource-server-api/NOTICE b/resource-server-api/NOTICE
@@ -26,11 +26,16 @@ This project includes:
   Apache Commons IO under Apache License, Version 2.0
   Commons Lang under The Apache Software License, Version 2.0
   Hamcrest Core under New BSD License
+  Jakarta Activation under EDL 1.0
+  Jakarta XML Binding API under Eclipse Distribution License - v 1.0
+  JavaBeans Activation Framework API jar under CDDL/GPLv2+CE
+  jaxb-api under CDDL 1.1 or GPL2 w/ CPE
   JAXB2 Basics - Runtime under BSD-Style License
   JCL 1.2 implemented over SLF4J under Apache License, Version 2.0
   JUnit under Eclipse Public License 1.0
   Logback Classic Module under Eclipse Public License - v 1.0 or GNU Lesser General Public License
   Logback Core Module under Eclipse Public License - v 1.0 or GNU Lesser General Public License
+  Old JAXB Runtime under Eclipse Distribution License - v 1.0
   Resource Server API under Apache License Version 2.0
   SLF4J API Module under MIT License
   Spring Commons Logging Bridge under Apache License, Version 2.0

diff --git a/resource-server-core/NOTICE b/resource-server-core/NOTICE
@@ -27,14 +27,19 @@ This project includes:
   Apache Commons IO under Apache License, Version 2.0
   Commons Lang under The Apache Software License, Version 2.0
   Hamcrest Core under New BSD License
+  Jakarta Activation under EDL 1.0
+  Jakarta XML Binding API under Eclipse Distribution License - v 1.0
+  JavaBeans Activation Framework API jar under CDDL/GPLv2+CE
+  jaxb-api under CDDL 1.1 or GPL2 w/ CPE
   JAXB2 Basics - Runtime under BSD-Style License
   JCL 1.2 implemented over SLF4J under Apache License, Version 2.0
+  js under Mozilla Public License, Version 1.1
   JUnit under Eclipse Public License 1.0
   Logback Classic Module under Eclipse Public License - v 1.0 or GNU Lesser General Public License
   Logback Core Module under Eclipse Public License - v 1.0 or GNU Lesser General Public License
+  Old JAXB Runtime under Eclipse Distribution License - v 1.0
   Resource Server API under Apache License Version 2.0
   Resource Server Core under Apache License Version 2.0
-  Rhino under Mozilla Public License
   SLF4J API Module under MIT License
   Spring Commons Logging Bridge under Apache License, Version 2.0
   Spring Core under Apache License, Version 2.0

diff --git a/resource-server-plugin/NOTICE b/resource-server-plugin/NOTICE
@@ -27,12 +27,17 @@ This project includes:
   Apache Commons IO under Apache License, Version 2.0
   Apache Commons Lang under Apache License, Version 2.0
   Commons Lang under The Apache Software License, Version 2.0
+  Jakarta Activation under EDL 1.0
+  Jakarta XML Binding API under Eclipse Distribution License - v 1.0
+  JavaBeans Activation Framework API jar under CDDL/GPLv2+CE
   javax.annotation API under CDDL + GPLv2 with classpath exception
+  jaxb-api under CDDL 1.1 or GPL2 w/ CPE
   JAXB2 Basics - Runtime under BSD-Style License
   JCL 1.2 implemented over SLF4J under Apache License, Version 2.0
   Maven Artifact under Apache License, Version 2.0
   Maven Model under Apache License, Version 2.0
   Maven Plugin API under Apache License, Version 2.0
+  Old JAXB Runtime under Eclipse Distribution License - v 1.0
   org.eclipse.sisu.inject under Eclipse Public License, Version 1.0
   org.eclipse.sisu.plexus under Eclipse Public License, Version 1.0
   Plexus :: Component Annotations under The Apache Software License, Version 2.0

diff --git a/resource-server-utils/NOTICE b/resource-server-utils/NOTICE
@@ -39,15 +39,20 @@ This project includes:
   Guava: Google Core Libraries for Java under Apache License, Version 2.0
   Hamcrest Core under New BSD License
   J2ObjC Annotations under The Apache Software License, Version 2.0
+  Jakarta Activation under EDL 1.0
+  Jakarta XML Binding API under Eclipse Distribution License - v 1.0
   Java Servlet API under CDDL + GPLv2 with classpath exception
+  JavaBeans Activation Framework API jar under CDDL/GPLv2+CE
   JavaServer Pages(TM) API under CDDL + GPLv2 with classpath exception
+  jaxb-api under CDDL 1.1 or GPL2 w/ CPE
   JAXB2 Basics - Runtime under BSD-Style License
   JCL 1.2 implemented over SLF4J under Apache License, Version 2.0
   JUnit under Eclipse Public License 1.0
   Logback Classic Module under Eclipse Public License - v 1.0 or GNU Lesser General Public License
   Logback Core Module under Eclipse Public License - v 1.0 or GNU Lesser General Public License
   mockito-core under The MIT License
   Objenesis under Apache License, Version 2.0
+  Old JAXB Runtime under Eclipse Distribution License - v 1.0
   Resource Server API under Apache License Version 2.0
   Resource Server Core under Apache License Version 2.0
   Resource Server Utilities under Apache License Version 2.0

diff --git a/resource-server-webapp/NOTICE b/resource-server-webapp/NOTICE
@@ -25,7 +25,6 @@ This project includes:
 
   Apache Commons Codec under Apache License, Version 2.0
   Apache Commons IO under Apache License, Version 2.0
-  Apache Commons Lang under Apache License, Version 2.0
   Apache Log4j API under Apache License, Version 2.0
   Apache Log4j to SLF4J Adapter under Apache License, Version 2.0
   asm under BSD-3-Clause
@@ -52,9 +51,11 @@ This project includes:
   Jackson-core under The Apache Software License, Version 2.0
   jackson-databind under The Apache Software License, Version 2.0
   Jackson-module-parameter-names under The Apache Software License, Version 2.0
-  Jakarta Activation API jar under EDL 1.0
+  Jakarta Activation under EDL 1.0
   Jakarta Annotations API under EPL 2.0 or GPL2 w/ CPE
   Jakarta XML Binding API under Eclipse Distribution License - v 1.0
+  JavaBeans Activation Framework API jar under CDDL/GPLv2+CE
+  jaxb-api under CDDL 1.1 or GPL2 w/ CPE
   JAXB2 Basics - Runtime under BSD-Style License
   JCL 1.2 implemented over SLF4J under Apache License, Version 2.0
   JSON library from Android SDK under Apache License 2.0
@@ -73,6 +74,7 @@ This project includes:
   mockito-core under The MIT License
   mockito-junit-jupiter under The MIT License
   Objenesis under Apache License, Version 2.0
+  Old JAXB Runtime under Eclipse Distribution License - v 1.0
   org.apiguardian:apiguardian-api under The Apache License, Version 2.0
   org.opentest4j:opentest4j under The Apache License, Version 2.0
   org.xmlunit:xmlunit-core under The Apache Software License, Version 2.0
@@ -108,6 +110,5 @@ This project includes:
   tomcat-embed-core under Apache License, Version 2.0
   tomcat-embed-el under Apache License, Version 2.0
   tomcat-embed-websocket under Apache License, Version 2.0
-  webjars-locator under MIT
   webjars-locator-core under MIT