From 7e82b3d834df8a36fe12aebaaf5f8cab1e5df0a4 Mon Sep 17 00:00:00 2001 From: Steven Green Date: Tue, 12 Apr 2022 21:53:22 -0400 Subject: [PATCH 01/21] Add treatment mapping Signed-off-by: Steven Green --- src/main/resources/TypeDefMappings.json | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/src/main/resources/TypeDefMappings.json b/src/main/resources/TypeDefMappings.json index a42e4da..82f75c6 100644 --- a/src/main/resources/TypeDefMappings.json +++ b/src/main/resources/TypeDefMappings.json @@ -69,6 +69,28 @@ } ] }, + { + "sasCat": "reference.treatmentDefinition", + "omrs": "Asset", + "propertyMappings": [ + { + "sasCat": "instance.name", + "omrs": "qualifiedName" + }, + { + "sasCat": "attribute.creator", + "omrs": "owner" + }, + { + "sasCat": "instance.resourceId", + "omrs": "description" + }, + { + "sasCat": "attribute.dateModified", + "omrs": "latestChange" + } + ] + }, { "sasCat": "dataFlow", "omrs": "Process", From 33dc435a24281a6a8acc62fed23b91ed4d06a660 Mon Sep 17 00:00:00 2001 From: Steven Green Date: Wed, 13 Apr 2022 13:10:53 -0400 Subject: [PATCH 02/21] Add treatment group mapping Signed-off-by: Steven Green --- src/main/resources/TypeDefMappings.json | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/main/resources/TypeDefMappings.json b/src/main/resources/TypeDefMappings.json index a42e4da..e1ded3c 100644 --- a/src/main/resources/TypeDefMappings.json +++ b/src/main/resources/TypeDefMappings.json @@ -21,6 +21,20 @@ } ] }, + { + "sasCat": "reference.treatmentGroup", + "omrs": "Collection", + "propertyMappings": [ + { + "sasCat": "instance.name", + "omrs": "qualifiedName" + }, + { + "sasCat": "instance.resourceId", + "omrs": "description" + } + ] + }, { "sasCat": "reference.file", "omrs": "DataFile", From 545c53c31cb14960df8d41774742c3edfc999eff Mon Sep 17 00:00:00 2001 From: Steven Green Date: Wed, 13 Apr 2022 13:10:53 -0400 Subject: [PATCH 03/21] Add treatment group mapping Signed-off-by: Steven Green --- src/main/resources/TypeDefMappings.json | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/main/resources/TypeDefMappings.json b/src/main/resources/TypeDefMappings.json index 82f75c6..cd3e9b9 100644 --- a/src/main/resources/TypeDefMappings.json +++ b/src/main/resources/TypeDefMappings.json @@ -21,6 +21,20 @@ } ] }, + { + "sasCat": "reference.treatmentGroup", + "omrs": "Collection", + "propertyMappings": [ + { + "sasCat": "instance.name", + "omrs": "qualifiedName" + }, + { + "sasCat": "instance.resourceId", + "omrs": "description" + } + ] + }, { "sasCat": "reference.file", "omrs": "DataFile", From 645ed993327e03e54634f3a57ede7d21d666cc55 Mon Sep 17 00:00:00 2001 From: Steven Green Date: Thu, 28 Apr 2022 15:22:25 -0400 Subject: [PATCH 04/21] Fix SQL mapping and kubernetes ingress Signed-off-by: Steven Green --- deployment/kubernetes/deployment.yaml | 2 ++ src/main/resources/TypeDefMappings.json | 14 +++++++++----- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/deployment/kubernetes/deployment.yaml b/deployment/kubernetes/deployment.yaml index 8756649..74dfc26 100644 --- a/deployment/kubernetes/deployment.yaml +++ b/deployment/kubernetes/deployment.yaml @@ -113,6 +113,7 @@ metadata: sas.com/admin: namespace name: egeria-connector-ingress-open-metadata spec: + ingressClassName: nginx rules: - host: $(INGRESS_HOST) http: @@ -154,6 +155,7 @@ metadata: sas.com/admin: namespace name: egeria-connector-ingress-servers spec: + ingressClassName: nginx rules: - host: $(INGRESS_HOST) http: diff --git a/src/main/resources/TypeDefMappings.json b/src/main/resources/TypeDefMappings.json index cd3e9b9..058b37f 100644 --- a/src/main/resources/TypeDefMappings.json +++ b/src/main/resources/TypeDefMappings.json @@ -129,7 +129,7 @@ }, { "sasCat": "decisionSQLCodeFile", - "omrs": "Asset", + "omrs": "DataFile", "propertyMappings": [ { "sasCat": "instance.name", @@ -140,12 +140,16 @@ "omrs": "description" }, { - "sasCat": "attribute.creator", - "omrs": "owner" + "sasCat": "attribute.dateModified", + "omrs": "modifiedTime" }, { - "sasCat": "attribute.dateModified", - "omrs": "latestChange" + "sasCat": "attribute.dateCreated", + "omrs": "createTime" + }, + { + "sasCat": "constant.SQL code file", + "omrs": "fileType" } ] }, From 81c9ac53f26c9ff0f8a6aa6635298e3f09ce614d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 2 May 2022 01:26:18 +0000 Subject: [PATCH 05/21] chore(deps): bump github/codeql-action from 1 to 2 Bumps [github/codeql-action](https://github.com/github/codeql-action) from 1 to 2. - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/github/codeql-action/compare/v1...v2) --- updated-dependencies: - dependency-name: github/codeql-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/codeql-analysis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 6b32a65..baaf30f 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -37,7 +37,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@v1 + uses: github/codeql-action/init@v2 with: languages: ${{ matrix.language }} # If you wish to specify custom queries, you can do so here or in a config file. @@ -49,7 +49,7 @@ jobs: # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). # If this step fails, then you should remove it and run the build manually (see below) - name: Autobuild - uses: github/codeql-action/autobuild@v1 + uses: github/codeql-action/autobuild@v2 # ℹī¸ Command-line programs to run using the OS shell. # 📚 https://git.io/JvXDl @@ -63,4 +63,4 @@ jobs: # make release - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v1 + uses: github/codeql-action/analyze@v2 From de382b02863b6488a9aac6e220f8271c82038e67 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 9 May 2022 02:03:02 +0000 Subject: [PATCH 06/21] chore(deps): bump docker/build-push-action from 2 to 3 Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 2 to 3. - [Release notes](https://github.com/docker/build-push-action/releases) - [Commits](https://github.com/docker/build-push-action/compare/v2...v3) --- updated-dependencies: - dependency-name: docker/build-push-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/merge.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml index 6603f14..0bf78b8 100644 --- a/.github/workflows/merge.yml +++ b/.github/workflows/merge.yml @@ -74,7 +74,7 @@ jobs: - name: Build and push (not main merge) if: github.ref != 'refs/heads/main' id: docker_build_release - uses: docker/build-push-action@v2 + uses: docker/build-push-action@v3 with: push: ${{ github.event_name == 'push' && github.repository == 'odpi/egeria-connector-sas-viya' }} tags: odpi/egeria-connector-sas-viya:${{env.RELEASE_VERSION}}, quay.io/odpi/egeria-connector-sas-viya:${{env.RELEASE_VERSION}} @@ -86,7 +86,7 @@ jobs: - name: Build and push (main merge) if: github.ref == 'refs/heads/main' id: docker_build_main - uses: docker/build-push-action@v2 + uses: docker/build-push-action@v3 with: push: ${{ github.event_name == 'push' && github.repository == 'odpi/egeria-connector-sas-viya' }} tags: odpi/egeria-connector-sas-viya:${{ env.RELEASE_VERSION}}, odpi/egeria-connector-sas-viya:latest, quay.io/odpi/egeria-connector-sas-viya:${{ env.RELEASE_VERSION}}, quay.io/odpi/egeria-connector-sas-viya:latest From a3e0b8c9e782aba12b4abd957c94d4e8bbf3f777 Mon Sep 17 00:00:00 2001 From: Nigel Jones Date: Mon, 25 Jul 2022 16:14:25 +0100 Subject: [PATCH 07/21] odpi/egeria#6723 ensure gradle wrapper verified Signed-off-by: Nigel Jones --- .github/workflows/merge.yml | 1 + .github/workflows/release.yml | 1 + .github/workflows/verify.yml | 1 + 3 files changed, 3 insertions(+) diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml index 6603f14..1faafc9 100644 --- a/.github/workflows/merge.yml +++ b/.github/workflows/merge.yml @@ -27,6 +27,7 @@ jobs: with: distribution: "adopt" java-version: "11" + - uses: gradle/wrapper-validation-action@v1 - name: Cache Gradle packages uses: actions/cache@v3 with: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index dfe3457..bb70cb0 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -25,6 +25,7 @@ jobs: with: distribution: 'adopt' java-version: '11' + - uses: gradle/wrapper-validation-action@v1 # No cache for release code # - name: Cache Gradle packages # uses: actions/cache@v2.1.4 diff --git a/.github/workflows/verify.yml b/.github/workflows/verify.yml index 33c094c..a98f82c 100644 --- a/.github/workflows/verify.yml +++ b/.github/workflows/verify.yml @@ -18,6 +18,7 @@ jobs: with: distribution: 'adopt' java-version: '11' + - uses: gradle/wrapper-validation-action@v1 - name: Cache Gradle packages uses: actions/cache@v3 with: From 7effccfda4745b9e8c31dc0aaaf01d416b4761aa Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 29 Aug 2022 04:36:59 +0000 Subject: [PATCH 08/21] chore(deps): bump docker/setup-buildx-action from 1 to 2 Bumps [docker/setup-buildx-action](https://github.com/docker/setup-buildx-action) from 1 to 2. - [Release notes](https://github.com/docker/setup-buildx-action/releases) - [Commits](https://github.com/docker/setup-buildx-action/compare/v1...v2) --- updated-dependencies: - dependency-name: docker/setup-buildx-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/merge.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml index 1faafc9..01944f9 100644 --- a/.github/workflows/merge.yml +++ b/.github/workflows/merge.yml @@ -57,7 +57,7 @@ jobs: name: Connector path: build/libs/*.jar - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v1 + uses: docker/setup-buildx-action@v2 - name: Login to DockerHub uses: docker/login-action@v1 with: From ee4f9575cb6abaed396c2b632632375374513cb4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 29 Aug 2022 04:41:46 +0000 Subject: [PATCH 09/21] chore(deps): bump amqp-client from 5.14.2 to 5.15.0 Bumps [amqp-client](https://github.com/rabbitmq/rabbitmq-java-client) from 5.14.2 to 5.15.0. - [Release notes](https://github.com/rabbitmq/rabbitmq-java-client/releases) - [Commits](https://github.com/rabbitmq/rabbitmq-java-client/compare/v5.14.2...v5.15.0) --- updated-dependencies: - dependency-name: com.rabbitmq:amqp-client dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 35ece91..de7dd79 100644 --- a/build.gradle +++ b/build.gradle @@ -41,7 +41,7 @@ dependencies { bundledLibs 'org.slf4j:slf4j-api' bundledLibs 'org.apache.httpcomponents:httpclient:4.5.13' bundledLibs 'com.google.code.gson:gson:2.9.0' - bundledLibs 'com.rabbitmq:amqp-client:5.14.2' + bundledLibs 'com.rabbitmq:amqp-client:5.15.0' testImplementation 'org.codehaus.groovy:groovy:3.0.10' testImplementation 'org.codehaus.groovy:groovy-dateutil:3.0.10' From 051eaea4d5e180277fb750f84ac5117dbedf8c01 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 29 Aug 2022 04:46:08 +0000 Subject: [PATCH 10/21] chore(deps): bump groovy from 3.0.10 to 3.0.12 Bumps [groovy](https://github.com/apache/groovy) from 3.0.10 to 3.0.12. - [Release notes](https://github.com/apache/groovy/releases) - [Commits](https://github.com/apache/groovy/commits) --- updated-dependencies: - dependency-name: org.codehaus.groovy:groovy dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 35ece91..0cda7ea 100644 --- a/build.gradle +++ b/build.gradle @@ -43,7 +43,7 @@ dependencies { bundledLibs 'com.google.code.gson:gson:2.9.0' bundledLibs 'com.rabbitmq:amqp-client:5.14.2' - testImplementation 'org.codehaus.groovy:groovy:3.0.10' + testImplementation 'org.codehaus.groovy:groovy:3.0.12' testImplementation 'org.codehaus.groovy:groovy-dateutil:3.0.10' testImplementation 'org.spockframework:spock-core:2.1-groovy-3.0' testImplementation 'org.junit.platform:junit-platform-engine:1.8.2' From 1a0b6264393b62e82dbc7812a49b23498374bcf6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 29 Aug 2022 10:22:55 +0000 Subject: [PATCH 11/21] chore(deps): bump gson from 2.9.0 to 2.9.1 Bumps [gson](https://github.com/google/gson) from 2.9.0 to 2.9.1. - [Release notes](https://github.com/google/gson/releases) - [Changelog](https://github.com/google/gson/blob/master/CHANGELOG.md) - [Commits](https://github.com/google/gson/compare/gson-parent-2.9.0...gson-parent-2.9.1) --- updated-dependencies: - dependency-name: com.google.code.gson:gson dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 76b563a..406886f 100644 --- a/build.gradle +++ b/build.gradle @@ -40,7 +40,7 @@ dependencies { bundledLibs 'org.slf4j:slf4j-api' bundledLibs 'org.apache.httpcomponents:httpclient:4.5.13' - bundledLibs 'com.google.code.gson:gson:2.9.0' + bundledLibs 'com.google.code.gson:gson:2.9.1' bundledLibs 'com.rabbitmq:amqp-client:5.15.0' testImplementation 'org.codehaus.groovy:groovy:3.0.12' From 9adce9bc5ee6f25187306c701df4a9d2ed3a9e6a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 29 Aug 2022 10:23:03 +0000 Subject: [PATCH 12/21] chore(deps): bump groovy-dateutil from 3.0.10 to 3.0.12 Bumps [groovy-dateutil](https://github.com/apache/groovy) from 3.0.10 to 3.0.12. - [Release notes](https://github.com/apache/groovy/releases) - [Commits](https://github.com/apache/groovy/commits) --- updated-dependencies: - dependency-name: org.codehaus.groovy:groovy-dateutil dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 76b563a..7d2c882 100644 --- a/build.gradle +++ b/build.gradle @@ -44,7 +44,7 @@ dependencies { bundledLibs 'com.rabbitmq:amqp-client:5.15.0' testImplementation 'org.codehaus.groovy:groovy:3.0.12' - testImplementation 'org.codehaus.groovy:groovy-dateutil:3.0.10' + testImplementation 'org.codehaus.groovy:groovy-dateutil:3.0.12' testImplementation 'org.spockframework:spock-core:2.1-groovy-3.0' testImplementation 'org.junit.platform:junit-platform-engine:1.8.2' testImplementation "org.odpi.egeria:repository-services-implementation:${egeriaVersion}" From 973887f8d470e8b22e5f7f5f05d3fbdf2c0c07e7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 29 Aug 2022 10:27:03 +0000 Subject: [PATCH 13/21] chore(deps): bump junit-platform-engine from 1.8.2 to 1.9.0 Bumps [junit-platform-engine](https://github.com/junit-team/junit5) from 1.8.2 to 1.9.0. - [Release notes](https://github.com/junit-team/junit5/releases) - [Commits](https://github.com/junit-team/junit5/commits) --- updated-dependencies: - dependency-name: org.junit.platform:junit-platform-engine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 7d2c882..d579920 100644 --- a/build.gradle +++ b/build.gradle @@ -46,7 +46,7 @@ dependencies { testImplementation 'org.codehaus.groovy:groovy:3.0.12' testImplementation 'org.codehaus.groovy:groovy-dateutil:3.0.12' testImplementation 'org.spockframework:spock-core:2.1-groovy-3.0' - testImplementation 'org.junit.platform:junit-platform-engine:1.8.2' + testImplementation 'org.junit.platform:junit-platform-engine:1.9.0' testImplementation "org.odpi.egeria:repository-services-implementation:${egeriaVersion}" } From da5a4c22f6ec67e8a72974537445c7f017200e92 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 29 Aug 2022 11:59:02 +0000 Subject: [PATCH 14/21] chore(deps): bump egeriaVersion from 3.8-SNAPSHOT to 3.11-SNAPSHOT Bumps `egeriaVersion` from 3.8-SNAPSHOT to 3.11-SNAPSHOT. Updates `open-connector-framework` from 3.8-SNAPSHOT to 3.11-SNAPSHOT Updates `repository-services-connectors` from 3.8-SNAPSHOT to 3.11-SNAPSHOT Updates `repository-services-implementation` from 3.8-SNAPSHOT to 3.11-SNAPSHOT --- updated-dependencies: - dependency-name: org.odpi.egeria:open-connector-framework dependency-type: direct:production - dependency-name: org.odpi.egeria:repository-services-connectors dependency-type: direct:production - dependency-name: org.odpi.egeria:repository-services-implementation dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index fb31040..53e1e1a 100644 --- a/build.gradle +++ b/build.gradle @@ -31,7 +31,7 @@ configurations { ext { // The version of Egeria to use - egeriaVersion = '3.8-SNAPSHOT' + egeriaVersion = '3.11-SNAPSHOT' } dependencies { implementation "org.odpi.egeria:open-connector-framework:${egeriaVersion}" From 24dfb1b842b9b01aa13fda77d555c67da8d21a25 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 12 Sep 2022 01:34:57 +0000 Subject: [PATCH 15/21] chore(deps): bump amqp-client from 5.15.0 to 5.16.0 Bumps [amqp-client](https://github.com/rabbitmq/rabbitmq-java-client) from 5.15.0 to 5.16.0. - [Release notes](https://github.com/rabbitmq/rabbitmq-java-client/releases) - [Commits](https://github.com/rabbitmq/rabbitmq-java-client/compare/v5.15.0...v5.16.0) --- updated-dependencies: - dependency-name: com.rabbitmq:amqp-client dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 68e9600..d3883ec 100644 --- a/build.gradle +++ b/build.gradle @@ -41,7 +41,7 @@ dependencies { bundledLibs 'org.slf4j:slf4j-api' bundledLibs 'org.apache.httpcomponents:httpclient:4.5.13' bundledLibs 'com.google.code.gson:gson:2.9.1' - bundledLibs 'com.rabbitmq:amqp-client:5.15.0' + bundledLibs 'com.rabbitmq:amqp-client:5.16.0' testImplementation 'org.codehaus.groovy:groovy:3.0.12' testImplementation 'org.codehaus.groovy:groovy-dateutil:3.0.12' From 7ff0b7738a567488e8dc4a69d8b06561bd92baaa Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 19 Sep 2022 01:33:48 +0000 Subject: [PATCH 16/21] chore(deps): bump groovy-dateutil from 3.0.12 to 3.0.13 Bumps [groovy-dateutil](https://github.com/apache/groovy) from 3.0.12 to 3.0.13. - [Release notes](https://github.com/apache/groovy/releases) - [Commits](https://github.com/apache/groovy/commits) --- updated-dependencies: - dependency-name: org.codehaus.groovy:groovy-dateutil dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 68e9600..53155f5 100644 --- a/build.gradle +++ b/build.gradle @@ -44,7 +44,7 @@ dependencies { bundledLibs 'com.rabbitmq:amqp-client:5.15.0' testImplementation 'org.codehaus.groovy:groovy:3.0.12' - testImplementation 'org.codehaus.groovy:groovy-dateutil:3.0.12' + testImplementation 'org.codehaus.groovy:groovy-dateutil:3.0.13' testImplementation 'org.spockframework:spock-core:2.1-groovy-3.0' testImplementation 'org.junit.platform:junit-platform-engine:1.9.0' testImplementation "org.odpi.egeria:repository-services-implementation:${egeriaVersion}" From bc2e294b49de5796f0c8199aac1d863af0d35df0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 21 Sep 2022 12:11:00 +0000 Subject: [PATCH 17/21] chore(deps): bump spock-core from 2.1-groovy-3.0 to 2.2-groovy-4.0 Bumps spock-core from 2.1-groovy-3.0 to 2.2-groovy-4.0. --- updated-dependencies: - dependency-name: org.spockframework:spock-core dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 1c7e231..1988067 100644 --- a/build.gradle +++ b/build.gradle @@ -45,7 +45,7 @@ dependencies { testImplementation 'org.codehaus.groovy:groovy:3.0.12' testImplementation 'org.codehaus.groovy:groovy-dateutil:3.0.13' - testImplementation 'org.spockframework:spock-core:2.1-groovy-3.0' + testImplementation 'org.spockframework:spock-core:2.2-groovy-4.0' testImplementation 'org.junit.platform:junit-platform-engine:1.9.0' testImplementation "org.odpi.egeria:repository-services-implementation:${egeriaVersion}" } From 0cf76a25f35008f48b7ab39f3e368172becc4662 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 21 Sep 2022 12:11:14 +0000 Subject: [PATCH 18/21] chore(deps): bump groovy from 3.0.12 to 3.0.13 Bumps [groovy](https://github.com/apache/groovy) from 3.0.12 to 3.0.13. - [Release notes](https://github.com/apache/groovy/releases) - [Commits](https://github.com/apache/groovy/commits) --- updated-dependencies: - dependency-name: org.codehaus.groovy:groovy dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 1c7e231..fda496a 100644 --- a/build.gradle +++ b/build.gradle @@ -43,7 +43,7 @@ dependencies { bundledLibs 'com.google.code.gson:gson:2.9.1' bundledLibs 'com.rabbitmq:amqp-client:5.16.0' - testImplementation 'org.codehaus.groovy:groovy:3.0.12' + testImplementation 'org.codehaus.groovy:groovy:3.0.13' testImplementation 'org.codehaus.groovy:groovy-dateutil:3.0.13' testImplementation 'org.spockframework:spock-core:2.1-groovy-3.0' testImplementation 'org.junit.platform:junit-platform-engine:1.9.0' From 48f1fe7467cfb6f8a8cbc8350f0bc5a29ad62cb3 Mon Sep 17 00:00:00 2001 From: Chris Replogle Date: Wed, 21 Sep 2022 12:43:45 +0000 Subject: [PATCH 19/21] fix: update dependencies for dependabot --- build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index c25b4aa..0631fff 100644 --- a/build.gradle +++ b/build.gradle @@ -43,8 +43,8 @@ dependencies { bundledLibs 'com.google.code.gson:gson:2.9.1' bundledLibs 'com.rabbitmq:amqp-client:5.16.0' - testImplementation 'org.codehaus.groovy:groovy:3.0.13' - testImplementation 'org.codehaus.groovy:groovy-dateutil:3.0.13' + testImplementation 'org.apache.groovy:groovy:4.0.4' + testImplementation 'org.apache.groovy:groovy-dateutil:4.0.5' testImplementation 'org.spockframework:spock-core:2.2-groovy-4.0' testImplementation 'org.junit.platform:junit-platform-engine:1.9.0' testImplementation "org.odpi.egeria:repository-services-implementation:${egeriaVersion}" From 43cb006ab4bdde3634ad500cac732b756d402357 Mon Sep 17 00:00:00 2001 From: Chris Replogle Date: Wed, 21 Sep 2022 09:31:02 -0400 Subject: [PATCH 20/21] chore: #150 update for release Egeria 3.11 Signed-off-by: Chris Replogle --- .github/workflows/merge.yml | 2 +- build.gradle | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml index d956e50..d8546c7 100644 --- a/.github/workflows/merge.yml +++ b/.github/workflows/merge.yml @@ -17,7 +17,7 @@ jobs: runs-on: ubuntu-latest name: "Merge" env: - RELEASE_VERSION: 3.11-SNAPSHOT + RELEASE_VERSION: 3.11 steps: - uses: actions/checkout@v3 name: Checkout source diff --git a/build.gradle b/build.gradle index 0631fff..8fa4b95 100644 --- a/build.gradle +++ b/build.gradle @@ -12,7 +12,7 @@ if (System.getenv('CI')) { // Published artifact info, equired for maven publishing - this is the version of our artifact group = 'org.odpi.egeria' -version = '3.11-SNAPSHOT' +version = '3.11' repositories { mavenCentral() @@ -31,7 +31,7 @@ configurations { ext { // The version of Egeria to use - egeriaVersion = '3.11-SNAPSHOT' + egeriaVersion = '3.11' } dependencies { implementation "org.odpi.egeria:open-connector-framework:${egeriaVersion}" From 5bc3be6f3acd9ae058214351afbb168615ddffa9 Mon Sep 17 00:00:00 2001 From: Chris Replogle Date: Wed, 21 Sep 2022 09:31:02 -0400 Subject: [PATCH 21/21] chore: #150 update for release Egeria 3.11 Signed-off-by: Chris Replogle --- .github/workflows/merge.yml | 2 +- build.gradle | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml index d956e50..d8546c7 100644 --- a/.github/workflows/merge.yml +++ b/.github/workflows/merge.yml @@ -17,7 +17,7 @@ jobs: runs-on: ubuntu-latest name: "Merge" env: - RELEASE_VERSION: 3.11-SNAPSHOT + RELEASE_VERSION: 3.11 steps: - uses: actions/checkout@v3 name: Checkout source diff --git a/build.gradle b/build.gradle index 0631fff..8fa4b95 100644 --- a/build.gradle +++ b/build.gradle @@ -12,7 +12,7 @@ if (System.getenv('CI')) { // Published artifact info, equired for maven publishing - this is the version of our artifact group = 'org.odpi.egeria' -version = '3.11-SNAPSHOT' +version = '3.11' repositories { mavenCentral() @@ -31,7 +31,7 @@ configurations { ext { // The version of Egeria to use - egeriaVersion = '3.11-SNAPSHOT' + egeriaVersion = '3.11' } dependencies { implementation "org.odpi.egeria:open-connector-framework:${egeriaVersion}"