Repository: knox Updated Branches: refs/heads/master f6acd1d1f -> 2b1386557
KNOX-1456 - Move dependency versions to top level pom properties Signed-off-by: Kevin Risden <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/knox/repo Commit: http://git-wip-us.apache.org/repos/asf/knox/commit/2b138655 Tree: http://git-wip-us.apache.org/repos/asf/knox/tree/2b138655 Diff: http://git-wip-us.apache.org/repos/asf/knox/diff/2b138655 Branch: refs/heads/master Commit: 2b1386557d278396fa19c3d0e20c16a2a4941e2b Parents: f6acd1d Author: Kevin Risden <[email protected]> Authored: Thu Sep 27 17:45:30 2018 -0400 Committer: Kevin Risden <[email protected]> Committed: Tue Oct 2 12:25:14 2018 -0400 ---------------------------------------------------------------------- gateway-provider-security-pac4j/pom.xml | 77 ++++---- gateway-release/pom.xml | 2 +- gateway-service-test/pom.xml | 5 +- gateway-shell-release/pom.xml | 2 +- gateway-test-release/pom.xml | 8 +- gateway-test-release/webhdfs-kerb-test/pom.xml | 2 - pom.xml | 185 ++++++++++++-------- 7 files changed, 157 insertions(+), 124 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/knox/blob/2b138655/gateway-provider-security-pac4j/pom.xml ---------------------------------------------------------------------- diff --git a/gateway-provider-security-pac4j/pom.xml b/gateway-provider-security-pac4j/pom.xml index 76f8f03..241984c 100644 --- a/gateway-provider-security-pac4j/pom.xml +++ b/gateway-provider-security-pac4j/pom.xml @@ -29,8 +29,11 @@ <description>An extension of the gateway integrating pac4j as an authentication provider.</description> <properties> + <bcprov-jdk15on.version>1.56</bcprov-jdk15on.version> <j2e-pac4j.version>3.0.0</j2e-pac4j.version> + <lang-tag.version>1.4.3</lang-tag.version> <pac4j.version>2.1.0</pac4j.version> + <spring-core.version>4.3.17.RELEASE</spring-core.version> </properties> <dependencies> @@ -86,57 +89,37 @@ </exclusions> </dependency> + <!-- pac4j Dependencies --> <dependency> <groupId>org.pac4j</groupId> - <artifactId>pac4j-http</artifactId> + <artifactId>pac4j-cas</artifactId> <version>${pac4j.version}</version> </dependency> - <dependency> <groupId>org.pac4j</groupId> - <artifactId>pac4j-oidc</artifactId> + <artifactId>pac4j-config</artifactId> <version>${pac4j.version}</version> <exclusions> <exclusion> - <groupId>com.nimbusds</groupId> - <artifactId>lang-tag</artifactId> + <groupId>xalan</groupId> + <artifactId>xalan</artifactId> </exclusion> </exclusions> </dependency> <dependency> <groupId>org.pac4j</groupId> - <artifactId>pac4j-saml</artifactId> + <artifactId>pac4j-core</artifactId> <version>${pac4j.version}</version> <exclusions> <exclusion> - <groupId>xalan</groupId> - <artifactId>xalan</artifactId> - </exclusion> - <exclusion> <groupId>org.springframework</groupId> <artifactId>spring-core</artifactId> </exclusion> - <exclusion> - <groupId>org.bouncycastle</groupId> - <artifactId>bcprov-jdk15on</artifactId> - </exclusion> </exclusions> </dependency> - - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-core</artifactId> - <version>4.3.17.RELEASE</version> - </dependency> - <dependency> - <groupId>org.bouncycastle</groupId> - <artifactId>bcprov-jdk15on</artifactId> - <version>1.56</version> - </dependency> - <dependency> <groupId>org.pac4j</groupId> - <artifactId>pac4j-cas</artifactId> + <artifactId>pac4j-http</artifactId> <version>${pac4j.version}</version> </dependency> <dependency> @@ -144,38 +127,54 @@ <artifactId>pac4j-oauth</artifactId> <version>${pac4j.version}</version> </dependency> - <dependency> <groupId>org.pac4j</groupId> - <artifactId>pac4j-core</artifactId> + <artifactId>pac4j-oidc</artifactId> <version>${pac4j.version}</version> <exclusions> <exclusion> - <groupId>org.springframework</groupId> - <artifactId>spring-core</artifactId> + <groupId>com.nimbusds</groupId> + <artifactId>lang-tag</artifactId> </exclusion> </exclusions> </dependency> - - <dependency> - <groupId>com.nimbusds</groupId> - <artifactId>lang-tag</artifactId> - <version>1.4.3</version> - </dependency> - <dependency> <groupId>org.pac4j</groupId> - <artifactId>pac4j-config</artifactId> + <artifactId>pac4j-saml</artifactId> <version>${pac4j.version}</version> <exclusions> <exclusion> <groupId>xalan</groupId> <artifactId>xalan</artifactId> </exclusion> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-core</artifactId> + </exclusion> + <exclusion> + <groupId>org.bouncycastle</groupId> + <artifactId>bcprov-jdk15on</artifactId> + </exclusion> </exclusions> </dependency> <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-core</artifactId> + <version>${spring-core.version}</version> + </dependency> + <dependency> + <groupId>org.bouncycastle</groupId> + <artifactId>bcprov-jdk15on</artifactId> + <version>${bcprov-jdk15on.version}</version> + </dependency> + <dependency> + <groupId>com.nimbusds</groupId> + <artifactId>lang-tag</artifactId> + <version>${lang-tag.version}</version> + </dependency> + + <dependency> <groupId>org.apache.velocity</groupId> <artifactId>velocity</artifactId> </dependency> http://git-wip-us.apache.org/repos/asf/knox/blob/2b138655/gateway-release/pom.xml ---------------------------------------------------------------------- diff --git a/gateway-release/pom.xml b/gateway-release/pom.xml index 7fa44c3..1b92937 100644 --- a/gateway-release/pom.xml +++ b/gateway-release/pom.xml @@ -82,7 +82,7 @@ <dependency> <groupId>org.apache.ant</groupId> <artifactId>ant-nodeps</artifactId> - <version>1.8.1</version> + <version>${ant-nodeps.version}</version> </dependency> </dependencies> </plugin> http://git-wip-us.apache.org/repos/asf/knox/blob/2b138655/gateway-service-test/pom.xml ---------------------------------------------------------------------- diff --git a/gateway-service-test/pom.xml b/gateway-service-test/pom.xml index 2963678..0c83259 100644 --- a/gateway-service-test/pom.xml +++ b/gateway-service-test/pom.xml @@ -18,15 +18,16 @@ <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> + <modelVersion>4.0.0</modelVersion> <parent> <artifactId>gateway</artifactId> <groupId>org.apache.knox</groupId> <version>1.2.0-SNAPSHOT</version> </parent> - <modelVersion>4.0.0</modelVersion> + <artifactId>gateway-service-test</artifactId> - <version>1.2.0-SNAPSHOT</version> <name>gateway-service-test</name> + <dependencies> <dependency> <groupId>${gateway-group}</groupId> http://git-wip-us.apache.org/repos/asf/knox/blob/2b138655/gateway-shell-release/pom.xml ---------------------------------------------------------------------- diff --git a/gateway-shell-release/pom.xml b/gateway-shell-release/pom.xml index 47b1b08..18cbcba 100644 --- a/gateway-shell-release/pom.xml +++ b/gateway-shell-release/pom.xml @@ -106,7 +106,7 @@ <dependency> <groupId>org.apache.ant</groupId> <artifactId>ant-nodeps</artifactId> - <version>1.8.1</version> + <version>${ant-nodeps.version}</version> </dependency> </dependencies> </plugin> http://git-wip-us.apache.org/repos/asf/knox/blob/2b138655/gateway-test-release/pom.xml ---------------------------------------------------------------------- diff --git a/gateway-test-release/pom.xml b/gateway-test-release/pom.xml index 12013f0..2271630 100644 --- a/gateway-test-release/pom.xml +++ b/gateway-test-release/pom.xml @@ -167,7 +167,7 @@ <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-common</artifactId> - <version>${hadoop-version}</version> + <version>${hadoop.version}</version> <type>test-jar</type> <exclusions> <exclusion> @@ -180,14 +180,14 @@ <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-hdfs</artifactId> - <version>${hadoop-version}</version> + <version>${hadoop.version}</version> <type>test-jar</type> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-hdfs</artifactId> - <version>${hadoop-version}</version> + <version>${hadoop.version}</version> <scope>test</scope> </dependency> <dependency> @@ -198,7 +198,7 @@ <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-minikdc</artifactId> - <version>${hadoop-version}</version> + <version>${hadoop.version}</version> <scope>test</scope> </dependency> http://git-wip-us.apache.org/repos/asf/knox/blob/2b138655/gateway-test-release/webhdfs-kerb-test/pom.xml ---------------------------------------------------------------------- diff --git a/gateway-test-release/webhdfs-kerb-test/pom.xml b/gateway-test-release/webhdfs-kerb-test/pom.xml index 0ea525f..b7c2d55 100644 --- a/gateway-test-release/webhdfs-kerb-test/pom.xml +++ b/gateway-test-release/webhdfs-kerb-test/pom.xml @@ -27,7 +27,6 @@ <artifactId>webhdfs-kerb-test</artifactId> <name>webhdfs-kerb-test</name> - <version>1.2.0-SNAPSHOT</version> <description>Tests for WebHDFS integration with Knox and Kerberos enabled</description> <dependencies> @@ -92,5 +91,4 @@ </plugin> </plugins> </build> - </project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/knox/blob/2b138655/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 84542cc..ca45535 100644 --- a/pom.xml +++ b/pom.xml @@ -142,6 +142,8 @@ <!-- Dependencies sorted alphabetically --> <apacheds.version>2.0.0-M24</apacheds.version> <apacheds-jdbm.version>2.0.0-M5</apacheds-jdbm.version> + <ant-nodeps.version>1.8.1</ant-nodeps.version> + <buildnumber-maven-plugin.version>1.3</buildnumber-maven-plugin.version> <checkstyle.version>8.12</checkstyle.version> <commons-beanutils.version>1.9.3</commons-beanutils.version> <commons-cli.version>1.4</commons-cli.version> @@ -153,25 +155,57 @@ <commons-lang.version>2.6</commons-lang.version> <commons-lang3.version>3.8</commons-lang3.version> <commons-net.version>3.6</commons-net.version> + <cors-filter.version>2.4</cors-filter.version> + <curator.version>4.0.0</curator.version> + <curator-test.version>2.12.0</curator-test.version> + <easymock.version>3.5</easymock.version> + <eclipselink.version>2.5.2</eclipselink.version> <ehcache.version>2.5.0</ehcache.version> <findsecbugs-plugin.version>1.8.0</findsecbugs-plugin.version> <forbiddenapis.version>2.6</forbiddenapis.version> - <groovy-version>2.4.8</groovy-version> - <hadoop-version>3.0.0</hadoop-version> + <groovy.version>2.4.8</groovy.version> + <hadoop.version>3.0.0</hadoop.version> + <hamcrest.version>1.3</hamcrest.version> + <hamcrest-json.version>0.2</hamcrest-json.version> + <httpclient.version>4.5.4</httpclient.version> + <httpcore.version>4.4.6</httpcore.version> <j2e-pac4j.version>3.0.0</j2e-pac4j.version> <jackson.version>2.9.5</jackson.version> - <javax-websocket-version>1.1</javax-websocket-version> + <jansi.version>1.16</jansi.version> + <javax.annotation-api.version>1.2</javax.annotation-api.version> + <javax.servlet-api.version>3.1.0</javax.servlet-api.version> + <javax.ws.rs-api.version>2.0</javax.ws.rs-api.version> + <javax.websocket-api.version>1.1</javax.websocket-api.version> + <jericho-html.version>3.2</jericho-html.version> <jersey.version>2.6</jersey.version> - <jetty-version>9.2.25.v20180606</jetty-version> + <jetty.version>9.2.25.v20180606</jetty.version> + <jline.version>2.13</jline.version> + <jna.version>4.1.0</jna.version> + <joda-time.version>2.9.2</joda-time.version> + <json-path.version>2.4.0</json-path.version> + <json-smart.version>2.3</json-smart.version> + <junit.version>4.12</junit.version> + <libpam4j.version>1.9.1</libpam4j.version> + <log4j.version>1.2.17</log4j.version> <maven-checkstyle-plugin.version>3.0.0</maven-checkstyle-plugin.version> + <maven-compiler-plugin.version>3.8.0</maven-compiler-plugin.version> <maven-dependency-plugin.version>3.1.1</maven-dependency-plugin.version> - <metrics-version>3.1.2</metrics-version> + <maven-enforcer-plugin.version>3.0.0-M1</maven-enforcer-plugin.version> + <metrics.version>3.1.2</metrics.version> + <nimbus-jose-jwt.version>4.41.2</nimbus-jose-jwt.version> <pac4j.version>2.1.0</pac4j.version> + <rest-assured.version>3.0.3</rest-assured.version> <shiro.version>1.2.6</shiro.version> <shrinkwrap.version>1.2.6</shrinkwrap.version> <shrinkwrap.descriptors.version>2.0.0</shrinkwrap.descriptors.version> + <slf4j.version>1.6.6</slf4j.version> <spotbugs.version>3.1.7</spotbugs.version> <spotbugs-maven-plugin.version>3.1.6</spotbugs-maven-plugin.version> + <velocity.version>1.7</velocity.version> + <xmltool.version>3.3</xmltool.version> + <xml-matchers.version>0.10</xml-matchers.version> + <zip4j.version>1.3.2</zip4j.version> + <zookeeper.version>3.4.10</zookeeper.version> </properties> <profiles> @@ -283,7 +317,7 @@ <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>buildnumber-maven-plugin</artifactId> - <version>1.3</version> + <version>${buildnumber-maven-plugin.version}</version> <executions> <execution> <phase>validate</phase> @@ -303,7 +337,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <version>3.8.0</version> + <version>${maven-compiler-plugin.version}</version> <!-- If you are looking to change source/target, change the maven.compiler.{source,target} property --> </plugin> @@ -341,7 +375,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-enforcer-plugin</artifactId> - <version>3.0.0-M1</version> + <version>${maven-enforcer-plugin.version}</version> <executions> <execution> <id>enforce-maven</id> @@ -847,7 +881,7 @@ <dependency> <groupId>com.nimbusds</groupId> <artifactId>nimbus-jose-jwt</artifactId> - <version>4.41.2</version> + <version>${nimbus-jose-jwt.version}</version> <exclusions> <exclusion> <groupId>org.bouncycastle</groupId> @@ -858,118 +892,118 @@ <dependency> <groupId>net.minidev</groupId> <artifactId>json-smart</artifactId> - <version>2.3</version> + <version>${json-smart.version}</version> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-http</artifactId> - <version>${jetty-version}</version> + <version>${jetty.version}</version> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-server</artifactId> - <version>${jetty-version}</version> + <version>${jetty.version}</version> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-util</artifactId> - <version>${jetty-version}</version> + <version>${jetty.version}</version> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-servlet</artifactId> - <version>${jetty-version}</version> + <version>${jetty.version}</version> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-webapp</artifactId> - <version>${jetty-version}</version> + <version>${jetty.version}</version> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-servlets</artifactId> - <version>${jetty-version}</version> + <version>${jetty.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>org.eclipse.persistence</groupId> <artifactId>eclipselink</artifactId> - <version>2.5.2</version> + <version>${eclipselink.version}</version> </dependency> <dependency> <groupId>com.thetransactioncompany</groupId> <artifactId>cors-filter</artifactId> - <version>2.4</version> + <version>${cors-filter.version}</version> </dependency> <dependency> <groupId>org.codehaus.groovy</groupId> <artifactId>groovy</artifactId> - <version>${groovy-version}</version> + <version>${groovy.version}</version> </dependency> <dependency> <groupId>org.codehaus.groovy</groupId> <artifactId>groovy-groovysh</artifactId> - <version>${groovy-version}</version> + <version>${groovy.version}</version> </dependency> <dependency> <groupId>org.codehaus.groovy</groupId> <artifactId>groovy-xml</artifactId> - <version>${groovy-version}</version> + <version>${groovy.version}</version> </dependency> <dependency> <groupId>org.codehaus.groovy</groupId> <artifactId>groovy-json</artifactId> - <version>${groovy-version}</version> + <version>${groovy.version}</version> </dependency> <dependency> <groupId>org.fusesource.jansi</groupId> <artifactId>jansi</artifactId> - <version>1.16</version> + <version>${jansi.version}</version> </dependency> <dependency> <groupId>jline</groupId> <artifactId>jline</artifactId> - <version>2.13</version> + <version>${jline.version}</version> </dependency> <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpclient</artifactId> - <version>4.5.4</version> + <version>${httpclient.version}</version> </dependency> <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpcore</artifactId> - <version>4.4.6</version> + <version>${httpcore.version}</version> </dependency> <dependency> <groupId>joda-time</groupId> <artifactId>joda-time</artifactId> - <version>2.9.2</version> + <version>${joda-time.version}</version> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-auth</artifactId> - <version>${hadoop-version}</version> + <version>${hadoop.version}</version> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-mapreduce-client-core</artifactId> - <version>${hadoop-version}</version> + <version>${hadoop.version}</version> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-common</artifactId> - <version>${hadoop-version}</version> + <version>${hadoop.version}</version> <exclusions> <!-- <exclusion> @@ -1112,7 +1146,7 @@ <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-hdfs-client</artifactId> - <version>${hadoop-version}</version> + <version>${hadoop.version}</version> </dependency> <dependency> @@ -1228,22 +1262,22 @@ </exclusion> </exclusions> </dependency> + <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> - <version>1.6.6</version> + <version>${slf4j.version}</version> </dependency> - <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> - <version>1.6.6</version> + <version>${slf4j.version}</version> </dependency> <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> - <version>1.2.17</version> + <version>${log4j.version}</version> </dependency> <dependency> @@ -1272,41 +1306,42 @@ <dependency> <groupId>org.abstractj</groupId> <artifactId>libpam4j</artifactId> - <version>1.9.1</version> + <version>${libpam4j.version}</version> </dependency> <dependency> <groupId>net.java.dev.jna</groupId> <artifactId>jna</artifactId> - <version>4.1.0</version> + <version>${jna.version}</version> </dependency> <dependency> <groupId>org.apache.zookeeper</groupId> <artifactId>zookeeper</artifactId> - <version>3.4.10</version> + <version>${zookeeper.version}</version> </dependency> + <dependency> <groupId>org.apache.curator</groupId> <artifactId>curator-framework</artifactId> - <version>4.0.0</version> + <version>${curator.version}</version> </dependency> <dependency> <groupId>org.apache.curator</groupId> <artifactId>curator-recipes</artifactId> - <version>4.0.0</version> + <version>${curator.version}</version> </dependency> <dependency> <groupId>org.apache.curator</groupId> <artifactId>curator-client</artifactId> - <version>4.0.0</version> + <version>${curator.version}</version> </dependency> <!-- Html pull parser. EPLv1 license --> <dependency> <groupId>net.htmlparser.jericho</groupId> <artifactId>jericho-html</artifactId> - <version>3.2</version> + <version>${jericho-html.version}</version> </dependency> <dependency> @@ -1322,107 +1357,107 @@ <dependency> <groupId>net.lingala.zip4j</groupId> <artifactId>zip4j</artifactId> - <version>1.3.2</version> + <version>${zip4j.version}</version> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-io</artifactId> - <version>${jetty-version}</version> + <version>${jetty.version}</version> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-annotations</artifactId> - <version>${jetty-version}</version> + <version>${jetty.version}</version> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>apache-jsp</artifactId> - <version>${jetty-version}</version> + <version>${jetty.version}</version> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>apache-jstl</artifactId> - <version>${jetty-version}</version> + <version>${jetty.version}</version> </dependency> <!-- Websocket support --> <dependency> <groupId>org.eclipse.jetty.websocket</groupId> <artifactId>websocket-api</artifactId> - <version>${jetty-version}</version> + <version>${jetty.version}</version> </dependency> <dependency> <groupId>org.eclipse.jetty.websocket</groupId> <artifactId>websocket-server</artifactId> - <version>${jetty-version}</version> + <version>${jetty.version}</version> </dependency> <dependency> <groupId>org.eclipse.jetty.websocket</groupId> <artifactId>websocket-servlet</artifactId> - <version>${jetty-version}</version> + <version>${jetty.version}</version> </dependency> <dependency> <groupId>javax.annotation</groupId> <artifactId>javax.annotation-api</artifactId> - <version>1.2</version> + <version>${javax.annotation-api.version}</version> </dependency> <dependency> <groupId>javax.ws.rs</groupId> <artifactId>javax.ws.rs-api</artifactId> - <version>2.0</version> + <version>${javax.ws.rs-api.version}</version> </dependency> <dependency> <groupId>javax.websocket</groupId> <artifactId>javax.websocket-api</artifactId> - <version>${javax-websocket-version}</version> + <version>${javax.websocket-api.version}</version> </dependency> <dependency> <groupId>org.eclipse.jetty.websocket</groupId> <artifactId>javax-websocket-server-impl</artifactId> - <version>${jetty-version}</version> + <version>${jetty.version}</version> </dependency> <dependency> <groupId>org.eclipse.jetty.websocket</groupId> <artifactId>javax-websocket-client-impl</artifactId> - <version>${jetty-version}</version> + <version>${jetty.version}</version> </dependency> <dependency> <groupId>io.dropwizard.metrics</groupId> <artifactId>metrics-core</artifactId> - <version>${metrics-version}</version> + <version>${metrics.version}</version> </dependency> <dependency> <groupId>io.dropwizard.metrics</groupId> <artifactId>metrics-json</artifactId> - <version>${metrics-version}</version> + <version>${metrics.version}</version> </dependency> <dependency> <groupId>io.dropwizard.metrics</groupId> <artifactId>metrics-servlets</artifactId> - <version>${metrics-version}</version> + <version>${metrics.version}</version> </dependency> <dependency> <groupId>io.dropwizard.metrics</groupId> <artifactId>metrics-httpclient</artifactId> - <version>${metrics-version}</version> + <version>${metrics.version}</version> </dependency> <dependency> <groupId>io.dropwizard.metrics</groupId> <artifactId>metrics-graphite</artifactId> - <version>${metrics-version}</version> + <version>${metrics.version}</version> </dependency> <dependency> <groupId>io.dropwizard.metrics</groupId> <artifactId>metrics-jetty9</artifactId> - <version>${metrics-version}</version> + <version>${metrics.version}</version> </dependency> <!-- ********** ********** ********** ********** ********** ********** --> @@ -1439,19 +1474,19 @@ <dependency> <groupId>org.hamcrest</groupId> <artifactId>hamcrest-core</artifactId> - <version>1.3</version> + <version>${hamcrest.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.hamcrest</groupId> <artifactId>hamcrest-library</artifactId> - <version>1.3</version> + <version>${hamcrest.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>uk.co.datumedge</groupId> <artifactId>hamcrest-json</artifactId> - <version>0.2</version> + <version>${hamcrest-json.version}</version> <scope>test</scope> </dependency> @@ -1459,66 +1494,66 @@ <dependency> <groupId>io.rest-assured</groupId> <artifactId>rest-assured</artifactId> - <version>3.0.3</version> + <version>${rest-assured.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>io.rest-assured</groupId> <artifactId>json-path</artifactId> - <version>3.0.3</version> + <version>${rest-assured.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.12</version> + <version>${junit.version}</version> </dependency> <dependency> <groupId>org.easymock</groupId> <artifactId>easymock</artifactId> - <version>3.5</version> + <version>${easymock.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.velocity</groupId> <artifactId>velocity</artifactId> - <version>1.7</version> + <version>${velocity.version}</version> <!--scope>test</scope--> </dependency> <dependency> <groupId>com.mycila.xmltool</groupId> <artifactId>xmltool</artifactId> - <version>3.3</version> + <version>${xmltool.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.xmlmatchers</groupId> <artifactId>xml-matchers</artifactId> - <version>0.10</version> + <version>${xml-matchers.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>com.jayway.jsonpath</groupId> <artifactId>json-path</artifactId> - <version>2.4.0</version> + <version>${json-path.version}</version> </dependency> <dependency> <groupId>com.jayway.jsonpath</groupId> <artifactId>json-path-assert</artifactId> - <version>2.4.0</version> + <version>${json-path.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.curator</groupId> <artifactId>curator-test</artifactId> - <version>2.12.0</version> + <version>${curator-test.version}</version> <scope>test</scope> </dependency> </dependencies>
