Fixed FELIX-4733 : UPnP plugin native2ascii plugin conflicts with Eclipse m2e
https://issues.apache.org/jira/browse/FELIX-4733
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1645889 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/webconsole-plugins/upnp/pom.xml b/webconsole-plugins/upnp/pom.xml
index 6d619af..57cabf8 100644
--- a/webconsole-plugins/upnp/pom.xml
+++ b/webconsole-plugins/upnp/pom.xml
@@ -41,13 +41,6 @@
<resource>
<directory>${basedir}/src/main/resources</directory>
</resource>
- <resource>
- <directory>target/classes</directory>
- <includes>
- <include>OSGI-INF/**</include>
- </includes>
- <filtering>false</filtering>
- </resource>
</resources>
<plugins>
@@ -84,6 +77,7 @@
<Bundle-Activator>
org.apache.felix.webconsole.plugins.upnp.internal.Activator
</Bundle-Activator>
+ <Include-Resource>{maven-resources},OSGI-INF=target/classes/OSGI-INF</Include-Resource>
</instructions>
</configuration>
</plugin>
diff --git a/webconsole-plugins/upnp/src/main/resources/OSGI-INF/l10n/bundle_bg.properties b/webconsole-plugins/upnp/src/main/resources/OSGI-INF/l10n/bundle_bg.properties
index 5b186fb..9fdf94f 100644
--- a/webconsole-plugins/upnp/src/main/resources/OSGI-INF/l10n/bundle_bg.properties
+++ b/webconsole-plugins/upnp/src/main/resources/OSGI-INF/l10n/bundle_bg.properties
@@ -1,4 +1,4 @@
-#Licensed to the Apache Software Foundation (ASF) under one or more
+#Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
# this work for additional information regarding copyright ownership.
# The ASF licenses this file to You under the Apache License, Version 2.0
diff --git a/webconsole-plugins/upnp/src/main/resources/OSGI-INF/l10n/bundle_de.properties b/webconsole-plugins/upnp/src/main/resources/OSGI-INF/l10n/bundle_de.properties
index 182bb7b..2a0597b 100644
--- a/webconsole-plugins/upnp/src/main/resources/OSGI-INF/l10n/bundle_de.properties
+++ b/webconsole-plugins/upnp/src/main/resources/OSGI-INF/l10n/bundle_de.properties
@@ -1,4 +1,4 @@
-#Licensed to the Apache Software Foundation (ASF) under one or more
+#Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
# this work for additional information regarding copyright ownership.
# The ASF licenses this file to You under the Apache License, Version 2.0