[poc] upgrade to latest XML resolver version

.github/workflows/ci-deploy.yml → .github/workflows/ci-container.yml

@@ -1,10 +1,11 @@
-name: Deploy
+name: Publish Container
 on: [push, pull_request]
 jobs:
   build:
-    name: Build and Test Images
+    name: Test and Publish Container Images
     runs-on: ubuntu-latest
     # NOTE (DP): Publish on develop and master, test on PRs against these
+    # TODO(DP) Reinstate CRONed release builds to update stock apps regularly
     if: github.ref == 'refs/heads/develop' || github.ref == 'refs/heads/master' || github.base_ref ==  'develop' || github.base_ref ==  'master'
     steps:
       - uses: actions/checkout@v4
@@ -15,6 +16,10 @@ jobs:
         with:
           distribution: liberica
           java-version: '17'
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+        with:
+          platforms: linux/amd64,linux/arm64 
       - name: Make buildkit default
         uses: docker/setup-buildx-action@v3
         id: buildx
@@ -27,7 +32,11 @@ jobs:
           key: deploy-${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
           restore-keys: deploy-${{ runner.os }}-maven
       - name: Install bats
-        run: sudo apt-get install bats    
+        run: sudo apt-get install bats
+        # Hack around #5450
+      - name: pull base image
+        run: |
+          docker pull --platform linux/amd64 --platform linux/arm64 gcr.io/distroless/java17-debian12:latest      
       - name: Build images
         run: mvn -V -B -q -Pdocker -DskipTests -Ddependency-check.skip=true -P !mac-dmg-on-unix,!installer,!concurrency-stress-tests,!micro-benchmarks,skip-build-dist-archives clean package
       - name: Check local images
@@ -68,4 +77,4 @@ jobs:
       #     DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
       #   run: mvn -q -Ddocker.tag=experimental -Ddocker.username=$DOCKER_USERNAME -Ddocker.password=$DOCKER_PASSWORD docker:build docker:push
       #   working-directory: ./exist-docker  
-      
+

.github/workflows/ci-snapshots.yml

@@ -0,0 +1,30 @@
+name: Publish Snaphots to Github Packages
+
+on:
+  push:
+    branches:
+      - develop
+  workflow_dispatch: # Allow manual triggering
+
+jobs:
+  publish-snapshots:
+    name: Deploy Snapshots
+    runs-on: ubuntu-latest
+    if: github.ref == 'refs/heads/develop'
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 1
+      - name: Set up JDK 17
+        uses: actions/setup-java@v4
+        with:
+          distribution: liberica
+          java-version: '17'
+      - name: Cache Maven packages
+        uses: actions/cache@v4
+        with:
+          path: ~/.m2
+          key: deploy-${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+          restore-keys: deploy-${{ runner.os }}-maven
+      - name: Deploy SNAPSHOT maven artefacts
+        run: mvn -V -B -q -DskipTests -Ddependency-check.skip=true -P !mac-dmg-on-unix,!installer,!concurrency-stress-tests,!micro-benchmarks,skip-build-dist-archives clean deploy

exist-core/pom.xml

@@ -138,7 +138,7 @@
         <dependency>
             <groupId>org.relaxng</groupId>
             <artifactId>jing</artifactId>
-            <version>20220510</version>
+            <version>20241231</version>
             <exclusions>
                 <exclusion> <!-- conflicts with Java 17's javax.xml module -->
                     <groupId>xml-apis</groupId>
@@ -169,7 +169,7 @@
         <dependency>
             <groupId>org.bouncycastle</groupId>
             <artifactId>bcprov-jdk18on</artifactId>
-            <version>1.78.1</version>
+            <version>1.79</version>
         </dependency>
 
         <dependency>
@@ -221,7 +221,7 @@
         <dependency>
             <groupId>org.jline</groupId>
             <artifactId>jline</artifactId>
-            <version>3.27.1</version>
+            <version>3.28.0</version>
         </dependency>
 
         <dependency>
@@ -472,13 +472,13 @@
         <dependency>
             <groupId>com.fifesoft</groupId>
             <artifactId>rsyntaxtextarea</artifactId>
-            <version>3.5.2</version>
+            <version>3.5.3</version>
         </dependency>
 
         <dependency>
             <groupId>org.quartz-scheduler</groupId>
             <artifactId>quartz</artifactId>
-            <version>2.3.2</version>  <!-- Quartz 2.3.1 has an issue on Windows, see: https://github.com/quartz-scheduler/quartz/issues/448 -->
+            <version>2.5.0</version>  <!-- Quartz 2.3.1 has an issue on Windows, see: https://github.com/quartz-scheduler/quartz/issues/448 -->
             <!-- exclude Quartz SQL connectivity options -->
             <exclusions>
                 <exclusion>

exist-core/src/main/java/org/exist/source/SourceFactory.java

@@ -111,7 +111,7 @@ public class SourceFactory {
                 && ((location.startsWith("/db") && !Files.exists(Paths.get(firstPathSegment(location))))
                 || (contextPath != null && contextPath.startsWith("/db") && !Files.exists(Paths.get(firstPathSegment(contextPath)))))) {
             final XmldbURI pathUri;
-            if (contextPath == null) {
+            if (contextPath == null || ".".equals(contextPath)) {
                 pathUri = XmldbURI.create(location);
             } else {
                 pathUri = XmldbURI.create(contextPath).append(location);

exist-core/src/main/java/org/exist/test/XQueryCompilationTest.java

@@ -41,9 +41,9 @@
  * @author <a href="mailto:[email protected]">Juri Leino</a>
  */
 public abstract class XQueryCompilationTest {
+
     @ClassRule
     public static final ExistEmbeddedServer server = new ExistEmbeddedServer(true, true);
-
     protected static Either<XPathException, CompiledXQuery> compileQuery(final String string) throws EXistException, PermissionDeniedException {
         final BrokerPool pool = server.getBrokerPool();
         final XQuery xqueryService = pool.getXQueryService();

exist-core/src/main/java/org/exist/webstart/JnlpJarFiles.java

@@ -60,7 +60,7 @@ public class JnlpJarFiles {
             "commons-logging-%latest%",
             "commons-pool-%latest%",
             "jargo-%latest%",
-            "bcprov-jdk15on-%latest%",
+            "bcprov-jdk18on-%latest%",
             "fastutil-%latest%-min",
             "j8fu-%latest%",
             "jackson-core-%latest%",

exist-core/src/main/java/org/exist/xquery/ForExpr.java

@@ -229,7 +229,8 @@ private void processItem(LocalVariable var, Item contextItem, Sequence in, Seque
         context.proceed(this);
         context.setContextSequencePosition(p, in);
         if (positionalVariable != null) {
-            at.setValue(new IntegerValue(this, p + 1));
+            final int position = contextItem == AtomicValue.EMPTY_VALUE ? 0 : p + 1;
+            at.setValue(new IntegerValue(this, position));
         }
         final Sequence contextSequence = contextItem.toSequence();
         // set variable value to current item

exist-core/src/main/java/org/exist/xquery/XQueryContext.java

@@ -587,33 +587,34 @@ public Optional<ExistRepository> getRepository() {
             return null;
         }
 
-        // use the resolved file or return null
-        if (resolved != null) {
-
-            String location = "";
-
-            try {
-
-                // see if the src exists in the database and if so, use that instead
-                Source src = repo.get().resolveStoredXQueryModuleFromDb(getBroker(), resolved);
-                if (src != null) {
-                    // NOTE(AR) set the location of the module to import relative to this module's load path - so that transient imports of the imported module will resolve correctly!
-                    location = Paths.get(XmldbURI.create(moduleLoadPath).getCollectionPath()).relativize(Paths.get(((DBSource)src).getDocumentPath().getCollectionPath())).toString();
+        // use the resolved file
+        String location = "";
+        try {
+            // see if the src exists in the database and if so, use that instead
+            Source src = repo.get().resolveStoredXQueryModuleFromDb(getBroker(), resolved);
+            if (src == null) {
+                // fallback to load the source from the filesystem
+                src = new FileSource(resolved, false);
+            } else {
+                final String sourceCollection = ((DBSource)src).getDocumentPath().getCollectionPath();
+                if (".".equals(moduleLoadPath)) {
+                    // module is a string passed to the xquery context, has therefore no location of its own
+                    location = sourceCollection;
                 } else {
-                    // else, fallback to the one from the filesystem
-                    src = new FileSource(resolved, false);
+                    // NOTE(AR) set the location of the module to import relative to this module's load path
+                    // - so that transient imports of the imported module will resolve correctly!
+                    final Path collectionPath = Paths.get(XmldbURI.create(moduleLoadPath).getCollectionPath());
+                    final Path sourcePath = Paths.get(sourceCollection);
+                    location = collectionPath.relativize(sourcePath).toString();
                 }
+            }
 
-                // build a module object from the source
-                final ExternalModule module = compileOrBorrowModule(namespace, prefix, location, src);
-                return module;
+            // build a module object from the source
+            return compileOrBorrowModule(namespace, prefix, location, src);
 
-            } catch (final PermissionDeniedException e) {
-                throw new XPathException(e.getMessage(), e);
-            }
+        } catch (final PermissionDeniedException | IllegalArgumentException e) {
+            throw new XPathException(e.getMessage(), e);
         }
-
-        return null;
     }
 
     /**

exist-core/src/main/java/org/exist/xslt/XsltURIResolverHelper.java

@@ -52,14 +52,16 @@ public class XsltURIResolverHelper {
             @Nullable final URIResolver defaultResolver, @Nullable final String base, final boolean avoidSelf) {
         final List<URIResolver> resolvers = new ArrayList<>();
 
+        // EXpath Pkg resolver
+        // This resolver needs to be the first one to prevent
+        // HTTP requests for registered package names (e.g. http://www.functx.com/functx.xsl)
+        brokerPool.getExpathRepo().map(repo -> resolvers.add(new PkgXsltModuleURIResolver(repo)));
+
         if (base != null) {
             // database resolver
-            resolvers.add(new EXistURISchemeURIResolver(new EXistURIResolver(brokerPool, base)));
+            resolvers.add(new EXistURIResolver(brokerPool, base));
         }
 
-        // EXpath Pkg resolver
-        brokerPool.getExpathRepo().map(repo -> resolvers.add(new PkgXsltModuleURIResolver(repo)));
-
         // default resolver
         if (defaultResolver != null) {
             if (avoidSelf) {