Merge pull request #728 from adoptium/main

merge main into prod
adoptium · Oct 10, 2023 · bf390bf · bf390bf
2 parents 6cae7f5 + 71c52a2
commit bf390bf
Show file tree

Hide file tree

Showing 9 changed files with 38 additions and 30 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -30,11 +30,11 @@ jobs:
           adoptopenjdk) echo "ARGS=-Padoptopenjdk,-adoptium" >> $GITHUB_ENV ;;
         esac
 
-    - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0
+    - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
       with:
         persist-credentials: false
 
-    - uses: actions/setup-java@cd89f46ac9d01407894225f350157564c9c7cee2 # v3.12.0
+    - uses: actions/setup-java@0ab4596768b603586c0de567f2430c30f5b0d2b0 # v3.13.0
       with:
         java-version: '17'
         distribution: 'temurin'

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@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0
+      - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
 
       - name: Login to Azure
         uses: ./.github/actions/azure-login

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@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0
+      - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
 
       - name: Login to Azure
         uses: ./.github/actions/azure-login

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -14,9 +14,9 @@ jobs:
       contents: write  # for Git to git push
 
     steps:
-      - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0
+      - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
 
-      - uses: actions/setup-java@cd89f46ac9d01407894225f350157564c9c7cee2 # v3.12.0
+      - uses: actions/setup-java@0ab4596768b603586c0de567f2430c30f5b0d2b0 # v3.13.0
         with:
           java-version: '17'
           distribution: 'temurin'

diff --git a/adoptium-api-versions/pom.xml b/adoptium-api-versions/pom.xml
@@ -20,7 +20,7 @@
         <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.3.2</quarkus.version>
+        <quarkus.version>3.4.2</quarkus.version>
         <rest-assured.version>5.3.2</rest-assured.version>
     </properties>
 
@@ -101,7 +101,7 @@
             <dependency>
                 <groupId>io.mockk</groupId>
                 <artifactId>mockk-jvm</artifactId>
-                <version>1.13.7</version>
+                <version>1.13.8</version>
                 <scope>test</scope>
             </dependency>
 
@@ -200,7 +200,7 @@
             <dependency>
                 <groupId>de.flapdoodle.embed</groupId>
                 <artifactId>de.flapdoodle.embed.mongo</artifactId>
-                <version>4.8.0</version>
+                <version>4.9.2</version>
                 <scope>test</scope>
             </dependency>
 
@@ -263,17 +263,17 @@
             <dependency>
                 <groupId>com.microsoft.azure</groupId>
                 <artifactId>applicationinsights-runtime-attach</artifactId>
-                <version>3.4.16</version>
+                <version>3.4.17</version>
             </dependency>
             <dependency>
                 <groupId>io.opentelemetry.javaagent.instrumentation</groupId>
                 <artifactId>opentelemetry-javaagent-kotlinx-coroutines</artifactId>
-                <version>1.28.0-alpha</version>
+                <version>1.30.0-alpha</version>
             </dependency>
             <dependency>
                 <groupId>io.opentelemetry.javaagent.instrumentation</groupId>
                 <artifactId>opentelemetry-javaagent-netty-4.1</artifactId>
-                <version>1.29.0-alpha</version>
+                <version>1.30.0-alpha</version>
             </dependency>
             <dependency>
                 <groupId>org.jboss.weld</groupId>
@@ -284,7 +284,7 @@
             <dependency>
                 <groupId>org.jboss.weld.se</groupId>
                 <artifactId>weld-se-core</artifactId>
-                <version>5.1.1.Final</version>
+                <version>5.1.2.Final</version>
             </dependency>
             <dependency>
                 <groupId>javax.enterprise</groupId>
@@ -300,12 +300,12 @@
             <dependency>
                 <groupId>io.quarkiverse.logging.logback</groupId>
                 <artifactId>quarkus-logging-logback</artifactId>
-                <version>1.1.1</version>
+                <version>1.1.2</version>
             </dependency>
             <dependency>
                 <groupId>io.quarkiverse.logging.logback</groupId>
                 <artifactId>quarkus-logging-logback-impl</artifactId>
-                <version>1.1.1</version>
+                <version>1.1.2</version>
             </dependency>
             <dependency>
                 <groupId>io.quarkus</groupId>
@@ -343,7 +343,7 @@
             <dependency>
                 <groupId>io.smallrye</groupId>
                 <artifactId>smallrye-open-api-core</artifactId>
-                <version>3.5.2</version>
+                <version>3.6.2</version>
                 <scope>test</scope>
             </dependency>
             <dependency>
@@ -405,7 +405,7 @@
             <dependency>
                 <groupId>com.expediagroup</groupId>
                 <artifactId>graphql-kotlin-ktor-client</artifactId>
-                <version>6.5.3</version>
+                <version>7.0.1</version>
                 <exclusions>
                     <exclusion>
                         <groupId>org.jetbrains.kotlinx</groupId>
@@ -416,7 +416,7 @@
             <dependency>
                 <groupId>com.expediagroup</groupId>
                 <artifactId>graphql-kotlin-client-jackson</artifactId>
-                <version>6.5.3</version>
+                <version>7.0.1</version>
             </dependency>
         </dependencies>
     </dependencyManagement>

diff --git a/...doptium/api/v3/metrics/OtelInterceptor.kt → ...tium/api/v3/metrics/RequestInterceptor.kt b/...doptium/api/v3/metrics/OtelInterceptor.kt → ...tium/api/v3/metrics/RequestInterceptor.kt
@@ -8,13 +8,21 @@ import jakarta.ws.rs.ext.Provider
 
 @Provider
 class AfterContainerFilter : ContainerResponseFilter {
+    // Fetch the hostname once and cache it
+    private val hostname: String = System.getenv("HOSTNAME") ?: "unknown"
+
     override fun filter(requestContext: ContainerRequestContext?, responseContext: ContainerResponseContext?) {
         try {
+            // Existing User-Agent code
             val userAgent = requestContext?.headers?.get("User-Agent")?.getOrNull(0)
             val span: Span? = Span.current()
             if (userAgent != null && span != null) {
                 span.setAttribute("User-Agent", userAgent)
             }
+
+            // Add the pod's hostname as a response header
+            responseContext?.headers?.add("X-Pod-Hostname", hostname)
+
         } catch (_: Exception) {
             //Ignore
         }

diff --git a/...dels-parent/adoptium-api-v3-models/src/main/kotlin/net/adoptium/api/v3/models/Versions.kt b/...dels-parent/adoptium-api-v3-models/src/main/kotlin/net/adoptium/api/v3/models/Versions.kt
@@ -7,7 +7,7 @@ object Versions {
 
     private val latestJavaVersion: Int
     val versions: Array<Int>
-    val ltsVersions: Array<Int> = arrayOf(8, 11, 17)
+    val ltsVersions: Array<Int> = arrayOf(8, 11, 17, 21)
 
     init {
         latestJavaVersion = Integer.parseInt(System.getProperty(LATEST_JAVA_VERSION_PROPERTY, DEFAULT_LATEST_JAVA_VERSION.toString()))

diff --git a/...doptium-api-v3-updater/src/test/kotlin/net/adoptium/api/GraphQLGitHubReleaseClientTest.kt b/...doptium-api-v3-updater/src/test/kotlin/net/adoptium/api/GraphQLGitHubReleaseClientTest.kt
@@ -73,7 +73,7 @@ class GraphQLGitHubReleaseClientTest : BaseTest() {
                 override suspend fun <F : Any> request(query: GraphQLClientRequest<F>): GraphQLClientResponse<F> {
                     val builder = mockk<GraphQLClientResponse<F>>()
 
-                    assert(query.query.contains("a-github-id"))
+                    assert(query.query?.contains("a-github-id") == true)
                     every { builder.data } returns GHReleaseResult(response, RateLimit(0, 5000)) as F
                     every { builder.errors } returns null
                     return builder
@@ -97,7 +97,7 @@ class GraphQLGitHubReleaseClientTest : BaseTest() {
                 override suspend fun <F : Any> request(query: GraphQLClientRequest<F>): GraphQLClientResponse<F> {
                     val builder = mockk<GraphQLClientResponse<F>>()
 
-                    assert(query.query.contains("a-repo-name"))
+                    assert(query.query?.contains("a-repo-name") == true)
 
                     every { builder.data } returns QueryData(repo, RateLimit(0, 5000)) as F
                     every { builder.errors } returns null
@@ -141,7 +141,7 @@ class GraphQLGitHubReleaseClientTest : BaseTest() {
                 override suspend fun <F : Any> request(query: GraphQLClientRequest<F>): GraphQLClientResponse<F> {
                     val builder = mockk<GraphQLClientResponse<F>>()
 
-                    assert(query.query.contains("a-repo-name"))
+                    assert(query.query?.contains("a-repo-name") == true)
 
                     every { builder.data } returns summary as F
                     every { builder.errors } returns null
@@ -166,7 +166,7 @@ class GraphQLGitHubReleaseClientTest : BaseTest() {
                 override suspend fun <F : Any> request(query: GraphQLClientRequest<F>): GraphQLClientResponse<F> {
                     val builder = mockk<GraphQLClientResponse<F>>()
 
-                    assert(query.query.contains("a-repo-name"))
+                    assert(query.query?.contains("a-repo-name") == true)
 
                     val pageInfo = if ((query.variables as Map<String, String>)["cursorPointer"] != null) {
                         PageInfo(false, null)

diff --git a/pom.xml b/pom.xml
@@ -50,30 +50,30 @@
         <!-- <maven.install-plugin.version>3.1.1</maven.install-plugin.version> -->
         <maven.jacoco-plugin.version>0.8.10</maven.jacoco-plugin.version>
         <maven.jar-plugin.version>3.3.0</maven.jar-plugin.version>
-        <maven.javadoc-plugin.version>3.5.0</maven.javadoc-plugin.version>
+        <maven.javadoc-plugin.version>3.6.0</maven.javadoc-plugin.version>
         <!-- Disabled further below until we get 2.1 https://www.mail-archive.com/[email protected]/msg127389.html -->
         <maven.jdepend-plugin.version>2.0</maven.jdepend-plugin.version>
         <maven.jdeprscan-plugin.version>3.0.0-alpha-1</maven.jdeprscan-plugin.version>
         <maven.jdeps-plugin.version>3.1.2</maven.jdeps-plugin.version>
         <maven.jxr-plugin.version>3.3.0</maven.jxr-plugin.version>
         <maven.license-plugin.version>2.2.0</maven.license-plugin.version>
-        <maven.openapi-generator-maven-plugin.version>6.6.0</maven.openapi-generator-maven-plugin.version>
-        <maven.pitest-plugin.version>1.14.4</maven.pitest-plugin.version>
+        <maven.openapi-generator-maven-plugin.version>7.0.1</maven.openapi-generator-maven-plugin.version>
+        <maven.pitest-plugin.version>1.15.0</maven.pitest-plugin.version>
         <maven.pmd-plugin.version>3.21.0</maven.pmd-plugin.version>
         <maven.project-info-reports-plugin.version>3.4.5</maven.project-info-reports-plugin.version>
         <maven.rat-plugin.version>0.15</maven.rat-plugin.version>
         <maven.release-plugin.version>3.0.1</maven.release-plugin.version>
         <maven.resources-plugin.version>3.3.1</maven.resources-plugin.version>
         <maven.scm-plugin.version>2.0.1</maven.scm-plugin.version>
-        <maven.site-plugin.version>4.0.0-M9</maven.site-plugin.version>
+        <maven.site-plugin.version>4.0.0-M10</maven.site-plugin.version>
         <maven.source-plugin.version>3.3.0</maven.source-plugin.version>
-        <maven.spotbugs-plugin.version>4.7.3.5</maven.spotbugs-plugin.version>
+        <maven.spotbugs-plugin.version>4.7.3.6</maven.spotbugs-plugin.version>
         <maven.surefire-plugin.version>3.1.2</maven.surefire-plugin.version>
         <maven.swaggerhub-maven-plugin.version>1.0.10</maven.swaggerhub-maven-plugin.version>
         <maven.tidy-plugin.version>1.2.0</maven.tidy-plugin.version>
         <maven.toolchains-plugin.version>3.1.0</maven.toolchains-plugin.version>
         <maven.version>3.9.2</maven.version>
-        <maven.versions-plugin.version>2.16.0</maven.versions-plugin.version>
+        <maven.versions-plugin.version>2.16.1</maven.versions-plugin.version>
         <maven.war-plugin.version>3.4.0</maven.war-plugin.version>
         <mutability.detector.version>0.9.1</mutability.detector.version>
         <pmd.version>6.55.0</pmd.version>
@@ -82,7 +82,7 @@
         <spotbugs.version>4.7.3</spotbugs.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <quarkus.version>3.3.1</quarkus.version>
+        <quarkus.version>3.4.2</quarkus.version>
     </properties>
 
     <modules>