You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2019/02/21 18:06:42 UTC
[karaf] branch karaf-4.2.x updated: [KARAF-6039] Avoid to use
maven-resources-plugin twice in instance module
This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a commit to branch karaf-4.2.x
in repository https://gitbox.apache.org/repos/asf/karaf.git
The following commit(s) were added to refs/heads/karaf-4.2.x by this push:
new 5852021 [KARAF-6039] Avoid to use maven-resources-plugin twice in instance module
5852021 is described below
commit 5852021b0a64cef296d18a42bbe730aa720032eb
Author: Jean-Baptiste Onofré <jb...@apache.org>
AuthorDate: Fri Feb 15 14:01:54 2019 +0100
[KARAF-6039] Avoid to use maven-resources-plugin twice in instance module
---
instance/pom.xml | 23 ++++-------------------
1 file changed, 4 insertions(+), 19 deletions(-)
diff --git a/instance/pom.xml b/instance/pom.xml
index 07740ed..a557dfb 100644
--- a/instance/pom.xml
+++ b/instance/pom.xml
@@ -142,6 +142,10 @@
<configuration>
<outputDirectory>${project.build.directory}/generated-resources/org/apache/karaf/instance</outputDirectory>
<addDefaultExcludes>false</addDefaultExcludes>
+ <useDefaultDelimiters>false</useDefaultDelimiters>
+ <delimiters>
+ <delimiter>@@</delimiter>
+ </delimiters>
<resources>
<resource>
<directory>${project.basedir}/../assemblies/features/base/src/main/resources</directory>
@@ -175,25 +179,6 @@
</executions>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-resources-plugin</artifactId>
- <configuration>
- <useDefaultDelimiters>false</useDefaultDelimiters>
- <delimiters>
- <delimiter>@@</delimiter>
- </delimiters>
- </configuration>
- <executions>
- <execution>
- <id>filter</id>
- <phase>generate-resources</phase>
- <goals>
- <goal>resources</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
<groupId>org.apache.karaf.tooling</groupId>
<artifactId>karaf-services-maven-plugin</artifactId>
</plugin>