Merge pull request #793 from adoptium/main

merge main into prod
adoptium · Nov 10, 2023 · 17805b0 · 17805b0
2 parents bf390bf + 48e64fc
commit 17805b0
Show file tree

Hide file tree

Showing 32 changed files with 364 additions and 155 deletions.
diff --git a/.github/actions/azure-login/action.yml b/.github/actions/azure-login/action.yml
@@ -27,7 +27,7 @@ runs:
       subscription-id: ${{ inputs.AZURE_SUBSCRIPTION_ID }}
 
   - name: Login to Azure Container Registry
-    uses: docker/login-action@465a07811f14bebb1938fbed4728c6a1ff8901fc # v2.2.0
+    uses: docker/login-action@343f7c4344506bcbf9b4de18042ae17996df046d # v3.0.0
     with:
       registry: adoptopenjdkacr.azurecr.io
       username: ${{ inputs.AZURE_CLIENT_ID }}

diff --git a/.github/actions/do-login/action.yml b/.github/actions/do-login/action.yml
@@ -8,7 +8,7 @@ runs:
   using: composite
   steps:
   - name: Login to DigitalOcean
-    uses: digitalocean/action-doctl@cf10ddb4467f6fb84c01f7cc5f099cec71eabc93 # v2.4.1
+    uses: digitalocean/action-doctl@e5cb5b0cde9789f79c5115c2c4d902f38a708804 # v2.5.0
     with:
       token: ${{ inputs.DIGITALOCEAN_ACCESS_TOKEN }}
 

diff --git a/.github/actions/docker-build/action.yml b/.github/actions/docker-build/action.yml
@@ -4,16 +4,19 @@ inputs:
     DOCKER_REPO:
       description: 'Docker repository'
       required: true
+    DOCKER_FILE:
+      description: 'Dockerfile path'
+      required: true
     BUILD_ARGS:
       description: 'Build arguments'
       required: false
 runs:
   using: composite
   steps:
   - name: Build container image and push to Azure
-    uses: docker/build-push-action@0a97817b6ade9f46837855d676c4cca3a2471fc9 # v4.2.1
+    uses: docker/build-push-action@0565240e2d4ab88bba5387d719585280857ece09 # v5.0.0
     with:
-      file: ./deploy/Dockerfile
+      file: ${{ inputs.DOCKER_FILE }}
       tags: ${{ inputs.DOCKER_REPO }}:latest
       build-args: ${{ inputs.BUILD_ARGS }}
       push: true
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -4,6 +4,20 @@ updates:
     directory: "/"
     schedule:
       interval: "daily"
+  # Maintain dependencies for GitHub composite Actions (/.github/actions)
+  # Waiting for supporting wildcards see https://github.com/dependabot/dependabot-core/issues/5137
+  - package-ecosystem: "github-actions"
+    directory: "/.github/actions/azure-login"
+    schedule:
+      interval: "daily"
+  - package-ecosystem: "github-actions"
+    directory: "/.github/actions/do-login"
+    schedule:
+      interval: "daily"
+  - package-ecosystem: "github-actions"
+    directory: "/.github/actions/docker-build"
+    schedule:
+      interval: "daily"
   - package-ecosystem: "maven"
     directory: "/"
     schedule:
@@ -12,3 +26,7 @@ updates:
     directory: "/"
     schedule:
       interval: "daily"
+  - package-ecosystem: docker
+    directory: "/deploy"
+    schedule:
+      interval: "daily"
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -30,13 +30,13 @@ jobs:
           adoptopenjdk) echo "ARGS=-Padoptopenjdk,-adoptium" >> $GITHUB_ENV ;;
         esac
 
-    - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
+    - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
       with:
         persist-credentials: false
 
     - uses: actions/setup-java@0ab4596768b603586c0de567f2430c30f5b0d2b0 # v3.13.0
       with:
-        java-version: '17'
+        java-version: '21'
         distribution: 'temurin'
         cache: 'maven'
 

diff --git a/.github/workflows/deploy-adoptium.yml b/.github/workflows/deploy-adoptium.yml
@@ -14,7 +14,7 @@ jobs:
     if: startsWith(github.repository, 'adoptium/')
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
+      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
 
       - name: Login to Azure
         uses: ./.github/actions/azure-login
@@ -36,6 +36,7 @@ jobs:
         uses: ./.github/actions/docker-build
         with:
           DOCKER_REPO: adoptopenjdkacr.azurecr.io/adoptopenjdk-${{ env.NAMESPACE }}
+          DOCKER_FILE: ./deploy/Dockerfile
 
       - name: Redeploy Kubernetes Updater and Frontend
         uses: ./.github/actions/kubectl-redeploy

diff --git a/.github/workflows/deploy-adoptopenjdk.yml b/.github/workflows/deploy-adoptopenjdk.yml
@@ -14,7 +14,7 @@ jobs:
     if: startsWith(github.repository, 'adoptium/')
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
+      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
 
       - name: Login to Azure
         uses: ./.github/actions/azure-login
@@ -36,6 +36,7 @@ jobs:
         uses: ./.github/actions/docker-build
         with:
           DOCKER_REPO: adoptopenjdkacr.azurecr.io/azure-${{ env.NAMESPACE }}
+          DOCKER_FILE: ./deploy/Dockerfile
           BUILD_ARGS: MAVEN_FLAGS="-Padoptopenjdk,-adoptium"
 
       - name: Redeploy Kubernetes Updater and Frontend

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -14,11 +14,11 @@ jobs:
       contents: write  # for Git to git push
 
     steps:
-      - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
+      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
 
       - uses: actions/setup-java@0ab4596768b603586c0de567f2430c30f5b0d2b0 # v3.13.0
         with:
-          java-version: '17'
+          java-version: '21'
           distribution: 'temurin'
           cache: 'maven'
 

diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties
@@ -14,5 +14,5 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.2/apache-maven-3.9.2-bin.zip
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.5/apache-maven-3.9.5-bin.zip
 wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar
diff --git a/.s2i/bin/assemble b/.s2i/bin/assemble
diff --git a/.s2i/bin/save-artifacts b/.s2i/bin/save-artifacts
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -34,6 +34,24 @@ If you want to use the updater tool to add entries into the database, you need t
 
 The production server uses mongodb to store data, however you can also use Fongo. If you would like to install mongodb and are on mac, I used this [guide](https://zellwk.com/blog/install-mongodb/) which utilizes homebrew. You can also install `mongo` which is a command-line tool that gives you access to your mongodb, allowing you to manually search through the database.
 
+### GitHub App Authentication
+
+The updater can be used with a GitHub Token or GitHub App. To use a GitHub app you need to generate an app on GitHub. Once you've done that you need to convert the key to PKCS#8 format using the following command:
+
+```bash
+openssl pkcs8 -topk8 -inform PEM -outform PEM -nocrypt -in your-rsa-private-key.pem -out pkcs8-key.pem
+```
+
+Once this is done you can export the following variables at runtime:
+
+```bash
+export GITHUB_APP_ID="1234"
+export GITHUB_APP_INSTALLATION_ID="1234"
+export GITHUB_APP_PRIVATE_KEY=$'-----BEGIN PRIVATE KEY-----
+<key contents>
+-----END PRIVATE KEY-----'
+```
+
 ### Build Tool
 
 [Maven](https://maven.apache.org/index.html) is used to build the project.

diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM eclipse-temurin:17 as build
+FROM eclipse-temurin:21 as build
 
 RUN mkdir /tmp/build
 
@@ -8,7 +8,7 @@ COPY . /tmp/build
 
 RUN ./mvnw clean install -Padoptium
 
-FROM eclipse-temurin:17
+FROM eclipse-temurin:21
 
 RUN mkdir -p /deployments
 

diff --git a/adoptium-api-versions/pom.xml b/adoptium-api-versions/pom.xml
@@ -9,18 +9,18 @@
 
     <properties>
         <coroutine.version>1.7.3</coroutine.version>
-        <jackson.version>2.15.2</jackson.version>
+        <jackson.version>2.15.3</jackson.version>
         <jdk.version>17</jdk.version>
-        <kmongo.version>4.10.0</kmongo.version>
+        <kmongo.version>4.11.0</kmongo.version>
         <kotlin.compiler.jvmTarget>17</kotlin.compiler.jvmTarget>
-        <kotlin.version>1.9.10</kotlin.version>
+        <kotlin.version>1.9.20</kotlin.version>
         <logback.version>1.4.11</logback.version>
         <maven.compiler.release>17</maven.compiler.release>
-        <maven.version>3.9.2</maven.version>
+        <maven.version>3.9.5</maven.version>
         <maven.project-info-reports-plugin.version>3.4.5</maven.project-info-reports-plugin.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <quarkus.version>3.4.2</quarkus.version>
+        <quarkus.version>3.5.1</quarkus.version>
         <rest-assured.version>5.3.2</rest-assured.version>
     </properties>
 
@@ -200,7 +200,7 @@
             <dependency>
                 <groupId>de.flapdoodle.embed</groupId>
                 <artifactId>de.flapdoodle.embed.mongo</artifactId>
-                <version>4.9.2</version>
+                <version>4.10.1</version>
                 <scope>test</scope>
             </dependency>
 
@@ -247,7 +247,7 @@
             <dependency>
                 <groupId>org.jooq</groupId>
                 <artifactId>jooq</artifactId>
-                <version>3.18.6</version>
+                <version>3.18.7</version>
             </dependency>
             <dependency>
                 <groupId>org.slf4j</groupId>
@@ -263,22 +263,22 @@
             <dependency>
                 <groupId>com.microsoft.azure</groupId>
                 <artifactId>applicationinsights-runtime-attach</artifactId>
-                <version>3.4.17</version>
+                <version>3.4.18</version>
             </dependency>
             <dependency>
                 <groupId>io.opentelemetry.javaagent.instrumentation</groupId>
                 <artifactId>opentelemetry-javaagent-kotlinx-coroutines</artifactId>
-                <version>1.30.0-alpha</version>
+                <version>1.31.0-alpha</version>
             </dependency>
             <dependency>
                 <groupId>io.opentelemetry.javaagent.instrumentation</groupId>
                 <artifactId>opentelemetry-javaagent-netty-4.1</artifactId>
-                <version>1.30.0-alpha</version>
+                <version>1.31.0-alpha</version>
             </dependency>
             <dependency>
                 <groupId>org.jboss.weld</groupId>
                 <artifactId>weld-junit5</artifactId>
-                <version>4.0.0.Final</version>
+                <version>4.0.1.Final</version>
                 <scope>test</scope>
             </dependency>
             <dependency>
@@ -337,25 +337,31 @@
             <dependency>
                 <groupId>org.junit.jupiter</groupId>
                 <artifactId>junit-jupiter</artifactId>
-                <version>5.10.0</version>
+                <version>5.10.1</version>
                 <scope>test</scope>
             </dependency>
             <dependency>
                 <groupId>io.smallrye</groupId>
                 <artifactId>smallrye-open-api-core</artifactId>
-                <version>3.6.2</version>
+                <version>3.7.0</version>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
+                <groupId>io.smallrye</groupId>
+                <artifactId>smallrye-open-api-jaxrs</artifactId>
+                <version>3.7.0</version>
                 <scope>test</scope>
             </dependency>
             <dependency>
                 <groupId>org.eclipse.jetty</groupId>
                 <artifactId>jetty-server</artifactId>
-                <version>12.0.1</version>
+                <version>12.0.3</version>
                 <scope>test</scope>
             </dependency>
             <dependency>
                 <groupId>org.eclipse.jetty</groupId>
                 <artifactId>jetty-client</artifactId>
-                <version>12.0.1</version>
+                <version>12.0.3</version>
             </dependency>
             <dependency>
                 <groupId>org.bouncycastle</groupId>
@@ -405,7 +411,7 @@
             <dependency>
                 <groupId>com.expediagroup</groupId>
                 <artifactId>graphql-kotlin-ktor-client</artifactId>
-                <version>7.0.1</version>
+                <version>7.0.2</version>
                 <exclusions>
                     <exclusion>
                         <groupId>org.jetbrains.kotlinx</groupId>
@@ -416,7 +422,7 @@
             <dependency>
                 <groupId>com.expediagroup</groupId>
                 <artifactId>graphql-kotlin-client-jackson</artifactId>
-                <version>7.0.1</version>
+                <version>7.0.2</version>
             </dependency>
         </dependencies>
     </dependencyManagement>

diff --git a/...um-api-v3-frontend/src/main/kotlin/net/adoptium/api/v3/routes/info/ReleaseListResource.kt b/...um-api-v3-frontend/src/main/kotlin/net/adoptium/api/v3/routes/info/ReleaseListResource.kt
@@ -151,6 +151,7 @@ constructor(
             semver
         )
             .map { it.release_name }
+            .distinct()
 
         val pagedReleases = getPage(pageSize, page, releases, showPageCount ?: false)