Author: rmannibucau
Date: Wed Jan 28 20:52:58 2015
New Revision: 1655464
URL: http://svn.apache.org/r1655464
Log:
removing aspect folder since it seems useless now + updating year in notices +
removing xerox from license
Removed:
commons/proper/jcs/trunk/commons-jcs-core/src/aspect/
Modified:
commons/proper/jcs/trunk/commons-jcs-core/LICENSE.txt
commons/proper/jcs/trunk/commons-jcs-core/NOTICE
commons/proper/jcs/trunk/commons-jcs-core/pom.xml
commons/proper/jcs/trunk/commons-jcs-dist/NOTICE.txt
commons/proper/jcs/trunk/commons-jcs-jcache-extras/NOTICE.txt
commons/proper/jcs/trunk/commons-jcs-jcache-openjpa/NOTICE.txt
commons/proper/jcs/trunk/commons-jcs-jcache/NOTICE.txt
Modified: commons/proper/jcs/trunk/commons-jcs-core/LICENSE.txt
URL:
http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/LICENSE.txt?rev=1655464&r1=1655463&r2=1655464&view=diff
==============================================================================
--- commons/proper/jcs/trunk/commons-jcs-core/LICENSE.txt (original)
+++ commons/proper/jcs/trunk/commons-jcs-core/LICENSE.txt Wed Jan 28 20:52:58
2015
@@ -201,16 +201,3 @@
See the License for the specific language governing permissions and
limitations under the License.
-
--------------------------------------------------------------------------------
-
-Copyright (c) Xerox Corporation 1998-2001. All rights reserved.
-
-Use and copying of this software and preparation of derivative works based
-upon this software are permitted. Any distribution of this software or
-derivative works must comply with all applicable United States export control
-laws.
-
-This software is made available AS IS, and Xerox Corporation makes no warranty
-about the software, its performance or its conformity to any specification.
-
Modified: commons/proper/jcs/trunk/commons-jcs-core/NOTICE
URL:
http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/NOTICE?rev=1655464&r1=1655463&r2=1655464&view=diff
==============================================================================
--- commons/proper/jcs/trunk/commons-jcs-core/NOTICE (original)
+++ commons/proper/jcs/trunk/commons-jcs-core/NOTICE Wed Jan 28 20:52:58 2015
@@ -1,10 +1,6 @@
Apache Commons JCS
-Copyright 2001-2014 The Apache Software Foundation.
-Portions Copyright (c) Xerox Corporation 1998-2001.
+Copyright 2001-2015 The Apache Software Foundation.
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
-See the LICENSE.txt file.
-This product includes software developed at Xerox Corporation.
-See the Xerox part in LICENSE.txt file.
Modified: commons/proper/jcs/trunk/commons-jcs-core/pom.xml
URL:
http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/pom.xml?rev=1655464&r1=1655463&r2=1655464&view=diff
==============================================================================
--- commons/proper/jcs/trunk/commons-jcs-core/pom.xml (original)
+++ commons/proper/jcs/trunk/commons-jcs-core/pom.xml Wed Jan 28 20:52:58 2015
@@ -163,8 +163,6 @@
<artifactId>apache-rat-plugin</artifactId>
<configuration>
<excludes combine.children="append">
- <exclude>src/aspect/org/apache/commons/Trace.aj</exclude>
- <exclude>**/LICENSE.xerox</exclude>
<exclude>**/zipcodes.txt</exclude>
</excludes>
</configuration>
Modified: commons/proper/jcs/trunk/commons-jcs-dist/NOTICE.txt
URL:
http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-dist/NOTICE.txt?rev=1655464&r1=1655463&r2=1655464&view=diff
==============================================================================
--- commons/proper/jcs/trunk/commons-jcs-dist/NOTICE.txt (original)
+++ commons/proper/jcs/trunk/commons-jcs-dist/NOTICE.txt Wed Jan 28 20:52:58
2015
@@ -1,10 +1,6 @@
Apache Commons JCS
-Copyright 2001-2014 The Apache Software Foundation.
-Portions Copyright (c) Xerox Corporation 1998-2001.
+Copyright 2001-2015 The Apache Software Foundation.
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
-See the LICENSE.txt file.
-This product includes software developed at Xerox Corporation.
-See the LICENSE.xerox file.
Modified: commons/proper/jcs/trunk/commons-jcs-jcache-extras/NOTICE.txt
URL:
http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-jcache-extras/NOTICE.txt?rev=1655464&r1=1655463&r2=1655464&view=diff
==============================================================================
--- commons/proper/jcs/trunk/commons-jcs-jcache-extras/NOTICE.txt (original)
+++ commons/proper/jcs/trunk/commons-jcs-jcache-extras/NOTICE.txt Wed Jan 28
20:52:58 2015
@@ -1,7 +1,6 @@
Apache Commons JCS
-Copyright 2001-2014 The Apache Software Foundation.
+Copyright 2001-2015 The Apache Software Foundation.
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
-See the LICENSE.txt file.
Modified: commons/proper/jcs/trunk/commons-jcs-jcache-openjpa/NOTICE.txt
URL:
http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-jcache-openjpa/NOTICE.txt?rev=1655464&r1=1655463&r2=1655464&view=diff
==============================================================================
--- commons/proper/jcs/trunk/commons-jcs-jcache-openjpa/NOTICE.txt (original)
+++ commons/proper/jcs/trunk/commons-jcs-jcache-openjpa/NOTICE.txt Wed Jan 28
20:52:58 2015
@@ -1,7 +1,6 @@
Apache Commons JCS
-Copyright 2001-2014 The Apache Software Foundation.
+Copyright 2001-2015 The Apache Software Foundation.
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
-See the LICENSE.txt file.
Modified: commons/proper/jcs/trunk/commons-jcs-jcache/NOTICE.txt
URL:
http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-jcache/NOTICE.txt?rev=1655464&r1=1655463&r2=1655464&view=diff
==============================================================================
--- commons/proper/jcs/trunk/commons-jcs-jcache/NOTICE.txt (original)
+++ commons/proper/jcs/trunk/commons-jcs-jcache/NOTICE.txt Wed Jan 28 20:52:58
2015
@@ -1,7 +1,6 @@
Apache Commons JCS
-Copyright 2001-2014 The Apache Software Foundation.
+Copyright 2001-2015 The Apache Software Foundation.
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
-See the LICENSE.txt file.
