Merge pull request #100 from Fraunhofer-AISEC/dependency-updates

Dependency updates

build.gradle.kts

@@ -4,7 +4,7 @@ import org.yaml.snakeyaml.Yaml
 
 buildscript {
     dependencies {
-        classpath("org.yaml:snakeyaml:1.29")
+        classpath("org.yaml:snakeyaml:1.30")
     }
 }
 
@@ -16,23 +16,23 @@ plugins {
     java
 
     // Spring Boot
-    id("org.springframework.boot") version "2.5.8" apply false
+    id("org.springframework.boot") version "2.6.6" apply false
     id("io.spring.dependency-management") version "1.0.11.RELEASE"
 
     // Other needed plugins
     id("com.moowork.node") version "1.3.1" apply false
-    // Latest version compiled with Java 11
-    id("com.benjaminsproule.swagger") version "1.0.8" apply false
+    id("com.benjaminsproule.swagger") version "1.0.14" apply false
 
     // Protobuf
-    id("com.google.protobuf") version "0.8.17" apply false
+    id("com.google.protobuf") version "0.8.18" apply false
 
     // Kotlin specific
-    kotlin("jvm") version "1.6.10" apply false
-    kotlin("plugin.spring") version "1.6.10" apply false
+    kotlin("jvm") version "1.6.20" apply false
+    kotlin("plugin.spring") version "1.6.20" apply false
 
-    id("com.diffplug.spotless") version "5.11.0"
-    id("com.github.jk1.dependency-license-report") version "1.16"
+    id("com.diffplug.spotless") version "6.4.1"
+    id("com.github.jk1.dependency-license-report") version "2.1"
+    id("com.github.ben-manes.versions") version "0.42.0"
 }
 
 @Suppress("UNCHECKED_CAST")
@@ -46,7 +46,7 @@ licenseReport {
 
 allprojects {
     group = "de.fhg.aisec.ids"
-    version = "6.2.0"
+    version = "6.3.0"
 }
 
 subprojects {

ids-api/build.gradle.kts

@@ -7,8 +7,6 @@ dependencies {
     implementation("de.fraunhofer.iais.eis.ids.infomodel", "java", libraryVersions["infomodel"])
     implementation("org.apache.camel", "camel-core", libraryVersions["camel"])
 
-    compileOnly("org.checkerframework", "checker-qual", libraryVersions["checkerQual"])
-
     testImplementation("junit", "junit", libraryVersions["junit4"])
     testImplementation("org.mockito", "mockito-core", libraryVersions["mockito"])
 }

ids-connector/build.gradle.kts

@@ -9,7 +9,7 @@ val libraryVersions = rootProject.extra.get("libraryVersions") as Map<String, St
 plugins {
     application
     id("org.springframework.boot")
-    id("com.github.gmazzo.buildconfig") version "2.0.2"
+    id("com.github.gmazzo.buildconfig") version "3.0.3"
 
     kotlin("jvm")
     kotlin("plugin.spring")
@@ -36,7 +36,6 @@ dependencies {
     implementation("org.apache.camel.springboot:camel-spring-boot-starter")
     implementation("org.apache.camel.springboot:camel-rest-starter")
     implementation("org.apache.camel.springboot:camel-http-starter")
-
     // IDSCP2
     implementation("de.fhg.aisec.ids", "camel-idscp2", libraryVersions["idscp2"])
     // Guava for weakly-keyed Map

ids-connector/src/main/resources/application.yml

@@ -8,4 +8,4 @@ logging:
 
 spring:
   resources:
-    static-locations: classpath:/www
+    static-locations: classpath:/www/

ids-container-manager/src/main/kotlin/de/fhg/aisec/ids/cm/impl/docker/DockerCM.kt

@@ -22,7 +22,7 @@ package de.fhg.aisec.ids.cm.impl.docker
 import com.amihaiemil.docker.Container
 import com.amihaiemil.docker.Docker
 import com.amihaiemil.docker.Images
-import com.amihaiemil.docker.LocalDocker
+import com.amihaiemil.docker.UnixDocker
 import de.fhg.aisec.ids.api.cm.ApplicationContainer
 import de.fhg.aisec.ids.api.cm.ContainerManager
 import de.fhg.aisec.ids.api.cm.ContainerStatus
@@ -86,11 +86,11 @@ class DockerCM : ContainerManager {
             }
 
         init {
-            try { // We have to modify the thread class loader for docker-java-api to find its
-                // config
+            try {
+                // We have to modify the thread class loader for docker-java-api to find its config
                 val threadContextClassLoader = Thread.currentThread().contextClassLoader
-                Thread.currentThread().contextClassLoader = LocalDocker::class.java.classLoader
-                DOCKER_CLIENT = LocalDocker(File("/var/run/docker.sock"))
+                Thread.currentThread().contextClassLoader = UnixDocker::class.java.classLoader
+                DOCKER_CLIENT = UnixDocker(File("/var/run/docker.sock"))
                 Thread.currentThread().contextClassLoader = threadContextClassLoader
             } catch (x: Exception) {
                 LOG.error("Error initializing docker client", x)

ids-infomodel-manager/build.gradle.kts

@@ -1,7 +1,7 @@
 import org.gradle.plugins.ide.idea.model.IdeaModel
 
 plugins {
-    id("com.github.gmazzo.buildconfig") version "2.0.2"
+    id("com.github.gmazzo.buildconfig") version "3.0.3"
 }
 
 @Suppress("UNCHECKED_CAST")
@@ -33,6 +33,6 @@ dependencies {
     implementation("commons-cli", "commons-cli", libraryVersions["commonsCli"])
     implementation("javax.validation", "validation-api", libraryVersions["javaxValidation"])
     implementation("com.fasterxml.jackson.core", "jackson-annotations", libraryVersions["jackson"])
-    implementation("com.fasterxml.jackson.core", "jackson-databind", libraryVersions["jackson"])
+    implementation("com.fasterxml.jackson.core", "jackson-databind", libraryVersions["jacksonDatabind"])
     implementation("org.springframework.boot:spring-boot-starter")
 }

ids-settings/src/main/kotlin/de/fhg/aisec/ids/settings/ElsaSerializer.kt

@@ -25,7 +25,7 @@ import org.mapdb.Serializer
 import org.mapdb.elsa.ElsaMaker
 import org.mapdb.elsa.ElsaSerializerPojo
 
-class ElsaSerializer<T> : Serializer<T> {
+class ElsaSerializer<T : Any> : Serializer<T> {
     private val serializer: ElsaSerializerPojo = ElsaMaker().make()
 
     override fun serialize(output: DataOutput2, obj: T) {

ids-webconsole/build.gradle.kts

@@ -9,7 +9,7 @@ import com.github.gradle.node.yarn.task.YarnTask
 val libraryVersions = rootProject.extra.get("libraryVersions") as Map<String, String>
 
 plugins {
-    id("com.github.node-gradle.node") version "3.1.1"
+    id("com.github.node-gradle.node") version "3.2.1"
     id("com.benjaminsproule.swagger")
 }
 

ids-webconsole/src/main/angular/package.json

@@ -8,14 +8,14 @@
   },
   "private": true,
   "dependencies": {
-    "@angular/animations": "~13.2.0",
-    "@angular/common": "~13.2.0",
-    "@angular/core": "~13.2.0",
-    "@angular/forms": "~13.2.0",
-    "@angular/platform-browser": "~13.2.0",
-    "@angular/platform-browser-dynamic": "~13.2.0",
-    "@angular/platform-server": "~13.2.0",
-    "@angular/router": "~13.2.0",
+    "@angular/animations": "~13.3.2",
+    "@angular/common": "~13.3.2",
+    "@angular/core": "~13.3.2",
+    "@angular/forms": "~13.3.2",
+    "@angular/platform-browser": "~13.3.2",
+    "@angular/platform-browser-dynamic": "~13.3.2",
+    "@angular/platform-server": "~13.3.2",
+    "@angular/router": "~13.3.2",
     "bootstrap": "^4.2.1",
     "core-js": "^3.6.4",
     "deep-equal": "^2.0.1",
@@ -36,9 +36,9 @@
     "@angular-eslint/eslint-plugin-template": "^13.0.1",
     "@angular-eslint/schematics": "^13.0.1",
     "@angular-eslint/template-parser": "^13.0.1",
-    "@angular/cli": "~13.2.0",
-    "@angular/compiler": "~13.2.0",
-    "@angular/compiler-cli": "~13.2.0",
+    "@angular/cli": "~13.3.2",
+    "@angular/compiler": "~13.3.2",
+    "@angular/compiler-cli": "~13.3.2",
     "@types/express": "^4.17.13",
     "@types/node": "^17.0.13",
     "@types/vis": "^4.21.9",
@@ -50,5 +50,8 @@
     "eslint-plugin-prefer-arrow": "latest",
     "typescript": "4.5.5",
     "vis": "^4.20.0"
+  },
+  "resolutions": {
+    "**/vis/moment": "^2.29.2"
   }
-}
+}