You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@calcite.apache.org by jh...@apache.org on 2015/09/13 06:30:42 UTC
[5/6] incubator-calcite git commit: Upgrade parent POM to apache-17
Upgrade parent POM to apache-17
Project: http://git-wip-us.apache.org/repos/asf/incubator-calcite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-calcite/commit/9f149015
Tree: http://git-wip-us.apache.org/repos/asf/incubator-calcite/tree/9f149015
Diff: http://git-wip-us.apache.org/repos/asf/incubator-calcite/diff/9f149015
Branch: refs/heads/master
Commit: 9f149015835c7c1af9cdeb657cb70a96e7ac3353
Parents: 3045348
Author: Julian Hyde <jh...@apache.org>
Authored: Fri Sep 11 14:16:48 2015 -0700
Committer: Julian Hyde <jh...@apache.org>
Committed: Fri Sep 11 15:42:56 2015 -0700
----------------------------------------------------------------------
pom.xml | 8 +++-----
ubenchmark/pom.xml | 1 +
2 files changed, 4 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/9f149015/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index b5defb3..f9210e5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,7 +20,7 @@ limitations under the License.
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
- <version>16</version>
+ <version>17</version>
</parent>
<!-- The basics. -->
@@ -481,10 +481,10 @@ limitations under the License.
<version>2.12.1</version>
</plugin>
<plugin>
- <!-- keep version in sync with surefire -->
+ <!-- keep version in sync with surefire; apache 17 has surefire 2.7.2 -->
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
- <version>2.18</version>
+ <version>2.7.2</version>
<executions>
<execution>
<id>failsafe-integration-test</id>
@@ -518,10 +518,8 @@ limitations under the License.
<version>2.4</version>
</plugin>
<plugin>
- <!-- override version 2.17 in apache-16 -->
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.18</version>
<configuration>
<threadCount>1</threadCount>
<perCoreThreadCount>true</perCoreThreadCount>
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/9f149015/ubenchmark/pom.xml
----------------------------------------------------------------------
diff --git a/ubenchmark/pom.xml b/ubenchmark/pom.xml
index 15a7e6a..52f94eb 100644
--- a/ubenchmark/pom.xml
+++ b/ubenchmark/pom.xml
@@ -64,6 +64,7 @@ limitations under the License.
<configuration>
<source>1.6</source>
<target>1.6</target>
+ <compilerArgument>-proc:none</compilerArgument>
</configuration>
</plugin>
<plugin>