dbeaver/pro#1962 eclipse 2023 09 2 (#2036)

* dbeaver/pro#1962 Servlet API 4.x deps

* dbeaver/pro#1962 Redundant SLF4J dep removed

* dbeaver/pro#1962 SLF4J binding fix + servlet API version

* dbeaver/pro#1962 add cloudbeaver slf4j binding

* dbeaver/pro#1962 Logging

* dbeaver/pro#1962 Logging fix

---------

Co-authored-by: Aleksandr Skoblikov <[email protected]>

server/bundles/io.cloudbeaver.model/META-INF/MANIFEST.MF

@@ -8,7 +8,7 @@ Bundle-Release-Date: 20231009
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Bundle-ActivationPolicy: lazy
 Bundle-ClassPath: .
-Require-Bundle:  org.jkiss.dbeaver.data.gis;visibility:=reexport,
+Require-Bundle: org.jkiss.dbeaver.data.gis;visibility:=reexport,
  org.jkiss.dbeaver.model;visibility:=reexport,
  org.jkiss.dbeaver.model.sm;visibility:=reexport,
  org.jkiss.dbeaver.model.event;visibility:=reexport,
@@ -18,7 +18,7 @@ Require-Bundle:  org.jkiss.dbeaver.data.gis;visibility:=reexport,
  org.jkiss.bundle.graphql.java;visibility:=reexport,
  org.jkiss.bundle.apache.dbcp,
  com.google.gson;visibility:=reexport,
- jakarta.servlet-api;visibility:=reexport
+ jakarta.servlet-api;bundle-version="[4.0.0,4.0.0]";visibility:=reexport
 Export-Package: io.cloudbeaver,
  io.cloudbeaver.auth,
  io.cloudbeaver.auth.provider,

server/bundles/io.cloudbeaver.slf4j/META-INF/MANIFEST.MF

@@ -0,0 +1,15 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Vendor: DBeaver Corp
+Bundle-Name: CloudBeaver SLF4j Binding
+Bundle-SymbolicName: io.cloudbeaver.slf4j;singleton:=true
+Bundle-Version: 1.0.0.qualifier
+Bundle-Release-Date: 20231009
+Bundle-RequiredExecutionEnvironment: JavaSE-11
+Bundle-ActivationPolicy: lazy
+Bundle-ClassPath: .
+Fragment-Host: slf4j.api
+Require-Bundle: ch.qos.logback.core,
+ ch.qos.logback.classic
+Automatic-Module-Name: io.cloudbeaver.slf4j
+Provide-Capability: osgi.serviceloader;osgi.serviceloader="org.slf4j.spi.SLF4JServiceProvider"

server/bundles/io.cloudbeaver.slf4j/META-INF/services/org.slf4j.spi.SLF4JServiceProvider

@@ -0,0 +1 @@
+io.cloudbeaver.slf4j.CloudBeaverLogServiceProvider

server/bundles/io.cloudbeaver.slf4j/build.properties

@@ -0,0 +1,5 @@
+source.. = src/
+output.. = target/classes/
+bin.includes = .,\
+ META-INF/,\
+ plugin.xml

server/bundles/io.cloudbeaver.slf4j/plugin.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.2"?>
+
+<plugin>
+</plugin>

server/bundles/io.cloudbeaver.slf4j/pom.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+         xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>io.cloudbeaver</groupId>
+        <artifactId>bundles</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+        <relativePath>../</relativePath>
+    </parent>
+    <artifactId>io.cloudbeaver.slf4j</artifactId>
+    <version>1.0.0-SNAPSHOT</version>
+    <packaging>eclipse-plugin</packaging>
+
+</project>

server/bundles/io.cloudbeaver.slf4j/src/io.cloudbeaver.slf4j/CloudBeaverLogServiceProvider.java

@@ -0,0 +1,24 @@
+/*
+ * DBeaver - Universal Database Manager
+ * Copyright (C) 2010-2023 DBeaver Corp and others
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.cloudbeaver.slf4j;
+
+import ch.qos.logback.classic.spi.LogbackServiceProvider;
+
+public class CloudBeaverLogServiceProvider extends LogbackServiceProvider {
+    public CloudBeaverLogServiceProvider() {
+    }
+}

server/bundles/pom.xml

@@ -15,6 +15,7 @@
     <modules>
         <module>io.cloudbeaver.model</module>
         <module>io.cloudbeaver.server</module>
+        <module>io.cloudbeaver.slf4j</module>
 
         <module>io.cloudbeaver.service.admin</module>
         <module>io.cloudbeaver.service.auth</module>

server/features/io.cloudbeaver.ws.feature/feature.xml

@@ -39,9 +39,9 @@
 
     <!-- Logging -->
 
+    <plugin id="io.cloudbeaver.slf4j" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
     <plugin id="ch.qos.logback.core" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
     <plugin id="ch.qos.logback.classic" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
-    <plugin id="ch.qos.logback.slf4j" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
 
 
 </feature>

server/test/pom.xml

@@ -28,7 +28,7 @@
                         <extraRequirements>
                             <requirement>
                                 <type>eclipse-plugin</type>
-                                <id>ch.qos.logback.slf4j</id>
+                                <id>ch.qos.logback.classic</id>
                                 <versionRange>0.0.0</versionRange>
                             </requirement>
                         </extraRequirements>