Michael Blow has submitted this change and it was merged. Change subject: Cleanup AsterixDB Dependencies ......................................................................
Cleanup AsterixDB Dependencies Enforce maven dependencies, to ensure that all declared dependencies are used, and that all used dependencies are declared. Change-Id: I3cc9d4db57b2138931baa3ef51ea569c45b79a2f Reviewed-on: https://asterix-gerrit.ics.uci.edu/1421 Tested-by: Jenkins <[email protected]> Integration-Tests: Jenkins <[email protected]> Reviewed-by: Ian Maxon <[email protected]> --- M asterixdb/asterix-active/pom.xml M asterixdb/asterix-algebra/pom.xml M asterixdb/asterix-app/pom.xml M asterixdb/asterix-app/src/main/java/org/apache/asterix/app/external/ExternalIndexingOperations.java M asterixdb/asterix-app/src/test/java/org/apache/asterix/api/http/servlet/ConnectorAPIServletTest.java M asterixdb/asterix-app/src/test/java/org/apache/asterix/test/runtime/ClusterStateDefaultParameterTest.java M asterixdb/asterix-client-helper/pom.xml M asterixdb/asterix-common/pom.xml M asterixdb/asterix-common/src/test/java/org/apache/asterix/test/aql/TestExecutor.java M asterixdb/asterix-events/pom.xml M asterixdb/asterix-events/src/main/java/org/apache/asterix/event/service/ZooKeeperService.java M asterixdb/asterix-experiments/pom.xml M asterixdb/asterix-external-data/pom.xml M asterixdb/asterix-fuzzyjoin/pom.xml M asterixdb/asterix-installer/pom.xml M asterixdb/asterix-installer/src/main/assembly/binary-assembly.xml M asterixdb/asterix-installer/src/main/resources/scripts/managix M asterixdb/asterix-installer/src/main/resources/zookeeper/start_zk.sh M asterixdb/asterix-lang-aql/pom.xml M asterixdb/asterix-lang-common/pom.xml M asterixdb/asterix-lang-sqlpp/pom.xml M asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/visitor/base/AbstractSqlppSimpleExpressionVisitor.java M asterixdb/asterix-maven-plugins/asterix-evaluator-generator-maven-plugin/pom.xml M asterixdb/asterix-maven-plugins/asterix-grammar-extension-maven-plugin/pom.xml M asterixdb/asterix-maven-plugins/asterix-test-datagenerator-maven-plugin/pom.xml M asterixdb/asterix-maven-plugins/license-automation-plugin/pom.xml M asterixdb/asterix-maven-plugins/record-manager-generator-maven-plugin/pom.xml M asterixdb/asterix-metadata/pom.xml M asterixdb/asterix-om/pom.xml M asterixdb/asterix-replication/pom.xml M asterixdb/asterix-runtime/pom.xml M asterixdb/asterix-server/pom.xml M asterixdb/asterix-tools/pom.xml M asterixdb/asterix-transactions/pom.xml M asterixdb/asterix-yarn/pom.xml M asterixdb/pom.xml M hyracks-fullstack/algebricks/algebricks-core/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-examples/hyracks-integration-tests/pom.xml M hyracks-fullstack/hyracks/hyracks-hdfs/hyracks-hdfs-core/pom.xml M hyracks-fullstack/hyracks/hyracks-storage-am-btree/pom.xml M hyracks-fullstack/pom.xml 44 files changed, 1,368 insertions(+), 374 deletions(-) Approvals: Ian Maxon: Looks good to me, approved Jenkins: Verified; Verified Objections: Jenkins: Violations found; Violations found diff --git a/asterixdb/asterix-active/pom.xml b/asterixdb/asterix-active/pom.xml index efba47e..a43e88e 100644 --- a/asterixdb/asterix-active/pom.xml +++ b/asterixdb/asterix-active/pom.xml @@ -27,31 +27,24 @@ <dependencies> <dependency> <groupId>org.apache.asterix</groupId> - <artifactId>asterix-om</artifactId> - <version>${project.version}</version> - <type>jar</type> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.apache.hyracks</groupId> - <artifactId>hyracks-test-support</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.asterix</groupId> - <artifactId>asterix-runtime</artifactId> - <version>${project.version}</version> - <type>jar</type> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.apache.hyracks</groupId> - <artifactId>algebricks-compiler</artifactId> - </dependency> - <dependency> - <groupId>org.apache.asterix</groupId> <artifactId>asterix-common</artifactId> <version>${project.version}</version> </dependency> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </dependency> + <dependency> + <groupId>org.apache.hyracks</groupId> + <artifactId>hyracks-control-nc</artifactId> + </dependency> + <dependency> + <groupId>org.apache.hyracks</groupId> + <artifactId>hyracks-api</artifactId> + </dependency> + <dependency> + <groupId>org.apache.hyracks</groupId> + <artifactId>hyracks-dataflow-std</artifactId> + </dependency> </dependencies> </project> diff --git a/asterixdb/asterix-algebra/pom.xml b/asterixdb/asterix-algebra/pom.xml index dc195e2..b4e504c 100644 --- a/asterixdb/asterix-algebra/pom.xml +++ b/asterixdb/asterix-algebra/pom.xml @@ -120,7 +120,6 @@ <groupId>org.apache.asterix</groupId> <artifactId>asterix-runtime</artifactId> <version>${project.version}</version> - <scope>compile</scope> </dependency> <dependency> <groupId>org.apache.asterix</groupId> @@ -131,19 +130,16 @@ <groupId>org.apache.asterix</groupId> <artifactId>asterix-lang-aql</artifactId> <version>${project.version}</version> - <scope>compile</scope> </dependency> <dependency> <groupId>org.apache.asterix</groupId> <artifactId>asterix-lang-sqlpp</artifactId> <version>${project.version}</version> - <scope>compile</scope> </dependency> <dependency> <groupId>org.apache.asterix</groupId> <artifactId>asterix-metadata</artifactId> <version>${project.version}</version> - <scope>compile</scope> </dependency> <dependency> <groupId>org.apache.asterix</groupId> @@ -160,7 +156,6 @@ <groupId>org.apache.asterix</groupId> <artifactId>asterix-transactions</artifactId> <version>${project.version}</version> - <scope>compile</scope> </dependency> <dependency> <groupId>org.apache.hyracks</groupId> @@ -173,17 +168,86 @@ <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-lang3</artifactId> - <version>3.5</version> </dependency> <dependency> <groupId>commons-lang</groupId> <artifactId>commons-lang</artifactId> - <version>2.5</version> </dependency> <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> - <version>18.0</version> + </dependency> + <dependency> + <groupId>org.apache.hyracks</groupId> + <artifactId>algebricks-common</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.asterix</groupId> + <artifactId>asterix-om</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.asterix</groupId> + <artifactId>asterix-active</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.hyracks</groupId> + <artifactId>algebricks-data</artifactId> + </dependency> + <dependency> + <groupId>org.apache.asterix</groupId> + <artifactId>asterix-common</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.hyracks</groupId> + <artifactId>algebricks-core</artifactId> + </dependency> + <dependency> + <groupId>org.apache.hyracks</groupId> + <artifactId>hyracks-storage-am-lsm-invertedindex</artifactId> + </dependency> + <dependency> + <groupId>org.apache.hyracks</groupId> + <artifactId>hyracks-data-std</artifactId> + </dependency> + <dependency> + <groupId>org.apache.hyracks</groupId> + <artifactId>hyracks-dataflow-std</artifactId> + </dependency> + <dependency> + <groupId>org.apache.asterix</groupId> + <artifactId>asterix-fuzzyjoin</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.hyracks</groupId> + <artifactId>hyracks-storage-am-bloomfilter</artifactId> + </dependency> + <dependency> + <groupId>org.apache.hyracks</groupId> + <artifactId>algebricks-runtime</artifactId> + </dependency> + <dependency> + <groupId>org.apache.hyracks</groupId> + <artifactId>hyracks-storage-am-common</artifactId> + </dependency> + <dependency> + <groupId>org.apache.hyracks</groupId> + <artifactId>hyracks-storage-am-lsm-common</artifactId> + </dependency> + <dependency> + <groupId>org.apache.hyracks</groupId> + <artifactId>hyracks-api</artifactId> </dependency> </dependencies> </project> diff --git a/asterixdb/asterix-app/pom.xml b/asterixdb/asterix-app/pom.xml index ae93779..0d991da 100644 --- a/asterixdb/asterix-app/pom.xml +++ b/asterixdb/asterix-app/pom.xml @@ -144,6 +144,23 @@ </execution> </executions> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <version>2.10</version> + <configuration> + <ignoredUsedUndeclaredDependencies> + <ignoredUsedUndeclaredDependency>commons-logging:commons-logging-api:*</ignoredUsedUndeclaredDependency> + <ignoredUsedUndeclaredDependency>org.apache.hive:hive-exec:*</ignoredUsedUndeclaredDependency> + </ignoredUsedUndeclaredDependencies> + <usedDependencies> + <usedDependency>org.apache.hadoop:hadoop-common</usedDependency> + <usedDependency>commons-lang:commons-lang</usedDependency> + <usedDependency>com.google.guava:guava</usedDependency> + <usedDependency>org.apache.asterix:asterix-external-data</usedDependency> + </usedDependencies> + </configuration> + </plugin> </plugins> <pluginManagement> <plugins> @@ -179,21 +196,14 @@ <dependency> <groupId>javax.servlet</groupId> <artifactId>javax.servlet-api</artifactId> - <type>jar</type> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-server</artifactId> - <version>9.3.11.v20160721</version> - <type>jar</type> - <scope>compile</scope> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-servlet</artifactId> - <version>9.3.11.v20160721</version> - <type>jar</type> - <scope>compile</scope> </dependency> <dependency> <groupId>org.apache.hyracks</groupId> @@ -219,39 +229,25 @@ <groupId>org.apache.asterix</groupId> <artifactId>asterix-algebra</artifactId> <version>${project.version}</version> - <scope>compile</scope> </dependency> <dependency> <groupId>org.apache.asterix</groupId> <artifactId>asterix-om</artifactId> <version>${project.version}</version> - <type>jar</type> - <scope>compile</scope> </dependency> <dependency> <groupId>org.apache.asterix</groupId> <artifactId>asterix-metadata</artifactId> <version>${project.version}</version> - <type>jar</type> - <scope>compile</scope> </dependency> <dependency> <groupId>org.apache.asterix</groupId> <artifactId>asterix-common</artifactId> <version>${project.version}</version> - <type>jar</type> - <scope>compile</scope> </dependency> <dependency> <groupId>org.apache.asterix</groupId> <artifactId>asterix-common</artifactId> - <version>${project.version}</version> - <type>test-jar</type> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.asterix</groupId> - <artifactId>asterix-external-data</artifactId> <version>${project.version}</version> <type>test-jar</type> <scope>test</scope> @@ -260,13 +256,6 @@ <groupId>org.apache.asterix</groupId> <artifactId>asterix-transactions</artifactId> <version>${project.version}</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-hdfs</artifactId> - <type>jar</type> - <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.asterix</groupId> @@ -284,7 +273,13 @@ <groupId>org.apache.asterix</groupId> <artifactId>asterix-replication</artifactId> <version>${project.version}</version> - <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.asterix</groupId> + <artifactId>asterix-external-data</artifactId> + <version>${project.version}</version> + <type>test-jar</type> + <scope>test</scope> </dependency> <dependency> <groupId>org.apache.asterix</groupId> @@ -304,17 +299,174 @@ </dependency> <dependency> <groupId>org.apache.hyracks</groupId> - <artifactId>hyracks-hdfs-2.x</artifactId> - <version>0.2.18-SNAPSHOT</version> - <type>test-jar</type> - <scope>test</scope> + <artifactId>hyracks-dataflow-common</artifactId> + </dependency> + <dependency> + <groupId>com.e-movimento.tinytools</groupId> + <artifactId>privilegedaccessor</artifactId> + <version>1.2.2</version> + </dependency> + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + </dependency> + <dependency> + <groupId>org.apache.asterix</groupId> + <artifactId>asterix-lang-aql</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.hyracks</groupId> + <artifactId>hyracks-storage-am-lsm-btree</artifactId> + </dependency> + <dependency> + <groupId>org.apache.asterix</groupId> + <artifactId>asterix-events</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-minicluster</artifactId> - <version>${hadoop.version}</version> - <type>jar</type> + <artifactId>hadoop-hdfs</artifactId> + <classifier>tests</classifier> <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.hyracks</groupId> + <artifactId>algebricks-data</artifactId> + </dependency> + <dependency> + <groupId>org.apache.hyracks</groupId> + <artifactId>algebricks-core</artifactId> + </dependency> + <dependency> + <groupId>org.apache.hyracks</groupId> + <artifactId>hyracks-net</artifactId> + </dependency> + <dependency> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + <version>2.2.2</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.hyracks</groupId> + <artifactId>hyracks-storage-am-lsm-rtree</artifactId> + </dependency> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-compress</artifactId> + <version>1.4.1</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.hyracks</groupId> + <artifactId>algebricks-runtime</artifactId> + </dependency> + <dependency> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpcore</artifactId> + </dependency> + <dependency> + <groupId>org.apache.asterix</groupId> + <artifactId>asterix-lang-common</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.hyracks</groupId> + <artifactId>hyracks-storage-am-lsm-common</artifactId> + </dependency> + <dependency> + <groupId>org.apache.asterix</groupId> + <artifactId>asterix-runtime</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.hyracks</groupId> + <artifactId>hyracks-storage-common</artifactId> + </dependency> + <dependency> + <groupId>org.apache.hyracks</groupId> + <artifactId>algebricks-common</artifactId> + </dependency> + <dependency> + <groupId>org.apache.asterix</groupId> + <artifactId>asterix-lang-sqlpp</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.hyracks</groupId> + <artifactId>hyracks-util</artifactId> + </dependency> + <dependency> + <groupId>args4j</groupId> + <artifactId>args4j</artifactId> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-mapreduce-client-core</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.hyracks</groupId> + <artifactId>hyracks-storage-am-rtree</artifactId> + </dependency> + <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + </dependency> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.hyracks</groupId> + <artifactId>hyracks-data-std</artifactId> + </dependency> + <dependency> + <groupId>org.apache.hyracks</groupId> + <artifactId>hyracks-dataflow-std</artifactId> + </dependency> + <dependency> + <groupId>org.apache.hyracks</groupId> + <artifactId>hyracks-storage-am-lsm-invertedindex</artifactId> + </dependency> + <dependency> + <groupId>org.apache.hyracks</groupId> + <artifactId>hyracks-storage-am-btree</artifactId> + </dependency> + <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + </dependency> + <dependency> + <groupId>org.apache.hyracks</groupId> + <artifactId>hyracks-control-common</artifactId> + </dependency> + <dependency> + <groupId>org.apache.hyracks</groupId> + <artifactId>hyracks-storage-am-common</artifactId> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-common</artifactId> + </dependency> + <dependency> + <groupId>org.apache.asterix</groupId> + <artifactId>asterix-active</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-hdfs</artifactId> </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> @@ -324,5 +476,11 @@ <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-core</artifactId> </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-common</artifactId> + <classifier>tests</classifier> + <scope>test</scope> + </dependency> </dependencies> </project> diff --git a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/external/ExternalIndexingOperations.java b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/external/ExternalIndexingOperations.java index 9bde91e..1a74e17 100644 --- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/external/ExternalIndexingOperations.java +++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/external/ExternalIndexingOperations.java @@ -26,12 +26,12 @@ import java.util.List; import java.util.Map; -import org.apache.asterix.common.config.StorageProperties; import org.apache.asterix.common.config.DatasetConfig.DatasetType; import org.apache.asterix.common.config.DatasetConfig.ExternalDatasetTransactionState; import org.apache.asterix.common.config.DatasetConfig.ExternalFilePendingOp; import org.apache.asterix.common.config.DatasetConfig.IndexType; import org.apache.asterix.common.config.IPropertiesProvider; +import org.apache.asterix.common.config.StorageProperties; import org.apache.asterix.common.context.AsterixVirtualBufferCacheProvider; import org.apache.asterix.common.dataflow.LSMIndexUtil; import org.apache.asterix.common.exceptions.AsterixException; @@ -112,6 +112,9 @@ .singletonList(Collections.singletonList("")); public static final List<IAType> FILE_INDEX_FIELD_TYPES = Collections.singletonList(BuiltinType.ASTRING); + private ExternalIndexingOperations() { + } + public static boolean isIndexible(ExternalDatasetDetails ds) { String adapter = ds.getAdapter(); if (adapter.equalsIgnoreCase(ExternalDataConstants.ALIAS_HDFS_ADAPTER)) { diff --git a/asterixdb/asterix-app/src/test/java/org/apache/asterix/api/http/servlet/ConnectorAPIServletTest.java b/asterixdb/asterix-app/src/test/java/org/apache/asterix/api/http/servlet/ConnectorAPIServletTest.java index 48d1c1c..41785e5 100644 --- a/asterixdb/asterix-app/src/test/java/org/apache/asterix/api/http/servlet/ConnectorAPIServletTest.java +++ b/asterixdb/asterix-app/src/test/java/org/apache/asterix/api/http/servlet/ConnectorAPIServletTest.java @@ -24,9 +24,7 @@ import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; -import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; -import java.io.InputStreamReader; import java.io.PrintWriter; import java.util.HashMap; import java.util.Map; @@ -37,6 +35,9 @@ import javax.servlet.http.HttpServletResponse; import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.node.ArrayNode; +import com.fasterxml.jackson.databind.node.ObjectNode; +import junit.extensions.PA; import org.apache.asterix.metadata.MetadataManager; import org.apache.asterix.metadata.MetadataTransactionContext; import org.apache.asterix.metadata.declared.MetadataProvider; @@ -49,15 +50,10 @@ import org.apache.hyracks.api.client.IHyracksClientConnection; import org.apache.hyracks.api.client.NodeControllerInfo; import org.apache.hyracks.api.comm.NetworkAddress; -import com.fasterxml.jackson.databind.node.ArrayNode; -import com.fasterxml.jackson.databind.node.ObjectNode; import org.apache.hyracks.api.io.FileSplit; import org.apache.hyracks.api.io.ManagedFileSplit; -import org.json.JSONTokener; import org.junit.Assert; import org.junit.Test; - -import junit.extensions.PA; public class ConnectorAPIServletTest { diff --git a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/runtime/ClusterStateDefaultParameterTest.java b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/runtime/ClusterStateDefaultParameterTest.java index 1979afe..545b2a1 100644 --- a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/runtime/ClusterStateDefaultParameterTest.java +++ b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/runtime/ClusterStateDefaultParameterTest.java @@ -25,9 +25,7 @@ import java.net.URL; import java.util.Collection; -import org.apache.asterix.common.config.StorageProperties; import org.apache.asterix.testframework.context.TestCaseContext; -import org.json.JSONObject; import org.junit.AfterClass; import org.junit.Assert; import org.junit.BeforeClass; @@ -35,7 +33,6 @@ import org.junit.runner.RunWith; import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameters; -import org.mortbay.util.ajax.JSON; /** * Runs the cluster state runtime tests with the storage parallelism. diff --git a/asterixdb/asterix-client-helper/pom.xml b/asterixdb/asterix-client-helper/pom.xml index 04de18a..d3a6d4e 100644 --- a/asterixdb/asterix-client-helper/pom.xml +++ b/asterixdb/asterix-client-helper/pom.xml @@ -81,6 +81,17 @@ </execution> </executions> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <version>2.10</version> + <configuration> + <usedDependencies> + <usedDependency>org.codehaus.mojo.appassembler:appassembler-booter</usedDependency> + <usedDependency>javax.servlet:javax.servlet-api</usedDependency> + </usedDependencies> + </configuration> + </plugin> </plugins> </build> <dependencies> @@ -110,10 +121,6 @@ <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> - </dependency> - <dependency> - <groupId>com.fasterxml.jackson.core</groupId> - <artifactId>jackson-core</artifactId> </dependency> </dependencies> </project> diff --git a/asterixdb/asterix-common/pom.xml b/asterixdb/asterix-common/pom.xml index 722e1c5..cb5075a 100644 --- a/asterixdb/asterix-common/pom.xml +++ b/asterixdb/asterix-common/pom.xml @@ -182,7 +182,6 @@ <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-lang3</artifactId> - <version>3.5</version> </dependency> <dependency> <groupId>org.apache.httpcomponents</groupId> @@ -241,10 +240,6 @@ <artifactId>hyracks-api</artifactId> </dependency> <dependency> - <groupId>org.apache.hyracks</groupId> - <artifactId>hyracks-control-nc</artifactId> - </dependency> - <dependency> <groupId>org.apache.asterix</groupId> <artifactId>asterix-test-framework</artifactId> <version>${project.version}</version> @@ -267,7 +262,6 @@ <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> - <version>1.2.17</version> </dependency> <dependency> <groupId>javax.servlet</groupId> @@ -277,13 +271,11 @@ <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-server</artifactId> - <version>9.3.11.v20160721</version> <scope>test</scope> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-servlet</artifactId> - <version>9.3.11.v20160721</version> <scope>test</scope> </dependency> <dependency> @@ -306,7 +298,6 @@ <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> - <version>18.0</version> </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> @@ -316,6 +307,10 @@ <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-core</artifactId> </dependency> + <dependency> + <groupId>org.apache.hyracks</groupId> + <artifactId>hyracks-data-std</artifactId> + </dependency> </dependencies> </project> diff --git a/asterixdb/asterix-common/src/test/java/org/apache/asterix/test/aql/TestExecutor.java b/asterixdb/asterix-common/src/test/java/org/apache/asterix/test/aql/TestExecutor.java index ac05008..80e8d09 100644 --- a/asterixdb/asterix-common/src/test/java/org/apache/asterix/test/aql/TestExecutor.java +++ b/asterixdb/asterix-common/src/test/java/org/apache/asterix/test/aql/TestExecutor.java @@ -18,33 +18,35 @@ */ package org.apache.asterix.test.aql; -import java.io.BufferedInputStream; import java.io.BufferedReader; +import java.io.ByteArrayInputStream; import java.io.File; import java.io.FileInputStream; import java.io.FileOutputStream; +import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; +import java.io.OutputStream; import java.io.PrintWriter; import java.io.StringWriter; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.net.Inet4Address; import java.nio.charset.StandardCharsets; +import java.util.ArrayList; +import java.util.Arrays; import java.util.HashMap; import java.util.HashSet; import java.util.List; import java.util.Set; -import java.util.Arrays; -import java.util.ArrayList; +import java.util.concurrent.Executors; +import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; import java.util.logging.Level; import java.util.logging.Logger; import java.util.regex.Matcher; import java.util.regex.Pattern; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.*; import org.apache.asterix.common.config.GlobalConfig; import org.apache.asterix.common.utils.ServletUtil.Servlets; import org.apache.asterix.test.base.ComparisonException; @@ -56,6 +58,7 @@ import org.apache.asterix.testframework.xml.TestCase.CompilationUnit; import org.apache.asterix.testframework.xml.TestGroup; import org.apache.commons.io.IOUtils; +import org.apache.commons.io.output.ByteArrayOutputStream; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.mutable.MutableInt; import org.apache.http.HttpResponse; @@ -69,6 +72,12 @@ import org.apache.http.impl.client.StandardHttpRequestRetryHandler; import org.apache.http.util.EntityUtils; import org.apache.hyracks.util.StorageUtil; + +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.DeserializationFeature; +import com.fasterxml.jackson.databind.JsonMappingException; +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ObjectNode; public class TestExecutor { @@ -646,9 +655,9 @@ } public static String executeScript(ProcessBuilder pb, String scriptPath) throws Exception { + LOGGER.info("Executing script: " + scriptPath); pb.command(scriptPath); Process p = pb.start(); - p.waitFor(); return getProcessOutput(p); } @@ -678,26 +687,47 @@ } private static String getProcessOutput(Process p) throws Exception { - StringBuilder s = new StringBuilder(); - BufferedInputStream bisIn = new BufferedInputStream(p.getInputStream()); - StringWriter writerIn = new StringWriter(); - IOUtils.copy(bisIn, writerIn, "UTF-8"); - s.append(writerIn.toString()); + ByteArrayOutputStream baos = new ByteArrayOutputStream(); + Future<Integer> future = Executors.newSingleThreadExecutor().submit(() -> IOUtils.copy(p.getInputStream(), + new OutputStream() { + @Override + public void write(int b) throws IOException { + baos.write(b); + System.out.write(b); + } - BufferedInputStream bisErr = new BufferedInputStream(p.getErrorStream()); + @Override + public void flush() throws IOException { + baos.flush(); + System.out.flush(); + } + + @Override + public void close() throws IOException { + baos.close(); + System.out.close(); + } + })); + p.waitFor(); + future.get(); + ByteArrayInputStream bisIn = new ByteArrayInputStream(baos.toByteArray()); + StringWriter writerIn = new StringWriter(); + IOUtils.copy(bisIn, writerIn, StandardCharsets.UTF_8); StringWriter writerErr = new StringWriter(); - IOUtils.copy(bisErr, writerErr, "UTF-8"); - s.append(writerErr.toString()); - if (writerErr.toString().length() > 0) { + IOUtils.copy(p.getErrorStream(), writerErr, StandardCharsets.UTF_8); + + StringBuffer stdOut = writerIn.getBuffer(); + if (writerErr.getBuffer().length() > 0) { StringBuilder sbErr = new StringBuilder(); - sbErr.append("script execution failed - error message:\n"); - sbErr.append("-------------------------------------------\n"); - sbErr.append(s.toString()); - sbErr.append("-------------------------------------------\n"); - LOGGER.info(sbErr.toString().trim()); - throw new Exception(s.toString().trim()); + sbErr.append("script execution failed - error message:\n" + + "-------------------------------------------\n" + + "stdout: ").append(stdOut) + .append("\nstderr: ").append(writerErr.getBuffer()) + .append("-------------------------------------------"); + LOGGER.info(sbErr.toString()); + throw new Exception(sbErr.toString()); } - return s.toString(); + return stdOut.toString(); } public void executeTest(String actualPath, TestCaseContext testCaseCtx, ProcessBuilder pb, diff --git a/asterixdb/asterix-events/pom.xml b/asterixdb/asterix-events/pom.xml index 4bd66df..47dfd80 100644 --- a/asterixdb/asterix-events/pom.xml +++ b/asterixdb/asterix-events/pom.xml @@ -148,44 +148,25 @@ <artifactId>args4j</artifactId> </dependency> <dependency> - <groupId>org.jvnet.jaxb2_commons</groupId> - <artifactId>jaxb2-value-constructor</artifactId> - <version>3.0</version> - </dependency> - <dependency> <groupId>commons-io</groupId> <artifactId>commons-io</artifactId> </dependency> <dependency> <groupId>org.apache.zookeeper</groupId> <artifactId>zookeeper</artifactId> - <version>3.4.5</version> - <exclusions> - <exclusion> - <groupId>com.sun.jmx</groupId> - <artifactId>jmxri</artifactId> - </exclusion> - <exclusion> - <groupId>com.sun.jdmk</groupId> - <artifactId>jmxtools</artifactId> - </exclusion> - <exclusion> - <groupId>javax.jms</groupId> - <artifactId>jms</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>org.apache.asterix</groupId> <artifactId>asterix-common</artifactId> <version>${project.version}</version> - <type>jar</type> - <scope>compile</scope> </dependency> <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> - <version>1.2.9</version> + </dependency> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> </dependency> </dependencies> </project> diff --git a/asterixdb/asterix-events/src/main/java/org/apache/asterix/event/service/ZooKeeperService.java b/asterixdb/asterix-events/src/main/java/org/apache/asterix/event/service/ZooKeeperService.java index ee80894..5e102e7 100644 --- a/asterixdb/asterix-events/src/main/java/org/apache/asterix/event/service/ZooKeeperService.java +++ b/asterixdb/asterix-events/src/main/java/org/apache/asterix/event/service/ZooKeeperService.java @@ -24,6 +24,8 @@ import java.io.IOException; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; +import java.io.StringWriter; +import java.nio.charset.Charset; import java.util.ArrayList; import java.util.List; import java.util.concurrent.LinkedBlockingQueue; @@ -33,6 +35,9 @@ import org.apache.asterix.event.error.EventException; import org.apache.asterix.event.model.AsterixInstance; import org.apache.asterix.installer.schema.conf.Configuration; +import org.apache.commons.io.IOUtils; +import org.apache.commons.lang3.tuple.ImmutablePair; +import org.apache.commons.lang3.tuple.Pair; import org.apache.log4j.Logger; import org.apache.zookeeper.CreateMode; import org.apache.zookeeper.KeeperException; @@ -111,26 +116,48 @@ } //TODO: Create a better way to interact with zookeeper Process zkProcess = Runtime.getRuntime().exec(cmdBuffer.toString()); - int output = zkProcess.waitFor(); - if (output != 0) { - throw new Exception("Error starting zookeeper server. output code = " + output); + int exitCode = zkProcess.waitFor(); + Pair<CharSequence, CharSequence> outputs = getProcessStreams(zkProcess); + if (exitCode != 0) { + StringBuilder msg = new StringBuilder("Error starting zookeeper server; output code = "); + msg.append(exitCode); + appendNonEmptyStreams(outputs, msg); + throw new Exception(msg.toString()); } zk = new ZooKeeper(zkConnectionString, ZOOKEEPER_SESSION_TIME_OUT, watcher); String head = msgQ.poll(60, TimeUnit.SECONDS); if (head == null) { - StringBuilder msg = new StringBuilder( - "Unable to start Zookeeper Service. This could be because of the following reasons.\n"); - msg.append("1) Managix is incorrectly configured. Please run " + "managix validate" - + " to run a validation test and correct the errors reported."); - msg.append( - "\n2) If validation in (1) is successful, ensure that java_home parameter is set correctly in Managix configuration (" - + AsterixEventServiceUtil.MANAGIX_CONF_XML + ")"); + StringBuilder msg = new StringBuilder("Unable to start Zookeeper Service. This could be because of the" + + " following reasons.\n1) Managix is incorrectly configured. Please run " + + "managix validate to run a validation test and correct the errors reported.\n" + + "2) If validation in (1) is successful, ensure that java_home parameter is set correctly" + + " in Managix configuration (" + AsterixEventServiceUtil.MANAGIX_CONF_XML + ")"); + appendNonEmptyStreams(outputs, msg); throw new Exception(msg.toString()); } msgQ.take(); createRootIfNotExist(); } + private void appendNonEmptyStreams(Pair<CharSequence, CharSequence> outputs, StringBuilder msg) { + appendIfNotEmpty(msg, outputs.getLeft(), "stdout"); + appendIfNotEmpty(msg, outputs.getRight(), "stderr"); + } + + private Pair<CharSequence, CharSequence> getProcessStreams(Process process) throws IOException { + StringWriter stdout = new StringWriter(); + StringWriter stderr = new StringWriter(); + IOUtils.copy(process.getInputStream(), stdout, Charset.defaultCharset()); + IOUtils.copy(process.getErrorStream(), stderr, Charset.defaultCharset()); + return new ImmutablePair<>(stdout.getBuffer(), stderr.getBuffer()); + } + + private void appendIfNotEmpty(StringBuilder msg, CharSequence output, String outputName) { + if (output.length() > 0) { + msg.append(", ").append(outputName).append(" = ").append(output); + } + } + @Override public void stopService(Configuration conf) throws Exception { if (LOGGER.isDebugEnabled()) { diff --git a/asterixdb/asterix-experiments/pom.xml b/asterixdb/asterix-experiments/pom.xml index fe87e9f..6db761a 100644 --- a/asterixdb/asterix-experiments/pom.xml +++ b/asterixdb/asterix-experiments/pom.xml @@ -85,6 +85,14 @@ </execution> </executions> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <version>2.10</version> + <configuration> + <failOnWarning>false</failOnWarning> + </configuration> + </plugin> </plugins> </build> diff --git a/asterixdb/asterix-external-data/pom.xml b/asterixdb/asterix-external-data/pom.xml index 3796a0d..da01510 100644 --- a/asterixdb/asterix-external-data/pom.xml +++ b/asterixdb/asterix-external-data/pom.xml @@ -34,6 +34,7 @@ <artifactId>asterix-external-data</artifactId> <properties> <appendedResourcesDirectory>${basedir}/../src/main/appended-resources</appendedResourcesDirectory> + <generatedSourcesDirectory>${project.build.directory}/generated-sources/lexer/</generatedSourcesDirectory> </properties> <build> <plugins> @@ -134,6 +135,21 @@ </execution> </executions> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <version>2.10</version> + <configuration> + <ignoredUsedUndeclaredDependencies> + <ignoredUsedUndeclaredDependency>org.json:json:*</ignoredUsedUndeclaredDependency> + <ignoredUsedUndeclaredDependency>stax:stax-api:*</ignoredUsedUndeclaredDependency> + <ignoredUsedUndeclaredDependency>javax.xml.bind:jaxb-api:*</ignoredUsedUndeclaredDependency> + </ignoredUsedUndeclaredDependencies> + <ignoredUnusedDeclaredDependencies> + <ignoredUnusedDeclaredDependency>xml-apis:xml-apis:*</ignoredUnusedDeclaredDependency> + </ignoredUnusedDeclaredDependencies> + </configuration> + </plugin> </plugins> <pluginManagement> <plugins> @@ -182,11 +198,6 @@ </build> <dependencies> <dependency> - <groupId>javax.servlet</groupId> - <artifactId>javax.servlet-api</artifactId> - <type>jar</type> - </dependency> - <dependency> <groupId>org.apache.asterix</groupId> <artifactId>asterix-om</artifactId> <version>${project.version}</version> @@ -205,10 +216,6 @@ </dependency> <dependency> <groupId>org.apache.hyracks</groupId> - <artifactId>algebricks-compiler</artifactId> - </dependency> - <dependency> - <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-hdfs-core</artifactId> </dependency> <dependency> @@ -222,12 +229,6 @@ <version>${project.version}</version> </dependency> <dependency> - <groupId>com.kenai.nbpwr</groupId> - <artifactId>org-apache-commons-io</artifactId> - <version>1.3.1-201002241208</version> - <scope>test</scope> - </dependency> - <dependency> <groupId>org.twitter4j</groupId> <artifactId>twitter4j-core</artifactId> <version>4.0.3</version> @@ -236,31 +237,6 @@ <groupId>org.twitter4j</groupId> <artifactId>twitter4j-stream</artifactId> <version>4.0.3</version> - </dependency> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-client</artifactId> - <scope>test</scope> - <exclusions> - <exclusion> - <groupId>com.sun.jersey.jersey-test-framework</groupId> - <artifactId>jersey-test-framework-grizzly2</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-hdfs</artifactId> - <exclusions> - <exclusion> - <groupId>javax.servlet.jsp</groupId> - <artifactId>jsp-api</artifactId> - </exclusion> - <exclusion> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>net.java.dev.rome</groupId> @@ -279,27 +255,9 @@ <version>1.0.1-modified-01</version> </dependency> <dependency> - <groupId>jdom</groupId> - <artifactId>jdom</artifactId> - <version>1.0</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>com.microsoft.windowsazure</groupId> - <artifactId>microsoft-windowsazure-api</artifactId> - <version>0.4.4</version> - <scope>test</scope> - </dependency> - <dependency> <groupId>org.apache.hive</groupId> <artifactId>hive-exec</artifactId> <version>0.13.0</version> - </dependency> - <dependency> - <groupId>javax.jdo</groupId> - <artifactId>jdo2-api</artifactId> - <version>2.3-20090302111651</version> - <scope>test</scope> </dependency> <dependency> <groupId>com.e-movimento.tinytools</groupId> @@ -326,21 +284,114 @@ </dependency> <dependency> <groupId>org.apache.wicket</groupId> - <artifactId>wicket-core</artifactId> - <version>1.5.2</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.wicket</groupId> - <artifactId>wicket-request</artifactId> - <version>1.5.2</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.wicket</groupId> <artifactId>wicket-util</artifactId> <version>1.5.2</version> <scope>test</scope> </dependency> + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + </dependency> + <dependency> + <groupId>org.apache.hyracks</groupId> + <artifactId>hyracks-dataflow-common</artifactId> + </dependency> + <dependency> + <groupId>org.apache.hyracks</groupId> + <artifactId>hyracks-storage-am-lsm-btree</artifactId> + </dependency> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </dependency> + <dependency> + <groupId>org.apache.hyracks</groupId> + <artifactId>algebricks-data</artifactId> + </dependency> + <dependency> + <groupId>org.apache.hyracks</groupId> + <artifactId>algebricks-core</artifactId> + </dependency> + <dependency> + <groupId>org.apache.hyracks</groupId> + <artifactId>hyracks-storage-am-lsm-rtree</artifactId> + </dependency> + <dependency> + <groupId>org.apache.hyracks</groupId> + <artifactId>algebricks-runtime</artifactId> + </dependency> + <dependency> + <groupId>org.apache.hyracks</groupId> + <artifactId>hyracks-storage-am-lsm-common</artifactId> + </dependency> + <dependency> + <groupId>org.apache.hyracks</groupId> + <artifactId>hyracks-storage-common</artifactId> + </dependency> + <dependency> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpclient</artifactId> + </dependency> + <dependency> + <groupId>org.apache.hyracks</groupId> + <artifactId>hyracks-util</artifactId> + </dependency> + <dependency> + <groupId>org.apache.hyracks</groupId> + <artifactId>algebricks-common</artifactId> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-common</artifactId> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-mapreduce-client-core</artifactId> + </dependency> + <dependency> + <groupId>org.apache.hyracks</groupId> + <artifactId>hyracks-storage-am-rtree</artifactId> + </dependency> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + </dependency> + <dependency> + <groupId>org.apache.hyracks</groupId> + <artifactId>hyracks-control-nc</artifactId> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </dependency> + <dependency> + <groupId>org.apache.hyracks</groupId> + <artifactId>hyracks-dataflow-std</artifactId> + </dependency> + <dependency> + <groupId>org.apache.hyracks</groupId> + <artifactId>hyracks-data-std</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-common</artifactId> + </dependency> + <dependency> + <groupId>org.apache.hyracks</groupId> + <artifactId>hyracks-api</artifactId> + </dependency> + <dependency> + <groupId>xml-apis</groupId> + <artifactId>xml-apis</artifactId> + <version>1.4.01</version> + </dependency> + <dependency> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-databind</artifactId> + </dependency> </dependencies> </project> diff --git a/asterixdb/asterix-fuzzyjoin/pom.xml b/asterixdb/asterix-fuzzyjoin/pom.xml index 9ff3387..77a2eff 100644 --- a/asterixdb/asterix-fuzzyjoin/pom.xml +++ b/asterixdb/asterix-fuzzyjoin/pom.xml @@ -82,10 +82,6 @@ <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-util</artifactId> </dependency> - <dependency> - <groupId>org.apache.hyracks</groupId> - <artifactId>hyracks-storage-am-lsm-invertedindex</artifactId> - </dependency> </dependencies> </project> diff --git a/asterixdb/asterix-installer/pom.xml b/asterixdb/asterix-installer/pom.xml index 36afffa..2f34f1d 100644 --- a/asterixdb/asterix-installer/pom.xml +++ b/asterixdb/asterix-installer/pom.xml @@ -93,6 +93,7 @@ <include>log4j:log4j</include> <include>org.apache.asterix:asterix-events</include> <include>org.apache.asterix:asterix-common</include> + <include>org.apache.commons:commons-lang3</include> <include>org.apache.zookeeper:zookeeper</include> <include>args4j:args4j</include> <include>log4j:log4j</include> @@ -252,6 +253,21 @@ </execution> </executions> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <version>2.10</version> + <configuration> + <usedDependencies> + <usedDependency>org.apache.asterix:asterix-external-data</usedDependency> + <usedDependency>org.apache.asterix:asterix-server</usedDependency> + <usedDependency>org.apache.hadoop:hadoop-common</usedDependency> + <usedDependency>org.apache.hadoop:hadoop-hdfs</usedDependency> + <usedDependency>org.apache.hadoop:hadoop-minicluster</usedDependency> + <usedDependency>org.apache.zookeeper:zookeeper</usedDependency> + </usedDependencies> + </configuration> + </plugin> </plugins> <pluginManagement> <plugins> @@ -365,21 +381,6 @@ <dependency> <groupId>org.apache.zookeeper</groupId> <artifactId>zookeeper</artifactId> - <version>3.4.5</version> - <exclusions> - <exclusion> - <groupId>com.sun.jmx</groupId> - <artifactId>jmxri</artifactId> - </exclusion> - <exclusion> - <groupId>com.sun.jdmk</groupId> - <artifactId>jmxtools</artifactId> - </exclusion> - <exclusion> - <groupId>javax.jms</groupId> - <artifactId>jms</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>commons-io</groupId> @@ -389,8 +390,6 @@ <groupId>org.apache.asterix</groupId> <artifactId>asterix-events</artifactId> <version>${project.version}</version> - <type>jar</type> - <scope>compile</scope> </dependency> <dependency> <groupId>org.apache.asterix</groupId> @@ -429,14 +428,53 @@ <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-common</artifactId> - <version>${hadoop.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-minicluster</artifactId> - <version>${hadoop.version}</version> - <type>jar</type> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-utils</artifactId> + <version>3.0.20</version> + </dependency> + <dependency> + <groupId>org.apache.asterix</groupId> + <artifactId>asterix-external-data</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.asterix</groupId> + <artifactId>asterix-common</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + </dependency> + <dependency> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + <version>2.2.2</version> + </dependency> + <dependency> + <groupId>org.apache.hyracks</groupId> + <artifactId>hyracks-api</artifactId> + </dependency> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-hdfs</artifactId> <scope>test</scope> </dependency> </dependencies> diff --git a/asterixdb/asterix-installer/src/main/assembly/binary-assembly.xml b/asterixdb/asterix-installer/src/main/assembly/binary-assembly.xml index 93ebbd7..88f2b70 100644 --- a/asterixdb/asterix-installer/src/main/assembly/binary-assembly.xml +++ b/asterixdb/asterix-installer/src/main/assembly/binary-assembly.xml @@ -90,6 +90,7 @@ <include>log4j:log4j</include> <include>org.apache.asterix:asterix-events</include> <include>org.apache.asterix:asterix-common</include> + <include>org.apache.commons:commons-lang3</include> <include>org.apache.zookeeper:zookeeper</include> <include>args4j:args4j</include> <include>log4j:log4j</include> diff --git a/asterixdb/asterix-installer/src/main/resources/scripts/managix b/asterixdb/asterix-installer/src/main/resources/scripts/managix index 06e5d2f..ddda709 100755 --- a/asterixdb/asterix-installer/src/main/resources/scripts/managix +++ b/asterixdb/asterix-installer/src/main/resources/scripts/managix @@ -23,15 +23,5 @@ popd >/dev/null fi -for jar in `ls $MANAGIX_HOME/lib/*.jar` - do - if [ -z $MANAGIX_CLASSPATH ] - then - MANAGIX_CLASSPATH=$jar - else - MANAGIX_CLASSPATH=$MANAGIX_CLASSPATH:$jar - fi -done - -MANAGIX_CLASSPATH=$MANAGIX_CLASSPATH:$MANAGIX_HOME/conf/log4j.properties +MANAGIX_CLASSPATH=$MANAGIX_HOME/lib/*:$MANAGIX_HOME/conf/log4j.properties java $JAVA_OPTS -Dlog4j.configuration=file:$MANAGIX_HOME/conf/log4j.properties -cp $MANAGIX_CLASSPATH org.apache.asterix.installer.driver.InstallerDriver $@ diff --git a/asterixdb/asterix-installer/src/main/resources/zookeeper/start_zk.sh b/asterixdb/asterix-installer/src/main/resources/zookeeper/start_zk.sh index 946abeb..7ec0e55 100755 --- a/asterixdb/asterix-installer/src/main/resources/zookeeper/start_zk.sh +++ b/asterixdb/asterix-installer/src/main/resources/zookeeper/start_zk.sh @@ -22,7 +22,6 @@ JAVA_HOME=$3 mkdir $ZK_HOME/data echo $2 > $ZK_HOME/data/myid -CLASSPATH=$ZK_HOME/lib/zookeeper-3.4.5.jar:$ZK_HOME/lib/log4j-1.2.15.jar:$ZK_HOME/lib/slf4j-api-1.6.1.jar:$ZK_HOME/conf:$ZK_HOME/conf/log4j.properties +CLASSPATH=$ZK_HOME/lib/*:$ZK_HOME/conf:$ZK_HOME/conf/log4j.properties ZK_CONF=$ZK_HOME/zk.cfg -export JAVA_OPTS="-Xdebug -Xrunjdwp:transport=dt_socket,address=8400,server=y,suspend=n" $JAVA_HOME/bin/java $JAVA_OPTS -Dlog4j.configuration="file:$ZK_HOME/conf/log4j.properties" -cp $CLASSPATH org.apache.zookeeper.server.quorum.QuorumPeerMain $ZK_CONF diff --git a/asterixdb/asterix-lang-aql/pom.xml b/asterixdb/asterix-lang-aql/pom.xml index b80c232..24909ad 100644 --- a/asterixdb/asterix-lang-aql/pom.xml +++ b/asterixdb/asterix-lang-aql/pom.xml @@ -128,6 +128,55 @@ <artifactId>asterix-lang-common</artifactId> <version>${project.version}</version> </dependency> + <dependency> + <groupId>org.apache.hyracks</groupId> + <artifactId>algebricks-common</artifactId> + </dependency> + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + </dependency> + <dependency> + <groupId>org.apache.hyracks</groupId> + <artifactId>hyracks-dataflow-common</artifactId> + </dependency> + <dependency> + <groupId>org.apache.asterix</groupId> + <artifactId>asterix-om</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.asterix</groupId> + <artifactId>asterix-active</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.asterix</groupId> + <artifactId>asterix-metadata</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.asterix</groupId> + <artifactId>asterix-external-data</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.asterix</groupId> + <artifactId>asterix-common</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.hyracks</groupId> + <artifactId>algebricks-core</artifactId> + </dependency> + <dependency> + <groupId>org.apache.hyracks</groupId> + <artifactId>hyracks-api</artifactId> + </dependency> + <dependency> + <groupId>org.apache.hyracks</groupId> + <artifactId>hyracks-data-std</artifactId> + </dependency> </dependencies> </project> diff --git a/asterixdb/asterix-lang-common/pom.xml b/asterixdb/asterix-lang-common/pom.xml index a25a0e9..b095997 100644 --- a/asterixdb/asterix-lang-common/pom.xml +++ b/asterixdb/asterix-lang-common/pom.xml @@ -63,13 +63,49 @@ <groupId>org.apache.asterix</groupId> <artifactId>asterix-common</artifactId> <version>${project.version}</version> - <scope>compile</scope> </dependency> <dependency> <groupId>org.apache.asterix</groupId> <artifactId>asterix-metadata</artifactId> <version>${project.version}</version> - <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.hyracks</groupId> + <artifactId>algebricks-common</artifactId> + </dependency> + <dependency> + <groupId>org.apache.hyracks</groupId> + <artifactId>hyracks-dataflow-common</artifactId> + </dependency> + <dependency> + <groupId>org.apache.asterix</groupId> + <artifactId>asterix-om</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.asterix</groupId> + <artifactId>asterix-runtime</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + </dependency> + <dependency> + <groupId>org.apache.hyracks</groupId> + <artifactId>algebricks-core</artifactId> + </dependency> + <dependency> + <groupId>org.apache.hyracks</groupId> + <artifactId>hyracks-api</artifactId> + </dependency> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + </dependency> + <dependency> + <groupId>org.apache.hyracks</groupId> + <artifactId>hyracks-data-std</artifactId> </dependency> </dependencies> diff --git a/asterixdb/asterix-lang-sqlpp/pom.xml b/asterixdb/asterix-lang-sqlpp/pom.xml index bce61d5..ba371c0 100644 --- a/asterixdb/asterix-lang-sqlpp/pom.xml +++ b/asterixdb/asterix-lang-sqlpp/pom.xml @@ -125,6 +125,42 @@ <artifactId>asterix-lang-common</artifactId> <version>${project.version}</version> </dependency> + <dependency> + <groupId>org.apache.hyracks</groupId> + <artifactId>algebricks-common</artifactId> + </dependency> + <dependency> + <groupId>org.apache.asterix</groupId> + <artifactId>asterix-om</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </dependency> + <dependency> + <groupId>org.apache.asterix</groupId> + <artifactId>asterix-metadata</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.asterix</groupId> + <artifactId>asterix-common</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.hyracks</groupId> + <artifactId>algebricks-core</artifactId> + </dependency> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> + </dependency> </dependencies> </project> diff --git a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/visitor/base/AbstractSqlppSimpleExpressionVisitor.java b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/visitor/base/AbstractSqlppSimpleExpressionVisitor.java index 90f812c..f788aea 100644 --- a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/visitor/base/AbstractSqlppSimpleExpressionVisitor.java +++ b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/visitor/base/AbstractSqlppSimpleExpressionVisitor.java @@ -21,7 +21,6 @@ import java.util.ArrayList; import java.util.List; -import org.antlr.stringtemplate.language.Expr; import org.apache.asterix.common.exceptions.AsterixException; import org.apache.asterix.lang.common.base.Expression; import org.apache.asterix.lang.common.base.ILangExpression; diff --git a/asterixdb/asterix-maven-plugins/asterix-evaluator-generator-maven-plugin/pom.xml b/asterixdb/asterix-maven-plugins/asterix-evaluator-generator-maven-plugin/pom.xml index 20fb641..cd85902 100644 --- a/asterixdb/asterix-maven-plugins/asterix-evaluator-generator-maven-plugin/pom.xml +++ b/asterixdb/asterix-maven-plugins/asterix-evaluator-generator-maven-plugin/pom.xml @@ -46,11 +46,6 @@ </dependency> <dependency> <groupId>org.apache.maven</groupId> - <artifactId>maven-artifact</artifactId> - <version>3.3.9</version> - </dependency> - <dependency> - <groupId>org.apache.maven</groupId> <artifactId>maven-project</artifactId> <version>2.2.1</version> </dependency> @@ -60,9 +55,9 @@ <version>0.9.10</version> </dependency> <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <scope>test</scope> + <groupId>org.apache.maven</groupId> + <artifactId>maven-model</artifactId> + <version>3.3.9</version> </dependency> </dependencies> </project> diff --git a/asterixdb/asterix-maven-plugins/asterix-grammar-extension-maven-plugin/pom.xml b/asterixdb/asterix-maven-plugins/asterix-grammar-extension-maven-plugin/pom.xml index a4c157d..49339c1 100644 --- a/asterixdb/asterix-maven-plugins/asterix-grammar-extension-maven-plugin/pom.xml +++ b/asterixdb/asterix-maven-plugins/asterix-grammar-extension-maven-plugin/pom.xml @@ -31,11 +31,6 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>org.apache.maven</groupId> - <artifactId>maven-project</artifactId> - <version>2.2.1</version> - </dependency> - <dependency> <groupId>org.apache.asterix</groupId> <artifactId>asterix-external-data</artifactId> <version>${project.version}</version> @@ -52,9 +47,22 @@ <version>${project.version}</version> </dependency> <dependency> + <groupId>org.apache.hyracks</groupId> + <artifactId>algebricks-common</artifactId> + </dependency> + <dependency> <groupId>org.apache.asterix</groupId> - <artifactId>asterix-lang-sqlpp</artifactId> + <artifactId>asterix-common</artifactId> <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> </dependency> </dependencies> <build> @@ -86,6 +94,17 @@ </execution> </executions> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <version>2.10</version> + <configuration> + <usedDependencies> + <usedDependency>org.apache.maven:maven-core</usedDependency> + <usedDependency>org.apache.maven:maven-compat</usedDependency> + </usedDependencies> + </configuration> + </plugin> </plugins> <pluginManagement> <plugins> diff --git a/asterixdb/asterix-maven-plugins/asterix-test-datagenerator-maven-plugin/pom.xml b/asterixdb/asterix-maven-plugins/asterix-test-datagenerator-maven-plugin/pom.xml index 98d58f2..426a6b4 100644 --- a/asterixdb/asterix-maven-plugins/asterix-test-datagenerator-maven-plugin/pom.xml +++ b/asterixdb/asterix-maven-plugins/asterix-test-datagenerator-maven-plugin/pom.xml @@ -41,11 +41,6 @@ <version>3.0.0</version> </dependency> <dependency> - <groupId>ant</groupId> - <artifactId>ant</artifactId> - <version>1.6.5</version> - </dependency> - <dependency> <groupId>org.apache.asterix</groupId> <artifactId>asterix-test-framework</artifactId> <version>${project.version}</version> diff --git a/asterixdb/asterix-maven-plugins/license-automation-plugin/pom.xml b/asterixdb/asterix-maven-plugins/license-automation-plugin/pom.xml index df701d9..6abbf71 100644 --- a/asterixdb/asterix-maven-plugins/license-automation-plugin/pom.xml +++ b/asterixdb/asterix-maven-plugins/license-automation-plugin/pom.xml @@ -44,11 +44,6 @@ <version>1.5</version> </dependency> <dependency> - <groupId>org.apache.maven</groupId> - <artifactId>maven-compat</artifactId> - <version>3.3.9</version> - </dependency> - <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> <version>2.8.4</version> @@ -61,7 +56,35 @@ <dependency> <groupId>commons-io</groupId> <artifactId>commons-io</artifactId> - <version>2.5</version> + </dependency> + <dependency> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-annotations</artifactId> + <version>2.8.0</version> + </dependency> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-project</artifactId> + <version>2.2.1</version> + </dependency> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-model</artifactId> + <version>3.3.9</version> + </dependency> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + </dependency> + <dependency> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-utils</artifactId> + <version>3.0.22</version> + </dependency> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-artifact</artifactId> + <version>3.0</version> </dependency> </dependencies> diff --git a/asterixdb/asterix-maven-plugins/record-manager-generator-maven-plugin/pom.xml b/asterixdb/asterix-maven-plugins/record-manager-generator-maven-plugin/pom.xml index 2fa86b4..86d39c8 100644 --- a/asterixdb/asterix-maven-plugins/record-manager-generator-maven-plugin/pom.xml +++ b/asterixdb/asterix-maven-plugins/record-manager-generator-maven-plugin/pom.xml @@ -35,11 +35,7 @@ <dependencies> <dependency> <groupId>org.apache.maven</groupId> - <artifactId>maven-plugin-api</artifactId> - </dependency> - <dependency> - <groupId>org.apache.maven</groupId> - <artifactId>maven-artifact</artifactId> + <artifactId>maven-model</artifactId> <version>3.3.9</version> </dependency> <dependency> @@ -50,10 +46,6 @@ <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> - </dependency> - <dependency> - <groupId>com.fasterxml.jackson.core</groupId> - <artifactId>jackson-core</artifactId> </dependency> </dependencies> </project> diff --git a/asterixdb/asterix-metadata/pom.xml b/asterixdb/asterix-metadata/pom.xml index 3087b60..b39713f 100644 --- a/asterixdb/asterix-metadata/pom.xml +++ b/asterixdb/asterix-metadata/pom.xml @@ -76,6 +76,95 @@ <groupId>org.apache.asterix</groupId> <artifactId>asterix-external-data</artifactId> <version>${project.version}</version> + <exclusions> + <exclusion> + <groupId>org.apache.hive</groupId> + <artifactId>hive-exec</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.apache.hyracks</groupId> + <artifactId>algebricks-common</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.asterix</groupId> + <artifactId>asterix-active</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.hyracks</groupId> + <artifactId>hyracks-storage-am-rtree</artifactId> + </dependency> + <dependency> + <groupId>org.apache.hyracks</groupId> + <artifactId>algebricks-data</artifactId> + </dependency> + <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + </dependency> + <dependency> + <groupId>org.apache.hyracks</groupId> + <artifactId>algebricks-core</artifactId> + </dependency> + <dependency> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + <version>2.2.2</version> + </dependency> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </dependency> + <dependency> + <groupId>org.apache.hyracks</groupId> + <artifactId>hyracks-data-std</artifactId> + </dependency> + <dependency> + <groupId>org.apache.hyracks</groupId> + <artifactId>hyracks-dataflow-std</artifactId> + </dependency> + <dependency> + <groupId>org.apache.hyracks</groupId> + <artifactId>hyracks-storage-am-btree</artifactId> + </dependency> + <dependency> + <groupId>org.apache.hyracks</groupId> + <artifactId>algebricks-runtime</artifactId> + </dependency> + <dependency> + <groupId>org.apache.hyracks</groupId> + <artifactId>hyracks-storage-am-common</artifactId> + </dependency> + <dependency> + <groupId>org.apache.hyracks</groupId> + <artifactId>hyracks-storage-am-lsm-common</artifactId> + </dependency> + <dependency> + <groupId>org.apache.hyracks</groupId> + <artifactId>hyracks-api</artifactId> + </dependency> + <dependency> + <groupId>org.apache.hyracks</groupId> + <artifactId>hyracks-storage-common</artifactId> + </dependency> + <dependency> + <groupId>org.apache.asterix</groupId> + <artifactId>asterix-transactions</artifactId> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.mockito</groupId> diff --git a/asterixdb/asterix-om/pom.xml b/asterixdb/asterix-om/pom.xml index eb3310f..c175dcc 100644 --- a/asterixdb/asterix-om/pom.xml +++ b/asterixdb/asterix-om/pom.xml @@ -46,22 +46,8 @@ <scope>compile</scope> </dependency> <dependency> - <groupId>org.apache.asterix</groupId> - <artifactId>asterix-transactions</artifactId> - <version>${project.version}</version> - <scope>compile</scope> - </dependency> - <dependency> <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-storage-am-lsm-invertedindex</artifactId> - </dependency> - <dependency> - <groupId>org.apache.hyracks</groupId> - <artifactId>algebricks-compiler</artifactId> - </dependency> - <dependency> - <groupId>org.apache.hyracks</groupId> - <artifactId>hyracks-storage-am-lsm-rtree</artifactId> </dependency> <dependency> <groupId>org.reflections</groupId> @@ -81,10 +67,60 @@ <scope>test</scope> </dependency> <dependency> - <groupId>com.e-movimento.tinytools</groupId> - <artifactId>privilegedaccessor</artifactId> - <version>1.2.2</version> - <scope>test</scope> + <groupId>org.apache.hyracks</groupId> + <artifactId>algebricks-common</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> + <artifactId>hyracks-storage-am-rtree</artifactId> + </dependency> + <dependency> + <groupId>org.apache.hyracks</groupId> + <artifactId>algebricks-data</artifactId> + </dependency> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + </dependency> + <dependency> + <groupId>org.apache.hyracks</groupId> + <artifactId>algebricks-core</artifactId> + </dependency> + <dependency> + <groupId>org.apache.hyracks</groupId> + <artifactId>hyracks-data-std</artifactId> + </dependency> + <dependency> + <groupId>org.apache.hyracks</groupId> + <artifactId>algebricks-runtime</artifactId> + </dependency> + <dependency> + <groupId>org.apache.hyracks</groupId> + <artifactId>hyracks-storage-am-common</artifactId> + </dependency> + <dependency> + <groupId>org.apache.hyracks</groupId> + <artifactId>hyracks-api</artifactId> + </dependency> + <dependency> + <groupId>org.apache.hyracks</groupId> + <artifactId>hyracks-storage-common</artifactId> + </dependency> + <dependency> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-databind</artifactId> + </dependency> + <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> </dependency> </dependencies> </project> diff --git a/asterixdb/asterix-replication/pom.xml b/asterixdb/asterix-replication/pom.xml index ff9e75c..e8fc5ff 100644 --- a/asterixdb/asterix-replication/pom.xml +++ b/asterixdb/asterix-replication/pom.xml @@ -53,7 +53,28 @@ </dependency> <dependency> <groupId>org.apache.hyracks</groupId> - <artifactId>hyracks-storage-am-common</artifactId> + <artifactId>hyracks-util</artifactId> + </dependency> + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + </dependency> + <dependency> + <groupId>org.apache.hyracks</groupId> + <artifactId>hyracks-storage-am-lsm-common</artifactId> + </dependency> + <dependency> + <groupId>org.apache.hyracks</groupId> + <artifactId>hyracks-storage-common</artifactId> + </dependency> + <dependency> + <groupId>org.apache.hyracks</groupId> + <artifactId>hyracks-data-std</artifactId> + </dependency> + <dependency> + <groupId>org.apache.asterix</groupId> + <artifactId>asterix-transactions</artifactId> + <version>${project.version}</version> </dependency> </dependencies> diff --git a/asterixdb/asterix-runtime/pom.xml b/asterixdb/asterix-runtime/pom.xml index cd7deed..4d33485 100644 --- a/asterixdb/asterix-runtime/pom.xml +++ b/asterixdb/asterix-runtime/pom.xml @@ -65,6 +65,67 @@ <artifactId>hyracks-control-nc</artifactId> </dependency> <dependency> + <groupId>org.apache.hyracks</groupId> + <artifactId>algebricks-common</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> + <artifactId>algebricks-data</artifactId> + </dependency> + <dependency> + <groupId>org.apache.asterix</groupId> + <artifactId>asterix-common</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.hyracks</groupId> + <artifactId>algebricks-core</artifactId> + </dependency> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + </dependency> + <dependency> + <groupId>org.apache.hyracks</groupId> + <artifactId>hyracks-storage-am-lsm-invertedindex</artifactId> + </dependency> + <dependency> + <groupId>org.apache.hyracks</groupId> + <artifactId>hyracks-dataflow-std</artifactId> + </dependency> + <dependency> + <groupId>org.apache.hyracks</groupId> + <artifactId>hyracks-data-std</artifactId> + </dependency> + <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + </dependency> + <dependency> + <groupId>org.apache.hyracks</groupId> + <artifactId>algebricks-runtime</artifactId> + </dependency> + <dependency> + <groupId>org.apache.hyracks</groupId> + <artifactId>hyracks-storage-am-common</artifactId> + </dependency> + <dependency> + <groupId>org.apache.hyracks</groupId> + <artifactId>hyracks-storage-am-lsm-common</artifactId> + </dependency> + <dependency> + <groupId>org.apache.hyracks</groupId> + <artifactId>hyracks-storage-common</artifactId> + </dependency> + <dependency> <groupId>org.apache.asterix</groupId> <artifactId>asterix-transactions</artifactId> <version>${project.version}</version> @@ -80,5 +141,9 @@ <artifactId>privilegedaccessor</artifactId> <version>1.2.2</version> </dependency> + <dependency> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-databind</artifactId> + </dependency> </dependencies> </project> diff --git a/asterixdb/asterix-server/pom.xml b/asterixdb/asterix-server/pom.xml index 4009b1e..8cf52d1 100644 --- a/asterixdb/asterix-server/pom.xml +++ b/asterixdb/asterix-server/pom.xml @@ -345,6 +345,25 @@ </execution> </executions> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <version>2.10</version> + <configuration> + <ignoredDependencies> + <ignoredDependency>org.apache.asterix:asterix-opt-bom:*</ignoredDependency> + </ignoredDependencies> + <usedDependencies> + <usedDependency>org.apache.asterix:asterix-app</usedDependency> + <usedDependency>org.apache.asterix:asterix-client-helper</usedDependency> + <usedDependency>org.apache.hadoop:hadoop-minicluster</usedDependency> + <usedDependency>org.apache.hyracks:hyracks-control-cc</usedDependency> + <usedDependency>org.apache.hyracks:hyracks-control-nc</usedDependency> + <usedDependency>org.apache.hyracks:hyracks-nc-service</usedDependency> + <usedDependency>org.codehaus.mojo.appassembler:appassembler-booter</usedDependency> + </usedDependencies> + </configuration> + </plugin> </plugins> <pluginManagement> <plugins> @@ -397,31 +416,24 @@ <dependency> <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-control-cc</artifactId> - <type>jar</type> - <scope>compile</scope> </dependency> <dependency> <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-control-nc</artifactId> - <type>jar</type> - <scope>compile</scope> </dependency> <dependency> <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-nc-service</artifactId> - <type>jar</type> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.apache.hyracks</groupId> - <artifactId>hyracks-server</artifactId> - <type>jar</type> - <scope>test</scope> </dependency> <dependency> <groupId>org.apache.asterix</groupId> <artifactId>asterix-app</artifactId> <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.hyracks</groupId> + <artifactId>hyracks-server</artifactId> + <scope>test</scope> </dependency> <dependency> <groupId>org.apache.asterix</groupId> @@ -462,10 +474,26 @@ <classifier>assembly</classifier> </dependency> <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + </dependency> + <dependency> + <groupId>org.apache.asterix</groupId> + <artifactId>asterix-common</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-minicluster</artifactId> - <version>${hadoop.version}</version> - <type>jar</type> <scope>test</scope> </dependency> </dependencies> diff --git a/asterixdb/asterix-tools/pom.xml b/asterixdb/asterix-tools/pom.xml index 5c35e05..ec87021 100644 --- a/asterixdb/asterix-tools/pom.xml +++ b/asterixdb/asterix-tools/pom.xml @@ -98,5 +98,43 @@ <version>${project.version}</version> <scope>test</scope> </dependency> + <dependency> + <groupId>org.apache.hyracks</groupId> + <artifactId>algebricks-common</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.asterix</groupId> + <artifactId>asterix-om</artifactId> + <version>${project.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>args4j</groupId> + <artifactId>args4j</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.asterix</groupId> + <artifactId>asterix-lang-common</artifactId> + <version>${project.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.hyracks</groupId> + <artifactId>algebricks-data</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.asterix</groupId> + <artifactId>asterix-common</artifactId> + <version>${project.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> + </dependency> </dependencies> </project> diff --git a/asterixdb/asterix-transactions/pom.xml b/asterixdb/asterix-transactions/pom.xml index a016a54..0a96ffd 100644 --- a/asterixdb/asterix-transactions/pom.xml +++ b/asterixdb/asterix-transactions/pom.xml @@ -113,7 +113,6 @@ <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> - <version>18.0</version> </dependency> <dependency> <groupId>org.mockito</groupId> @@ -126,6 +125,30 @@ <artifactId>junit</artifactId> <scope>test</scope> </dependency> + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + </dependency> + <dependency> + <groupId>org.apache.hyracks</groupId> + <artifactId>hyracks-dataflow-common</artifactId> + </dependency> + <dependency> + <groupId>org.apache.hyracks</groupId> + <artifactId>hyracks-storage-am-rtree</artifactId> + </dependency> + <dependency> + <groupId>org.apache.hyracks</groupId> + <artifactId>hyracks-storage-am-lsm-common</artifactId> + </dependency> + <dependency> + <groupId>org.apache.hyracks</groupId> + <artifactId>hyracks-api</artifactId> + </dependency> + <dependency> + <groupId>org.apache.hyracks</groupId> + <artifactId>hyracks-storage-common</artifactId> + </dependency> </dependencies> </project> diff --git a/asterixdb/asterix-yarn/pom.xml b/asterixdb/asterix-yarn/pom.xml index 3c484f9..4e6ce2a 100644 --- a/asterixdb/asterix-yarn/pom.xml +++ b/asterixdb/asterix-yarn/pom.xml @@ -183,13 +183,42 @@ </license> <license> <url>https://opensource.org/licenses/mit-license.php</url> - <aliasUrls>http://www.opensource.org/licenses/mit-license.php</aliasUrls> + <aliasUrls>http://www.opensource.org/li]censes/mit-license.php</aliasUrls> </license> </licenses> <templateProperties> <assembly>asterix/asterix-server-${project.version}-binary-assembly.zip</assembly> <packageName>YARN Install</packageName> </templateProperties> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <version>2.10</version> + <configuration> + <ignoredDependencies> + <ignoredDependency>org.apache.hive:hive-exec:*</ignoredDependency> + </ignoredDependencies> + <usedDependencies> + <usedDependency>com.google.guava:guava</usedDependency> + <usedDependency>commons-codec:commons-codec</usedDependency> + <usedDependency>commons-collections:commons-collections</usedDependency> + <usedDependency>commons-configuration:commons-configuration</usedDependency> + <usedDependency>commons-lang:commons-lang</usedDependency> + <usedDependency>commons-logging:commons-logging-api</usedDependency> + <usedDependency>commons-net:commons-net</usedDependency> + <usedDependency>org.apache.asterix:asterix-app</usedDependency> + <usedDependency>org.apache.asterix:asterix-events</usedDependency> + <usedDependency>org.apache.asterix:asterix-runtime</usedDependency> + <usedDependency>org.apache.asterix:asterix-server</usedDependency> + <usedDependency>org.apache.commons:commons-math</usedDependency> + <usedDependency>org.apache.hadoop:hadoop-minicluster</usedDependency> + <usedDependency>org.apache.httpcomponents:httpclient</usedDependency> + <usedDependency>org.apache.httpcomponents:httpcore</usedDependency> + <usedDependency>org.slf4j:slf4j-simple</usedDependency> + <usedDependency>xerces:xercesImpl</usedDependency> + </usedDependencies> </configuration> </plugin> </plugins> @@ -305,7 +334,6 @@ <dependency> <groupId>commons-lang</groupId> <artifactId>commons-lang</artifactId> - <version>2.5</version> </dependency> <dependency> <groupId>commons-collections</groupId> @@ -330,14 +358,10 @@ <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpclient</artifactId> - <version>4.5.2</version> - <scope>compile</scope> </dependency> <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpcore</artifactId> - <version>4.4.5</version> - <scope>compile</scope> </dependency> <dependency> <groupId>org.apache.asterix</groupId> @@ -374,9 +398,68 @@ <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-minicluster</artifactId> - <version>${hadoop.version}</version> - <type>jar</type> <scope>test</scope> </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-annotations</artifactId> + </dependency> + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + </dependency> + <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + </dependency> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </dependency> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <version>1.1.1</version> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-hdfs</artifactId> + <classifier>tests</classifier> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-yarn-api</artifactId> + <version>${hadoop.version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + <version>2.2.2</version> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-yarn-server-tests</artifactId> + <version>${hadoop.version}</version> + <classifier>tests</classifier> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-yarn-server-resourcemanager</artifactId> + <version>${hadoop.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>commons-httpclient</groupId> + <artifactId>commons-httpclient</artifactId> + <version>3.1</version> + </dependency> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging-api</artifactId> + <version>1.0.4</version> + </dependency> </dependencies> </project> diff --git a/asterixdb/pom.xml b/asterixdb/pom.xml index 675d549..a0f9633 100644 --- a/asterixdb/pom.xml +++ b/asterixdb/pom.xml @@ -47,6 +47,7 @@ <runSlowAQLTests>false</runSlowAQLTests> <appendedResourcesDirectory>${basedir}/src/main/appended-resources</appendedResourcesDirectory> <sonar.jacoco.reportPath>${env.PWD}/target/jacoco-merged.exec</sonar.jacoco.reportPath> + <debug.suspend.flag>n</debug.suspend.flag> <!-- Definition of tests in various categories which may be excluded --> <optimizer.tests>**/optimizer/**/*Test.java</optimizer.tests> @@ -65,9 +66,7 @@ <algebricks.version>0.2.18-SNAPSHOT</algebricks.version> <hyracks.version>0.2.18-SNAPSHOT</hyracks.version> <hadoop.version>2.2.0</hadoop.version> - <junit.version>4.12</junit.version> - <commons.io.version>2.5</commons.io.version> - <servlet.api.version>3.1.0</servlet.api.version> + <jetty.version>9.3.11.v20160721</jetty.version> <jacoco.version>0.7.6.201602180812</jacoco.version> </properties> @@ -90,7 +89,7 @@ -Djava.util.logging.config.file=${user.home}/logging.properties -DrunSlowAQLTests=${runSlowAQLTests} -Xdebug - -Xrunjdwp:transport=dt_socket,server=y,address=8000,suspend=n + -Xrunjdwp:transport=dt_socket,server=y,address=8000,suspend=${debug.suspend.flag} ${coverageArgLine} </argLine> <includes> @@ -263,6 +262,18 @@ <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> </plugins> <pluginManagement> @@ -627,9 +638,19 @@ <dependencyManagement> <dependencies> <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-server</artifactId> + <version>${jetty.version}</version> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-servlet</artifactId> + <version>${jetty.version}</version> + </dependency> + <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>${junit.version}</version> + <version>4.12</version> </dependency> <dependency> <groupId>org.apache.maven</groupId> @@ -662,8 +683,46 @@ <version>${hadoop.version}</version> </dependency> <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-common</artifactId> + <version>${hadoop.version}</version> + <classifier>tests</classifier> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-mapreduce-client-core</artifactId> + <version>${hadoop.version}</version> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-annotations</artifactId> + <version>${hadoop.version}</version> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-minicluster</artifactId> + <version>${hadoop.version}</version> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-hdfs</artifactId> + <version>${hadoop.version}</version> + <classifier>tests</classifier> + <exclusions> + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> <groupId>org.apache.hyracks</groupId> <artifactId>algebricks-common</artifactId> + <version>${algebricks.version}</version> + </dependency> + <dependency> + <groupId>org.apache.hyracks</groupId> + <artifactId>algebricks-data</artifactId> <version>${algebricks.version}</version> </dependency> <dependency> @@ -673,12 +732,22 @@ </dependency> <dependency> <groupId>org.apache.hyracks</groupId> + <artifactId>hyracks-net</artifactId> + <version>${hyracks.version}</version> + </dependency> + <dependency> + <groupId>org.apache.hyracks</groupId> <artifactId>algebricks-compiler</artifactId> <version>${algebricks.version}</version> </dependency> <dependency> <groupId>org.apache.hyracks</groupId> <artifactId>algebricks-rewriter</artifactId> + <version>${algebricks.version}</version> + </dependency> + <dependency> + <groupId>org.apache.hyracks</groupId> + <artifactId>algebricks-runtime</artifactId> <version>${algebricks.version}</version> </dependency> <dependency> @@ -699,6 +768,11 @@ <dependency> <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-data</artifactId> + <version>${hyracks.version}</version> + </dependency> + <dependency> + <groupId>org.apache.hyracks</groupId> + <artifactId>hyracks-data-std</artifactId> <version>${hyracks.version}</version> </dependency> <dependency> @@ -768,6 +842,11 @@ </dependency> <dependency> <groupId>org.apache.hyracks</groupId> + <artifactId>hyracks-control-common</artifactId> + <version>${hyracks.version}</version> + </dependency> + <dependency> + <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-client</artifactId> <version>${hyracks.version}</version> </dependency> @@ -808,15 +887,30 @@ <type>test-jar</type> </dependency> <dependency> + <groupId>org.apache.hyracks</groupId> + <artifactId>hyracks-hdfs-2.x</artifactId> + <version>${hyracks.version}</version> + <type>test-jar</type> + </dependency> + <dependency> <groupId>javax.servlet</groupId> <artifactId>javax.servlet-api</artifactId> - <version>${servlet.api.version}</version> - <type>jar</type> + <version>3.1.0</version> </dependency> <dependency> <groupId>commons-io</groupId> <artifactId>commons-io</artifactId> - <version>${commons.io.version}</version> + <version>2.5</version> + </dependency> + <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + <version>2.5</version> + </dependency> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + <version>3.5</version> </dependency> <dependency> <groupId>xerces</groupId> @@ -836,7 +930,7 @@ <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpcore</artifactId> - <version>4.4</version> + <version>4.4.5</version> </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> @@ -848,6 +942,49 @@ <artifactId>jackson-core</artifactId> <version>2.8.4</version> </dependency> + <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + <version>18.0</version> + </dependency> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <version>1.2.17</version> + <exclusions> + <exclusion> + <groupId>com.sun.jmx</groupId> + <artifactId>jmxri</artifactId> + </exclusion> + <exclusion> + <groupId>com.sun.jdmk</groupId> + <artifactId>jmxtools</artifactId> + </exclusion> + <exclusion> + <groupId>javax.jms</groupId> + <artifactId>jms</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.apache.zookeeper</groupId> + <artifactId>zookeeper</artifactId> + <version>3.4.5</version> + <exclusions> + <exclusion> + <groupId>com.sun.jmx</groupId> + <artifactId>jmxri</artifactId> + </exclusion> + <exclusion> + <groupId>com.sun.jdmk</groupId> + <artifactId>jmxtools</artifactId> + </exclusion> + <exclusion> + <groupId>javax.jms</groupId> + <artifactId>jms</artifactId> + </exclusion> + </exclusions> + </dependency> </dependencies> </dependencyManagement> </project> diff --git a/hyracks-fullstack/algebricks/algebricks-core/pom.xml b/hyracks-fullstack/algebricks/algebricks-core/pom.xml index c53a87b..5829ac5 100644 --- a/hyracks-fullstack/algebricks/algebricks-core/pom.xml +++ b/hyracks-fullstack/algebricks/algebricks-core/pom.xml @@ -60,7 +60,6 @@ <dependency> <groupId>commons-io</groupId> <artifactId>commons-io</artifactId> - <version>2.5</version> </dependency> <dependency> <groupId>org.apache.hyracks</groupId> 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 636e1fe..63c6047 100644 --- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/pom.xml +++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/pom.xml @@ -42,9 +42,6 @@ <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-server</artifactId> - <version>9.3.11.v20160721</version> - <type>jar</type> - <scope>compile</scope> </dependency> <dependency> <groupId>org.apache.wicket</groupId> @@ -54,7 +51,6 @@ <dependency> <groupId>commons-io</groupId> <artifactId>commons-io</artifactId> - <version>2.5</version> </dependency> <dependency> <groupId>javax.servlet</groupId> @@ -64,7 +60,6 @@ <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-servlet</artifactId> - <version>9.3.11.v20160721</version> </dependency> <dependency> <groupId>org.apache.wicket</groupId> @@ -74,7 +69,6 @@ <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-http</artifactId> - <version>9.3.11.v20160721</version> </dependency> <dependency> <groupId>org.ini4j</groupId> @@ -109,7 +103,6 @@ <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> - <version>18.0</version> </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> 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 1c8ae20..afe8598 100644 --- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/pom.xml +++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/pom.xml @@ -35,12 +35,10 @@ <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-api</artifactId> <version>${project.version}</version> - <scope>compile</scope> </dependency> <dependency> <groupId>commons-io</groupId> <artifactId>commons-io</artifactId> - <scope>compile</scope> </dependency> <dependency> <groupId>org.ini4j</groupId> 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 f7726e1..73ed8b2 100644 --- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/pom.xml +++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/pom.xml @@ -56,7 +56,6 @@ <dependency> <groupId>commons-io</groupId> <artifactId>commons-io</artifactId> - <version>2.5</version> </dependency> <dependency> <groupId>args4j</groupId> 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 d934e8c..d294c11 100644 --- a/hyracks-fullstack/hyracks/hyracks-examples/hyracks-integration-tests/pom.xml +++ b/hyracks-fullstack/hyracks/hyracks-examples/hyracks-integration-tests/pom.xml @@ -114,7 +114,6 @@ <dependency> <groupId>commons-io</groupId> <artifactId>commons-io</artifactId> - <version>2.5</version> </dependency> <dependency> <groupId>org.apache.hyracks</groupId> @@ -139,7 +138,6 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.12</version> <scope>test</scope> </dependency> <dependency> 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 eea6ca3..03ebc55 100644 --- a/hyracks-fullstack/hyracks/hyracks-hdfs/hyracks-hdfs-core/pom.xml +++ b/hyracks-fullstack/hyracks/hyracks-hdfs/hyracks-hdfs-core/pom.xml @@ -187,7 +187,7 @@ <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-common</artifactId> - <version>2.2.0</version> + <version>${hadoop.version}</version> <exclusions> <exclusion> <groupId>javax.servlet.jsp</groupId> @@ -202,7 +202,7 @@ <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-mapreduce-client-core</artifactId> - <version>2.2.0</version> + <version>${hadoop.version}</version> <exclusions> <exclusion> <groupId>com.sun.jersey.jersey-test-framework</groupId> @@ -213,14 +213,14 @@ <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-hdfs</artifactId> - <version>2.2.0</version> + <version>${hadoop.version}</version> <type>jar</type> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-hdfs</artifactId> - <version>2.2.0</version> + <version>${hadoop.version}</version> <type>test-jar</type> <classifier>tests</classifier> <scope>test</scope> @@ -228,7 +228,7 @@ <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-common</artifactId> - <version>2.2.0</version> + <version>${hadoop.version}</version> <type>test-jar</type> <classifier>tests</classifier> <scope>test</scope> @@ -405,9 +405,8 @@ <scope>test</scope> </dependency> <dependency> - <groupId>org.apache.commons</groupId> + <groupId>commons-io</groupId> <artifactId>commons-io</artifactId> - <version>1.3.2</version> <scope>test</scope> </dependency> </dependencies> diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-btree/pom.xml b/hyracks-fullstack/hyracks/hyracks-storage-am-btree/pom.xml index 39409c6..390143e 100644 --- a/hyracks-fullstack/hyracks/hyracks-storage-am-btree/pom.xml +++ b/hyracks-fullstack/hyracks/hyracks-storage-am-btree/pom.xml @@ -48,29 +48,21 @@ <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-storage-common</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> - <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> - <type>jar</type> - <scope>compile</scope> </dependency> <dependency> <groupId>org.mockito</groupId> @@ -104,7 +96,6 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.12</version> <scope>test</scope> </dependency> <dependency> diff --git a/hyracks-fullstack/pom.xml b/hyracks-fullstack/pom.xml index 7390905..efad75b 100644 --- a/hyracks-fullstack/pom.xml +++ b/hyracks-fullstack/pom.xml @@ -55,16 +55,30 @@ </global.test.excludes> <!-- Versions under dependencymanagement or used in many projects via properties --> <hadoop.version>2.2.0</hadoop.version> - <junit.version>4.12</junit.version> - <commons.io.version>2.5</commons.io.version> <jacoco.version>0.7.6.201602180812</jacoco.version> + <jetty.version>9.3.11.v20160721</jetty.version> </properties> <dependencyManagement> <dependencies> <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-server</artifactId> + <version>${jetty.version}</version> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-servlet</artifactId> + <version>${jetty.version}</version> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-http</artifactId> + <version>${jetty.version}</version> + </dependency> + <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>${junit.version}</version> + <version>4.12</version> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> @@ -106,7 +120,7 @@ <dependency> <groupId>commons-io</groupId> <artifactId>commons-io</artifactId> - <version>${commons.io.version}</version> + <version>2.5</version> </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> @@ -118,6 +132,11 @@ <artifactId>jackson-core</artifactId> <version>2.8.4</version> </dependency> + <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + <version>18.0</version> + </dependency> </dependencies> </dependencyManagement> -- To view, visit https://asterix-gerrit.ics.uci.edu/1421 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3cc9d4db57b2138931baa3ef51ea569c45b79a2f Gerrit-PatchSet: 23 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Michael Blow <[email protected]> Gerrit-Reviewer: Ian Maxon <[email protected]> Gerrit-Reviewer: Jenkins <[email protected]> Gerrit-Reviewer: Michael Blow <[email protected]> Gerrit-Reviewer: Steven Jacobs <[email protected]> Gerrit-Reviewer: Till Westmann <[email protected]>
