diff options
author | gjoranv <gv@verizonmedia.com> | 2019-09-27 16:42:04 +0200 |
---|---|---|
committer | gjoranv <gv@verizonmedia.com> | 2019-09-27 16:42:04 +0200 |
commit | c939e0f692a6d27721788606e8338e91dc6159b7 (patch) | |
tree | 1c2656fd3112859787571879c4e0e6931f5e9298 | |
parent | edf8aa93d28e2e4ae4544ae6b22dfa3f78cc9a33 (diff) |
Add version properties for remaining deps in container-dep-versions
-rw-r--r-- | container-dependencies-enforcer/pom.xml | 12 | ||||
-rw-r--r-- | container-dependency-versions/pom.xml | 18 |
2 files changed, 18 insertions, 12 deletions
diff --git a/container-dependencies-enforcer/pom.xml b/container-dependencies-enforcer/pom.xml index b13082b40bb..92407aa9c68 100644 --- a/container-dependencies-enforcer/pom.xml +++ b/container-dependencies-enforcer/pom.xml @@ -92,15 +92,15 @@ <include>commons-daemon:commons-daemon:[${commons-daemon.version}]:jar:provided</include> <include>commons-logging:commons-logging:[1.1.1]:jar:provided</include> <include>javax.annotation:javax.annotation-api:[${javax.annotation-api.version}]:jar:provided</include> - <include>javax.inject:javax.inject:[1]:jar:provided</include> - <include>javax.servlet:javax.servlet-api:[3.1.0]: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.validation:validation-api:[${javax.validation-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>net.jcip:jcip-annotations:[1.0]:jar:provided</include> - <include>net.jpountz.lz4:lz4:[1.3.0]:jar:provided</include> + <include>net.jpountz.lz4:lz4:[${lz4.version}]:jar:provided</include> <include>org.apache.felix:org.apache.felix.framework:[${felix.version}]:jar:provided</include> - <include>org.apache.felix:org.apache.felix.log:[1.0.1]:jar:provided</include> + <include>org.apache.felix:org.apache.felix.log:[${felix.log.version}]:jar:provided</include> <include>org.apache.felix:org.apache.felix.main:[${felix.version}]:jar:provided</include> <include>org.bouncycastle:bcpkix-jdk15on:[${bouncycastle.version}]:jar:provided</include> <include>org.bouncycastle:bcprov-jdk15on:[${bouncycastle.version}]:jar:provided</include> @@ -125,13 +125,13 @@ <include>org.glassfish.jersey.media:jersey-media-json-jackson:[${jersey2.version}]:jar:provided</include> <include>org.glassfish.jersey.media:jersey-media-multipart:[${jersey2.version}]:jar:provided</include> <include>org.javassist:javassist:[${javassist.version}]:jar:provided</include> - <include>org.json:json:[20090211]:jar:provided</include> + <include>org.json:json:[${org.json.version}]:jar:provided</include> <include>org.jvnet.mimepull:mimepull:[${mimepull.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:[1.4.01]:jar:provided</include> + <include>xml-apis:xml-apis:[${xml-apis.version}]:jar:provided</include> </includes> </bannedDependencies> </rules> diff --git a/container-dependency-versions/pom.xml b/container-dependency-versions/pom.xml index 6bf5edbdffc..70840864c6b 100644 --- a/container-dependency-versions/pom.xml +++ b/container-dependency-versions/pom.xml @@ -133,12 +133,12 @@ <dependency> <groupId>javax.inject</groupId> <artifactId>javax.inject</artifactId> - <version>1</version> + <version>${javax.inject.version}</version> </dependency> <dependency> <groupId>javax.servlet</groupId> <artifactId>javax.servlet-api</artifactId> - <version>3.1.0</version> + <version>${javax.servlet-api.version}</version> </dependency> <dependency> <groupId>javax.validation</groupId> @@ -186,7 +186,7 @@ <dependency> <groupId>net.jpountz.lz4</groupId> <artifactId>lz4</artifactId> - <version>1.3.0</version> + <version>${lz4.version}</version> </dependency> <dependency> <groupId>org.apache.felix</groupId> @@ -196,7 +196,7 @@ <dependency> <groupId>org.apache.felix</groupId> <artifactId>org.apache.felix.log</artifactId> - <version>1.0.1</version> + <version>${felix.log.version}</version> </dependency> <dependency> <groupId>org.apache.felix</groupId> @@ -321,7 +321,7 @@ <dependency> <groupId>org.json</groupId> <artifactId>json</artifactId> - <version>20090211</version> + <version>${org.json.version}</version> </dependency> <dependency> <groupId>org.jvnet.mimepull</groupId> @@ -351,7 +351,7 @@ <dependency> <groupId>xml-apis</groupId> <artifactId>xml-apis</artifactId> - <version>1.4.01</version> + <version>${xml-apis.version}</version> </dependency> <!-- NOTE: The dependencies below are not provided from the jdisc container runtime, but had to be moved @@ -420,12 +420,18 @@ <bouncycastle.version>1.58</bouncycastle.version> <commons-daemon.version>1.0.3</commons-daemon.version> <felix.version>6.0.3</felix.version> + <felix.log.version>1.0.1</felix.log.version> <findbugs.version>1.3.9</findbugs.version> <guava.version>20.0</guava.version> <guice.version>3.0</guice.version> + <javax.inject.version>1</javax.inject.version> + <javax.servlet-api.version>3.1.0</javax.servlet-api.version> <jaxb.version>2.3.0</jaxb.version> <jetty.version>9.4.20.v20190813</jetty.version> + <lz4.version>1.3.0</lz4.version> + <org.json.version>20090211</org.json.version> <slf4j.version>1.7.5</slf4j.version> + <xml-apis.version>1.4.01</xml-apis.version> <!-- These must be kept in sync with version used by current jersey2.version. --> <!-- MUST be updated each time jersey2 is upgraded! --> |