Merge branch 'feature/compile-with-jdk-11' into 'main'

Use rpki-commons 1.35 and back port changes that were mistakenly applied on GitHub

See merge request rpki/rpki-ta-0!121

.github/workflows/ci.yml

@@ -13,7 +13,7 @@ jobs:
     strategy:
       matrix:
         # test against latest update of each major Java version, as well as specific updates of LTS versions:
-        java: [ 8, 11, 17 ]
+        java: [ 11, 17 ]
     name: Java ${{ matrix.java }}
     steps:
       - uses: actions/checkout@v3
@@ -25,7 +25,7 @@ jobs:
           java-version: ${{ matrix.java }}
 
       - name: Setup Gradle
-        uses: gradle/gradle-build-action@v2
+        uses: gradle/gradle-build-action@v2.4.2
 
       - name: Execute Gradle build
         run: ./gradlew build
@@ -39,13 +39,14 @@ jobs:
       - uses: actions/checkout@v3
 
       - name: Setup Gradle
-        uses: gradle/gradle-build-action@v2
+        uses: gradle/gradle-build-action@v2.4.2
 
-      - name: Login to Docker Hub
-        uses: docker/login-action@v2
+      - name: Login to GHCR
+        uses: docker/login-action@v1
         with:
-          username: ${{ secrets.DOCKER_HUB_USERNAME }}
-          password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Set up Docker Buildx
         id: buildx

README.md

@@ -16,10 +16,13 @@ Changelog
 ---------
 
 ### main:
+  * Publish docker image to GHCR insetead of dockerhub
   * Updated github actions
   * Add feature to revoke objects that TA0 knows off, but are not requested
     (e.g. leftover files on manifest).
-  * Publish docker image `ripencc/rpki-ta-0`
+  * Publish docker image `ghcr.io/ripe-ncc/rpki-ta-0`
+  * Use rpki-commons 1.35
+  * Compile with JDK 11
 
 ### 0.3.5:
   * Removed explicit license from all files.

build.gradle

@@ -35,7 +35,7 @@ version = ENV['RELEASE_VERSION'] ?: gitRef()
 description = 'RIPE NCC Trust Anchor'
 
 dependencies {
-    implementation 'net.ripe.rpki:rpki-commons:1.30'
+    implementation 'net.ripe.rpki:rpki-commons:1.35'
     implementation 'commons-cli:commons-cli:1.5.0'
     implementation 'org.slf4j:slf4j-api:2.0.7'
     runtimeOnly 'org.slf4j:slf4j-simple:2.0.7'
@@ -126,5 +126,5 @@ jib {
         }
       }
     }
-    to { image = "ripencc/rpki-ta-0" }
+    to { image = "ghcr.io/ripe-ncc/rpki-ta-0" }
 }