From 9f04b65b76a2e670fd7cd8a818e38e2c5d6078f7 Mon Sep 17 00:00:00 2001 From: RPKI Team at RIPE NCC Date: Fri, 10 Jan 2025 10:31:32 +0000 Subject: [PATCH] RIPE NCC has merged b83e3f80c * Remove trailing slash [463e89404] * Fix basic dashboard links [90dfaa63e] * gitlab: disallow to tag `latest` manually on branches [28ee96390] * gitlab: allow prepdev and pilot deploys to fail [e4dbe3981] * Update dependency commons-codec:commons-codec to v1.17.2 [af88529a5] * Update dependency io.sentry:sentry-bom to v7.20.0 [e467972f0] * Update dependency gradle to v8.12 [774acc89e] * Update dependency org.thymeleaf:thymeleaf-spring6 to v3.1.3.RELEASE [1f799ebbf] --- .gitlab-ci.yml | 6 +++--- build.gradle | 6 +++--- gradle/wrapper/gradle-wrapper.properties | 2 +- gradlew | 3 +-- src/main/resources/application-prepdev.properties | 2 +- src/main/resources/application-production.properties | 2 +- src/main/resources/application.yml | 2 +- .../net/ripe/rpki/services/impl/RoaAlertCheckerTest.java | 4 ++-- 8 files changed, 13 insertions(+), 14 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f770353..d56f2c8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,5 +1,5 @@ default: - image: gradle:8.11-jdk17 + image: gradle:8.12-jdk17 # Explicit version of the Mergerequests-Pipelines workflow, with the main branch # added. @@ -106,8 +106,6 @@ image-tag-latest: - if: $CI_MERGE_REQUEST_EVENT_TYPE == "merge_train" when: never - if: $CI_COMMIT_BRANCH == "main" - - when: manual - ######### Test stage ######### sonarqube: @@ -169,6 +167,7 @@ prepdev: <<: *delivr-deploy environment: name: prepdev + allow_failure: true rules: - if: $CI_MERGE_REQUEST_EVENT_TYPE == "merge_train" when: never @@ -178,6 +177,7 @@ pilot: <<: *delivr-deploy environment: name: pilot + allow_failure: true rules: - if: $CI_MERGE_REQUEST_EVENT_TYPE == "merge_train" when: never diff --git a/build.gradle b/build.gradle index 9f274a1..3bab61d 100644 --- a/build.gradle +++ b/build.gradle @@ -42,9 +42,9 @@ dependencies { implementation 'org.flywaydb:flyway-core' implementation "org.thymeleaf:thymeleaf:3.1.2.RELEASE" - implementation "org.thymeleaf:thymeleaf-spring6:3.1.2.RELEASE" + implementation "org.thymeleaf:thymeleaf-spring6:3.1.3.RELEASE" - implementation platform('io.sentry:sentry-bom:7.18.1') + implementation platform('io.sentry:sentry-bom:7.20.0') implementation 'io.sentry:sentry-spring-boot-starter' implementation 'io.sentry:sentry-logback' @@ -58,7 +58,7 @@ dependencies { implementation 'com.google.code.gson:gson:2.11.0' implementation 'com.jamesmurty.utils:java-xmlbuilder:1.3' - implementation 'commons-codec:commons-codec:1.17.1' + implementation 'commons-codec:commons-codec:1.17.2' implementation 'commons-io:commons-io:2.18.0' implementation 'ch.qos.logback.contrib:logback-json-classic:0.1.5' implementation 'ch.qos.logback.contrib:logback-jackson:0.1.5' diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index e2847c8..cea7a79 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index f5feea6..f3b75f3 100755 --- a/gradlew +++ b/gradlew @@ -86,8 +86,7 @@ done # shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) -APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s -' "$PWD" ) || exit +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum diff --git a/src/main/resources/application-prepdev.properties b/src/main/resources/application-prepdev.properties index 58abb27..b813c94 100644 --- a/src/main/resources/application-prepdev.properties +++ b/src/main/resources/application-prepdev.properties @@ -1,7 +1,7 @@ server.address=localhost system.setup.and.testing.api.enabled: true -mail.template.parameters.rpkiDashboardUri=https://my.prepdev.ripe.net/#/rpki +mail.template.parameters.rpkiDashboardUri=https://dashboard.rpki.prepdev.ripe.net mail.template.parameters.authUnsubscribeUri=https://access.prepdev.ripe.net/?originalUrl= mail.template.parameters.apiUnsubscribeUri=https://my.prepdev.ripe.net/api/rpki/unsubscribe-alerts diff --git a/src/main/resources/application-production.properties b/src/main/resources/application-production.properties index c2fb6c5..9cf2898 100644 --- a/src/main/resources/application-production.properties +++ b/src/main/resources/application-production.properties @@ -2,7 +2,7 @@ logging.config=classpath:logback/logback-production.xml server.address=localhost -mail.template.parameters.rpkiDashboardUri=https://my.ripe.net/#/rpki +mail.template.parameters.rpkiDashboardUri=https://dashboard.rpki.ripe.net mail.template.parameters.authUnsubscribeUri=https://access.ripe.net/?originalUrl= mail.template.parameters.apiUnsubscribeUri=https://my.ripe.net/api/rpki/unsubscribe-alerts diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index d74e999..5a16881 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -50,7 +50,7 @@ mail: host: localhost port: 25 template.parameters: - rpkiDashboardUri: "https://my.ripe.net/#/rpki" + rpkiDashboardUri: "https://dashboard.rpki.ripe.net" authUnsubscribeUri: "https://access.ripe.net/?originalUrl=" apiUnsubscribeUri: "https://my.ripe.net/api/rpki/unsubscribe-alerts" diff --git a/src/test/java/net/ripe/rpki/services/impl/RoaAlertCheckerTest.java b/src/test/java/net/ripe/rpki/services/impl/RoaAlertCheckerTest.java index f8994db..5804ad6 100644 --- a/src/test/java/net/ripe/rpki/services/impl/RoaAlertCheckerTest.java +++ b/src/test/java/net/ripe/rpki/services/impl/RoaAlertCheckerTest.java @@ -68,9 +68,9 @@ public class RoaAlertCheckerTest { private RoaAlertChecker subject; - private final String rpkiDashboardUri = "https://my.ripe.net/#/rpki"; + private final String rpkiDashboardUri = "https://dashboard.rpki.ripe.net"; private final String authUnsubscribeUri = "http://access.ripe.net/?originalUrl="; - private final String apiUnsubscribeUri = "http://my.ripe.net/api/email/unsubscribe-alerts"; + private final String apiUnsubscribeUri = "https://my.ripe.net/api/email/unsubscribe-alerts"; private final String unsubscribeSecret = UUID.randomUUID().toString(); private final EmailTokens emailTokens = new EmailTokens(unsubscribeSecret, authUnsubscribeUri, apiUnsubscribeUri);