You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by vv...@apache.org on 2014/12/16 10:38:34 UTC
svn commit: r1645889 - in /felix/trunk/webconsole-plugins/upnp: pom.xml
src/main/resources/OSGI-INF/l10n/bundle_bg.properties
src/main/resources/OSGI-INF/l10n/bundle_de.properties
Author: vvalchev
Date: Tue Dec 16 09:38:33 2014
New Revision: 1645889
URL: http://svn.apache.org/r1645889
Log:
Fixed FELIX-4733 : UPnP plugin native2ascii plugin conflicts with Eclipse m2e
https://issues.apache.org/jira/browse/FELIX-4733
Modified:
felix/trunk/webconsole-plugins/upnp/pom.xml
felix/trunk/webconsole-plugins/upnp/src/main/resources/OSGI-INF/l10n/bundle_bg.properties
felix/trunk/webconsole-plugins/upnp/src/main/resources/OSGI-INF/l10n/bundle_de.properties
Modified: felix/trunk/webconsole-plugins/upnp/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/webconsole-plugins/upnp/pom.xml?rev=1645889&r1=1645888&r2=1645889&view=diff
==============================================================================
--- felix/trunk/webconsole-plugins/upnp/pom.xml (original)
+++ felix/trunk/webconsole-plugins/upnp/pom.xml Tue Dec 16 09:38:33 2014
@@ -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>
Modified: felix/trunk/webconsole-plugins/upnp/src/main/resources/OSGI-INF/l10n/bundle_bg.properties
URL: http://svn.apache.org/viewvc/felix/trunk/webconsole-plugins/upnp/src/main/resources/OSGI-INF/l10n/bundle_bg.properties?rev=1645889&r1=1645888&r2=1645889&view=diff
==============================================================================
--- felix/trunk/webconsole-plugins/upnp/src/main/resources/OSGI-INF/l10n/bundle_bg.properties (original)
+++ felix/trunk/webconsole-plugins/upnp/src/main/resources/OSGI-INF/l10n/bundle_bg.properties Tue Dec 16 09:38:33 2014
@@ -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
Modified: felix/trunk/webconsole-plugins/upnp/src/main/resources/OSGI-INF/l10n/bundle_de.properties
URL: http://svn.apache.org/viewvc/felix/trunk/webconsole-plugins/upnp/src/main/resources/OSGI-INF/l10n/bundle_de.properties?rev=1645889&r1=1645888&r2=1645889&view=diff
==============================================================================
--- felix/trunk/webconsole-plugins/upnp/src/main/resources/OSGI-INF/l10n/bundle_de.properties (original)
+++ felix/trunk/webconsole-plugins/upnp/src/main/resources/OSGI-INF/l10n/bundle_de.properties Tue Dec 16 09:38:33 2014
@@ -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