This is an automated email from the ASF dual-hosted git repository.
vladimirsitnikov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/calcite.git
The following commit(s) were added to refs/heads/master by this push:
new d0cf8ca [CALCITE-2759] Update maven-remote-resources-plugin to 1.6.0
d0cf8ca is described below
commit d0cf8ca178d44c21b341337ea16a56df53cf2dd7
Author: Vladimir Sitnikov <sitnikov.vladi...@gmail.com>
AuthorDate: Sat Dec 29 23:47:08 2018 +0300
[CALCITE-2759] Update maven-remote-resources-plugin to 1.6.0
See also CALCITE-537 Support skip overwrite in
maven-remote-resources-plugin
---
pom.xml | 34 +++++++++++-----------------------
1 file changed, 11 insertions(+), 23 deletions(-)
diff --git a/pom.xml b/pom.xml
index 5954eda..a0d164d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -116,6 +116,7 @@ limitations under the License.
<maven-checkstyle-plugin.version>3.0.0</maven-checkstyle-plugin.version>
<maven-dependency-plugin.version>3.1.1</maven-dependency-plugin.version>
<maven-enforcer-plugin.version>3.0.0-M2</maven-enforcer-plugin.version>
+
<maven-remote-resources-plugin.version>1.6.0</maven-remote-resources-plugin.version>
<maven-scm-provider.version>1.10.0</maven-scm-provider.version>
<mockito.version>2.22.0</mockito.version>
<mongo-java-driver.version>3.5.0</mongo-java-driver.version>
@@ -805,6 +806,16 @@ limitations under the License.
</dependency>
</dependencies>
</plugin>
+ <!-- CALCITE-2759, CALCITE-537: maven-remote-resources-plugin 1.6.0
resolves MRRESOURCES-91
+ Avoid overwrite of the destination file if the produced
+ contents is the same.
+ Apache pom overwrites NOTICE, DEPENDENCIES, and LICENSE files, however
+ we do not want recompile the module every time. -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-remote-resources-plugin</artifactId>
+ <version>${maven-remote-resources-plugin.version}</version>
+ </plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
@@ -1192,29 +1203,6 @@ limitations under the License.
</build>
</profile>
<profile>
- <!-- CALCITE-537: workaround for MRRESOURCES-91
- Avoid overwrite of the destination file if the produced
- contents is the same.
- Apache pom overwrites NOTICE, DEPENDENCIES, and LICENSE files, however
- we do not want recompile the module every time. -->
- <id>skip-apache-licenses</id>
- <activation>
- <activeByDefault>true</activeByDefault>
-
<file><exists>target/maven-shared-archive-resources/META-INF/LICENSE</exists></file>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-remote-resources-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
<!-- Generate git.properties on first build -->
<id>generate-git-id</id>
<activation>
