Merge branch 'main' of https://github.com/odpi/egeria into egeria-code

.github/ISSUE_TEMPLATE/bug.yml

@@ -6,14 +6,13 @@ description: File a bug/issue
 title: "[BUG] <title>"
 labels: [bug, triage]
 body:
-  - type: checkboxes
+  - type: input
     id: issue_exists
     attributes:
-      label: Is there an existing issue for this?
-      description: "Search to see if an issue already exists for the probem you encountered. This can save you and the maintainers time. Please include any related issues in the other text boxes below ie by #1234 for an egeria issue, or include the URL"
-      options:
-        - label: I have searched the existing issues
-          required: true
+      label: Existing/related issue?
+      description: "Search for related issues. List below as #123456"
+    validations:
+      required: false
   - type: textarea
     attributes:
       label: Current Behavior

.github/ISSUE_TEMPLATE/enhancement.yml

@@ -6,14 +6,13 @@ description: Suggest an Enhancement
 title: "[Enhancement] <title>"
 labels: [enhancement, triage]
 body:
-  - type: checkboxes
+  - type: input
     id: issue_exists
     attributes:
-      label: Is there an existing issue for this?
-      description: "Search to see if an issue already exists for the probem you encountered. This can save you and the maintainers time. Please include any related issues in the other text boxes below ie by #1234 for an egeria issue, or include the URL"
-      options:
-        - label: I have searched the existing issues
-          required: true
+      label: Existing/related issue?
+      description: "Search for related issues. List below as #123456"
+    validations:
+      required: false
   - type: textarea
     attributes:
       label: Please describe the new behavior that that will improve Egeria
@@ -35,10 +34,10 @@ body:
         Tip: You can attach images or log files by clicking this area to highlight it and then dragging files in.
     validations:
       required: false
-  - type: checkboxes
+  - type: input
     id: work_on_it
     attributes:
       label: Would you be prepared to be assigned this issue to work on?
       description: Let us know if you'd be able to be involved in designing and implementing this enhancement
-      options:
-        - label: I can work on this
+    validations:
+      required: false

.github/workflows/linkcheck.yml

@@ -18,7 +18,7 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - name: Link Checker
-        uses: lycheeverse/[email protected].1
+        uses: lycheeverse/[email protected].4
         with:
           # Can switch to true once we run clean
           fail: false

build.gradle

@@ -11,11 +11,11 @@ plugins {
     id "io.freefair.lombok" version "6.5.1"
     id "io.freefair.aggregate-javadoc" version "6.5.1"
     // Checks for unnecessary dependencies
-    id 'com.autonomousapps.dependency-analysis' version "1.13.1"
+    id 'com.autonomousapps.dependency-analysis' version "1.17.0"
     // helps resolve log implementation clashes
     id 'dev.jacomet.logging-capabilities' version "0.10.0"
     // This plugin helps resolve jakarta/javax dev.jacomet.logging-capabilities
-    id 'de.jjohannes.java-ecosystem-capabilities' version "0.6"
+    id 'org.gradlex.java-ecosystem-capabilities' version "1.0"
 }
 
 
@@ -26,12 +26,12 @@ plugins {
 allprojects {
 
     group = 'org.odpi.egeria'
-    version = '3.14-SNAPSHOT'
+    version = '3.15-SNAPSHOT'
 
     // Mostly java, so default to this for now
     apply plugin: 'java'
     apply plugin: 'jacoco'
-    apply plugin: 'de.jjohannes.java-ecosystem-capabilities'
+    apply plugin: 'org.gradlex.java-ecosystem-capabilities'
     apply plugin: 'dev.jacomet.logging-capabilities'
     // As we've migrated from maven - we'll assume all submodules publish directly to maven
     apply plugin: 'maven-publish'
@@ -57,7 +57,7 @@ allprojects {
         antlrVersion = '3.5.3'
         ST4Version = '4.3.4'
         avroVersion = '1.11.1'
-        classgraphVersion = '4.8.149'
+        classgraphVersion = '4.8.151'
         classmateVersion = '1.5.1'
         collections4Version = '4.4'
         commonscodecVersion = '1.15'
@@ -67,44 +67,44 @@ allprojects {
         commonsloggingVersion = '1.2'
         commonstextVersion = '1.10.0'
         commonscliVersion = '1.5.0'
-        elasticsearchVersion = '8.5.0'
+        elasticsearchVersion = '8.5.2'
         findbugsVersion = '3.0.2'
         glassfishVersion = '1.1.4'
         gremlinVersion = '3.5.2'
-        groovyVersion = '3.0.10'
+        groovyVersion = '3.0.13'
         guavaVersion = '31.1-jre'
         hamcrestVersion = '2.2'
         hdrhistogramVersion = '2.1.12'
         hibernatevalidatorVersion = '8.0.0.Final'
         httpclientVersion = '4.5.13'
-        httpcoreVersion = '4.4.15'
-        jacksonVersion = '2.13.4'
-        jacksonDatabindVersion = '2.13.4.2'
+        httpcoreVersion = '4.4.16'
+        jacksonVersion = '2.14.1'
+        jacksonDatabindVersion = '2.14.1'
         jacksonaslVersion = '1.9.14-atlassian-6'
-        jakartaannotationVersion = '1.3.5'
+        jakartaannotationVersion = '2.1.1'
         jakartapersistenceVersion = '3.1.0'
         jakartavalidationVersion = '3.0.2'
-        janusVersion = '0.6.2'
-        javassistVersion = '3.29.0-GA'
+        janusVersion = '0.6.1'
+        javassistVersion = '3.29.2-GA'
         jaxbVersion = '2.3.1'
         jenaVersion = '4.2.0'
         jodatimeVersion = '2.12.1'
         jsonldVersion = '0.13.4'
         junitVersion = '4.13.2'
         junitjupiterVersion = '5.9.1'
-        junitplatformVersion = '1.8.2'
+        junitplatformVersion = '1.9.1'
         jwtVersion = '0.9.1'
         kafkaVersion = '3.3.1'
         lang3Version = '3.12.0'
         logbackVersion = '1.2.11'
         lettuceVersion = '6.2.1.RELEASE'
         luceneVersion = '8.11.1'
-        openlineageVersion = '0.15.1'
+        openlineageVersion = '0.17.0'
         ossVersion = '4.15.0'
-        mockitoVersion = '4.8.1'
+        mockitoVersion = '4.9.0'
         plexusVersion = '3.5.0'
-        prometheusVersion = '1.9.5'
-        nettyVersion = '4.1.84.Final'
+        prometheusVersion = '1.10.2'
+        nettyVersion = '4.1.85.Final'
         quartzVersion = '2.3.2'
         reflectionsVersion = '0.10.2'
         sanitizerVersion = '1.2.3'
@@ -113,27 +113,27 @@ allprojects {
         snakeyamlVersion = '1.33'
         slf4jVersion = '1.7.36'
         snappyVersion = '1.1.8.4'
-        springbootVersion = '2.7.5'
-        springdocVersion = '1.6.12'
+        springbootVersion = '2.7.6'
+        springdocVersion = '1.6.13'
         spotbugsVersion = '4.7.3'
-        springdataVersion = '2.7.5'
+        springdataVersion = '2.7.6'
         springldapVersion = '2.4.1'
-        springsecurityVersion = '5.7.5'
-        swaggerVersion = '2.2.6'
+        springsecurityVersion = '5.8.0'
+        swaggerVersion = '2.2.7'
         testngVersion = '7.6.1'
         thriftVersion = '0.17.0'
-        springwebVersion = '5.3.23'
+        springwebVersion = '5.3.24'
         tinkVersion = '1.7.0'
-        tomcatVersion = '9.0.68'
+        tomcatVersion = '9.0.69'
         validationVersion = '2.0.1.Final'
         antVersion = '1.10.12'
         gsonVersion = '2.10'
-        protobufVersion = '3.21.9'
-        jnrVersion = '3.1.15'
+        jnrVersion = '3.1.16'
+        protobufVersion = '3.21.10'
         cassandraVersion = '4.0.7'
         osgiVersion = '8.0.0'
         log4jVersion = '2.19.0'
-        jacksonjdk8Version = '2.13.4'
+        jacksonjdk8Version = '2.14.1'
         reactivestreamsVersion = '1.0.4'
     }
 
@@ -301,7 +301,7 @@ allprojects {
             runtimeOnly("org.antlr:antlr4:4.11.1")
             runtimeOnly("org.apache.ivy:ivy:2.5.1")
         }
-        implementation platform('net.openhft:chronicle-bom:2.24ea7')
+        implementation platform('net.openhft:chronicle-bom:2.24ea16')
     }
 
     /*

developer-resources/License-Example-Files/License_for_POM_Files.xml

@@ -10,7 +10,7 @@
     <parent>
         <artifactId>egeria</artifactId>
         <groupId>org.odpi.egeria</groupId>
-        <version>3.14-SNAPSHOT</version>
+        <version>3.15-SNAPSHOT</version>
     </parent>
 
     <name>Add module name here</name>

developer-resources/tools/HTTPie-Curl.md

@@ -11,7 +11,7 @@ It uses commands such as:
 
 ```bash
 $ curl --insecure -X GET https://localhost:9443/open-metadata/platform-services/users/test/server-platform/origin
-Egeria OMAG Server Platform (version 3.14-SNAPSHOT)
+Egeria OMAG Server Platform (version 3.15-SNAPSHOT)
 ```
 
 Note that Egeria is using https, so if you have not replaced the provided self-signed certificate, ensure to add '--insecure' to any requests 

gradle/wrapper/gradle-wrapper.properties

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

gradlew

@@ -205,6 +205,12 @@ set -- \
         org.gradle.wrapper.GradleWrapperMain \
         "$@"
 
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
 # Use "xargs" to parse quoted args.
 #
 # With -n1 it outputs one arg per line, with the quotes and backslashes removed.

gradlew.bat

@@ -14,7 +14,7 @@
 @rem limitations under the License.
 @rem
 
-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -25,7 +25,7 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if %ERRORLEVEL% equ 0 goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -75,13 +75,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal

open-metadata-conformance-suite/docs/platform-workbench/test-cases/platform-origin-test-case.md

@@ -37,7 +37,7 @@ open metadata services are activated.
       "successfulAssertions" : [ "Origin descriptor retrieved from platform." ],
       "unsuccessfulAssertions" : [ ],
       "discoveredProperties" : {
-        "Repository origin id" : "Egeria OMAG Server Platform (version 3.14-SNAPSHOT)"
+        "Repository origin id" : "Egeria OMAG Server Platform (version 3.15-SNAPSHOT)"
       }
 }
 ```

open-metadata-conformance-suite/open-metadata-conformance-suite-api/pom.xml

@@ -10,7 +10,7 @@
     <parent>
         <artifactId>open-metadata-conformance-suite</artifactId>
         <groupId>org.odpi.egeria</groupId>
-        <version>3.14-SNAPSHOT</version>
+        <version>3.15-SNAPSHOT</version>
     </parent>
 
     <name>Open Metadata Conformance Suite API</name>

open-metadata-conformance-suite/open-metadata-conformance-suite-client/pom.xml

@@ -10,7 +10,7 @@
     <parent>
         <artifactId>open-metadata-conformance-suite</artifactId>
         <groupId>org.odpi.egeria</groupId>
-        <version>3.14-SNAPSHOT</version>
+        <version>3.15-SNAPSHOT</version>
     </parent>
 
     <name>Open Metadata Conformance Suite Client</name>

open-metadata-conformance-suite/open-metadata-conformance-suite-server/pom.xml

@@ -10,7 +10,7 @@
     <parent>
         <artifactId>open-metadata-conformance-suite</artifactId>
         <groupId>org.odpi.egeria</groupId>
-        <version>3.14-SNAPSHOT</version>
+        <version>3.15-SNAPSHOT</version>
     </parent>
 
     <name>Open Metadata Conformance Suite Server-side</name>

open-metadata-conformance-suite/open-metadata-conformance-suite-spring/pom.xml

@@ -10,7 +10,7 @@
     <parent>
         <artifactId>open-metadata-conformance-suite</artifactId>
         <groupId>org.odpi.egeria</groupId>
-        <version>3.14-SNAPSHOT</version>
+        <version>3.15-SNAPSHOT</version>
     </parent>
 
     <name>Open Metadata Conformance Suite with Spring</name>

open-metadata-conformance-suite/pom.xml

@@ -10,7 +10,7 @@
     <parent>
         <artifactId>egeria</artifactId>
         <groupId>org.odpi.egeria</groupId>
-        <version>3.14-SNAPSHOT</version>
+        <version>3.15-SNAPSHOT</version>
     </parent>
 
     <name>Open Metadata Conformance Suite</name>

open-metadata-distribution/open-metadata-assemblies/pom.xml

@@ -10,7 +10,7 @@
     <parent>
         <artifactId>open-metadata-distribution</artifactId>
         <groupId>org.odpi.egeria</groupId>
-        <version>3.14-SNAPSHOT</version>
+        <version>3.15-SNAPSHOT</version>
     </parent>
 
     <name>Open Metadata Assemblies</name>

open-metadata-distribution/open-metadata-packages/open-metadata-adapter-package/pom.xml

@@ -10,7 +10,7 @@
     <parent>
         <artifactId>open-metadata-packages</artifactId>
         <groupId>org.odpi.egeria</groupId>
-        <version>3.14-SNAPSHOT</version>
+        <version>3.15-SNAPSHOT</version>
     </parent>
 
     <packaging>pom</packaging>

open-metadata-distribution/open-metadata-packages/open-metadata-caller-package/pom.xml

@@ -10,7 +10,7 @@
     <parent>
         <artifactId>open-metadata-packages</artifactId>
         <groupId>org.odpi.egeria</groupId>
-        <version>3.14-SNAPSHOT</version>
+        <version>3.15-SNAPSHOT</version>
     </parent>
 
     <name>Open Metadata Caller Package</name>

open-metadata-distribution/open-metadata-packages/open-metadata-client-package/pom.xml

@@ -10,7 +10,7 @@
     <parent>
         <artifactId>open-metadata-packages</artifactId>
         <groupId>org.odpi.egeria</groupId>
-        <version>3.14-SNAPSHOT</version>
+        <version>3.15-SNAPSHOT</version>
     </parent>
 
     <name>Open Metadata Client Package</name>

open-metadata-distribution/open-metadata-packages/open-metadata-native-package/pom.xml

@@ -10,7 +10,7 @@
     <parent>
         <artifactId>open-metadata-packages</artifactId>
         <groupId>org.odpi.egeria</groupId>
-        <version>3.14-SNAPSHOT</version>
+        <version>3.15-SNAPSHOT</version>
     </parent>
 
     <name>Open Metadata Native Package</name>

open-metadata-distribution/open-metadata-packages/pom.xml

@@ -10,7 +10,7 @@
     <parent>
         <artifactId>open-metadata-distribution</artifactId>
         <groupId>org.odpi.egeria</groupId>
-        <version>3.14-SNAPSHOT</version>
+        <version>3.15-SNAPSHOT</version>
     </parent>
 
     <name>Open Metadata Packages</name>