Skip to content

Commit 93db842

Browse files
authored
Merge pull request #3146 from statisticsnorway/develop
Merge develop to master
2 parents c3cf3de + ddf1dd1 commit 93db842

File tree

64 files changed

+2048
-566
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

64 files changed

+2048
-566
lines changed

.github/release.yml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
# .github/release.yml
2+
3+
changelog:
4+
categories:
5+
- title: 🏕 Features
6+
labels:
7+
- '*'
8+
exclude:
9+
labels:
10+
- dependencies
11+
- title: 👒 Dependencies
12+
labels:
13+
- dependencies

.github/workflows/deploy_nais.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ jobs:
6969
7070
- id: 'auth'
7171
name: 'Authenticate to Google Cloud'
72-
uses: 'google-github-actions/auth@v2.1.7'
72+
uses: 'google-github-actions/auth@v2.1.8'
7373
with:
7474
workload_identity_provider: 'projects/906675412832/locations/global/workloadIdentityPools/ssb-identity-pool/providers/github-oidc-provider'
7575
service_account: 'gh-ssb@nais-management-b3a7.iam.gserviceaccount.com'

.github/workflows/deploy_to_test.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ jobs:
2626
url: ${{ secrets.ENONIC_TEST_URL }}
2727
username: ${{ secrets.ENONIC_USER }}
2828
password: ${{ secrets.ENONIC_TEST_PASS }}
29-
client_cert: ${{ secrets.ENONIC_CERT }}
30-
client_key: ${{ secrets.ENONIC_KEY }}
29+
client_cert: ${{ secrets.ENONIC_DEPLOY_CERT }}
30+
client_key: ${{ secrets.ENONIC_DEPLOY_KEY }}
3131
app_jar: "./build/libs/*.jar"
3232
- name: Upload artifacts
3333
id: upload_artifacts

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ dependencies {
2626
include "com.enonic.xp:lib-admin:${xpVersion}"
2727
include "com.enonic.lib:lib-http-client:3.2.2"
2828
include "com.enonic.xp:lib-i18n:${xpVersion}"
29-
include "com.enonic.lib:lib-cron:1.1.2"
29+
include "com.enonic.lib:lib-cron:1.1.3"
3030
include "com.enonic.xp:lib-context:${xpVersion}"
3131
include 'com.enonic.lib:lib-cache:2.2.1'
3232
include "com.enonic.xp:lib-event:${xpVersion}"

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Gradle Project settings
22
projectName = mimir
3-
version = 2.21.0
3+
version = 2.22.0
44

55
# XP App values
66
appDisplayName = Mimir application

package-lock.json

Lines changed: 7 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@
7676
"@item-enonic-types/lib-thymeleaf": "~2.1.0",
7777
"@item-enonic-types/lib-time": "~1.0.4",
7878
"@reduxjs/toolkit": "~2.5.0",
79-
"@statisticsnorway/ssb-component-library": "~2.4.5",
79+
"@statisticsnorway/ssb-component-library": "~2.4.7",
8080
"@types/grecaptcha": "^3.0.9",
8181
"@types/ramda": "~0.30.2",
8282
"@types/react": "~18.3.12",

src/main/resources/assets/SSB_ikon_statisticContacts.svg

Lines changed: 0 additions & 4 deletions
This file was deleted.

src/main/resources/assets/SSB_ikon_statisticDescription.svg

Lines changed: 0 additions & 5 deletions
This file was deleted.

0 commit comments

Comments
 (0)