Ian Maxon has submitted this change and it was merged. Change subject: ASTERIXDB-1136: Make Java compiler target configurable via profile ......................................................................
ASTERIXDB-1136: Make Java compiler target configurable via profile Change-Id: I10378f9d3fdec9b4951f53c9b370b7741668e537 Reviewed-on: https://asterix-gerrit.ics.uci.edu/273 Tested-by: Jenkins <[email protected]> Reviewed-by: Till Westmann <[email protected]> --- M algebricks/algebricks-common/pom.xml M algebricks/algebricks-compiler/pom.xml M algebricks/algebricks-core/pom.xml M algebricks/algebricks-data/pom.xml M algebricks/algebricks-examples/piglet-example/pom.xml M algebricks/algebricks-rewriter/pom.xml M algebricks/algebricks-runtime/pom.xml M algebricks/algebricks-tests/pom.xml M hyracks/hyracks-api/pom.xml M hyracks/hyracks-client/pom.xml M hyracks/hyracks-comm/pom.xml M hyracks/hyracks-control/hyracks-control-cc/pom.xml M hyracks/hyracks-control/hyracks-control-common/pom.xml M hyracks/hyracks-control/hyracks-control-nc/pom.xml M hyracks/hyracks-data/hyracks-data-std/pom.xml M hyracks/hyracks-dataflow-common/pom.xml M hyracks/hyracks-dataflow-hadoop/pom.xml M hyracks/hyracks-dataflow-std/pom.xml M hyracks/hyracks-dist/pom.xml M hyracks/hyracks-examples/btree-example/btreeclient/pom.xml M hyracks/hyracks-examples/btree-example/btreehelper/pom.xml M hyracks/hyracks-examples/hyracks-integration-tests/pom.xml M hyracks/hyracks-examples/hyracks-shutdown-test/pom.xml M hyracks/hyracks-examples/text-example/textclient/pom.xml M hyracks/hyracks-examples/text-example/texthelper/pom.xml M hyracks/hyracks-examples/text-example/textserver/pom.xml M hyracks/hyracks-examples/tpch-example/tpchclient/pom.xml M hyracks/hyracks-hdfs/hyracks-hdfs-1.x/pom.xml M hyracks/hyracks-hdfs/hyracks-hdfs-2.x/pom.xml M hyracks/hyracks-hdfs/hyracks-hdfs-core/pom.xml M hyracks/hyracks-hdfs/pom.xml M hyracks/hyracks-ipc/pom.xml M hyracks/hyracks-maven-plugins/hyracks-virtualcluster-maven-plugin/pom.xml M hyracks/hyracks-net/pom.xml M hyracks/hyracks-server/pom.xml M hyracks/hyracks-storage-am-bloomfilter/pom.xml M hyracks/hyracks-storage-am-btree/pom.xml M hyracks/hyracks-storage-am-common/pom.xml M hyracks/hyracks-storage-am-lsm-btree/pom.xml M hyracks/hyracks-storage-am-lsm-common/pom.xml M hyracks/hyracks-storage-am-lsm-invertedindex/pom.xml M hyracks/hyracks-storage-am-lsm-rtree/pom.xml M hyracks/hyracks-storage-am-rtree/pom.xml M hyracks/hyracks-storage-common/pom.xml M hyracks/hyracks-test-support/pom.xml M hyracks/hyracks-tests/hyracks-storage-am-bloomfilter-test/pom.xml M hyracks/hyracks-tests/hyracks-storage-am-btree-test/pom.xml M hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/pom.xml M hyracks/hyracks-tests/hyracks-storage-am-lsm-common-test/pom.xml M hyracks/hyracks-tests/hyracks-storage-am-lsm-invertedindex-test/pom.xml M hyracks/hyracks-tests/hyracks-storage-am-lsm-rtree-test/pom.xml M hyracks/hyracks-tests/hyracks-storage-am-rtree-test/pom.xml M hyracks/hyracks-tests/hyracks-storage-common-test/pom.xml M hyracks/hyracks-yarn/hyracks-yarn-am/pom.xml M hyracks/hyracks-yarn/hyracks-yarn-client/pom.xml M hyracks/hyracks-yarn/hyracks-yarn-common/pom.xml M hyracks/pom.xml M pom.xml 58 files changed, 103 insertions(+), 717 deletions(-) Approvals: Till Westmann: Looks good to me, approved Jenkins: Verified diff --git a/algebricks/algebricks-common/pom.xml b/algebricks/algebricks-common/pom.xml index 29ad3d6..b1784e3 100644 --- a/algebricks/algebricks-common/pom.xml +++ b/algebricks/algebricks-common/pom.xml @@ -38,20 +38,7 @@ </licenses> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>2.0.2</version> - <configuration> - <source>1.7</source> - <target>1.7</target> - <fork>true</fork> - </configuration> - </plugin> - </plugins> - </build> + <dependencies> <dependency> <groupId>org.apache.hyracks</groupId> diff --git a/algebricks/algebricks-compiler/pom.xml b/algebricks/algebricks-compiler/pom.xml index e441bdd..6f847d0 100644 --- a/algebricks/algebricks-compiler/pom.xml +++ b/algebricks/algebricks-compiler/pom.xml @@ -37,21 +37,6 @@ </license> </licenses> - - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>2.0.2</version> - <configuration> - <source>1.7</source> - <target>1.7</target> - <fork>true</fork> - </configuration> - </plugin> - </plugins> - </build> <dependencies> <dependency> <groupId>org.apache.hyracks</groupId> diff --git a/algebricks/algebricks-core/pom.xml b/algebricks/algebricks-core/pom.xml index e178484..5f35481 100644 --- a/algebricks/algebricks-core/pom.xml +++ b/algebricks/algebricks-core/pom.xml @@ -37,21 +37,6 @@ </license> </licenses> - - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>2.0.2</version> - <configuration> - <source>1.7</source> - <target>1.7</target> - <fork>true</fork> - </configuration> - </plugin> - </plugins> - </build> <dependencies> <dependency> <groupId>org.apache.hyracks</groupId> diff --git a/algebricks/algebricks-data/pom.xml b/algebricks/algebricks-data/pom.xml index 4fa07fd..6fdf891 100644 --- a/algebricks/algebricks-data/pom.xml +++ b/algebricks/algebricks-data/pom.xml @@ -37,21 +37,6 @@ </license> </licenses> - - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>2.0.2</version> - <configuration> - <source>1.7</source> - <target>1.7</target> - <fork>true</fork> - </configuration> - </plugin> - </plugins> - </build> <dependencies> <dependency> <groupId>org.apache.hyracks</groupId> diff --git a/algebricks/algebricks-examples/piglet-example/pom.xml b/algebricks/algebricks-examples/piglet-example/pom.xml index 7e0b0eb..a037db5 100644 --- a/algebricks/algebricks-examples/piglet-example/pom.xml +++ b/algebricks/algebricks-examples/piglet-example/pom.xml @@ -30,16 +30,6 @@ <build> <plugins> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>2.0.2</version> - <configuration> - <source>1.7</source> - <target>1.7</target> - <fork>true</fork> - </configuration> - </plugin> - <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>javacc-maven-plugin</artifactId> <version>2.6</version> diff --git a/algebricks/algebricks-rewriter/pom.xml b/algebricks/algebricks-rewriter/pom.xml index ed658d0..b074258 100644 --- a/algebricks/algebricks-rewriter/pom.xml +++ b/algebricks/algebricks-rewriter/pom.xml @@ -38,20 +38,7 @@ </licenses> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>2.0.2</version> - <configuration> - <source>1.7</source> - <target>1.7</target> - <fork>true</fork> - </configuration> - </plugin> - </plugins> - </build> + <dependencies> <dependency> <groupId>org.apache.hyracks</groupId> diff --git a/algebricks/algebricks-runtime/pom.xml b/algebricks/algebricks-runtime/pom.xml index 920a0eb..7f81f1e 100644 --- a/algebricks/algebricks-runtime/pom.xml +++ b/algebricks/algebricks-runtime/pom.xml @@ -38,20 +38,7 @@ </licenses> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>2.0.2</version> - <configuration> - <source>1.7</source> - <target>1.7</target> - <fork>true</fork> - </configuration> - </plugin> - </plugins> - </build> + <dependencies> <dependency> <groupId>org.apache.hyracks</groupId> diff --git a/algebricks/algebricks-tests/pom.xml b/algebricks/algebricks-tests/pom.xml index 0d34303..dfa51a4 100644 --- a/algebricks/algebricks-tests/pom.xml +++ b/algebricks/algebricks-tests/pom.xml @@ -41,17 +41,6 @@ <build> <plugins> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>2.0.2</version> - <configuration> - <source>1.7</source> - <target>1.7</target> - <fork>true</fork> - <encoding>UTF-8</encoding> - </configuration> - </plugin> - <plugin> <artifactId>maven-antrun-plugin</artifactId> <executions> <execution> diff --git a/hyracks/hyracks-api/pom.xml b/hyracks/hyracks-api/pom.xml index 154de5c..dfc7e12 100644 --- a/hyracks/hyracks-api/pom.xml +++ b/hyracks/hyracks-api/pom.xml @@ -36,20 +36,7 @@ </license> </licenses> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>2.0.2</version> - <configuration> - <source>1.7</source> - <target>1.7</target> - <fork>true</fork> - </configuration> - </plugin> - </plugins> - </build> + <dependencies> <dependency> <groupId>org.json</groupId> diff --git a/hyracks/hyracks-client/pom.xml b/hyracks/hyracks-client/pom.xml index 2607c5a..445203b 100644 --- a/hyracks/hyracks-client/pom.xml +++ b/hyracks/hyracks-client/pom.xml @@ -39,15 +39,6 @@ <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>2.0.2</version> - <configuration> - <source>1.7</source> - <target>1.7</target> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-clean-plugin</artifactId> <version>2.5</version> <configuration> diff --git a/hyracks/hyracks-comm/pom.xml b/hyracks/hyracks-comm/pom.xml index 84404b3..862f2af 100644 --- a/hyracks/hyracks-comm/pom.xml +++ b/hyracks/hyracks-comm/pom.xml @@ -36,19 +36,7 @@ </license> </licenses> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>2.0.2</version> - <configuration> - <source>1.7</source> - <target>1.7</target> - </configuration> - </plugin> - </plugins> - </build> + <dependencies> <dependency> <groupId>org.apache.hyracks</groupId> diff --git a/hyracks/hyracks-control/hyracks-control-cc/pom.xml b/hyracks/hyracks-control/hyracks-control-cc/pom.xml index 09adabf..26d8e41 100644 --- a/hyracks/hyracks-control/hyracks-control-cc/pom.xml +++ b/hyracks/hyracks-control/hyracks-control-cc/pom.xml @@ -27,20 +27,7 @@ <version>0.2.17-SNAPSHOT</version> </parent> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>2.0.2</version> - <configuration> - <source>1.7</source> - <target>1.7</target> - <fork>true</fork> - </configuration> - </plugin> - </plugins> - </build> + <dependencies> <dependency> <groupId>org.apache.hyracks</groupId> diff --git a/hyracks/hyracks-control/hyracks-control-common/pom.xml b/hyracks/hyracks-control/hyracks-control-common/pom.xml index 46395e4..d3c9912 100644 --- a/hyracks/hyracks-control/hyracks-control-common/pom.xml +++ b/hyracks/hyracks-control/hyracks-control-common/pom.xml @@ -16,7 +16,6 @@ ! specific language governing permissions and limitations ! under the License. !--> - <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> <modelVersion>4.0.0</modelVersion> <artifactId>hyracks-control-common</artifactId> @@ -28,20 +27,7 @@ <version>0.2.17-SNAPSHOT</version> </parent> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>2.0.2</version> - <configuration> - <source>1.7</source> - <target>1.7</target> - <fork>true</fork> - </configuration> - </plugin> - </plugins> - </build> + <dependencies> <dependency> <groupId>org.apache.hyracks</groupId> diff --git a/hyracks/hyracks-control/hyracks-control-nc/pom.xml b/hyracks/hyracks-control/hyracks-control-nc/pom.xml index 55f326e..56d7110 100644 --- a/hyracks/hyracks-control/hyracks-control-nc/pom.xml +++ b/hyracks/hyracks-control/hyracks-control-nc/pom.xml @@ -27,20 +27,7 @@ <version>0.2.17-SNAPSHOT</version> </parent> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>2.0.2</version> - <configuration> - <source>1.7</source> - <target>1.7</target> - <fork>true</fork> - </configuration> - </plugin> - </plugins> - </build> + <dependencies> <dependency> <groupId>org.apache.hyracks</groupId> diff --git a/hyracks/hyracks-data/hyracks-data-std/pom.xml b/hyracks/hyracks-data/hyracks-data-std/pom.xml index 3d8665f..8546bdb 100644 --- a/hyracks/hyracks-data/hyracks-data-std/pom.xml +++ b/hyracks/hyracks-data/hyracks-data-std/pom.xml @@ -28,20 +28,7 @@ <version>0.2.17-SNAPSHOT</version> </parent> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>2.0.2</version> - <configuration> - <source>1.7</source> - <target>1.7</target> - <fork>true</fork> - </configuration> - </plugin> - </plugins> - </build> + <dependencies> <dependency> <groupId>org.apache.hyracks</groupId> diff --git a/hyracks/hyracks-dataflow-common/pom.xml b/hyracks/hyracks-dataflow-common/pom.xml index 71e1be9..c6e85cd 100644 --- a/hyracks/hyracks-dataflow-common/pom.xml +++ b/hyracks/hyracks-dataflow-common/pom.xml @@ -36,20 +36,7 @@ </license> </licenses> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>2.0.2</version> - <configuration> - <source>1.7</source> - <target>1.7</target> - <fork>true</fork> - </configuration> - </plugin> - </plugins> - </build> + <dependencies> <dependency> <groupId>org.apache.hyracks</groupId> diff --git a/hyracks/hyracks-dataflow-hadoop/pom.xml b/hyracks/hyracks-dataflow-hadoop/pom.xml index 32152a9..805f993 100644 --- a/hyracks/hyracks-dataflow-hadoop/pom.xml +++ b/hyracks/hyracks-dataflow-hadoop/pom.xml @@ -38,19 +38,7 @@ </licenses> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>2.0.2</version> - <configuration> - <source>1.7</source> - <target>1.7</target> - </configuration> - </plugin> - </plugins> - </build> + <dependencies> <dependency> <groupId>org.apache.hyracks</groupId> diff --git a/hyracks/hyracks-dataflow-std/pom.xml b/hyracks/hyracks-dataflow-std/pom.xml index 5ed986d..949ea38 100644 --- a/hyracks/hyracks-dataflow-std/pom.xml +++ b/hyracks/hyracks-dataflow-std/pom.xml @@ -38,20 +38,7 @@ </licenses> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>2.0.2</version> - <configuration> - <source>1.7</source> - <target>1.7</target> - <fork>true</fork> - </configuration> - </plugin> - </plugins> - </build> + <dependencies> <dependency> <groupId>org.apache.hyracks</groupId> diff --git a/hyracks/hyracks-dist/pom.xml b/hyracks/hyracks-dist/pom.xml index 4b46fdf..0d79370 100755 --- a/hyracks/hyracks-dist/pom.xml +++ b/hyracks/hyracks-dist/pom.xml @@ -1,4 +1,3 @@ -<?xml version="1.0" encoding="UTF-8"?> <!-- ! Licensed to the Apache Software Foundation (ASF) under one ! or more contributor license agreements. See the NOTICE file @@ -46,21 +45,11 @@ <build> <plugins> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>2.0.2</version> - <configuration> - <source>1.7</source> - <target>1.7</target> - </configuration> - </plugin> - <plugin> <artifactId>maven-resources-plugin</artifactId> <version>2.5</version> <executions> <execution> <id>copy-scripts</id> - <!-- here the phase you need --> <phase>package</phase> <goals> <goal>copy-resources</goal> diff --git a/hyracks/hyracks-examples/btree-example/btreeclient/pom.xml b/hyracks/hyracks-examples/btree-example/btreeclient/pom.xml index fa5a015..c6bc25b 100644 --- a/hyracks/hyracks-examples/btree-example/btreeclient/pom.xml +++ b/hyracks/hyracks-examples/btree-example/btreeclient/pom.xml @@ -52,16 +52,6 @@ <build> <plugins> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>2.0.2</version> - <configuration> - <source>1.7</source> - <target>1.7</target> - <fork>true</fork> - </configuration> - </plugin> - <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>appassembler-maven-plugin</artifactId> <version>1.3</version> diff --git a/hyracks/hyracks-examples/btree-example/btreehelper/pom.xml b/hyracks/hyracks-examples/btree-example/btreehelper/pom.xml index a248c96..2aa1501 100644 --- a/hyracks/hyracks-examples/btree-example/btreehelper/pom.xml +++ b/hyracks/hyracks-examples/btree-example/btreehelper/pom.xml @@ -53,18 +53,5 @@ <version>0.2.17-SNAPSHOT</version> </dependency> </dependencies> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>2.0.2</version> - <configuration> - <source>1.7</source> - <target>1.7</target> - <fork>true</fork> - </configuration> - </plugin> - </plugins> - </build> + </project> diff --git a/hyracks/hyracks-examples/hyracks-integration-tests/pom.xml b/hyracks/hyracks-examples/hyracks-integration-tests/pom.xml index 5f49dd5..50060d0 100644 --- a/hyracks/hyracks-examples/hyracks-integration-tests/pom.xml +++ b/hyracks/hyracks-examples/hyracks-integration-tests/pom.xml @@ -27,19 +27,7 @@ <artifactId>hyracks-examples</artifactId> <version>0.2.17-SNAPSHOT</version> </parent> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>2.0.2</version> - <configuration> - <source>1.7</source> - <target>1.7</target> - </configuration> - </plugin> - </plugins> - </build> + <dependencies> <dependency> <groupId>org.apache.hyracks</groupId> diff --git a/hyracks/hyracks-examples/hyracks-shutdown-test/pom.xml b/hyracks/hyracks-examples/hyracks-shutdown-test/pom.xml index 14ceabb..31ea235 100644 --- a/hyracks/hyracks-examples/hyracks-shutdown-test/pom.xml +++ b/hyracks/hyracks-examples/hyracks-shutdown-test/pom.xml @@ -127,15 +127,6 @@ </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>2.0.2</version> - <configuration> - <source>1.6</source> - <target>1.6</target> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-failsafe-plugin</artifactId> <version>2.8.1</version> <executions> @@ -152,7 +143,6 @@ </build> <dependencies> <dependency> - <!-- Dependency management inherited from top-level hyracks --> <groupId>junit</groupId> <artifactId>junit</artifactId> </dependency> diff --git a/hyracks/hyracks-examples/text-example/textclient/pom.xml b/hyracks/hyracks-examples/text-example/textclient/pom.xml index 4304414..3bf69e2 100644 --- a/hyracks/hyracks-examples/text-example/textclient/pom.xml +++ b/hyracks/hyracks-examples/text-example/textclient/pom.xml @@ -46,16 +46,6 @@ <build> <plugins> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>2.0.2</version> - <configuration> - <source>1.7</source> - <target>1.7</target> - <fork>true</fork> - </configuration> - </plugin> - <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>appassembler-maven-plugin</artifactId> <version>1.3</version> diff --git a/hyracks/hyracks-examples/text-example/texthelper/pom.xml b/hyracks/hyracks-examples/text-example/texthelper/pom.xml index 6101f67..7da4977 100644 --- a/hyracks/hyracks-examples/text-example/texthelper/pom.xml +++ b/hyracks/hyracks-examples/text-example/texthelper/pom.xml @@ -47,18 +47,5 @@ <version>0.2.17-SNAPSHOT</version> </dependency> </dependencies> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>2.0.2</version> - <configuration> - <source>1.7</source> - <target>1.7</target> - <fork>true</fork> - </configuration> - </plugin> - </plugins> - </build> + </project> diff --git a/hyracks/hyracks-examples/text-example/textserver/pom.xml b/hyracks/hyracks-examples/text-example/textserver/pom.xml index f116638..c669f22 100644 --- a/hyracks/hyracks-examples/text-example/textserver/pom.xml +++ b/hyracks/hyracks-examples/text-example/textserver/pom.xml @@ -126,15 +126,6 @@ </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>2.0.2</version> - <configuration> - <source>1.6</source> - <target>1.6</target> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-failsafe-plugin</artifactId> <version>2.8.1</version> <executions> @@ -151,7 +142,6 @@ </build> <dependencies> <dependency> - <!-- Dependency management inherited from top-level hyracks --> <groupId>junit</groupId> <artifactId>junit</artifactId> </dependency> diff --git a/hyracks/hyracks-examples/tpch-example/tpchclient/pom.xml b/hyracks/hyracks-examples/tpch-example/tpchclient/pom.xml index ddcc983..cd45536 100644 --- a/hyracks/hyracks-examples/tpch-example/tpchclient/pom.xml +++ b/hyracks/hyracks-examples/tpch-example/tpchclient/pom.xml @@ -43,16 +43,6 @@ <build> <plugins> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>2.0.2</version> - <configuration> - <source>1.7</source> - <target>1.7</target> - <fork>true</fork> - </configuration> - </plugin> - <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>appassembler-maven-plugin</artifactId> <version>1.3</version> diff --git a/hyracks/hyracks-hdfs/hyracks-hdfs-1.x/pom.xml b/hyracks/hyracks-hdfs/hyracks-hdfs-1.x/pom.xml index 3ba806e..b484049 100644 --- a/hyracks/hyracks-hdfs/hyracks-hdfs-1.x/pom.xml +++ b/hyracks/hyracks-hdfs/hyracks-hdfs-1.x/pom.xml @@ -1,4 +1,3 @@ -<?xml version="1.0"?> <!-- ! Licensed to the Apache Software Foundation (ASF) under one ! or more contributor license agreements. See the NOTICE file @@ -28,20 +27,7 @@ <version>0.2.17-SNAPSHOT</version> </parent> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>2.0.2</version> - <configuration> - <source>1.7</source> - <target>1.7</target> - <fork>true</fork> - </configuration> - </plugin> - </plugins> - </build> + <profiles> <profile> diff --git a/hyracks/hyracks-hdfs/hyracks-hdfs-2.x/pom.xml b/hyracks/hyracks-hdfs/hyracks-hdfs-2.x/pom.xml index 1ec9c85..87cd2b4 100644 --- a/hyracks/hyracks-hdfs/hyracks-hdfs-2.x/pom.xml +++ b/hyracks/hyracks-hdfs/hyracks-hdfs-2.x/pom.xml @@ -1,4 +1,3 @@ -<?xml version="1.0"?> <!-- ! Licensed to the Apache Software Foundation (ASF) under one ! or more contributor license agreements. See the NOTICE file @@ -27,20 +26,6 @@ <groupId>org.apache.hyracks</groupId> <version>0.2.17-SNAPSHOT</version> </parent> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>2.0.2</version> - <configuration> - <source>1.7</source> - <target>1.7</target> - <fork>true</fork> - </configuration> - </plugin> - </plugins> - </build> <profiles> <profile> diff --git a/hyracks/hyracks-hdfs/hyracks-hdfs-core/pom.xml b/hyracks/hyracks-hdfs/hyracks-hdfs-core/pom.xml index 170ef5b..9365359 100644 --- a/hyracks/hyracks-hdfs/hyracks-hdfs-core/pom.xml +++ b/hyracks/hyracks-hdfs/hyracks-hdfs-core/pom.xml @@ -31,16 +31,6 @@ <build> <plugins> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>2.0.2</version> - <configuration> - <source>1.7</source> - <target>1.7</target> - <fork>true</fork> - </configuration> - </plugin> - <plugin> <artifactId>maven-clean-plugin</artifactId> <version>2.5</version> <configuration> diff --git a/hyracks/hyracks-hdfs/pom.xml b/hyracks/hyracks-hdfs/pom.xml index 1bfafbb..e08e0cd 100644 --- a/hyracks/hyracks-hdfs/pom.xml +++ b/hyracks/hyracks-hdfs/pom.xml @@ -1,4 +1,3 @@ -<?xml version="1.0" encoding="UTF-8"?> <!-- ! Licensed to the Apache Software Foundation (ASF) under one ! or more contributor license agreements. See the NOTICE file diff --git a/hyracks/hyracks-ipc/pom.xml b/hyracks/hyracks-ipc/pom.xml index 3ee9653..3fc6013 100644 --- a/hyracks/hyracks-ipc/pom.xml +++ b/hyracks/hyracks-ipc/pom.xml @@ -37,23 +37,9 @@ </licenses> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>2.0.2</version> - <configuration> - <source>1.7</source> - <target>1.7</target> - <fork>true</fork> - </configuration> - </plugin> - </plugins> - </build> + <dependencies> <dependency> - <!-- Dependency management inherited from top-level hyracks --> <groupId>junit</groupId> <artifactId>junit</artifactId> </dependency> diff --git a/hyracks/hyracks-maven-plugins/hyracks-virtualcluster-maven-plugin/pom.xml b/hyracks/hyracks-maven-plugins/hyracks-virtualcluster-maven-plugin/pom.xml index 1a8c356..853aea7 100644 --- a/hyracks/hyracks-maven-plugins/hyracks-virtualcluster-maven-plugin/pom.xml +++ b/hyracks/hyracks-maven-plugins/hyracks-virtualcluster-maven-plugin/pom.xml @@ -29,18 +29,5 @@ <version>0.2.17-SNAPSHOT</version> </parent> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>2.0.2</version> - <configuration> - <source>1.7</source> - <target>1.7</target> - <fork>true</fork> - </configuration> - </plugin> - </plugins> - </build> + </project> diff --git a/hyracks/hyracks-net/pom.xml b/hyracks/hyracks-net/pom.xml index c5e7f6b..ee5774f 100644 --- a/hyracks/hyracks-net/pom.xml +++ b/hyracks/hyracks-net/pom.xml @@ -37,23 +37,9 @@ </licenses> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>2.0.2</version> - <configuration> - <source>1.7</source> - <target>1.7</target> - <fork>true</fork> - </configuration> - </plugin> - </plugins> - </build> + <dependencies> <dependency> - <!-- Dependency management inherited from top-level hyracks --> <groupId>junit</groupId> <artifactId>junit</artifactId> </dependency> diff --git a/hyracks/hyracks-server/pom.xml b/hyracks/hyracks-server/pom.xml index 4453c7c..4eae63f 100644 --- a/hyracks/hyracks-server/pom.xml +++ b/hyracks/hyracks-server/pom.xml @@ -40,16 +40,6 @@ <build> <plugins> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>2.0.2</version> - <configuration> - <source>1.7</source> - <target>1.7</target> - <fork>true</fork> - </configuration> - </plugin> - <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>appassembler-maven-plugin</artifactId> <version>1.3</version> diff --git a/hyracks/hyracks-storage-am-bloomfilter/pom.xml b/hyracks/hyracks-storage-am-bloomfilter/pom.xml index 425dd76..a704a66 100644 --- a/hyracks/hyracks-storage-am-bloomfilter/pom.xml +++ b/hyracks/hyracks-storage-am-bloomfilter/pom.xml @@ -37,19 +37,7 @@ </licenses> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>2.0.2</version> - <configuration> - <source>1.7</source> - <target>1.7</target> - </configuration> - </plugin> - </plugins> - </build> + <dependencies> <dependency> <groupId>org.apache.hyracks</groupId> diff --git a/hyracks/hyracks-storage-am-btree/pom.xml b/hyracks/hyracks-storage-am-btree/pom.xml index e9db163..cf14c3b 100644 --- a/hyracks/hyracks-storage-am-btree/pom.xml +++ b/hyracks/hyracks-storage-am-btree/pom.xml @@ -38,20 +38,7 @@ </licenses> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>2.0.2</version> - <configuration> - <source>1.7</source> - <target>1.7</target> - <fork>true</fork> - </configuration> - </plugin> - </plugins> - </build> + <dependencies> <dependency> <groupId>org.apache.hyracks</groupId> diff --git a/hyracks/hyracks-storage-am-common/pom.xml b/hyracks/hyracks-storage-am-common/pom.xml index 3082815..727da41 100644 --- a/hyracks/hyracks-storage-am-common/pom.xml +++ b/hyracks/hyracks-storage-am-common/pom.xml @@ -38,20 +38,7 @@ </licenses> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>2.0.2</version> - <configuration> - <source>1.7</source> - <target>1.7</target> - <fork>true</fork> - </configuration> - </plugin> - </plugins> - </build> + <dependencies> <dependency> <groupId>org.apache.hyracks</groupId> diff --git a/hyracks/hyracks-storage-am-lsm-btree/pom.xml b/hyracks/hyracks-storage-am-lsm-btree/pom.xml index a7842f6..cc4e697 100644 --- a/hyracks/hyracks-storage-am-lsm-btree/pom.xml +++ b/hyracks/hyracks-storage-am-lsm-btree/pom.xml @@ -37,19 +37,7 @@ </licenses> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>2.0.2</version> - <configuration> - <source>1.7</source> - <target>1.7</target> - </configuration> - </plugin> - </plugins> - </build> + <dependencies> <dependency> <groupId>org.apache.hyracks</groupId> diff --git a/hyracks/hyracks-storage-am-lsm-common/pom.xml b/hyracks/hyracks-storage-am-lsm-common/pom.xml index d879c53..bf6fc5b 100644 --- a/hyracks/hyracks-storage-am-lsm-common/pom.xml +++ b/hyracks/hyracks-storage-am-lsm-common/pom.xml @@ -37,19 +37,7 @@ </licenses> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>2.0.2</version> - <configuration> - <source>1.7</source> - <target>1.7</target> - </configuration> - </plugin> - </plugins> - </build> + <dependencies> <dependency> <groupId>org.apache.hyracks</groupId> diff --git a/hyracks/hyracks-storage-am-lsm-invertedindex/pom.xml b/hyracks/hyracks-storage-am-lsm-invertedindex/pom.xml index 34e6122..af70253 100644 --- a/hyracks/hyracks-storage-am-lsm-invertedindex/pom.xml +++ b/hyracks/hyracks-storage-am-lsm-invertedindex/pom.xml @@ -37,19 +37,7 @@ </license> </licenses> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>2.0.2</version> - <configuration> - <source>1.7</source> - <target>1.7</target> - </configuration> - </plugin> - </plugins> - </build> + <dependencies> <dependency> <groupId>org.apache.hyracks</groupId> diff --git a/hyracks/hyracks-storage-am-lsm-rtree/pom.xml b/hyracks/hyracks-storage-am-lsm-rtree/pom.xml index 0de2d02..e1c09c0 100644 --- a/hyracks/hyracks-storage-am-lsm-rtree/pom.xml +++ b/hyracks/hyracks-storage-am-lsm-rtree/pom.xml @@ -36,19 +36,7 @@ </license> </licenses> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>2.0.2</version> - <configuration> - <source>1.7</source> - <target>1.7</target> - </configuration> - </plugin> - </plugins> - </build> + <dependencies> <dependency> <groupId>org.apache.hyracks</groupId> diff --git a/hyracks/hyracks-storage-am-rtree/pom.xml b/hyracks/hyracks-storage-am-rtree/pom.xml index bd802cd..37c322e 100644 --- a/hyracks/hyracks-storage-am-rtree/pom.xml +++ b/hyracks/hyracks-storage-am-rtree/pom.xml @@ -37,20 +37,7 @@ </license> </licenses> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>2.0.2</version> - <configuration> - <source>1.7</source> - <target>1.7</target> - <fork>true</fork> - </configuration> - </plugin> - </plugins> - </build> + <dependencies> <dependency> <groupId>org.apache.hyracks</groupId> diff --git a/hyracks/hyracks-storage-common/pom.xml b/hyracks/hyracks-storage-common/pom.xml index e970772..8d558e4 100644 --- a/hyracks/hyracks-storage-common/pom.xml +++ b/hyracks/hyracks-storage-common/pom.xml @@ -37,20 +37,7 @@ </license> </licenses> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>2.0.2</version> - <configuration> - <source>1.7</source> - <target>1.7</target> - <fork>true</fork> - </configuration> - </plugin> - </plugins> - </build> + <dependencies> <dependency> <groupId>org.apache.hyracks</groupId> diff --git a/hyracks/hyracks-test-support/pom.xml b/hyracks/hyracks-test-support/pom.xml index 493e428..f0ec043 100644 --- a/hyracks/hyracks-test-support/pom.xml +++ b/hyracks/hyracks-test-support/pom.xml @@ -37,23 +37,9 @@ </license> </licenses> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>2.0.2</version> - <configuration> - <source>1.7</source> - <target>1.7</target> - <fork>true</fork> - </configuration> - </plugin> - </plugins> - </build> + <dependencies> <dependency> - <!-- Dependency management inherited from top-level hyracks --> <groupId>junit</groupId> <artifactId>junit</artifactId> </dependency> diff --git a/hyracks/hyracks-tests/hyracks-storage-am-bloomfilter-test/pom.xml b/hyracks/hyracks-tests/hyracks-storage-am-bloomfilter-test/pom.xml index 05da1ad..8147640 100644 --- a/hyracks/hyracks-tests/hyracks-storage-am-bloomfilter-test/pom.xml +++ b/hyracks/hyracks-tests/hyracks-storage-am-bloomfilter-test/pom.xml @@ -27,19 +27,7 @@ <version>0.2.17-SNAPSHOT</version> </parent> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>2.0.2</version> - <configuration> - <source>1.7</source> - <target>1.7</target> - </configuration> - </plugin> - </plugins> - </build> + <dependencies> <dependency> <groupId>org.apache.hyracks</groupId> diff --git a/hyracks/hyracks-tests/hyracks-storage-am-btree-test/pom.xml b/hyracks/hyracks-tests/hyracks-storage-am-btree-test/pom.xml index 6e38949..de5b47f 100644 --- a/hyracks/hyracks-tests/hyracks-storage-am-btree-test/pom.xml +++ b/hyracks/hyracks-tests/hyracks-storage-am-btree-test/pom.xml @@ -28,20 +28,7 @@ <version>0.2.17-SNAPSHOT</version> </parent> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>2.0.2</version> - <configuration> - <source>1.7</source> - <target>1.7</target> - <fork>true</fork> - </configuration> - </plugin> - </plugins> - </build> + <dependencies> <dependency> <groupId>org.apache.hyracks</groupId> diff --git a/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/pom.xml b/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/pom.xml index 1209f9a..35de199 100644 --- a/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/pom.xml +++ b/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/pom.xml @@ -27,19 +27,7 @@ <version>0.2.17-SNAPSHOT</version> </parent> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>2.0.2</version> - <configuration> - <source>1.7</source> - <target>1.7</target> - </configuration> - </plugin> - </plugins> - </build> + <dependencies> <dependency> <groupId>org.apache.hyracks</groupId> diff --git a/hyracks/hyracks-tests/hyracks-storage-am-lsm-common-test/pom.xml b/hyracks/hyracks-tests/hyracks-storage-am-lsm-common-test/pom.xml index 13563d2..7b0778c 100644 --- a/hyracks/hyracks-tests/hyracks-storage-am-lsm-common-test/pom.xml +++ b/hyracks/hyracks-tests/hyracks-storage-am-lsm-common-test/pom.xml @@ -27,19 +27,7 @@ <version>0.2.17-SNAPSHOT</version> </parent> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>2.0.2</version> - <configuration> - <source>1.7</source> - <target>1.7</target> - </configuration> - </plugin> - </plugins> - </build> + <dependencies> <dependency> <groupId>org.apache.hyracks</groupId> diff --git a/hyracks/hyracks-tests/hyracks-storage-am-lsm-invertedindex-test/pom.xml b/hyracks/hyracks-tests/hyracks-storage-am-lsm-invertedindex-test/pom.xml index 7e1a999..f2896cb 100644 --- a/hyracks/hyracks-tests/hyracks-storage-am-lsm-invertedindex-test/pom.xml +++ b/hyracks/hyracks-tests/hyracks-storage-am-lsm-invertedindex-test/pom.xml @@ -28,19 +28,7 @@ <relativePath>..</relativePath> </parent> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>2.0.2</version> - <configuration> - <source>1.7</source> - <target>1.7</target> - </configuration> - </plugin> - </plugins> - </build> + <dependencies> <dependency> <groupId>org.apache.hyracks</groupId> @@ -65,4 +53,4 @@ </dependency> </dependencies> -</project> \ No newline at end of file +</project> diff --git a/hyracks/hyracks-tests/hyracks-storage-am-lsm-rtree-test/pom.xml b/hyracks/hyracks-tests/hyracks-storage-am-lsm-rtree-test/pom.xml index 91d247f..d77d838 100644 --- a/hyracks/hyracks-tests/hyracks-storage-am-lsm-rtree-test/pom.xml +++ b/hyracks/hyracks-tests/hyracks-storage-am-lsm-rtree-test/pom.xml @@ -27,19 +27,7 @@ <version>0.2.17-SNAPSHOT</version> </parent> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>2.0.2</version> - <configuration> - <source>1.7</source> - <target>1.7</target> - </configuration> - </plugin> - </plugins> - </build> + <dependencies> <dependency> <groupId>org.apache.hyracks</groupId> diff --git a/hyracks/hyracks-tests/hyracks-storage-am-rtree-test/pom.xml b/hyracks/hyracks-tests/hyracks-storage-am-rtree-test/pom.xml index 682cbe4..18f9e9e 100644 --- a/hyracks/hyracks-tests/hyracks-storage-am-rtree-test/pom.xml +++ b/hyracks/hyracks-tests/hyracks-storage-am-rtree-test/pom.xml @@ -28,20 +28,7 @@ <version>0.2.17-SNAPSHOT</version> </parent> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>2.0.2</version> - <configuration> - <source>1.7</source> - <target>1.7</target> - <fork>true</fork> - </configuration> - </plugin> - </plugins> - </build> + <dependencies> <dependency> <groupId>org.apache.hyracks</groupId> diff --git a/hyracks/hyracks-tests/hyracks-storage-common-test/pom.xml b/hyracks/hyracks-tests/hyracks-storage-common-test/pom.xml index 119c972..fcfed4f 100644 --- a/hyracks/hyracks-tests/hyracks-storage-common-test/pom.xml +++ b/hyracks/hyracks-tests/hyracks-storage-common-test/pom.xml @@ -28,20 +28,7 @@ <version>0.2.17-SNAPSHOT</version> </parent> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>2.0.2</version> - <configuration> - <source>1.7</source> - <target>1.7</target> - <fork>true</fork> - </configuration> - </plugin> - </plugins> - </build> + <dependencies> <dependency> <groupId>org.apache.hyracks</groupId> diff --git a/hyracks/hyracks-yarn/hyracks-yarn-am/pom.xml b/hyracks/hyracks-yarn/hyracks-yarn-am/pom.xml index c695e41..de38d2e 100644 --- a/hyracks/hyracks-yarn/hyracks-yarn-am/pom.xml +++ b/hyracks/hyracks-yarn/hyracks-yarn-am/pom.xml @@ -29,15 +29,6 @@ <build> <plugins> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>2.0.2</version> - <configuration> - <source>1.7</source> - <target>1.7</target> - </configuration> - </plugin> - <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>appassembler-maven-plugin</artifactId> <executions> diff --git a/hyracks/hyracks-yarn/hyracks-yarn-client/pom.xml b/hyracks/hyracks-yarn/hyracks-yarn-client/pom.xml index b4015bc..55c682e 100644 --- a/hyracks/hyracks-yarn/hyracks-yarn-client/pom.xml +++ b/hyracks/hyracks-yarn/hyracks-yarn-client/pom.xml @@ -29,15 +29,6 @@ <build> <plugins> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>2.0.2</version> - <configuration> - <source>1.7</source> - <target>1.7</target> - </configuration> - </plugin> - <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>appassembler-maven-plugin</artifactId> <executions> diff --git a/hyracks/hyracks-yarn/hyracks-yarn-common/pom.xml b/hyracks/hyracks-yarn/hyracks-yarn-common/pom.xml index 2dae061..b018477 100644 --- a/hyracks/hyracks-yarn/hyracks-yarn-common/pom.xml +++ b/hyracks/hyracks-yarn/hyracks-yarn-common/pom.xml @@ -26,19 +26,7 @@ <version>0.2.1-SNAPSHOT</version> </parent> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>2.0.2</version> - <configuration> - <source>1.7</source> - <target>1.7</target> - </configuration> - </plugin> - </plugins> - </build> + <dependencies> <dependency> <groupId>org.apache.hadoop</groupId> diff --git a/hyracks/pom.xml b/hyracks/pom.xml index 6ed530a..86b1551 100644 --- a/hyracks/pom.xml +++ b/hyracks/pom.xml @@ -1,4 +1,3 @@ -<?xml version="1.0" encoding="UTF-8"?> <!-- ! Licensed to the Apache Software Foundation (ASF) under one ! or more contributor license agreements. See the NOTICE file @@ -96,6 +95,5 @@ <module>hyracks-maven-plugins</module> <module>hyracks-hdfs</module> <module>hyracks-dist</module> - <!--module>hyracks-yarn</module --> </modules> </project> diff --git a/pom.xml b/pom.xml index 8e4aeec..8f00aac 100644 --- a/pom.xml +++ b/pom.xml @@ -46,6 +46,7 @@ <jvm.extraargs /> <!-- Definition of tests in various categories which may be excluded --> <hanging.pregelix.tests>**/pregelix/**/FailureRecovery*.java</hanging.pregelix.tests> + <jdk.version>1.8</jdk.version> <hivesterix.perf.tests>**/hivesterix/perf/PerfTestSuite.java</hivesterix.perf.tests> <global.test.includes>**/*TestSuite.java,**/*Test.java</global.test.includes> <global.test.excludes>**/Abstract*.java,${hanging.pregelix.tests},${hivesterix.perf.tests}</global.test.excludes> @@ -190,7 +191,42 @@ <excludes> <exclude>${global.test.excludes},${test.excludes}</exclude> </excludes> - </configuration> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-assembly-plugin</artifactId> + <!-- We override the configuration plugin to override the descriptor to use for building + the source release zip. Specifically, we would like to control the inclusions/exclusions. + For example, we exclude the KEYS file from the zip --> + <executions> + <execution> + <!-- Use this id to match the id mentioned in the assembly plugin configuration in + the apache parent POM under the apache-release profile --> + <id>source-release-assembly</id> + <phase>package</phase> + <goals> + <goal>single</goal> + </goals> + <!-- combine.self should be override to replace the configuration in the parent POM --> + <configuration combine.self="override"> + <runOnlyAtExecutionRoot>true</runOnlyAtExecutionRoot> + <descriptors> + <descriptor>src/main/assembly/source.xml</descriptor> + </descriptors> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <version>3.1</version> + <configuration> + <source>${jdk.version}</source> + <target>${jdk.version}</target> + <compilerArgument>-Xlint:all</compilerArgument> + </configuration> </plugin> </plugins> </build> @@ -242,6 +278,33 @@ </plugins> </build> </profile> + <profile> + <id>java6</id> + <activation> + <jdk>1.6</jdk> + </activation> + <properties> + <jdk.version>1.6</jdk.version> + </properties> + </profile> + <profile> + <id>java7</id> + <activation> + <jdk>1.7</jdk> + </activation> + <properties> + <jdk.version>1.7</jdk.version> + </properties> + </profile> + <profile> + <id>java8</id> + <activation> + <jdk>1.8</jdk> + </activation> + <properties> + <jdk.version>1.8</jdk.version> + </properties> + </profile> </profiles> <repositories> -- To view, visit https://asterix-gerrit.ics.uci.edu/273 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: merged Gerrit-Change-Id: I10378f9d3fdec9b4951f53c9b370b7741668e537 Gerrit-PatchSet: 8 Gerrit-Project: hyracks Gerrit-Branch: master Gerrit-Owner: Ian Maxon <[email protected]> Gerrit-Reviewer: Ian Maxon <[email protected]> Gerrit-Reviewer: Jenkins <[email protected]> Gerrit-Reviewer: Till Westmann <[email protected]>
