From 58256a3039f37b9ae6d54e9fdfcaebc21b771975 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Kr=C3=BCger?= <martin.krueger@rohde-schwarz.com>
Date: Fri, 7 Dec 2018 15:15:22 +0100
Subject: [PATCH] KARAF-6039 Remove one plugin instance and merge their configs

This patch removes the maven warning and should have no other effect.
---
 instance/pom.xml | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/instance/pom.xml b/instance/pom.xml
index 5dc40cee35..f56f14e431 100644
--- a/instance/pom.xml
+++ b/instance/pom.xml
@@ -172,24 +172,18 @@
                             </resources>
                         </configuration>
                     </execution>
-                </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>
+                        <configuration>
+                            <useDefaultDelimiters>false</useDefaultDelimiters>
+                            <delimiters>
+                                <delimiter>@@</delimiter>
+                            </delimiters>
+                        </configuration>
                     </execution>
                 </executions>
             </plugin>
-- 
2.19.1