Allow properties in rule set

2 files changed, 173 insertions, 186 deletions

diff --git a/vespa-dependencies-enforcer/allowed-maven-dependencies.txt b/vespa-dependencies-enforcer/allowed-maven-dependencies.txt
index b70b3ff2bb1..3ae0923aef0 100644
--- a/vespa-dependencies-enforcer/allowed-maven-dependencies.txt
+++ b/vespa-dependencies-enforcer/allowed-maven-dependencies.txt
@@ -1,211 +1,206 @@
 # Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
-#[non-test]
-# Contains dependencies that are not used exclusively in 'test' scope
-ai.djl:api:0.23.0
 ai.djl.huggingface:tokenizers:0.23.0
-aopalliance:aopalliance:1.0
+ai.djl:api:0.23.0
+aopalliance:aopalliance:${aopalliance.vespa.version}
 backport-util-concurrent:backport-util-concurrent:3.1
 ch.qos.logback:logback-classic:1.2.10
 ch.qos.logback:logback-core:1.2.10
 classworlds:classworlds:1.1-alpha-2
-com.amazonaws:aws-java-sdk-core:1.12.540
-com.amazonaws:aws-java-sdk-kms:1.12.540
-com.amazonaws:aws-java-sdk-s3:1.12.540
-com.amazonaws:aws-java-sdk-ssm:1.12.540
-com.amazonaws:aws-java-sdk-sts:1.12.540
-com.amazonaws:jmespath-java:1.12.540
-com.auth0:java-jwt:4.4.0
-com.fasterxml.jackson.core:jackson-annotations:2.15.2
-com.fasterxml.jackson.core:jackson-core:2.15.2
-com.fasterxml.jackson.core:jackson-databind:2.15.2
-com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.15.2
-com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.15.2
-com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.15.2
-com.github.luben:zstd-jni:1.5.5-5
+com.amazonaws:aws-java-sdk-core:${aws-sdk.vespa.version}
+com.amazonaws:aws-java-sdk-kms:${aws-sdk.vespa.version}
+com.amazonaws:aws-java-sdk-s3:${aws-sdk.vespa.version}
+com.amazonaws:aws-java-sdk-ssm:${aws-sdk.vespa.version}
+com.amazonaws:aws-java-sdk-sts:${aws-sdk.vespa.version}
+com.amazonaws:jmespath-java:${aws-sdk.vespa.version}
+com.auth0:java-jwt:${java-jwt.vespa.version}
+com.fasterxml.jackson.core:jackson-annotations:${jackson2.vespa.version}
+com.fasterxml.jackson.core:jackson-core:${jackson2.vespa.version}
+com.fasterxml.jackson.core:jackson-databind:${jackson-databind.vespa.version}
+com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:${jackson2.vespa.version}
+com.fasterxml.jackson.datatype:jackson-datatype-jdk8:${jackson2.vespa.version}
+com.fasterxml.jackson.datatype:jackson-datatype-jsr310:${jackson2.vespa.version}
+com.github.luben:zstd-jni:${luben.zstd.vespa.version}
 com.github.spotbugs:spotbugs-annotations:3.1.9
-com.google.code.findbugs:jsr305:3.0.2
-com.google.errorprone:error_prone_annotations:2.22.0
+com.google.code.findbugs:jsr305:${findbugs.vespa.version}
+com.google.errorprone:error_prone_annotations:${error-prone-annotations.vespa.version}
 com.google.guava:failureaccess:1.0.1
-com.google.guava:guava:32.1.2-jre
-com.google.inject:guice:6.0.0
+com.google.guava:guava:${guava.vespa.version}
+com.google.inject:guice:${guice.vespa.version}
 com.google.j2objc:j2objc-annotations:2.8
-com.google.protobuf:protobuf-java:3.24.3
-com.ibm.icu:icu4j:73.2
-com.microsoft.onnxruntime:onnxruntime:1.15.1
-com.sun.activation:javax.activation:1.2.0
+com.google.jimfs:jimfs:${jimfs.vespa.version}
+com.google.protobuf:protobuf-java:${protobuf.vespa.version}
+com.ibm.icu:icu4j:${icu4j.vespa.version}
+com.microsoft.onnxruntime:onnxruntime:${onnxruntime.vespa.version}
+com.sun.activation:javax.activation:${properties-maven-plugin.vespa.version}
 com.sun.istack:istack-commons-runtime:4.1.2
-com.sun.xml.bind:jaxb-core:2.3.0.1
-com.sun.xml.bind:jaxb-impl:2.3.0
+com.sun.xml.bind:jaxb-core:${jaxb-core.vespa.version}
+com.sun.xml.bind:jaxb-impl:${jaxb-impl.vespa.version}
 com.thaiopensource:jing:20091111
-com.yahoo.athenz:athenz-auth-core:1.11.42
-com.yahoo.athenz:athenz-client-common:1.11.42
-com.yahoo.athenz:athenz-zms-core:1.11.42
-com.yahoo.athenz:athenz-zpe-java-client:1.11.42
-com.yahoo.athenz:athenz-zts-core:1.11.42
+com.yahoo.athenz:athenz-auth-core:${athenz.vespa.version}
+com.yahoo.athenz:athenz-client-common:${athenz.vespa.version}
+com.yahoo.athenz:athenz-zms-core:${athenz.vespa.version}
+com.yahoo.athenz:athenz-zpe-java-client:${athenz.vespa.version}
+com.yahoo.athenz:athenz-zts-core:${athenz.vespa.version}
 com.yahoo.rdl:rdl-java:1.5.4
 commons-cli:commons-cli:1.5.0
-commons-codec:commons-codec:1.16.0
+commons-codec:commons-codec:${commons-codec.vespa.version}
 commons-fileupload:commons-fileupload:1.5
-commons-io:commons-io:2.13.0
-commons-logging:commons-logging:1.2
-io.airlift:airline:0.9
-io.dropwizard.metrics:metrics-core:4.2.20
-io.jsonwebtoken:jjwt-api:0.11.5
-io.jsonwebtoken:jjwt-impl:0.11.5
-io.jsonwebtoken:jjwt-jackson:0.11.5
-io.netty:netty-buffer:4.1.98.Final
-io.netty:netty-codec:4.1.98.Final
-io.netty:netty-common:4.1.98.Final
-io.netty:netty-handler:4.1.98.Final
-io.netty:netty-resolver:4.1.98.Final
-io.netty:netty-tcnative:2.0.61.Final
-io.netty:netty-tcnative-classes:2.0.61.Final
-io.netty:netty-transport:4.1.98.Final
-io.netty:netty-transport-classes-epoll:4.1.98.Final
-io.netty:netty-transport-native-epoll:4.1.98.Final
-io.netty:netty-transport-native-unix-common:4.1.98.Final
-io.prometheus:simpleclient:0.16.0
-io.prometheus:simpleclient_common:0.16.0
-io.prometheus:simpleclient_tracer_common:0.16.0
-io.prometheus:simpleclient_tracer_otel:0.16.0
-io.prometheus:simpleclient_tracer_otel_agent:0.16.0
-jakarta.inject:jakarta.inject-api:2.0.1
-javax.activation:javax.activation-api:1.2.0
-javax.annotation:javax.annotation-api:1.2
-javax.inject:javax.inject:1
-javax.servlet:javax.servlet-api:3.1.0
-javax.ws.rs:javax.ws.rs-api:2.1.1
-javax.xml.bind:jaxb-api:2.3.1
-joda-time:joda-time:2.12.5
-junit:junit:4.13.2
-net.java.dev.jna:jna:5.13.0
-net.openhft:zero-allocation-hashing:0.16
-org.antlr:antlr-runtime:3.5.3
-org.antlr:antlr4-runtime:4.13.1
-org.apache.aries.spifly:org.apache.aries.spifly.dynamic.bundle:1.3.6
-org.apache.commons:commons-compress:1.24.0
-org.apache.commons:commons-csv:1.10.0
-org.apache.commons:commons-exec:1.3
-org.apache.commons:commons-lang3:3.13.0
-org.apache.commons:commons-math3:3.6.1
-org.apache.curator:curator-client:5.5.0
-org.apache.curator:curator-framework:5.5.0
-org.apache.curator:curator-recipes:5.5.0
-org.apache.felix:org.apache.felix.framework:7.0.5
-org.apache.felix:org.apache.felix.log:1.3.0
-org.apache.httpcomponents:httpclient:4.5.14
-org.apache.httpcomponents:httpcore:4.4.16
-org.apache.httpcomponents:httpmime:4.5.14
-org.apache.httpcomponents.client5:httpclient5:5.2.1
-org.apache.httpcomponents.core5:httpcore5:5.2.3
-org.apache.httpcomponents.core5:httpcore5-h2:5.2.3
-org.apache.lucene:lucene-analysis-common:9.7.0
-org.apache.lucene:lucene-core:9.7.0
-org.apache.maven:maven-archiver:3.6.1
-org.apache.maven:maven-artifact:3.9.4
+commons-io:commons-io:${commons-io.vespa.version}
+commons-logging:commons-logging:${commons-logging.vespa.version}
+io.airlift:airline:${airline.vespa.version}
+io.dropwizard.metrics:metrics-core:${dropwizard.metrics.vespa.version}
+io.jsonwebtoken:jjwt-api:${java-jjwt.vespa.version}
+io.jsonwebtoken:jjwt-impl:${java-jjwt.vespa.version}
+io.jsonwebtoken:jjwt-jackson:${java-jjwt.vespa.version}
+io.netty:netty-buffer:${netty.vespa.version}
+io.netty:netty-codec:${netty.vespa.version}
+io.netty:netty-common:${netty.vespa.version}
+io.netty:netty-handler:${netty.vespa.version}
+io.netty:netty-resolver:${netty.vespa.version}
+io.netty:netty-tcnative-classes:${netty-tcnative.vespa.version}
+io.netty:netty-tcnative:${netty-tcnative.vespa.version}
+io.netty:netty-transport-classes-epoll:${netty.vespa.version}
+io.netty:netty-transport-native-epoll:${netty.vespa.version}
+io.netty:netty-transport-native-unix-common:${netty.vespa.version}
+io.netty:netty-transport:${netty.vespa.version}
+io.prometheus:simpleclient:${prometheus.client.vespa.version}
+io.prometheus:simpleclient_common:${prometheus.client.vespa.version}
+io.prometheus:simpleclient_tracer_common:${prometheus.client.vespa.version}
+io.prometheus:simpleclient_tracer_otel:${prometheus.client.vespa.version}
+io.prometheus:simpleclient_tracer_otel_agent:${prometheus.client.vespa.version}
+jakarta.inject:jakarta.inject-api:${jakarta.inject.vespa.version}
+javax.activation:javax.activation-api:${properties-maven-plugin.vespa.version}
+javax.annotation:javax.annotation-api:${commons-logging.vespa.version}
+javax.inject:javax.inject:${javax.inject.vespa.version}
+javax.servlet:javax.servlet-api:${javax.servlet-api.vespa.version}
+javax.ws.rs:javax.ws.rs-api:${javax.ws.rs-api.vespa.version}
+javax.xml.bind:jaxb-api:${jaxb-api.vespa.version}
+joda-time:joda-time:${joda-time.vespa.version}
+junit:junit:${junit4.vespa.version}
+net.bytebuddy:byte-buddy-agent:${byte-buddy.vespa.version}
+net.bytebuddy:byte-buddy:${byte-buddy.vespa.version}
+net.java.dev.jna:jna:${jna.vespa.version}
+net.openhft:zero-allocation-hashing:${zero-allocation-hashing.vespa.version}
+org.antlr:antlr-runtime:${antlr.vespa.version}
+org.antlr:antlr4-runtime:${antlr4.vespa.version}
+org.apache.aries.spifly:org.apache.aries.spifly.dynamic.bundle:${spifly.vespa.version}
+org.apache.commons:commons-compress:${commons-compress.vespa.version}
+org.apache.commons:commons-csv:${commons-csv.vespa.version}
+org.apache.commons:commons-exec:${commons-exec.vespa.version}
+org.apache.commons:commons-lang3:${commons-lang3.vespa.version}
+org.apache.commons:commons-math3:${commons.math3.vespa.version}
+org.apache.curator:curator-client:${curator.vespa.version}
+org.apache.curator:curator-framework:${curator.vespa.version}
+org.apache.curator:curator-recipes:${curator.vespa.version}
+org.apache.curator:curator-test:${curator.vespa.version}
+org.apache.felix:org.apache.felix.framework:${felix.vespa.version}
+org.apache.felix:org.apache.felix.log:${felix.log.vespa.version}
+org.apache.httpcomponents.client5:httpclient5:${apache.httpclient5.vespa.version}
+org.apache.httpcomponents.core5:httpcore5-h2:${apache.httpcore5.vespa.version}
+org.apache.httpcomponents.core5:httpcore5:${apache.httpcore5.vespa.version}
+org.apache.httpcomponents:httpclient:${apache.httpclient.vespa.version}
+org.apache.httpcomponents:httpcore:${apache.httpcore.vespa.version}
+org.apache.httpcomponents:httpmime:${apache.httpclient.vespa.version}
+org.apache.lucene:lucene-analysis-common:${lucene.vespa.version}
+org.apache.lucene:lucene-core:${lucene.vespa.version}
+org.apache.maven.plugin-tools:maven-plugin-annotations:${maven-plugin-tools.vespa.version}
+org.apache.maven.plugins:maven-jar-plugin:${maven-jar-plugin.vespa.version}
+org.apache.maven.shared:file-management:3.1.0
+org.apache.maven.wagon:wagon-provider-api:${maven-wagon.vespa.version}
+org.apache.maven:maven-archiver:${maven-archiver.vespa.version}
 org.apache.maven:maven-artifact-manager:2.2.1
-org.apache.maven:maven-model:3.9.4
-org.apache.maven:maven-plugin-api:3.9.4
+org.apache.maven:maven-artifact:${maven-core.vespa.version}
+org.apache.maven:maven-model:${maven-core.vespa.version}
+org.apache.maven:maven-plugin-api:${maven-core.vespa.version}
 org.apache.maven:maven-plugin-registry:2.2.1
 org.apache.maven:maven-profile:2.2.1
 org.apache.maven:maven-project:2.2.1
-org.apache.maven:maven-repository-metadata:3.9.4
-org.apache.maven:maven-settings:3.9.4
-org.apache.maven.plugin-tools:maven-plugin-annotations:3.9.0
-org.apache.maven.plugins:maven-jar-plugin:3.3.0
-org.apache.maven.shared:file-management:3.1.0
-org.apache.maven.wagon:wagon-provider-api:3.5.3
-org.apache.opennlp:opennlp-tools:2.3.0
+org.apache.maven:maven-repository-metadata:${maven-core.vespa.version}
+org.apache.maven:maven-settings:${maven-core.vespa.version}
+org.apache.opennlp:opennlp-tools:${opennlp.vespa.version}
 org.apache.velocity:velocity-engine-core:2.3
 org.apache.yetus:audience-annotations:0.12.0
-org.apache.zookeeper:zookeeper:3.8.0
-org.apache.zookeeper:zookeeper:3.8.1
-org.apache.zookeeper:zookeeper-jute:3.8.0
+org.apache.zookeeper:zookeeper-jute:${zookeeper.client.vespa.version}
 org.apache.zookeeper:zookeeper-jute:3.8.1
-org.apiguardian:apiguardian-api:1.1.2
-org.bouncycastle:bcpkix-jdk18on:1.76
-org.bouncycastle:bcprov-jdk18on:1.76
-org.bouncycastle:bcutil-jdk18on:1.76
+org.apache.zookeeper:zookeeper:${zookeeper.client.vespa.version}
+org.apache.zookeeper:zookeeper:3.8.1
+org.apiguardian:apiguardian-api:${apiguardian.vespa.version}
+org.assertj:assertj-core:${assertj.vespa.version}
+org.bouncycastle:bcpkix-jdk18on:${bouncycastle.vespa.version}
+org.bouncycastle:bcprov-jdk18on:${bouncycastle.vespa.version}
+org.bouncycastle:bcutil-jdk18on:${bouncycastle.vespa.version}
 org.codehaus.plexus:plexus-archiver:4.8.0
 org.codehaus.plexus:plexus-classworlds:2.7.0
 org.codehaus.plexus:plexus-component-annotations:1.5.5
 org.codehaus.plexus:plexus-container-default:1.0-alpha-9-stable-1
 org.codehaus.plexus:plexus-interpolation:1.26
-org.codehaus.plexus:plexus-io:3.4.1
-org.codehaus.plexus:plexus-utils:3.5.1
-org.eclipse.angus:angus-activation:2.0.1
-org.eclipse.collections:eclipse-collections:11.1.0
-org.eclipse.collections:eclipse-collections-api:11.1.0
-org.eclipse.jetty:jetty-alpn-client:11.0.16
-org.eclipse.jetty:jetty-alpn-java-client:11.0.16
-org.eclipse.jetty:jetty-alpn-java-server:11.0.16
-org.eclipse.jetty:jetty-alpn-server:11.0.16
-org.eclipse.jetty:jetty-client:11.0.16
-org.eclipse.jetty:jetty-http:11.0.16
-org.eclipse.jetty:jetty-io:11.0.16
-org.eclipse.jetty:jetty-jmx:11.0.16
-org.eclipse.jetty:jetty-security:11.0.16
-org.eclipse.jetty:jetty-server:11.0.16
-org.eclipse.jetty:jetty-servlet:11.0.16
-org.eclipse.jetty:jetty-util:11.0.16
-org.eclipse.jetty.http2:http2-client:11.0.16
-org.eclipse.jetty.http2:http2-common:11.0.16
-org.eclipse.jetty.http2:http2-hpack:11.0.16
-org.eclipse.jetty.http2:http2-http-client-transport:11.0.16
-org.eclipse.jetty.http2:http2-server:11.0.16
-org.eclipse.jetty.toolchain:jetty-jakarta-servlet-api:5.0.2
+org.codehaus.plexus:plexus-io:${maven-enforcer-plugin.vespa.version}
+org.codehaus.plexus:plexus-utils:${maven-shade-plugin.vespa.version}
+org.eclipse.angus:angus-activation:${jakarta.inject.vespa.version}
+org.eclipse.collections:eclipse-collections-api:${eclipse-collections.vespa.version}
+org.eclipse.collections:eclipse-collections:${eclipse-collections.vespa.version}
+org.eclipse.jetty.http2:http2-client:${jetty.vespa.version}
+org.eclipse.jetty.http2:http2-common:${jetty.vespa.version}
+org.eclipse.jetty.http2:http2-hpack:${jetty.vespa.version}
+org.eclipse.jetty.http2:http2-http-client-transport:${jetty.vespa.version}
+org.eclipse.jetty.http2:http2-server:${jetty.vespa.version}
+org.eclipse.jetty.toolchain:jetty-jakarta-servlet-api:${jetty-servlet-api.vespa.version}
+org.eclipse.jetty:jetty-alpn-client:${jetty.vespa.version}
+org.eclipse.jetty:jetty-alpn-java-client:${jetty.vespa.version}
+org.eclipse.jetty:jetty-alpn-java-server:${jetty.vespa.version}
+org.eclipse.jetty:jetty-alpn-server:${jetty.vespa.version}
+org.eclipse.jetty:jetty-client:${jetty.vespa.version}
+org.eclipse.jetty:jetty-http:${jetty.vespa.version}
+org.eclipse.jetty:jetty-io:${jetty.vespa.version}
+org.eclipse.jetty:jetty-jmx:${jetty.vespa.version}
+org.eclipse.jetty:jetty-security:${jetty.vespa.version}
+org.eclipse.jetty:jetty-server:${jetty.vespa.version}
+org.eclipse.jetty:jetty-servlet:${jetty.vespa.version}
+org.eclipse.jetty:jetty-util:${jetty.vespa.version}
 org.eclipse.sisu:org.eclipse.sisu.inject:0.3.5
 org.eclipse.sisu:org.eclipse.sisu.plexus:0.3.5
 org.fusesource.jansi:jansi:1.18
-org.glassfish.jaxb:jaxb-core:4.0.3
-org.glassfish.jaxb:jaxb-runtime:4.0.3
-org.glassfish.jaxb:txw2:4.0.3
-org.hamcrest:hamcrest:2.2
-org.hamcrest:hamcrest-core:2.2
-org.hdrhistogram:HdrHistogram:2.1.12
+org.glassfish.jaxb:jaxb-core:${jaxb.runtime.vespa.version}
+org.glassfish.jaxb:jaxb-runtime:${jaxb.runtime.vespa.version}
+org.glassfish.jaxb:txw2:${jaxb.runtime.vespa.version}
+org.hamcrest:hamcrest-core:${hamcrest.vespa.version}
+org.hamcrest:hamcrest:${hamcrest.vespa.version}
+org.hdrhistogram:HdrHistogram:${hdrhistogram.vespa.version}
 org.iq80.snappy:snappy:0.4
-org.json:json:20230618
-org.junit.jupiter:junit-jupiter-api:5.10.0
-org.junit.jupiter:junit-jupiter-api:5.8.1
-org.junit.jupiter:junit-jupiter-engine:5.8.1
-org.junit.platform:junit-platform-commons:1.8.1
-org.junit.platform:junit-platform-engine:1.8.1
-org.junit.platform:junit-platform-launcher:1.8.1
+org.json:json:${org.json.vespa.version}
+org.junit.jupiter:junit-jupiter-api:${junit.vespa.tenant.version}
+org.junit.jupiter:junit-jupiter-api:${junit.vespa.version}
+org.junit.jupiter:junit-jupiter-engine:${junit.vespa.tenant.version}
+org.junit.jupiter:junit-jupiter-engine:${junit.vespa.version}
+org.junit.jupiter:junit-jupiter-params:${junit.vespa.version}
+org.junit.jupiter:junit-jupiter:${junit.vespa.version}
+org.junit.platform:junit-platform-commons:${junit.platform.vespa.tenant.version}
+org.junit.platform:junit-platform-commons:${junit.platform.vespa.version}
+org.junit.platform:junit-platform-engine:${junit.platform.vespa.tenant.version}
+org.junit.platform:junit-platform-engine:${junit.platform.vespa.version}
+org.junit.platform:junit-platform-launcher:${junit.platform.vespa.tenant.version}
+org.junit.vintage:junit-vintage-engine:${junit.vespa.tenant.version}
+org.junit.vintage:junit-vintage-engine:${junit.vespa.version}
 org.kohsuke:libpam4j:1.11
-org.lz4:lz4-java:1.8.0
-org.opentest4j:opentest4j:1.3.0
-org.ow2.asm:asm:9.5
-org.ow2.asm:asm-analysis:9.5
-org.ow2.asm:asm-commons:9.5
-org.ow2.asm:asm-tree:9.5
-org.ow2.asm:asm-util:9.5
-org.questdb:questdb:7.3.2
-org.slf4j:jcl-over-slf4j:1.7.36
-org.slf4j:log4j-over-slf4j:1.7.36
-org.slf4j:slf4j-api:1.7.36
-org.slf4j:slf4j-jdk14:1.7.36
-org.slf4j:slf4j-simple:1.7.36
+org.lz4:lz4-java:${org.lz4.vespa.version}
+org.mockito:mockito-core:${mockito.vespa.version}
+org.mockito:mockito-junit-jupiter:${mockito.vespa.version}
+org.objenesis:objenesis:3.3
+org.opentest4j:opentest4j:${opentest4j.vespa.version}
+org.ow2.asm:asm-analysis:${asm.vespa.version}
+org.ow2.asm:asm-commons:${asm.vespa.version}
+org.ow2.asm:asm-tree:${asm.vespa.version}
+org.ow2.asm:asm-util:${asm.vespa.version}
+org.ow2.asm:asm:${asm.vespa.version}
+org.questdb:questdb:${questdb.vespa.version}
+org.slf4j:jcl-over-slf4j:${slf4j.vespa.version}
+org.slf4j:log4j-over-slf4j:${slf4j.vespa.version}
+org.slf4j:slf4j-api:${slf4j.vespa.version}
+org.slf4j:slf4j-jdk14:${slf4j.vespa.version}
+org.slf4j:slf4j-simple:${slf4j.vespa.version}
 org.tukaani:xz:1.9
-org.xerial.snappy:snappy-java:1.1.10.4
+org.wiremock:wiremock-standalone:${wiremock.vespa.version}
+org.xerial.snappy:snappy-java:${snappy.vespa.version}
 software.amazon.ion:ion-java:1.0.2
-xerces:xercesImpl:2.12.2
-
-#[test-only]
-# Contains dependencies that are used exclusively in 'test' scope
-com.google.jimfs:jimfs:1.3.0
-net.bytebuddy:byte-buddy:1.14.8
-net.bytebuddy:byte-buddy-agent:1.14.8
-org.apache.curator:curator-test:5.5.0
-org.assertj:assertj-core:3.24.2
-org.junit.jupiter:junit-jupiter:5.10.0
-org.junit.jupiter:junit-jupiter-engine:5.10.0
-org.junit.jupiter:junit-jupiter-params:5.10.0
-org.junit.platform:junit-platform-commons:1.10.0
-org.junit.platform:junit-platform-engine:1.10.0
-org.junit.vintage:junit-vintage-engine:5.10.0
-org.junit.vintage:junit-vintage-engine:5.8.1
-org.mockito:mockito-core:5.5.0
-org.mockito:mockito-junit-jupiter:5.5.0
-org.objenesis:objenesis:3.3
-org.wiremock:wiremock-standalone:3.1.0
+xerces:xercesImpl:${xerces.vespa.version}
diff --git a/vespa-dependencies-enforcer/pom.xml b/vespa-dependencies-enforcer/pom.xml
index 768e5708ee5..91820fd292b 100644
--- a/vespa-dependencies-enforcer/pom.xml
+++ b/vespa-dependencies-enforcer/pom.xml
@@ -38,7 +38,7 @@
                         </goals>
                         <configuration>
                             <rules>
-                                <enforceDependencies implementation="com.yahoo.vespa.maven.plugin.enforcer.EnforceDependenciesAllProjects">
+                                <enforceDependencies implementation="com.yahoo.vespa.maven.plugin.enforcer.AllowedDependencies">
                                     <rootProjectId>com.yahoo.vespa:vespa</rootProjectId>
                                     <specFile>allowed-maven-dependencies.txt</specFile>
                                     <ignored>
@@ -47,14 +47,6 @@
                                         <i>com.yahoo.vespa.bundle-plugin:*:*</i>
                                         <i>com.yahoo.vespa.jdisc_core:*:*</i>
                                     </ignored>
-
-                                    <!-- Classifly all dependencies of below modules as 'test' -->
-                                    <testUtilProjects>
-                                        <!-- Misc -->
-                                        <i>com.yahoo.vespa:testutil</i>
-                                        <!-- Bundle plugin integration test -->
-                                        <i>com.yahoo.vespa.bundle-plugin:*</i>
-                                    </testUtilProjects>
                                 </enforceDependencies>
                             </rules>
                             <fail>true</fail>