diff options
| author | Bjørn Christian Seime <bjorncs@yahooinc.com> | 2022-11-02 14:01:19 +0100 |
|---|---|---|
| committer | Bjørn Christian Seime <bjorncs@yahooinc.com> | 2022-11-02 14:13:31 +0100 |
| commit | cd44f453fcda9398e3b78aa82d118e139d56bdf9 (patch) | |
| tree | b01418651cb623cad156566c600ac7108bfdf68d /container-dependencies-enforcer | |
| parent | cf9692752bfad296c5b0927d9c9a07140f73fc18 (diff) | |
Simplify rule syntax and follow pattern of `Artifact.toString()`
Diffstat (limited to 'container-dependencies-enforcer')
| -rw-r--r-- | container-dependencies-enforcer/pom.xml | 52 |
1 files changed, 26 insertions, 26 deletions
diff --git a/container-dependencies-enforcer/pom.xml b/container-dependencies-enforcer/pom.xml index 5c3ca684c52..8c420328fe2 100644 --- a/container-dependencies-enforcer/pom.xml +++ b/container-dependencies-enforcer/pom.xml @@ -60,35 +60,35 @@ <rules> <enforceDependencies implementation="com.yahoo.vespa.maven.plugin.enforcer.EnforceDependencies"> <allowed> - <include>*:*:*:jar:test</include> - <include>com.yahoo.vespa</include> - <include>aopalliance:aopalliance:${aopalliance.version}:jar:provided</include> - <include>com.fasterxml.jackson.core:jackson-annotations:${jackson2.version}:jar:provided</include> - <include>com.fasterxml.jackson.core:jackson-core:${jackson2.version}:jar:provided</include> - <include>com.fasterxml.jackson.core:jackson-databind:${jackson-databind.version}:jar:provided</include> - <include>com.fasterxml.jackson.datatype:jackson-datatype-jdk8:${jackson2.version}:jar:provided</include> - <include>com.fasterxml.jackson.datatype:jackson-datatype-jsr310:${jackson2.version}:jar:provided</include> + <include>*:*:*:test</include> + <include>com.yahoo.vespa:*:*:*</include> + <include>aopalliance:aopalliance:${aopalliance.version}:provided</include> + <include>com.fasterxml.jackson.core:jackson-annotations:${jackson2.version}:provided</include> + <include>com.fasterxml.jackson.core:jackson-core:${jackson2.version}:provided</include> + <include>com.fasterxml.jackson.core:jackson-databind:${jackson-databind.version}:provided</include> + <include>com.fasterxml.jackson.datatype:jackson-datatype-jdk8:${jackson2.version}:provided</include> + <include>com.fasterxml.jackson.datatype:jackson-datatype-jsr310:${jackson2.version}:provided</include> <!-- Guava with its internal dependencies --> - <include>com.google.guava:guava:${guava.version}:jar:provided</include> - <include>com.google.errorprone:error_prone_annotations:2.2.0:jar:provided</include> - <include>com.google.guava:failureaccess:1.0.1:jar:provided</include> - <include>com.google.j2objc:j2objc-annotations:1.1:jar:provided</include> + <include>com.google.guava:guava:${guava.version}:provided</include> + <include>com.google.errorprone:error_prone_annotations:2.2.0:provided</include> + <include>com.google.guava:failureaccess:1.0.1:provided</include> + <include>com.google.j2objc:j2objc-annotations:1.1:provided</include> - <include>com.google.inject:guice:${guice.version}:jar:provided:no_aop</include> - <include>com.sun.activation:javax.activation:1.2.0:jar:provided</include> - <include>com.sun.xml.bind:jaxb-core:${jaxb.version}:jar:provided</include> - <include>com.sun.xml.bind:jaxb-impl:${jaxb.version}:jar:provided</include> - <include>commons-logging:commons-logging:1.2:jar:provided</include> - <include>javax.inject:javax.inject:${javax.inject.version}:jar:provided</include> - <include>javax.servlet:javax.servlet-api:${javax.servlet-api.version}:jar:provided</include> - <include>javax.ws.rs:javax.ws.rs-api:${javax.ws.rs-api.version}:jar:provided</include> - <include>javax.xml.bind:jaxb-api:${jaxb.version}:jar:provided</include> - <include>org.slf4j:jcl-over-slf4j:${slf4j.version}:jar:provided</include> - <include>org.slf4j:log4j-over-slf4j:${slf4j.version}:jar:provided</include> - <include>org.slf4j:slf4j-api:${slf4j.version}:jar:provided</include> - <include>org.slf4j:slf4j-jdk14:${slf4j.version}:jar:provided</include> - <include>xml-apis:xml-apis:${xml-apis.version}:jar:provided</include> + <include>com.google.inject:guice:jar:no_aop:${guice.version}:provided</include> + <include>com.sun.activation:javax.activation:1.2.0:provided</include> + <include>com.sun.xml.bind:jaxb-core:${jaxb.version}:provided</include> + <include>com.sun.xml.bind:jaxb-impl:${jaxb.version}:provided</include> + <include>commons-logging:commons-logging:1.2:provided</include> + <include>javax.inject:javax.inject:${javax.inject.version}:provided</include> + <include>javax.servlet:javax.servlet-api:${javax.servlet-api.version}:provided</include> + <include>javax.ws.rs:javax.ws.rs-api:${javax.ws.rs-api.version}:provided</include> + <include>javax.xml.bind:jaxb-api:${jaxb.version}:provided</include> + <include>org.slf4j:jcl-over-slf4j:${slf4j.version}:provided</include> + <include>org.slf4j:log4j-over-slf4j:${slf4j.version}:provided</include> + <include>org.slf4j:slf4j-api:${slf4j.version}:provided</include> + <include>org.slf4j:slf4j-jdk14:${slf4j.version}:provided</include> + <include>xml-apis:xml-apis:${xml-apis.version}:provided</include> </allowed> </enforceDependencies> </rules> |