diff --git a/.gitea/workflows/ci-basex.yaml b/.gitea/workflows/ci-basex.yaml index 10a22e4..6d1b1f7 100644 --- a/.gitea/workflows/ci-basex.yaml +++ b/.gitea/workflows/ci-basex.yaml @@ -21,7 +21,7 @@ jobs: - name: Download BaseX run: | - BASEX_VERSION="9.7.4" # Example version (adjust as needed) + BASEX_VERSION="10.7" # Example version (adjust as needed) # Remove dots from version for filename (e.g., "11.7" → "117") "9.7.4","10.7" BASEX_CLEAN_VERSION="${BASEX_VERSION//./}" wget https://files.basex.org/releases/$BASEX_VERSION/BaseX$BASEX_CLEAN_VERSION.zip -O BaseX.zip @@ -51,6 +51,6 @@ jobs: - name: Run tests run: | - basex -t src/test + basex -Wt src/test diff --git a/.gitea/workflows/trigger/release b/.gitea/workflows/trigger/release index 5365cb0..e29f10b 100644 --- a/.gitea/workflows/trigger/release +++ b/.gitea/workflows/trigger/release @@ -3,4 +3,4 @@ c Xyxh 4456 -9.7.4 xyx \ No newline at end of file +9.7.4 xyxz \ No newline at end of file diff --git a/LICENSE b/LICENSE index b90bd6c..61148b0 100644 --- a/LICENSE +++ b/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2024 Andy Bunce + Copyright 2024-25 Andy Bunce Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/scripts/build.xqm b/scripts/build.xqm index a020fab..66adbcf 100644 --- a/scripts/build.xqm +++ b/scripts/build.xqm @@ -94,7 +94,7 @@ as xs:string{ declare function build:xar-create() as xs:base64Binary{ - + let $_:=build:maven-download($build:PKG?quodatum?maven=>array:flatten(),$build:base || "jars/") let $entries:= build:xar-add(map{},build:jars("content"),build:jars("download")!build:content(.)) =>build:xar-add("content/Pdfbox3.xqm",build:content("src/Pdfbox3.xqm")) diff --git a/scripts/make-xar.xq b/scripts/make-xar.xq index 3911b54..88aef5e 100644 --- a/scripts/make-xar.xq +++ b/scripts/make-xar.xq @@ -1,7 +1,7 @@ import module namespace build = 'urn:quodatum:build1' at 'build.xqm'; -let $_:=build:maven-download($build:PKG?quodatum?maven=>array:flatten(),$build:base || "jars/") + let $xar:=build:xar-create() let $output-file := build:xar-path() return (build:write-binary($output-file, $xar), diff --git a/src/test/test.xqm b/src/test/test.xqm index 6b3050d..1c393cf 100644 --- a/src/test/test.xqm +++ b/src/test/test.xqm @@ -83,7 +83,7 @@ function test:page-image(){ }; declare %unit:test -function test:pdf-with(){ +function test:with-pdf(){ let $path:=test:resolve("samples.pdf/BaseX100.pdf") let $txt:=pdfbox:with-pdf($path,pdfbox:page-text(?,101)) return unit:assert(starts-with($txt,"Options"))