Repository: asterixdb Updated Branches: refs/heads/master 0f4a25b20 -> 65da60c85
update maven-compile-plugin to 3.6.1 - also fix dependencies for asterix-experiments Change-Id: I744d3e479ce238a9d1e5ae283be2113bd014353c Reviewed-on: https://asterix-gerrit.ics.uci.edu/1520 Reviewed-by: Michael Blow <[email protected]> Sonar-Qube: Jenkins <[email protected]> Tested-by: Jenkins <[email protected]> Integration-Tests: Jenkins <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/asterixdb/repo Commit: http://git-wip-us.apache.org/repos/asf/asterixdb/commit/65da60c8 Tree: http://git-wip-us.apache.org/repos/asf/asterixdb/tree/65da60c8 Diff: http://git-wip-us.apache.org/repos/asf/asterixdb/diff/65da60c8 Branch: refs/heads/master Commit: 65da60c85c3fb6a8f2a138cd4327a0f4ad7d4f6c Parents: 0f4a25b Author: Till Westmann <[email protected]> Authored: Wed Feb 22 13:17:49 2017 -0800 Committer: Till Westmann <[email protected]> Committed: Wed Feb 22 16:31:01 2017 -0800 ---------------------------------------------------------------------- asterixdb/asterix-experiments/pom.xml | 61 ++++++-------------- asterixdb/asterix-yarn/pom.xml | 10 ---- asterixdb/pom.xml | 6 +- .../hyracks-control/hyracks-nc-service/pom.xml | 15 ----- hyracks-fullstack/pom.xml | 6 +- 5 files changed, 29 insertions(+), 69 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/asterixdb/blob/65da60c8/asterixdb/asterix-experiments/pom.xml ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-experiments/pom.xml b/asterixdb/asterix-experiments/pom.xml index b03aa9b..80a00fa 100644 --- a/asterixdb/asterix-experiments/pom.xml +++ b/asterixdb/asterix-experiments/pom.xml @@ -24,16 +24,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.0</version> @@ -98,70 +88,57 @@ <dependencies> <dependency> - <groupId>org.apache.asterix</groupId> - <artifactId>asterix-lang-common</artifactId> - <version>${project.version}</version> - <scope>compile</scope> + <groupId>org.apache.hyracks</groupId> + <artifactId>hyracks-api</artifactId> </dependency> <dependency> - <groupId>org.apache.asterix</groupId> - <artifactId>asterix-lang-aql</artifactId> - <version>${project.version}</version> - <scope>compile</scope> + <groupId>org.apache.hyracks</groupId> + <artifactId>hyracks-control-cc</artifactId> </dependency> <dependency> <groupId>org.apache.asterix</groupId> - <artifactId>asterix-algebra</artifactId> + <artifactId>asterix-common</artifactId> <version>${project.version}</version> - <scope>compile</scope> </dependency> <dependency> <groupId>org.apache.asterix</groupId> - <artifactId>asterix-external-data</artifactId> + <artifactId>asterix-app</artifactId> <version>${project.version}</version> - <scope>compile</scope> </dependency> <dependency> <groupId>org.apache.asterix</groupId> - <artifactId>asterix-metadata</artifactId> + <artifactId>asterix-tools</artifactId> <version>${project.version}</version> - <scope>compile</scope> + <type>test-jar</type> </dependency> <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>junit</groupId> - <artifactId>junit</artifactId> - <scope>test</scope> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> </dependency> <dependency> - <groupId>org.apache.hyracks</groupId> - <artifactId>hyracks-control-cc</artifactId> + <groupId>commons-httpclient</groupId> + <artifactId>commons-httpclient</artifactId> + <version>3.0.1</version> </dependency> <dependency> - <groupId>org.apache.hyracks</groupId> - <artifactId>hyracks-control-nc</artifactId> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> </dependency> <dependency> - <groupId>org.apache.asterix</groupId> - <artifactId>asterix-app</artifactId> - <version>${project.version}</version> + <groupId>args4j</groupId> + <artifactId>args4j</artifactId> </dependency> <dependency> - <groupId>org.apache.asterix</groupId> - <artifactId>asterix-tools</artifactId> - <version>${project.version}</version> - <type>test-jar</type> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> </dependency> <dependency> <groupId>com.hierynomus</groupId> http://git-wip-us.apache.org/repos/asf/asterixdb/blob/65da60c8/asterixdb/asterix-yarn/pom.xml ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-yarn/pom.xml b/asterixdb/asterix-yarn/pom.xml index 5491f9f..f301694 100644 --- a/asterixdb/asterix-yarn/pom.xml +++ b/asterixdb/asterix-yarn/pom.xml @@ -32,16 +32,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-jar-plugin</artifactId> <executions> <execution> http://git-wip-us.apache.org/repos/asf/asterixdb/blob/65da60c8/asterixdb/pom.xml ---------------------------------------------------------------------- diff --git a/asterixdb/pom.xml b/asterixdb/pom.xml index 7cb0e5b..6691309 100644 --- a/asterixdb/pom.xml +++ b/asterixdb/pom.xml @@ -193,7 +193,6 @@ <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> @@ -290,6 +289,11 @@ </plugins> <pluginManagement> <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <version>3.6.1</version> + </plugin> <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.--> <plugin> <groupId>org.eclipse.m2e</groupId> http://git-wip-us.apache.org/repos/asf/asterixdb/blob/65da60c8/hyracks-fullstack/hyracks/hyracks-control/hyracks-nc-service/pom.xml ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-control/hyracks-nc-service/pom.xml b/hyracks-fullstack/hyracks/hyracks-control/hyracks-nc-service/pom.xml index 269e620..8d9a93b 100644 --- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-nc-service/pom.xml +++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-nc-service/pom.xml @@ -27,21 +27,6 @@ <artifactId>hyracks-nc-service</artifactId> - <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>args4j</groupId> http://git-wip-us.apache.org/repos/asf/asterixdb/blob/65da60c8/hyracks-fullstack/pom.xml ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/pom.xml b/hyracks-fullstack/pom.xml index f243f0c..1494183 100644 --- a/hyracks-fullstack/pom.xml +++ b/hyracks-fullstack/pom.xml @@ -251,7 +251,6 @@ <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> @@ -350,6 +349,11 @@ <pluginManagement> <plugins> <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <version>3.6.1</version> + </plugin> + <plugin> <groupId>org.apache.rat</groupId> <artifactId>apache-rat-plugin</artifactId> <version>0.12</version>
