Skip to content

Commit

Permalink
Correct license in all jars
Browse files Browse the repository at this point in the history
- Copy of licenses are in META-INF of all jars
- Removed old version of licenses
- removed link to code-of-conduct-chat
- removed manifest.mf - not needed anymore

Solves: #631
Solves: #574
asturio committed Jun 24, 2022
1 parent 9b7b485 commit f25ab8b
Showing 14 changed files with 96 additions and 967 deletions.
7 changes: 0 additions & 7 deletions License.md

This file was deleted.

7 changes: 6 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -11,7 +11,6 @@ and bugreports to this GitHub repository.
[![License (MPL)](https://img.shields.io/badge/license-Mozilla%20Public%20License-yellow.svg?style=flat-square)](http://opensource.org/licenses/MPL-2.0)

[![Join the chat at https://gitter.im/LibrePDF/OpenPDF](https://badges.gitter.im/LibrePDF/OpenPDF.svg)](https://gitter.im/LibrePDF/OpenPDF)
[![Join the chat at https://gitter.im/LibrePDF/code_of_conduct](https://badges.gitter.im/LibrePDF/code_of_conduct.svg)](https://gitter.im/LibrePDF/code_of_conduct)

## OpenPDF version 1.3.28 released 2022-05-12 ##

@@ -36,8 +35,14 @@ Add this to your pom.xml file to use the latest version of OpenPDF:

[GNU Lesser General Public License (LGPL), Version 2.1](https://www.gnu.org/licenses/old-licenses/lgpl-2.1)

For a short explanation see https://en.wikipedia.org/wiki/GNU_Lesser_General_Public_License

[Mozilla Public License Version 2.0](http://www.mozilla.org/MPL/2.0/)

For a short explanation see https://en.wikipedia.org/wiki/Mozilla_Public_License

You can find also a nice explanation of these licenses under https://itsfoss.com/open-source-licenses-explained/

We want OpenPDF to consist of source code which is consistently licensed with the LGPL and MPL
licences only. This also means that any new contributions to the project must have a dual LGPL and
MPL license only.
3 changes: 0 additions & 3 deletions manifest.mf

This file was deleted.

25 changes: 18 additions & 7 deletions openpdf-fonts-extra/pom.xml
Original file line number Diff line number Diff line change
@@ -17,14 +17,25 @@
<dependencies>
<dependency>
<groupId>com.github.librepdf</groupId>
<artifactId>openpdf</artifactId>
<version>${project.version}</version>
<artifactId>openpdf</artifactId>
<version>${project.version}</version>
</dependency>

<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<scope>test</scope>
</dependency>
</dependencies>

<build>
<resources>
<resource>
<directory>src/main/resources</directory>
</resource>
<resource>
<directory>../src/main/resources</directory>
</resource>
</resources>
</build>
</project>
3 changes: 3 additions & 0 deletions openpdf/pom.xml
Original file line number Diff line number Diff line change
@@ -83,6 +83,9 @@
<directory>src/main/resources-filtered</directory>
<filtering>true</filtering>
</resource>
<resource>
<directory>../src/main/resources</directory>
</resource>
</resources>
<plugins>
<plugin>
Original file line number Diff line number Diff line change
@@ -1,15 +1,11 @@
Some files use code from different Apache projects.
The source code of these files contains the appropriate copyright notices
as described in the Appendix of http://www.apache.org/licenses/LICENSE-2.0
This is a copy of the text that can be found at that specific URL:

Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/
Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/

TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION

1. Definitions.
1. Definitions.

"License" shall mean the terms and conditions for use, reproduction,
and distribution as defined by Sections 1 through 9 of this document.
@@ -68,18 +64,14 @@ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
on behalf of whom a Contribution has been received by Licensor and
subsequently incorporated within the Work.

2. Grant of Copyright License.

Subject to the terms and conditions of
2. Grant of Copyright License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
copyright license to reproduce, prepare Derivative Works of,
publicly display, publicly perform, sublicense, and distribute the
Work and such Derivative Works in Source or Object form.

3. Grant of Patent License.

Subject to the terms and conditions of
3. Grant of Patent License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
(except as stated in this section) patent license to make, have made,
@@ -95,23 +87,24 @@ Subject to the terms and conditions of
granted to You under this License for that Work shall terminate
as of the date such litigation is filed.

4. Redistribution.

You may reproduce and distribute copies of the
4. Redistribution. You may reproduce and distribute copies of the
Work or Derivative Works thereof in any medium, with or without
modifications, and in Source or Object form, provided that You
meet the following conditions:

* You must give any other recipients of the Work or
(a) You must give any other recipients of the Work or
Derivative Works a copy of this License; and
* You must cause any modified files to carry prominent notices

(b) You must cause any modified files to carry prominent notices
stating that You changed the files; and
* You must retain, in the Source form of any Derivative Works

(c) You must retain, in the Source form of any Derivative Works
that You distribute, all copyright, patent, trademark, and
attribution notices from the Source form of the Work,
excluding those notices that do not pertain to any part of
the Derivative Works; and
* If the Work includes a "NOTICE" text file as part of its

(d) If the Work includes a "NOTICE" text file as part of its
distribution, then any Derivative Works that You distribute must
include a readable copy of the attribution notices contained
within such NOTICE file, excluding those notices that do not
@@ -135,26 +128,20 @@ You may reproduce and distribute copies of the
reproduction, and distribution of the Work otherwise complies with
the conditions stated in this License.

5. Submission of Contributions.

Unless You explicitly state otherwise,
5. Submission of Contributions. Unless You explicitly state otherwise,
any Contribution intentionally submitted for inclusion in the Work
by You to the Licensor shall be under the terms and conditions of
this License, without any additional terms or conditions.
Notwithstanding the above, nothing herein shall supersede or modify
the terms of any separate license agreement you may have executed
with Licensor regarding such Contributions.

6. Trademarks.

This License does not grant permission to use the trade
6. Trademarks. This License does not grant permission to use the trade
names, trademarks, service marks, or product names of the Licensor,
except as required for reasonable and customary use in describing the
origin of the Work and reproducing the content of the NOTICE file.

7. Disclaimer of Warranty.

Unless required by applicable law or
7. Disclaimer of Warranty. Unless required by applicable law or
agreed to in writing, Licensor provides the Work (and each
Contributor provides its Contributions) on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
@@ -164,9 +151,7 @@ Unless required by applicable law or
appropriateness of using or redistributing the Work and assume any
risks associated with Your exercise of permissions under this License.

8. Limitation of Liability.

In no event and under no legal theory,
8. Limitation of Liability. In no event and under no legal theory,
whether in tort (including negligence), contract, or otherwise,
unless required by applicable law (such as deliberate and grossly
negligent acts) or agreed to in writing, shall any Contributor be
@@ -178,9 +163,7 @@ In no event and under no legal theory,
other commercial damages or losses), even if such Contributor
has been advised of the possibility of such damages.

9. Accepting Warranty or Additional Liability.

While redistributing
9. Accepting Warranty or Additional Liability. While redistributing
the Work or Derivative Works thereof, You may choose to offer,
and charge a fee for, acceptance of support, warranty, indemnity,
or other liability obligations and/or rights consistent with this
@@ -191,9 +174,9 @@ While redistributing
incurred by, or claims asserted against, such Contributor by reason
of your accepting any such warranty or additional liability.

END OF TERMS AND CONDITIONS
END OF TERMS AND CONDITIONS

APPENDIX: How to apply the Apache License to your work
APPENDIX: How to apply the Apache License to your work.

To apply the Apache License to your work, attach the following
boilerplate notice, with the fields enclosed by brackets "[]"
@@ -206,14 +189,14 @@ APPENDIX: How to apply the Apache License to your work

Copyright [yyyy] [name of copyright owner]

Licensed under the Apache License, Version 2.0 (the &quot;License&quot;);
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an &quot;AS IS&quot; BASIS,
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
limitations under the License.
470 changes: 0 additions & 470 deletions openpdf/src/main/resources/MPL-1.1.txt

This file was deleted.

437 changes: 0 additions & 437 deletions openpdf/src/main/resources/lgpl.txt

This file was deleted.

11 changes: 11 additions & 0 deletions pdf-swing/pom.xml
Original file line number Diff line number Diff line change
@@ -29,4 +29,15 @@
<artifactId>dom4j</artifactId>
</dependency>
</dependencies>

<build>
<resources>
<resource>
<directory>src/main/resources</directory>
</resource>
<resource>
<directory>../src/main/resources</directory>
</resource>
</resources>
</build>
</project>
11 changes: 11 additions & 0 deletions pdf-toolbox/pom.xml
Original file line number Diff line number Diff line change
@@ -46,4 +46,15 @@
<scope>test</scope>
</dependency>
</dependencies>

<build>
<resources>
<resource>
<directory>src/main/resources</directory>
</resource>
<resource>
<directory>../src/main/resources</directory>
</resource>
</resources>
</build>
</project>
File renamed without changes.
22 changes: 22 additions & 0 deletions src/main/resources/META-INF/LICENSES.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
# Licenses

## Licenses of OpenPDF

### Mozilla Public License Version 2.0

Please see https://www.mozilla.org/en-US/MPL/2.0/ or the attached file
[MPL-2.0.txt](MPL-2.0.txt).

### GNU Lesser General Public License 2.1

Please see https://www.gnu.org/licenses/old-licenses/lgpl-2.1 or the attached file
[LGPL-2.1.md](LGPL-2.1.md).

#### Apache License, Version 2.0

Some files use code from different Apache projects. The source code of these files contains the appropriate copyright
notices as described in the Appendix of `http://www.apache.org/licenses/LICENSE-2.0`.

Please see https://www.apache.org/licenses/LICENSE-2.0 or the attached file
[APACHE-LICENSE-2.0.txt](APACHE-LICENSE-2.0.txt).

File renamed without changes.

0 comments on commit f25ab8b

Please sign in to comment.