Merge branch 'master' into dep-upgrades

Conflicts:
	checkstyle-rules.xml
	pom.xml

.travis.yml

@@ -32,7 +32,7 @@ branches:
   - master
 jdk:
 - oraclejdk7
-- oraclejdk8
+# - oraclejdk8
 cache:
   directories:
     - '$HOME/.m2/repository'

NOTICE

@@ -16,7 +16,6 @@ specific language governing permissions and limitations
 under the License.
 
 This project includes:
-  "Java Concurrency in Practice" book annotations under Creative Commons Attribution License
   Annotations for Metrics under Apache License 2.0
   AntLR Parser Generator under BSD License
   AOP alliance under Public Domain
@@ -32,7 +31,6 @@ This project includes:
   Apache Log4j Core under The Apache Software License, Version 2.0
   Apache Log4j SLF4J Binding under The Apache Software License, Version 2.0
   Apache Log4j Web under The Apache Software License, Version 2.0
-  Apache Santuario under The Apache Software License, Version 2.0
   Apache Shiro :: Core under The Apache Software License, Version 2.0
   Apache Velocity under The Apache Software License, Version 2.0
   Apache XML Security for Java under The Apache Software License, Version 2.0
@@ -74,7 +72,16 @@ This project includes:
   Central Authentication Service under Jasig License
   ClassMate under The Apache Software License, Version 2.0
   Code Generation Library under ASF 2.0
-  Collections under The Apache Software License, Version 2.0
+  com.github.coova.jradius:jradius-apps under GNU Lesser General Public License, version 2.1
+  com.github.coova.jradius:jradius-client under GNU Lesser General Public License, version 2.1
+  com.github.coova.jradius:jradius-core under GNU Lesser General Public License, version 2.1
+  com.github.coova.jradius:jradius-dictionary under GNU Lesser General Public License, version 2.1
+  com.github.coova.jradius:jradius-dictionary-min under GNU Lesser General Public License, version 2.1
+  com.github.coova.jradius:jradius-example under GNU Lesser General Public License, version 2.1
+  com.github.coova.jradius:jradius-extended under GNU Lesser General Public License, version 2.1
+  com.github.coova.jradius:jradius-extras under GNU Lesser General Public License, version 2.1
+  com.github.coova.jradius:jradius-server under GNU Lesser General Public License, version 2.1
+  com.github.coova:jradius under GNU Lesser General Public License, version 2.1
   Commons BeanUtils under The Apache Software License, Version 2.0
   Commons Chain under The Apache Software License, Version 2.0
   Commons CLI under The Apache Software License, Version 2.0
@@ -90,15 +97,13 @@ This project includes:
   Commons Pool under The Apache Software License, Version 2.0
   commons-beanutils under Apache License, Version 2.0
   commons-beanutils-core under Apache License, Version 2.0
-  commons-collections under Apache License, Version 2.0
   Core Hibernate O/RM functionality under GNU Lesser General Public License
   Cryptacular Library under Apache 2 or GNU Lesser General Public License
   Digester under The Apache Software License, Version 2.0
   dom4j under BSD License
   ehcache under The Apache Software License, Version 2.0
   Ehcache Core under The Apache Software License, Version 2.0
   Ehcache JCache Implementation under The Apache Software License, Version 2.0
-  ESAPI 2.0 under BSD or Creative Commons 3.0 BY-SA
   Expression Language 2.2 Implementation under CDDL + GPLv2 with classpath exception
   Expression Language 3.0 API under CDDL + GPLv2 with classpath exception
   fastinfoset under Apache License, Version 2.0
@@ -109,7 +114,6 @@ This project includes:
   fongo under The Apache Software License, Version 2.0
   FreeMarker under Apache License, Version 2.0
   GeoJson POJOs for Jackson under The Apache Software License, Version 2.0
-  gnu-crypto under GNU General Public License, with the "library exception"
   Guava: Google Core Libraries for Java under The Apache Software License, Version 2.0
   guice under The Apache Software License, Version 2.0
   Hamcrest Core under New BSD License
@@ -118,7 +122,6 @@ This project includes:
   Hibernate Commons Annotations under GNU Lesser General Public License
   Hibernate JPA Support under GNU Lesser General Public License
   Hibernate Validator Engine under Apache License, Version 2.0
-  HttpClient under Apache License
   HyperSQL Database under HSQLDB License, a BSD open source license
   Inspektr - Aspects under Apache 2.0 License
   Inspektr - Auditing API under Apache 2.0 License
@@ -140,14 +143,14 @@ This project includes:
   Java Persistence API, Version 2.1 under Eclipse Public License (EPL), Version 1.0 or Eclipse Distribution License (EDL), Version 1.0
   Java Servlet API under CDDL + GPLv2 with classpath exception
   Java Transaction API under Commons Development and Distribution License, Version 1.0
-  java-getopt under GNU General Public License, with the "library exception"
   java-support under The Apache Software License, Version 2.0
   JavaBeans Activation Framework (JAF) under Common Development and Distribution License (CDDL) v1.0
   JavaMail API (compat) under CDDL or GPLv2+CE
   Javassist under MPL 1.1 or LGPL 2.1 or Apache License 2.0
   javax.inject under The Apache Software License, Version 2.0
   JAXB CORE under CDDL 1.1 or GPL2 w/ CPE
   JAXB Reference Implementation under CDDL 1.1 or GPL2 w/ CPE
+  JBoss Cache - Core Edition under GNU Lesser General Public License
   JBoss Common Classes under lgpl
   JBoss Logging 3 under Apache License, version 2.0
   JBoss Logging I18n Annotations under Public Domain
@@ -163,7 +166,7 @@ This project includes:
   JGroups under Library (or Lesser) GNU Public License 2.1
   Joda-Time under Apache 2
   jose4j under The Apache Software License, Version 2.0
-  JSR 105 - Java(TM) XML Digital Signature API under JDL license
+  js under Mozilla Public License, Version 1.1
   JSR 353 (JSON Processing) API under Dual license consisting of the CDDL v1.1 and GPL v2
   JSR 353 (JSON Processing) Default Provider under Dual license consisting of the CDDL v1.1 and GPL v2
   JSR-250 Common Annotations for the JavaTM Platform under COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
@@ -191,9 +194,6 @@ This project includes:
   Mockito under The MIT License
   MongoDB Java Driver under The Apache Software License, Version 2.0
   Neko HTML under The Apache Software License, Version 2.0
-  net.jradius:jradius-core under LGPL, v3.0
-  net.jradius:jradius-dictionary under LGPL, v3.0
-  net.sf.ehcache:ehcache-terracotta under Apache License, Version 2.0
   net.shibboleth.idp:idp-attribute-api under Apache License, Version 2.0
   net.shibboleth.idp:idp-attribute-filter-api under Apache License, Version 2.0
   net.shibboleth.idp:idp-attribute-resolver-api under Apache License, Version 2.0
@@ -206,9 +206,9 @@ This project includes:
   net.shibboleth.idp:idp-saml-impl under Apache License, Version 2.0
   net.shibboleth.idp:idp-schema under Apache License, Version 2.0
   net.shibboleth.idp:idp-session-api under Apache License, Version 2.0
-  Not Yet Commons SSL under Apache License v2
   Objenesis under Apache 2
   OGNL - Object Graph Navigation Library under Apache License, Version 2.0
+  ON Enterprise Server JAR under GNU Lesser General Public License (LGPL)
   OpenID4Java under Apache 2
   OpenSAML :: Core under The Apache Software License, Version 2.0
   OpenSAML :: Messaging API under The Apache Software License, Version 2.0
@@ -222,11 +222,7 @@ This project includes:
   OpenSAML :: Storage API under The Apache Software License, Version 2.0
   OpenSAML :: XML Security API under The Apache Software License, Version 2.0
   OpenSAML :: XML Security Implementation under The Apache Software License, Version 2.0
-  OpenSAML-J under Apache 2
-  OpenWS under Apache 2
-  org.jboss.cache:jbosscache-core under LGPL, v2.1
   org.samba.jcifs:jcifs-ext under GNU LESSER GENERAL PUBLIC LICENSE, Version 2.1
-  org.terracotta:terracotta-toolkit-1.0-runtime under Terracotta Public License, http://www.terracotta.org/legal/terracotta-public-license
   pac4j core under The Apache Software License, Version 2.0
   pac4j for HTTP protocol under The Apache Software License, Version 2.0
   pac4j for OAuth protocol under The Apache Software License, Version 2.0
@@ -240,7 +236,6 @@ This project includes:
   Restlet Extension - Servlet under Apache 2.0 license or LGPL 3.0 license or LGPL 2.1 license or CDDL 1.0 license or EPL 1.0 license
   Restlet Extension - SLF4J under Apache 2.0 license or LGPL 3.0 license or LGPL 2.1 license or CDDL 1.0 license or EPL 1.0 license
   Restlet Extension - Spring Framework under Apache 2.0 license or LGPL 3.0 license or LGPL 2.1 license or CDDL 1.0 license or EPL 1.0 license
-  Rhino under Mozilla Public License
   Scribe OAuth Library under MIT
   servlet-api under Commons Development and Distribution License, Version 1.0
   SLF4J API Module under MIT License
@@ -276,11 +271,5 @@ This project includes:
   UnboundID LDAP SDK for Java under GNU General Public License version 2 (GPLv2) or GNU Lesser General Public License version 2.1 (LGPLv2.1) or UnboundID LDAP SDK Free Use License
   VT Crypt Library under Apache 2 or GNU Lesser General Public License
   Woodstox under The Apache Software License, Version 2.0
-  Xalan Java under The Apache Software License, Version 2.0
-  Xalan Java Serializer under The Apache Software License, Version 2.0
-  Xerces2 Java Parser under The Apache Software License, Version 2.0
-  Xerces2-j under The Apache Software License, Version 2.0
   XML Commons External Components XML APIs under The Apache Software License, Version 2.0 or The SAX License or The W3C License
-  XML Commons Resolver Component under The Apache Software License, Version 2.0
-  XMLTooling-J under Apache 2
 

cas-management-webapp/NOTICE

@@ -16,7 +16,6 @@ specific language governing permissions and limitations
 under the License.
 
 This project includes:
-  "Java Concurrency in Practice" book annotations under Creative Commons Attribution License
   Annotations for Metrics under Apache License 2.0
   AntLR Parser Generator under BSD License
   AOP alliance under Public Domain
@@ -30,8 +29,6 @@ This project includes:
   Apache Log4j Core under The Apache Software License, Version 2.0
   Apache Log4j SLF4J Binding under The Apache Software License, Version 2.0
   Apache Log4j Web under The Apache Software License, Version 2.0
-  Apache Santuario under The Apache Software License, Version 2.0
-  Apache Velocity under The Apache Software License, Version 2.0
   Apereo CAS Core under Apache 2
   Apereo CAS Core APIs under Apache 2
   Apereo CAS Generic Support under Apache 2
@@ -48,11 +45,9 @@ This project includes:
   Commons IO under The Apache Software License, Version 2.0
   Commons JEXL under The Apache Software License, Version 2.0
   Commons Logging under The Apache Software License, Version 2.0
-  commons-collections under Apache License, Version 2.0
   Core Hibernate O/RM functionality under GNU Lesser General Public License
   Cryptacular Library under Apache 2 or GNU Lesser General Public License
   dom4j under BSD License
-  ESAPI 2.0 under BSD or Creative Commons 3.0 BY-SA
   Expression Language 2.2 Implementation under CDDL + GPLv2 with classpath exception
   Expression Language 3.0 API under CDDL + GPLv2 with classpath exception
   fastinfoset under Apache License, Version 2.0
@@ -61,7 +56,6 @@ This project includes:
   Hamcrest Core under New BSD License
   Hibernate Commons Annotations under GNU Lesser General Public License
   Hibernate Validator Engine under Apache License, Version 2.0
-  HttpClient under Apache License
   Inspektr - Aspects under Apache 2.0 License
   Inspektr - Auditing API under Apache 2.0 License
   Inspektr - Common API under Apache 2.0 License
@@ -101,17 +95,13 @@ This project includes:
   JUL to SLF4J bridge under MIT License
   JUnit under Eclipse Public License 1.0
   JVM Integration for Metrics under Apache License 2.0
-  Lang under The Apache Software License, Version 2.0
   LDAPTIVE under Apache 2 or GNU Lesser General Public License
   Metrics Core under Apache License 2.0
   Metrics Health Checks under Apache License 2.0
   Metrics Utility Servlets under Apache License 2.0
   Mockito under The MIT License
-  Not Yet Commons SSL under Apache License v2
   Objenesis under Apache 2
   OGNL - Object Graph Navigation Library under Apache License, Version 2.0
-  OpenSAML-J under Apache 2
-  OpenWS under Apache 2
   Person Directory API under Apache License Version 2.0
   Person Directory Implementations under Apache License Version 2.0
   quartz under The Apache Software License, Version 2.0
@@ -142,10 +132,5 @@ This project includes:
   Stax2 API under The BSD License
   Streaming API for XML under Sun Binary Code License
   Woodstox under The Apache Software License, Version 2.0
-  Xalan Java under The Apache Software License, Version 2.0
-  Xalan Java Serializer under The Apache Software License, Version 2.0
-  Xerces2-j under The Apache Software License, Version 2.0
   XML Commons External Components XML APIs under The Apache Software License, Version 2.0 or The SAX License or The W3C License
-  XML Commons Resolver Component under The Apache Software License, Version 2.0
-  XMLTooling-J under Apache 2
 

cas-management-webapp/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.jasig.cas</groupId>
         <artifactId>cas-server</artifactId>
-        <version>4.1.0-RC3-SNAPSHOT</version>
+        <version>4.2.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>cas-management-webapp</artifactId>

cas-server-core-api/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <artifactId>cas-server</artifactId>
         <groupId>org.jasig.cas</groupId>
-        <version>4.1.0-RC3-SNAPSHOT</version>
+        <version>4.2.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>cas-server-core-api</artifactId>

cas-server-core/pom.xml

@@ -22,7 +22,7 @@
   <parent>
     <artifactId>cas-server</artifactId>
     <groupId>org.jasig.cas</groupId>
-    <version>4.1.0-RC3-SNAPSHOT</version>
+    <version>4.2.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>cas-server-core</artifactId>

cas-server-core/src/main/java/org/jasig/cas/CasEnvironmentContextListener.java

@@ -76,8 +76,9 @@ public void logEnvironmentInfo() {
     private String collectEnvironmentInfo() {
         final Properties properties = System.getProperties();
         final Formatter formatter = new Formatter();
-        formatter.format("\n******************** Welcome to CAS ********************\n");
+        formatter.format("\n******************** Welcome to CAS *****************\n");
         formatter.format("CAS Version: %s\n", CasVersion.getVersion());
+        formatter.format("Build Date/Time: %s\n", CasVersion.getDateTime());
         formatter.format("Java Home: %s\n", properties.get("java.home"));
         formatter.format("Java Vendor: %s\n", properties.get("java.vendor"));
         formatter.format("Java Version: %s\n", properties.get("java.version"));

cas-server-core/src/main/java/org/jasig/cas/CasVersion.java

@@ -18,12 +18,16 @@
  */
 package org.jasig.cas;
 
+import org.joda.time.DateTime;
+
+import java.io.File;
+import java.net.URL;
+
 /**
  * Class that exposes the CAS version. Fetches the "Implementation-Version"
  * manifest attribute from the jar file.
  *
  * @author Dmitriy Kopylenko
-
  * @since 3.0.0
  */
 public final class CasVersion {
@@ -43,4 +47,27 @@ private CasVersion() {
     public static String getVersion() {
         return CasVersion.class.getPackage().getImplementationVersion();
     }
+
+    /**
+     * Gets last modified date/time for the module.
+     * @return the date/time
+     */
+    public static DateTime getDateTime() {
+        try {
+            final Class clazz = CasVersion.class;
+            final URL resource = clazz.getResource(clazz.getSimpleName() + ".class");
+            if ("file".equals(resource.getProtocol())) {
+                return new DateTime(new File(resource.toURI()).lastModified());
+            } else if ("jar".equals(resource.getProtocol())) {
+                final String path = resource.getPath();
+                final File file = new File(path.substring(5, path.indexOf('!')));
+                return new DateTime(file.lastModified());
+            }
+            throw new IllegalArgumentException("Unhandled url protocol: "
+                        + resource.getProtocol() + " for class: "
+                        + clazz.getName() + " resource: " + resource);
+        } catch (final Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
 }