ref #8868 adding jetty-http to plugin

diff --git a/eu.etaxonomy.taxeditor.webapp/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.webapp/META-INF/MANIFEST.MF
index f89743fbc03b5f99dd2a16f75577b02ae8d17cd9..59e2f72ae39d97eb2a6f77175f40378c5975f39e 100644 (file)
--- a/eu.etaxonomy.taxeditor.webapp/META-INF/MANIFEST.MF
+++ b/eu.etaxonomy.taxeditor.webapp/META-INF/MANIFEST.MF
@@ -21,7 +21,8 @@ Bundle-ClassPath: .,
  lib/jetty-webapp-9.4.26.v20200117.jar,
  lib/jetty-security-9.4.26.v20200117.jar,
  lib/jetty-servlet-9.4.26.v20200117.jar,
- lib/jetty-xml-9.4.26.v20200117.jar
+ lib/jetty-xml-9.4.26.v20200117.jar,
+ lib/jetty-http-9.4.26.v20200117.jar
 Bundle-Vendor: EDIT
 Import-Package: org.eclipse.jface.resource,
  org.eclipse.ui.plugin

diff --git a/eu.etaxonomy.taxeditor.webapp/build.properties b/eu.etaxonomy.taxeditor.webapp/build.properties
index b71b5108fec7cd707d16af4256b523910f17d04c..daadc1e31998bfb3fbe8f2c73e0d564c871cd660 100644 (file)
--- a/eu.etaxonomy.taxeditor.webapp/build.properties
+++ b/eu.etaxonomy.taxeditor.webapp/build.properties
@@ -12,5 +12,6 @@ bin.includes = META-INF/,\
                lib/jetty-webapp-9.4.26.v20200117.jar,\
                lib/jetty-security-9.4.26.v20200117.jar,\
                lib/jetty-servlet-9.4.26.v20200117.jar,\
-               lib/jetty-xml-9.4.26.v20200117.jar
+               lib/jetty-xml-9.4.26.v20200117.jar,\
+               lib/jetty-http-9.4.26.v20200117.jar
 output.. = bin/

diff --git a/eu.etaxonomy.taxeditor.webapp/pom.xml b/eu.etaxonomy.taxeditor.webapp/pom.xml
index 7f3e9c4f319fe1a0de8ff1e143ca10e17394f912..2a533e7b8314cf63fc97594f053ef5984b6608f8 100644 (file)
--- a/eu.etaxonomy.taxeditor.webapp/pom.xml
+++ b/eu.etaxonomy.taxeditor.webapp/pom.xml
@@ -53,7 +53,7 @@
             </goals>
             <configuration>
               <includeArtifactIds>
-                log4j,javax.servlet-api,jetty-server,jetty-util,jetty-webapp,jetty-xml,jetty-servlet,jetty-security
+                log4j,javax.servlet-api,jetty-server,jetty-util,jetty-webapp,jetty-xml,jetty-servlet,jetty-http
               </includeArtifactIds>
               <outputDirectory>
                 ${basedir}/lib

diff --git a/pom.xml b/pom.xml
index 7ae42cf3c1a5e82c4194f120ea88608985b90938..b99b63460f1c18678bd043fddb9c934c5864715f 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -47,8 +47,8 @@
     <module>eu.etaxonomy.taxeditor.application</module>
     <module>eu.etaxonomy.taxeditor.feature.platform</module>
     <module>eu.etaxonomy.taxeditor.feature</module>
-    <module>eu.etaxonomy.taxeditor</module>
     <module>eu.etaxonomy.taxeditor.test</module>
+    <module>eu.etaxonomy.taxeditor</module>
   </modules>
   <scm>
     <connection>scm:git:https://dev.e-taxonomy.eu/git/taxeditor.git