Merge pull request #139 from Fraunhofer-AISEC/release/7.2.0

Trusted Connector 7.2.0

build.gradle.kts

@@ -25,7 +25,7 @@ licenseReport {
 
 allprojects {
     group = "de.fhg.aisec.ids"
-    version = "7.1.0"
+    version = "7.2.0"
 
     val versionRegex = ".*(rc-?[0-9]*|beta|-b.+)$".toRegex(RegexOption.IGNORE_CASE)
 

gradle/libs.versions.toml

@@ -3,7 +3,7 @@ idscp2 = "0.18.0"
 ktlint = "0.48.2"
 
 # Kotlin library/compiler version
-kotlin = "1.8.0"
+kotlin = "1.8.10"
 kotlinxCoroutines = "1.6.4"
 # HTTP client
 ktor = "2.2.3"
@@ -26,7 +26,7 @@ junit5 = "5.9.2"
 mockito = "5.1.1"
 mapdb = "3.0.9"
 jnrunix = "0.38.19"
-protobuf = "3.21.12"
+protobuf = "3.22.0"
 httpclient = "4.5.14"
 
 # Needed for policy reasoning with 2p (formerly tuProlog)
@@ -35,7 +35,7 @@ commonsText = "1.10.0"
 protonpack = "1.16"
 
 # Needed for ACME module
-acme = "2.15"
+acme = "2.16"
 nanohttpd = "2.3.1"
 
 # Docker API dependencies
@@ -49,20 +49,20 @@ jacksonDatabind = "2.14.2"
 orgJson = "20220320"
 
 # Needed for camel multipart processor
-commonsFileUpload = "1.4"
+commonsFileUpload = "1.5"
 
 # Needed for info model manager
 commonsCli = "1.5.0"
 javaxValidation = "2.0.1.Final"
 
 # Needed for web console
-auth0Jwt = "4.2.2"
+auth0Jwt = "4.3.0"
 swagger = "1.6.9"
-jose4j = "0.9.2"
+jose4j = "0.9.3"
 
 jetty = "9.4.50.v20221201"
 springBoot = "3.0.2"
-springSecurity = "6.0.1"
+springSecurity = "6.0.2"
 bouncyCastle = "1.70"
 
 [libraries]
@@ -158,8 +158,8 @@ swagger = { id = "com.benjaminsproule.swagger", version = "1.0.14" }
 protobuf = { id = "com.google.protobuf",  version = "0.9.2" }
 kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
 kotlin-plugin-spring = { id = "org.jetbrains.kotlin.plugin.spring", version.ref = "kotlin" }
-spotless = { id = "com.diffplug.spotless", version = "6.14.0" }
+spotless = { id = "com.diffplug.spotless", version = "6.15.0" }
 licenseReport = { id = "com.github.jk1.dependency-license-report", version = "2.1" }
-versions = { id = "com.github.ben-manes.versions", version = "0.45.0" }
+versions = { id = "com.github.ben-manes.versions", version = "0.46.0" }
 buildconfig = { id = "com.github.gmazzo.buildconfig", version = "3.1.0" }
 node = { id = "com.github.node-gradle.node", version = "3.5.1" }

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 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.0.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

ids-route-manager/src/main/kotlin/de/fhg/aisec/ids/rm/XmlDeployWatcher.kt

@@ -61,7 +61,7 @@ class XmlDeployWatcher : ApplicationContextAware {
                 FileSystemXmlApplicationContext(arrayOf(xmlPathString), applicationContext).also { ctx ->
                     // Move special beans prefixed with "root" to the root ApplicationContext
                     (ctx.autowireCapableBeanFactory as DefaultListableBeanFactory).let { registry ->
-                        registry.beanDefinitionNames.forEach { LOG.debug("Laoded bean: $it") }
+                        registry.beanDefinitionNames.forEach { LOG.debug("Loaded bean: $it") }
                         registry.beanDefinitionNames
                             .filter { it.startsWith("root") }
                             // Memorize Beans for root ApplicationContext

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

@@ -8,16 +8,16 @@
   },
   "private": true,
   "dependencies": {
-    "@angular/animations": "^15.1.2",
-    "@angular/common": "^15.1.2",
-    "@angular/core": "^15.1.2",
-    "@angular/forms": "^15.1.2",
-    "@angular/platform-browser": "^15.1.2",
-    "@angular/platform-browser-dynamic": "^15.1.2",
-    "@angular/platform-server": "^15.1.2",
-    "@angular/router": "^15.1.2",
+    "@angular/animations": "^15.1.5",
+    "@angular/common": "^15.1.5",
+    "@angular/core": "^15.1.5",
+    "@angular/forms": "^15.1.5",
+    "@angular/platform-browser": "^15.1.5",
+    "@angular/platform-browser-dynamic": "^15.1.5",
+    "@angular/platform-server": "^15.1.5",
+    "@angular/router": "^15.1.5",
     "bootstrap": "^4.2.1",
-    "core-js": "^3.6.4",
+    "core-js": "^3.28.0",
     "deep-equal": "^2.0.1",
     "jquery": "^3.5.1",
     "material-design-lite": "^1.3.0",
@@ -31,29 +31,30 @@
     "zone.js": "~0.11.4"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "^15.1.3",
-    "@angular-eslint/builder": "^15.2.0",
-    "@angular-eslint/eslint-plugin": "^15.2.0",
-    "@angular-eslint/eslint-plugin-template": "^15.2.0",
-    "@angular-eslint/schematics": "^15.2.0",
-    "@angular-eslint/template-parser": "^15.2.0",
-    "@angular/cli": "^15.1.3",
-    "@angular/compiler": "^15.1.2",
-    "@angular/compiler-cli": "^15.1.2",
-    "@types/express": "^4.17.13",
-    "@types/node": "^18.11.18",
+    "@angular-devkit/build-angular": "^15.1.6",
+    "@angular-eslint/builder": "^15.2.1",
+    "@angular-eslint/eslint-plugin": "^15.2.1",
+    "@angular-eslint/eslint-plugin-template": "^15.2.1",
+    "@angular-eslint/schematics": "^15.2.1",
+    "@angular-eslint/template-parser": "^15.2.1",
+    "@angular/cli": "^15.1.6",
+    "@angular/compiler": "^15.1.5",
+    "@angular/compiler-cli": "^15.1.5",
+    "@types/express": "^4.17.17",
+    "@types/node": "^18.14.0",
     "@types/vis": "^4.21.9",
-    "@typescript-eslint/eslint-plugin": "^5.10.1",
-    "@typescript-eslint/parser": "^5.10.1",
-    "@typescript-eslint/typescript-estree": "^5.38.1",
-    "eslint": "^8.8.0",
+    "@typescript-eslint/eslint-plugin": "^5.53.0",
+    "@typescript-eslint/parser": "^5.53.0",
+    "@typescript-eslint/typescript-estree": "^5.53.0",
+    "eslint": "^8.34.0",
     "eslint-plugin-import": "^2.23.4",
-    "eslint-plugin-jsdoc": "^37.7.0",
+    "eslint-plugin-jsdoc": "^40.0.0",
     "eslint-plugin-prefer-arrow": "latest",
-    "typescript": "4.9.4",
+    "typescript": "4.9.5",
     "vis": "^4.20.0"
   },
   "resolutions": {
-    "**/vis/moment": "^2.29.4"
+    "**/vis/moment": "^2.29.4",
+    "**/http-cache-semantics": "^4.1.1"
   }
 }