You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ja...@apache.org on 2006/12/02 10:34:23 UTC
svn commit: r481530 - in /incubator/ofbiz/trunk: LICENSE NOTICE
framework/base/lib/freemarker-2.3.8.jar framework/base/lib/freemarker.jar
Author: jacopoc
Date: Sat Dec 2 01:34:22 2006
New Revision: 481530
URL: http://svn.apache.org/viewvc?view=rev&rev=481530
Log:
Upgraded Freemarker jar from 2.3.4 to 2.3.8 (downloaded from http://prdownloads.sourceforge.net/freemarker/freemarker-2.3.8.tar.gz).
According to the new conventions, I've also renamed the jar file including the version number and updated the LICENSE and NOTICE files.
Added:
incubator/ofbiz/trunk/framework/base/lib/freemarker-2.3.8.jar
- copied, changed from r480727, incubator/ofbiz/trunk/framework/base/lib/freemarker.jar
Removed:
incubator/ofbiz/trunk/framework/base/lib/freemarker.jar
Modified:
incubator/ofbiz/trunk/LICENSE
incubator/ofbiz/trunk/NOTICE
Modified: incubator/ofbiz/trunk/LICENSE
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/LICENSE?view=diff&rev=481530&r1=481529&r2=481530
==============================================================================
--- incubator/ofbiz/trunk/LICENSE (original)
+++ incubator/ofbiz/trunk/LICENSE Sat Dec 2 01:34:22 2006
@@ -365,7 +365,7 @@
The following libraries distributed with Apache OFBiz are licensed under the
BSD License:
ofbiz/trunk/framework/base/lib/httpunit.jar
-ofbiz/trunk/framework/base/lib/freemarker.jar
+ofbiz/trunk/framework/base/lib/freemarker-2.3.8.jar
ofbiz/trunk/framework/base/lib/junitperf.jar
ofbiz/trunk/framework/entity/lib/jdbc/hsqldb.jar
ofbiz/trunk/specialpurpose/pos/lib/looks-2.0.2.jar
@@ -1155,9 +1155,9 @@
W3C License:
ofbiz/trunk/framework/base/lib/Tidy.jar
=========================================================================
-W3C¨ SOFTWARE NOTICE AND LICENSE
+W3C� SOFTWARE NOTICE AND LICENSE
- Copyright © 1994-2001 World Wide Web Consortium, (Massachusetts Institute of
+ Copyright � 1994-2001 World Wide Web Consortium, (Massachusetts Institute of
Technology, Institut National de Recherche en Informatique et en Automatique,
Keio University). All Rights Reserved. http://www.w3.org/Consortium/Legal/
@@ -1179,7 +1179,7 @@
2. Any pre-existing intellectual property disclaimers, notices, or terms and
conditions. If none exist, a short notice of the following form (hypertext is
preferred, text is permitted) should be used within the body of any
- redistributed or derivative code: "Copyright © [$date-of-software] World Wide
+ redistributed or derivative code: "Copyright � [$date-of-software] World Wide
Web Consortium, (Massachusetts Institute of Technology, Institut National de
Recherche en Informatique et en Automatique, Keio University). All Rights
Reserved. http://www.w3.org/Consortium/Legal/"
@@ -1744,7 +1744,7 @@
publicly, prepare derivative works, distribute, and otherwise use the
Software alone or in any derivative version, provided, however, that
CNRI's License Agreement and CNRI's notice of copyright, i.e.,
- "Copyright ©1996-1999 Corporation for National Research Initiatives;
+ "Copyright �1996-1999 Corporation for National Research Initiatives;
All Rights Reserved" are both retained in the Software, alone or in any
derivative version prepared by Licensee.
Modified: incubator/ofbiz/trunk/NOTICE
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/NOTICE?view=diff&rev=481530&r1=481529&r2=481530
==============================================================================
--- incubator/ofbiz/trunk/NOTICE (original)
+++ incubator/ofbiz/trunk/NOTICE Sat Dec 2 01:34:22 2006
@@ -128,6 +128,13 @@
Aetrion LLC (http://www.aetrion.com/).
=========================================================================
+== Freemarker Notice ==
+=========================================================================
+
+This product includes software developed by the
+Visigoth Software Society (http://www.visigoths.org/).
+
+=========================================================================
== JDBM Notice ==
=========================================================================
@@ -135,7 +142,7 @@
(http://jdbm.sourceforge.net/).
=========================================================================
-== Jetty Notice ==
+== Jetty Notice ==
=========================================================================
==============================================================
Copied: incubator/ofbiz/trunk/framework/base/lib/freemarker-2.3.8.jar (from r480727, incubator/ofbiz/trunk/framework/base/lib/freemarker.jar)
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/framework/base/lib/freemarker-2.3.8.jar?view=diff&rev=481530&p1=incubator/ofbiz/trunk/framework/base/lib/freemarker.jar&r1=480727&p2=incubator/ofbiz/trunk/framework/base/lib/freemarker-2.3.8.jar&r2=481530
==============================================================================
Binary files - no diff available.