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 <[email protected]> Authored: Wed Nov 21 21:25:56 2018 +1100 Committer: Francis Chuang <[email protected]> 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>
