Merge pull request #2853 from statisticsnorway/develop

Prodløft
statisticsnorway · Aug 9, 2024 · e379f75 · e379f75
2 parents d624201 + 187fd21
commit e379f75
Show file tree

Hide file tree

Showing 72 changed files with 4,221 additions and 4,291 deletions.
diff --git a/.github/auto_assign.yml b/.github/auto_assign.yml
@@ -9,7 +9,7 @@ assignees:
   - ssb-cgn
   - Glenruben
   - johnnadeluy
-  - annesiri
+# - annesiri
   - Carl-OW
   - michaelpande
 

diff --git a/.github/workflows/deploy_nais.yaml b/.github/workflows/deploy_nais.yaml
@@ -106,7 +106,7 @@ jobs:
             type=sha
             type=raw,value=${{ env.TAG }}, enable=true
       - name: Build and push
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           context: ./ssbno-xp-docker
           file: "./ssbno-xp-docker/Dockerfile"

diff --git a/.github/workflows/former_build_deploy_to_prod.yaml b/.github/workflows/former_build_deploy_to_prod.yaml
@@ -15,7 +15,7 @@ jobs:
     environment: 'production'
     steps:
       - name: Download workflow artifact
-        uses: dawidd6/action-download-artifact@v5
+        uses: dawidd6/action-download-artifact@v6
         with:
           workflow: deploy_to_prod.yaml
           branch: master

diff --git a/.github/workflows/former_build_deploy_to_qa.yaml b/.github/workflows/former_build_deploy_to_qa.yaml
@@ -15,7 +15,7 @@ jobs:
     environment: 'QA_mimir'
     steps:
       - name: Download workflow artifact
-        uses: dawidd6/action-download-artifact@v5
+        uses: dawidd6/action-download-artifact@v6
         with:
           workflow: deploy_to_qa.yaml
           branch: develop

diff --git a/build.gradle b/build.gradle
@@ -37,11 +37,11 @@ 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.0'
+    implementation 'commons-codec:commons-codec:1.17.1'
     include "no.item:wsutil-server:2.0.0"
     include "com.gravitondigital:featuretogglelib:0.3.0"
     include 'org.json:json:20240303'
-    include "com.enonic.lib:lib-react4xp:5.1.0"
+    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}"
     include "no.item:lib-xp-cristin:1.3.1"

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