[CALCITE-1485] Upgrade Avatica's Apache parent POM to version 18

apache · Nov 9, 2016 · aed0a9e · aed0a9e
1 parent 6a7da0e
commit aed0a9e
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 11 deletions.
diff --git a/avatica/core/pom.xml b/avatica/core/pom.xml
@@ -139,6 +139,7 @@ limitations under the License.
       </plugin>
       <plugin>
         <artifactId>maven-dependency-plugin</artifactId>
+        <version>${maven-dependency-plugin.version}</version>
         <executions>
           <execution>
             <id>analyze</id>

diff --git a/avatica/pom.xml b/avatica/pom.xml
@@ -20,7 +20,7 @@ limitations under the License.
   <parent>
     <groupId>org.apache</groupId>
     <artifactId>apache</artifactId>
-    <version>17</version>
+    <version>18</version>
     <!-- Tell Maven that it's OK that we're not attached to the parent directory -->
     <relativePath />
   </parent>
@@ -34,7 +34,7 @@ limitations under the License.
   <!-- More project information. -->
   <name>Apache Calcite Avatica Project</name>
   <description>Avatica is a JDBC driver framework which is a part of Apache Calcite</description>
-  <url>http://calcite.apache.org/avatica</url>
+  <url>https://calcite.apache.org/avatica</url>
   <inceptionYear>2012</inceptionYear>
 
   <mailingLists>
@@ -43,7 +43,7 @@ limitations under the License.
       <subscribe>[email protected]</subscribe>
       <unsubscribe>[email protected]</unsubscribe>
       <post>[email protected]</post>
-      <archive>http://mail-archives.apache.org/mod_mbox/calcite-dev</archive>
+      <archive>https://mail-archives.apache.org/mod_mbox/calcite-dev</archive>
     </mailingList>
   </mailingLists>
 
@@ -76,11 +76,8 @@ limitations under the License.
     <kerby.version>1.0.0-RC2</kerby.version>
     <maven-checkstyle-plugin.version>2.12.1</maven-checkstyle-plugin.version>
     <maven-dependency-plugin.version>2.10</maven-dependency-plugin.version>
-    <!-- keep failsafe version in sync with surefire; apache 17 has surefire 2.7.2 -->
-    <maven-failsafe-plugin.version>2.7.2</maven-failsafe-plugin.version>
-    <maven-scm-provider.version>1.9.1</maven-scm-provider.version>
+    <maven-scm-provider.version>1.9.4</maven-scm-provider.version>
     <maven-shade-plugin.version>2.1</maven-shade-plugin.version>
-    <maven-source-plugin.version>2.4</maven-source-plugin.version>
     <mockito-all.version>1.10.19</mockito-all.version>
     <protobuf.version>3.1.0</protobuf.version>
     <scott-data-hsqldb.version>0.1</scott-data-hsqldb.version>
@@ -404,7 +401,7 @@ limitations under the License.
         <artifactId>maven-javadoc-plugin</artifactId>
         <configuration>
           <links>
-            <link>http://docs.oracle.com/javase/8/docs/api/</link>
+            <link>https://docs.oracle.com/javase/8/docs/api/</link>
           </links>
           <tags>
             <tag>
@@ -516,7 +513,6 @@ limitations under the License.
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-failsafe-plugin</artifactId>
-          <version>${maven-failsafe-plugin.version}</version>
           <executions>
             <execution>
               <id>failsafe-integration-test</id>
@@ -547,7 +543,6 @@ limitations under the License.
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-source-plugin</artifactId>
-          <version>${maven-source-plugin.version}</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
@@ -582,7 +577,7 @@ limitations under the License.
         <artifactId>maven-javadoc-plugin</artifactId>
         <configuration>
           <links>
-            <link>http://docs.oracle.com/javase/8/docs/api/</link>
+            <link>https://docs.oracle.com/javase/8/docs/api/</link>
           </links>
           <tags>
             <tag>

diff --git a/avatica/server/pom.xml b/avatica/server/pom.xml
@@ -185,6 +185,7 @@ limitations under the License.
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-dependency-plugin</artifactId>
+        <version>${maven-dependency-plugin.version}</version>
         <!-- configurations do not cascade, so all of the definition from
              ../pom.xml:build:plugin-management:plugins:plugin must be repeated in child poms -->
         <executions>

diff --git a/avatica/shaded/core/pom.xml b/avatica/shaded/core/pom.xml
@@ -44,6 +44,7 @@ limitations under the License.
     <plugins>
       <plugin>
         <artifactId>maven-dependency-plugin</artifactId>
+        <version>${maven-dependency-plugin.version}</version>
         <executions>
           <execution>
             <id>analyze</id>

diff --git a/avatica/standalone-server/pom.xml b/avatica/standalone-server/pom.xml
@@ -113,6 +113,7 @@ limitations under the License.
       </plugin>
       <plugin>
         <artifactId>maven-dependency-plugin</artifactId>
+        <version>${maven-dependency-plugin.version}</version>
         <executions>
           <execution>
             <id>analyze</id>

diff --git a/avatica/tck/pom.xml b/avatica/tck/pom.xml
@@ -199,6 +199,7 @@ limitations under the License.
       </plugin>
       <plugin>
         <artifactId>maven-dependency-plugin</artifactId>
+        <version>${maven-dependency-plugin.version}</version>
         <executions>
           <execution>
             <id>analyze</id>