chore: pre-release prep

uPortal-Project · Jan 19, 2022 · 683a487 · 683a487
1 parent 706ecd3
commit 683a487
Show file tree

Hide file tree

Showing 14 changed files with 301 additions and 126 deletions.
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -1,3 +1,22 @@
+#
+# Licensed to Apereo under one or more contributor license
+# agreements. See the NOTICE file distributed with this work
+# for additional information regarding copyright ownership.
+# Apereo licenses this file to you under the Apache License,
+# Version 2.0 (the "License"); you may not use this file
+# except in compliance with the License.  You may obtain a
+# copy of the License at the following location:
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
 name: CI
 on:
   push:

diff --git a/NOTICE b/NOTICE
@@ -23,58 +23,70 @@ This project includes:
   The famfamfam Silk Icons under the Creative Commons Attribution 3.0 License
     http://www.famfamfam.com/lab/icons/silk/
 
-  AOP alliance under Public Domain
   Apache Commons Codec under Apache License, Version 2.0
-  Apache Commons Compress under The Apache Software 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
   ASM based accessors helper used by json-smart under The Apache Software License, Version 2.0
-  ASM Core under BSD
   AssertJ fluent assertions under Apache License, Version 2.0
-  Bean Validation API under Apache License 2.0
-  Byte Buddy (without dependencies) under The Apache Software License, Version 2.0
-  Byte Buddy Java agent under The Apache Software License, Version 2.0
-  ClassMate under The Apache Software License, Version 2.0
-  Commons Codec under The Apache Software License, Version 2.0
-  Commons IO under The Apache Software License, Version 2.0
+  Byte Buddy (without dependencies) under Apache License, Version 2.0
+  Byte Buddy agent under Apache License, Version 2.0
+  Checker Qual under The MIT License
+  ClassGraph under The MIT License (MIT)
   Commons Lang under The Apache Software License, Version 2.0
   Ehcache Core under The Apache Software License, Version 2.0
   Ehcache Web Filters under The Apache Software License, Version 2.0
-  Expression Language API under Apache License, Version 2.0
-  Guava: Google Core Libraries for Java under The Apache Software License, Version 2.0
-  Hamcrest Core under New BSD License
-  Hamcrest library under New BSD License
-  Hibernate Validator Engine under Apache License 2.0
+  error-prone annotations under Apache 2.0
+  FindBugs-jsr305 under The Apache Software License, Version 2.0
+  Guava InternalFutureFailureAccess and InternalFutures under The Apache Software License, Version 2.0
+  Guava ListenableFuture only under The Apache Software License, Version 2.0
+  Guava: Google Core Libraries for Java under Apache License, Version 2.0
+  Hamcrest under BSD License 3
+  Hamcrest Core under BSD License 3
+  J2ObjC Annotations under The Apache Software License, Version 2.0
   Jackson datatype: jdk8 under The Apache Software License, Version 2.0
   Jackson datatype: JSR310 under The Apache Software License, Version 2.0
   Jackson-annotations under The Apache Software License, Version 2.0
   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
-  JavaServer Pages(TM) API v2.1.1 under CDDL + GPLv2 with classpath exception
+  Jakarta Activation API jar 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
+  JavaServer Pages(TM) API under CDDL + GPLv2 with classpath exception
   javax.annotation API under CDDL + GPLv2 with classpath exception
   JAXB2 Basics - Runtime under BSD-Style License
-  JBoss Logging 3 under Apache License, version 2.0
-  JCL 1.1.1 implemented over SLF4J under MIT License
-  JCL 1.2 implemented over SLF4J under MIT License
+  JCL 1.2 implemented over SLF4J under Apache License, Version 2.0
   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
   JUL to SLF4J bridge under MIT License
   JUnit under Eclipse Public License 1.0
+  JUnit Jupiter (Aggregator) under Eclipse Public License v2.0
+  JUnit Jupiter API under Eclipse Public License v2.0
+  JUnit Jupiter Engine under Eclipse Public License v2.0
+  JUnit Jupiter Params under Eclipse Public License v2.0
+  JUnit Platform Commons under Eclipse Public License v2.0
+  JUnit Platform Engine API under Eclipse Public License v2.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
-  Maven Artifact under The Apache Software License, Version 2.0
-  Maven Model under The Apache Software License, Version 2.0
-  Maven Plugin API under The Apache Software License, Version 2.0
-  Mockito under The MIT License
+  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
   mockito-core under The MIT License
-  Objenesis under Apache 2
+  mockito-junit-jupiter under The MIT License
+  Objenesis under Apache License, Version 2.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
+  org.opentest4j:opentest4j under The Apache License, Version 2.0
   org.xmlunit:xmlunit-core under The Apache Software License, Version 2.0
   Plexus :: Component Annotations under The Apache Software License, Version 2.0
-  Plexus Classworlds under The Apache Software License, Version 2.0
-  Plexus Common Utilities under The Apache Software License, Version 2.0
+  Plexus Classworlds under Apache License, Version 2.0
+  Plexus Common Utilities under Apache License, Version 2.0
   project ':json-path' under The Apache Software License, Version 2.0
   Resource Server API under Apache License Version 2.0
   Resource Server Content under Apache License Version 2.0
@@ -84,26 +96,10 @@ This project includes:
   Resource Server Utilities under Apache License Version 2.0
   Resource Server Webapp under Apache License, Version 2.0
   Rhino under Mozilla Public License
-  servlet-api under Commons Development and Distribution License, Version 1.0
-  Sisu Guava - Core Library under The Apache Software License, Version 2.0
-  Sisu Guice - Core Library under The Apache Software License, Version 2.0
-  Sisu-Inject-Bean : Aggregate OSGi bundle under The Apache Software License, Version 2.0 or Eclipse Public License, Version 1.0
-  Sisu-Inject-Plexus : Aggregate OSGi bundle under Eclipse Public License, Version 1.0
   SLF4J API Module under MIT License
   SnakeYAML under Apache License, Version 2.0
   Spring AOP under Apache License, Version 2.0
   Spring Beans under Apache License, Version 2.0
-  Spring Boot under Apache License, Version 2.0
-  Spring Boot AutoConfigure under Apache License, Version 2.0
-  Spring Boot Cache Starter under Apache License, Version 2.0
-  Spring Boot Json Starter under Apache License, Version 2.0
-  Spring Boot Logging Starter under Apache License, Version 2.0
-  Spring Boot Starter under Apache License, Version 2.0
-  Spring Boot Test under Apache License, Version 2.0
-  Spring Boot Test Auto-Configure under Apache License, Version 2.0
-  Spring Boot Test Starter under Apache License, Version 2.0
-  Spring Boot Tomcat Starter under Apache License, Version 2.0
-  Spring Boot Web Starter under Apache License, Version 2.0
   Spring Commons Logging Bridge under Apache License, Version 2.0
   Spring Context under Apache License, Version 2.0
   Spring Context Support under Apache License, Version 2.0
@@ -112,14 +108,17 @@ This project includes:
   Spring TestContext Framework under Apache License, Version 2.0
   Spring Web under Apache License, Version 2.0
   Spring Web MVC under Apache License, Version 2.0
-  spring-aop under The Apache Software License, Version 2.0
-  spring-asm under The Apache Software License, Version 2.0
-  spring-beans under The Apache Software License, Version 2.0
-  spring-context under The Apache Software License, Version 2.0
-  spring-core under The Apache Software License, Version 2.0
-  spring-expression under The Apache Software License, Version 2.0
-  spring-test under The Apache Software License, Version 2.0
-  spring-web under The Apache Software License, Version 2.0
+  spring-boot under Apache License, Version 2.0
+  spring-boot-autoconfigure under Apache License, Version 2.0
+  spring-boot-starter under Apache License, Version 2.0
+  spring-boot-starter-cache under Apache License, Version 2.0
+  spring-boot-starter-json under Apache License, Version 2.0
+  spring-boot-starter-logging under Apache License, Version 2.0
+  spring-boot-starter-test under Apache License, Version 2.0
+  spring-boot-starter-tomcat under Apache License, Version 2.0
+  spring-boot-starter-web under Apache License, Version 2.0
+  spring-boot-test under Apache License, Version 2.0
+  spring-boot-test-autoconfigure under Apache License, Version 2.0
   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

diff --git a/pom.xml b/pom.xml
@@ -1,3 +1,23 @@
+<!--
+
+    Licensed to Apereo under one or more contributor license
+    agreements. See the NOTICE file distributed with this work
+    for additional information regarding copyright ownership.
+    Apereo licenses this file to you under the Apache License,
+    Version 2.0 (the "License"); you may not use this file
+    except in compliance with the License.  You may obtain a
+    copy of the License at the following location:
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:merge="http://maven.apache.org/plugin-merge" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <parent>
@@ -293,8 +313,8 @@
         </pluginManagement>
         <plugins>
             <plugin>
-                <groupId>com.mycila.maven-license-plugin</groupId>
-                <artifactId>maven-license-plugin</artifactId>
+                <groupId>com.mycila</groupId>
+                <artifactId>license-maven-plugin</artifactId>
                 <configuration>
                     <basedir>${basedir}</basedir>
                     <header>${jasig-short-license-url}</header>

diff --git a/resource-server-api/NOTICE b/resource-server-api/NOTICE
@@ -23,17 +23,17 @@ This project includes:
   The famfamfam Silk Icons under the Creative Commons Attribution 3.0 License
     http://www.famfamfam.com/lab/icons/silk/
 
-  Commons IO under The Apache Software License, Version 2.0
+  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
   JAXB2 Basics - Runtime under BSD-Style License
-  JCL 1.1.1 implemented over SLF4J under MIT License
-  JUnit under Common Public License Version 1.0
+  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
   Resource Server API under Apache License Version 2.0
   SLF4J API Module under MIT License
-  spring-asm under The Apache Software License, Version 2.0
-  spring-core under The Apache Software License, Version 2.0
+  Spring Commons Logging Bridge under Apache License, Version 2.0
+  Spring Core under Apache License, Version 2.0
   XMLUnit for Java under BSD License
 
diff --git a/resource-server-api/pom.xml b/resource-server-api/pom.xml
@@ -1,4 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to Apereo under one or more contributor license
+    agreements. See the NOTICE file distributed with this work
+    for additional information regarding copyright ownership.
+    Apereo licenses this file to you under the Apache License,
+    Version 2.0 (the "License"); you may not use this file
+    except in compliance with the License.  You may obtain a
+    copy of the License at the following location:
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <parent>

diff --git a/resource-server-content/pom.xml b/resource-server-content/pom.xml
@@ -1,4 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to Apereo under one or more contributor license
+    agreements. See the NOTICE file distributed with this work
+    for additional information regarding copyright ownership.
+    Apereo licenses this file to you under the Apache License,
+    Version 2.0 (the "License"); you may not use this file
+    except in compliance with the License.  You may obtain a
+    copy of the License at the following location:
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <parent>

diff --git a/resource-server-core/NOTICE b/resource-server-core/NOTICE
@@ -23,21 +23,21 @@ This project includes:
   The famfamfam Silk Icons under the Creative Commons Attribution 3.0 License
     http://www.famfamfam.com/lab/icons/silk/
 
-  Commons Codec under The Apache Software License, Version 2.0
-  Commons IO under The Apache Software License, Version 2.0
+  Apache Commons Codec under Apache License, Version 2.0
+  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
   JAXB2 Basics - Runtime under BSD-Style License
-  JCL 1.1.1 implemented over SLF4J under MIT License
-  JUnit under Common Public License Version 1.0
+  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
   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-asm under The Apache Software License, Version 2.0
-  spring-core under The Apache Software License, Version 2.0
+  Spring Commons Logging Bridge under Apache License, Version 2.0
+  Spring Core under Apache License, Version 2.0
   XMLUnit for Java under BSD License
   yui compressor under BSD License
 
diff --git a/resource-server-core/pom.xml b/resource-server-core/pom.xml
@@ -1,4 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to Apereo under one or more contributor license
+    agreements. See the NOTICE file distributed with this work
+    for additional information regarding copyright ownership.
+    Apereo licenses this file to you under the Apache License,
+    Version 2.0 (the "License"); you may not use this file
+    except in compliance with the License.  You may obtain a
+    copy of the License at the following location:
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <parent>

diff --git a/resource-server-plugin/NOTICE b/resource-server-plugin/NOTICE
@@ -23,23 +23,23 @@ This project includes:
   The famfamfam Silk Icons under the Creative Commons Attribution 3.0 License
     http://www.famfamfam.com/lab/icons/silk/
 
-  Commons Codec under The Apache Software License, Version 2.0
-  Commons IO under The Apache Software License, Version 2.0
+  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
   Commons Lang under The Apache Software License, Version 2.0
+  javax.annotation API under CDDL + GPLv2 with classpath exception
   JAXB2 Basics - Runtime under BSD-Style License
-  JCL 1.1.1 implemented over SLF4J under MIT License
-  Maven Artifact under The Apache Software License, Version 2.0
-  Maven Model under The Apache Software License, Version 2.0
-  Maven Plugin API under The Apache Software License, Version 2.0
+  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
+  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
-  Plexus Classworlds under The Apache Software License, Version 2.0
-  Plexus Common Utilities under The Apache Software License, Version 2.0
+  Plexus Classworlds under Apache License, Version 2.0
+  Plexus Common Utilities under Apache License, Version 2.0
   Resource Server API under Apache License Version 2.0
   Resource Server Core under Apache License Version 2.0
   Resource Server Plugin under Apache License Version 2.0
-  Sisu Guava - Core Library under The Apache Software License, Version 2.0
-  Sisu Guice - Core Library under The Apache Software License, Version 2.0
-  Sisu-Inject-Bean : Aggregate OSGi bundle under The Apache Software License, Version 2.0 or Eclipse Public License, Version 1.0
-  Sisu-Inject-Plexus : Aggregate OSGi bundle under Eclipse Public License, Version 1.0
   SLF4J API Module under MIT License