Merge branch 'feature/release-prepare' into feature/newCAS-v21.0.0-alpha

Author: cslzchen

etc/cas/config/cas.properties

@@ -15,12 +15,6 @@ cas.server.prefix=${cas.server.name}
 # Tomcat Server
 #
 cas.server.tomcat.server-name=OSF CAS
-# Enable additional HTTP connections for the embedded Tomcat container (when SSL is enabled by default)
-# cas.server.tomcat.http.port=${TOMCAT_HTTP_PORT:80}
-# cas.server.tomcat.http.protocol=org.apache.coyote.http11.Http11NioProtocol
-# cas.server.tomcat.http.enabled=true
-# cas.server.tomcat.http.attributes=
-# e.g. cas.server.tomcat.http.attributes.{attribute-name}={attributeValue}
 ########################################################################################################################
 
 ########################################################################################################################
@@ -92,7 +86,7 @@ cas.authn.osf-api.instn-authn-jwe-secret=${OSF_JWE_SECRET}
 #
 # Path of the XSL file for parsing and transforming XML authentication responses
 #
-cas.authn.osf-api.instn-authn-xsl-location=file:/etc/cas/config/instn-authn.xsl
+cas.authn.osf-api.instn-authn-xsl-location=file:/etc/cas/institutions-auth.xsl
 ########################################################################################################################
 
 ########################################################################################################################
@@ -122,8 +116,6 @@ cas.authn.osf-postgres.jpa.dialect=${OSF_DB_HIBERNATE_DIALECT:io.cos.cas.osf.hib
 cas.jdbc.show-sql=false
 cas.jdbc.gen-ddl=true
 cas.jdbc.case-insensitive=false
-# cas.jdbc.physical-table-names=
-# e.g. cas.jdbc.physical-table-names.{table-name}={new-table-name}
 #
 # General JPA Settings
 #

…ices/local/casarxiv-203948234207241.json …ices/local/casarxiv-203948234207239.jsonetc/cas/services/local/casarxiv-203948234207241.json renamed to etc/cas/services/local/casarxiv-203948234207239.json etc/cas/services/local/casarxiv-203948234207241.json renamed to etc/cas/services/local/casarxiv-203948234207239.json

@@ -3,7 +3,7 @@
   "serviceId" : "^https?://(localhost|127\\.0\\.0\\.1):5000/(login|logout)/?\\?next=https?(%3A|:)(%2F|/)(%2F|/)((local\\.casarxiv\\.org(%3A|:)4200)|((localhost|127\\.0\\.0\\.1)(%3A|:)5000(%2F|/)preprints(%2F|/)casarxiv))($|%2F|/).*",
   "name" : "CasArxiv Preprints",
   "description" : "",
-  "id" : 203948234207241,
+  "id" : 203948234207239,
   "evaluationOrder": 10,
   "logo" : "/images/branded/preprints-casarxiv-logo.png",
   "attributeReleasePolicy": {

src/main/java/io/cos/cas/osf/authentication/exception/InstitutionSsoFailedException.java

@@ -8,7 +8,7 @@
  * Describes an authentication error condition where institution SSO has failed.
  *
  * @author Longze Chen
- * @since 20.2.0
+ * @since 21.0.0
  */
 @NoArgsConstructor
 public class InstitutionSsoFailedException extends AccountException {

src/main/java/io/cos/cas/osf/authentication/exception/TermsOfServiceConsentRequiredException.java

@@ -8,7 +8,7 @@
  * Describes an authentication error condition where a user account needs to agree to OSF's terms of service.
  *
  * @author Longze Chen
- * @since 21.1.0
+ * @since 21.0.0
  */
 @NoArgsConstructor
 public class TermsOfServiceConsentRequiredException extends AccountException {

src/main/java/io/cos/cas/osf/authentication/support/OsfInstitutionUtils.java

@@ -17,7 +17,7 @@
  * This is {@link OsfInstitutionUtils}.
  *
  * @author Longze Chen
- * @since 20.2.0
+ * @since 21.0.0
  */
 @Slf4j
 public final class OsfInstitutionUtils {

src/main/java/io/cos/cas/osf/configuration/model/OsfApiProperties.java

@@ -10,7 +10,7 @@
  * This is {@link OsfApiProperties}.
  *
  * @author Longze Chen
- * @since 20.2.0
+ * @since 21.0.0
  */
 @Getter
 @Setter

src/main/java/io/cos/cas/osf/configuration/model/OsfUrlProperties.java

@@ -17,7 +17,7 @@
  * staging servers) URLs need to be manually put into the flow context for the templates to access.
  *
  * @author Longze Chen
- * @since 20.2.0
+ * @since 21.0.0
  */
 @Getter
 @Setter

src/main/java/io/cos/cas/osf/model/OsfInstitution.java

@@ -14,7 +14,7 @@
  * This is {@link OsfInstitution}.
  *
  * @author Longze Chen
- * @since 20.2.0
+ * @since 21.0.0
  */
 @Entity
 @Table(name = "osf_institution")

src/main/java/io/cos/cas/osf/web/flow/configurer/OsfCasLogoutWebFlowConfigurer.java

@@ -15,7 +15,7 @@
  * This is {@link OsfCasLogoutWebFlowConfigurer}.
  *
  * @author Longze Chen
- * @since 20.2.0
+ * @since 21.0.0
  */
 public class OsfCasLogoutWebFlowConfigurer extends DefaultLogoutWebflowConfigurer {
 

src/main/java/io/cos/cas/osf/web/flow/login/OsfCasPreInitialFlowSetupAction.java

@@ -17,7 +17,7 @@
  * This is {@link OsfCasPreInitialFlowSetupAction}.
  *
  * @author Longze Chen
- * @since 20.2.0
+ * @since 21.0.0
  */
 @RequiredArgsConstructor
 @Slf4j