Address RC0 Comments
Change-Id: I2a6c4fb809b6fcad578007b8f48bf8bce179cd84
Reviewed-on: https://asterix-gerrit.ics.uci.edu/607
Tested-by: Jenkins <jenkins@fulliautomatix.ics.uci.edu>
Reviewed-by: Till Westmann <tillw@apache.org>
diff --git a/hyracks/hyracks-examples/tpch-example/tpchclient/pom.xml b/hyracks/hyracks-examples/tpch-example/tpchclient/pom.xml
index 5914d42..4d183ca 100644
--- a/hyracks/hyracks-examples/tpch-example/tpchclient/pom.xml
+++ b/hyracks/hyracks-examples/tpch-example/tpchclient/pom.xml
@@ -80,6 +80,13 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
</plugins>
</build>
</project>
diff --git a/hyracks/hyracks-examples/tpch-example/tpchserver/pom.xml b/hyracks/hyracks-examples/tpch-example/tpchserver/pom.xml
index 948b60a..5e4660d 100644
--- a/hyracks/hyracks-examples/tpch-example/tpchserver/pom.xml
+++ b/hyracks/hyracks-examples/tpch-example/tpchserver/pom.xml
@@ -63,21 +63,11 @@
</executions>
</plugin>
<plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>2.2-beta-5</version>
- <executions>
- <execution>
- <configuration>
- <descriptors>
- <descriptor>src/main/assembly/binary-assembly.xml</descriptor>
- </descriptors>
- </configuration>
- <phase>package</phase>
- <goals>
- <goal>attached</goal>
- </goals>
- </execution>
- </executions>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
</plugin>
</plugins>
</build>
diff --git a/hyracks/hyracks-examples/tpch-example/tpchserver/src/main/licenses/LICENSE b/hyracks/hyracks-examples/tpch-example/tpchserver/src/main/licenses/LICENSE
index 644bea1..21a4ecc 100644
--- a/hyracks/hyracks-examples/tpch-example/tpchserver/src/main/licenses/LICENSE
+++ b/hyracks/hyracks-examples/tpch-example/tpchserver/src/main/licenses/LICENSE
@@ -209,46 +209,6 @@
subcomponents is subject to the terms and condition of the following
licenses.
- Components under Apache License 2.0 are as follows:
-
- - HttpClient (http://hc.apache.org/httpcomponents-client)
- lib/httpclient-4.3.jar
- - HttpCore (http://hc.apache.org/httpcomponents-core-ga)
- lib/httpcore-4.3.jar
- - Jetty :: Continuation (http://www.eclipse.org/jetty/jetty-continuation)
- lib/jetty-continuation-8.0.0.RC0.jar
- - Jetty :: Http Utility (http://www.eclipse.org/jetty/jetty-http)
- lib/jetty-http-8.0.0.RC0.jar
- - Jetty :: IO Utility (http://www.eclipse.org/jetty/jetty-io)
- lib/jetty-io-8.0.0.RC0.jar
- - Jetty :: Security (http://www.eclipse.org/jetty/jetty-security)
- lib/jetty-security-8.0.0.RC0.jar
- - Jetty :: Server Core (http://www.eclipse.org/jetty)
- lib/jetty-server-8.0.0.RC0.jar
- - Jetty :: Servlet Handling (http://www.eclipse.org/jetty/jetty-servlet)
- lib/jetty-servlet-8.0.0.RC0.jar
- - Jetty :: Utilities (http://www.eclipse.org/jetty/jetty-util)
- lib/jetty-util-8.0.0.RC0.jar
- - Jetty :: Webapp Application Support (http://www.eclipse.org/jetty/jetty-webapp)
- lib/jetty-webapp-8.0.0.RC0.jar
- - Jetty :: XML utilities (http://www.eclipse.org/jetty/jetty-xml)
- lib/jetty-xml-8.0.0.RC0.jar
- - Servlet API (http://www.eclipse.org/jetty/jetty-parent/servlet-api)
- lib/servlet-api-3.0.20100224.jar
- - Wicket Core (http://wicket.apache.org/wicket-core/wicket-core)
- lib/wicket-core-1.5.2.jar
- - Wicket Request (http://maven.apache.org)
- lib/wicket-request-1.5.2.jar
- - Wicket Util (http://maven.apache.org)
- lib/wicket-util-1.5.2.jar
- - Apache Commons Codec (http://commons.apache.org/codec/commons-codec)
- lib/commons-codec-1.4.jar
- - Commons IO (http://commons.apache.org/io/)
- lib/commons-io-2.4.jar
- - Apache Commons Logging (http://commons.apache.org/logging)
- lib/commons-logging-1.1.1.jar
- - Commons Lang (http://commons.apache.org/lang/)
- lib/commons-lang3-3.1.jar
===
diff --git a/hyracks/hyracks-examples/tpch-example/tpchserver/src/main/licenses/NOTICE b/hyracks/hyracks-examples/tpch-example/tpchserver/src/main/licenses/NOTICE
index 791d0ba..8bceca5 100644
--- a/hyracks/hyracks-examples/tpch-example/tpchserver/src/main/licenses/NOTICE
+++ b/hyracks/hyracks-examples/tpch-example/tpchserver/src/main/licenses/NOTICE
@@ -1,4 +1,4 @@
-Apache AsterixDB
+Apache AsterixDB Hyracks TPC-H Example Server
Copyright 2016 The Apache Software Foundation
This product includes software developed at
@@ -6,81 +6,6 @@
AsterixDB utilizes many libraries, which come with the following applicable NOTICE(s):
- - lib/hyracks-api-0.2.17-incubating.jar
-
- hyracks-api
- Copyright 2016 The Apache Software Foundation
-
- - lib/hyracks-comm-0.2.17-incubating.jar
-
- hyracks-comm
- Copyright 2016 The Apache Software Foundation
-
- - lib/hyracks-control-cc-0.2.17-incubating.jar
-
- hyracks-control-cc
- Copyright 2016 The Apache Software Foundation
-
- - lib/hyracks-control-common-0.2.17-incubating.jar
-
- hyracks-control-common
- Copyright 2016 The Apache Software Foundation
-
- - lib/hyracks-control-nc-0.2.17-incubating.jar
-
- hyracks-control-nc
- Copyright 2016 The Apache Software Foundation
-
- - lib/hyracks-control-cc-0.2.17-incubating.jar
-
- hyracks-control-cc
- Copyright 2016 The Apache Software Foundation
-
- - lib/hyracks-ipc-0.2.17-incubating.jar
-
- hyracks-ipc
- Copyright 2016 The Apache Software Foundation
-
- - lib/hyracks-net-0.2.17-incubating.jar
-
- hyracks-net
- Copyright 2016 The Apache Software Foundation
-
- - lib/hyracks-dataflow-common-0.2.17-incubating.jar
-
- hyracks-dataflow-common
- Copyright 2016 The Apache Software Foundation
-
- - lib/hyracks-dataflow-std-0.2.17-incubating.jar
-
- hyracks-dataflow-std
- Copyright 2016 The Apache Software Foundation
-
- - lib/hyracks-storage-am-btree-0.2.17-incubating.jar
-
- hyracks-storage-am-btree
- Copyright 2016 The Apache Software Foundation
-
- - lib/hyracks-storage-am-common-0.2.17-incubating.jar
-
- hyracks-storage-am-common
- Copyright 2016 The Apache Software Foundation
-
- - lib/hyracks-storage-common-0.2.17-incubating.jar
-
- hyracks-storage-common
- Copyright 2016 The Apache Software Foundation
-
- - lib/hyracks-data-std-0.2.17-incubating.jar
-
- hyracks-data-std
- Copyright 2016 The Apache Software Foundation
-
- - lib/hyracks-util-0.2.17-incubating.jar
-
- hyracks-util
- Copyright 2016 The Apache Software Foundation
-
- lib/wicket-core-1.5.2.jar
Apache Wicket
Copyright 2006-2011 Apache Software Foundation
@@ -119,3 +44,29 @@
Wicket Util
Copyright 2006-2011 Apache Software Foundation
+
+- lib/commons-logging-1.1.1.jar
+
+ Commons Logging
+ Copyright 2001-2007 The Apache Software Foundation
+
+- lib/httpclient-4.3.jar
+
+ Apache HttpClient
+ Copyright 1999-2013 The Apache Software Foundation
+
+ This product includes software developed at
+ The Apache Software Foundation (http://www.apache.org/).
+
+- lib/httpcore-4.3.jar
+
+ Apache HttpCore
+ Copyright 2005-2013 The Apache Software Foundation
+
+ This product includes software developed at
+ The Apache Software Foundation (http://www.apache.org/).
+
+
+ This project contains annotations derived from JCIP-ANNOTATIONS
+ Copyright (c) 2005 Brian Goetz and Tim Peierls. See http://www.jcip.net
+