This is an automated email from the ASF dual-hosted git repository. volodymyr pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/drill.git
commit 5655dbbbd8492f3a037b2f3b1fa670f3b71ae66a Author: Volodymyr Vysotskyi <[email protected]> AuthorDate: Thu Nov 28 20:25:57 2019 +0200 DRILL-7208: Reuse root git.properties file - Generate git.properties for root module only and copy it to child modules when required closes #1911 --- contrib/storage-kudu/.gitignore | 15 ------- pom.xml | 95 +++++++++++++++++++++++------------------ 2 files changed, 53 insertions(+), 57 deletions(-) diff --git a/contrib/storage-kudu/.gitignore b/contrib/storage-kudu/.gitignore deleted file mode 100644 index f290bae..0000000 --- a/contrib/storage-kudu/.gitignore +++ /dev/null @@ -1,15 +0,0 @@ -.project -.buildpath -.classpath -.checkstyle -.settings/ -.idea/ -TAGS -*.log -*.lck -*.iml -target/ -*.DS_Store -*.patch -*~ -git.properties diff --git a/pom.xml b/pom.xml index cbc3548..bcb255b 100644 --- a/pom.xml +++ b/pom.xml @@ -463,13 +463,66 @@ </execution> </executions> </plugin> + <plugin> + <groupId>pl.project13.maven</groupId> + <artifactId>git-commit-id-plugin</artifactId> + <version>4.0.0</version> + <executions> + <execution> + <id>for-source-tarball</id> + <goals> + <goal>revision</goal> + </goals> + <inherited>false</inherited> + <configuration> + <generateGitPropertiesFilename>./git.properties</generateGitPropertiesFilename> + </configuration> + </execution> + </executions> + <configuration> + <dateFormat>dd.MM.yyyy '@' HH:mm:ss z</dateFormat> + <verbose>false</verbose> + <skipPoms>false</skipPoms> + <generateGitPropertiesFile>true</generateGitPropertiesFile> + <failOnNoGitDirectory>false</failOnNoGitDirectory> + <gitDescribe> + <skip>false</skip> + <always>false</always> + <abbrev>7</abbrev> + <dirty>-dirty</dirty> + <forceLongFormat>true</forceLongFormat> + </gitDescribe> + </configuration> + </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-resources-plugin</artifactId> <configuration> <encoding>UTF-8</encoding> </configuration> + <executions> + <execution> + <!-- copy root git.properties file to target/classes folder for every module + to ensure that it will be placed into jar --> + <phase>initialize</phase> + <goals> + <goal>copy-resources</goal> + </goals> + <configuration> + <outputDirectory>${project.build.outputDirectory}</outputDirectory> + <resources> + <resource> + <!--suppress UnresolvedMavenProperty --> + <directory>${maven.multiModuleProjectDirectory}</directory> + <includes> + <include>git.properties</include> + </includes> + </resource> + </resources> + </configuration> + </execution> + </executions> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> @@ -527,48 +580,6 @@ </execution> </executions> </plugin> - <plugin> - <groupId>pl.project13.maven</groupId> - <artifactId>git-commit-id-plugin</artifactId> - <version>2.2.5</version> - <executions> - <execution> - <id>for-jars</id> - <inherited>true</inherited> - <goals> - <goal>revision</goal> - </goals> - <configuration> - <generateGitPropertiesFilename>target/classes/git.properties</generateGitPropertiesFilename> - </configuration> - </execution> - <execution> - <id>for-source-tarball</id> - <goals> - <goal>revision</goal> - </goals> - <inherited>false</inherited> - <configuration> - <generateGitPropertiesFilename>./git.properties</generateGitPropertiesFilename> - </configuration> - </execution> - </executions> - - <configuration> - <dateFormat>dd.MM.yyyy '@' HH:mm:ss z</dateFormat> - <verbose>false</verbose> - <skipPoms>false</skipPoms> - <generateGitPropertiesFile>true</generateGitPropertiesFile> - <failOnNoGitDirectory>false</failOnNoGitDirectory> - <gitDescribe> - <skip>false</skip> - <always>false</always> - <abbrev>7</abbrev> - <dirty>-dirty</dirty> - <forceLongFormat>true</forceLongFormat> - </gitDescribe> - </configuration> - </plugin> </plugins> <pluginManagement> <plugins>
