Merge pull request #152 from CDaRip2U/release-3.11

Release 3.11
odpi · Sep 22, 2022 · 611acdb · 611acdb
2 parents 5b42351 + a05693c
commit 611acdb
Show file tree

Hide file tree

Showing 7 changed files with 65 additions and 20 deletions.
diff --git 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
diff --git 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.8-SNAPSHOT
+      RELEASE_VERSION: 3.11
     steps:
       - uses: actions/checkout@v3
         name: Checkout source
@@ -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:
@@ -56,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:
@@ -74,7 +75,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 +87,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

diff --git 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/[email protected]

diff --git 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:

diff --git 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.8-SNAPSHOT'
+version = '3.11'
 
 repositories {
     mavenCentral()
@@ -31,7 +31,7 @@ configurations {
 
 ext {
     // The version of Egeria to use
-    egeriaVersion = '3.8-SNAPSHOT'
+    egeriaVersion = '3.11'
 }
 dependencies {
     implementation "org.odpi.egeria:open-connector-framework:${egeriaVersion}"
@@ -40,13 +40,13 @@ 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.google.code.gson:gson:2.9.1'
+    bundledLibs 'com.rabbitmq:amqp-client:5.16.0'
 
-    testImplementation 'org.codehaus.groovy:groovy:3.0.10'
-    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'
+    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}"
 }
 

diff --git 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
@@ -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",
@@ -69,6 +83,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",
@@ -93,7 +129,7 @@
   },
   {
     "sasCat": "decisionSQLCodeFile",
-    "omrs": "Asset",
+    "omrs": "DataFile",
     "propertyMappings": [
       {
         "sasCat": "instance.name",
@@ -104,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"
       }
     ]
   },