Michael Blow has uploaded a new change for review. https://asterix-gerrit.ics.uci.edu/1292
Change subject: Revert "Fix / Enforce Hyracks Dependency Correctness" ...................................................................... Revert "Fix / Enforce Hyracks Dependency Correctness" This reverts commit ba35812f40d961382f89a5e711786537cbb6c977, which is causing an issue with extensions. Change-Id: I3f74b5cb9eac4d944650811c358236255a9be358 --- M asterixdb/asterix-algebra/pom.xml M asterixdb/pom.xml M hyracks-fullstack/algebricks/algebricks-compiler/pom.xml M hyracks-fullstack/algebricks/algebricks-core/pom.xml M hyracks-fullstack/algebricks/algebricks-data/pom.xml M hyracks-fullstack/algebricks/algebricks-examples/piglet-example/pom.xml M hyracks-fullstack/algebricks/algebricks-rewriter/pom.xml M hyracks-fullstack/algebricks/algebricks-runtime/pom.xml M hyracks-fullstack/algebricks/algebricks-tests/pom.xml M hyracks-fullstack/hyracks/hyracks-api/pom.xml M hyracks-fullstack/hyracks/hyracks-client/pom.xml M hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/pom.xml M hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/pom.xml M hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/pom.xml M hyracks-fullstack/hyracks/hyracks-control/hyracks-nc-service/pom.xml M hyracks-fullstack/hyracks/hyracks-data/hyracks-data-std/pom.xml M hyracks-fullstack/hyracks/hyracks-dataflow-std/pom.xml M hyracks-fullstack/hyracks/hyracks-examples/btree-example/btreeclient/pom.xml M hyracks-fullstack/hyracks/hyracks-examples/btree-example/btreehelper/pom.xml M hyracks-fullstack/hyracks/hyracks-examples/btree-example/btreeserver/pom.xml M hyracks-fullstack/hyracks/hyracks-examples/hyracks-integration-tests/pom.xml M hyracks-fullstack/hyracks/hyracks-examples/hyracks-shutdown-test/pom.xml M hyracks-fullstack/hyracks/hyracks-examples/text-example/textclient/pom.xml M hyracks-fullstack/hyracks/hyracks-examples/text-example/texthelper/pom.xml M hyracks-fullstack/hyracks/hyracks-examples/text-example/textserver/pom.xml M hyracks-fullstack/hyracks/hyracks-examples/tpch-example/tpchclient/pom.xml M hyracks-fullstack/hyracks/hyracks-examples/tpch-example/tpchserver/pom.xml M hyracks-fullstack/hyracks/hyracks-hdfs/hyracks-hdfs-2.x/pom.xml M hyracks-fullstack/hyracks/hyracks-hdfs/hyracks-hdfs-core/pom.xml M hyracks-fullstack/hyracks/hyracks-net/pom.xml M hyracks-fullstack/hyracks/hyracks-server/pom.xml M hyracks-fullstack/hyracks/hyracks-storage-am-bloomfilter/pom.xml M hyracks-fullstack/hyracks/hyracks-storage-am-btree/pom.xml M hyracks-fullstack/hyracks/hyracks-storage-am-common/pom.xml M hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/pom.xml M hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/pom.xml M hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/pom.xml M hyracks-fullstack/hyracks/hyracks-storage-am-lsm-rtree/pom.xml M hyracks-fullstack/hyracks/hyracks-storage-am-rtree/pom.xml M hyracks-fullstack/hyracks/hyracks-storage-common/pom.xml M hyracks-fullstack/hyracks/hyracks-test-support/pom.xml M hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-bloomfilter-test/pom.xml M hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-btree-test/pom.xml M hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/pom.xml M hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-common-test/pom.xml M hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-invertedindex-test/pom.xml M hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-rtree-test/pom.xml M hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-rtree-test/pom.xml M hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-common-test/pom.xml M hyracks-fullstack/pom.xml 50 files changed, 324 insertions(+), 1,136 deletions(-) git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb refs/changes/92/1292/1 diff --git a/asterixdb/asterix-algebra/pom.xml b/asterixdb/asterix-algebra/pom.xml index 779e0d5..c78e82a 100644 --- a/asterixdb/asterix-algebra/pom.xml +++ b/asterixdb/asterix-algebra/pom.xml @@ -161,10 +161,6 @@ <artifactId>algebricks-compiler</artifactId> </dependency> <dependency> - <groupId>org.apache.hyracks</groupId> - <artifactId>algebricks-rewriter</artifactId> - </dependency> - <dependency> <groupId>org.json</groupId> <artifactId>json</artifactId> </dependency> diff --git a/asterixdb/pom.xml b/asterixdb/pom.xml index 161a625..2e9f859 100644 --- a/asterixdb/pom.xml +++ b/asterixdb/pom.xml @@ -658,11 +658,6 @@ </dependency> <dependency> <groupId>org.apache.hyracks</groupId> - <artifactId>algebricks-rewriter</artifactId> - <version>${algebricks.version}</version> - </dependency> - <dependency> - <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-api</artifactId> <version>${hyracks.version}</version> </dependency> diff --git a/hyracks-fullstack/algebricks/algebricks-compiler/pom.xml b/hyracks-fullstack/algebricks/algebricks-compiler/pom.xml index 75684f3..13654f4 100644 --- a/hyracks-fullstack/algebricks/algebricks-compiler/pom.xml +++ b/hyracks-fullstack/algebricks/algebricks-compiler/pom.xml @@ -44,28 +44,13 @@ <dependencies> <dependency> <groupId>org.apache.hyracks</groupId> + <artifactId>algebricks-rewriter</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.hyracks</groupId> <artifactId>algebricks-core</artifactId> <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.hyracks</groupId> - <artifactId>algebricks-common</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.hyracks</groupId> - <artifactId>algebricks-data</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.hyracks</groupId> - <artifactId>hyracks-api</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-lang3</artifactId> - <version>3.1</version> </dependency> </dependencies> </project> diff --git a/hyracks-fullstack/algebricks/algebricks-core/pom.xml b/hyracks-fullstack/algebricks/algebricks-core/pom.xml index cd4b374..498a656 100644 --- a/hyracks-fullstack/algebricks/algebricks-core/pom.xml +++ b/hyracks-fullstack/algebricks/algebricks-core/pom.xml @@ -44,6 +44,16 @@ <dependencies> <dependency> <groupId>org.apache.hyracks</groupId> + <artifactId>hyracks-storage-am-btree</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.hyracks</groupId> + <artifactId>hyracks-storage-am-rtree</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-dataflow-std</artifactId> <version>${project.version}</version> </dependency> @@ -56,36 +66,6 @@ <groupId>org.apache.hyracks</groupId> <artifactId>algebricks-common</artifactId> <version>${project.version}</version> - </dependency> - <dependency> - <groupId>commons-io</groupId> - <artifactId>commons-io</artifactId> - <version>2.5</version> - </dependency> - <dependency> - <groupId>org.apache.hyracks</groupId> - <artifactId>hyracks-dataflow-common</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.hyracks</groupId> - <artifactId>algebricks-data</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.hyracks</groupId> - <artifactId>hyracks-api</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.hyracks</groupId> - <artifactId>hyracks-data-std</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-lang3</artifactId> - <version>3.1</version> </dependency> </dependencies> </project> diff --git a/hyracks-fullstack/algebricks/algebricks-data/pom.xml b/hyracks-fullstack/algebricks/algebricks-data/pom.xml index d95810a..aaf02c1 100644 --- a/hyracks-fullstack/algebricks/algebricks-data/pom.xml +++ b/hyracks-fullstack/algebricks/algebricks-data/pom.xml @@ -52,15 +52,5 @@ <artifactId>hyracks-data-std</artifactId> <version>${project.version}</version> </dependency> - <dependency> - <groupId>org.apache.hyracks</groupId> - <artifactId>hyracks-util</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.hyracks</groupId> - <artifactId>hyracks-api</artifactId> - <version>${project.version}</version> - </dependency> </dependencies> </project> diff --git a/hyracks-fullstack/algebricks/algebricks-examples/piglet-example/pom.xml b/hyracks-fullstack/algebricks/algebricks-examples/piglet-example/pom.xml index 4f576cb..a1dfa39 100644 --- a/hyracks-fullstack/algebricks/algebricks-examples/piglet-example/pom.xml +++ b/hyracks-fullstack/algebricks/algebricks-examples/piglet-example/pom.xml @@ -122,50 +122,5 @@ <artifactId>hyracks-util</artifactId> <version>${project.version}</version> </dependency> - <dependency> - <groupId>org.apache.hyracks</groupId> - <artifactId>algebricks-common</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.hyracks</groupId> - <artifactId>hyracks-dataflow-common</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.hyracks</groupId> - <artifactId>algebricks-rewriter</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.hyracks</groupId> - <artifactId>algebricks-runtime</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.hyracks</groupId> - <artifactId>algebricks-data</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.hyracks</groupId> - <artifactId>hyracks-api</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.hyracks</groupId> - <artifactId>hyracks-dataflow-std</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.hyracks</groupId> - <artifactId>hyracks-data-std</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-lang3</artifactId> - <version>3.1</version> - </dependency> </dependencies> </project> diff --git a/hyracks-fullstack/algebricks/algebricks-rewriter/pom.xml b/hyracks-fullstack/algebricks/algebricks-rewriter/pom.xml index c507911..e42f3f0 100644 --- a/hyracks-fullstack/algebricks/algebricks-rewriter/pom.xml +++ b/hyracks-fullstack/algebricks/algebricks-rewriter/pom.xml @@ -47,20 +47,5 @@ <artifactId>algebricks-core</artifactId> <version>${project.version}</version> </dependency> - <dependency> - <groupId>org.apache.hyracks</groupId> - <artifactId>algebricks-common</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.hyracks</groupId> - <artifactId>hyracks-dataflow-common</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-lang3</artifactId> - <version>3.1</version> - </dependency> </dependencies> </project> diff --git a/hyracks-fullstack/algebricks/algebricks-runtime/pom.xml b/hyracks-fullstack/algebricks/algebricks-runtime/pom.xml index 17dd1ea..38c86c5 100644 --- a/hyracks-fullstack/algebricks/algebricks-runtime/pom.xml +++ b/hyracks-fullstack/algebricks/algebricks-runtime/pom.xml @@ -44,6 +44,16 @@ <dependencies> <dependency> <groupId>org.apache.hyracks</groupId> + <artifactId>hyracks-storage-am-btree</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.hyracks</groupId> + <artifactId>hyracks-storage-am-rtree</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-dataflow-std</artifactId> <version>${project.version}</version> </dependency> @@ -55,26 +65,6 @@ <dependency> <groupId>org.apache.hyracks</groupId> <artifactId>algebricks-data</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.hyracks</groupId> - <artifactId>hyracks-dataflow-common</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.hyracks</groupId> - <artifactId>hyracks-api</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.json</groupId> - <artifactId>json</artifactId> - <version>20090211</version> - </dependency> - <dependency> - <groupId>org.apache.hyracks</groupId> - <artifactId>hyracks-data-std</artifactId> <version>${project.version}</version> </dependency> </dependencies> diff --git a/hyracks-fullstack/algebricks/algebricks-tests/pom.xml b/hyracks-fullstack/algebricks/algebricks-tests/pom.xml index 8ad3e7b..b8dc650 100644 --- a/hyracks-fullstack/algebricks/algebricks-tests/pom.xml +++ b/hyracks-fullstack/algebricks/algebricks-tests/pom.xml @@ -110,6 +110,11 @@ </dependency> <dependency> <groupId>org.apache.hyracks</groupId> + <artifactId>algebricks-compiler</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-control-cc</artifactId> <version>${project.version}</version> </dependency> @@ -121,51 +126,6 @@ <dependency> <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-data-std</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.hyracks</groupId> - <artifactId>algebricks-common</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.hyracks</groupId> - <artifactId>hyracks-dataflow-common</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.hyracks</groupId> - <artifactId>hyracks-control-common</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.hyracks</groupId> - <artifactId>algebricks-runtime</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.hyracks</groupId> - <artifactId>algebricks-data</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.hyracks</groupId> - <artifactId>algebricks-core</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.hyracks</groupId> - <artifactId>hyracks-api</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.json</groupId> - <artifactId>json</artifactId> - <version>20090211</version> - </dependency> - <dependency> - <groupId>org.apache.hyracks</groupId> - <artifactId>hyracks-dataflow-std</artifactId> <version>${project.version}</version> </dependency> </dependencies> diff --git a/hyracks-fullstack/hyracks/hyracks-api/pom.xml b/hyracks-fullstack/hyracks/hyracks-api/pom.xml index 14789d9..acb0f1d 100644 --- a/hyracks-fullstack/hyracks/hyracks-api/pom.xml +++ b/hyracks-fullstack/hyracks/hyracks-api/pom.xml @@ -72,6 +72,13 @@ <scope>compile</scope> </dependency> <dependency> + <groupId>args4j</groupId> + <artifactId>args4j</artifactId> + <version>2.0.12</version> + <type>jar</type> + <scope>compile</scope> + </dependency> + <dependency> <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-ipc</artifactId> <version>${project.version}</version> @@ -82,11 +89,6 @@ <version>3.1</version> </dependency> <dependency> - <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpcore</artifactId> - <version>4.4.4</version> - </dependency> - <dependency> <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-util</artifactId> <version>${project.version}</version> @@ -97,5 +99,17 @@ <version>2.0.2-beta</version> <scope>test</scope> </dependency> + <dependency> + <groupId>org.powermock</groupId> + <artifactId>powermock-api-mockito</artifactId> + <version>1.6.2</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.powermock</groupId> + <artifactId>powermock-module-junit4</artifactId> + <version>1.6.2</version> + <scope>test</scope> + </dependency> </dependencies> </project> diff --git a/hyracks-fullstack/hyracks/hyracks-client/pom.xml b/hyracks-fullstack/hyracks/hyracks-client/pom.xml index bf5d167..fad01d5 100644 --- a/hyracks-fullstack/hyracks/hyracks-client/pom.xml +++ b/hyracks-fullstack/hyracks/hyracks-client/pom.xml @@ -83,12 +83,7 @@ </dependency> <dependency> <groupId>org.apache.hyracks</groupId> - <artifactId>hyracks-ipc</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.hyracks</groupId> - <artifactId>hyracks-control-common</artifactId> + <artifactId>hyracks-dataflow-common</artifactId> <version>${project.version}</version> </dependency> <dependency> diff --git a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/pom.xml b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/pom.xml index 8b66a7f..910d1a2 100644 --- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/pom.xml +++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/pom.xml @@ -47,69 +47,21 @@ <scope>compile</scope> </dependency> <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-webapp</artifactId> + <version>9.3.11.v20160721</version> + <type>jar</type> + <scope>compile</scope> + </dependency> + <dependency> <groupId>org.apache.wicket</groupId> <artifactId>wicket-core</artifactId> <version>1.5.2</version> </dependency> <dependency> - <groupId>commons-io</groupId> - <artifactId>commons-io</artifactId> - <version>2.5</version> - </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>javax.servlet-api</artifactId> - <version>3.1.0</version> - </dependency> - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-servlet</artifactId> - <version>9.3.11.v20160721</version> - </dependency> - <dependency> - <groupId>org.apache.wicket</groupId> - <artifactId>wicket-request</artifactId> - <version>1.5.2</version> - </dependency> - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-http</artifactId> - <version>9.3.11.v20160721</version> - </dependency> - <dependency> - <groupId>org.ini4j</groupId> - <artifactId>ini4j</artifactId> - <version>0.5.4</version> - </dependency> - <dependency> - <groupId>org.apache.hyracks</groupId> - <artifactId>hyracks-ipc</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.wicket</groupId> - <artifactId>wicket-util</artifactId> - <version>1.5.2</version> - </dependency> - <dependency> - <groupId>args4j</groupId> - <artifactId>args4j</artifactId> - <version>2.0.12</version> - </dependency> - <dependency> - <groupId>org.apache.hyracks</groupId> - <artifactId>hyracks-api</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.json</groupId> - <artifactId>json</artifactId> - <version>20090211</version> - </dependency> - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-lang3</artifactId> - <version>3.1</version> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-jcl</artifactId> + <version>1.6.3</version> </dependency> </dependencies> </project> diff --git a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/pom.xml b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/pom.xml index ef00821..223aa9e 100644 --- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/pom.xml +++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/pom.xml @@ -47,30 +47,5 @@ <artifactId>ini4j</artifactId> <version>0.5.4</version> </dependency> - <dependency> - <groupId>args4j</groupId> - <artifactId>args4j</artifactId> - <version>2.0.12</version> - </dependency> - <dependency> - <groupId>org.apache.hyracks</groupId> - <artifactId>hyracks-ipc</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.json</groupId> - <artifactId>json</artifactId> - <version>20090211</version> - </dependency> - <dependency> - <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpcore</artifactId> - <version>4.4.4</version> - </dependency> - <dependency> - <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpclient</artifactId> - <version>4.5.2</version> - </dependency> </dependencies> </project> diff --git a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/pom.xml b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/pom.xml index 20d4abe..a6c06de 100644 --- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/pom.xml +++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/pom.xml @@ -48,31 +48,6 @@ <artifactId>hyracks-comm</artifactId> <version>${project.version}</version> </dependency> - <dependency> - <groupId>org.apache.hyracks</groupId> - <artifactId>hyracks-ipc</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>commons-io</groupId> - <artifactId>commons-io</artifactId> - <version>2.5</version> - </dependency> - <dependency> - <groupId>args4j</groupId> - <artifactId>args4j</artifactId> - <version>2.0.12</version> - </dependency> - <dependency> - <groupId>org.apache.hyracks</groupId> - <artifactId>hyracks-api</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-lang3</artifactId> - <version>3.1</version> - </dependency> </dependencies> <reporting> <plugins> diff --git a/hyracks-fullstack/hyracks/hyracks-control/hyracks-nc-service/pom.xml b/hyracks-fullstack/hyracks/hyracks-control/hyracks-nc-service/pom.xml index 6562557..2e4012e 100644 --- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-nc-service/pom.xml +++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-nc-service/pom.xml @@ -18,53 +18,50 @@ ! under the License. !--> <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"> - <parent> - <artifactId>hyracks-control</artifactId> - <groupId>org.apache.hyracks</groupId> - <version>0.2.18-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - - <artifactId>hyracks-nc-service</artifactId> - - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>2.0.2</version> - <configuration> - <source>1.7</source> - <target>1.7</target> - <fork>true</fork> - </configuration> - </plugin> - </plugins> - </build> - - <dependencies> - <dependency> - <groupId>args4j</groupId> - <artifactId>args4j</artifactId> - <version>2.0.12</version> - <type>jar</type> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.ini4j</groupId> - <artifactId>ini4j</artifactId> - <version>0.5.4</version> - </dependency> - <dependency> + <parent> + <artifactId>hyracks-control</artifactId> <groupId>org.apache.hyracks</groupId> - <artifactId>hyracks-control-common</artifactId> <version>0.2.18-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-lang3</artifactId> - <version>3.1</version> - </dependency> - </dependencies> + </parent> + <modelVersion>4.0.0</modelVersion> + + <artifactId>hyracks-nc-service</artifactId> + + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <version>2.0.2</version> + <configuration> + <source>1.7</source> + <target>1.7</target> + <fork>true</fork> + </configuration> + </plugin> + </plugins> + </build> + + <dependencies> + <dependency> + <groupId>args4j</groupId> + <artifactId>args4j</artifactId> + <version>2.0.12</version> + <type>jar</type> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.ini4j</groupId> + <artifactId>ini4j</artifactId> + <version>0.5.4</version> + </dependency> + <dependency> + <groupId>org.apache.hyracks</groupId> + <artifactId>hyracks-control-nc</artifactId> + <version>${project.version}</version> + <type>jar</type> + <scope>compile</scope> + </dependency> + </dependencies> </project> diff --git a/hyracks-fullstack/hyracks/hyracks-data/hyracks-data-std/pom.xml b/hyracks-fullstack/hyracks/hyracks-data/hyracks-data-std/pom.xml index d5d7d5c..e6bb340 100644 --- a/hyracks-fullstack/hyracks/hyracks-data/hyracks-data-std/pom.xml +++ b/hyracks-fullstack/hyracks/hyracks-data/hyracks-data-std/pom.xml @@ -32,11 +32,6 @@ </properties> <dependencies> <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-lang3</artifactId> - <version>3.1</version> - </dependency> - <dependency> <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-util</artifactId> <version>${project.version}</version> diff --git a/hyracks-fullstack/hyracks/hyracks-dataflow-std/pom.xml b/hyracks-fullstack/hyracks/hyracks-dataflow-std/pom.xml index b610220..6cfd941 100644 --- a/hyracks-fullstack/hyracks/hyracks-dataflow-std/pom.xml +++ b/hyracks-fullstack/hyracks/hyracks-dataflow-std/pom.xml @@ -44,26 +44,6 @@ <dependencies> <dependency> <groupId>org.apache.hyracks</groupId> - <artifactId>hyracks-util</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.json</groupId> - <artifactId>json</artifactId> - <version>20090211</version> - </dependency> - <dependency> - <groupId>org.apache.hyracks</groupId> - <artifactId>hyracks-data-std</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-lang3</artifactId> - <version>3.1</version> - </dependency> - <dependency> - <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-api</artifactId> <version>${project.version}</version> <type>jar</type> diff --git a/hyracks-fullstack/hyracks/hyracks-examples/btree-example/btreeclient/pom.xml b/hyracks-fullstack/hyracks/hyracks-examples/btree-example/btreeclient/pom.xml index 1cec310..453354b 100644 --- a/hyracks-fullstack/hyracks/hyracks-examples/btree-example/btreeclient/pom.xml +++ b/hyracks-fullstack/hyracks/hyracks-examples/btree-example/btreeclient/pom.xml @@ -37,46 +37,20 @@ <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-dataflow-std</artifactId> <version>${project.version}</version> + <scope>compile</scope> </dependency> <dependency> <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-storage-am-btree</artifactId> <version>${project.version}</version> + <scope>compile</scope> </dependency> <dependency> <groupId>org.apache.hyracks.examples.btree</groupId> <artifactId>btreehelper</artifactId> <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.hyracks</groupId> - <artifactId>hyracks-dataflow-common</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.hyracks</groupId> - <artifactId>hyracks-storage-am-common</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>args4j</groupId> - <artifactId>args4j</artifactId> - <version>2.0.12</version> - </dependency> - <dependency> - <groupId>org.apache.hyracks</groupId> - <artifactId>hyracks-api</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.hyracks</groupId> - <artifactId>hyracks-storage-common</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.hyracks</groupId> - <artifactId>hyracks-data-std</artifactId> - <version>${project.version}</version> + <type>jar</type> + <scope>compile</scope> </dependency> </dependencies> <build> diff --git a/hyracks-fullstack/hyracks/hyracks-examples/btree-example/btreehelper/pom.xml b/hyracks-fullstack/hyracks/hyracks-examples/btree-example/btreehelper/pom.xml index 991556f..9364294 100644 --- a/hyracks-fullstack/hyracks/hyracks-examples/btree-example/btreehelper/pom.xml +++ b/hyracks-fullstack/hyracks/hyracks-examples/btree-example/btreehelper/pom.xml @@ -37,25 +37,23 @@ <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-dataflow-std</artifactId> <version>${project.version}</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.hyracks</groupId> + <artifactId>hyracks-storage-am-btree</artifactId> + <version>${project.version}</version> + <scope>compile</scope> </dependency> <dependency> <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-api</artifactId> <version>${project.version}</version> + <scope>compile</scope> </dependency> <dependency> <groupId>org.apache.hyracks</groupId> - <artifactId>hyracks-dataflow-common</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.hyracks</groupId> - <artifactId>hyracks-storage-am-common</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.hyracks</groupId> - <artifactId>hyracks-storage-common</artifactId> + <artifactId>hyracks-data-std</artifactId> <version>${project.version}</version> </dependency> </dependencies> diff --git a/hyracks-fullstack/hyracks/hyracks-examples/btree-example/btreeserver/pom.xml b/hyracks-fullstack/hyracks/hyracks-examples/btree-example/btreeserver/pom.xml index 881fd1a..23400e1 100644 --- a/hyracks-fullstack/hyracks/hyracks-examples/btree-example/btreeserver/pom.xml +++ b/hyracks-fullstack/hyracks/hyracks-examples/btree-example/btreeserver/pom.xml @@ -71,4 +71,26 @@ </plugin> </plugins> </build> + <dependencies> + <dependency> + <groupId>org.apache.hyracks.examples.btree</groupId> + <artifactId>btreehelper</artifactId> + <version>${project.version}</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.hyracks</groupId> + <artifactId>hyracks-control-cc</artifactId> + <version>${project.version}</version> + <type>jar</type> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.hyracks</groupId> + <artifactId>hyracks-control-nc</artifactId> + <version>${project.version}</version> + <type>jar</type> + <scope>compile</scope> + </dependency> + </dependencies> </project> diff --git a/hyracks-fullstack/hyracks/hyracks-examples/hyracks-integration-tests/pom.xml b/hyracks-fullstack/hyracks/hyracks-examples/hyracks-integration-tests/pom.xml index 1a5d4ab..08ab78d 100644 --- a/hyracks-fullstack/hyracks/hyracks-examples/hyracks-integration-tests/pom.xml +++ b/hyracks-fullstack/hyracks/hyracks-examples/hyracks-integration-tests/pom.xml @@ -47,41 +47,63 @@ <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-dataflow-std</artifactId> <version>${project.version}</version> + <type>jar</type> + <scope>compile</scope> </dependency> <dependency> <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-control-cc</artifactId> <version>${project.version}</version> + <type>jar</type> + <scope>compile</scope> </dependency> <dependency> <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-control-nc</artifactId> <version>${project.version}</version> + <type>jar</type> + <scope>compile</scope> </dependency> <dependency> <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-storage-am-btree</artifactId> <version>${project.version}</version> + <type>jar</type> + <scope>compile</scope> </dependency> <dependency> <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-storage-am-rtree</artifactId> <version>${project.version}</version> + <type>jar</type> + <scope>compile</scope> </dependency> <dependency> <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-storage-am-lsm-btree</artifactId> <version>${project.version}</version> + <type>jar</type> + <scope>compile</scope> </dependency> <dependency> <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-storage-am-lsm-rtree</artifactId> <version>${project.version}</version> + <type>jar</type> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.hyracks</groupId> + <artifactId>hyracks-storage-am-lsm-invertedindex</artifactId> + <version>${project.version}</version> + <type>jar</type> + <scope>compile</scope> </dependency> <dependency> <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-test-support</artifactId> <version>${project.version}</version> + <type>jar</type> <scope>test</scope> </dependency> <dependency> @@ -93,6 +115,8 @@ <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-client</artifactId> <version>${project.version}</version> + <type>jar</type> + <scope>compile</scope> </dependency> <dependency> <groupId>com.e-movimento.tinytools</groupId> @@ -105,52 +129,6 @@ <artifactId>mockito-all</artifactId> <version>2.0.2-beta</version> <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.hyracks</groupId> - <artifactId>hyracks-dataflow-common</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>commons-io</groupId> - <artifactId>commons-io</artifactId> - <version>2.5</version> - </dependency> - <dependency> - <groupId>org.apache.hyracks</groupId> - <artifactId>hyracks-control-common</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.hyracks</groupId> - <artifactId>hyracks-storage-am-common</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.hyracks</groupId> - <artifactId>hyracks-storage-am-lsm-common</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.hyracks</groupId> - <artifactId>hyracks-api</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.json</groupId> - <artifactId>json</artifactId> - <version>20090211</version> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.12</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.hyracks</groupId> - <artifactId>hyracks-storage-common</artifactId> - <version>${project.version}</version> </dependency> </dependencies> </project> diff --git a/hyracks-fullstack/hyracks/hyracks-examples/hyracks-shutdown-test/pom.xml b/hyracks-fullstack/hyracks/hyracks-examples/hyracks-shutdown-test/pom.xml index aafbbe4..711c183 100644 --- a/hyracks-fullstack/hyracks/hyracks-examples/hyracks-shutdown-test/pom.xml +++ b/hyracks-fullstack/hyracks/hyracks-examples/hyracks-shutdown-test/pom.xml @@ -36,24 +36,6 @@ <build> <plugins> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <version>2.10</version> - <configuration> - <failOnWarning>true</failOnWarning> - <outputXML>true</outputXML> - <usedDependencies>org.apache.hyracks:hyracks-control-nc,org.apache.hyracks:hyracks-control-cc</usedDependencies> - </configuration> - <executions> - <execution> - <phase>process-test-classes</phase> - <goals> - <goal>analyze-only</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>appassembler-maven-plugin</artifactId> <version>1.3</version> @@ -192,12 +174,13 @@ </dependency> <dependency> <groupId>org.apache.hyracks</groupId> - <artifactId>hyracks-ipc</artifactId> + <artifactId>texthelper</artifactId> <version>${project.version}</version> + <scope>compile</scope> </dependency> <dependency> <groupId>org.apache.hyracks</groupId> - <artifactId>hyracks-api</artifactId> + <artifactId>hyracks-control-cc</artifactId> <version>${project.version}</version> <type>jar</type> <scope>compile</scope> @@ -206,11 +189,15 @@ <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-control-nc</artifactId> <version>${project.version}</version> + <type>jar</type> + <scope>compile</scope> </dependency> <dependency> <groupId>org.apache.hyracks</groupId> - <artifactId>hyracks-control-cc</artifactId> + <artifactId>textclient</artifactId> <version>${project.version}</version> + <type>jar</type> + <scope>test</scope> </dependency> </dependencies> </project> diff --git a/hyracks-fullstack/hyracks/hyracks-examples/text-example/textclient/pom.xml b/hyracks-fullstack/hyracks/hyracks-examples/text-example/textclient/pom.xml index fcb5b8e..d73fe86 100644 --- a/hyracks-fullstack/hyracks/hyracks-examples/text-example/textclient/pom.xml +++ b/hyracks-fullstack/hyracks/hyracks-examples/text-example/textclient/pom.xml @@ -37,31 +37,14 @@ <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-dataflow-std</artifactId> <version>${project.version}</version> + <scope>compile</scope> </dependency> <dependency> <groupId>org.apache.hyracks</groupId> <artifactId>texthelper</artifactId> <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.hyracks</groupId> - <artifactId>hyracks-dataflow-common</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>args4j</groupId> - <artifactId>args4j</artifactId> - <version>2.0.12</version> - </dependency> - <dependency> - <groupId>org.apache.hyracks</groupId> - <artifactId>hyracks-api</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.hyracks</groupId> - <artifactId>hyracks-data-std</artifactId> - <version>${project.version}</version> + <type>jar</type> + <scope>compile</scope> </dependency> </dependencies> <build> diff --git a/hyracks-fullstack/hyracks/hyracks-examples/text-example/texthelper/pom.xml b/hyracks-fullstack/hyracks/hyracks-examples/text-example/texthelper/pom.xml index 1792650..f85b264 100644 --- a/hyracks-fullstack/hyracks/hyracks-examples/text-example/texthelper/pom.xml +++ b/hyracks-fullstack/hyracks/hyracks-examples/text-example/texthelper/pom.xml @@ -35,17 +35,19 @@ <dependencies> <dependency> <groupId>org.apache.hyracks</groupId> - <artifactId>hyracks-api</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-dataflow-std</artifactId> <version>${project.version}</version> + <scope>compile</scope> </dependency> <dependency> <groupId>org.apache.hyracks</groupId> - <artifactId>hyracks-dataflow-common</artifactId> + <artifactId>hyracks-api</artifactId> + <version>${project.version}</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.hyracks</groupId> + <artifactId>hyracks-data-std</artifactId> <version>${project.version}</version> </dependency> </dependencies> diff --git a/hyracks-fullstack/hyracks/hyracks-examples/text-example/textserver/pom.xml b/hyracks-fullstack/hyracks/hyracks-examples/text-example/textserver/pom.xml index 07e64c1..aec77a3 100644 --- a/hyracks-fullstack/hyracks/hyracks-examples/text-example/textserver/pom.xml +++ b/hyracks-fullstack/hyracks/hyracks-examples/text-example/textserver/pom.xml @@ -36,26 +36,6 @@ <build> <plugins> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <version>2.10</version> - <configuration> - <failOnWarning>true</failOnWarning> - <outputXML>true</outputXML> - <usedDependencies> - org.apache.hyracks:hyracks-control-nc,org.apache.hyracks:hyracks-control-cc,org.apache.hyracks:hyracks-dataflow-std,org.apache.hyracks:texthelper - </usedDependencies> - </configuration> - <executions> - <execution> - <phase>process-test-classes</phase> - <goals> - <goal>analyze-only</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>appassembler-maven-plugin</artifactId> <version>1.3</version> @@ -193,29 +173,30 @@ </dependency> <dependency> <groupId>org.apache.hyracks</groupId> - <artifactId>textclient</artifactId> + <artifactId>texthelper</artifactId> <version>${project.version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.hyracks</groupId> - <artifactId>hyracks-control-nc</artifactId> - <version>${project.version}</version> + <scope>compile</scope> </dependency> <dependency> <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-control-cc</artifactId> <version>${project.version}</version> + <type>jar</type> + <scope>compile</scope> </dependency> <dependency> <groupId>org.apache.hyracks</groupId> - <artifactId>hyracks-dataflow-std</artifactId> + <artifactId>hyracks-control-nc</artifactId> <version>${project.version}</version> + <type>jar</type> + <scope>compile</scope> </dependency> <dependency> <groupId>org.apache.hyracks</groupId> - <artifactId>texthelper</artifactId> + <artifactId>textclient</artifactId> <version>${project.version}</version> + <type>jar</type> + <scope>test</scope> </dependency> </dependencies> </project> diff --git a/hyracks-fullstack/hyracks/hyracks-examples/tpch-example/tpchclient/pom.xml b/hyracks-fullstack/hyracks/hyracks-examples/tpch-example/tpchclient/pom.xml index 59f54a0..fd5f4d5 100644 --- a/hyracks-fullstack/hyracks/hyracks-examples/tpch-example/tpchclient/pom.xml +++ b/hyracks-fullstack/hyracks/hyracks-examples/tpch-example/tpchclient/pom.xml @@ -42,21 +42,6 @@ <artifactId>hyracks-data-std</artifactId> <version>${project.version}</version> </dependency> - <dependency> - <groupId>args4j</groupId> - <artifactId>args4j</artifactId> - <version>2.0.12</version> - </dependency> - <dependency> - <groupId>org.apache.hyracks</groupId> - <artifactId>hyracks-dataflow-common</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.hyracks</groupId> - <artifactId>hyracks-api</artifactId> - <version>${project.version}</version> - </dependency> </dependencies> <build> <plugins> diff --git a/hyracks-fullstack/hyracks/hyracks-examples/tpch-example/tpchserver/pom.xml b/hyracks-fullstack/hyracks/hyracks-examples/tpch-example/tpchserver/pom.xml index b967e85..18e00db 100644 --- a/hyracks-fullstack/hyracks/hyracks-examples/tpch-example/tpchserver/pom.xml +++ b/hyracks-fullstack/hyracks/hyracks-examples/tpch-example/tpchserver/pom.xml @@ -71,4 +71,31 @@ </plugin> </plugins> </build> + <dependencies> + <dependency> + <groupId>org.apache.hyracks</groupId> + <artifactId>hyracks-dataflow-std</artifactId> + <version>${project.version}</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.hyracks</groupId> + <artifactId>hyracks-data-std</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.hyracks</groupId> + <artifactId>hyracks-control-cc</artifactId> + <version>${project.version}</version> + <type>jar</type> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.hyracks</groupId> + <artifactId>hyracks-control-nc</artifactId> + <version>${project.version}</version> + <type>jar</type> + <scope>compile</scope> + </dependency> + </dependencies> </project> diff --git a/hyracks-fullstack/hyracks/hyracks-hdfs/hyracks-hdfs-2.x/pom.xml b/hyracks-fullstack/hyracks/hyracks-hdfs/hyracks-hdfs-2.x/pom.xml index 4fda8a5..dbe9858 100644 --- a/hyracks-fullstack/hyracks/hyracks-hdfs/hyracks-hdfs-2.x/pom.xml +++ b/hyracks-fullstack/hyracks/hyracks-hdfs/hyracks-hdfs-2.x/pom.xml @@ -73,7 +73,13 @@ <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-hdfs</artifactId> - <classifier>tests</classifier> + <type>jar</type> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-minicluster</artifactId> + <type>jar</type> <scope>test</scope> </dependency> </dependencies> @@ -91,10 +97,26 @@ <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-common</artifactId> + <type>jar</type> + <scope>compile</scope> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-mapreduce-client-core</artifactId> + <type>jar</type> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-hdfs</artifactId> + <type>jar</type> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-minicluster</artifactId> + <type>jar</type> + <scope>test</scope> </dependency> </dependencies> </profile> diff --git a/hyracks-fullstack/hyracks/hyracks-hdfs/hyracks-hdfs-core/pom.xml b/hyracks-fullstack/hyracks/hyracks-hdfs/hyracks-hdfs-core/pom.xml index 96a30fd..cf1e48d 100644 --- a/hyracks-fullstack/hyracks/hyracks-hdfs/hyracks-hdfs-core/pom.xml +++ b/hyracks-fullstack/hyracks/hyracks-hdfs/hyracks-hdfs-core/pom.xml @@ -63,24 +63,6 @@ </execution> </executions> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <version>2.10</version> - <configuration> - <failOnWarning>true</failOnWarning> - <outputXML>true</outputXML> - <ignoredUnusedDeclaredDependencies>org.apache.hadoop:hadoop*::</ignoredUnusedDeclaredDependencies> - </configuration> - <executions> - <execution> - <phase>process-test-classes</phase> - <goals> - <goal>analyze-only</goal> - </goals> - </execution> - </executions> - </plugin> </plugins> </build> @@ -179,47 +161,9 @@ <scope>test</scope> </dependency> <dependency> - <groupId>org.apache.hyracks</groupId> - <artifactId>hyracks-control-common</artifactId> - <version>0.2.18-SNAPSHOT</version> - <scope>test</scope> - </dependency> - <dependency> <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-common</artifactId> - <version>2.2.0</version> - </dependency> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-mapreduce-client-core</artifactId> - <version>2.2.0</version> - </dependency> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-hdfs</artifactId> - <version>2.2.0</version> + <artifactId>hadoop-minicluster</artifactId> <type>jar</type> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-hdfs</artifactId> - <version>2.2.0</version> - <type>test-jar</type> - <classifier>tests</classifier> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-common</artifactId> - <version>2.2.0</version> - <type>test-jar</type> - <classifier>tests</classifier> - <scope>test</scope> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> <scope>test</scope> </dependency> </dependencies> diff --git a/hyracks-fullstack/hyracks/hyracks-net/pom.xml b/hyracks-fullstack/hyracks/hyracks-net/pom.xml index 838e0c7..46494c3 100644 --- a/hyracks-fullstack/hyracks/hyracks-net/pom.xml +++ b/hyracks-fullstack/hyracks/hyracks-net/pom.xml @@ -44,7 +44,7 @@ <dependency> <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-api</artifactId> - <version>${project.version}</version> + <version>0.2.18-SNAPSHOT</version> </dependency> <dependency> <groupId>junit</groupId> diff --git a/hyracks-fullstack/hyracks/hyracks-server/pom.xml b/hyracks-fullstack/hyracks/hyracks-server/pom.xml index 482401b..ed82438 100644 --- a/hyracks-fullstack/hyracks/hyracks-server/pom.xml +++ b/hyracks-fullstack/hyracks/hyracks-server/pom.xml @@ -44,24 +44,6 @@ <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <version>2.10</version> - <configuration> - <failOnWarning>true</failOnWarning> - <outputXML>true</outputXML> - <usedDependencies>org.apache.hyracks:hyracks-control-nc</usedDependencies> - </configuration> - <executions> - <execution> - <phase>process-test-classes</phase> - <goals> - <goal>analyze-only</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-failsafe-plugin</artifactId> <version>2.6</version> <configuration> @@ -147,11 +129,22 @@ <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-control-cc</artifactId> <version>${project.version}</version> + <type>jar</type> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.hyracks</groupId> + <artifactId>hyracks-control-nc</artifactId> + <version>${project.version}</version> + <type>jar</type> + <scope>compile</scope> </dependency> <dependency> <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-nc-service</artifactId> <version>${project.version}</version> + <type>jar</type> + <scope>compile</scope> </dependency> <dependency> <groupId>org.apache.httpcomponents</groupId> @@ -162,26 +155,6 @@ <groupId>junit</groupId> <artifactId>junit</artifactId> <scope>test</scope> - </dependency> - <dependency> - <groupId>org.json</groupId> - <artifactId>json</artifactId> - <version>20090211</version> - </dependency> - <dependency> - <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpcore</artifactId> - <version>4.4.4</version> - </dependency> - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-lang3</artifactId> - <version>3.1</version> - </dependency> - <dependency> - <groupId>org.apache.hyracks</groupId> - <artifactId>hyracks-control-nc</artifactId> - <version>${project.version}</version> </dependency> </dependencies> </project> diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-bloomfilter/pom.xml b/hyracks-fullstack/hyracks/hyracks-storage-am-bloomfilter/pom.xml index b16a827..55f7a42 100644 --- a/hyracks-fullstack/hyracks/hyracks-storage-am-bloomfilter/pom.xml +++ b/hyracks-fullstack/hyracks/hyracks-storage-am-bloomfilter/pom.xml @@ -45,21 +45,8 @@ <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-storage-am-common</artifactId> <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.hyracks</groupId> - <artifactId>hyracks-dataflow-common</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.hyracks</groupId> - <artifactId>hyracks-api</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.hyracks</groupId> - <artifactId>hyracks-storage-common</artifactId> - <version>${project.version}</version> + <type>jar</type> + <scope>compile</scope> </dependency> </dependencies> </project> diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-btree/pom.xml b/hyracks-fullstack/hyracks/hyracks-storage-am-btree/pom.xml index 39409c6..be26125 100644 --- a/hyracks-fullstack/hyracks/hyracks-storage-am-btree/pom.xml +++ b/hyracks-fullstack/hyracks/hyracks-storage-am-btree/pom.xml @@ -90,27 +90,5 @@ <version>1.6.2</version> <scope>test</scope> </dependency> - <dependency> - <groupId>org.powermock</groupId> - <artifactId>powermock-core</artifactId> - <version>1.6.2</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.hyracks</groupId> - <artifactId>hyracks-api</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.12</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.hyracks</groupId> - <artifactId>hyracks-data-std</artifactId> - <version>${project.version}</version> - </dependency> </dependencies> </project> diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-common/pom.xml b/hyracks-fullstack/hyracks/hyracks-storage-am-common/pom.xml index 7ebd27f..da64794 100644 --- a/hyracks-fullstack/hyracks/hyracks-storage-am-common/pom.xml +++ b/hyracks-fullstack/hyracks/hyracks-storage-am-common/pom.xml @@ -75,10 +75,5 @@ <artifactId>hyracks-util</artifactId> <version>${project.version}</version> </dependency> - <dependency> - <groupId>org.apache.hyracks</groupId> - <artifactId>hyracks-data-std</artifactId> - <version>${project.version}</version> - </dependency> </dependencies> </project> diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/pom.xml b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/pom.xml index 5d518bb..ab69b9b 100644 --- a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/pom.xml +++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/pom.xml @@ -45,41 +45,22 @@ <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-storage-am-btree</artifactId> <version>${project.version}</version> + <type>jar</type> + <scope>compile</scope> </dependency> <dependency> <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-storage-am-bloomfilter</artifactId> <version>${project.version}</version> + <type>jar</type> + <scope>compile</scope> </dependency> <dependency> <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-storage-am-lsm-common</artifactId> <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.hyracks</groupId> - <artifactId>hyracks-dataflow-common</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.hyracks</groupId> - <artifactId>hyracks-storage-am-common</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.hyracks</groupId> - <artifactId>hyracks-api</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.hyracks</groupId> - <artifactId>hyracks-storage-common</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.hyracks</groupId> - <artifactId>hyracks-data-std</artifactId> - <version>${project.version}</version> + <type>jar</type> + <scope>compile</scope> </dependency> </dependencies> </project> diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/pom.xml b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/pom.xml index da7c397..a4a97f2 100644 --- a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/pom.xml +++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/pom.xml @@ -45,36 +45,22 @@ <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-storage-am-common</artifactId> <version>${project.version}</version> + <type>jar</type> + <scope>compile</scope> </dependency> <dependency> <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-storage-am-bloomfilter</artifactId> <version>${project.version}</version> + <type>jar</type> + <scope>compile</scope> </dependency> <dependency> <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-storage-am-btree</artifactId> <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.hyracks</groupId> - <artifactId>hyracks-dataflow-common</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.hyracks</groupId> - <artifactId>hyracks-api</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.hyracks</groupId> - <artifactId>hyracks-storage-common</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.hyracks</groupId> - <artifactId>hyracks-dataflow-std</artifactId> - <version>${project.version}</version> + <type>jar</type> + <scope>compile</scope> </dependency> </dependencies> </project> diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/pom.xml b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/pom.xml index 95e446a..670c85e 100644 --- a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/pom.xml +++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/pom.xml @@ -51,46 +51,15 @@ <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-storage-am-btree</artifactId> <version>${project.version}</version> + <type>jar</type> + <scope>compile</scope> </dependency> <dependency> <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-storage-am-lsm-common</artifactId> <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.hyracks</groupId> - <artifactId>hyracks-dataflow-common</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.hyracks</groupId> - <artifactId>hyracks-storage-am-common</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.hyracks</groupId> - <artifactId>hyracks-api</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.hyracks</groupId> - <artifactId>hyracks-dataflow-std</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.hyracks</groupId> - <artifactId>hyracks-storage-common</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.hyracks</groupId> - <artifactId>hyracks-data-std</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.hyracks</groupId> - <artifactId>hyracks-storage-am-bloomfilter</artifactId> - <version>${project.version}</version> + <type>jar</type> + <scope>compile</scope> </dependency> </dependencies> </project> diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-rtree/pom.xml b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-rtree/pom.xml index 2d8085c..17a471c 100644 --- a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-rtree/pom.xml +++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-rtree/pom.xml @@ -45,51 +45,22 @@ <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-storage-am-lsm-common</artifactId> <version>${project.version}</version> + <type>jar</type> + <scope>compile</scope> </dependency> <dependency> <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-storage-am-btree</artifactId> <version>${project.version}</version> + <type>jar</type> + <scope>compile</scope> </dependency> <dependency> <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-storage-am-rtree</artifactId> <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.hyracks</groupId> - <artifactId>hyracks-util</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.hyracks</groupId> - <artifactId>hyracks-api</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.hyracks</groupId> - <artifactId>hyracks-storage-common</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.hyracks</groupId> - <artifactId>hyracks-data-std</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.hyracks</groupId> - <artifactId>hyracks-dataflow-common</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.hyracks</groupId> - <artifactId>hyracks-storage-am-common</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.hyracks</groupId> - <artifactId>hyracks-storage-am-bloomfilter</artifactId> - <version>${project.version}</version> + <type>jar</type> + <scope>compile</scope> </dependency> </dependencies> </project> diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-rtree/pom.xml b/hyracks-fullstack/hyracks/hyracks-storage-am-rtree/pom.xml index d03824e..9cda3b2 100644 --- a/hyracks-fullstack/hyracks/hyracks-storage-am-rtree/pom.xml +++ b/hyracks-fullstack/hyracks/hyracks-storage-am-rtree/pom.xml @@ -46,36 +46,22 @@ <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-storage-am-common</artifactId> <version>${project.version}</version> + <type>jar</type> + <scope>compile</scope> </dependency> <dependency> <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-dataflow-common</artifactId> <version>${project.version}</version> + <type>jar</type> + <scope>compile</scope> </dependency> <dependency> <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-dataflow-std</artifactId> <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.hyracks</groupId> - <artifactId>hyracks-util</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.hyracks</groupId> - <artifactId>hyracks-api</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.hyracks</groupId> - <artifactId>hyracks-storage-common</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.hyracks</groupId> - <artifactId>hyracks-data-std</artifactId> - <version>${project.version}</version> + <type>jar</type> + <scope>compile</scope> </dependency> </dependencies> </project> diff --git a/hyracks-fullstack/hyracks/hyracks-storage-common/pom.xml b/hyracks-fullstack/hyracks/hyracks-storage-common/pom.xml index 5aebb22..1eedbfd 100644 --- a/hyracks-fullstack/hyracks/hyracks-storage-common/pom.xml +++ b/hyracks-fullstack/hyracks/hyracks-storage-common/pom.xml @@ -45,11 +45,8 @@ <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-api</artifactId> <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.hyracks</groupId> - <artifactId>hyracks-api</artifactId> - <version>${project.version}</version> + <type>jar</type> + <scope>compile</scope> </dependency> </dependencies> </project> diff --git a/hyracks-fullstack/hyracks/hyracks-test-support/pom.xml b/hyracks-fullstack/hyracks/hyracks-test-support/pom.xml index 34dedfd..6ee9711 100644 --- a/hyracks-fullstack/hyracks/hyracks-test-support/pom.xml +++ b/hyracks-fullstack/hyracks/hyracks-test-support/pom.xml @@ -49,56 +49,34 @@ <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-control-nc</artifactId> <version>${project.version}</version> + <scope>compile</scope> </dependency> <dependency> <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-storage-common</artifactId> <version>${project.version}</version> + <scope>compile</scope> </dependency> <dependency> <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-storage-am-btree</artifactId> <version>${project.version}</version> + <type>jar</type> + <scope>compile</scope> </dependency> <dependency> <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-storage-am-rtree</artifactId> <version>${project.version}</version> + <type>jar</type> + <scope>compile</scope> </dependency> <dependency> <groupId>org.apache.hyracks</groupId> - <artifactId>hyracks-dataflow-common</artifactId> + <artifactId>hyracks-storage-am-lsm-invertedindex</artifactId> <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.hyracks</groupId> - <artifactId>hyracks-control-common</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.hyracks</groupId> - <artifactId>hyracks-storage-am-common</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.hyracks</groupId> - <artifactId>hyracks-storage-am-lsm-common</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.hyracks</groupId> - <artifactId>hyracks-api</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.hyracks</groupId> - <artifactId>hyracks-data-std</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.hyracks</groupId> - <artifactId>hyracks-dataflow-std</artifactId> - <version>${project.version}</version> + <type>jar</type> + <scope>compile</scope> </dependency> </dependencies> </project> diff --git a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-bloomfilter-test/pom.xml b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-bloomfilter-test/pom.xml index 937c299..69e9af5 100644 --- a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-bloomfilter-test/pom.xml +++ b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-bloomfilter-test/pom.xml @@ -48,36 +48,14 @@ <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-storage-am-bloomfilter</artifactId> <version>${project.version}</version> + <type>jar</type> + <scope>compile</scope> </dependency> <dependency> <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-test-support</artifactId> <version>${project.version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.hyracks</groupId> - <artifactId>hyracks-dataflow-common</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.hyracks</groupId> - <artifactId>hyracks-storage-am-common</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.hyracks</groupId> - <artifactId>hyracks-api</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.hyracks</groupId> - <artifactId>hyracks-storage-common</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> + <type>jar</type> <scope>test</scope> </dependency> </dependencies> diff --git a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-btree-test/pom.xml b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-btree-test/pom.xml index c57690b..e9f7fc1 100644 --- a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-btree-test/pom.xml +++ b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-btree-test/pom.xml @@ -49,41 +49,15 @@ <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-storage-am-btree</artifactId> <version>${project.version}</version> + <type>jar</type> + <scope>compile</scope> </dependency> <dependency> <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-test-support</artifactId> <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.hyracks</groupId> - <artifactId>hyracks-dataflow-common</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.hyracks</groupId> - <artifactId>hyracks-storage-am-common</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.hyracks</groupId> - <artifactId>hyracks-api</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.hyracks</groupId> - <artifactId>hyracks-storage-common</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> + <type>jar</type> <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.hyracks</groupId> - <artifactId>hyracks-data-std</artifactId> - <version>${project.version}</version> </dependency> </dependencies> </project> diff --git a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/pom.xml b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/pom.xml index bd81ee9..34a1ab8 100644 --- a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/pom.xml +++ b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/pom.xml @@ -48,55 +48,20 @@ <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-storage-am-lsm-btree</artifactId> <version>${project.version}</version> + <type>jar</type> + <scope>compile</scope> </dependency> <dependency> <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-storage-am-common</artifactId> <version>${project.version}</version> + <scope>compile</scope> </dependency> <dependency> <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-test-support</artifactId> <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.hyracks</groupId> - <artifactId>hyracks-dataflow-common</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.hyracks</groupId> - <artifactId>hyracks-storage-am-lsm-common</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.hyracks</groupId> - <artifactId>hyracks-api</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.hyracks</groupId> - <artifactId>hyracks-control-nc</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.hyracks</groupId> - <artifactId>hyracks-storage-common</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </dependency> - <dependency> - <groupId>org.apache.hyracks</groupId> - <artifactId>hyracks-data-std</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.hyracks</groupId> - <artifactId>hyracks-storage-am-btree</artifactId> - <version>${project.version}</version> + <scope>compile</scope> </dependency> </dependencies> </project> diff --git a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-common-test/pom.xml b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-common-test/pom.xml index 40ae5d1..9d6bc2a 100644 --- a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-common-test/pom.xml +++ b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-common-test/pom.xml @@ -48,35 +48,15 @@ <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-storage-am-lsm-common</artifactId> <version>${project.version}</version> + <type>jar</type> + <scope>compile</scope> </dependency> <dependency> <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-test-support</artifactId> <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.hyracks</groupId> - <artifactId>hyracks-storage-am-common</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.hyracks</groupId> - <artifactId>hyracks-api</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.hyracks</groupId> - <artifactId>hyracks-control-nc</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.hyracks</groupId> - <artifactId>hyracks-storage-common</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> + <type>jar</type> + <scope>compile</scope> </dependency> </dependencies> </project> diff --git a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-invertedindex-test/pom.xml b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-invertedindex-test/pom.xml index ab1b840..bab356b 100644 --- a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-invertedindex-test/pom.xml +++ b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-invertedindex-test/pom.xml @@ -48,64 +48,29 @@ <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-storage-am-lsm-invertedindex</artifactId> <version>${project.version}</version> + <type>jar</type> + <scope>compile</scope> </dependency> <dependency> <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-test-support</artifactId> <version>${project.version}</version> + <type>jar</type> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-data-std</artifactId> <version>${project.version}</version> + <type>jar</type> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-util</artifactId> <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.hyracks</groupId> - <artifactId>hyracks-dataflow-common</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.hyracks</groupId> - <artifactId>hyracks-storage-am-common</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.hyracks</groupId> - <artifactId>hyracks-storage-am-lsm-common</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.hyracks</groupId> - <artifactId>hyracks-api</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.hyracks</groupId> - <artifactId>hyracks-control-nc</artifactId> - <version>${project.version}</version> + <type>test-jar</type> <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.hyracks</groupId> - <artifactId>hyracks-storage-common</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.hyracks</groupId> - <artifactId>hyracks-storage-am-btree</artifactId> - <version>${project.version}</version> </dependency> </dependencies> diff --git a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-rtree-test/pom.xml b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-rtree-test/pom.xml index ff0aebe..b0405d4 100644 --- a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-rtree-test/pom.xml +++ b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-rtree-test/pom.xml @@ -48,55 +48,15 @@ <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-storage-am-lsm-rtree</artifactId> <version>${project.version}</version> + <type>jar</type> + <scope>compile</scope> </dependency> <dependency> <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-test-support</artifactId> <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.hyracks</groupId> - <artifactId>hyracks-dataflow-common</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.hyracks</groupId> - <artifactId>hyracks-storage-am-common</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.hyracks</groupId> - <artifactId>hyracks-storage-am-lsm-common</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.hyracks</groupId> - <artifactId>hyracks-storage-am-rtree</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.hyracks</groupId> - <artifactId>hyracks-api</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.hyracks</groupId> - <artifactId>hyracks-control-nc</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.hyracks</groupId> - <artifactId>hyracks-storage-common</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </dependency> - <dependency> - <groupId>org.apache.hyracks</groupId> - <artifactId>hyracks-data-std</artifactId> - <version>${project.version}</version> + <type>jar</type> + <scope>compile</scope> </dependency> </dependencies> </project> diff --git a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-rtree-test/pom.xml b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-rtree-test/pom.xml index d5cd2ea..99101fd 100644 --- a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-rtree-test/pom.xml +++ b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-rtree-test/pom.xml @@ -49,42 +49,15 @@ <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-storage-am-rtree</artifactId> <version>${project.version}</version> + <type>jar</type> + <scope>compile</scope> </dependency> <dependency> <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-test-support</artifactId> <version>${project.version}</version> + <type>jar</type> <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.hyracks</groupId> - <artifactId>hyracks-dataflow-common</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.hyracks</groupId> - <artifactId>hyracks-storage-am-common</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.hyracks</groupId> - <artifactId>hyracks-api</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.hyracks</groupId> - <artifactId>hyracks-storage-common</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.hyracks</groupId> - <artifactId>hyracks-data-std</artifactId> - <version>${project.version}</version> </dependency> </dependencies> </project> diff --git a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-common-test/pom.xml b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-common-test/pom.xml index baa5e76..6dd96d3 100644 --- a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-common-test/pom.xml +++ b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-common-test/pom.xml @@ -49,20 +49,14 @@ <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-storage-common</artifactId> <version>${project.version}</version> + <scope>compile</scope> </dependency> <dependency> <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-test-support</artifactId> <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.hyracks</groupId> - <artifactId>hyracks-api</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> + <type>jar</type> + <scope>compile</scope> </dependency> </dependencies> </project> diff --git a/hyracks-fullstack/pom.xml b/hyracks-fullstack/pom.xml index af536e1..d70e917 100644 --- a/hyracks-fullstack/pom.xml +++ b/hyracks-fullstack/pom.xml @@ -97,13 +97,6 @@ <version>${hadoop.version}</version> </dependency> <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-hdfs</artifactId> - <version>${hadoop.version}</version> - <classifier>tests</classifier> - <scope>test</scope> - </dependency> - <dependency> <groupId>commons-io</groupId> <artifactId>commons-io</artifactId> <version>${commons.io.version}</version> @@ -113,23 +106,6 @@ <build> <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <version>2.10</version> - <configuration> - <failOnWarning>true</failOnWarning> - <outputXML>true</outputXML> - </configuration> - <executions> - <execution> - <phase>process-test-classes</phase> - <goals> - <goal>analyze-only</goal> - </goals> - </execution> - </executions> - </plugin> <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>versions-maven-plugin</artifactId> -- To view, visit https://asterix-gerrit.ics.uci.edu/1292 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3f74b5cb9eac4d944650811c358236255a9be358 Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Michael Blow <mb...@apache.org>