You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@calcite.apache.org by fr...@apache.org on 2018/11/21 21:51:02 UTC
[1/2] calcite-avatica git commit: Test automatically update
dockerfiles
Repository: calcite-avatica
Updated Branches:
refs/heads/automate-dockerfile-versions [created] 59274ed69
Test automatically update dockerfiles
Project: http://git-wip-us.apache.org/repos/asf/calcite-avatica/repo
Commit: http://git-wip-us.apache.org/repos/asf/calcite-avatica/commit/d3f13910
Tree: http://git-wip-us.apache.org/repos/asf/calcite-avatica/tree/d3f13910
Diff: http://git-wip-us.apache.org/repos/asf/calcite-avatica/diff/d3f13910
Branch: refs/heads/automate-dockerfile-versions
Commit: d3f13910e6db1fbe536933c1c7c619bfdd5f5c93
Parents: acc49bf
Author: Francis Chuang <fr...@apache.org>
Authored: Wed Nov 21 21:25:56 2018 +1100
Committer: Francis Chuang <fr...@apache.org>
Committed: Wed Nov 21 22:20:50 2018 +1100
----------------------------------------------------------------------
docker/pom.xml | 46 ++++++++++++++++++++++++++++++++++------------
pom.xml | 12 ++++++------
2 files changed, 40 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/calcite-avatica/blob/d3f13910/docker/pom.xml
----------------------------------------------------------------------
diff --git a/docker/pom.xml b/docker/pom.xml
index 5548499..9d3f837 100644
--- a/docker/pom.xml
+++ b/docker/pom.xml
@@ -98,30 +98,52 @@ limitations under the License.
</profile>
<profile>
<!-- Need to verify that the URL we're pulling from in the Dockerfile is correct for this release -->
- <id>check-dockerfile-version</id>
- <activation>
- <property>
- <name>!skipDockerCheck</name>
- </property>
- </activation>
+ <id>apache-release</id>
<build>
<plugins>
<plugin>
- <groupId>org.codehaus.gmaven</groupId>
- <artifactId>groovy-maven-plugin</artifactId>
+ <groupId>com.google.code.maven-replacer-plugin</groupId>
+ <artifactId>replacer</artifactId>
<executions>
<execution>
- <id>check-dockerhub-dockerfile-version</id>
- <phase>validate</phase>
+ <id>update-dockerfile-versions</id>
+ <phase>generate-resources</phase>
<goals>
- <goal>execute</goal>
+ <goal>replace</goal>
</goals>
<configuration>
- <source>${project.basedir}/src/test/scripts/verify-dockerhub-dockerfile-version.groovy</source>
+ <files>
+ <file>src/main/dockerhub/Dockerfile</file>
+ <file>src/main/dockerhub-hypersql/Dockerfile</file>
+ </files>
+ <outputFiles>
+ <outputFile>src/main/dockerhub/Dockerfile</outputFile>
+ <outputFile>src/main/dockerhub-hypersql/Dockerfile</outputFile>
+ </outputFiles>
+ <regex>true</regex>
+ <replacements>
+ <replacement>
+ <token>ARG AVATICA_VERSION=.+</token>
+ <value>ARG AVATICA_VERSION=${project.version}</value>
+ </replacement>
+ </replacements>
</configuration>
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-scm-plugin</artifactId>
+ <configuration>
+ <includes>src/main/dockerhub/Dockerfile,src/main/dockerhub-hypersql/Dockerfile</includes>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-release-plugin</artifactId>
+ <configuration>
+ <preparationGoals>clean replacer:replace scm:add verify</preparationGoals>
+ </configuration>
+ </plugin>
</plugins>
</build>
</profile>
http://git-wip-us.apache.org/repos/asf/calcite-avatica/blob/d3f13910/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index f00b0d0..41a9eb2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -69,7 +69,6 @@ limitations under the License.
<docker-maven-plugin.version>1.1.1</docker-maven-plugin.version>
<dropwizard-metrics.version>4.0.3</dropwizard-metrics.version>
<forbiddenapis.version>2.6</forbiddenapis.version>
- <groovy-maven-plugin.version>2.1</groovy-maven-plugin.version>
<!-- We support guava versions as old as 14.0.1 (the version used by Hive)
but prefer more recent versions. -->
<guava.version>14.0.1</guava.version>
@@ -101,6 +100,7 @@ limitations under the License.
<owasp-dependency-check.version>3.3.2</owasp-dependency-check.version>
<protobuf.version>3.6.1</protobuf.version>
<protobuf-maven-plugin.version>0.5.1</protobuf-maven-plugin.version>
+ <replacer.version>1.5.3</replacer.version>
<scott-data-hsqldb.version>0.1</scott-data-hsqldb.version>
<servlet.version>4.0.1</servlet.version>
<slf4j.version>1.7.25</slf4j.version>
@@ -524,6 +524,11 @@ limitations under the License.
<plugins>
<!-- Sorted by groupId, artifactId. -->
<plugin>
+ <groupId>com.google.code.maven-replacer-plugin</groupId>
+ <artifactId>replacer</artifactId>
+ <version>${replacer.version}</version>
+ </plugin>
+ <plugin>
<groupId>com.spotify</groupId>
<artifactId>docker-maven-plugin</artifactId>
<version>${docker-maven-plugin.version}</version>
@@ -621,11 +626,6 @@ limitations under the License.
<version>${build-helper-maven-plugin.version}</version>
</plugin>
<plugin>
- <groupId>org.codehaus.gmaven</groupId>
- <artifactId>groovy-maven-plugin</artifactId>
- <version>${groovy-maven-plugin.version}</version>
- </plugin>
- <plugin>
<groupId>org.eclipse.m2e</groupId>
<artifactId>lifecycle-mapping</artifactId>
<version>1.0.0</version>
[2/2] calcite-avatica git commit: [maven-release-plugin] prepare
release avatica-1.13.0-rc0
Posted by fr...@apache.org.
[maven-release-plugin] prepare release avatica-1.13.0-rc0
Project: http://git-wip-us.apache.org/repos/asf/calcite-avatica/repo
Commit: http://git-wip-us.apache.org/repos/asf/calcite-avatica/commit/59274ed6
Tree: http://git-wip-us.apache.org/repos/asf/calcite-avatica/tree/59274ed6
Diff: http://git-wip-us.apache.org/repos/asf/calcite-avatica/diff/59274ed6
Branch: refs/heads/automate-dockerfile-versions
Commit: 59274ed69519156a50130ac20bf9d50dfc648aee
Parents: d3f1391
Author: Francis Chuang <fr...@apache.org>
Authored: Wed Nov 21 21:50:58 2018 +0000
Committer: Francis Chuang <fr...@apache.org>
Committed: Wed Nov 21 21:50:58 2018 +0000
----------------------------------------------------------------------
core/pom.xml | 2 +-
docker/pom.xml | 2 +-
metrics-dropwizardmetrics/pom.xml | 2 +-
metrics/pom.xml | 2 +-
noop-driver/pom.xml | 2 +-
pom.xml | 4 ++--
server/pom.xml | 2 +-
shaded/core/pom.xml | 2 +-
standalone-server/pom.xml | 2 +-
tck/pom.xml | 2 +-
10 files changed, 11 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/calcite-avatica/blob/59274ed6/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index 94b748d..843b6b3 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -20,7 +20,7 @@ limitations under the License.
<parent>
<groupId>org.apache.calcite.avatica</groupId>
<artifactId>avatica-parent</artifactId>
- <version>1.13.0-SNAPSHOT</version>
+ <version>1.13.0</version>
</parent>
<artifactId>avatica-core</artifactId>
http://git-wip-us.apache.org/repos/asf/calcite-avatica/blob/59274ed6/docker/pom.xml
----------------------------------------------------------------------
diff --git a/docker/pom.xml b/docker/pom.xml
index 9d3f837..088420c 100644
--- a/docker/pom.xml
+++ b/docker/pom.xml
@@ -20,7 +20,7 @@ limitations under the License.
<parent>
<groupId>org.apache.calcite.avatica</groupId>
<artifactId>avatica-parent</artifactId>
- <version>1.13.0-SNAPSHOT</version>
+ <version>1.13.0</version>
</parent>
<artifactId>avatica-docker</artifactId>
http://git-wip-us.apache.org/repos/asf/calcite-avatica/blob/59274ed6/metrics-dropwizardmetrics/pom.xml
----------------------------------------------------------------------
diff --git a/metrics-dropwizardmetrics/pom.xml b/metrics-dropwizardmetrics/pom.xml
index 387e7f3..25231d9 100644
--- a/metrics-dropwizardmetrics/pom.xml
+++ b/metrics-dropwizardmetrics/pom.xml
@@ -20,7 +20,7 @@ limitations under the License.
<parent>
<groupId>org.apache.calcite.avatica</groupId>
<artifactId>avatica-parent</artifactId>
- <version>1.13.0-SNAPSHOT</version>
+ <version>1.13.0</version>
</parent>
<artifactId>avatica-metrics-dropwizardmetrics</artifactId>
http://git-wip-us.apache.org/repos/asf/calcite-avatica/blob/59274ed6/metrics/pom.xml
----------------------------------------------------------------------
diff --git a/metrics/pom.xml b/metrics/pom.xml
index fb4ddd7..07df798 100644
--- a/metrics/pom.xml
+++ b/metrics/pom.xml
@@ -20,7 +20,7 @@ limitations under the License.
<parent>
<groupId>org.apache.calcite.avatica</groupId>
<artifactId>avatica-parent</artifactId>
- <version>1.13.0-SNAPSHOT</version>
+ <version>1.13.0</version>
</parent>
<artifactId>avatica-metrics</artifactId>
http://git-wip-us.apache.org/repos/asf/calcite-avatica/blob/59274ed6/noop-driver/pom.xml
----------------------------------------------------------------------
diff --git a/noop-driver/pom.xml b/noop-driver/pom.xml
index b899d83..eea8e95 100644
--- a/noop-driver/pom.xml
+++ b/noop-driver/pom.xml
@@ -20,7 +20,7 @@ limitations under the License.
<parent>
<groupId>org.apache.calcite.avatica</groupId>
<artifactId>avatica-parent</artifactId>
- <version>1.13.0-SNAPSHOT</version>
+ <version>1.13.0</version>
</parent>
<artifactId>avatica-noop-driver</artifactId>
http://git-wip-us.apache.org/repos/asf/calcite-avatica/blob/59274ed6/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 41a9eb2..0874f69 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@ limitations under the License.
<groupId>org.apache.calcite.avatica</groupId>
<artifactId>avatica-parent</artifactId>
<packaging>pom</packaging>
- <version>1.13.0-SNAPSHOT</version>
+ <version>1.13.0</version>
<name>Apache Calcite Avatica Project</name>
<description>Avatica is a JDBC driver framework which is a part of Apache Calcite</description>
<url>https://calcite.apache.org/avatica</url>
@@ -119,7 +119,7 @@ limitations under the License.
<connection>scm:git:https://git-wip-us.apache.org/repos/asf/calcite-avatica.git</connection>
<developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/calcite-avatica.git</developerConnection>
<url>https://github.com/apache/calcite-avatica</url>
- <tag>HEAD</tag>
+ <tag>avatica-1.13.0-rc0</tag>
</scm>
<modules>
<module>core</module>
http://git-wip-us.apache.org/repos/asf/calcite-avatica/blob/59274ed6/server/pom.xml
----------------------------------------------------------------------
diff --git a/server/pom.xml b/server/pom.xml
index 1fd2f8c..82c270b 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -20,7 +20,7 @@ limitations under the License.
<parent>
<groupId>org.apache.calcite.avatica</groupId>
<artifactId>avatica-parent</artifactId>
- <version>1.13.0-SNAPSHOT</version>
+ <version>1.13.0</version>
</parent>
<artifactId>avatica-server</artifactId>
http://git-wip-us.apache.org/repos/asf/calcite-avatica/blob/59274ed6/shaded/core/pom.xml
----------------------------------------------------------------------
diff --git a/shaded/core/pom.xml b/shaded/core/pom.xml
index 63e50fd..63e2a0e 100644
--- a/shaded/core/pom.xml
+++ b/shaded/core/pom.xml
@@ -20,7 +20,7 @@ limitations under the License.
<parent>
<groupId>org.apache.calcite.avatica</groupId>
<artifactId>avatica-parent</artifactId>
- <version>1.13.0-SNAPSHOT</version>
+ <version>1.13.0</version>
<relativePath>../../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/calcite-avatica/blob/59274ed6/standalone-server/pom.xml
----------------------------------------------------------------------
diff --git a/standalone-server/pom.xml b/standalone-server/pom.xml
index 3ae8af0..bdd727e 100644
--- a/standalone-server/pom.xml
+++ b/standalone-server/pom.xml
@@ -20,7 +20,7 @@ limitations under the License.
<parent>
<groupId>org.apache.calcite.avatica</groupId>
<artifactId>avatica-parent</artifactId>
- <version>1.13.0-SNAPSHOT</version>
+ <version>1.13.0</version>
</parent>
<artifactId>avatica-standalone-server</artifactId>
<name>Apache Calcite Avatica Standalone Server</name>
http://git-wip-us.apache.org/repos/asf/calcite-avatica/blob/59274ed6/tck/pom.xml
----------------------------------------------------------------------
diff --git a/tck/pom.xml b/tck/pom.xml
index dd5c57a..fd23995 100644
--- a/tck/pom.xml
+++ b/tck/pom.xml
@@ -20,7 +20,7 @@ limitations under the License.
<parent>
<groupId>org.apache.calcite.avatica</groupId>
<artifactId>avatica-parent</artifactId>
- <version>1.13.0-SNAPSHOT</version>
+ <version>1.13.0</version>
</parent>
<artifactId>avatica-tck</artifactId>