calcite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jh...@apache.org
Subject incubator-calcite git commit: [CALCITE-561] Upgrade parent POM
Date Sat, 17 Jan 2015 05:25:33 GMT
Repository: incubator-calcite
Updated Branches:
  refs/heads/master 0c052cc68 -> 42d723928


[CALCITE-561] Upgrade parent POM

May also fix [CALCITE-560] Calcite test suite hangs on ubuntu-12.04


Project: http://git-wip-us.apache.org/repos/asf/incubator-calcite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-calcite/commit/42d72392
Tree: http://git-wip-us.apache.org/repos/asf/incubator-calcite/tree/42d72392
Diff: http://git-wip-us.apache.org/repos/asf/incubator-calcite/diff/42d72392

Branch: refs/heads/master
Commit: 42d723928b091a7aeb57e9792022d7d7f8afd3d6
Parents: 0c052cc
Author: Julian Hyde <jhyde@apache.org>
Authored: Fri Jan 16 18:22:10 2015 -0800
Committer: Julian Hyde <jhyde@apache.org>
Committed: Fri Jan 16 18:22:10 2015 -0800

----------------------------------------------------------------------
 linq4j/pom.xml |  1 -
 pom.xml        | 14 +++++++++++++-
 2 files changed, 13 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/42d72392/linq4j/pom.xml
----------------------------------------------------------------------
diff --git a/linq4j/pom.xml b/linq4j/pom.xml
index b97f53a..3dd14bc 100644
--- a/linq4j/pom.xml
+++ b/linq4j/pom.xml
@@ -57,7 +57,6 @@ limitations under the License.
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
-        <version>2.15</version>
         <configuration>
           <includes>
             <include>org/apache/calcite/linq4j/test/Linq4jSuite.java</include>

http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/42d72392/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 49e5b6e..b779003 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,7 +20,7 @@ limitations under the License.
   <parent>
     <groupId>org.apache</groupId>
     <artifactId>apache</artifactId>
-    <version>14</version>
+    <version>16</version>
   </parent>
 
   <!-- The basics. -->
@@ -376,6 +376,12 @@ limitations under the License.
           <version>2.12.1</version>
         </plugin>
         <plugin>
+          <!-- keep version in sync with surefire -->
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-failsafe-plugin</artifactId>
+          <version>2.18</version>
+        </plugin>
+        <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-shade-plugin</artifactId>
           <version>2.1</version>
@@ -386,6 +392,12 @@ 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>
+        </plugin>
+        <plugin>
           <groupId>org.codehaus.mojo</groupId>
           <artifactId>build-helper-maven-plugin</artifactId>
           <version>1.9</version>


Mime
View raw message