Repository: incubator-trafodion Updated Branches: refs/heads/master 70b17ed56 -> aa2681f26
REST - Remove unneeded dependent jar files Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/976fc38a Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/976fc38a Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/976fc38a Branch: refs/heads/master Commit: 976fc38acf04012456c0446f7550ea0648511a3d Parents: 4ba8d7d Author: venkat1m <[email protected]> Authored: Mon Mar 21 05:46:03 2016 +0000 Committer: venkat1m <[email protected]> Committed: Mon Mar 21 05:46:03 2016 +0000 ---------------------------------------------------------------------- core/rest/pom.xml | 158 ++----------------- core/rest/src/assembly/all.xml | 20 ++- .../main/java/org/trafodion/rest/Constants.java | 8 - .../org/trafodion/rest/GetStatusResponse.java | 3 - 4 files changed, 26 insertions(+), 163 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/976fc38a/core/rest/pom.xml ---------------------------------------------------------------------- diff --git a/core/rest/pom.xml b/core/rest/pom.xml index be74105..faf283f 100644 --- a/core/rest/pom.xml +++ b/core/rest/pom.xml @@ -35,18 +35,7 @@ <packaging>jar</packaging> <version>${env.TRAFODION_VER}</version> <name>Trafodion REST</name> - <url>http://wiki.trafodion.org</url> - - <developers> - <developer> - <id>matbrown</id> - <name>Matt Brown</name> - <email>[email protected]</email> - <timezone>-8</timezone> - <organization>HP</organization> - <organizationUrl>http://www.hp.com</organizationUrl> - </developer> - </developers> + <url>http://trafodion.apache.org</url> <build> <resources> @@ -417,29 +406,19 @@ <compileSource>1.6</compileSource> <!-- Dependencies --> - <hadoop.version>${env.HADOOP_DEP_VER}</hadoop.version> + <hadoop.version>2.6.0</hadoop.version> <commons-cli.version>1.2</commons-cli.version> - <commons-codec.version>1.4</commons-codec.version> <commons-io.version>2.1</commons-io.version> - <commons-lang.version>2.5</commons-lang.version> <commons-logging.version>1.1.1</commons-logging.version> - <commons-math.version>2.1</commons-math.version> - <commons-configuration.version>1.6</commons-configuration.version> - <metrics-core.version>2.1.2</metrics-core.version> - <guava.version>11.0.2</guava.version> - <jackson.version>1.8.8</jackson.version> - <jasper.version>5.5.23</jasper.version> <jaxb-api.version>2.1</jaxb-api.version> - <jetty.version>9.2.10.v20150310</jetty.version> - <jetty.jspapi.version>6.1.14</jetty.jspapi.version> + <jetty.version>9.2.10.v20150310</jetty.version> <jersey.version>1.8</jersey.version> <junit.version>4.10</junit.version> - <slf4j.version>1.6.6</slf4j.version> + <slf4j.version>1.6.6</slf4j.version> <log4j.version>1.2.16</log4j.version> <zookeeper.version>3.4.5</zookeeper.version> <jython-standalone.version>2.5.3</jython-standalone.version> <jettison.version>1.3.5</jettison.version> - <displaytag.version>1.1.1</displaytag.version> <jdbct4.version>${project.version}</jdbct4.version> <!-- Plugin Dependencies --> @@ -481,57 +460,22 @@ </dependency> <!-- General dependencies --> - <dependency> - <groupId>com.yammer.metrics</groupId> - <artifactId>metrics-core</artifactId> - <version>${metrics-core.version}</version> - </dependency> - <dependency> - <groupId>com.google.guava</groupId> - <artifactId>guava</artifactId> - <version>${guava.version}</version> - </dependency> - <dependency> - <groupId>org.python</groupId> - <artifactId>jython-standalone</artifactId> - <version>${jython-standalone.version}</version> - </dependency> <dependency> <groupId>commons-cli</groupId> <artifactId>commons-cli</artifactId> <version>${commons-cli.version}</version> </dependency> <dependency> - <groupId>commons-configuration</groupId> - <artifactId>commons-configuration</artifactId> - <version>${commons-configuration.version}</version> - </dependency> - <dependency> - <groupId>commons-codec</groupId> - <artifactId>commons-codec</artifactId> - <version>${commons-codec.version}</version> - </dependency> - <dependency> <groupId>commons-io</groupId> <artifactId>commons-io</artifactId> <version>${commons-io.version}</version> </dependency> <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - <version>${commons-lang.version}</version> - </dependency> - <dependency> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> <version>${commons-logging.version}</version> </dependency> <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <version>${log4j.version}</version> - </dependency> - <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-common</artifactId> <version>${hadoop.version}</version> @@ -563,26 +507,6 @@ </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-continuation</artifactId> - <version>${jetty.version}</version> - </dependency> - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-http</artifactId> - <version>${jetty.version}</version> - </dependency> - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-io</artifactId> - <version>${jetty.version}</version> - </dependency> - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-security</artifactId> - <version>${jetty.version}</version> - </dependency> - <dependency> - <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-server</artifactId> <version>${jetty.version}</version> </dependency> @@ -599,73 +523,6 @@ <!-- While jackson is also a dependency of both jersey and avro, these can bring in jars from different, incompatible versions. We force the same version with these dependencies --> - <dependency> - <groupId>org.codehaus.jackson</groupId> - <artifactId>jackson-core-asl</artifactId> - <version>${jackson.version}</version> - </dependency> - <dependency> - <groupId>org.codehaus.jackson</groupId> - <artifactId>jackson-mapper-asl</artifactId> - <version>${jackson.version}</version> - </dependency> - <dependency> - <groupId>org.codehaus.jackson</groupId> - <artifactId>jackson-jaxrs</artifactId> - <version>${jackson.version}</version> - </dependency> - <dependency> - <groupId>org.codehaus.jackson</groupId> - <artifactId>jackson-xc</artifactId> - <version>${jackson.version}</version> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - <version>${slf4j.version}</version> - </dependency> - <dependency> - <!--If this is not in the runtime lib, we get odd - "2009-02-27 11:38:39.504::WARN: failed jsp - java.lang.NoSuchFieldError: IS_SECURITY_ENABLED" - exceptions out of jetty deploying webapps. - St.Ack Thu May 20 01:04:41 PDT 2010 - --> - <groupId>tomcat</groupId> - <artifactId>jasper-compiler</artifactId> - <version>${jasper.version}</version> - <scope>runtime</scope> - <exclusions> - <exclusion> - <groupId>javax.servlet</groupId> - <artifactId>jsp-api</artifactId> - </exclusion> - <exclusion> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - </exclusion> - <exclusion> - <groupId>ant</groupId> - <artifactId>ant</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>tomcat</groupId> - <artifactId>jasper-runtime</artifactId> - <version>${jasper.version}</version> - <scope>runtime</scope> - <exclusions> - <exclusion> - <groupId>javax.servlet</groupId> - <artifactId>jsp-api</artifactId> - </exclusion> - <exclusion> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - </exclusion> - </exclusions> - </dependency> <!-- REST dependencies --> <dependency> @@ -699,7 +556,12 @@ <artifactId>jettison</artifactId> <version>${jettison.version}</version> </dependency> - + + <dependency> + <groupId>org.python</groupId> + <artifactId>jython-standalone</artifactId> + <version>${jython-standalone.version}</version> + </dependency> </dependencies> <profiles> http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/976fc38a/core/rest/src/assembly/all.xml ---------------------------------------------------------------------- diff --git a/core/rest/src/assembly/all.xml b/core/rest/src/assembly/all.xml index 07ac044..ba9df23 100644 --- a/core/rest/src/assembly/all.xml +++ b/core/rest/src/assembly/all.xml @@ -74,10 +74,22 @@ http://maven.apache.org/plugins/maven-assembly-plugin/faq.html#required-classifi <outputDirectory>/lib</outputDirectory> <unpack>false</unpack> <scope>runtime</scope> - <excludes> - <exclude>tomcat:jasper-runtime</exclude> - <exclude>org.trafodion:rest</exclude> - </excludes> + <includes> + <include>org.python:jython-standalone</include> + <include>org.apache.httpcomponents:httpcore</include> + <include>org.codehaus.jettison:jettison</include> + <include>org.eclipse.jetty:jetty-servlet</include> + <include>org.eclipse.jetty:jetty-util</include> + <include>org.eclipse.jetty:jetty-http</include> + <include>org.eclipse.jetty:jetty-io</include> + <include>org.eclipse.jetty:jetty-server</include> + <include>javax.servlet:javax.servlet-api</include> + <include>com.sun.jersey:jersey-server</include> + <include>com.sun.jersey:jersey-json</include> + <include>org.slf4j:slf4j-api</include> + <include>org.slf4j:slf4j-log4j12</include> + <include>org.apache.zookeeper:zookeeper</include> + </includes> <fileMode>0644</fileMode> <directoryMode>0644</directoryMode> </dependencySet> http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/976fc38a/core/rest/src/main/java/org/trafodion/rest/Constants.java ---------------------------------------------------------------------- diff --git a/core/rest/src/main/java/org/trafodion/rest/Constants.java b/core/rest/src/main/java/org/trafodion/rest/Constants.java index 2c6e001..52b210e 100644 --- a/core/rest/src/main/java/org/trafodion/rest/Constants.java +++ b/core/rest/src/main/java/org/trafodion/rest/Constants.java @@ -22,14 +22,6 @@ under the License. */ package org.trafodion.rest; -import java.util.Arrays; -import java.util.Collections; -import java.util.List; -import java.util.UUID; -import java.util.regex.Pattern; - -import org.apache.commons.lang.ArrayUtils; -import org.trafodion.rest.util.Bytes; /** * Constants holds a bunch of rest-related constants http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/976fc38a/core/rest/src/main/java/org/trafodion/rest/GetStatusResponse.java ---------------------------------------------------------------------- diff --git a/core/rest/src/main/java/org/trafodion/rest/GetStatusResponse.java b/core/rest/src/main/java/org/trafodion/rest/GetStatusResponse.java index eb2b96e..edfa202 100644 --- a/core/rest/src/main/java/org/trafodion/rest/GetStatusResponse.java +++ b/core/rest/src/main/java/org/trafodion/rest/GetStatusResponse.java @@ -22,10 +22,7 @@ package org.trafodion.rest; -import java.io.IOException; - import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlElementWrapper; import javax.xml.bind.annotation.XmlElement; @XmlRootElement
