You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pdfbox.apache.org by le...@apache.org on 2014/08/23 14:04:32 UTC
svn commit: r1620019 - in /pdfbox/trunk: ./
app/src/main/appended-resources/META-INF/ jempbox/
preflight-app/src/main/appended-resources/META-INF/
Author: lehmi
Date: Sat Aug 23 12:04:32 2014
New Revision: 1620019
URL: http://svn.apache.org/r1620019
Log:
PDFBOX-2276: removed jempbox subproject, removed Jempbox reference from LICENSE, NOTICE, LICENSE.txt NOTICE.txt
Removed:
pdfbox/trunk/jempbox/
Modified:
pdfbox/trunk/LICENSE.txt
pdfbox/trunk/NOTICE.txt
pdfbox/trunk/app/src/main/appended-resources/META-INF/LICENSE
pdfbox/trunk/app/src/main/appended-resources/META-INF/NOTICE
pdfbox/trunk/pom.xml
pdfbox/trunk/preflight-app/src/main/appended-resources/META-INF/LICENSE
pdfbox/trunk/preflight-app/src/main/appended-resources/META-INF/NOTICE
Modified: pdfbox/trunk/LICENSE.txt
URL: http://svn.apache.org/viewvc/pdfbox/trunk/LICENSE.txt?rev=1620019&r1=1620018&r2=1620019&view=diff
==============================================================================
--- pdfbox/trunk/LICENSE.txt (original)
+++ pdfbox/trunk/LICENSE.txt Sat Aug 23 12:04:32 2014
@@ -207,10 +207,9 @@ Apache PDFBox includes a number of compo
and license terms. Your use of these components is subject to the terms and
conditions of the following licenses.
-Contributions made to the original PDFBox, JempBox and FontBox projects:
+Contributions made to the original PDFBox and FontBox projects:
Copyright (c) 2002-2007, www.pdfbox.org
- Copyright (c) 2006-2007, www.jempbox.org
All rights reserved.
Redistribution and use in source and binary forms, with or without
Modified: pdfbox/trunk/NOTICE.txt
URL: http://svn.apache.org/viewvc/pdfbox/trunk/NOTICE.txt?rev=1620019&r1=1620018&r2=1620019&view=diff
==============================================================================
--- pdfbox/trunk/NOTICE.txt (original)
+++ pdfbox/trunk/NOTICE.txt Sat Aug 23 12:04:32 2014
@@ -4,10 +4,10 @@ Copyright 2014 The Apache Software Found
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
-Based on source code originally developed in the PDFBox, JempBox and
+Based on source code originally developed in the PDFBox and
FontBox projects.
+
Copyright (c) 2002-2007, www.pdfbox.org
-Copyright (c) 2006-2007, www.jempbox.org
Based on source code originally developed in the PaDaF project.
Copyright (c) 2010 Atos Worldline SAS
Modified: pdfbox/trunk/app/src/main/appended-resources/META-INF/LICENSE
URL: http://svn.apache.org/viewvc/pdfbox/trunk/app/src/main/appended-resources/META-INF/LICENSE?rev=1620019&r1=1620018&r2=1620019&view=diff
==============================================================================
--- pdfbox/trunk/app/src/main/appended-resources/META-INF/LICENSE (original)
+++ pdfbox/trunk/app/src/main/appended-resources/META-INF/LICENSE Sat Aug 23 12:04:32 2014
@@ -5,10 +5,9 @@ Apache PDFBox includes a number of compo
and license terms. Your use of these components is subject to the terms and
conditions of the following licenses.
-Contributions made to the original PDFBox, JempBox and FontBox projects:
+Contributions made to the original PDFBox and FontBox projects:
Copyright (c) 2002-2007, www.pdfbox.org
- Copyright (c) 2006-2007, www.jempbox.org
All rights reserved.
Redistribution and use in source and binary forms, with or without
@@ -135,36 +134,3 @@ Glyphlist (http://www.adobe.com/devnet/o
non-infringement of any third party rights regarding the Adobe
materials.
-The International Components for Unicode library (http://site.icu-project.org/)
-
- ICU License - ICU 1.8.1 and later
-
- COPYRIGHT AND PERMISSION NOTICE
-
- Copyright (c) 1995-2009 International Business Machines Corporation and others
-
- 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, and/or sell
- copies of the Software, and to permit persons to whom the Software is
- furnished to do so, provided that the above copyright notice(s) and this
- permission notice appear in all copies of the Software and that both the
- above copyright notice(s) and this permission notice appear in supporting
- documentation.
-
- 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 OF THIRD PARTY RIGHTS.
- IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS NOTICE
- BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES,
- OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
- WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
- ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
- Except as contained in this notice, the name of a copyright holder shall
- not be used in advertising or otherwise to promote the sale, use or other
- dealings in this Software without prior written authorization of the
- copyright holder.
Modified: pdfbox/trunk/app/src/main/appended-resources/META-INF/NOTICE
URL: http://svn.apache.org/viewvc/pdfbox/trunk/app/src/main/appended-resources/META-INF/NOTICE?rev=1620019&r1=1620018&r2=1620019&view=diff
==============================================================================
--- pdfbox/trunk/app/src/main/appended-resources/META-INF/NOTICE (original)
+++ pdfbox/trunk/app/src/main/appended-resources/META-INF/NOTICE Sat Aug 23 12:04:32 2014
@@ -1,4 +1,2 @@
-Based on source code originally developed in the PDFBox, JempBox and
-FontBox projects.
+Based on source code originally developed in the PDFBox and FontBox projects.
Copyright (c) 2002-2007, www.pdfbox.org
-Copyright (c) 2006-2007, www.jempbox.org
Modified: pdfbox/trunk/pom.xml
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pom.xml?rev=1620019&r1=1620018&r2=1620019&view=diff
==============================================================================
--- pdfbox/trunk/pom.xml (original)
+++ pdfbox/trunk/pom.xml Sat Aug 23 12:04:32 2014
@@ -45,7 +45,6 @@
<modules>
<module>parent</module>
<module>fontbox</module>
- <module>jempbox</module>
<module>xmpbox</module>
<module>pdfbox</module>
<module>preflight</module>
Modified: pdfbox/trunk/preflight-app/src/main/appended-resources/META-INF/LICENSE
URL: http://svn.apache.org/viewvc/pdfbox/trunk/preflight-app/src/main/appended-resources/META-INF/LICENSE?rev=1620019&r1=1620018&r2=1620019&view=diff
==============================================================================
--- pdfbox/trunk/preflight-app/src/main/appended-resources/META-INF/LICENSE (original)
+++ pdfbox/trunk/preflight-app/src/main/appended-resources/META-INF/LICENSE Sat Aug 23 12:04:32 2014
@@ -5,10 +5,9 @@ Apache PDFBox includes a number of compo
and license terms. Your use of these components is subject to the terms and
conditions of the following licenses.
-Contributions made to the original PDFBox, JempBox and FontBox projects:
+Contributions made to the original PDFBox and FontBox projects:
Copyright (c) 2002-2007, www.pdfbox.org
- Copyright (c) 2006-2007, www.jempbox.org
All rights reserved.
Redistribution and use in source and binary forms, with or without
@@ -154,36 +153,3 @@ Glyphlist (http://www.adobe.com/devnet/o
non-infringement of any third party rights regarding the Adobe
materials.
-The International Components for Unicode library (http://site.icu-project.org/)
-
- ICU License - ICU 1.8.1 and later
-
- COPYRIGHT AND PERMISSION NOTICE
-
- Copyright (c) 1995-2009 International Business Machines Corporation and others
-
- 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, and/or sell
- copies of the Software, and to permit persons to whom the Software is
- furnished to do so, provided that the above copyright notice(s) and this
- permission notice appear in all copies of the Software and that both the
- above copyright notice(s) and this permission notice appear in supporting
- documentation.
-
- 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 OF THIRD PARTY RIGHTS.
- IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS NOTICE
- BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES,
- OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
- WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
- ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
- Except as contained in this notice, the name of a copyright holder shall
- not be used in advertising or otherwise to promote the sale, use or other
- dealings in this Software without prior written authorization of the
- copyright holder.
Modified: pdfbox/trunk/preflight-app/src/main/appended-resources/META-INF/NOTICE
URL: http://svn.apache.org/viewvc/pdfbox/trunk/preflight-app/src/main/appended-resources/META-INF/NOTICE?rev=1620019&r1=1620018&r2=1620019&view=diff
==============================================================================
--- pdfbox/trunk/preflight-app/src/main/appended-resources/META-INF/NOTICE (original)
+++ pdfbox/trunk/preflight-app/src/main/appended-resources/META-INF/NOTICE Sat Aug 23 12:04:32 2014
@@ -1,4 +1,3 @@
-Based on source code originally developed in the PDFBox, JempBox and
-FontBox projects.
+Based on source code originally developed in the PDFBox and FontBox projects.
Copyright (c) 2002-2007, www.pdfbox.org
-Copyright (c) 2006-2007, www.jempbox.org
+