Classify dependencies based on test vs non-test usage

2 files changed, 35 insertions, 21 deletions

diff --git a/vespa-dependencies-enforcer/allowed-maven-dependencies.txt b/vespa-dependencies-enforcer/allowed-maven-dependencies.txt
index 114f75acc0b..459033e387e 100644
--- a/vespa-dependencies-enforcer/allowed-maven-dependencies.txt
+++ b/vespa-dependencies-enforcer/allowed-maven-dependencies.txt
@@ -1,4 +1,7 @@
 # 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
 backport-util-concurrent:backport-util-concurrent:3.1
 biz.aQute.bnd:biz.aQute.bnd.util:6.1.0
@@ -21,17 +24,13 @@ com.fasterxml.jackson.jaxrs:jackson-jaxrs-base:2.14.0
 com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:2.14.0
 com.fasterxml.jackson.module:jackson-module-jaxb-annotations:2.14.0
 com.github.spotbugs:spotbugs-annotations:3.1.9
-com.github.tomakehurst:wiremock-jre8-standalone:2.35.0
 com.google.code.findbugs:jsr305:3.0.2
 com.google.errorprone:error_prone_annotations:2.2.0
 com.google.guava:failureaccess:1.0.1
 com.google.guava:guava:27.1-jre
-com.google.guava:guava-testlib:27.1-jre
 com.google.inject:guice:4.2.3
 com.google.inject:guice:4.2.3:no_aop
 com.google.j2objc:j2objc-annotations:1.1
-com.google.jimfs:jimfs:1.1
-com.google.jimfs:jimfs:1.2
 com.google.protobuf:protobuf-java:3.21.7
 com.ibm.icu:icu4j:70.1
 com.intellij:annotations:9.0.4
@@ -80,9 +79,6 @@ javax.ws.rs:javax.ws.rs-api:2.0
 javax.ws.rs:javax.ws.rs-api:2.0.1
 javax.xml.bind:jaxb-api:2.3.0
 joda-time:joda-time:2.8.1
-junit:junit:4.13.2
-net.bytebuddy:byte-buddy:1.11.19
-net.bytebuddy:byte-buddy-agent:1.11.19
 net.java.dev.jna:jna:5.11.0
 org.antlr:antlr-runtime:3.5.2
 org.antlr:antlr4-runtime:4.9.3
@@ -96,7 +92,6 @@ org.apache.commons:commons-math3:3.6.1
 org.apache.curator:curator-client:5.3.0
 org.apache.curator:curator-framework:5.3.0
 org.apache.curator:curator-recipes:5.3.0
-org.apache.curator:curator-test:5.3.0
 org.apache.felix:org.apache.felix.framework:7.0.1
 org.apache.felix:org.apache.felix.log:1.0.1
 org.apache.httpcomponents:httpclient:4.5.13
@@ -140,11 +135,9 @@ org.apache.yetus:audience-annotations:0.12.0
 org.apache.zookeeper:zookeeper:3.8.0
 org.apache.zookeeper:zookeeper-jute:3.8.0
 org.apiguardian:apiguardian-api:1.1.2
-org.assertj:assertj-core:3.11.1
 org.bouncycastle:bcpkix-jdk18on:1.72
 org.bouncycastle:bcprov-jdk18on:1.72
 org.bouncycastle:bcutil-jdk18on:1.72
-org.checkerframework:checker-qual:2.5.2
 org.codehaus.plexus:plexus-archiver:4.2.1
 org.codehaus.plexus:plexus-cipher:2.0
 org.codehaus.plexus:plexus-classworlds:2.6.0
@@ -155,8 +148,6 @@ org.codehaus.plexus:plexus-interpolation:1.26
 org.codehaus.plexus:plexus-io:3.2.0
 org.codehaus.plexus:plexus-sec-dispatcher:2.0
 org.codehaus.plexus:plexus-utils:3.3.0
-org.codehaus.plexus:plexus-utils:3.3.1
-org.cthul:cthul-matchers:1.0
 org.eclipse.collections:eclipse-collections:11.0.0
 org.eclipse.collections:eclipse-collections-api:11.0.0
 org.eclipse.jetty:jetty-alpn-java-server:9.4.49.v20220914
@@ -195,28 +186,19 @@ org.glassfish.jersey.ext:jersey-entity-filtering:2.25
 org.glassfish.jersey.ext:jersey-proxy-client:2.25
 org.glassfish.jersey.media:jersey-media-json-jackson:2.25
 org.glassfish.jersey.media:jersey-media-multipart:2.25
-org.hamcrest:hamcrest-all:1.3
-org.hamcrest:hamcrest-core:1.3
-org.hamcrest:hamcrest-library:1.3
 org.hdrhistogram:HdrHistogram:2.1.12
 org.iq80.snappy:snappy:0.4
 org.javassist:javassist:3.20.0-GA
 org.json:json:20220320
-org.junit.jupiter:junit-jupiter:5.8.1
 org.junit.jupiter:junit-jupiter-api:5.8.1
 org.junit.jupiter:junit-jupiter-engine:5.8.1
-org.junit.jupiter:junit-jupiter-params: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.junit.vintage:junit-vintage-engine:5.8.1
 org.jvnet.mimepull:mimepull:1.9.6
 org.jvnet.staxex:stax-ex:1.8.1
 org.kohsuke:libpam4j:1.11
 org.lz4:lz4-java:1.8.0
-org.mockito:mockito-core:4.0.0
-org.mockito:mockito-junit-jupiter:4.0.0
-org.objenesis:objenesis:3.2
 org.opentest4j:opentest4j:1.2.0
 org.osgi:org.osgi.compendium:4.1.0
 org.osgi:org.osgi.core:4.1.0
@@ -240,4 +222,28 @@ org.xerial.snappy:snappy-java:1.1.7
 software.amazon.ion:ion-java:1.0.2
 xerces:xercesImpl:2.12.2
 xml-apis:xml-apis:1.4.01
+
+#[test-only]
+# Contains dependencies that are used exclusively in 'test' scope
+com.github.tomakehurst:wiremock-jre8-standalone:2.35.0
+com.google.guava:guava-testlib:27.1-jre
+com.google.jimfs:jimfs:1.1
+com.google.jimfs:jimfs:1.2
+junit:junit:4.13.2
+net.bytebuddy:byte-buddy:1.11.19
+net.bytebuddy:byte-buddy-agent:1.11.19
+org.apache.curator:curator-test:5.3.0
+org.assertj:assertj-core:3.11.1
+org.checkerframework:checker-qual:2.5.2
+org.codehaus.plexus:plexus-utils:3.3.1
+org.cthul:cthul-matchers:1.0
+org.hamcrest:hamcrest-all:1.3
+org.hamcrest:hamcrest-core:1.3
+org.hamcrest:hamcrest-library:1.3
+org.junit.jupiter:junit-jupiter:5.8.1
+org.junit.jupiter:junit-jupiter-params:5.8.1
+org.junit.vintage:junit-vintage-engine:5.8.1
+org.mockito:mockito-core:4.0.0
+org.mockito:mockito-junit-jupiter:4.0.0
+org.objenesis:objenesis:3.2
 xmlunit:xmlunit:1.5
diff --git a/vespa-dependencies-enforcer/pom.xml b/vespa-dependencies-enforcer/pom.xml
index a4f73991a64..a0e6dc19ccb 100644
--- a/vespa-dependencies-enforcer/pom.xml
+++ b/vespa-dependencies-enforcer/pom.xml
@@ -46,6 +46,14 @@
                                         <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>