Merge pull request #783 from assimbly/develop

Release 4.0.1
assimbly · Jun 12, 2023 · db06304 · db06304
2 parents bfe6f55 + a122557
commit db06304
Show file tree

Hide file tree

Showing 58 changed files with 306 additions and 739 deletions.
diff --git a/bin/README.md b/bin/README.md
@@ -52,16 +52,16 @@ with options:
 
 ### Examples:
 
-````
+```
 build full
 build broker default
 build integration full
 build integration
-````
+```
 
 ---
 
-## buildDocker
+##  BuildDocker
 
 Build a local Docker image to Docker Desktop. (Docker Desktop needs to be installed).
 

diff --git a/bin/main/config/application-dev.yml b/bin/main/config/application-dev.yml
@@ -49,7 +49,7 @@ spring:
     console:
       enabled: false
   jpa:
-    database-platform: tech.jhipster.domain.util.FixedH2Dialect
+    database-platform: org.hibernate.dialect.H2Dialect
     database: H2
     show-sql: true
     properties:
@@ -118,7 +118,7 @@ jhipster:
   #enabled: false
   #report-frequency: 60 # in seconds
   logging:
-    use-json-format: false # By default, logs are not in Json format  
+    use-json-format: false # By default, logs are not in Json format
     logstash: # Forward logs to logstash over a socket, used by LoggingConfiguration
       enabled: false
       host: localhost

diff --git a/bin/main/config/application-prod.yml b/bin/main/config/application-prod.yml
@@ -45,7 +45,7 @@ spring:
     hikari:
       auto-commit: false
   jpa:
-    database-platform: tech.jhipster.domain.util.FixedH2Dialect
+    database-platform: org.hibernate.dialect.H2Dialect
     database: H2
     show-sql: false
     properties:
@@ -91,7 +91,7 @@ spring:
 #        ciphers: TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA,TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA,TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 ,TLS_DHE_RSA_WITH_AES_128_GCM_SHA256 ,TLS_DHE_RSA_WITH_AES_256_GCM_SHA384 ,TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256,TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384,TLS_DHE_RSA_WITH_AES_128_CBC_SHA256,TLS_DHE_RSA_WITH_AES_128_CBC_SHA,TLS_DHE_RSA_WITH_AES_256_CBC_SHA256,TLS_DHE_RSA_WITH_AES_256_CBC_SHA,TLS_RSA_WITH_AES_128_GCM_SHA256,TLS_RSA_WITH_AES_256_GCM_SHA384,TLS_RSA_WITH_AES_128_CBC_SHA256,TLS_RSA_WITH_AES_256_CBC_SHA256,TLS_RSA_WITH_AES_128_CBC_SHA,TLS_RSA_WITH_AES_256_CBC_SHA,TLS_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA,TLS_RSA_WITH_CAMELLIA_256_CBC_SHA,TLS_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA,TLS_RSA_WITH_CAMELLIA_128_CBC_SHA
 # ===================================================================
 server:
-  port: 8080  
+  port: 8080
   shutdown: graceful
   compression:
     enabled: true

diff --git a/bin/test/config/application.yml b/bin/test/config/application.yml
@@ -28,7 +28,7 @@ spring:
         hikari:
             auto-commit: false
     jpa:
-        database-platform: io.github.jhipster.domain.util.FixedH2Dialect
+        database-platform: org.hibernate.dialect.H2Dialect
         database: H2
         open-in-view: false
         show-sql: false

diff --git a/build.gradle b/build.gradle
@@ -4,30 +4,30 @@ buildscript {
     repositories {
         mavenLocal()
         mavenCentral()
-		gradlePluginPortal()
+        gradlePluginPortal()
         maven{  name = "Aurea"
-                url "https://int-factory.aurea.com/nexus/content/repositories/sonic-releases/" 
+            url "https://int-factory.aurea.com/nexus/content/repositories/sonic-releases/"
         }
 
         maven{ name = "Assimbly Base"
-                url = uri("https://maven.pkg.github.com/assimbly/base")
-                credentials {
-                    username = project.findProperty("mavenUser") ?: System.getenv("GITHUB_ACTOR")
-                    password = project.findProperty("mavenToken") ?: System.getenv("GITHUB_TOKEN")}
+            url = uri("https://maven.pkg.github.com/assimbly/base")
+            credentials {
+                username = project.findProperty("mavenUser") ?: System.getenv("GITHUB_ACTOR")
+                password = project.findProperty("mavenToken") ?: System.getenv("GITHUB_TOKEN")}
         }
 
         maven{ name = "Assimbly Runtime"
-                url = uri("https://maven.pkg.github.com/assimbly/runtime")
-                credentials {
-                    username = project.findProperty("mavenUser") ?: System.getenv("GITHUB_ACTOR")
-                    password = project.findProperty("mavenToken") ?: System.getenv("GITHUB_TOKEN")}
+            url = uri("https://maven.pkg.github.com/assimbly/runtime")
+            credentials {
+                username = project.findProperty("mavenUser") ?: System.getenv("GITHUB_ACTOR")
+                password = project.findProperty("mavenToken") ?: System.getenv("GITHUB_TOKEN")}
         }
 
         maven{  name = "Assimbly Custom Components"
-                url = uri("https://maven.pkg.github.com/assimbly/custom-components")
-                credentials {
-                    username = project.findProperty("mavenUser") ?: System.getenv("GITHUB_ACTOR")
-                    password = project.findProperty("mavenToken") ?: System.getenv("GITHUB_TOKEN")}
+            url = uri("https://maven.pkg.github.com/assimbly/custom-components")
+            credentials {
+                username = project.findProperty("mavenUser") ?: System.getenv("GITHUB_ACTOR")
+                password = project.findProperty("mavenToken") ?: System.getenv("GITHUB_TOKEN")}
         }
         //maven{ url "http://artifactory-p.svb.org:80/artifactory/repo"}
     }
@@ -44,7 +44,7 @@ plugins {
     id "java"
     id "maven-publish"
     id "idea"
-	id "eclipse"
+    id "eclipse"
     id "jacoco"
     id "org.springframework.boot"
     id "com.google.cloud.tools.jib"
@@ -53,7 +53,7 @@ plugins {
     id "org.liquibase.gradle"
     id "org.sonarqube"
     id "io.spring.nohttp"
-	id 'de.undercouch.download' version '5.3.1'
+    id 'de.undercouch.download' version '5.4.0'
     id "com.github.ben-manes.versions" version "0.46.0"
     //id "com.palantir.graal" version "0.6.0-114-gfe95739"
     //id "org.mikeneck.graalvm-native-image" version "0.3.0"
@@ -65,11 +65,11 @@ tasks.withType(JavaExec) {
 }
 
 group = "org.assimbly.gateway"
-version = '4.0.0'
+version = '4.0.1'
 
 description = ""
 
-assert System.properties["java.specification.version"] == "11" || "12" || "13" || 14 || 15 || 16 || 17 || 18 || 19
+assert System.properties["java.specification.version"] == "11" || "12" || "13" || 14 || 15 || 16 || 17 || 18 || 19 || 20 || 21
 
 apply from: "$rootDir/scripts/upgrade/upgrade.gradle"
 apply from: "$rootDir/scripts/resources/resources.gradle"
@@ -90,14 +90,15 @@ apply plugin: 'eclipse'
 configurations.all {
     exclude group: 'org.slf4j', module: 'slf4j-log4j12'
     exclude group: 'org.jboss.slf4j', module: 'slf4j-jboss-logmanager'
-  	exclude group: "org.slf4j", module: "slf4j-nop"
-  	exclude group: "org.slf4j", module: "slf4j-log4j12"
+    exclude group: "org.slf4j", module: "slf4j-nop"
+    exclude group: "org.slf4j", module: "slf4j-log4j12"
     exclude group: "org.slf4j", module: "slf4j-simple"
     exclude group: "org.apache.logging.log4j", module: 'log4j-slf4j-impl'
     exclude module: 'netty-tcnative-classes'
     exclude group: 'javax.servlet', module: 'servlet-api'
     exclude group: 'javax.persistence', module: 'persistence-api'
     exclude group: 'xerces', module: 'xercesImpl'
+    exclude group: 'org.eclipse.angus', module: 'angus-activation'
 }
 
 if (project.hasProperty("prod") || project.hasProperty("gae")) {
@@ -171,7 +172,7 @@ jib {
 defaultTasks "bootRun"
 
 springBoot {
- 	mainClassName = "org.assimbly.gateway.GatewayApp"
+    mainClassName = "org.assimbly.gateway.GatewayApp"
 }
 
 
@@ -205,7 +206,7 @@ test {
     // uncomment if the tests reports are not generated
     // see https://github.com/jhipster/generator-jhipster/pull/2771 and https://github.com/jhipster/generator-jhipster/pull/4484
     // ignoreFailures true
-    reports.html.enabled = false
+    reports.html.required = false
 }
 
 task integrationTest(type: Test) {
@@ -220,27 +221,27 @@ task integrationTest(type: Test) {
     // uncomment if the tests reports are not generated
     // see https://github.com/jhipster/generator-jhipster/pull/2771 and https://github.com/jhipster/generator-jhipster/pull/4484
     // ignoreFailures true
-    reports.html.enabled = false
+    reports.html.required = false
 }
 
 check.dependsOn integrationTest
 task testReport(type: TestReport) {
-    destinationDir = file("$buildDir/reports/tests")
-    reportOn test
+    destinationDirectory = file("$buildDir/reports/tests")
+    getTestResults()
 }
 
 task integrationTestReport(type: TestReport) {
-    destinationDir = file("$buildDir/reports/tests")
-    reportOn integrationTest
+    destinationDirectory = file("$buildDir/reports/tests")
+    getTestResults()
 }
 
 if (!project.hasProperty("runList")) {
     project.ext.runList = "main"
 }
 
 task getDeps(type: Copy) {
-  from sourceSets.main.runtimeClasspath
-  into 'runtime/'
+    from sourceSets.main.runtimeClasspath
+    into 'runtime/'
 }
 
 
@@ -295,19 +296,20 @@ configurations {
     providedRuntime
     implementation.exclude module: "spring-boot-starter-tomcat"
 
+    liquibaseRuntime.extendsFrom(sourceSets.main.compileClasspath)
+
     compile { transitive = false }
     all {
         resolutionStrategy {
-            // Inherited version from Spring Boot can't be used because of regressions:
-            // https://liquibase.jira.com/browse/CORE-3536 and https://liquibase.jira.com/browse/CORE-3522
-            force 'org.liquibase:liquibase-core:4.6.2'
+            // force to use latest liquibase instead of default by Spring dependencies
+            force 'org.liquibase:liquibase-core:4.22.0'
 
             eachDependency { DependencyResolveDetails details ->
                 if (details.requested.group == 'org.apache.activemq' && details.requested.name.startsWith('artemis') ) {
-                    details.useVersion("2.27.1")
+                    details.useVersion("2.28.0")
                 }
                 if (details.requested.group == 'org.apache.activemq' && details.requested.name.startsWith('activemq') && !details.requested.name.startsWith('activemq-artemis') && !details.requested.name.startsWith('activemq-branding')) {
-                    details.useVersion("5.17.3")
+                    details.useVersion("5.18.1")
                 }
             }
         }
@@ -319,39 +321,40 @@ repositories {
     mavenCentral()
 
     maven{  name = "Aurea"
-                url "https://int-factory.aurea.com/nexus/content/repositories/sonic-releases/" 
+        url "https://int-factory.aurea.com/nexus/content/repositories/sonic-releases/"
     }
 
     maven{ name = "Assimbly Base"
-            url = uri("https://maven.pkg.github.com/assimbly/base")
-            credentials {
-                username = project.findProperty("mavenUser") ?: System.getenv("GITHUB_ACTOR")
-                password = project.findProperty("mavenToken") ?: System.getenv("GITHUB_TOKEN")}
+        url = uri("https://maven.pkg.github.com/assimbly/base")
+        credentials {
+            username = project.findProperty("mavenUser") ?: System.getenv("GITHUB_ACTOR")
+            password = project.findProperty("mavenToken") ?: System.getenv("GITHUB_TOKEN")}
     }
 
     maven{ name = "Assimbly Runtime"
-            url = uri("https://maven.pkg.github.com/assimbly/runtime")
-            credentials {
-                username = project.findProperty("mavenUser") ?: System.getenv("GITHUB_ACTOR")
-                password = project.findProperty("mavenToken") ?: System.getenv("GITHUB_TOKEN")}
+        url = uri("https://maven.pkg.github.com/assimbly/runtime")
+        credentials {
+            username = project.findProperty("mavenUser") ?: System.getenv("GITHUB_ACTOR")
+            password = project.findProperty("mavenToken") ?: System.getenv("GITHUB_TOKEN")}
     }
-    
+
     maven{  name = "Assimbly Custom Components"
-            url = uri("https://maven.pkg.github.com/assimbly/custom-components")
-            credentials {
-                username = project.findProperty("mavenUser") ?: System.getenv("GITHUB_ACTOR")
-                password = project.findProperty("mavenToken") ?: System.getenv("GITHUB_TOKEN")}
+        url = uri("https://maven.pkg.github.com/assimbly/custom-components")
+        credentials {
+            username = project.findProperty("mavenUser") ?: System.getenv("GITHUB_ACTOR")
+            password = project.findProperty("mavenToken") ?: System.getenv("GITHUB_TOKEN")}
     }
     //maven{ url "http://artifactory-p.svb.org:80/artifactory/repo"}
 }
 
 dependencies {
 
-
     implementation group: "org.assimbly", name: "common-base", version: "${version}"
 
-    implementation group: 'tech.jhipster', name: 'jhipster-framework', version: '7.8.1'
-	implementation group: 'net.logstash.logback', name: 'logstash-logback-encoder', version: '7.3'
+    implementation group: 'tech.jhipster', name: 'jhipster-framework', version: '7.9.3'
+    implementation group: 'net.logstash.logback', name: 'logstash-logback-encoder', version: '7.3'
+
+    implementation 'com.mattbertolini:liquibase-slf4j:4.0.0'
 
     implementation group: "tech.jhipster", name: "jhipster-framework"
 
@@ -388,10 +391,9 @@ dependencies {
     implementation "org.hibernate:hibernate-envers"
     implementation "org.hibernate.validator:hibernate-validator"
 
-    implementation "org.liquibase:liquibase-core"
-    liquibaseRuntime "org.liquibase:liquibase-core"
+    implementation "org.liquibase:liquibase-core:4.22.0"
+    liquibaseRuntime "org.liquibase:liquibase-core:4.22.0"
     liquibaseRuntime "org.liquibase.ext:liquibase-hibernate5:${liquibase_hibernate5_version}"
-    liquibaseRuntime sourceSets.main.compileClasspath
 
     implementation "org.springframework.boot:spring-boot-starter-cache"
     implementation "org.springframework.boot:spring-boot-loader-tools"
@@ -404,31 +406,30 @@ dependencies {
 
     implementation "org.springframework.boot:spring-boot-starter-validation"
 
-
-
     //Only one of web server can be active: tomcat, undertow or jetty
 
     //To use Tomcat
     //implementation ("org.springframework.boot:spring-boot-starter-web")
 
     //To use Undertow
-    implementation ("org.springframework.boot:spring-boot-starter-web") {
-        exclude module: "spring-boot-starter-tomcat"
-    }
-    //implementation "org.springframework.boot:spring-boot-starter-undertow"
-
-    //To Use Jetty
     //implementation ("org.springframework.boot:spring-boot-starter-web") {
     //    exclude module: "spring-boot-starter-tomcat"
     //}
-    //implementation 'org.eclipse.jetty:jetty-quickstart:11.0.12'
+    //implementation "org.springframework.boot:spring-boot-starter-undertow"
+
+    //To Use Jetty
+    implementation ("org.springframework.boot:spring-boot-starter-web") {
+        exclude module: "spring-boot-starter-tomcat"
+    }
     implementation "org.springframework.boot:spring-boot-starter-jetty"
+    //https://www.eclipse.org/jetty/documentation/jetty-9/index.html#quickstart-webapp
+    implementation 'org.eclipse.jetty:jetty-quickstart'
 
     implementation "org.springframework.boot:spring-boot-starter-websocket"
     implementation "org.springframework.boot:spring-boot-starter-thymeleaf"
     implementation "org.zalando:problem-spring-web:0.27.0"
-    implementation "org.springframework.boot:spring-boot-starter-cloud-connectors:2.2.13.RELEASE"
-    implementation "org.springframework.cloud:spring-cloud-spring-service-connector"
+    //implementation "org.springframework.boot:spring-boot-starter-cloud-connectors"
+    //implementation "org.springframework.cloud:spring-cloud-spring-service-connector"
     implementation "org.springframework:spring-context-support"
     implementation "org.springframework:spring-messaging"
     implementation "org.springframework.security:spring-security-config"
@@ -437,18 +438,20 @@ dependencies {
     implementation "org.springframework.security:spring-security-messaging"
     implementation "org.mapstruct:mapstruct:${mapstruct_version}"
     implementation "org.mapstruct:mapstruct-processor:${mapstruct_version}"
-    implementation "mysql:mysql-connector-java"
-    liquibaseRuntime "mysql:mysql-connector-java"
+    implementation "com.mysql:mysql-connector-j"
+    liquibaseRuntime "com.mysql:mysql-connector-j"
 
     implementation 'org.springframework.boot:spring-boot-starter-webflux'
-    implementation "com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.14.2"
+    implementation "com.fasterxml.jackson.dataformat:jackson-dataformat-xml"
     implementation "org.jdom:jdom2:2.0.6.1"
     implementation group: 'org.quartz-scheduler', name: 'quartz', version: '2.3.2'
     implementation "com.warrenstrange:googleauth:1.5.0"
     implementation "org.mongodb:mongo-java-driver:3.5.0"
     implementation "org.mongodb.morphia:morphia:1.3.2"
     implementation "dev.morphia.morphia:core:1.6.1"
+    implementation 'org.yaml:snakeyaml:2.0'
     //implementation "io.hawt:hawtio-springboot:2.17.2"
+    //implementation 'org.crac:crac:1.3.0'
 
     if (project.hasProperty("integration") || project.hasProperty("headless")) {
         implementation group: "org.assimbly", name: "integration-rest", version: "${version}", changing: true
@@ -589,7 +592,7 @@ task cleanResources(type: Delete) {
 }
 
 wrapper {
-    gradleVersion = "7.6.1"
+    gradleVersion = "8.1.1"
 }
 
 /*
@@ -602,9 +605,9 @@ java {
 
 if (project.hasProperty("nodeInstall")) {
     node {
-        version = "16.16.0"
-        npmVersion = "8.19.4"
-        yarnVersion = "1.22.17"
+        version = "18.16.0"
+        npmVersion = "9.5.1"
+        yarnVersion = "1.22.19"
         download = true
     }
 }

diff --git a/data/bindings/activemq-bindings-1.bindings b/data/bindings/activemq-bindings-1.bindings
diff --git a/data/bindings/activemq-bindings-2.bindings b/data/bindings/activemq-bindings-2.bindings
diff --git a/data/journal/activemq-data-1.amq b/data/journal/activemq-data-1.amq
diff --git a/data/journal/activemq-data-2.amq b/data/journal/activemq-data-2.amq