Fix server issues after upgrading to Eclipse 2022-03
diff --git a/core/tests/org.eclipse.hawk.timeaware.tests/META-INF/MANIFEST.MF b/core/tests/org.eclipse.hawk.timeaware.tests/META-INF/MANIFEST.MF
index 6c06140..f4cd442 100644
--- a/core/tests/org.eclipse.hawk.timeaware.tests/META-INF/MANIFEST.MF
+++ b/core/tests/org.eclipse.hawk.timeaware.tests/META-INF/MANIFEST.MF
@@ -19,7 +19,6 @@
org.eclipse.core.runtime,
org.eclipse.emf.ecore;visibility:=reexport,
org.eclipse.hawk.epsilon;bundle-version="2.0.0",
- javax.servlet;bundle-version="3.1.0",
org.eclipse.hawk.jgit;bundle-version="2.0.0",
org.eclipse.jgit;bundle-version="5.5.0",
com.github.peterwippermann.junit4.parameterizedsuite_1.1.0;bundle-version="1.1.0"
diff --git a/server/plugins/org.eclipse.hawk.service.cli/META-INF/MANIFEST.MF b/server/plugins/org.eclipse.hawk.service.cli/META-INF/MANIFEST.MF
index eaa44fb..7fe0c51 100644
--- a/server/plugins/org.eclipse.hawk.service.cli/META-INF/MANIFEST.MF
+++ b/server/plugins/org.eclipse.hawk.service.cli/META-INF/MANIFEST.MF
@@ -7,7 +7,6 @@
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.equinox.console,
org.slf4j.api;bundle-version="1.7.2",
- org.eclipse.equinox.ds;bundle-version="1.4.200",
org.apache.thrift;bundle-version="0.9.2",
org.apache.httpcomponents.httpcore;bundle-version="4.3.3",
org.apache.httpcomponents.httpclient;bundle-version="4.3.6",
diff --git a/server/plugins/org.eclipse.hawk.service.server.cli/META-INF/MANIFEST.MF b/server/plugins/org.eclipse.hawk.service.server.cli/META-INF/MANIFEST.MF
index f9568b0..00ce337 100644
--- a/server/plugins/org.eclipse.hawk.service.server.cli/META-INF/MANIFEST.MF
+++ b/server/plugins/org.eclipse.hawk.service.server.cli/META-INF/MANIFEST.MF
@@ -7,7 +7,6 @@
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.equinox.console,
- org.eclipse.equinox.ds,
org.eclipse.hawk.core,
org.eclipse.hawk.osgiserver
Export-Package: org.eclipse.hawk.service.server.cli
diff --git a/server/plugins/org.eclipse.hawk.service.server.gzip/src/org/eclipse/hawk/service/server/gzip/Customizer.java b/server/plugins/org.eclipse.hawk.service.server.gzip/src/org/eclipse/hawk/service/server/gzip/Customizer.java
index 4b765ee..8891f39 100644
--- a/server/plugins/org.eclipse.hawk.service.server.gzip/src/org/eclipse/hawk/service/server/gzip/Customizer.java
+++ b/server/plugins/org.eclipse.hawk.service.server.gzip/src/org/eclipse/hawk/service/server/gzip/Customizer.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2015 University of York.
+ * Copyright (c) 2015-2022 University of York, Antonio Garcia-Dominguez.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License 2.0 which is available at
@@ -17,7 +17,6 @@
package org.eclipse.hawk.service.server.gzip;
import java.util.Dictionary;
-import java.util.zip.Deflater;
import org.eclipse.equinox.http.jetty.JettyCustomizer;
import org.eclipse.jetty.server.handler.ContextHandler;
@@ -29,7 +28,6 @@
public Object customizeContext(Object context, Dictionary<String, ?> settings) {
if (context instanceof ContextHandler) {
final GzipHandler gzipHandler = new GzipHandler();
- gzipHandler.setCompressionLevel(Deflater.BEST_COMPRESSION);
gzipHandler.addIncludedMimeTypes("application/x-thrift");
final ContextHandler contextHandler = (ContextHandler)context;
contextHandler.insertHandler(gzipHandler);
diff --git a/server/plugins/org.eclipse.hawk.service.server.users.cli/META-INF/MANIFEST.MF b/server/plugins/org.eclipse.hawk.service.server.users.cli/META-INF/MANIFEST.MF
index e24ad0a..4c7b67b 100644
--- a/server/plugins/org.eclipse.hawk.service.server.users.cli/META-INF/MANIFEST.MF
+++ b/server/plugins/org.eclipse.hawk.service.server.users.cli/META-INF/MANIFEST.MF
@@ -7,7 +7,6 @@
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Require-Bundle: org.eclipse.core.runtime;bundle-version="3.10.0",
org.eclipse.equinox.console;bundle-version="1.1.0",
- org.eclipse.equinox.ds;bundle-version="1.4.200",
org.apache.thrift;bundle-version="0.9.3",
org.eclipse.hawk.service.api;bundle-version="1.0.0",
org.slf4j.api;bundle-version="1.7.2",
diff --git a/server/plugins/org.eclipse.hawk.service.server.users.servlet/META-INF/MANIFEST.MF b/server/plugins/org.eclipse.hawk.service.server.users.servlet/META-INF/MANIFEST.MF
index 0d6eb6a..9167738 100644
--- a/server/plugins/org.eclipse.hawk.service.server.users.servlet/META-INF/MANIFEST.MF
+++ b/server/plugins/org.eclipse.hawk.service.server.users.servlet/META-INF/MANIFEST.MF
@@ -10,8 +10,8 @@
org.slf4j.api;bundle-version="1.7.2",
org.apache.thrift;bundle-version="0.9.3",
org.eclipse.hawk.service.api;bundle-version="1.0.0",
- javax.servlet;bundle-version="3.0.0",
- org.apache.commons.beanutils;bundle-version="1.8.0"
+ org.apache.commons.beanutils;bundle-version="1.8.0",
+ jakarta.servlet-api;bundle-version="4.0.0"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy
Bundle-ClassPath: lib/mapdb-1.0.9.jar,
diff --git a/server/releng/org.eclipse.hawk.service.server.feature/feature.xml b/server/releng/org.eclipse.hawk.service.server.feature/feature.xml
index 11dd6c7..23d72dd 100644
--- a/server/releng/org.eclipse.hawk.service.server.feature/feature.xml
+++ b/server/releng/org.eclipse.hawk.service.server.feature/feature.xml
@@ -1,5 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
-<feature id="org.eclipse.hawk.service.server.feature" label="Hawk Integration - Server Feature" version="2.1.0.qualifier" provider-name="Eclipse.org">
+<feature
+ id="org.eclipse.hawk.service.server.feature"
+ label="Hawk Integration - Server Feature"
+ version="2.1.0.qualifier"
+ provider-name="Eclipse.org">
<description>
This feature brings together the basic components needed for the Hawk server. The Hawk servlets are not included here.
@@ -154,13 +158,27 @@
</license>
<requires>
- <import plugin="org.apache.thrift" version="0.9.2" match="greaterOrEqual"/>
<import plugin="org.slf4j.api" version="1.7.2" match="greaterOrEqual"/>
- <import plugin="org.eclipse.hawk.service.artemis" version="1.0.0" match="greaterOrEqual"/>
- <import plugin="org.eclipse.core.runtime" version="3.10.0" match="greaterOrEqual"/>
<import plugin="ch.qos.logback.classic" version="1.0.7.v20121108-1250" match="greaterOrEqual"/>
- <import plugin="org.eclipse.jetty.http" version="8.1.16" match="greaterOrEqual"/>
<import plugin="org.eclipse.equinox.http.jetty" version="3.0.200" match="greaterOrEqual"/>
+ <import plugin="org.eclipse.core.runtime" version="3.10.0" match="greaterOrEqual"/>
+ <import plugin="org.eclipse.hawk.service.artemis" version="1.0.0" match="greaterOrEqual"/>
+ <import plugin="org.apache.thrift" version="0.9.3" match="perfect"/>
+ <import plugin="org.eclipse.hawk.service.artemis" version="2.0.0" match="greaterOrEqual"/>
+ <import plugin="com.google.guava" version="27.1.0" match="greaterOrEqual"/>
+ <import plugin="javax.annotation" version="1.2.0" match="greaterOrEqual"/>
+ <import plugin="org.eclipse.jetty.http" version="9.4.10" match="greaterOrEqual"/>
+ <import plugin="org.eclipse.jetty.server" version="9.4.10" match="greaterOrEqual"/>
+ <import plugin="org.eclipse.equinox.http.registry" version="1.1.300" match="greaterOrEqual"/>
+ <import plugin="org.apache.thrift" version="0.9.3" match="greaterOrEqual"/>
+ <import plugin="org.eclipse.hawk.service.api" version="1.0.0" match="greaterOrEqual"/>
+ <import plugin="org.apache.commons.beanutils" version="1.8.0" match="greaterOrEqual"/>
+ <import plugin="jakarta.servlet-api" version="4.0.0" match="greaterOrEqual"/>
+ <import plugin="org.eclipse.equinox.console"/>
+ <import plugin="org.eclipse.hawk.core"/>
+ <import plugin="org.eclipse.hawk.osgiserver"/>
+ <import plugin="org.eclipse.equinox.security"/>
+ <import plugin="org.eclipse.hawk.service.server.users.servlet" version="1.0.0" match="greaterOrEqual"/>
</requires>
<plugin
@@ -269,4 +287,11 @@
version="0.0.0"
unpack="false"/>
+ <plugin
+ id="org.slf4j.api"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
</feature>
diff --git a/server/releng/org.eclipse.hawk.service.server.product/hawk.server.nogpl.product b/server/releng/org.eclipse.hawk.service.server.product/hawk.server.nogpl.product
index 2054452..e95ceea 100644
--- a/server/releng/org.eclipse.hawk.service.server.product/hawk.server.nogpl.product
+++ b/server/releng/org.eclipse.hawk.service.server.product/hawk.server.nogpl.product
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<?pde version="3.5"?>
-<product name="Server Product" uid="org.eclipse.hawk.service.server.product.nogplserver" id="org.eclipse.hawk.service.server.product.nogplserver" application="org.eclipse.hawk.service.server.application.serverapp" version="2.1.0.qualifier" useFeatures="true" includeLaunchers="true">
+<product name="Server Product" uid="org.eclipse.hawk.service.server.product.nogplserver" id="org.eclipse.hawk.service.server.product.nogplserver" application="org.eclipse.hawk.service.server.application.serverapp" version="2.2.0.qualifier" useFeatures="true" includeLaunchers="true">
<configIni use="default">
</configIni>
@@ -70,7 +70,6 @@
<feature id="org.eclipse.equinox.p2.rcp.feature"/>
<feature id="org.eclipse.e4.rcp"/>
<feature id="org.eclipse.equinox.p2.user.ui"/>
- <feature id="org.eclipse.ecf.filetransfer.httpclient45.feature"/>
<feature id="org.eclipse.ecf.core.ssl.feature"/>
<feature id="org.eclipse.ecf.filetransfer.ssl.feature"/>
<feature id="org.eclipse.ecf.core.feature"/>
