From e60f61d0a9e928bcd1ea6ee965e79f5003f76a95 Mon Sep 17 00:00:00 2001 From: Tanguy Leroux Date: Tue, 7 Apr 2015 11:41:53 +0200 Subject: [PATCH] Fix maven-resources-plugin warnings Commit 168238dab6f5cb081c1e919c0136c13a3c837b72 declared multiple maven-resources-plugin usages instead of declaring multiple executions for the same plugin... resulting to Maven warnings. Closes #10433 --- pom.xml | 194 +++++++++++++++++++++++++++----------------------------- 1 file changed, 92 insertions(+), 102 deletions(-) diff --git a/pom.xml b/pom.xml index 0059a4e9ee4..7ca27190064 100644 --- a/pom.xml +++ b/pom.xml @@ -893,6 +893,98 @@ + + + copy-resources-deb + prepare-package + + copy-resources + + + ${project.build.directory}/generated-packaging/deb/ + + src/packaging/common/packaging.properties + src/packaging/deb/packaging.properties + + + + src/packaging/common/ + true + + **/* + + + packaging.properties + + + + src/packaging/deb/ + true + + **/* + + + packaging.properties + + + + ${project.basedir} + true + + bin/elasticsearch + bin/elasticsearch.in.sh + bin/plugin + + + + + + + + copy-resources-rpm + prepare-package + + copy-resources + + + ${project.build.directory}/generated-packaging/rpm/ + + src/packaging/common/packaging.properties + src/packaging/rpm/packaging.properties + + + + src/packaging/common/ + true + + **/* + + + packaging.properties + + + + src/packaging/rpm/ + true + + **/* + + + packaging.properties + + + + ${project.basedir} + true + + bin/elasticsearch + bin/elasticsearch.in.sh + bin/plugin + + + + + @@ -1101,57 +1193,6 @@ - - - maven-resources-plugin - - - copy-resources-deb - prepare-package - - copy-resources - - - ${project.build.directory}/generated-packaging/deb/ - - src/packaging/common/packaging.properties - src/packaging/deb/packaging.properties - - - - src/packaging/common/ - true - - **/* - - - packaging.properties - - - - src/packaging/deb/ - true - - **/* - - - packaging.properties - - - - ${project.basedir} - true - - bin/elasticsearch - bin/elasticsearch.in.sh - bin/plugin - - - - - - - @@ -1364,57 +1405,6 @@ - - - maven-resources-plugin - - - copy-resources-rpm - prepare-package - - copy-resources - - - ${project.build.directory}/generated-packaging/rpm/ - - src/packaging/common/packaging.properties - src/packaging/rpm/packaging.properties - - - - src/packaging/common/ - true - - **/* - - - packaging.properties - - - - src/packaging/rpm/ - true - - **/* - - - packaging.properties - - - - ${project.basedir} - true - - bin/elasticsearch - bin/elasticsearch.in.sh - bin/plugin - - - - - - - de.thetaphi