From 5fc9a3557908ce0ae5938c19d97b23478e66d031 Mon Sep 17 00:00:00 2001
From: Ainur <59531286+yagudin10@users.noreply.github.com>
Date: Thu, 6 Apr 2023 20:26:48 +0400
Subject: [PATCH] CB-2997 jetty server bundle (#1587)
* CB-2997 jetty server bundle
* CB-2997 remove jetty dependencies
---
server/bundles/io.cloudbeaver.server/META-INF/MANIFEST.MF | 6 +-----
server/features/io.cloudbeaver.server.feature/feature.xml | 5 -----
2 files changed, 1 insertion(+), 10 deletions(-)
diff --git a/server/bundles/io.cloudbeaver.server/META-INF/MANIFEST.MF b/server/bundles/io.cloudbeaver.server/META-INF/MANIFEST.MF
index dd9bfd136d..64985c57ca 100644
--- a/server/bundles/io.cloudbeaver.server/META-INF/MANIFEST.MF
+++ b/server/bundles/io.cloudbeaver.server/META-INF/MANIFEST.MF
@@ -15,14 +15,10 @@ Require-Bundle: org.eclipse.core.runtime;visibility:=reexport,
org.jkiss.utils;visibility:=reexport,
org.jkiss.dbeaver.model.sql;visibility:=reexport,
org.jkiss.dbeaver.data.gis,
- org.eclipse.jetty.server;visibility:=reexport,
- org.eclipse.jetty.servlet;visibility:=reexport,
- org.eclipse.jetty.http,
- org.eclipse.jetty.util;visibility:=reexport,
+ org.jkiss.bundle.jetty.server;visibility:=reexport,
com.google.gson;visibility:=reexport,
org.jkiss.bundle.graphql.java;visibility:=reexport,
org.jkiss.bundle.apache.dbcp,
- org.jkiss.bundle.jetty.websocket,
org.jkiss.dbeaver.net.ssh,
io.cloudbeaver.model;visibility:=reexport,
io.cloudbeaver.service.security;visibility:=reexport
diff --git a/server/features/io.cloudbeaver.server.feature/feature.xml b/server/features/io.cloudbeaver.server.feature/feature.xml
index ef8d5f882f..9e3a56fdd1 100644
--- a/server/features/io.cloudbeaver.server.feature/feature.xml
+++ b/server/features/io.cloudbeaver.server.feature/feature.xml
@@ -45,9 +45,4 @@
-
-
-
-
-