From e7ff6e59ff70e43bf2c26041dc540eb85861d958 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=CC=88rg=20Prante?= Date: Tue, 28 Dec 2021 22:07:15 +0100 Subject: [PATCH] update to gradle 7.3.2, remove pdf example --- gradle.properties | 4 +- gradle/compile/java.gradle | 6 +- gradle/documentation/asciidoc.gradle | 36 ------ gradle/ide/idea.gradle | 5 - gradle/test/junit5.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- .../pdfbox/layout/test/ScriptingTest.java | 14 -- .../pdfbox/layout/test/deckblatt.json | 120 ------------------ .../graphics/pdfbox/test/RenderSVGsTest.java | 4 +- 9 files changed, 10 insertions(+), 183 deletions(-) delete mode 100644 graphics-pdfbox-layout/src/test/resources/org/xbib/graphics/pdfbox/layout/test/deckblatt.json diff --git a/gradle.properties b/gradle.properties index 502ad88..0a8da1d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,8 +3,8 @@ name = graphics version = 4.1.0 org.gradle.warning.mode = ALL -gradle.wrapper.version = 7.3 -pdfbox.version = 2.0.24 +gradle.wrapper.version = 7.3.2 +pdfbox.version = 2.0.25 jna.version = 5.10.0 zxing.version = 3.4.1 reflections.version = 0.9.11 diff --git a/gradle/compile/java.gradle b/gradle/compile/java.gradle index 30b6d51..73c6705 100644 --- a/gradle/compile/java.gradle +++ b/gradle/compile/java.gradle @@ -21,13 +21,15 @@ jar { } } -task sourcesJar(type: Jar, dependsOn: classes) { +task sourcesJar(type: Jar) { + dependsOn classes classifier 'sources' from sourceSets.main.allSource duplicatesStrategy = DuplicatesStrategy.EXCLUDE } -task javadocJar(type: Jar, dependsOn: javadoc) { +task javadocJar(type: Jar) { + dependsOn javadoc classifier 'javadoc' from javadoc.destinationDir } diff --git a/gradle/documentation/asciidoc.gradle b/gradle/documentation/asciidoc.gradle index 87ba22e..da6dd7e 100644 --- a/gradle/documentation/asciidoc.gradle +++ b/gradle/documentation/asciidoc.gradle @@ -1,14 +1,5 @@ apply plugin: 'org.xbib.gradle.plugin.asciidoctor' -configurations { - asciidoclet -} - -dependencies { - asciidoclet "org.asciidoctor:asciidoclet:${project.property('asciidoclet.version')}" -} - - asciidoctor { backends 'html5' outputDir = file("${rootProject.projectDir}/docs") @@ -26,30 +17,3 @@ asciidoctor { imagesdir: 'img', stylesheet: "${projectDir}/src/docs/asciidoc/css/foundation.css" } - - -/*javadoc { -options.docletpath = configurations.asciidoclet.files.asType(List) -options.doclet = 'org.asciidoctor.Asciidoclet' -//options.overview = "src/docs/asciidoclet/overview.adoc" -options.addStringOption "-base-dir", "${projectDir}" -options.addStringOption "-attribute", - "name=${project.name},version=${project.version},title-link=https://github.com/xbib/${project.name}" -configure(options) { - noTimestamp = true -} -}*/ - - -/*javadoc { - options.docletpath = configurations.asciidoclet.files.asType(List) - options.doclet = 'org.asciidoctor.Asciidoclet' - options.overview = "${rootProject.projectDir}/src/docs/asciidoclet/overview.adoc" - options.addStringOption "-base-dir", "${projectDir}" - options.addStringOption "-attribute", - "name=${project.name},version=${project.version},title-link=https://github.com/xbib/${project.name}" - options.destinationDirectory(file("${projectDir}/docs/javadoc")) - configure(options) { - noTimestamp = true - } -}*/ diff --git a/gradle/ide/idea.gradle b/gradle/ide/idea.gradle index 64e2167..5bd2095 100644 --- a/gradle/ide/idea.gradle +++ b/gradle/ide/idea.gradle @@ -6,8 +6,3 @@ idea { testOutputDir file('build/classes/java/test') } } - -if (project.convention.findPlugin(JavaPluginConvention)) { - //sourceSets.main.output.classesDirs = file("build/classes/java/main") - //sourceSets.test.output.classesDirs = file("build/classes/java/test") -} diff --git a/gradle/test/junit5.gradle b/gradle/test/junit5.gradle index aa62ed9..451dedf 100644 --- a/gradle/test/junit5.gradle +++ b/gradle/test/junit5.gradle @@ -1,5 +1,5 @@ -def junitVersion = project.hasProperty('junit.version')?project.property('junit.version'):'5.8.1' +def junitVersion = project.hasProperty('junit.version')?project.property('junit.version'):'5.8.2' def hamcrestVersion = project.hasProperty('hamcrest.version')?project.property('hamcrest.version'):'2.2' dependencies { diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index fbce071..ac0b842 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.2-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/graphics-pdfbox-layout/src/test/java/org/xbib/graphics/pdfbox/layout/test/ScriptingTest.java b/graphics-pdfbox-layout/src/test/java/org/xbib/graphics/pdfbox/layout/test/ScriptingTest.java index 3857b95..c1be34e 100644 --- a/graphics-pdfbox-layout/src/test/java/org/xbib/graphics/pdfbox/layout/test/ScriptingTest.java +++ b/graphics-pdfbox-layout/src/test/java/org/xbib/graphics/pdfbox/layout/test/ScriptingTest.java @@ -22,18 +22,4 @@ public class ScriptingTest { } engine.close(); } - - @Test - public void deckblatt() throws Exception { - Settings settings = Settings.settingsBuilder() - .loadFromResource("json", getClass().getResourceAsStream("deckblatt.json")) - .build(); - Engine engine = new Engine(); - engine.execute(settings); - int i = 0; - for (Document document : engine.getState().getDocuments()) { - document.render().save(new FileOutputStream("build/deckblatt" + (i++) + ".pdf")).close(); - } - engine.close(); - } } diff --git a/graphics-pdfbox-layout/src/test/resources/org/xbib/graphics/pdfbox/layout/test/deckblatt.json b/graphics-pdfbox-layout/src/test/resources/org/xbib/graphics/pdfbox/layout/test/deckblatt.json deleted file mode 100644 index 64ec5f9..0000000 --- a/graphics-pdfbox-layout/src/test/resources/org/xbib/graphics/pdfbox/layout/test/deckblatt.json +++ /dev/null @@ -1,120 +0,0 @@ -{ - "type": "document", - "margin": "10 10 10 10", - "author": "Jörg Prante", - "creator": "org.xbib.graphics.pdfbox.layout", - "elements": [ - { - "type": "image", - "x": 10, - "y": 290, - "scalex": 0.25, - "scaley": 0.25, - "value": "iVBORw0KGgoAAAANSUhEUgAAAfQAAAC0AQMAAABYN0wRAAAABlBMVEUAAAD///+l2Z/dAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH1gsEDjEFTKgt4wAAAi5JREFUaN7t2s1ygyAQAOClHLiVHnvojI/io+mj+Sg+Qo4eGKmwgPkfdjfTNC05ZEblm+BmxQUFL/ocoPnmhX6Fy0/zzf+kN8L8fXl/Fr8Z9O/wACq1nQAs1S9Q/Mabb/6v+qOd0+O82/3C8eFYvn6X++evrno/lwNr88033/zr+Vlnv8BA99vIOSQ/nvahzs+x58G7OBynglnX+jGO78EfIHSF6FfIv2rDoZ7qHRb0wY/xJkT0odPYawvxVkX0M+RevyMj+rANXWj2BTEURD8W/4lzG6KPjWPUPjhen/uB5t/gJOpbKGkeHu07jteP85bsp+K/ON644uMsas0hqfT9mrPWhG2TvK31g8/ebgJrxYXg/TYCoe+CMzjybRt1Xu2+9zEUuL+v9DrsEniz+zgK6dRoqPR29774Ma5x0L2n+654tXvcYHnly2lU+b547fGvlHuHaVTlhys+TWaI3hz7rtb7K/4g9BgWkR8kfhJ6TF+qt0deiTzUe3XF56tY4I3EO6HPc3muT+nL81rkY+RT+rN9St+n+ZT+PG/2VdWf92sqxfRtn8rOOz6nL8O78C31ZSmL7pdUBHUXfj5dAbztO4mPNKc/w0ea05fhJ6EfA40zIhxHiH5N5SjXu1hEcT2Enpf5H8MjcyKvhd482Vuh74R+EHov80rotdBboe+F3nM9TqU133vMnguPzylVzdPO81Y0f+/9i6d7/vP35ptvvvnmX9i/8PuHzf9f/w3g1VrR1Tf4UwAAAABJRU5ErkJggg==" - }, - { - "type": "text", - "x": 70, - "y": 290, - "value": "*Aufsatzbestellung*", - "fontsize": 24 - }, - { - "type": "barcode", - "x": 70, - "y": 280, - "symbol": "Code3Of9Extended", - "value": "1234567890", - "scalex": 2.0, - "scaley": 1.0 - }, - { - "type": "table", - "x": 10, - "y": 260, - "columnwidths": "40 150", - "elements": [ - { - "type": "row", - "elements": [ - { - "type": "cell", - "markup": "*This* is markup" - }, - { - "type": "cell", - "value": "Hello World" - } - ] - }, - { - "type": "row", - "elements": [ - { - "type": "cell", - "markup": "*This* is markup", - "fontsize": 12 - }, - { - "type": "cell", - "markup": "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.", - "fontsize": 12 - } - ] - }, - { - "type": "row", - "elements": [ - { - "type": "horizontalruler", - "linewidth": 0.5 - }, - { - "type": "horizontalruler", - "linewidth": 0.5 - } - ] - }, - { - "type": "row", - "elements": [ - { - "type": "cell", - "markup": "*This* is markup" - }, - { - "type": "cell", - "value": "Hello World", - "fontsize": 20 - } - ] - }, - { - "type": "row", - "elements": [ - { - "type": "cell", - "markup": "*This* is markup" - }, - { - "type": "cell", - "value": "Hello World", - "fontsize": 36 - } - ] - } - ] - }, - { - "type": "chart", - "x": 0, - "y": 150, - "width": 600, - "height": 480, - "scalex": 0.66, - "scaley": 0.66, - "xdata": [ 0.0, 1.0, 3.0, 7.0 ], - "ydata": [ 3.5, 2.5, 1.25, 0.8 ] - } - ] -} diff --git a/graphics-pdfbox/src/test/java/org/xbib/graphics/pdfbox/test/RenderSVGsTest.java b/graphics-pdfbox/src/test/java/org/xbib/graphics/pdfbox/test/RenderSVGsTest.java index 4bf5ead..03fadd9 100644 --- a/graphics-pdfbox/src/test/java/org/xbib/graphics/pdfbox/test/RenderSVGsTest.java +++ b/graphics-pdfbox/src/test/java/org/xbib/graphics/pdfbox/test/RenderSVGsTest.java @@ -70,7 +70,7 @@ public class RenderSVGsTest extends PdfBoxGraphics2DTestBase { } private void renderSVG(String name, final double scale) { - URL url = getClass().getResource(name); + /*URL url = getClass().getResource(name); SVGUniverse svgUniverse = new SVGUniverse(); SVGDiagram diagram = svgUniverse.getDiagram(svgUniverse.loadSVG(url)); exportGraphic("xbibsvg", name.replace(".svg", ""), gfx -> { @@ -80,7 +80,7 @@ public class RenderSVGsTest extends PdfBoxGraphics2DTestBase { } catch (SVGException e) { throw new IllegalArgumentException(e); } - }); + });*/ /*String uri = RenderSVGsTest.class.getResource(name).toString(); SAXSVGDocumentFactory f = new SAXSVGDocumentFactory();