forrest-svn mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cross...@apache.org
Subject svn commit: r1452803 - in /forrest/branches/update_cocoon_2.1.12: ./ lib/core/ site-author/
Date Tue, 05 Mar 2013 14:13:49 GMT
Author: crossley
Date: Tue Mar  5 14:13:48 2013
New Revision: 1452803

URL: http://svn.apache.org/r1452803
Log:
Updated log4j to 1.2.17 and slf4j to 1.7.2
-This line, and those below, will be ignored--

AM   lib/core/slf4j-LICENSE.txt
AM   lib/core/slf4j-api-1.7.2.jar
AM   lib/core/slf4j-log4j12-1.7.2.jar
AM   lib/core/log4j-1.2.17.jar
A  + lib/core/log4j-LICENSE.txt
AM   lib/core/log4j-NOTICE.txt
M    LICENSE.txt
M    site-author/status.xml

Added:
    forrest/branches/update_cocoon_2.1.12/lib/core/log4j-1.2.17.jar   (with props)
    forrest/branches/update_cocoon_2.1.12/lib/core/log4j-LICENSE.txt
      - copied unchanged from r1452765, forrest/branches/update_cocoon_2.1.12/lib/core/log4j-1.2.13.jar.license.txt
    forrest/branches/update_cocoon_2.1.12/lib/core/log4j-NOTICE.txt   (with props)
    forrest/branches/update_cocoon_2.1.12/lib/core/slf4j-LICENSE.txt   (with props)
    forrest/branches/update_cocoon_2.1.12/lib/core/slf4j-api-1.7.2.jar   (with props)
    forrest/branches/update_cocoon_2.1.12/lib/core/slf4j-log4j12-1.7.2.jar   (with props)
Modified:
    forrest/branches/update_cocoon_2.1.12/LICENSE.txt
    forrest/branches/update_cocoon_2.1.12/site-author/status.xml

Modified: forrest/branches/update_cocoon_2.1.12/LICENSE.txt
URL: http://svn.apache.org/viewvc/forrest/branches/update_cocoon_2.1.12/LICENSE.txt?rev=1452803&r1=1452802&r2=1452803&view=diff
==============================================================================
--- forrest/branches/update_cocoon_2.1.12/LICENSE.txt (original)
+++ forrest/branches/update_cocoon_2.1.12/LICENSE.txt Tue Mar  5 14:13:48 2013
@@ -231,7 +231,7 @@ license: lib/core/excalibur-sourceresolv
 license: lib/core/excalibur-store-2.1.jar.license.txt
 license: lib/core/excalibur-xmlutil-2.1.jar.license.txt
 license: lib/core/jcs-1.2.5-dev-20050313.jar.license.txt
-license: lib/core/log4j-1.2.13.jar.license.txt
+license: lib/core/log4j-LICENSE.txt
 license: lib/core/lucene-1.4.3.jar.license.txt
 license: lib/core/xml-commons-resolver.license.txt
 license: lib/core/xmlbeans-1.0.3.jar.license.txt
@@ -346,8 +346,7 @@ license: tools/eclipse/plugins/org.apach
 
 ----------------
 These supporting products are licensed: The MIT License
-license: lib/core/slf4j-api-1.5.11.jar.license.txt
-license: lib/core/slf4j-log4j12-1.5.11.jar.license.txt
+license: lib/core/slf4j-LICENSE.txt
 
 ----------------
 These supporting products are licensed: Common Development and Distribution License (CDDL)
Version 1.0

Added: forrest/branches/update_cocoon_2.1.12/lib/core/log4j-1.2.17.jar
URL: http://svn.apache.org/viewvc/forrest/branches/update_cocoon_2.1.12/lib/core/log4j-1.2.17.jar?rev=1452803&view=auto
==============================================================================
Binary file - no diff available.

Propchange: forrest/branches/update_cocoon_2.1.12/lib/core/log4j-1.2.17.jar
------------------------------------------------------------------------------
    svn:mime-type = application/jar

Added: forrest/branches/update_cocoon_2.1.12/lib/core/log4j-NOTICE.txt
URL: http://svn.apache.org/viewvc/forrest/branches/update_cocoon_2.1.12/lib/core/log4j-NOTICE.txt?rev=1452803&view=auto
==============================================================================
--- forrest/branches/update_cocoon_2.1.12/lib/core/log4j-NOTICE.txt (added)
+++ forrest/branches/update_cocoon_2.1.12/lib/core/log4j-NOTICE.txt Tue Mar  5 14:13:48 2013
@@ -0,0 +1,5 @@
+Apache log4j
+Copyright 2010 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).

Propchange: forrest/branches/update_cocoon_2.1.12/lib/core/log4j-NOTICE.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Added: forrest/branches/update_cocoon_2.1.12/lib/core/slf4j-LICENSE.txt
URL: http://svn.apache.org/viewvc/forrest/branches/update_cocoon_2.1.12/lib/core/slf4j-LICENSE.txt?rev=1452803&view=auto
==============================================================================
--- forrest/branches/update_cocoon_2.1.12/lib/core/slf4j-LICENSE.txt (added)
+++ forrest/branches/update_cocoon_2.1.12/lib/core/slf4j-LICENSE.txt Tue Mar  5 14:13:48 2013
@@ -0,0 +1,24 @@
+Copyright (c) 2004-2008 QOS.ch
+All rights reserved.
+
+Permission is hereby granted, free  of charge, to any person obtaining
+a  copy  of this  software  and  associated  documentation files  (the
+"Software"), to  deal in  the Software without  restriction, including
+without limitation  the rights to  use, copy, modify,  merge, publish,
+distribute,  sublicense, and/or sell  copies of  the Software,  and to
+permit persons to whom the Software  is furnished to do so, subject to
+the following conditions:
+
+The  above  copyright  notice  and  this permission  notice  shall  be
+included in all copies or substantial portions of the Software.
+
+THE  SOFTWARE IS  PROVIDED  "AS  IS", WITHOUT  WARRANTY  OF ANY  KIND,
+EXPRESS OR  IMPLIED, INCLUDING  BUT NOT LIMITED  TO THE  WARRANTIES OF
+MERCHANTABILITY,    FITNESS    FOR    A   PARTICULAR    PURPOSE    AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE,  ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+
+

Propchange: forrest/branches/update_cocoon_2.1.12/lib/core/slf4j-LICENSE.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Added: forrest/branches/update_cocoon_2.1.12/lib/core/slf4j-api-1.7.2.jar
URL: http://svn.apache.org/viewvc/forrest/branches/update_cocoon_2.1.12/lib/core/slf4j-api-1.7.2.jar?rev=1452803&view=auto
==============================================================================
Binary file - no diff available.

Propchange: forrest/branches/update_cocoon_2.1.12/lib/core/slf4j-api-1.7.2.jar
------------------------------------------------------------------------------
    svn:mime-type = application/zip

Added: forrest/branches/update_cocoon_2.1.12/lib/core/slf4j-log4j12-1.7.2.jar
URL: http://svn.apache.org/viewvc/forrest/branches/update_cocoon_2.1.12/lib/core/slf4j-log4j12-1.7.2.jar?rev=1452803&view=auto
==============================================================================
Binary file - no diff available.

Propchange: forrest/branches/update_cocoon_2.1.12/lib/core/slf4j-log4j12-1.7.2.jar
------------------------------------------------------------------------------
    svn:mime-type = application/zip

Modified: forrest/branches/update_cocoon_2.1.12/site-author/status.xml
URL: http://svn.apache.org/viewvc/forrest/branches/update_cocoon_2.1.12/site-author/status.xml?rev=1452803&r1=1452802&r2=1452803&view=diff
==============================================================================
--- forrest/branches/update_cocoon_2.1.12/site-author/status.xml (original)
+++ forrest/branches/update_cocoon_2.1.12/site-author/status.xml Tue Mar  5 14:13:48 2013
@@ -153,6 +153,10 @@
         Added document to facilitate
         <link href="site:upgrading_010">upgrading to v0.10-dev</link>
       </action>
+<!-- 2013-03 -->
+      <action context="code" type="update" dev="AG">
+        Updated log4j to 1.2.17 and slf4j to 1.7.2
+      </action>
 <!-- 2012-01 -->
       <action context="docs" type="update" dev="DC" fixes-bug="FOR-1233">
         Improved documentation about configuring project entities file,



Mime
View raw message