From b0044cd0758dbb187bac267942988be40d159792 Mon Sep 17 00:00:00 2001 From: Scott Battaglia Date: Sat, 23 Oct 2010 03:49:49 +0000 Subject: [PATCH] NOJIRA: upgrade to Java 1.5, upgrade Clover, Ehcache version, switch to 3.2.0-SNAPSHOT, and Jasig Parent pom. Switch to Apache license. --- LICENSE | 50 ++++++++++++++++ cas-client-core/pom.xml | 2 +- cas-client-integration-atlassian/pom.xml | 2 +- cas-client-integration-jboss/pom.xml | 2 +- cas-client-integration-tomcat-common/pom.xml | 2 +- cas-client-integration-tomcat-v6/pom.xml | 2 +- cas-client-integration-tomcat-v7/pom.xml | 2 +- .../pom.xml | 4 +- .../pom.xml | 47 +-------------- pom.xml | 60 ++++++++++++------- 10 files changed, 96 insertions(+), 77 deletions(-) create mode 100644 LICENSE diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..eef3493 --- /dev/null +++ b/LICENSE @@ -0,0 +1,50 @@ +==== + Licensed to Jasig under one or more contributor license + agreements. See the NOTICE file distributed with this work + for additional information regarding copyright ownership. + Jasig 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: + + 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. +==== + +License for Use + +Copyright (c) 2007, JA-SIG, Inc. + +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + + * Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + + * Neither the name of the JA-SIG, Inc. nor the names of its contributors + may be used to endorse or promote products derived from this software + without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR +CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR +PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF +LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. \ No newline at end of file diff --git a/cas-client-core/pom.xml b/cas-client-core/pom.xml index 90d9705..75a1930 100644 --- a/cas-client-core/pom.xml +++ b/cas-client-core/pom.xml @@ -1,7 +1,7 @@ org.jasig.cas.client - 3.1.13-SNAPSHOT + 3.2.0-SNAPSHOT cas-client 4.0.0 diff --git a/cas-client-integration-atlassian/pom.xml b/cas-client-integration-atlassian/pom.xml index c218fe9..ee9478d 100644 --- a/cas-client-integration-atlassian/pom.xml +++ b/cas-client-integration-atlassian/pom.xml @@ -1,7 +1,7 @@ org.jasig.cas.client - 3.1.13-SNAPSHOT + 3.2.0-SNAPSHOT cas-client 4.0.0 diff --git a/cas-client-integration-jboss/pom.xml b/cas-client-integration-jboss/pom.xml index c4bb546..883ba48 100644 --- a/cas-client-integration-jboss/pom.xml +++ b/cas-client-integration-jboss/pom.xml @@ -1,7 +1,7 @@ org.jasig.cas.client - 3.1.13-SNAPSHOT + 3.2.0-SNAPSHOT cas-client 4.0.0 diff --git a/cas-client-integration-tomcat-common/pom.xml b/cas-client-integration-tomcat-common/pom.xml index 0d61a48..9a28977 100644 --- a/cas-client-integration-tomcat-common/pom.xml +++ b/cas-client-integration-tomcat-common/pom.xml @@ -3,7 +3,7 @@ cas-client org.jasig.cas.client - 3.1.13-SNAPSHOT + 3.2.0-SNAPSHOT 4.0.0 diff --git a/cas-client-integration-tomcat-v6/pom.xml b/cas-client-integration-tomcat-v6/pom.xml index c275f6e..099a631 100644 --- a/cas-client-integration-tomcat-v6/pom.xml +++ b/cas-client-integration-tomcat-v6/pom.xml @@ -3,7 +3,7 @@ cas-client org.jasig.cas.client - 3.1.13-SNAPSHOT + 3.2.0-SNAPSHOT 4.0.0 diff --git a/cas-client-integration-tomcat-v7/pom.xml b/cas-client-integration-tomcat-v7/pom.xml index 49c6005..bae234f 100644 --- a/cas-client-integration-tomcat-v7/pom.xml +++ b/cas-client-integration-tomcat-v7/pom.xml @@ -3,7 +3,7 @@ cas-client org.jasig.cas.client - 3.1.13-SNAPSHOT + 3.2.0-SNAPSHOT 4.0.0 diff --git a/cas-client-support-distributed-ehcache/pom.xml b/cas-client-support-distributed-ehcache/pom.xml index ef3cba3..71600c9 100644 --- a/cas-client-support-distributed-ehcache/pom.xml +++ b/cas-client-support-distributed-ehcache/pom.xml @@ -3,7 +3,7 @@ cas-client org.jasig.cas.client - 3.1.13-SNAPSHOT + 3.2.0-SNAPSHOT 4.0.0 Jasig CAS Client for Java - Distributed Proxy Storage Support: EhCache @@ -23,7 +23,7 @@ net.sf.ehcache - ehcache + ehcache-core ${ehcache.version} compile jar diff --git a/cas-client-support-distributed-memcached/pom.xml b/cas-client-support-distributed-memcached/pom.xml index f270dc9..f7ecdc7 100644 --- a/cas-client-support-distributed-memcached/pom.xml +++ b/cas-client-support-distributed-memcached/pom.xml @@ -3,7 +3,7 @@ cas-client org.jasig.cas.client - 3.1.13-SNAPSHOT + 3.2.0-SNAPSHOT 4.0.0 @@ -30,49 +30,4 @@ provided - - - src/main/java - src/test/java - - - src/test/resources - false - - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.5 - 1.5 - - - - org.apache.maven.plugins - maven-surefire-plugin - - - **/*Tests* - - - - - org.apache.maven.plugins - maven-clover-plugin - - ${basedir}/src/test/clover/clover.license - - - - pre-site - - instrument - - - - - - \ No newline at end of file diff --git a/pom.xml b/pom.xml index a8cd745..c468485 100644 --- a/pom.xml +++ b/pom.xml @@ -1,12 +1,12 @@ - oss-parent - org.sonatype.oss - 5 - + org.jasig.parent + jasig-parent + 22 + 4.0.0 org.jasig.cas.client - 3.1.13-SNAPSHOT + 3.2.0-SNAPSHOT cas-client pom JA-SIG CAS Client for Java @@ -18,7 +18,7 @@ JIRA http://www.ja-sig.org/issues - + scm:svn:https://source.jasig.org/cas-clients/java-client/trunk scm:svn:https://source.jasig.org/cas-clients/java-client/trunk https://source.jasig.org/cas-clients/java-client/trunk @@ -40,13 +40,6 @@ -5 - - - JA-SIG License for Use - http://www.ja-sig.org/products/cas/overview/license/ - repo - - JA-SIG http://www.jasig.org @@ -67,8 +60,8 @@ org.apache.maven.plugins maven-compiler-plugin - 1.4 - 1.4 + 1.5 + 1.5 @@ -80,22 +73,42 @@ - - org.apache.maven.plugins - maven-clover-plugin + + com.atlassian.maven.plugins + maven-clover2-plugin + ${clover.version} - ${basedir}/src/test/clover/clover.license + 4UXb6xR2KpyJJkUM3laUDMilMoRmc +RrQqsWMNNPqpqNoOPpRxUQnpnnnMpOpQqrwvUwQWsTqsuW +NwXMoqnmqmUUnosrspqmmmmmmUUnosrspqmmmmmmUUA1jJ +97W9kZkUUnmm]]> + 1.5 + true + true + + **/*.java + + + if.*\(log\.is.*\).* + ^.*log\..* + + + public String toString\(\).* + + log,iflog,toString,property - pre-site + verify instrument - - + + + @@ -145,6 +158,7 @@ - 1.5.0 + 2.2.0 + 3.0.2