Repository: incubator-vxquery Updated Branches: refs/heads/master 0df78c506 -> 92302902f
Fixed dependency management. Changed Hyracks dependency to 0.2.11 for the release. Project: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/commit/60152072 Tree: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/tree/60152072 Diff: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/diff/60152072 Branch: refs/heads/master Commit: 601520720e5369d3fd460075b65cd6f767caa664 Parents: a09d1f5 Author: Vinayak Borkar <[email protected]> Authored: Tue Apr 1 10:51:23 2014 -0700 Committer: Vinayak Borkar <[email protected]> Committed: Tue Apr 1 10:51:23 2014 -0700 ---------------------------------------------------------------------- pom.xml | 215 ++++++++++++++++++++++++++++++++++++-------- vxquery-cli/pom.xml | 28 ++++-- vxquery-core/pom.xml | 37 +------- vxquery-server/pom.xml | 6 -- vxquery-xtest/pom.xml | 18 ++-- 5 files changed, 209 insertions(+), 95 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/60152072/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index db91760..00e815e 100644 --- a/pom.xml +++ b/pom.xml @@ -36,7 +36,7 @@ <name>Apache Software Foundation</name> <url>http://www.apache.org/</url> </organization> - + <licenses> <license> <name>The Apache Software License, Version 2.0</name> @@ -45,7 +45,7 @@ <comments>A business-friendly OSS license</comments> </license> </licenses> - + <scm> <connection>scm:svn:https://svn.apache.org/repos/asf/incubator/vxquery</connection> <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/vxquery/branches/vxquery_0_2_staging</developerConnection> @@ -56,7 +56,7 @@ <system>Jira</system> <url>https://issues.apache.org/jira/browse/VXQUERY</url> </issueManagement> - + <developers> <developer> <id>antelder</id> @@ -175,7 +175,7 @@ <timezone /> </developer> </developers> - + <mailingLists> <mailingList> <name>VXQuery-dev</name> @@ -192,7 +192,7 @@ <archive>http://mail-archives.apache.org/mod_mbox/incubator-vxquery-commits/</archive> </mailingList> </mailingLists> - + <distributionManagement> <site> <id>vxquery.website</id> @@ -221,38 +221,175 @@ </releases> </repository> </repositories> - - <dependencies> - <dependency> - <groupId>args4j</groupId> - <artifactId>args4j</artifactId> - <version>2.0.9</version> - </dependency> - - <dependency> - <groupId>edu.uci.ics.hyracks</groupId> - <artifactId>hyracks-client</artifactId> - <version>${hyracks.version}</version> - </dependency> - - <dependency> - <groupId>edu.uci.ics.hyracks</groupId> - <artifactId>hyracks-control-cc</artifactId> - <version>${hyracks.version}</version> - </dependency> - - <dependency> - <groupId>edu.uci.ics.hyracks</groupId> - <artifactId>hyracks-control-nc</artifactId> - <version>${hyracks.version}</version> - </dependency> - - <dependency> - <groupId>edu.uci.ics.hyracks</groupId> - <artifactId>algebricks-compiler</artifactId> - <version>${hyracks.version}</version> - </dependency> - </dependencies> + + <dependencyManagement> + <dependencies> + <dependency> + <groupId>args4j</groupId> + <artifactId>args4j</artifactId> + <version>2.0.9</version> + </dependency> + + <dependency> + <groupId>edu.uci.ics.hyracks</groupId> + <artifactId>hyracks-client</artifactId> + <version>${hyracks.version}</version> + </dependency> + + <dependency> + <groupId>edu.uci.ics.hyracks</groupId> + <artifactId>hyracks-control-common</artifactId> + <version>${hyracks.version}</version> + </dependency> + + <dependency> + <groupId>edu.uci.ics.hyracks</groupId> + <artifactId>hyracks-control-cc</artifactId> + <version>${hyracks.version}</version> + </dependency> + + <dependency> + <groupId>edu.uci.ics.hyracks</groupId> + <artifactId>hyracks-control-nc</artifactId> + <version>${hyracks.version}</version> + </dependency> + + <dependency> + <groupId>edu.uci.ics.hyracks</groupId> + <artifactId>algebricks-compiler</artifactId> + <version>${hyracks.version}</version> + </dependency> + + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + <version>3.1</version> + </dependency> + + <dependency> + <groupId>edu.uci.ics.hyracks</groupId> + <artifactId>algebricks-common</artifactId> + <version>${hyracks.version}</version> + </dependency> + + <dependency> + <groupId>edu.uci.ics.hyracks</groupId> + <artifactId>algebricks-core</artifactId> + <version>${hyracks.version}</version> + </dependency> + + <dependency> + <groupId>edu.uci.ics.hyracks</groupId> + <artifactId>algebricks-data</artifactId> + <version>${hyracks.version}</version> + </dependency> + + <dependency> + <groupId>edu.uci.ics.hyracks</groupId> + <artifactId>algebricks-rewriter</artifactId> + <version>${hyracks.version}</version> + </dependency> + + <dependency> + <groupId>edu.uci.ics.hyracks</groupId> + <artifactId>algebricks-runtime</artifactId> + <version>${hyracks.version}</version> + </dependency> + + <dependency> + <groupId>edu.uci.ics.hyracks</groupId> + <artifactId>hyracks-api</artifactId> + <version>${hyracks.version}</version> + </dependency> + + <dependency> + <groupId>edu.uci.ics.hyracks</groupId> + <artifactId>hyracks-data-std</artifactId> + <version>${hyracks.version}</version> + </dependency> + + <dependency> + <groupId>edu.uci.ics.hyracks</groupId> + <artifactId>hyracks-dataflow-common</artifactId> + <version>${hyracks.version}</version> + </dependency> + + <dependency> + <groupId>edu.uci.ics.hyracks</groupId> + <artifactId>hyracks-dataflow-std</artifactId> + <version>${hyracks.version}</version> + </dependency> + + <dependency> + <groupId>ant</groupId> + <artifactId>ant-trax</artifactId> + <version>1.6.5</version> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.codehaus.woodstox</groupId> + <artifactId>stax2-api</artifactId> + <version>3.0.1</version> + </dependency> + + <dependency> + <groupId>org.codehaus.woodstox</groupId> + <artifactId>woodstox-core-asl</artifactId> + <version>4.0.6</version> + </dependency> + + <dependency> + <groupId>xalan</groupId> + <artifactId>serializer</artifactId> + <version>2.7.1</version> + </dependency> + + <dependency> + <groupId>xerces</groupId> + <artifactId>xercesImpl</artifactId> + <version>2.9.1</version> + </dependency> + + <dependency> + <groupId>activemq</groupId> + <artifactId>activemq-transport-xstream</artifactId> + <version>2.1</version> + </dependency> + + <dependency> + <groupId>com.thoughtworks.xstream</groupId> + <artifactId>xstream</artifactId> + <version>1.3.1</version> + </dependency> + + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + <version>1.3.2</version> + </dependency> + + <dependency> + <groupId>commons-codec</groupId> + <artifactId>commons-codec</artifactId> + <version>1.4</version> + </dependency> + + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.7</version> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.mortbay.jetty</groupId> + <artifactId>jetty</artifactId> + <version>6.1.4</version> + <scope>compile</scope> + </dependency> + </dependencies> + </dependencyManagement> <build> <pluginManagement> @@ -272,7 +409,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> - <version>2.9</version> + <version>2.9.1</version> </plugin> </plugins> </pluginManagement> @@ -424,7 +561,7 @@ <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> - <hyracks.version>0.2.11-SNAPSHOT</hyracks.version> + <hyracks.version>0.2.11</hyracks.version> </properties> <modules> http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/60152072/vxquery-cli/pom.xml ---------------------------------------------------------------------- diff --git a/vxquery-cli/pom.xml b/vxquery-cli/pom.xml index 86b896a..a7a51df 100644 --- a/vxquery-cli/pom.xml +++ b/vxquery-cli/pom.xml @@ -90,31 +90,41 @@ <dependency> <groupId>edu.uci.ics.hyracks</groupId> <artifactId>hyracks-api</artifactId> - <version>${hyracks.version}</version> </dependency> - + + <dependency> + <groupId>edu.uci.ics.hyracks</groupId> + <artifactId>hyracks-client</artifactId> + </dependency> + + <dependency> + <groupId>edu.uci.ics.hyracks</groupId> + <artifactId>hyracks-control-cc</artifactId> + </dependency> + + <dependency> + <groupId>edu.uci.ics.hyracks</groupId> + <artifactId>hyracks-control-nc</artifactId> + </dependency> + <dependency> <groupId>edu.uci.ics.hyracks</groupId> <artifactId>algebricks-common</artifactId> - <version>${hyracks.version}</version> </dependency> - + <dependency> <groupId>edu.uci.ics.hyracks</groupId> <artifactId>algebricks-core</artifactId> - <version>${hyracks.version}</version> </dependency> - + <dependency> <groupId>edu.uci.ics.hyracks</groupId> <artifactId>hyracks-control-common</artifactId> - <version>${hyracks.version}</version> </dependency> - + <dependency> <groupId>edu.uci.ics.hyracks</groupId> <artifactId>hyracks-dataflow-std</artifactId> - <version>${hyracks.version}</version> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/60152072/vxquery-core/pom.xml ---------------------------------------------------------------------- diff --git a/vxquery-core/pom.xml b/vxquery-core/pom.xml index ebfb1a7..5a0dfdd 100644 --- a/vxquery-core/pom.xml +++ b/vxquery-core/pom.xml @@ -176,122 +176,87 @@ <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-lang3</artifactId> - <version>3.1</version> </dependency> <dependency> <groupId>edu.uci.ics.hyracks</groupId> - <artifactId>algebricks-common</artifactId> - <version>${hyracks.version}</version> - </dependency> - - <dependency> - <groupId>edu.uci.ics.hyracks</groupId> - <artifactId>algebricks-core</artifactId> - <version>${hyracks.version}</version> + <artifactId>algebricks-compiler</artifactId> </dependency> <dependency> <groupId>edu.uci.ics.hyracks</groupId> <artifactId>algebricks-data</artifactId> - <version>${hyracks.version}</version> - </dependency> - - <dependency> - <groupId>edu.uci.ics.hyracks</groupId> - <artifactId>algebricks-rewriter</artifactId> - <version>${hyracks.version}</version> - </dependency> - - <dependency> - <groupId>edu.uci.ics.hyracks</groupId> - <artifactId>algebricks-runtime</artifactId> - <version>${hyracks.version}</version> </dependency> <dependency> <groupId>edu.uci.ics.hyracks</groupId> <artifactId>hyracks-api</artifactId> - <version>${hyracks.version}</version> </dependency> <dependency> <groupId>edu.uci.ics.hyracks</groupId> <artifactId>hyracks-data-std</artifactId> - <version>${hyracks.version}</version> </dependency> <dependency> <groupId>edu.uci.ics.hyracks</groupId> <artifactId>hyracks-dataflow-common</artifactId> - <version>${hyracks.version}</version> </dependency> <dependency> <groupId>edu.uci.ics.hyracks</groupId> <artifactId>hyracks-dataflow-std</artifactId> - <version>${hyracks.version}</version> </dependency> <dependency> <groupId>ant</groupId> <artifactId>ant-trax</artifactId> - <version>1.6.5</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.codehaus.woodstox</groupId> <artifactId>stax2-api</artifactId> - <version>3.0.1</version> </dependency> <dependency> <groupId>org.codehaus.woodstox</groupId> <artifactId>woodstox-core-asl</artifactId> - <version>4.0.6</version> </dependency> <dependency> <groupId>xalan</groupId> <artifactId>serializer</artifactId> - <version>2.7.1</version> </dependency> <dependency> <groupId>xerces</groupId> <artifactId>xercesImpl</artifactId> - <version>2.9.1</version> </dependency> <dependency> <groupId>activemq</groupId> <artifactId>activemq-transport-xstream</artifactId> - <version>2.1</version> </dependency> <dependency> <groupId>com.thoughtworks.xstream</groupId> <artifactId>xstream</artifactId> - <version>1.3.1</version> </dependency> <dependency> <groupId>commons-io</groupId> <artifactId>commons-io</artifactId> - <version>1.3.2</version> </dependency> <dependency> <groupId>commons-codec</groupId> <artifactId>commons-codec</artifactId> - <version>1.4</version> </dependency> <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.7</version> <scope>test</scope> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/60152072/vxquery-server/pom.xml ---------------------------------------------------------------------- diff --git a/vxquery-server/pom.xml b/vxquery-server/pom.xml index 34af2d4..9c1b15d 100644 --- a/vxquery-server/pom.xml +++ b/vxquery-server/pom.xml @@ -131,17 +131,11 @@ <dependency> <groupId>edu.uci.ics.hyracks</groupId> <artifactId>hyracks-control-cc</artifactId> - <version>${hyracks.version}</version> - <type>jar</type> - <scope>compile</scope> </dependency> <dependency> <groupId>edu.uci.ics.hyracks</groupId> <artifactId>hyracks-control-nc</artifactId> - <version>${hyracks.version}</version> - <type>jar</type> - <scope>compile</scope> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/60152072/vxquery-xtest/pom.xml ---------------------------------------------------------------------- diff --git a/vxquery-xtest/pom.xml b/vxquery-xtest/pom.xml index 04e06ff..d0836f2 100644 --- a/vxquery-xtest/pom.xml +++ b/vxquery-xtest/pom.xml @@ -89,23 +89,31 @@ <dependency> <groupId>edu.uci.ics.hyracks</groupId> <artifactId>hyracks-api</artifactId> - <version>${hyracks.version}</version> </dependency> + + <dependency> + <groupId>edu.uci.ics.hyracks</groupId> + <artifactId>hyracks-client</artifactId> + </dependency> + <dependency> <groupId>edu.uci.ics.hyracks</groupId> - <artifactId>hyracks-control-common</artifactId> - <version>${hyracks.version}</version> + <artifactId>hyracks-control-cc</artifactId> </dependency> + + <dependency> + <groupId>edu.uci.ics.hyracks</groupId> + <artifactId>hyracks-control-nc</artifactId> + </dependency> + <dependency> <groupId>edu.uci.ics.hyracks</groupId> <artifactId>hyracks-dataflow-std</artifactId> - <version>${hyracks.version}</version> </dependency> <dependency> <groupId>org.mortbay.jetty</groupId> <artifactId>jetty</artifactId> - <version>6.1.4</version> <scope>compile</scope> </dependency> </dependencies>
