Remove javax.servlet spec from exemplary war file builds
The servlet spec is required during build time only, and used to be
contributed by the javax.servlet bundle. With the upgrade of the spec
version, these Java packages are not contributed by the new
org.eclipse.jetty.servlet-api bundle which also needs to be excluded
from the .war files.
Create additional exclude rules for all three example products.
Change-Id: I2907c74cecb1c2784f14c8ed1cbbf6d94e5963cf
Signed-off-by: Markus Knauer <mknauer@eclipsesource.com>
diff --git a/releng/org.eclipse.rap.examples.build/controlsdemo/assembly.xml b/releng/org.eclipse.rap.examples.build/controlsdemo/assembly.xml
index ce5648d..e5bba1d 100644
--- a/releng/org.eclipse.rap.examples.build/controlsdemo/assembly.xml
+++ b/releng/org.eclipse.rap.examples.build/controlsdemo/assembly.xml
@@ -10,6 +10,7 @@
<outputDirectory>/WEB-INF</outputDirectory>
<excludes>
<exclude>plugins/javax.servlet*.jar</exclude>
+ <exclude>plugins/org.eclipse.jetty.servlet-api*.jar</exclude>
</excludes>
</fileSet>
<fileSet>
diff --git a/releng/org.eclipse.rap.examples.build/controlsdemo/pom.xml b/releng/org.eclipse.rap.examples.build/controlsdemo/pom.xml
index c9dd120..153d4ca 100644
--- a/releng/org.eclipse.rap.examples.build/controlsdemo/pom.xml
+++ b/releng/org.eclipse.rap.examples.build/controlsdemo/pom.xml
@@ -42,7 +42,7 @@
</executions>
</plugin>
- <!-- Remove javax.servlet from the bundles.info -->
+ <!-- Remove servlet spec (old javax.servlet, new o.e.jetty.servlet-api) from the bundles.info -->
<plugin>
<groupId>com.google.code.maven-replacer-plugin</groupId>
<artifactId>maven-replacer-plugin</artifactId>
@@ -66,6 +66,10 @@
<token>reference\\:file\\:javax.servlet.*?jar@4,</token>
<value></value>
</replacement>
+ <replacement>
+ <token>reference\\:file\\:org.eclipse.jetty.servlet-api.*?jar@4,</token>
+ <value></value>
+ </replacement>
</replacements>
<regexFlags>
<regexFlag>CASE_INSENSITIVE</regexFlag>
diff --git a/releng/org.eclipse.rap.examples.build/rapdemo/assembly.xml b/releng/org.eclipse.rap.examples.build/rapdemo/assembly.xml
index ce5648d..e5bba1d 100644
--- a/releng/org.eclipse.rap.examples.build/rapdemo/assembly.xml
+++ b/releng/org.eclipse.rap.examples.build/rapdemo/assembly.xml
@@ -10,6 +10,7 @@
<outputDirectory>/WEB-INF</outputDirectory>
<excludes>
<exclude>plugins/javax.servlet*.jar</exclude>
+ <exclude>plugins/org.eclipse.jetty.servlet-api*.jar</exclude>
</excludes>
</fileSet>
<fileSet>
diff --git a/releng/org.eclipse.rap.examples.build/rapdemo/pom.xml b/releng/org.eclipse.rap.examples.build/rapdemo/pom.xml
index 33155c3..9ce9e48 100644
--- a/releng/org.eclipse.rap.examples.build/rapdemo/pom.xml
+++ b/releng/org.eclipse.rap.examples.build/rapdemo/pom.xml
@@ -42,7 +42,7 @@
</executions>
</plugin>
- <!-- Remove javax.servlet from the bundles.info -->
+ <!-- Remove servlet spec (old javax.servlet, new o.e.jetty.servlet-api) from the bundles.info -->
<plugin>
<groupId>com.google.code.maven-replacer-plugin</groupId>
<artifactId>maven-replacer-plugin</artifactId>
@@ -66,6 +66,10 @@
<token>reference\\:file\\:javax.servlet.*?jar@4,</token>
<value></value>
</replacement>
+ <replacement>
+ <token>reference\\:file\\:org.eclipse.jetty.servlet-api.*?jar@4,</token>
+ <value></value>
+ </replacement>
</replacements>
<regexFlags>
<regexFlag>CASE_INSENSITIVE</regexFlag>
diff --git a/releng/org.eclipse.rap.examples.build/workbenchdemo/assembly.xml b/releng/org.eclipse.rap.examples.build/workbenchdemo/assembly.xml
index ce5648d..e5bba1d 100644
--- a/releng/org.eclipse.rap.examples.build/workbenchdemo/assembly.xml
+++ b/releng/org.eclipse.rap.examples.build/workbenchdemo/assembly.xml
@@ -10,6 +10,7 @@
<outputDirectory>/WEB-INF</outputDirectory>
<excludes>
<exclude>plugins/javax.servlet*.jar</exclude>
+ <exclude>plugins/org.eclipse.jetty.servlet-api*.jar</exclude>
</excludes>
</fileSet>
<fileSet>
diff --git a/releng/org.eclipse.rap.examples.build/workbenchdemo/pom.xml b/releng/org.eclipse.rap.examples.build/workbenchdemo/pom.xml
index be9bc79..695edf6 100644
--- a/releng/org.eclipse.rap.examples.build/workbenchdemo/pom.xml
+++ b/releng/org.eclipse.rap.examples.build/workbenchdemo/pom.xml
@@ -42,7 +42,7 @@
</executions>
</plugin>
- <!-- Remove javax.servlet from the bundles.info -->
+ <!-- Remove servlet spec (old javax.servlet, new o.e.jetty.servlet-api) from the bundles.info -->
<plugin>
<groupId>com.google.code.maven-replacer-plugin</groupId>
<artifactId>maven-replacer-plugin</artifactId>
@@ -66,6 +66,10 @@
<token>reference\\:file\\:javax.servlet.*?jar@4,</token>
<value></value>
</replacement>
+ <replacement>
+ <token>reference\\:file\\:org.eclipse.jetty.servlet-api.*?jar@4,</token>
+ <value></value>
+ </replacement>
</replacements>
<regexFlags>
<regexFlag>CASE_INSENSITIVE</regexFlag>
