Till Westmann has uploaded a new change for review. https://asterix-gerrit.ics.uci.edu/1357
Change subject: fix dependencies for asterix-common ...................................................................... fix dependencies for asterix-common Change-Id: I699fad60cfac996940d6017e4f0791027b6494c3 --- M asterixdb/asterix-common/pom.xml M asterixdb/pom.xml 2 files changed, 82 insertions(+), 26 deletions(-) git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb refs/changes/57/1357/1 diff --git a/asterixdb/asterix-common/pom.xml b/asterixdb/asterix-common/pom.xml index 113c5b8..7ef770e 100644 --- a/asterixdb/asterix-common/pom.xml +++ b/asterixdb/asterix-common/pom.xml @@ -180,13 +180,33 @@ <artifactId>commons-io</artifactId> </dependency> <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + <version>3.5</version> + </dependency> + <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpclient</artifactId> - <version>4.5.2</version> + </dependency> + <dependency> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpcore</artifactId> </dependency> <dependency> <groupId>org.apache.hyracks</groupId> - <artifactId>algebricks-compiler</artifactId> + <artifactId>algebricks-common</artifactId> + </dependency> + <dependency> + <groupId>org.apache.hyracks</groupId> + <artifactId>algebricks-core</artifactId> + </dependency> + <dependency> + <groupId>org.apache.hyracks</groupId> + <artifactId>hyracks-util</artifactId> + </dependency> + <dependency> + <groupId>org.apache.hyracks</groupId> + <artifactId>hyracks-dataflow-common</artifactId> </dependency> <dependency> <groupId>org.apache.hyracks</groupId> @@ -199,6 +219,26 @@ <dependency> <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-storage-am-common</artifactId> + </dependency> + <dependency> + <groupId>org.apache.hyracks</groupId> + <artifactId>hyracks-storage-am-common</artifactId> + </dependency> + <dependency> + <groupId>org.apache.hyracks</groupId> + <artifactId>hyracks-storage-common</artifactId> + </dependency> + <dependency> + <groupId>org.apache.hyracks</groupId> + <artifactId>hyracks-storage-am-btree</artifactId> + </dependency> + <dependency> + <groupId>org.apache.hyracks</groupId> + <artifactId>hyracks-storage-am-bloomfilter</artifactId> + </dependency> + <dependency> + <groupId>org.apache.hyracks</groupId> + <artifactId>hyracks-storage-am-rtree</artifactId> </dependency> <dependency> <groupId>org.apache.hyracks</groupId> @@ -225,22 +265,13 @@ <artifactId>hyracks-storage-am-lsm-rtree</artifactId> </dependency> <dependency> - <groupId>org.apache.hyracks</groupId> - <artifactId>hyracks-control-cc</artifactId> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <version>1.2.17</version> </dependency> <dependency> - <groupId>org.apache.hyracks</groupId> - <artifactId>hyracks-control-nc</artifactId> - </dependency> - <dependency> - <groupId>com.fasterxml.jackson.core</groupId> - <artifactId>jackson-core</artifactId> - <version>2.2.0</version> - </dependency> - <dependency> - <groupId>org.codehaus.jackson</groupId> - <artifactId>jackson-mapper-asl</artifactId> - <version>1.9.12</version> + <groupId>org.json</groupId> + <artifactId>json</artifactId> </dependency> <dependency> <groupId>com.rometools</groupId> @@ -254,20 +285,10 @@ <scope>test</scope> </dependency> <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <version>1.2.17</version> - </dependency> - <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-all</artifactId> <version>2.0.2-beta</version> <scope>test</scope> - </dependency> - <dependency> - <groupId>com.google.guava</groupId> - <artifactId>guava</artifactId> - <version>18.0</version> </dependency> </dependencies> diff --git a/asterixdb/pom.xml b/asterixdb/pom.xml index 689663d..8862644 100644 --- a/asterixdb/pom.xml +++ b/asterixdb/pom.xml @@ -666,6 +666,16 @@ </dependency> <dependency> <groupId>org.apache.hyracks</groupId> + <artifactId>algebricks-common</artifactId> + <version>${algebricks.version}</version> + </dependency> + <dependency> + <groupId>org.apache.hyracks</groupId> + <artifactId>algebricks-core</artifactId> + <version>${algebricks.version}</version> + </dependency> + <dependency> + <groupId>org.apache.hyracks</groupId> <artifactId>algebricks-compiler</artifactId> <version>${algebricks.version}</version> </dependency> @@ -721,12 +731,27 @@ </dependency> <dependency> <groupId>org.apache.hyracks</groupId> + <artifactId>hyracks-dataflow-common</artifactId> + <version>${hyracks.version}</version> + </dependency> + <dependency> + <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-dataflow-hadoop</artifactId> <version>${hyracks.version}</version> </dependency> <dependency> <groupId>org.apache.hyracks</groupId> + <artifactId>hyracks-storage-common</artifactId> + <version>${hyracks.version}</version> + </dependency> + <dependency> + <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-storage-am-btree</artifactId> + <version>${hyracks.version}</version> + </dependency> + <dependency> + <groupId>org.apache.hyracks</groupId> + <artifactId>hyracks-storage-am-bloomfilter</artifactId> <version>${hyracks.version}</version> </dependency> <dependency> @@ -812,6 +837,16 @@ <artifactId>args4j</artifactId> <version>2.33</version> </dependency> + <dependency> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpclient</artifactId> + <version>4.5.2</version> + </dependency> + <dependency> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpcore</artifactId> + <version>4.4</version> + </dependency> </dependencies> </dependencyManagement> </project> -- To view, visit https://asterix-gerrit.ics.uci.edu/1357 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I699fad60cfac996940d6017e4f0791027b6494c3 Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Till Westmann <ti...@apache.org>