Fixed FELIX-4731 : Event plugin native2ascii plugin conflicts with Eclipse
https://issues.apache.org/jira/browse/FELIX-4731
In addition, the resources are fixed to be UTF-8 without POM, because native2ascii doesn't process them right.
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1645885 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/webconsole-plugins/event/pom.xml b/webconsole-plugins/event/pom.xml
index 1380adc..b5390e4 100644
--- a/webconsole-plugins/event/pom.xml
+++ b/webconsole-plugins/event/pom.xml
@@ -48,15 +48,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>
@@ -97,6 +88,7 @@
org.osgi.service.event,org.osgi.service.cm,
javax.servlet,javax.servlet.http
</DynamicImport-Package>
+ <Include-Resource>{maven-resources},OSGI-INF=target/classes/OSGI-INF</Include-Resource>
</instructions>
</configuration>
</plugin>
@@ -133,7 +125,7 @@
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
- <version>5.0.0</version>
+ <version>4.0.0</version>
<scope>provided</scope>
</dependency>
</dependencies>
diff --git a/webconsole-plugins/event/src/main/resources/OSGI-INF/l10n/bundle_bg.properties b/webconsole-plugins/event/src/main/resources/OSGI-INF/l10n/bundle_bg.properties
index c16660d..cbebbd3 100644
--- a/webconsole-plugins/event/src/main/resources/OSGI-INF/l10n/bundle_bg.properties
+++ b/webconsole-plugins/event/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/event/src/main/resources/OSGI-INF/l10n/bundle_de.properties b/webconsole-plugins/event/src/main/resources/OSGI-INF/l10n/bundle_de.properties
index 536c024..bc88a3c 100644
--- a/webconsole-plugins/event/src/main/resources/OSGI-INF/l10n/bundle_de.properties
+++ b/webconsole-plugins/event/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