Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Openpdf #174

Closed
wants to merge 19 commits into from
Closed

Openpdf #174

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
9f202df
Add Travis CI file for continuous integration.
rosdal Mar 17, 2017
7baa6d8
Test Travis CI.
rosdal Mar 17, 2017
d63f171
Switch from OracleJDK to OpenJDK8
asturio Oct 16, 2020
972936b
Bump junit from 4.12 to 4.13.1 in /flying-saucer-pdf
dependabot[bot] Sep 13, 2021
c8cf7d6
Bump junit from 4.10 to 4.13.1 in /flying-saucer-core
dependabot[bot] Sep 13, 2021
7550523
Bump junit from 4.10 to 4.13.1 in /flying-saucer-fop
dependabot[bot] Sep 13, 2021
ade844c
Bump bcprov-jdk14 from 1.64 to 1.67 in /flying-saucer-pdf
dependabot[bot] Sep 13, 2021
87a6d88
Using openpdf per default
asturio Dec 25, 2017
9213008
Artefact renamed.
asturio Dec 26, 2017
1b598bd
OpenPDF Branch
asturio Dec 26, 2017
bfba763
Update for 9.1.18 release
pbrant Mar 5, 2019
c27382f
Update OpenPDF
asturio Nov 5, 2020
4c20871
Update openpdf to 1.3.26
asturio Oct 5, 2021
187c31d
remove absolute path prefix for licenses when copied into target by m…
nickbreen Oct 28, 2021
f5cb224
Merge pull request #179 from nickbreen/master
pbrant Oct 29, 2021
ba7eea4
Update openpdf to 1.3.27
asturio Apr 7, 2022
779bdf1
Merge branch 'master' of https://github.com/flyingsaucerproject/flyin…
asturio Apr 7, 2022
965d692
Merge branch 'openpdf' of https://github.com/flyingsaucerproject/flyi…
asturio Apr 7, 2022
265b018
Update openpdf to 1.3.27
asturio Apr 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 0 additions & 10 deletions .cvsignore
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions .hgignore
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions flying-saucer-core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.10</version>
<version>4.13.1</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down Expand Up @@ -77,7 +77,7 @@
<instructions>
<Bundle-SymbolicName>org.xhtmlrenderer.flying.saucer.core</Bundle-SymbolicName>
<Bundle-Version>${project.version}</Bundle-Version>
<!-- Dependency resolution seems not to work properly with default
<!-- Dependency resolution seems not to work properly with default
behavior of importing the exported packages. -->
<Import-Package>!org.xhtmlrenderer.*</Import-Package>
<Export-Package>org.xhtmlrenderer.*</Export-Package>
Expand Down
8 changes: 4 additions & 4 deletions flying-saucer-fop/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.10</version>
<version>4.13.1</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down Expand Up @@ -137,11 +137,11 @@
<instructions>
<Bundle-SymbolicName>org.xhtmlrenderer.flying.saucer.fop</Bundle-SymbolicName>
<Bundle-Version>${project.version}</Bundle-Version>
<!-- Dependency resolution seems not to work properly with default
<!-- Dependency resolution seems not to work properly with default
behavior of importing the exported packages. -->
<Import-Package>!org.xhtmlrenderer.*,*</Import-Package>
<!-- Do not export package org.xhtmlrenderer.simple as it is already
exported by flying-saucer-core and this would lead to a split package without
<!-- Do not export package org.xhtmlrenderer.simple as it is already
exported by flying-saucer-core and this would lead to a split package without
correctly marking it as such. -->
<Export-Package>!org.xhtmlrenderer.simple,org.xhtmlrenderer.*</Export-Package>
</instructions>
Expand Down
4 changes: 2 additions & 2 deletions flying-saucer-log4j/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,9 +77,9 @@
</executions>
<configuration>
<instructions>
<Bundle-SymbolicName>org.xhtmlrenderer.flying.saucer.pdf.itext5</Bundle-SymbolicName>
<Bundle-SymbolicName>org.xhtmlrenderer.flying.saucer.log4j</Bundle-SymbolicName>
<Bundle-Version>${project.version}</Bundle-Version>
<!-- Dependency resolution seems not to work properly with default
<!-- Dependency resolution seems not to work properly with default
behavior of importing the exported packages. -->
<Import-Package>!org.xhtmlrenderer.*,*</Import-Package>
<Export-Package>org.xhtmlrenderer.*</Export-Package>
Expand Down
6 changes: 3 additions & 3 deletions flying-saucer-pdf-itext5/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,11 +79,11 @@
<instructions>
<Bundle-SymbolicName>org.xhtmlrenderer.flying.saucer.pdf.itext5</Bundle-SymbolicName>
<Bundle-Version>${project.version}</Bundle-Version>
<!-- Dependency resolution seems not to work properly with default
<!-- Dependency resolution seems not to work properly with default
behavior of importing the exported packages. -->
<Import-Package>!org.xhtmlrenderer.*,*</Import-Package>
<!-- Do not export package org.xhtmlrenderer.simple as it is
already exported by flying-saucer-core and this would lead to a split package
<!-- Do not export package org.xhtmlrenderer.simple as it is
already exported by flying-saucer-core and this would lead to a split package
without correctly marking it as such. -->
<Export-Package>!org.xhtmlrenderer.simple,org.xhtmlrenderer.*</Export-Package>
</instructions>
Expand Down
7 changes: 3 additions & 4 deletions flying-saucer-pdf-osgi/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,17 +36,16 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>3.2.0</version>
<extensions>true</extensions>
<configuration>
<instructions>
<Bundle-SymbolicName>org.xhtmlrenderer.flying.saucer.pdf.osgi</Bundle-SymbolicName>
<Bundle-Version>${project.version}</Bundle-Version>
<!-- This bundle re-bundles the original flying-saucer-pdf artifact
<!-- This bundle re-bundles the original flying-saucer-pdf artifact
and only needs to import packages from flying-saucer-core. -->
<Import-Package>org.xhtmlrenderer.*</Import-Package>
<!-- Do not export package org.xhtmlrenderer.simple as it is
already exported by flying-saucer-core and this would lead to a split package
<!-- Do not export package org.xhtmlrenderer.simple as it is
already exported by flying-saucer-core and this would lead to a split package
without correctly marking it as such. -->
<Export-Package>!org.xhtmlrenderer.simple,org.xhtmlrenderer.*</Export-Package>
<Embed-Dependency>*;scope=compile|runtime;artifactId=!flying-saucer-core</Embed-Dependency>
Expand Down
7 changes: 2 additions & 5 deletions flying-saucer-pdf/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,8 @@
<description>Flying Saucer is a CSS 2.1 renderer written in Java. This artifact supports PDF output. (OpenPDF)</description>

<properties>
<bouncycastle.version>1.64</bouncycastle.version>
<junit.version>4.12</junit.version>
<openpdf.version>1.3.11</openpdf.version>
<itext.version>2.1.7</itext.version>
<bouncycastle.version>1.67</bouncycastle.version>
<junit.version>4.13.1</junit.version>
</properties>

<licenses>
Expand All @@ -41,7 +39,6 @@
<dependency>
<groupId>com.github.librepdf</groupId>
<artifactId>openpdf</artifactId>
<version>${openpdf.version}</version>
</dependency>
<dependency>
<groupId>org.xhtmlrenderer</groupId>
Expand Down
2 changes: 1 addition & 1 deletion flying-saucer-swt-examples/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

<name>Flying Saucer SWT Examples</name>
<description>Examples that use SWT. It is not deployed with a release.</description>

<licenses>
<license>
<name>GNU Lesser General Public License (LGPL), version 2.1 or later</name>
Expand Down
6 changes: 3 additions & 3 deletions flying-saucer-swt/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,11 +136,11 @@
<instructions>
<Bundle-SymbolicName>org.xhtmlrenderer.flying.saucer.swt</Bundle-SymbolicName>
<Bundle-Version>${project.version}</Bundle-Version>
<!-- Dependency resolution seems not to work properly with default
<!-- Dependency resolution seems not to work properly with default
behavior of importing the exported packages. -->
<Import-Package>!org.xhtmlrenderer.*,*</Import-Package>
<!-- Do not export package org.xhtmlrenderer.simple as it is
already exported by flying-saucer-core and this would lead to a split package
<!-- Do not export package org.xhtmlrenderer.simple as it is
already exported by flying-saucer-core and this would lead to a split package
without correctly marking it as such. -->
<Export-Package>!org.xhtmlrenderer.simple,org.xhtmlrenderer.*</Export-Package>
</instructions>
Expand Down
Loading