Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/jul
2 changes: 1 addition & 1 deletion lib/type
11 changes: 5 additions & 6 deletions module/api/graphql/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,25 +1,24 @@

plugins {
id("org.openbase.bco")
//id("org.springframework.boot") version "2.4.0"
//id("io.spring.dependency-management") version "1.0.11.RELEASE"
id("org.springframework.boot") version "2.6.0"
id("io.spring.dependency-management") version "1.0.11.RELEASE"
}

dependencies {
api(project(":bco.dal.remote"))
api("com.graphql-java-kickstart:graphql-spring-boot-starter:8.0.0") {
exclude(group = "org.springframework.boot", module = "spring-boot-starter-tomcat")
}
api("io.reactivex:rxjava:1.3.8")
api("org.springframework.boot:spring-boot-starter-jetty:2.4.0")
api("org.springframework:spring-webflux:5.3.1")
api("org.springframework.boot:spring-boot-starter-jetty:2.6.0")
api("org.springframework.boot:spring-boot-starter-webflux:2.6.0")
api("com.google.api.graphql:rejoiner:0.3.1") {
exclude(group = "com.graphql-java", module = "graphql-java")
}
api("com.google.guava:guava:28.0-jre")
api("net.javacrumbs.future-converter:future-converter-java8-guava:1.2.0")
api("org.jmdns:jmdns:3.5.6")
api("io.reactivex.rxjava2:rxjava:2.2.20")
api("io.reactivex.rxjava2:rxjava:2.2.21")
}

description = "BCO GraphQL API"

This file was deleted.

This file was deleted.

8 changes: 4 additions & 4 deletions module/api/graphql/src/main/resources/application.properties
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@ server.port=13781
spring.main.banner-mode=off

# SSL
server.ssl.key-store=classpath:dev-keystore.p12
server.ssl.key-store-password=WrCqBj8WV/eeXZIW
#server.ssl.key-store=classpath:dev-keystore.p12
#server.ssl.key-store-password=WrCqBj8WV/eeXZIW

# JKS or PKCS12
server.ssl.key-store-type=PKCS12
server.ssl.key-alaias=basecubeone
#server.ssl.key-store-type=PKCS12
#server.ssl.key-alaias=basecubeone


graphql:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ public static void main(final String[] args) {
/**
* API Launcher
*/
// launcher.add(BcoApiGraphQlLauncher.class);
launcher.add(BcoApiGraphQlLauncher.class);

/**
* Configure dynamic Device Manager Launcher
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ protected void verifyPublication(final Transform transformation, String targetFr
if (transformation.equalsWithoutTime(GlobalTransformReceiver.getInstance().lookupTransform(targetFrame, sourceFrame, System.currentTimeMillis()))) {
// was published
if (!JPService.testMode() && JPService.verboseMode()) {
logger.info("Published " + targetFrame + " to " + sourceFrame);
logger.debug("Published " + targetFrame + " to " + sourceFrame);
}
return;
}
Expand Down
16 changes: 16 additions & 0 deletions versions.properties
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,22 @@
#### suppress inspection "SpellCheckingInspection" for whole file
#### suppress inspection "UnusedProperty" for whole file

version.com.graphql-java..graphql-java-extended-scalars=17.0
## # available=2018-10-05T23-44-12-5312ccd
## # available=2019-08-31T02-34-04-3decba9
## # available=2021-03-30T00-21-22-0d32e2f-SNAPSHOT
## # available=2021-03-30T00-26-04-4e02150
## # available=2021-03-30T02-07-32-573beab
## # available=2021-03-30T02-55-48-f03414a
## # available=2021-03-31T04-38-21-f03414a
## # available=2021-03-29T23-28-56-0d32e2f-SNAPSHOT
## # available=2021-04-09T04-01-28-f4f9cb9
## # available=2021-06-29T01-19-32-8e19827
## # available=2021-07-20T10-05-45-ac72af3
## # available=2021-08-03T09-10-50-aff4d46
## # available=2021-08-15T23-45-48-a9f6ec6
## # available=2021-10-11T21-35-35-49138ff

version.org.openbase..jul.communication.controller=3.0-SNAPSHOT

version.org.openbase..jul.communication.mqtt=3.0-SNAPSHOT
Expand Down