Upgrade deps

gradle.properties

@@ -1,5 +1,5 @@
-version = 3.1.1
-org.gradle.caching = true
-org.gradle.parallel = false
-org.gradle.daemon = true
-org.gradle.jvmargs = -Xmx2000m
+version=3.1.2
+org.gradle.caching=true
+org.gradle.parallel=false
+org.gradle.daemon=true
+org.gradle.jvmargs=-Xmx2000m

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
+networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

module/api/graphql/build.gradle.kts

@@ -1,7 +1,7 @@
 plugins {
     id("org.openbase.bco")
     id("org.springframework.boot")
-    id("io.spring.dependency-management") version "1.0.11.RELEASE"
+    id("io.spring.dependency-management") version "1.1.2"
 }
 
 dependencies {
@@ -12,12 +12,17 @@ dependencies {
         exclude(group = "org.springframework.boot", module = "spring-boot-starter-tomcat")
     }
     api("org.springframework.boot:spring-boot-starter-jetty:_")
-    implementation("org.springframework.boot:spring-boot-starter-websocket:_") {
+    api("org.springframework.boot:spring-boot-starter-websocket:_") {
         exclude(group = "org.springframework.boot", module = "spring-boot-starter-tomcat")
     }
     api(Spring.boot.webflux)
     api("org.springframework:spring-webmvc:_")
 
+    api("org.eclipse.jetty:jetty-server:11.0.14")
+    api("jakarta.servlet:jakarta.servlet-api:6.0.0")
+
+
+
     api(rootProject.files("lib/external/rejoiner-0.5.0-bco.jar"))
     api(rootProject.files("lib/external/rejoiner-guice-0.5.0-bco.jar"))
 // disabled since rejoiner is linked locally.
@@ -35,7 +40,6 @@ dependencies {
     api("com.google.inject:guice:_")
     api("com.google.guava:guava:_")
     api("net.javacrumbs.future-converter:future-converter-java8-guava:_")
-    api("org.jmdns:jmdns:_")
     api(ReactiveX.rxJava2)
 }
 

module/api/graphql/src/main/java/org/openbase/bco/api/graphql/BcoApiGraphQlSpringLaunchable.kt

@@ -11,7 +11,6 @@ import org.slf4j.LoggerFactory
 import org.springframework.boot.SpringApplication
 import org.springframework.context.ConfigurableApplicationContext
 import java.util.*
-import javax.jmdns.ServiceInfo
 
 /*-
  * #%L
@@ -55,19 +54,19 @@ import javax.jmdns.ServiceInfo
         LOGGER.info("Start webserver...")
         context = SpringApplication.run(BcoGraphQlApiSpringBootApplication::class.java, *JPService.getArgs())
         LOGGER.info("Advertise graphql service...")
-        val qualifiedNameMap = HashMap<ServiceInfo.Fields, String>()
-        qualifiedNameMap[ServiceInfo.Fields.Application] = "http"
-        qualifiedNameMap[ServiceInfo.Fields.Instance] = "graphql-bco-openbase"
-        qualifiedNameMap[ServiceInfo.Fields.Subtype] = "graphql"
+//        val qualifiedNameMap = HashMap<ServiceInfo.Fields, String>()
+//        qualifiedNameMap[ServiceInfo.Fields.Application] = "http"
+//        qualifiedNameMap[ServiceInfo.Fields.Instance] = "graphql-bco-openbase"
+//        qualifiedNameMap[ServiceInfo.Fields.Subtype] = "graphql"
         val propertyMap = HashMap<String, String>()
         propertyMap["bco-uuid"] = UUID.randomUUID().toString()
         propertyMap["path"] = "graphql"
 
         // lookup port
-        context?.getEnvironment()?.getProperty("server.port")?.toInt()?.let { port ->
-            // register service advertising
-            serviceAdvertiser!!.register(qualifiedNameMap, port, 0, 0, false, propertyMap)
-        }
+//        context?.getEnvironment()?.getProperty("server.port")?.toInt()?.let { port ->
+//            // register service advertising
+//            serviceAdvertiser!!.register(qualifiedNameMap, port, 0, 0, false, propertyMap)
+//        }
     }
 
     override fun deactivate() {

module/api/graphql/src/main/java/org/openbase/bco/api/graphql/BcoGraphQlApiSpringBootApplication.kt

@@ -1,7 +1,9 @@
 package org.openbase.bco.api.graphql
 
 import com.google.api.graphql.execution.GuavaListenableFutureSupport
-import com.google.api.graphql.rejoiner.*
+import com.google.api.graphql.rejoiner.GqlInputConverter
+import com.google.api.graphql.rejoiner.Schema
+import com.google.api.graphql.rejoiner.SchemaProviderModule
 import com.google.inject.Guice
 import com.google.inject.Injector
 import com.google.inject.Key
@@ -12,6 +14,10 @@ import graphql.kickstart.execution.context.DefaultGraphQLContext
 import graphql.kickstart.execution.context.GraphQLKickstartContext
 import graphql.kickstart.servlet.context.GraphQLServletContextBuilder
 import graphql.schema.*
+import jakarta.servlet.http.HttpServletRequest
+import jakarta.servlet.http.HttpServletResponse
+import jakarta.websocket.Session
+import jakarta.websocket.server.HandshakeRequest
 import org.dataloader.DataLoader
 import org.dataloader.DataLoaderRegistry
 import org.openbase.bco.api.graphql.batchloader.BCOUnitBatchLoader
@@ -30,10 +36,6 @@ import org.openbase.type.domotic.unit.UnitFilterType
 import org.springframework.beans.factory.annotation.Value
 import org.springframework.boot.autoconfigure.SpringBootApplication
 import org.springframework.context.annotation.Bean
-import javax.servlet.http.HttpServletRequest
-import javax.servlet.http.HttpServletResponse
-import javax.websocket.Session
-import javax.websocket.server.HandshakeRequest
 
 /*-
  * #%L

module/api/graphql/src/main/java/org/openbase/bco/api/graphql/context/BCOGraphQLWebsocketContext.kt

@@ -1,10 +1,10 @@
 package org.openbase.bco.api.graphql.context
 
 import graphql.kickstart.execution.context.GraphQLKickstartContext
+import jakarta.websocket.Session
+import jakarta.websocket.server.HandshakeRequest
 import org.dataloader.DataLoaderRegistry
 import java.util.*
-import javax.websocket.Session
-import javax.websocket.server.HandshakeRequest
 
 /*-
  * #%L

module/api/graphql/src/main/java/org/openbase/bco/api/graphql/context/DefaultBCOGraphQLContext.kt

@@ -1,8 +1,8 @@
 package org.openbase.bco.api.graphql.context
 
+import jakarta.servlet.http.HttpServletRequest
 import org.dataloader.DataLoaderRegistry
 import java.util.*
-import javax.servlet.http.HttpServletRequest
 
 /*-
  * #%L

module/api/graphql/src/main/java/org/openbase/bco/api/graphql/discovery/ServiceAdvertiser.kt

@@ -1,18 +1,14 @@
 package org.openbase.bco.api.graphql.discovery
 
 import org.openbase.jps.core.JPService
-import org.openbase.jul.exception.CouldNotPerformException
 import org.openbase.jul.exception.InstantiationException
 import org.openbase.jul.iface.Shutdownable
 import org.slf4j.LoggerFactory
-import java.io.IOException
 import java.net.InetAddress
 import java.net.NetworkInterface
 import java.net.SocketException
 import java.net.UnknownHostException
 import java.util.*
-import javax.jmdns.JmDNS
-import javax.jmdns.ServiceInfo
 
 
 /*-
@@ -36,10 +32,10 @@ import javax.jmdns.ServiceInfo
  * <http://www.gnu.org/licenses/gpl-3.0.html>.
  * #L%
  */   class ServiceAdvertiser private constructor() : Shutdownable {
-    private val domainNameServices: List<JmDNS>
+//    private val domainNameServices: List<JmDNS>
 
     init {
-        domainNameServices = ArrayList()
+//        domainNameServices = ArrayList()
 
         // skip advertising in debug mode
         if (!JPService.debugMode()) {
@@ -69,40 +65,40 @@ import javax.jmdns.ServiceInfo
         }
     }
 
-    @Throws(CouldNotPerformException::class)
-    fun register(
-        qualifiedNameMap: HashMap<ServiceInfo.Fields, String>?,
-        port: Int,
-        weight: Int,
-        priority: Int,
-        persistent: Boolean,
-        props: Map<String, *>?,
-    ): List<ServiceInfo> {
-        return try {
-            val serviceInfoList: MutableList<ServiceInfo> = ArrayList()
-            for (domainNameService in domainNameServices) {
-
-                // Register the service
-                val serviceInfo = ServiceInfo.create(qualifiedNameMap, port, weight, priority, false, props)
-                domainNameService.registerService(serviceInfo)
-                serviceInfoList.add(serviceInfo)
-            }
-            serviceInfoList
-        } catch (ex: IOException) {
-            throw CouldNotPerformException("Could not register service!", ex)
-        }
-    }
-
-    fun deregisterService(serviceInfo: ServiceInfo?) {
-        for (domainNameService in domainNameServices) {
-            domainNameService.unregisterService(serviceInfo)
-        }
-    }
+//    @Throws(CouldNotPerformException::class)
+//    fun register(
+//        qualifiedNameMap: HashMap<ServiceInfo.Fields, String>?,
+//        port: Int,
+//        weight: Int,
+//        priority: Int,
+//        persistent: Boolean,
+//        props: Map<String, *>?,
+//    ): List<ServiceInfo> {
+//        return try {
+//            val serviceInfoList: MutableList<ServiceInfo> = ArrayList()
+//            for (domainNameService in domainNameServices) {
+//
+//                // Register the service
+//                val serviceInfo = ServiceInfo.create(qualifiedNameMap, port, weight, priority, false, props)
+//                domainNameService.registerService(serviceInfo)
+//                serviceInfoList.add(serviceInfo)
+//            }
+//            serviceInfoList
+//        } catch (ex: IOException) {
+//            throw CouldNotPerformException("Could not register service!", ex)
+//        }
+//    }
+
+//    fun deregisterService(serviceInfo: ServiceInfo?) {
+//        for (domainNameService in domainNameServices) {
+//            domainNameService.unregisterService(serviceInfo)
+//        }
+//    }
 
     override fun shutdown() {
-        for (domainNameService in domainNameServices) {
-            domainNameService.unregisterAllServices()
-        }
+//        for (domainNameService in domainNameServices) {
+//            domainNameService.unregisterAllServices()
+//        }
     }
 
     companion object {