Michael Blow has submitted this change and it was merged. Change subject: Remove Conflicting Servlet API From Install Repo ......................................................................
Remove Conflicting Servlet API From Install Repo Outdated servlet jars are getting included in repo by way of Hadoop dependencies. Refactor some test dependencies in hyracks-hdfs to live in tests, and exclude problematic dependencies in asterix-external-data Change-Id: I88795f3b805d09f83950bbf24fff0e5caed79ef4 Reviewed-on: https://asterix-gerrit.ics.uci.edu/1252 Sonar-Qube: Jenkins <[email protected]> Tested-by: Jenkins <[email protected]> Reviewed-by: Till Westmann <[email protected]> Integration-Tests: Jenkins <[email protected]> --- M asterixdb/asterix-app/pom.xml M asterixdb/asterix-external-data/pom.xml M asterixdb/asterix-installer/pom.xml M asterixdb/asterix-server/pom.xml M asterixdb/asterix-yarn/pom.xml M hyracks-fullstack/hyracks/hyracks-hdfs/hyracks-hdfs-1.x/pom.xml R hyracks-fullstack/hyracks/hyracks-hdfs/hyracks-hdfs-1.x/src/test/java/org/apache/hyracks/hdfs/MiniDFSClusterFactory.java M hyracks-fullstack/hyracks/hyracks-hdfs/hyracks-hdfs-2.x/pom.xml R hyracks-fullstack/hyracks/hyracks-hdfs/hyracks-hdfs-2.x/src/test/java/org/apache/hyracks/hdfs/MiniDFSClusterFactory.java M hyracks-fullstack/hyracks/hyracks-hdfs/hyracks-hdfs-core/pom.xml 10 files changed, 196 insertions(+), 9 deletions(-) Approvals: Till Westmann: Looks good to me, approved Jenkins: Verified; No violations found; Verified diff --git a/asterixdb/asterix-app/pom.xml b/asterixdb/asterix-app/pom.xml index cf96893..08a3d81 100644 --- a/asterixdb/asterix-app/pom.xml +++ b/asterixdb/asterix-app/pom.xml @@ -303,5 +303,19 @@ <type>test-jar</type> <scope>test</scope> </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> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-minicluster</artifactId> + <version>${hadoop.version}</version> + <type>jar</type> + <scope>test</scope> + </dependency> </dependencies> </project> diff --git a/asterixdb/asterix-external-data/pom.xml b/asterixdb/asterix-external-data/pom.xml index c3cf3c4..245f340 100644 --- a/asterixdb/asterix-external-data/pom.xml +++ b/asterixdb/asterix-external-data/pom.xml @@ -244,10 +244,26 @@ <artifactId>hadoop-client</artifactId> <type>jar</type> <scope>compile</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> diff --git a/asterixdb/asterix-installer/pom.xml b/asterixdb/asterix-installer/pom.xml index 2b849c2..b3bd196 100644 --- a/asterixdb/asterix-installer/pom.xml +++ b/asterixdb/asterix-installer/pom.xml @@ -311,5 +311,12 @@ <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> </dependencies> </project> diff --git a/asterixdb/asterix-server/pom.xml b/asterixdb/asterix-server/pom.xml index 58b0393..919cb16 100644 --- a/asterixdb/asterix-server/pom.xml +++ b/asterixdb/asterix-server/pom.xml @@ -244,5 +244,12 @@ <type>zip</type> <classifier>assembly</classifier> </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-minicluster</artifactId> + <version>${hadoop.version}</version> + <type>jar</type> + <scope>test</scope> + </dependency> </dependencies> </project> diff --git a/asterixdb/asterix-yarn/pom.xml b/asterixdb/asterix-yarn/pom.xml index a9a4a36..79b9822 100644 --- a/asterixdb/asterix-yarn/pom.xml +++ b/asterixdb/asterix-yarn/pom.xml @@ -232,5 +232,12 @@ <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> </project> diff --git a/hyracks-fullstack/hyracks/hyracks-hdfs/hyracks-hdfs-1.x/pom.xml b/hyracks-fullstack/hyracks/hyracks-hdfs/hyracks-hdfs-1.x/pom.xml index 9e8d185..254fc87 100644 --- a/hyracks-fullstack/hyracks/hyracks-hdfs/hyracks-hdfs-1.x/pom.xml +++ b/hyracks-fullstack/hyracks/hyracks-hdfs/hyracks-hdfs-1.x/pom.xml @@ -30,6 +30,23 @@ <root.dir>${basedir}/../../..</root.dir> </properties> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + <version>2.4</version> + <executions> + <execution> + <goals> + <goal>test-jar</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + <profiles> <profile> <activation> @@ -49,7 +66,7 @@ <artifactId>hadoop-test</artifactId> <version>0.20.2</version> <type>jar</type> - <scope>compile</scope> + <scope>test</scope> </dependency> </dependencies> </profile> @@ -75,14 +92,14 @@ <artifactId>hadoop-minicluster</artifactId> <version>1.0.4</version> <type>jar</type> - <scope>compile</scope> + <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-test</artifactId> <version>1.0.4</version> <type>jar</type> - <scope>compile</scope> + <scope>test</scope> </dependency> </dependencies> </profile> diff --git a/hyracks-fullstack/hyracks/hyracks-hdfs/hyracks-hdfs-1.x/src/main/java/org/apache/hyracks/hdfs/MiniDFSClusterFactory.java b/hyracks-fullstack/hyracks/hyracks-hdfs/hyracks-hdfs-1.x/src/test/java/org/apache/hyracks/hdfs/MiniDFSClusterFactory.java similarity index 100% rename from hyracks-fullstack/hyracks/hyracks-hdfs/hyracks-hdfs-1.x/src/main/java/org/apache/hyracks/hdfs/MiniDFSClusterFactory.java rename to hyracks-fullstack/hyracks/hyracks-hdfs/hyracks-hdfs-1.x/src/test/java/org/apache/hyracks/hdfs/MiniDFSClusterFactory.java diff --git a/hyracks-fullstack/hyracks/hyracks-hdfs/hyracks-hdfs-2.x/pom.xml b/hyracks-fullstack/hyracks/hyracks-hdfs/hyracks-hdfs-2.x/pom.xml index 7cca256..dbe9858 100644 --- a/hyracks-fullstack/hyracks/hyracks-hdfs/hyracks-hdfs-2.x/pom.xml +++ b/hyracks-fullstack/hyracks/hyracks-hdfs/hyracks-hdfs-2.x/pom.xml @@ -30,6 +30,23 @@ <root.dir>${basedir}/../../..</root.dir> </properties> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + <version>2.4</version> + <executions> + <execution> + <goals> + <goal>test-jar</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + <profiles> <profile> <activation> @@ -63,7 +80,7 @@ <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-minicluster</artifactId> <type>jar</type> - <scope>compile</scope> + <scope>test</scope> </dependency> </dependencies> </profile> @@ -99,7 +116,7 @@ <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-minicluster</artifactId> <type>jar</type> - <scope>compile</scope> + <scope>test</scope> </dependency> </dependencies> </profile> @@ -139,7 +156,7 @@ <artifactId>hadoop-minicluster</artifactId> <version>0.23.6</version> <type>jar</type> - <scope>compile</scope> + <scope>test</scope> </dependency> </dependencies> </profile> @@ -179,7 +196,7 @@ <artifactId>hadoop-minicluster</artifactId> <version>2.0.0-cdh4.2.0</version> <type>jar</type> - <scope>compile</scope> + <scope>test</scope> </dependency> </dependencies> </profile> @@ -219,7 +236,7 @@ <artifactId>hadoop-minicluster</artifactId> <version>2.0.0-cdh4.1.0</version> <type>jar</type> - <scope>compile</scope> + <scope>test</scope> </dependency> </dependencies> </profile> diff --git a/hyracks-fullstack/hyracks/hyracks-hdfs/hyracks-hdfs-2.x/src/main/java/org/apache/hyracks/hdfs/MiniDFSClusterFactory.java b/hyracks-fullstack/hyracks/hyracks-hdfs/hyracks-hdfs-2.x/src/test/java/org/apache/hyracks/hdfs/MiniDFSClusterFactory.java similarity index 100% rename from hyracks-fullstack/hyracks/hyracks-hdfs/hyracks-hdfs-2.x/src/main/java/org/apache/hyracks/hdfs/MiniDFSClusterFactory.java rename to hyracks-fullstack/hyracks/hyracks-hdfs/hyracks-hdfs-2.x/src/test/java/org/apache/hyracks/hdfs/MiniDFSClusterFactory.java 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 8d019d9..cf1e48d 100644 --- a/hyracks-fullstack/hyracks/hyracks-hdfs/hyracks-hdfs-core/pom.xml +++ b/hyracks-fullstack/hyracks/hyracks-hdfs/hyracks-hdfs-core/pom.xml @@ -80,6 +80,20 @@ <type>jar</type> <scope>compile</scope> </dependency> + <dependency> + <groupId>org.apache.hyracks</groupId> + <artifactId>hyracks-hdfs-1.x</artifactId> + <version>${project.version}</version> + <type>test-jar</type> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-test</artifactId> + <version>0.20.2</version> + <type>jar</type> + <scope>test</scope> + </dependency> </dependencies> </profile> <profile> @@ -99,7 +113,27 @@ <type>jar</type> <scope>compile</scope> </dependency> - </dependencies> + <dependency> + <groupId>org.apache.hyracks</groupId> + <artifactId>hyracks-hdfs-1.x</artifactId> + <version>${project.version}</version> + <type>test-jar</type> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-minicluster</artifactId> + <version>1.0.4</version> + <type>jar</type> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-test</artifactId> + <version>1.0.4</version> + <type>jar</type> + <scope>test</scope> + </dependency> </dependencies> </profile> <profile> @@ -118,6 +152,19 @@ <version>${project.version}</version> <type>jar</type> <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.hyracks</groupId> + <artifactId>hyracks-hdfs-2.x</artifactId> + <version>${project.version}</version> + <type>test-jar</type> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-minicluster</artifactId> + <type>jar</type> + <scope>test</scope> </dependency> </dependencies> </profile> @@ -138,6 +185,19 @@ <type>jar</type> <scope>compile</scope> </dependency> + <dependency> + <groupId>org.apache.hyracks</groupId> + <artifactId>hyracks-hdfs-2.x</artifactId> + <version>${project.version}</version> + <type>test-jar</type> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-minicluster</artifactId> + <type>jar</type> + <scope>test</scope> + </dependency> </dependencies> </profile> <profile> @@ -156,6 +216,20 @@ <version>${project.version}</version> <type>jar</type> <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.hyracks</groupId> + <artifactId>hyracks-hdfs-2.x</artifactId> + <version>${project.version}</version> + <type>test-jar</type> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-minicluster</artifactId> + <version>0.23.6</version> + <type>jar</type> + <scope>test</scope> </dependency> </dependencies> </profile> @@ -176,6 +250,20 @@ <type>jar</type> <scope>compile</scope> </dependency> + <dependency> + <groupId>org.apache.hyracks</groupId> + <artifactId>hyracks-hdfs-2.x</artifactId> + <version>${project.version}</version> + <type>test-jar</type> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-minicluster</artifactId> + <version>2.0.0-cdh4.1.0</version> + <type>jar</type> + <scope>test</scope> + </dependency> </dependencies> </profile> <profile> @@ -195,6 +283,20 @@ <type>jar</type> <scope>compile</scope> </dependency> + <dependency> + <groupId>org.apache.hyracks</groupId> + <artifactId>hyracks-hdfs-2.x</artifactId> + <version>${project.version}</version> + <type>test-jar</type> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-minicluster</artifactId> + <version>2.0.0-cdh4.2.0</version> + <type>jar</type> + <scope>test</scope> + </dependency> </dependencies> </profile> </profiles> -- To view, visit https://asterix-gerrit.ics.uci.edu/1252 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: merged Gerrit-Change-Id: I88795f3b805d09f83950bbf24fff0e5caed79ef4 Gerrit-PatchSet: 5 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Michael Blow <[email protected]> Gerrit-Reviewer: Jenkins <[email protected]> Gerrit-Reviewer: Michael Blow <[email protected]> Gerrit-Reviewer: Till Westmann <[email protected]>
