diff --git a/extensions/modules/src/org/exist/xquery/modules/expathrepo/Deploy.java b/extensions/modules/src/org/exist/xquery/modules/expathrepo/Deploy.java index 1cc6b69ec0a..11678c70ef0 100644 --- a/extensions/modules/src/org/exist/xquery/modules/expathrepo/Deploy.java +++ b/extensions/modules/src/org/exist/xquery/modules/expathrepo/Deploy.java @@ -256,7 +256,7 @@ public RepoPackageLoader(final String repoURL) { public Path load(final String name, final Version version) throws IOException { String pkgURL = repoURL + "?name=" + URLEncoder.encode(name, "UTF-8") + - "&processor=" + SystemProperties.getInstance().getSystemProperty("product-semver", "2.2.0"); + "&processor=" + SystemProperties.getInstance().getSystemProperty("product-version", "2.2.0"); if (version != null) { if (version.getMin() != null) { pkgURL += "&semver-min=" + version.getMin(); diff --git a/lib/core/pkg-java-fork.jar b/lib/core/pkg-java-fork.jar index 2b80a990490..884f6340bf5 100644 Binary files a/lib/core/pkg-java-fork.jar and b/lib/core/pkg-java-fork.jar differ diff --git a/src/org/exist/repo/ClasspathHelper.java b/src/org/exist/repo/ClasspathHelper.java index 2d5f7323a2c..9475ec0c8c3 100644 --- a/src/org/exist/repo/ClasspathHelper.java +++ b/src/org/exist/repo/ClasspathHelper.java @@ -108,7 +108,7 @@ private static void scanPackages(BrokerPool pool, Classpath classpath) { private static boolean isCompatible(Package pkg) throws PackageException { // determine the eXistdb version this package is compatible with final Collection processorDeps = pkg.getProcessorDeps(); - final String procVersion = SystemProperties.getInstance().getSystemProperty("product-semver", "1.0"); + final String procVersion = SystemProperties.getInstance().getSystemProperty("product-version", "1.0"); PackageLoader.Version processorVersion = DEFAULT_VERSION; for (ProcessorDependency dependency: processorDeps) { if (Deployment.PROCESSOR_NAME.equals(dependency.getProcessor())) { diff --git a/src/org/exist/repo/Deployment.java b/src/org/exist/repo/Deployment.java index 09fe4b6c379..4b8b6e797ea 100644 --- a/src/org/exist/repo/Deployment.java +++ b/src/org/exist/repo/Deployment.java @@ -286,7 +286,8 @@ public Optional installAndDeploy(final Path xar, final PackageLoader loa } private void checkProcessorVersion(final PackageLoader.Version version) throws PackageException { - final String procVersion = SystemProperties.getInstance().getSystemProperty("product-semver", "1.0"); + final String procVersion = SystemProperties.getInstance().getSystemProperty("product-version", "1.0"); + final DependencyVersion depVersion = version.getDependencyVersion(); if (!depVersion.isCompatible(procVersion)) { throw new PackageException("Package requires eXistdb version " + version.toString() + ". " +