FELIX-3268 Update native2ascii plugin to 1.0-beta-1 to support building on Java 7 (thanks Lionel Debroux for providing the patch)
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1215489 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/webconsole-plugins/deppack/pom.xml b/webconsole-plugins/deppack/pom.xml
index 0c764e6..cab7cee 100644
--- a/webconsole-plugins/deppack/pom.xml
+++ b/webconsole-plugins/deppack/pom.xml
@@ -40,7 +40,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>native2ascii-maven-plugin</artifactId>
- <version>1.0-alpha-1</version>
+ <version>1.0-beta-1</version>
<executions>
<execution>
<goals>
diff --git a/webconsole-plugins/ds/pom.xml b/webconsole-plugins/ds/pom.xml
index 40a3224..338f306 100644
--- a/webconsole-plugins/ds/pom.xml
+++ b/webconsole-plugins/ds/pom.xml
@@ -40,7 +40,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>native2ascii-maven-plugin</artifactId>
- <version>1.0-alpha-1</version>
+ <version>1.0-beta-1</version>
<executions>
<execution>
<goals>
diff --git a/webconsole-plugins/event/pom.xml b/webconsole-plugins/event/pom.xml
index b257032..24fb1f6 100644
--- a/webconsole-plugins/event/pom.xml
+++ b/webconsole-plugins/event/pom.xml
@@ -81,7 +81,8 @@
org.apache.felix.webconsole.plugins.event.*
</Private-Package>
<DynamicImport-Package>
- org.osgi.service.event,org.osgi.service.cm
+ org.osgi.service.event,org.osgi.service.cm,
+ javax.servlet,javax.servlet.http
</DynamicImport-Package>
</instructions>
</configuration>
diff --git a/webconsole-plugins/obr/pom.xml b/webconsole-plugins/obr/pom.xml
index c4a88f2..4aafe05 100644
--- a/webconsole-plugins/obr/pom.xml
+++ b/webconsole-plugins/obr/pom.xml
@@ -40,7 +40,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>native2ascii-maven-plugin</artifactId>
- <version>1.0-alpha-1</version>
+ <version>1.0-beta-1</version>
<executions>
<execution>
<goals>
diff --git a/webconsole-plugins/shell/pom.xml b/webconsole-plugins/shell/pom.xml
index 661d3cd..9fa87db 100644
--- a/webconsole-plugins/shell/pom.xml
+++ b/webconsole-plugins/shell/pom.xml
@@ -40,7 +40,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>native2ascii-maven-plugin</artifactId>
- <version>1.0-alpha-1</version>
+ <version>1.0-beta-1</version>
<executions>
<execution>
<goals>
diff --git a/webconsole-plugins/upnp/pom.xml b/webconsole-plugins/upnp/pom.xml
index 413da08..bb091a4 100644
--- a/webconsole-plugins/upnp/pom.xml
+++ b/webconsole-plugins/upnp/pom.xml
@@ -48,7 +48,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>native2ascii-maven-plugin</artifactId>
- <version>1.0-alpha-1</version>
+ <version>1.0-beta-1</version>
<executions>
<execution>
<goals>
diff --git a/webconsole/pom.xml b/webconsole/pom.xml
index 3b3b4cc..2c51ed9 100644
--- a/webconsole/pom.xml
+++ b/webconsole/pom.xml
@@ -69,7 +69,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>native2ascii-maven-plugin</artifactId>
- <version>1.0-alpha-1</version>
+ <version>1.0-beta-1</version>
<executions>
<execution>
<goals>