RIPE NCC has merged 37710f6

* gitlab: stop building a docker image [937a3faa]
* README: replace docker-compose with local gradle build [skip-ci] [deb04e53]
* Enable ASPA in production [6b6cf9a3]
* Use HTTPS URLs for internal test services [1de15708]
* Replace endpoints in service client [056ef7c2]
* gitlab: auto-deploy prepdev on 'next' only [c7e155c7]
* Try another version of rules [8ead6c94]
* Cleanup [d51ec5a5]
* Solve issue with 'this-escape' warning [514b5129]
* Automatically deploy to prepdev when merging to next [67ea8b81]
* Copy configuration from rpki-monitoring [8c450651]
* Revert auto-merge-renovate-to-next and update renovate.json [3205cea2]
* Try some automerge [22f78756]
* Try different image (openjdk-21 is deprecated) [b3569a92]
* JVM option [96301cee]
* Bump gradle image version [ce6de10d]
* Make it build with JDK21 [8357b746]
* Simple 17 -> 21 replacement [ad2745d1]
* Oopsie [fc41294f]
* Naming [720c96ba]
* Format unique ASNs, otherwise we have very long messages in logs [7867204b]
* chore(deps): update dependency io.sentry:sentry-bom to v8.26.0 [9b3b8147]
* Naming [8b012687]
* chore(deps): update dependency net.logstash.logback:logstash-logback-encoder to v9 [574792ee]
* chore(deps): update dependency org.sonarqube:org.sonarqube.gradle.plugin to v7.0.1.6134 [491d3909]
* Delete UPGRADE.txt [b591d5bc]
* Remove opentelemetry from prepdev [8ada30f6]
* Remove opentelemetry from prepdev [7ddc38b9]
* Remove opentelemetry from prepdev [a936dce2]
* Cleanup docker-compose configuration [1c083cac]

Author: RPKI Team at RIPE NCC

.github/workflows/unit-tests.yml

@@ -22,7 +22,7 @@ jobs:
       - name: setup java
         uses: actions/setup-java@5
         with:
-          java-version: 17
+          java-version: 21
           distribution: temurin
           cache: gradle
       - name: Run tests

.gitlab-ci.yml

@@ -1,5 +1,5 @@
 default:
-  image: gradle:8.14-jdk17
+  image: gradle:8.14-jdk21
 
 # Explicit version of the Mergerequests-Pipelines workflow, with the main branch
 # added.
@@ -70,43 +70,6 @@ build:
       junit:
         - build/test-results/**/*.xml
 
-build-image:
-  stage: package
-  needs: ["build"]
-  cache:
-    key: ${CI_COMMIT_REF_SLUG}
-    paths:
-      - .gradle/caches
-      - .gradle/wrapper
-  before_script:
-    - apt-get update
-    - apt-get install --yes --no-install-recommends docker.io
-    - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
-    - mkdir -p ~/.config/google-cloud-tools-java/jib/
-    - cp jib.config.json ~/.config/google-cloud-tools-java/jib/config.json
-  script:
-    - ./gradlew jib --image $CI_REGISTRY_IMAGE/ci:ci-step-$BUILD_NUMBER
-  rules:
-    - if: $CI_MERGE_REQUEST_EVENT_TYPE == "merge_train"
-      when: never
-    - when: on_success
-
-image-tag-latest:
-  stage: deploy
-  dependencies:
-    - build-image
-  image: docker-registry.ripe.net/swe/gitlab-ci/debian-deployenv
-  before_script:
-    - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
-  script:
-    - docker pull $CI_REGISTRY_IMAGE/ci:ci-step-$BUILD_NUMBER
-    - docker tag $CI_REGISTRY_IMAGE/ci:ci-step-$BUILD_NUMBER ${CI_REGISTRY_IMAGE}:latest
-    - docker push ${CI_REGISTRY_IMAGE}:latest
-  rules:
-    - if: $CI_MERGE_REQUEST_EVENT_TYPE == "merge_train"
-      when: never
-    - if: $CI_COMMIT_BRANCH == "main"
-
 ######### Test stage #########
 sonarqube:
   stage: qa
@@ -169,8 +132,7 @@ prepdev:
     name: prepdev
   allow_failure: true
   rules:
-    - if: $CI_MERGE_REQUEST_EVENT_TYPE == "merge_train"
-      when: never
+    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
     - when: manual
 
 pilot:

README.md

@@ -112,19 +112,14 @@ the manifest. The best time to determine that is when we know exactly what will
 
 ## How to set up RPKI development environment
 
-### Docker
+### Local build
 
-You can run RPKI core and all required components with docker.
+You can build the RPKI Core software locally with gradle.
 
 ```
 > gradle build
-> docker-compose up
 ```
 
-This builds the necessary docker images and starts the container configuration as specified in
-the `docker-compose.yml`. When you make modifications to the system, don't forget to rebuild the
-docker image with `docker-compose build` (or `docker-compose up --build`).
-
 ### Hardware Security Module
 
 For secure key signing the CA software integrates with a Hardware Security

UPGRADE.txt

@@ -44,7 +44,7 @@ dependencies {
     implementation "org.thymeleaf:thymeleaf:3.1.2.RELEASE"
     implementation "org.thymeleaf:thymeleaf-spring6:3.1.3.RELEASE"
 
-    implementation platform('io.sentry:sentry-bom:8.23.0')
+    implementation platform('io.sentry:sentry-bom:8.26.0')
     implementation 'io.sentry:sentry-spring-boot-starter'
     implementation 'io.sentry:sentry-logback'
 
@@ -62,7 +62,7 @@ dependencies {
     implementation 'commons-io:commons-io:2.20.0'
     implementation 'ch.qos.logback.contrib:logback-json-classic:0.1.5'
     implementation 'ch.qos.logback.contrib:logback-jackson:0.1.5'
-    implementation 'net.logstash.logback:logstash-logback-encoder:8.1'
+    implementation 'net.logstash.logback:logstash-logback-encoder:9.0'
     implementation 'commons-lang:commons-lang:2.6'
 
     testImplementation('org.springframework.boot:spring-boot-starter-test') {
@@ -146,7 +146,7 @@ distributions {
 
 jib {
     from {
-        image = "openjdk:17-jdk-slim"
+        image = "eclipse-temurin:21-ubi10-minimal"
     }
     to {
         image = "docker-registry.ripe.net/rpki/rpki-ripe-ncc"

build.gradle

@@ -14,5 +14,5 @@ dependencies {
         exclude group: 'org.eclipse.jgit', module: 'org.eclipse.jgit'
     }
     implementation 'org.eclipse.jgit:org.eclipse.jgit:7.4.0.202509020913-r'
-    implementation 'org.sonarqube:org.sonarqube.gradle.plugin:7.0.0.6105'
+    implementation 'org.sonarqube:org.sonarqube.gradle.plugin:7.0.1.6134'
 }

buildSrc/build.gradle

@@ -43,7 +43,7 @@ repositories {
 
 java {
     toolchain {
-        languageVersion = JavaLanguageVersion.of(17)
+        languageVersion = JavaLanguageVersion.of(21)
     }
 }