You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@knox.apache.org by km...@apache.org on 2013/03/22 21:45:08 UTC
git commit: Cleanup some dependencies to reduce jars in dep.
Updated Branches:
refs/heads/master 3534d6a0c -> a6fbf2add
Cleanup some dependencies to reduce jars in dep.
Project: http://git-wip-us.apache.org/repos/asf/incubator-knox/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-knox/commit/a6fbf2ad
Tree: http://git-wip-us.apache.org/repos/asf/incubator-knox/tree/a6fbf2ad
Diff: http://git-wip-us.apache.org/repos/asf/incubator-knox/diff/a6fbf2ad
Branch: refs/heads/master
Commit: a6fbf2add4a40c103b5e3146c13804df34c4323c
Parents: 3534d6a
Author: Kevin Minder <ke...@hortonworks.com>
Authored: Fri Mar 22 16:45:04 2013 -0400
Committer: Kevin Minder <ke...@hortonworks.com>
Committed: Fri Mar 22 16:45:04 2013 -0400
----------------------------------------------------------------------
gateway-provider-rewrite/pom.xml | 6 +-
gateway-provider-secure-query/pom.xml | 4 +
gateway-release/src/assembly.xml | 4 +
gateway-server/pom.xml | 4 +
.../topology/file/FileTopologyProvider.java | 6 +-
gateway-spi/pom.xml | 4 +
pom.xml | 90 ++++++---------
7 files changed, 60 insertions(+), 58 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/a6fbf2ad/gateway-provider-rewrite/pom.xml
----------------------------------------------------------------------
diff --git a/gateway-provider-rewrite/pom.xml b/gateway-provider-rewrite/pom.xml
index 843aa9c..9e29758 100644
--- a/gateway-provider-rewrite/pom.xml
+++ b/gateway-provider-rewrite/pom.xml
@@ -74,7 +74,11 @@
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
</dependency>
-
+ <dependency>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-core-asl</artifactId>
+ <version>1.0.1</version>
+ </dependency>
<dependency>
<groupId>net.htmlparser.jericho</groupId>
<artifactId>jericho-html</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/a6fbf2ad/gateway-provider-secure-query/pom.xml
----------------------------------------------------------------------
diff --git a/gateway-provider-secure-query/pom.xml b/gateway-provider-secure-query/pom.xml
index 5c3354a..38eabd3 100644
--- a/gateway-provider-secure-query/pom.xml
+++ b/gateway-provider-secure-query/pom.xml
@@ -62,6 +62,10 @@
<groupId>${gateway-group}</groupId>
<artifactId>gateway-provider-rewrite</artifactId>
</dependency>
+ <dependency>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ </dependency>
<!-- ********** ********** ********** ********** ********** ********** -->
<!-- ********** Test Dependencies ********** -->
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/a6fbf2ad/gateway-release/src/assembly.xml
----------------------------------------------------------------------
diff --git a/gateway-release/src/assembly.xml b/gateway-release/src/assembly.xml
index b85560a..98e3529 100644
--- a/gateway-release/src/assembly.xml
+++ b/gateway-release/src/assembly.xml
@@ -39,6 +39,10 @@
<dependencySets>
<dependencySet>
<outputDirectory>dep</outputDirectory>
+ <!--
+ <useTransitiveFiltering>true</useTransitiveFiltering>
+ -->
+ <scope>runtime</scope>
<excludes>
<exclude>${gateway-group}:*</exclude>
</excludes>
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/a6fbf2ad/gateway-server/pom.xml
----------------------------------------------------------------------
diff --git a/gateway-server/pom.xml b/gateway-server/pom.xml
index 59d7016..afdb0ba 100644
--- a/gateway-server/pom.xml
+++ b/gateway-server/pom.xml
@@ -141,6 +141,10 @@
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
</dependency>
+ <dependency>
+ <groupId>commons-net</groupId>
+ <artifactId>commons-net</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.commons</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/a6fbf2ad/gateway-server/src/main/java/org/apache/hadoop/gateway/topology/file/FileTopologyProvider.java
----------------------------------------------------------------------
diff --git a/gateway-server/src/main/java/org/apache/hadoop/gateway/topology/file/FileTopologyProvider.java b/gateway-server/src/main/java/org/apache/hadoop/gateway/topology/file/FileTopologyProvider.java
index dfde74b..fcf74bd 100644
--- a/gateway-server/src/main/java/org/apache/hadoop/gateway/topology/file/FileTopologyProvider.java
+++ b/gateway-server/src/main/java/org/apache/hadoop/gateway/topology/file/FileTopologyProvider.java
@@ -19,6 +19,7 @@ package org.apache.hadoop.gateway.topology.file;
import org.apache.commons.digester3.Digester;
import org.apache.commons.digester3.binder.DigesterLoader;
+import org.apache.commons.io.FilenameUtils;
import org.apache.commons.vfs2.FileChangeEvent;
import org.apache.commons.vfs2.FileContent;
import org.apache.commons.vfs2.FileListener;
@@ -35,7 +36,6 @@ import org.apache.hadoop.gateway.topology.TopologyListener;
import org.apache.hadoop.gateway.topology.TopologyMonitor;
import org.apache.hadoop.gateway.topology.TopologyProvider;
import org.apache.hadoop.gateway.topology.xml.XmlTopologyRules;
-import org.codehaus.plexus.util.FileUtils;
import org.xml.sax.SAXException;
import java.io.File;
@@ -51,6 +51,8 @@ import java.util.Set;
import static org.apache.commons.digester3.binder.DigesterLoader.newLoader;
+//import org.codehaus.plexus.util.FileUtils;
+
public class FileTopologyProvider implements TopologyProvider, TopologyMonitor, FileListener {
private static GatewayMessages log = MessagesFactory.get( GatewayMessages.class );
@@ -80,7 +82,7 @@ public class FileTopologyProvider implements TopologyProvider, TopologyMonitor,
Digester digester = digesterLoader.newDigester();
FileContent content = file.getContent();
Topology topology = digester.parse( content.getInputStream() );
- topology.setName( FileUtils.removeExtension( file.getName().getBaseName() ) );
+ topology.setName( FilenameUtils.removeExtension( file.getName().getBaseName() ) );
topology.setTimestamp( content.getLastModifiedTime() );
return topology;
}
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/a6fbf2ad/gateway-spi/pom.xml
----------------------------------------------------------------------
diff --git a/gateway-spi/pom.xml b/gateway-spi/pom.xml
index 4f56365..e071fd7 100644
--- a/gateway-spi/pom.xml
+++ b/gateway-spi/pom.xml
@@ -56,6 +56,10 @@
<artifactId>hadoop-core</artifactId>
</dependency>
<dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>javax.servlet-api</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.jboss.shrinkwrap</groupId>
<artifactId>shrinkwrap-api</artifactId>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/a6fbf2ad/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 2176d72..7602b3b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,18 +28,6 @@
<description>The Apache Knox Gateway</description>
<url>http://incubator.apache.org/knox</url>
- <!-- Need this to pickup JUnit 4.11 which is required to resolve Hamcrest dependency issues between JUnit and RestAssured. -->
- <!--
- <repositories>
- <repository>
- <snapshots><enabled>true</enabled></snapshots>
- <id>snapshots</id>
- <name>snapshots</name>
- <url>http://repo.typesafe.com/typesafe/snapshots</url>
- </repository>
- </repositories>
- -->
-
<modules>
<module>gateway-test-utils</module>
<module>gateway-util-common</module>
@@ -435,6 +423,20 @@
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-core</artifactId>
<version>1.0.3</version>
+ <exclusions>
+ <exclusion>
+ <groupId>hsqldb</groupId>
+ <artifactId>hsqldb</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jsp-2.1</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -448,24 +450,26 @@
<artifactId>commons-io</artifactId>
<version>2.4</version>
</dependency>
-
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.1</version>
</dependency>
-
<dependency>
<groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId>
<version>1.2</version>
</dependency>
-
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
<version>1.7</version>
</dependency>
+ <dependency>
+ <groupId>commons-net</groupId>
+ <artifactId>commons-net</artifactId>
+ <version>1.4.1</version>
+ </dependency>
<dependency>
<groupId>org.apache.commons</groupId>
@@ -478,6 +482,16 @@
<groupId>org.apache.commons</groupId>
<artifactId>commons-vfs2</artifactId>
<version>2.0</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.maven.scm</groupId>
+ <artifactId>maven-scm-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.maven.scm</groupId>
+ <artifactId>maven-scm-provider-svnexe</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -555,6 +569,12 @@
<version>${gateway-version}</version>
</dependency>
+ <dependency>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-core-asl</artifactId>
+ <version>1.0.1</version>
+ </dependency>
+
<!-- ********** ********** ********** ********** ********** ********** -->
<!-- ********** Test Dependencies ********** -->
<!-- ********** ********** ********** ********** ********** ********** -->
@@ -590,22 +610,6 @@
<groupId>com.jayway.restassured</groupId>
<artifactId>rest-assured</artifactId>
<version>1.6.2</version>
- <!--
- <exclusions>
- <exclusion>
- <groupId>org.hamcrest</groupId>
- <artifactId>hamcrest-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.hamcrest</groupId>
- <artifactId>hamcrest-core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.hamcrest</groupId>
- <artifactId>hamcrest-library</artifactId>
- </exclusion>
- </exclusions>
- -->
<scope>test</scope>
</dependency>
@@ -615,30 +619,6 @@
<version>4.11</version>
</dependency>
- <!-- Junit must be after restassured otherwise is messes up the hamcrest dependencies -->
- <!--
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit-dep</artifactId>
- <version>4.10</version>
- <exclusions>
- <exclusion>
- <groupId>org.hamcrest</groupId>
- <artifactId>hamcrest-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.hamcrest</groupId>
- <artifactId>hamcrest-core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.hamcrest</groupId>
- <artifactId>hamcrest-library</artifactId>
- </exclusion>
- </exclusions>
- <scope>test</scope>
- </dependency>
- -->
-
<dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>