Allow properties in rule set

2 files changed, 53 insertions, 58 deletions

diff --git a/maven-plugins/allowed-maven-dependencies.txt b/maven-plugins/allowed-maven-dependencies.txt
index 6853632ea40..06f2f34964b 100644
--- a/maven-plugins/allowed-maven-dependencies.txt
+++ b/maven-plugins/allowed-maven-dependencies.txt
@@ -1,41 +1,31 @@
 # 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
-aopalliance:aopalliance:1.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.github.luben:zstd-jni:1.5.5-5
-com.google.errorprone:error_prone_annotations:2.22.0
+aopalliance:aopalliance:${aopalliance.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.github.luben:zstd-jni:${luben.zstd.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
-commons-codec:commons-codec:1.16.0
-commons-io:commons-io:2.13.0
-jakarta.inject:jakarta.inject-api:2.0.1
-javax.annotation:javax.annotation-api:1.2
-javax.inject:javax.inject:1
+commons-codec:commons-codec:${commons-codec.vespa.version}
+commons-io:commons-io:${commons-io.vespa.version}
+jakarta.inject:jakarta.inject-api:${jakarta.inject.vespa.version}
+javax.annotation:javax.annotation-api:${commons-logging.vespa.version}
+javax.inject:javax.inject:${javax.inject.vespa.version}
+junit:junit:${junit4.vespa.version}
+net.bytebuddy:byte-buddy-agent:${byte-buddy.vespa.version}
+net.bytebuddy:byte-buddy:${byte-buddy.vespa.version}
 org.apache-extras.beanshell:bsh:2.0b6
 org.apache.commons:commons-collections4:4.4
-org.apache.commons:commons-compress:1.24.0
-org.apache.commons:commons-lang3:3.13.0
-org.apache.maven:maven-archiver:3.6.1
-org.apache.maven:maven-artifact:3.9.4
-org.apache.maven:maven-builder-support:3.9.4
-org.apache.maven:maven-core:3.9.4
-org.apache.maven:maven-model:3.9.4
-org.apache.maven:maven-model-builder:3.9.4
-org.apache.maven:maven-plugin-api:3.9.4
-org.apache.maven:maven-repository-metadata:3.9.4
-org.apache.maven:maven-resolver-provider:3.9.4
-org.apache.maven:maven-settings:3.9.4
-org.apache.maven:maven-settings-builder:3.9.4
-org.apache.maven.enforcer:enforcer-api:3.4.1
-org.apache.maven.enforcer:enforcer-rules:3.4.1
-org.apache.maven.plugin-tools:maven-plugin-annotations:3.9.0
-org.apache.maven.plugins:maven-shade-plugin:3.5.1
+org.apache.commons:commons-compress:${commons-compress.vespa.version}
+org.apache.commons:commons-lang3:${commons-lang3.vespa.version}
+org.apache.maven.enforcer:enforcer-api:${maven-enforcer-plugin.vespa.version}
+org.apache.maven.enforcer:enforcer-rules:${maven-enforcer-plugin.vespa.version}
+org.apache.maven.plugin-tools:maven-plugin-annotations:${maven-plugin-tools.vespa.version}
+org.apache.maven.plugins:maven-shade-plugin:${maven-shade-plugin.vespa.version}
 org.apache.maven.resolver:maven-resolver-api:1.9.14
 org.apache.maven.resolver:maven-resolver-impl:1.9.14
 org.apache.maven.resolver:maven-resolver-named-locks:1.9.14
@@ -43,42 +33,47 @@ org.apache.maven.resolver:maven-resolver-spi:1.9.14
 org.apache.maven.resolver:maven-resolver-util:1.9.14
 org.apache.maven.shared:maven-dependency-tree:3.2.1
 org.apache.maven.shared:maven-shared-utils:3.3.4
+org.apache.maven:maven-archiver:${maven-archiver.vespa.version}
+org.apache.maven:maven-artifact:${maven-core.vespa.version}
+org.apache.maven:maven-builder-support:${maven-core.vespa.version}
+org.apache.maven:maven-core:${maven-core.vespa.version}
+org.apache.maven:maven-model-builder:${maven-core.vespa.version}
+org.apache.maven:maven-model:${maven-core.vespa.version}
+org.apache.maven:maven-plugin-api:${maven-plugin-api.vespa.version}
+org.apache.maven:maven-repository-metadata:${maven-core.vespa.version}
+org.apache.maven:maven-resolver-provider:${maven-core.vespa.version}
+org.apache.maven:maven-settings-builder:${maven-core.vespa.version}
+org.apache.maven:maven-settings:${maven-core.vespa.version}
+org.apiguardian:apiguardian-api:${apiguardian.vespa.version}
 org.codehaus.plexus:plexus-archiver:4.8.0
 org.codehaus.plexus:plexus-cipher:2.0
 org.codehaus.plexus:plexus-classworlds:2.7.0
 org.codehaus.plexus:plexus-component-annotations:2.1.0
 org.codehaus.plexus:plexus-interpolation:1.26
-org.codehaus.plexus:plexus-io:3.4.1
+org.codehaus.plexus:plexus-io:${maven-enforcer-plugin.vespa.version}
 org.codehaus.plexus:plexus-sec-dispatcher:2.0
-org.codehaus.plexus:plexus-utils:3.5.1
+org.codehaus.plexus:plexus-utils:${maven-shade-plugin.vespa.version}
 org.eclipse.aether:aether-api:1.0.0.v20140518
 org.eclipse.aether:aether-util:1.0.0.v20140518
 org.eclipse.sisu:org.eclipse.sisu.inject:0.3.5
 org.eclipse.sisu:org.eclipse.sisu.plexus:0.3.5
+org.hamcrest:hamcrest-core:${hamcrest.vespa.version}
+org.hamcrest:hamcrest:${hamcrest.vespa.version}
 org.iq80.snappy:snappy:0.4
 org.jdom:jdom2:2.0.6.1
-org.ow2.asm:asm:9.5
-org.ow2.asm:asm-commons:9.5
-org.ow2.asm:asm-tree:9.5
-org.slf4j:slf4j-api:1.7.36
+org.junit.jupiter:junit-jupiter-api:${junit.vespa.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.version}
+org.junit.platform:junit-platform-engine:${junit.platform.vespa.version}
+org.mockito:mockito-core:${mockito.vespa.version}
+org.objenesis:objenesis:3.3
+org.opentest4j:opentest4j:${opentest4j.vespa.version}
+org.ow2.asm:asm-commons:${asm.vespa.version}
+org.ow2.asm:asm-tree:${asm.vespa.version}
+org.ow2.asm:asm:${asm.vespa.version}
+org.slf4j:slf4j-api:${slf4j.vespa.version}
 org.tukaani:xz:1.9
-org.twdata.maven:mojo-executor:2.4.0
+org.twdata.maven:mojo-executor:${mojo-executor.vespa.version}
 org.vafer:jdependency:2.9.0
-
-#[test-only]
-# Contains dependencies that are used exclusively in 'test' scope
-junit:junit:4.13.2
-net.bytebuddy:byte-buddy:1.14.8
-net.bytebuddy:byte-buddy-agent:1.14.8
-org.apiguardian:apiguardian-api:1.1.2
-org.hamcrest:hamcrest:2.2
-org.hamcrest:hamcrest-core:2.2
-org.junit.jupiter:junit-jupiter:5.10.0
-org.junit.jupiter:junit-jupiter-api: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.mockito:mockito-core:5.5.0
-org.objenesis:objenesis:3.3
-org.opentest4j:opentest4j:1.3.0
diff --git a/maven-plugins/pom.xml b/maven-plugins/pom.xml
index f12731ba9da..bc8ed090c3f 100644
--- a/maven-plugins/pom.xml
+++ b/maven-plugins/pom.xml
@@ -47,7 +47,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:maven-plugins</rootProjectId>
                                     <specFile>allowed-maven-dependencies.txt</specFile>
                                     <ignored>