Merge pull request #3114 from statisticsnorway/develop

Prodløft
statisticsnorway · Jan 20, 2025 · 5f5d64a · 5f5d64a
2 parents d29c852 + 22d7c88
commit 5f5d64a
Show file tree

Hide file tree

Showing 49 changed files with 2,098 additions and 1,818 deletions.
diff --git a/.github/workflows/deploy_to_prod.yaml b/.github/workflows/deploy_to_prod.yaml
@@ -48,8 +48,10 @@ jobs:
       - name: Send success message to Slack
         id: slack_success
         if: success()
-        uses: slackapi/slack-github-action@v1
+        uses: slackapi/slack-github-action@v2
         with:
+          webhook: ${{ secrets.SLACK_ALERTS_PROD }}
+          webhook-type: incoming-webhook
           # Using Github block kit (https://api.slack.com/reference/block-kit/blocks) to configure the Slack message, see https://docs.github.com/en/actions/learn-github-actions/contexts
           # for more information about context variables
           payload: |
@@ -85,14 +87,13 @@ jobs:
                 }
               ]
             }
-        env:
-          SLACK_WEBHOOK_URL: ${{ secrets.SLACK_ALERTS_PROD }}
-          SLACK_WEBHOOK_TYPE: INCOMING_WEBHOOK
       - name: Send failure message to Slack
         id: slack_failure
         if: failure()
-        uses: slackapi/slack-github-action@v1
+        uses: slackapi/slack-github-action@v2
         with:
+          webhook: ${{ secrets.SLACK_MIMIR_UTV }}
+          webhook-type: incoming-webhook
           payload: |
             {
               "blocks": [
@@ -126,6 +127,3 @@ jobs:
                 }
               ]
             }
-        env:
-          SLACK_WEBHOOK_URL: ${{ secrets.SLACK_MIMIR_UTV }}
-          SLACK_WEBHOOK_TYPE: INCOMING_WEBHOOK
diff --git a/.github/workflows/deploy_to_qa.yaml b/.github/workflows/deploy_to_qa.yaml
@@ -38,8 +38,10 @@ jobs:
       - name: Send success message to Slack
         id: slack_success
         if: success()
-        uses: slackapi/slack-github-action@v1
+        uses: slackapi/slack-github-action@v2
         with:
+          webhook: ${{ secrets.SLACK_ALERTS_QA }}
+          webhook-type: incoming-webhook
           # Using Github block kit (https://api.slack.com/reference/block-kit/blocks) to configure the Slack message, see https://docs.github.com/en/actions/learn-github-actions/contexts
           # for more information about context variables
           payload: |
@@ -75,14 +77,13 @@ jobs:
                 }
               ]
             }
-        env:
-          SLACK_WEBHOOK_URL: ${{ secrets.SLACK_ALERTS_QA }}
-          SLACK_WEBHOOK_TYPE: INCOMING_WEBHOOK
       - name: Send failure message to Slack
         id: slack_failure
         if: failure()
-        uses: slackapi/slack-github-action@v1
+        uses: slackapi/slack-github-action@v2
         with:
+          webhook: ${{ secrets.SLACK_MIMIR_UTV }}
+          webhook-type: incoming-webhook
           payload: |
             {
               "blocks": [
@@ -116,9 +117,6 @@ jobs:
                 }
               ]
             }
-        env:
-          SLACK_WEBHOOK_URL: ${{ secrets.SLACK_MIMIR_UTV }}
-          SLACK_WEBHOOK_TYPE: INCOMING_WEBHOOK
   mabl_test:
     # Run this job after deploy is finished, and only run if deploy succeeded
     needs: deploy_to_qa

diff --git a/.github/workflows/deploy_to_test.yaml b/.github/workflows/deploy_to_test.yaml
@@ -39,8 +39,10 @@ jobs:
       - name: Send failure message to Slack
         id: slack_failure
         if: failure()
-        uses: slackapi/slack-github-action@v1
+        uses: slackapi/slack-github-action@v2
         with:
+          webhook: ${{ secrets.SLACK_MIMIR_UTV }}
+          webhook-type: incoming-webhook
           payload: |
             {
               "blocks": [
@@ -74,9 +76,6 @@ jobs:
                 }
               ]
             }
-        env:
-          SLACK_WEBHOOK_URL: ${{ secrets.SLACK_MIMIR_UTV }}
-          SLACK_WEBHOOK_TYPE: INCOMING_WEBHOOK
   mabl_test:
     # Run this job after deploy is finished, and only run if deploy succeeded
     needs: deploy_to_test

diff --git a/.github/workflows/former_build_deploy_to_prod.yaml b/.github/workflows/former_build_deploy_to_prod.yaml
@@ -45,8 +45,10 @@ jobs:
       - name: Send success message to Slack
         id: slack_success
         if: success()
-        uses: slackapi/slack-github-action@v1
+        uses: slackapi/slack-github-action@v2
         with:
+          webhook: ${{ secrets.SLACK_ALERTS_PROD }}
+          webhook-type: incoming-webhook
           # Using Github block kit (https://api.slack.com/reference/block-kit/blocks) to configure the Slack message, see https://docs.github.com/en/actions/learn-github-actions/contexts
           # for more information about context variables
           payload: |
@@ -82,14 +84,13 @@ jobs:
                 }
               ]
             }
-        env:
-          SLACK_WEBHOOK_URL: ${{ secrets.SLACK_ALERTS_PROD }}
-          SLACK_WEBHOOK_TYPE: INCOMING_WEBHOOK
       - name: Send failure message to Slack
         id: slack_failure
         if: failure()
-        uses: slackapi/slack-github-action@v1
+        uses: slackapi/slack-github-action@v2
         with:
+          webhook: ${{ secrets.SLACK_MIMIR_UTV }}
+          webhook-type: incoming-webhook
           payload: |
             {
               "blocks": [
@@ -123,6 +124,3 @@ jobs:
                 }
               ]
             }
-        env:
-          SLACK_WEBHOOK_URL: ${{ secrets.SLACK_MIMIR_UTV }}
-          SLACK_WEBHOOK_TYPE: INCOMING_WEBHOOK
diff --git a/.github/workflows/former_build_deploy_to_qa.yaml b/.github/workflows/former_build_deploy_to_qa.yaml
@@ -35,8 +35,10 @@ jobs:
       - name: Send success message to Slack
         id: slack_success
         if: success()
-        uses: slackapi/slack-github-action@v1
+        uses: slackapi/slack-github-action@v2
         with:
+          webhook: ${{ secrets.SLACK_ALERTS_QA }}
+          webhook-type: incoming-webhook
           # Using Github block kit (https://api.slack.com/reference/block-kit/blocks) to configure the Slack message, see https://docs.github.com/en/actions/learn-github-actions/contexts
           # for more information about context variables
           payload: |
@@ -72,14 +74,13 @@ jobs:
                 }
               ]
             }
-        env:
-          SLACK_WEBHOOK_URL: ${{ secrets.SLACK_ALERTS_QA }}
-          SLACK_WEBHOOK_TYPE: INCOMING_WEBHOOK
       - name: Send failure message to Slack
         id: slack_failure
         if: failure()
-        uses: slackapi/slack-github-action@v1
+        uses: slackapi/slack-github-action@v2
         with:
+          webhook: ${{ secrets.SLACK_MIMIR_UTV }}
+          webhook-type: incoming-webhook
           payload: |
             {
               "blocks": [
@@ -113,9 +114,6 @@ jobs:
                 }
               ]
             }
-        env:
-          SLACK_WEBHOOK_URL: ${{ secrets.SLACK_MIMIR_UTV }}
-          SLACK_WEBHOOK_TYPE: INCOMING_WEBHOOK
   mabl_test:
     # Run this job after deploy is finished, and only run if deploy succeeded
     needs: deploy-artifact

diff --git a/build.gradle b/build.gradle
@@ -2,7 +2,7 @@ import org.apache.tools.ant.taskdefs.condition.Os
 
 plugins {
     id("com.github.node-gradle.node") version "7.1.0"
-    id 'com.enonic.xp.app' version '3.4.0'
+    id 'com.enonic.xp.app' version '3.5.2'
     id 'no.item.xp.codegen' version '2.3.0'
 }
 
@@ -37,10 +37,10 @@ dependencies {
     include "com.enonic.xp:lib-cluster:${xpVersion}"
     include "com.enonic.xp:lib-mail:${xpVersion}"
     include "com.enonic.xp:lib-scheduler:${xpVersion}"
-    implementation 'commons-codec:commons-codec:1.17.1'
+    implementation 'commons-codec:commons-codec:1.17.2'
     include "no.item:wsutil-server:2.0.0"
     include "com.gravitondigital:featuretogglelib:0.3.0"
-    include 'org.json:json:20240303'
+    include 'org.json:json:20250107'
     include "com.enonic.lib:lib-react4xp:5.1.1"
     include 'com.enonic.lib:lib-text-encoding:2.1.1'
     include "com.enonic.xp:lib-value:${xpVersion}"

diff --git a/gradle.properties b/gradle.properties
@@ -1,13 +1,13 @@
 # Gradle Project settings
 projectName = mimir
-version = 2.19.0
+version = 2.20.0
 
 # XP App values
 appDisplayName = Mimir application
 appName = mimir
 vendorName = SSB
 vendorUrl = http://example.com
-xpVersion = 7.14.2
+xpVersion = 7.14.4
 
 # Settings for publishing to a Maven repo
 group =