Repository: knox Updated Branches: refs/heads/master 6f8245a21 -> e9016eb80
http://git-wip-us.apache.org/repos/asf/knox/blob/e9016eb8/gateway-test/pom.xml ---------------------------------------------------------------------- diff --git a/gateway-test/pom.xml b/gateway-test/pom.xml index cf6642f..106afb2 100644 --- a/gateway-test/pom.xml +++ b/gateway-test/pom.xml @@ -32,17 +32,7 @@ <dependencies> <dependency> <groupId>${gateway-group}</groupId> - <artifactId>gateway-demo-ldap</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>${gateway-group}</groupId> - <artifactId>gateway-provider-ha</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>${gateway-group}</groupId> - <artifactId>gateway-provider-identity-assertion-pseudo</artifactId> + <artifactId>gateway-release</artifactId> <scope>test</scope> </dependency> <dependency> @@ -52,74 +42,27 @@ </dependency> <dependency> <groupId>${gateway-group}</groupId> - <artifactId>gateway-provider-rewrite</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>${gateway-group}</groupId> - <artifactId>gateway-provider-security-authc-anon</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>${gateway-group}</groupId> - <artifactId>gateway-provider-security-authz-acls</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>${gateway-group}</groupId> - <artifactId>gateway-provider-security-preauth</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>${gateway-group}</groupId> - <artifactId>gateway-provider-security-shiro</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>${gateway-group}</groupId> - <artifactId>gateway-server</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>${gateway-group}</groupId> - <artifactId>gateway-server-xforwarded-filter</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>${gateway-group}</groupId> - <artifactId>gateway-service-remoteconfig</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>${gateway-group}</groupId> - <artifactId>gateway-spi</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>${gateway-group}</groupId> - <artifactId>gateway-release</artifactId> + <artifactId>gateway-service-vault</artifactId> <scope>test</scope> </dependency> + <dependency> <groupId>${gateway-group}</groupId> - <artifactId>gateway-service-vault</artifactId> + <artifactId>gateway-demo-ldap</artifactId> <scope>test</scope> </dependency> + <dependency> <groupId>${gateway-group}</groupId> <artifactId>gateway-test-utils</artifactId> <scope>test</scope> </dependency> + <dependency> <groupId>${gateway-group}</groupId> <artifactId>gateway-test-release-utils</artifactId> - <version>${project.version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>${gateway-group}</groupId> - <artifactId>gateway-util-common</artifactId> <scope>test</scope> + <version>${project.version}</version> </dependency> <dependency> @@ -130,11 +73,6 @@ <dependency> <groupId>org.hamcrest</groupId> - <artifactId>hamcrest-core</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.hamcrest</groupId> <artifactId>hamcrest-library</artifactId> <scope>test</scope> </dependency> @@ -144,17 +82,13 @@ <artifactId>hamcrest-json</artifactId> <scope>test</scope> </dependency> - + + <dependency> <groupId>io.rest-assured</groupId> <artifactId>rest-assured</artifactId> <scope>test</scope> </dependency> - <dependency> - <groupId>io.rest-assured</groupId> - <artifactId>json-path</artifactId> - <scope>test</scope> - </dependency> <dependency> <groupId>org.xmlmatchers</groupId> @@ -187,11 +121,6 @@ <scope>test</scope> </dependency> <dependency> - <groupId>org.glassfish.jersey.containers</groupId> - <artifactId>jersey-container-servlet-core</artifactId> - <scope>test</scope> - </dependency> - <dependency> <groupId>org.glassfish.jersey.core</groupId> <artifactId>jersey-server</artifactId> <scope>test</scope> @@ -204,87 +133,10 @@ </dependency> <dependency> - <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpcore</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpclient</artifactId> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.apache.curator</groupId> - <artifactId>curator-client</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.curator</groupId> - <artifactId>curator-framework</artifactId> - <scope>test</scope> - </dependency> - <dependency> <groupId>org.apache.curator</groupId> <artifactId>curator-test</artifactId> <scope>test</scope> </dependency> - <dependency> - <groupId>org.apache.zookeeper</groupId> - <artifactId>zookeeper</artifactId> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-lang3</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>commons-io</groupId> - <artifactId>commons-io</artifactId> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.apache.shiro</groupId> - <artifactId>shiro-web</artifactId> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>javax.ws.rs</groupId> - <artifactId>javax.ws.rs-api</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>javax.servlet-api</artifactId> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.apache.directory.server</groupId> - <artifactId>apacheds-all</artifactId> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.jboss.shrinkwrap</groupId> - <artifactId>shrinkwrap-api</artifactId> - <scope>test</scope> - </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/knox/blob/e9016eb8/gateway-util-common/pom.xml ---------------------------------------------------------------------- diff --git a/gateway-util-common/pom.xml b/gateway-util-common/pom.xml index 04c9325..3f66b8f 100644 --- a/gateway-util-common/pom.xml +++ b/gateway-util-common/pom.xml @@ -31,48 +31,18 @@ <dependencies> <dependency> - <groupId>${gateway-group}</groupId> - <artifactId>gateway-i18n</artifactId> - </dependency> - - <dependency> - <groupId>com.fasterxml.jackson.core</groupId> - <artifactId>jackson-core</artifactId> - </dependency> - <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> </dependency> - <dependency> <groupId>commons-codec</groupId> <artifactId>commons-codec</artifactId> </dependency> - <dependency> <groupId>javax.servlet</groupId> <artifactId>javax.servlet-api</artifactId> </dependency> - <dependency> - <groupId>org.apache.directory.server</groupId> - <artifactId>apacheds-jdbm</artifactId> - </dependency> - - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </dependency> - - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </dependency> - <!-- ********** ********** ********** ********** ********** ********** --> <!-- ********** Test Dependencies ********** --> <!-- ********** ********** ********** ********** ********** ********** --> @@ -83,9 +53,12 @@ <scope>test</scope> </dependency> <dependency> - <groupId>org.hamcrest</groupId> - <artifactId>hamcrest-core</artifactId> - <scope>test</scope> + <groupId>${gateway-group}</groupId> + <artifactId>gateway-i18n</artifactId> + </dependency> + <dependency> + <groupId>org.apache.directory.server</groupId> + <artifactId>apacheds-jdbm</artifactId> </dependency> <dependency> <groupId>org.hamcrest</groupId> @@ -105,5 +78,13 @@ <artifactId>easymock</artifactId> <scope>test</scope> </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + </dependency> </dependencies> </project> http://git-wip-us.apache.org/repos/asf/knox/blob/e9016eb8/gateway-util-configinjector/pom.xml ---------------------------------------------------------------------- diff --git a/gateway-util-configinjector/pom.xml b/gateway-util-configinjector/pom.xml index c692a0b..4d4b854 100755 --- a/gateway-util-configinjector/pom.xml +++ b/gateway-util-configinjector/pom.xml @@ -47,11 +47,6 @@ </dependency> <dependency> <groupId>org.hamcrest</groupId> - <artifactId>hamcrest-core</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.hamcrest</groupId> <artifactId>hamcrest-library</artifactId> <scope>test</scope> </dependency> http://git-wip-us.apache.org/repos/asf/knox/blob/e9016eb8/gateway-util-urltemplate/pom.xml ---------------------------------------------------------------------- diff --git a/gateway-util-urltemplate/pom.xml b/gateway-util-urltemplate/pom.xml index 46a5b7c..a0650bb 100644 --- a/gateway-util-urltemplate/pom.xml +++ b/gateway-util-urltemplate/pom.xml @@ -50,12 +50,6 @@ <artifactId>javax.servlet-api</artifactId> <scope>test</scope> </dependency> - - <dependency> - <groupId>org.hamcrest</groupId> - <artifactId>hamcrest-core</artifactId> - <scope>test</scope> - </dependency> <dependency> <groupId>org.hamcrest</groupId> <artifactId>hamcrest-library</artifactId> http://git-wip-us.apache.org/repos/asf/knox/blob/e9016eb8/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index b9d4fe5..878538b 100644 --- a/pom.xml +++ b/pom.xml @@ -148,24 +148,18 @@ <commons-configuration.version>1.10</commons-configuration.version> <commons-digester3.version>3.2</commons-digester3.version> <commons-io.version>2.6</commons-io.version> - <commons-lang.version>2.6</commons-lang.version> <commons-lang3.version>3.8</commons-lang3.version> <commons-net.version>3.6</commons-net.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> - <j2e-pac4j.version>3.0.0</j2e-pac4j.version> <jackson.version>2.9.5</jackson.version> <javax-websocket-version>1.1</javax-websocket-version> - <jersey.version>2.6</jersey.version> <jetty-version>9.2.25.v20180606</jetty-version> <maven-checkstyle-plugin.version>3.0.0</maven-checkstyle-plugin.version> - <maven-dependency-plugin.version>3.1.1</maven-dependency-plugin.version> <metrics-version>3.1.2</metrics-version> <mockito-version>1.10.19</mockito-version> - <pac4j.version>2.1.0</pac4j.version> <shiro.version>1.2.6</shiro.version> <shrinkwrap.version>1.2.6</shrinkwrap.version> <shrinkwrap.descriptors.version>2.0.0</shrinkwrap.descriptors.version> @@ -461,25 +455,6 @@ </dependency> </dependencies> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <version>${maven-dependency-plugin.version}</version> - <executions> - <execution> - <id>analyze</id> - <goals> - <goal>analyze-only</goal> - </goals> - <configuration> - <failOnWarning>true</failOnWarning> - <ignoredUnusedDeclaredDependencies> - <ignoredUnusedDeclaredDependency>*</ignoredUnusedDeclaredDependency> - </ignoredUnusedDeclaredDependencies> - </configuration> - </execution> - </executions> - </plugin> </plugins> </build> @@ -834,29 +809,20 @@ <version>${gateway-version}</version> </dependency> <dependency> - <groupId>org.glassfish.jersey.core</groupId> - <artifactId>jersey-common</artifactId> - <version>${jersey.version}</version> - </dependency> - <dependency> - <groupId>org.glassfish.jersey.containers</groupId> - <artifactId>jersey-container-servlet-core</artifactId> - <version>${jersey.version}</version> - </dependency> - <dependency> <groupId>org.glassfish.jersey.containers</groupId> <artifactId>jersey-container-servlet</artifactId> - <version>${jersey.version}</version> + <version>2.6</version> </dependency> <dependency> <groupId>org.glassfish.jersey.core</groupId> <artifactId>jersey-server</artifactId> - <version>${jersey.version}</version> + <version>2.6</version> </dependency> <dependency> <groupId>com.nimbusds</groupId> <artifactId>nimbus-jose-jwt</artifactId> <version>4.41.2</version> + <scope>compile</scope> <exclusions> <exclusion> <groupId>org.bouncycastle</groupId> @@ -871,11 +837,6 @@ </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-http</artifactId> - <version>${jetty-version}</version> - </dependency> - <dependency> - <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-server</artifactId> <version>${jetty-version}</version> </dependency> @@ -905,6 +866,13 @@ <version>3.1.0</version> </dependency> + <!-- + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-jaspi</artifactId> + <version>${jetty-version}</version> + </dependency> + --> <dependency> <groupId>org.eclipse.persistence</groupId> <artifactId>eclipselink</artifactId> @@ -953,16 +921,24 @@ <version>4.5.4</version> </dependency> <dependency> - <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpcore</artifactId> - <version>4.4.6</version> - </dependency> - <dependency> <groupId>joda-time</groupId> <artifactId>joda-time</artifactId> <version>2.9.2</version> </dependency> + <!-- + <dependency> + <groupId>org.apache.geronimo.components</groupId> + <artifactId>geronimo-jaspi</artifactId> + <version>2.0.0</version> + </dependency> + <dependency> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-osgi-locator</artifactId> + <version>1.1</version> + </dependency> + --> + <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-auth</artifactId> @@ -1115,40 +1091,32 @@ <groupId>com.sun.jersey</groupId> <artifactId>jersey-servlet</artifactId> </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-hdfs-client</artifactId> - <version>${hadoop-version}</version> - </dependency> + <!-- + <exclusion> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-databind</artifactId> + </exclusion> + --> - <dependency> - <groupId>com.fasterxml.jackson.core</groupId> - <artifactId>jackson-annotations</artifactId> - <version>${jackson.version}</version> - </dependency> - <dependency> - <groupId>com.fasterxml.jackson.core</groupId> - <artifactId>jackson-core</artifactId> - <version>${jackson.version}</version> + </exclusions> </dependency> + <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> <version>${jackson.version}</version> </dependency> + <dependency> - <groupId>com.fasterxml.jackson.dataformat</groupId> - <artifactId>jackson-dataformat-yaml</artifactId> - <version>${jackson.version}</version> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + <version>${commons-io.version}</version> </dependency> - <dependency> - <groupId>commons-beanutils</groupId> - <artifactId>commons-beanutils</artifactId> - <version>${commons-beanutils.version}</version> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + <version>${commons-lang3.version}</version> </dependency> <dependency> <groupId>commons-cli</groupId> @@ -1161,39 +1129,29 @@ <version>${commons-codec.version}</version> </dependency> <dependency> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> - <version>${commons-collections.version}</version> - </dependency> - <dependency> <groupId>commons-configuration</groupId> <artifactId>commons-configuration</artifactId> <version>${commons-configuration.version}</version> </dependency> <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-digester3</artifactId> - <version>${commons-digester3.version}</version> + <groupId>commons-net</groupId> + <artifactId>commons-net</artifactId> + <version>${commons-net.version}</version> </dependency> <dependency> - <groupId>commons-io</groupId> - <artifactId>commons-io</artifactId> - <version>${commons-io.version}</version> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + <version>${commons-collections.version}</version> </dependency> <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - <version>${commons-lang.version}</version> + <groupId>commons-beanutils</groupId> + <artifactId>commons-beanutils</artifactId> + <version>${commons-beanutils.version}</version> </dependency> <dependency> <groupId>org.apache.commons</groupId> - <artifactId>commons-lang3</artifactId> - <version>${commons-lang3.version}</version> - </dependency> - <dependency> - <groupId>commons-net</groupId> - <artifactId>commons-net</artifactId> - <version>${commons-net.version}</version> + <artifactId>commons-digester3</artifactId> + <version>${commons-digester3.version}</version> </dependency> <dependency> @@ -1208,11 +1166,6 @@ </dependency> <dependency> <groupId>org.jboss.shrinkwrap.descriptors</groupId> - <artifactId>shrinkwrap-descriptors-api-base</artifactId> - <version>${shrinkwrap.descriptors.version}</version> - </dependency> - <dependency> - <groupId>org.jboss.shrinkwrap.descriptors</groupId> <artifactId>shrinkwrap-descriptors-api-javaee</artifactId> <version>${shrinkwrap.descriptors.version}</version> </dependency> @@ -1257,11 +1210,6 @@ <dependency> <groupId>org.apache.shiro</groupId> - <artifactId>shiro-core</artifactId> - <version>${shiro.version}</version> - </dependency> - <dependency> - <groupId>org.apache.shiro</groupId> <artifactId>shiro-web</artifactId> <version>${shiro.version}</version> </dependency> @@ -1273,12 +1221,6 @@ </dependency> <dependency> - <groupId>net.sf.ehcache</groupId> - <artifactId>ehcache-core</artifactId> - <version>${ehcache.version}</version> - </dependency> - - <dependency> <groupId>org.abstractj</groupId> <artifactId>libpam4j</artifactId> <version>1.9.1</version> @@ -1336,11 +1278,6 @@ <dependency> <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-io</artifactId> - <version>${jetty-version}</version> - </dependency> - <dependency> - <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-annotations</artifactId> <version>${jetty-version}</version> </dependency> @@ -1358,11 +1295,6 @@ <!-- Websocket support --> <dependency> <groupId>org.eclipse.jetty.websocket</groupId> - <artifactId>websocket-api</artifactId> - <version>${jetty-version}</version> - </dependency> - <dependency> - <groupId>org.eclipse.jetty.websocket</groupId> <artifactId>websocket-server</artifactId> <version>${jetty-version}</version> </dependency> @@ -1374,18 +1306,6 @@ </dependency> <dependency> - <groupId>javax.annotation</groupId> - <artifactId>javax.annotation-api</artifactId> - <version>1.2</version> - </dependency> - - <dependency> - <groupId>javax.ws.rs</groupId> - <artifactId>javax.ws.rs-api</artifactId> - <version>2.0</version> - </dependency> - - <dependency> <groupId>javax.websocket</groupId> <artifactId>javax.websocket-api</artifactId> <version>${javax-websocket-version}</version> @@ -1410,11 +1330,6 @@ </dependency> <dependency> <groupId>io.dropwizard.metrics</groupId> - <artifactId>metrics-json</artifactId> - <version>${metrics-version}</version> - </dependency> - <dependency> - <groupId>io.dropwizard.metrics</groupId> <artifactId>metrics-servlets</artifactId> <version>${metrics-version}</version> </dependency> @@ -1471,12 +1386,6 @@ <version>3.0.3</version> <scope>test</scope> </dependency> - <dependency> - <groupId>io.rest-assured</groupId> - <artifactId>json-path</artifactId> - <version>3.0.3</version> - <scope>test</scope> - </dependency> <dependency> <groupId>junit</groupId> @@ -1538,12 +1447,4 @@ </dependency> </dependencies> </dependencyManagement> - - <dependencies> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <scope>test</scope> - </dependency> - </dependencies> </project>
