Skip to content

Commit 5732f85

Browse files
authored
Merge pull request #956 from adoptium/main
merge main into prod
2 parents 3ab78ec + 4bdd7a0 commit 5732f85

File tree

9 files changed

+71
-29
lines changed

9 files changed

+71
-29
lines changed

.github/actions/azure-login/action.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ runs:
2020
using: composite
2121
steps:
2222
- name: Login to our Azure subscription.
23-
uses: azure/login@cb79c773a3cfa27f31f25eb3f677781210c9ce3d # v1.6.1
23+
uses: azure/login@8c334a195cbb38e46038007b304988d888bf676a # v2.0.0
2424
with:
2525
client-id: ${{ inputs.AZURE_CLIENT_ID_OIDC }}
2626
tenant-id: ${{ inputs.AZURE_TENANT_ID }}

.github/actions/docker-build/action.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ runs:
1414
using: composite
1515
steps:
1616
- name: Build container image and push to Azure
17-
uses: docker/build-push-action@4a13e500e55cf31b7a5d59a38ab2040ab0f42f56 # v5.1.0
17+
uses: docker/build-push-action@af5a7ed5ba88268d5278f7203fb52cd833f66d6e # v5.2.0
1818
with:
1919
file: ${{ inputs.DOCKER_FILE }}
2020
tags: ${{ inputs.DOCKER_REPO }}:latest

.github/workflows/ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
with:
3535
persist-credentials: false
3636

37-
- uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # v4.0.0
37+
- uses: actions/setup-java@9704b39bf258b59bc04b50fa2dd55e9ed76b47a8 # v4.1.0
3838
with:
3939
java-version: '21'
4040
distribution: 'temurin'

.github/workflows/publish.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
steps:
1717
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
1818

19-
- uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # v4.0.0
19+
- uses: actions/setup-java@9704b39bf258b59bc04b50fa2dd55e9ed76b47a8 # v4.1.0
2020
with:
2121
java-version: '21'
2222
distribution: 'temurin'

adoptium-api-versions/pom.xml

+17-17
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,19 @@
88
<packaging>pom</packaging>
99

1010
<properties>
11-
<coroutine.version>1.7.3</coroutine.version>
12-
<jackson.version>2.16.1</jackson.version>
11+
<coroutine.version>1.8.0</coroutine.version>
12+
<jackson.version>2.16.2</jackson.version>
1313
<jdk.version>17</jdk.version>
1414
<kmongo.version>4.11.0</kmongo.version>
1515
<kotlin.compiler.jvmTarget>17</kotlin.compiler.jvmTarget>
16-
<kotlin.version>1.9.22</kotlin.version>
17-
<logback.version>1.4.14</logback.version>
16+
<kotlin.version>1.9.23</kotlin.version>
17+
<logback.version>1.5.3</logback.version>
1818
<maven.compiler.release>17</maven.compiler.release>
1919
<maven.version>3.9.6</maven.version>
2020
<maven.project-info-reports-plugin.version>3.5.0</maven.project-info-reports-plugin.version>
2121
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
2222
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
23-
<quarkus.version>3.7.2</quarkus.version>
23+
<quarkus.version>3.8.2</quarkus.version>
2424
<rest-assured.version>5.4.0</rest-assured.version>
2525
</properties>
2626

@@ -101,7 +101,7 @@
101101
<dependency>
102102
<groupId>io.mockk</groupId>
103103
<artifactId>mockk-jvm</artifactId>
104-
<version>1.13.9</version>
104+
<version>1.13.10</version>
105105
<scope>test</scope>
106106
</dependency>
107107

@@ -240,14 +240,14 @@
240240
<dependency>
241241
<groupId>org.codehaus.groovy</groupId>
242242
<artifactId>groovy-xml</artifactId>
243-
<version>3.0.20</version>
243+
<version>3.0.21</version>
244244
</dependency>
245245

246246

247247
<dependency>
248248
<groupId>org.jooq</groupId>
249249
<artifactId>jooq</artifactId>
250-
<version>3.19.3</version>
250+
<version>3.19.6</version>
251251
</dependency>
252252
<dependency>
253253
<groupId>org.slf4j</groupId>
@@ -263,22 +263,22 @@
263263
<dependency>
264264
<groupId>com.microsoft.azure</groupId>
265265
<artifactId>applicationinsights-runtime-attach</artifactId>
266-
<version>3.4.19</version>
266+
<version>3.5.0</version>
267267
</dependency>
268268
<dependency>
269269
<groupId>io.opentelemetry.javaagent.instrumentation</groupId>
270270
<artifactId>opentelemetry-javaagent-kotlinx-coroutines</artifactId>
271-
<version>2.0.0-alpha</version>
271+
<version>2.1.0-alpha</version>
272272
</dependency>
273273
<dependency>
274274
<groupId>io.opentelemetry.javaagent.instrumentation</groupId>
275275
<artifactId>opentelemetry-javaagent-netty-4.1</artifactId>
276-
<version>2.0.0-alpha</version>
276+
<version>2.1.0-alpha</version>
277277
</dependency>
278278
<dependency>
279279
<groupId>org.jboss.weld</groupId>
280280
<artifactId>weld-junit5</artifactId>
281-
<version>4.0.1.Final</version>
281+
<version>4.0.2.Final</version>
282282
<scope>test</scope>
283283
</dependency>
284284
<dependency>
@@ -295,7 +295,7 @@
295295
<dependency>
296296
<groupId>org.codehaus.groovy</groupId>
297297
<artifactId>groovy</artifactId>
298-
<version>3.0.20</version>
298+
<version>3.0.21</version>
299299
</dependency>
300300
<dependency>
301301
<groupId>io.quarkiverse.logging.logback</groupId>
@@ -343,25 +343,25 @@
343343
<dependency>
344344
<groupId>io.smallrye</groupId>
345345
<artifactId>smallrye-open-api-core</artifactId>
346-
<version>3.9.0</version>
346+
<version>3.10.0</version>
347347
<scope>test</scope>
348348
</dependency>
349349
<dependency>
350350
<groupId>io.smallrye</groupId>
351351
<artifactId>smallrye-open-api-jaxrs</artifactId>
352-
<version>3.9.0</version>
352+
<version>3.10.0</version>
353353
<scope>test</scope>
354354
</dependency>
355355
<dependency>
356356
<groupId>org.eclipse.jetty</groupId>
357357
<artifactId>jetty-server</artifactId>
358-
<version>12.0.6</version>
358+
<version>12.0.7</version>
359359
<scope>test</scope>
360360
</dependency>
361361
<dependency>
362362
<groupId>org.eclipse.jetty</groupId>
363363
<artifactId>jetty-client</artifactId>
364-
<version>12.0.6</version>
364+
<version>12.0.7</version>
365365
</dependency>
366366
<dependency>
367367
<groupId>org.bouncycastle</groupId>

adoptium-updater-parent/adoptium-datasources-parent/adoptium-github-datasource/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
<dependency>
5151
<groupId>org.kohsuke</groupId>
5252
<artifactId>github-api</artifactId>
53-
<version>1.318</version>
53+
<version>1.319</version>
5454
</dependency>
5555
<dependency>
5656
<groupId>net.adoptium.api</groupId>

adoptium-updater-parent/adoptium-datasources-parent/adoptium-http-client-datasource/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@
6868
<dependency>
6969
<groupId>org.kohsuke</groupId>
7070
<artifactId>github-api</artifactId>
71-
<version>1.318</version>
71+
<version>1.319</version>
7272
</dependency>
7373
</dependencies>
7474

docs/cookbook.adoc

+42
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,48 @@ The full set of filters and possible argument values is available in
145145
https://api.adoptium.net/q/swagger-ui/[the API documentation]
146146
and can be used to specify exactly the information you require.
147147

148+
[#example-five]
149+
== Example Five: Download JDKs via the API using Powershell.
150+
151+
Below is a sample script written in Powershell for Windows This script downloads and verifies the JDKs via the API, and performs checksum validation. This script is provided as an example to demonstrate how the API can be used to automate tasks such as downloading and verifying the JDK.
152+
153+
[source, powershell]
154+
----
155+
# Define Folders For Downloads
156+
$ShareFolder = "<path to where the builds will be copied to>"
157+
# Define Releases To Download
158+
$Releases = @('8', '11', '17', '21')
159+
$Releases | ForEach-Object {
160+
$Release = $_
161+
$Platforms = @('linux', 'windows')
162+
$Platforms | ForEach-Object {
163+
$Platform = $_
164+
$Types = @('jdk', 'jre')
165+
$Types | ForEach-Object {
166+
$Type = $_
167+
$ReleaseInfo = Invoke-WebRequest -Uri "https://api.adoptium.net/v3/assets/latest/$Release/hotspot?architecture=x64&image_type=$Type&os=$Platform&vendor=eclipse" -UseBasicParsing | ConvertFrom-Json
168+
$CurrentDate = Get-Date -UFormat "%Y-%m-%dT%H:%M:%SZ"
169+
$TimeDifference = New-TimeSpan -Start $ReleaseInfo.binary.updated_at -End $CurrentDate
170+
$Found = Get-ChildItem -Filter $ReleaseInfo.binary.package.name -Path $ShareFolder
171+
if ($null -eq $Found) {
172+
Remove-Item "$ShareFolder\OpenJDK$ReleaseU-$Type*"
173+
Write-Host "Downloading file $($ReleaseInfo.binary.package.name) to $ShareFolder"
174+
Invoke-WebRequest -Uri "https://api.adoptium.net/v3/binary/latest/$Release/ga/$Platform/x64/$Type/hotspot/normal/eclipse" -UseBasicParsing -OutFile "$ShareFolder\$($ReleaseInfo.binary.package.name)"
175+
Write-Host "Comparing checksums"
176+
$DownloadHash = Get-FileHash "$ShareFolder\$($ReleaseInfo.binary.package.name)"
177+
$AdoptiumHash = $ReleaseInfo.binary.package.checksum
178+
179+
if ($AdoptiumHash -ne $DownloadHash.hash) {
180+
Write-Host "An integrity issue has been found with $($ReleaseInfo.binary.package.name) on $ShareFolder"
181+
}
182+
} else {
183+
Write-Host "The file $($ReleaseInfo.binary.package.name) appears to have already been downloaded."
184+
}
185+
}
186+
}
187+
}
188+
----
189+
148190
== More examples
149191

150192
Looking for more API examples? Got an example you'd like to share? Drop us a note on the

pom.xml

+6-6
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919
<jacoco.version>0.8.11</jacoco.version>
2020
<jdk.version>17</jdk.version>
2121
<kotlin.compiler.jvmTarget>17</kotlin.compiler.jvmTarget>
22-
<kotlin.version>1.9.22</kotlin.version>
22+
<kotlin.version>1.9.23</kotlin.version>
2323
<maven.antrun-plugin.version>3.1.0</maven.antrun-plugin.version>
24-
<maven.assembly-plugin.version>3.6.0</maven.assembly-plugin.version>
24+
<maven.assembly-plugin.version>3.7.0</maven.assembly-plugin.version>
2525
<maven.build-helper-plugin.version>3.5.0</maven.build-helper-plugin.version>
2626
<maven.changes-plugin.version>2.12.1</maven.changes-plugin.version>
2727
<maven.checkstyle-plugin.version>3.3.0</maven.checkstyle-plugin.version>
@@ -37,8 +37,8 @@
3737
<maven.deploy-plugin.version>3.1.1</maven.deploy-plugin.version>
3838
<maven.directory-maven-plugin.version>1.0</maven.directory-maven-plugin.version>
3939
<maven.enforcer-plugin.version>3.4.1</maven.enforcer-plugin.version>
40-
<maven.exec-plugin.version>3.1.1</maven.exec-plugin.version>
41-
<maven.filtering-plugin.version>3.3.1</maven.filtering-plugin.version>
40+
<maven.exec-plugin.version>3.2.0</maven.exec-plugin.version>
41+
<maven.filtering-plugin.version>3.3.2</maven.filtering-plugin.version>
4242
<maven.help-plugin.version>3.4.0</maven.help-plugin.version>
4343
<!--
4444
TODO Moving to 3.1.1 created a multi-module packaging issue:
@@ -58,7 +58,7 @@
5858
<maven.jxr-plugin.version>3.3.2</maven.jxr-plugin.version>
5959
<maven.license-plugin.version>2.4.0</maven.license-plugin.version>
6060
<maven.openapi-generator-maven-plugin.version>7.3.0</maven.openapi-generator-maven-plugin.version>
61-
<maven.pitest-plugin.version>1.15.7</maven.pitest-plugin.version>
61+
<maven.pitest-plugin.version>1.15.8</maven.pitest-plugin.version>
6262
<maven.pmd-plugin.version>3.21.2</maven.pmd-plugin.version>
6363
<maven.project-info-reports-plugin.version>3.5.0</maven.project-info-reports-plugin.version>
6464
<maven.rat-plugin.version>0.16.1</maven.rat-plugin.version>
@@ -82,7 +82,7 @@
8282
<spotbugs.version>4.7.3</spotbugs.version>
8383
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
8484
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
85-
<quarkus.version>3.7.2</quarkus.version>
85+
<quarkus.version>3.8.2</quarkus.version>
8686
</properties>
8787

8888
<modules>

0 commit comments

Comments
 (0)