Set correct list of bundles/fragments in config.ini
Bug 421863 - [releng] Wars created by maven build don't work
https://bugs.eclipse.org/bugs/show_bug.cgi?id=421863
- Do not add start level to servletbridge.extensionbundle fragment
in config.ini
- Remove javax.servlet from config.ini
Signed-off-by: Markus Knauer <mknauer@eclipsesource.com>
diff --git a/releng/org.eclipse.rap.examples.build/controlsdemo/product/pom.xml b/releng/org.eclipse.rap.examples.build/controlsdemo/product/pom.xml
index c9c3323..4534a01 100644
--- a/releng/org.eclipse.rap.examples.build/controlsdemo/product/pom.xml
+++ b/releng/org.eclipse.rap.examples.build/controlsdemo/product/pom.xml
@@ -60,8 +60,12 @@
<replacements>
<replacement>
<token>osgi.bundles=</token>
- <value>osgi.bundles=org.eclipse.equinox.servletbridge.extensionbundle@4:start,</value>
- </replacement>
+ <value>osgi.bundles=org.eclipse.equinox.servletbridge.extensionbundle,</value>
+ </replacement>
+ <replacement>
+ <token>reference\\:file\\:javax.servlet.*?jar@4,</token>
+ <value></value>
+ </replacement>
</replacements>
<regexFlags>
<regexFlag>CASE_INSENSITIVE</regexFlag>
diff --git a/releng/org.eclipse.rap.examples.build/rapdemo/product/pom.xml b/releng/org.eclipse.rap.examples.build/rapdemo/product/pom.xml
index e0043cc..92a5bb8 100644
--- a/releng/org.eclipse.rap.examples.build/rapdemo/product/pom.xml
+++ b/releng/org.eclipse.rap.examples.build/rapdemo/product/pom.xml
@@ -60,8 +60,12 @@
<replacements>
<replacement>
<token>osgi.bundles=</token>
- <value>osgi.bundles=org.eclipse.equinox.servletbridge.extensionbundle@4:start,</value>
- </replacement>
+ <value>osgi.bundles=org.eclipse.equinox.servletbridge.extensionbundle,</value>
+ </replacement>
+ <replacement>
+ <token>reference\\:file\\:javax.servlet.*?jar@4,</token>
+ <value></value>
+ </replacement>
</replacements>
<regexFlags>
<regexFlag>CASE_INSENSITIVE</regexFlag>
diff --git a/releng/org.eclipse.rap.examples.build/workbenchdemo/product/pom.xml b/releng/org.eclipse.rap.examples.build/workbenchdemo/product/pom.xml
index 5207f97..c1ad4aa 100644
--- a/releng/org.eclipse.rap.examples.build/workbenchdemo/product/pom.xml
+++ b/releng/org.eclipse.rap.examples.build/workbenchdemo/product/pom.xml
@@ -60,8 +60,12 @@
<replacements>
<replacement>
<token>osgi.bundles=</token>
- <value>osgi.bundles=org.eclipse.equinox.servletbridge.extensionbundle@4:start,</value>
- </replacement>
+ <value>osgi.bundles=org.eclipse.equinox.servletbridge.extensionbundle,</value>
+ </replacement>
+ <replacement>
+ <token>reference\\:file\\:javax.servlet.*?jar@4,</token>
+ <value></value>
+ </replacement>
</replacements>
<regexFlags>
<regexFlag>CASE_INSENSITIVE</regexFlag>
