You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pdfbox.apache.org by ju...@apache.org on 2009/09/25 09:15:34 UTC
svn commit: r818748 - in /incubator/pdfbox/fontbox/trunk: LICENSE.txt
NOTICE.txt pom.xml src/main/appended-resources/
src/main/appended-resources/META-INF/
src/main/appended-resources/META-INF/LICENSE
src/main/appended-resources/META-INF/NOTICE
Author: jukka
Date: Fri Sep 25 07:15:34 2009
New Revision: 818748
URL: http://svn.apache.org/viewvc?rev=818748&view=rev
Log:
PDFBOX-499: Maven pom.xml & directory structure incorrect for the FontBox 0.8-incubating release
Use the remote resource plugin and the appended-resources mechanism to include the licensing metadata files in the generated jar artifact.
Update the wording of the license metadata.
Added:
incubator/pdfbox/fontbox/trunk/src/main/appended-resources/
incubator/pdfbox/fontbox/trunk/src/main/appended-resources/META-INF/
incubator/pdfbox/fontbox/trunk/src/main/appended-resources/META-INF/LICENSE (with props)
incubator/pdfbox/fontbox/trunk/src/main/appended-resources/META-INF/NOTICE (with props)
Modified:
incubator/pdfbox/fontbox/trunk/LICENSE.txt
incubator/pdfbox/fontbox/trunk/NOTICE.txt
incubator/pdfbox/fontbox/trunk/pom.xml
Modified: incubator/pdfbox/fontbox/trunk/LICENSE.txt
URL: http://svn.apache.org/viewvc/incubator/pdfbox/fontbox/trunk/LICENSE.txt?rev=818748&r1=818747&r2=818748&view=diff
==============================================================================
--- incubator/pdfbox/fontbox/trunk/LICENSE.txt (original)
+++ incubator/pdfbox/fontbox/trunk/LICENSE.txt Fri Sep 25 07:15:34 2009
@@ -202,40 +202,35 @@
limitations under the License.
-EXTERNAL COMPONENTS
+CONTRIBUTIONS TO THE ORIGINAL CODEBASE
-Apache JempBox includes a number of components with separate copyright notices
-and license terms. Your use of these components is subject to the terms and
-conditions of the following licenses.
-
-Contributions made to the original JempBox project at www.jempbox.org:
-
- Copyright (c) 2006-2007, www.jempbox.org
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are met:
-
- 1. Redistributions of source code must retain the above copyright notice,
- this list of conditions and the following disclaimer.
-
- 2. 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.
-
- 3. Neither the name of fontbox; 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 REGENTS 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.
+Apache FontBox is based on contributions made to the original FontBox project:
+ Copyright (c) 2006-2007, www.fontbox.org
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+ this list of conditions and the following disclaimer.
+
+ 2. 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.
+
+ 3. Neither the name of fontbox; 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 REGENTS 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.
Modified: incubator/pdfbox/fontbox/trunk/NOTICE.txt
URL: http://svn.apache.org/viewvc/incubator/pdfbox/fontbox/trunk/NOTICE.txt?rev=818748&r1=818747&r2=818748&view=diff
==============================================================================
--- incubator/pdfbox/fontbox/trunk/NOTICE.txt (original)
+++ incubator/pdfbox/fontbox/trunk/NOTICE.txt Fri Sep 25 07:15:34 2009
@@ -4,5 +4,5 @@
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
-Based on source code originally developed at www.fontbox.org.
+Based on source code contributed to the original FontBox project.
Copyright (c) 2006-2007, www.fontbox.org
Modified: incubator/pdfbox/fontbox/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/pdfbox/fontbox/trunk/pom.xml?rev=818748&r1=818747&r2=818748&view=diff
==============================================================================
--- incubator/pdfbox/fontbox/trunk/pom.xml (original)
+++ incubator/pdfbox/fontbox/trunk/pom.xml Fri Sep 25 07:15:34 2009
@@ -61,17 +61,6 @@
</dependencies>
<build>
- <resources>
- <resource>
- <directory>${basedir}</directory>
- <targetPath>META-INF</targetPath>
- <includes>
- <include>NOTICE.txt</include>
- <include>LICENSE.txt</include>
- <include>README.txt</include>
- </includes>
- </resource>
- </resources>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
Added: incubator/pdfbox/fontbox/trunk/src/main/appended-resources/META-INF/LICENSE
URL: http://svn.apache.org/viewvc/incubator/pdfbox/fontbox/trunk/src/main/appended-resources/META-INF/LICENSE?rev=818748&view=auto
==============================================================================
--- incubator/pdfbox/fontbox/trunk/src/main/appended-resources/META-INF/LICENSE (added)
+++ incubator/pdfbox/fontbox/trunk/src/main/appended-resources/META-INF/LICENSE Fri Sep 25 07:15:34 2009
@@ -0,0 +1,32 @@
+CONTRIBUTIONS TO THE ORIGINAL CODEBASE
+
+Apache FontBox is based on contributions made to the original FontBox project:
+
+ Copyright (c) 2006-2007, www.fontbox.org
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+ this list of conditions and the following disclaimer.
+
+ 2. 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.
+
+ 3. Neither the name of fontbox; 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 REGENTS 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.
Propchange: incubator/pdfbox/fontbox/trunk/src/main/appended-resources/META-INF/LICENSE
------------------------------------------------------------------------------
svn:eol-style = native
Added: incubator/pdfbox/fontbox/trunk/src/main/appended-resources/META-INF/NOTICE
URL: http://svn.apache.org/viewvc/incubator/pdfbox/fontbox/trunk/src/main/appended-resources/META-INF/NOTICE?rev=818748&view=auto
==============================================================================
--- incubator/pdfbox/fontbox/trunk/src/main/appended-resources/META-INF/NOTICE (added)
+++ incubator/pdfbox/fontbox/trunk/src/main/appended-resources/META-INF/NOTICE Fri Sep 25 07:15:34 2009
@@ -0,0 +1,2 @@
+Based on source code contributed to the original FontBox project.
+Copyright (c) 2006-2007, www.fontbox.org
Propchange: incubator/pdfbox/fontbox/trunk/src/main/appended-resources/META-INF/NOTICE
------------------------------------------------------------------------------
svn:eol-style = native
Re: svn commit: r818748 - in /incubator/pdfbox/fontbox/trunk: LICENSE.txt NOTICE.txt pom.xml src/main/appended-resources/ src/main/appended-resources/META-INF/ src/main/appended-resources/META-INF/LICENSE src/main/appended-resources/META-INF/NOTICE
Posted by Jeremias Maerki <de...@jeremias-maerki.ch>.
Thanks for the explanation! I'll defer to the Maven-addicts then.
On 25.09.2009 10:18:09 Jukka Zitting wrote:
> Hi,
>
> On Fri, Sep 25, 2009 at 9:29 AM, Jeremias Maerki <de...@jeremias-maerki.ch> wrote:
> > why is this duplication necessary? There's quite a risk now that one of
> > the two NOTICE file is updated at some point and the other isn't.
>
> The appended-resources mechanism comes from the latest
> org.apache:apache parent POM and integrates quite nicely with the
> default build lifecycle without us needing explicit POM customizations
> to get the licensing metadata included in the build result.
>
> It's especially nice for multi-module projects where each produced
> binary may have different licensing metadata, but only a single top
> level LICENSE/NOTICE pair is needed to cover the source distribution.
> The unfortunate corollary of this feature is that for a
> single-component project the licensing metadata typically (though not
> always) is the same for the source and binary packages which leads to
> this duplication.
>
> These files don't change too often and any changes should in any case
> be carefully considered, so I'm personally fine with the need for
> increased effort to avoid inconsistencies due to the duplication. On
> the other hand I don't feel too strongly about this, so I can
> reintroduce the previous mechanism if people prefer that.
>
> BR,
>
> Jukka Zitting
Jeremias Maerki
Re: svn commit: r818748 - in /incubator/pdfbox/fontbox/trunk:
LICENSE.txt NOTICE.txt pom.xml src/main/appended-resources/
src/main/appended-resources/META-INF/ src/main/appended-resources/META-INF/LICENSE
src/main/appended-resources/META-INF/NOTICE
Posted by Jukka Zitting <ju...@gmail.com>.
Hi,
On Fri, Sep 25, 2009 at 9:29 AM, Jeremias Maerki <de...@jeremias-maerki.ch> wrote:
> why is this duplication necessary? There's quite a risk now that one of
> the two NOTICE file is updated at some point and the other isn't.
The appended-resources mechanism comes from the latest
org.apache:apache parent POM and integrates quite nicely with the
default build lifecycle without us needing explicit POM customizations
to get the licensing metadata included in the build result.
It's especially nice for multi-module projects where each produced
binary may have different licensing metadata, but only a single top
level LICENSE/NOTICE pair is needed to cover the source distribution.
The unfortunate corollary of this feature is that for a
single-component project the licensing metadata typically (though not
always) is the same for the source and binary packages which leads to
this duplication.
These files don't change too often and any changes should in any case
be carefully considered, so I'm personally fine with the need for
increased effort to avoid inconsistencies due to the duplication. On
the other hand I don't feel too strongly about this, so I can
reintroduce the previous mechanism if people prefer that.
BR,
Jukka Zitting
Re: svn commit: r818748 - in /incubator/pdfbox/fontbox/trunk: LICENSE.txt NOTICE.txt pom.xml src/main/appended-resources/ src/main/appended-resources/META-INF/ src/main/appended-resources/META-INF/LICENSE src/main/appended-resources/META-INF/NOTICE
Posted by Jeremias Maerki <de...@jeremias-maerki.ch>.
Jukka,
why is this duplication necessary? There's quite a risk now that one of
the two NOTICE file is updated at some point and the other isn't.
On 25.09.2009 09:15:34 jukka wrote:
> Author: jukka
> Date: Fri Sep 25 07:15:34 2009
> New Revision: 818748
>
> URL: http://svn.apache.org/viewvc?rev=818748&view=rev
> Log:
> PDFBOX-499: Maven pom.xml & directory structure incorrect for the FontBox 0.8-incubating release
>
> Use the remote resource plugin and the appended-resources mechanism to include the licensing metadata files in the generated jar artifact.
>
> Update the wording of the license metadata.
>
> Added:
> incubator/pdfbox/fontbox/trunk/src/main/appended-resources/
> incubator/pdfbox/fontbox/trunk/src/main/appended-resources/META-INF/
> incubator/pdfbox/fontbox/trunk/src/main/appended-resources/META-INF/LICENSE (with props)
> incubator/pdfbox/fontbox/trunk/src/main/appended-resources/META-INF/NOTICE (with props)
> Modified:
> incubator/pdfbox/fontbox/trunk/LICENSE.txt
> incubator/pdfbox/fontbox/trunk/NOTICE.txt
> incubator/pdfbox/fontbox/trunk/pom.xml
<snip/>
Jeremias Maerki