From ae7ea4d1ba9f38d9488d0dff569b1cc9ca378e14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Prante?= Date: Wed, 27 Sep 2023 14:38:37 +0200 Subject: [PATCH] update to PDFbox 3.0.0 --- gradle.properties | 2 +- .../pdfbox/layout/test/table/TableTest.java | 5 ++++- settings.gradle | 16 ++++++++-------- 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/gradle.properties b/gradle.properties index 12fc78f..81f4a1d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ group = org.xbib.graphics name = graphics -version = 4.5.9 +version = 4.6.0 org.gradle.warning.mode = ALL diff --git a/graphics-pdfbox-layout/src/test/java/org/xbib/graphics/pdfbox/layout/test/table/TableTest.java b/graphics-pdfbox-layout/src/test/java/org/xbib/graphics/pdfbox/layout/test/table/TableTest.java index fcee2ab..102c342 100644 --- a/graphics-pdfbox-layout/src/test/java/org/xbib/graphics/pdfbox/layout/test/table/TableTest.java +++ b/graphics-pdfbox-layout/src/test/java/org/xbib/graphics/pdfbox/layout/test/table/TableTest.java @@ -4,6 +4,8 @@ import static org.hamcrest.Matchers.greaterThan; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.lessThanOrEqualTo; + import org.apache.pdfbox.pdmodel.PDDocument; import org.apache.pdfbox.pdmodel.PDPage; import org.apache.pdfbox.pdmodel.PDPageContentStream; @@ -113,7 +115,8 @@ public class TableTest { .build()) .build(); final float actualFontHeight = PdfUtil.getFontHeight(table.getSettings().getFontDescriptor()); - assertThat(table.getHeight(), equalTo(50 + actualFontHeight)); + float diff = table.getHeight() - actualFontHeight - 50.0f; + assertThat(diff, lessThanOrEqualTo(1.0f)); } @Test diff --git a/settings.gradle b/settings.gradle index a0f0056..778b254 100644 --- a/settings.gradle +++ b/settings.gradle @@ -34,15 +34,15 @@ dependencyResolutionManagement { library('groovy-sql', 'org.apache.groovy', 'groovy-sql').versionRef('groovy') library('groovy-macro', 'org.apache.groovy', 'groovy-macro').versionRef('groovy') library('groovy-templates', 'org.apache.groovy', 'groovy-templates').versionRef('groovy') - library('groovy-test', 'org.apache.groovy', 'groovy-test').versionRef('groovy') - library('spock', 'org.spockframework', 'spock-core').versionRef('spock') - library('bytebuddy', 'net.bytebuddy', 'byte-buddy').version('1.14.4') - library('objenesis', 'org.objenesis', 'objenesis').version('2.6') + library('groovy-test', 'org.apache.groovy', 'groovy-test').versionRef('groovy') // test only + library('spock', 'org.spockframework', 'spock-core').versionRef('spock') // test only + library('bytebuddy', 'net.bytebuddy', 'byte-buddy').version('1.14.4') // test only + library('objenesis', 'org.objenesis', 'objenesis').version('2.6') // test only library('jna', 'net.java.dev.jna', 'jna').version('5.13.0') - library('pdfbox', 'org.apache.pdfbox', 'pdfbox').version('3.0.0-beta1') - library('zxing', 'com.google.zxing', 'javase').version('3.4.1') - library('reflections', 'org.reflections', 'reflections').version('0.9.11') - library('jfreechart', 'org.jfree', 'jfreechart').version('1.5.2') + library('pdfbox', 'org.apache.pdfbox', 'pdfbox').version('3.0.0') + library('zxing', 'com.google.zxing', 'javase').version('3.5.2') // test only + library('reflections', 'org.reflections', 'reflections').version('0.9.11') // test only + library('jfreechart', 'org.jfree', 'jfreechart').version('1.5.2') // test only library('datastructures-settings', 'org.xbib', 'settings-datastructures')versionRef('content') library('datastructures-settings-json', 'org.xbib', 'settings-datastructures-json').versionRef('content') library('datastructures-settings-yaml', 'org.xbib', 'settings-datastructures-yaml').versionRef('content')