From b381e9d7c24b1ed91b1f136d203c2e816e7fb7d5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 25 Oct 2023 10:33:00 +0000 Subject: [PATCH 01/14] build(deps): bump api.adoptium.net from `24a736d` to `a53e82a` Bumps [api.adoptium.net](https://github.com/adoptium/api.adoptium.net) from `24a736d` to `a53e82a`. - [Commits](https://github.com/adoptium/api.adoptium.net/compare/24a736dde8cdda212ac66e17a1f49dc1d134b41d...a53e82a2fcc9b7d07bb47a838532eca2e2917857) --- updated-dependencies: - dependency-name: api.adoptium.net dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- api.adoptium.net | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api.adoptium.net b/api.adoptium.net index 24a736dd..a53e82a2 160000 --- a/api.adoptium.net +++ b/api.adoptium.net @@ -1 +1 @@ -Subproject commit 24a736dde8cdda212ac66e17a1f49dc1d134b41d +Subproject commit a53e82a2fcc9b7d07bb47a838532eca2e2917857 From 1cb4226516dad2b2a08544cb1d009f1f68833212 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 25 Oct 2023 20:19:38 +0000 Subject: [PATCH 02/14] build(deps): bump org.codehaus.mojo:license-maven-plugin Bumps [org.codehaus.mojo:license-maven-plugin](https://github.com/mojohaus/license-maven-plugin) from 2.2.0 to 2.3.0. - [Release notes](https://github.com/mojohaus/license-maven-plugin/releases) - [Commits](https://github.com/mojohaus/license-maven-plugin/compare/2.2.0...2.3.0) --- updated-dependencies: - dependency-name: org.codehaus.mojo:license-maven-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- adoptium-marketplace-server/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adoptium-marketplace-server/pom.xml b/adoptium-marketplace-server/pom.xml index 4ced1df5..666013ba 100644 --- a/adoptium-marketplace-server/pom.xml +++ b/adoptium-marketplace-server/pom.xml @@ -260,7 +260,7 @@ org.codehaus.mojo license-maven-plugin - 2.2.0 + 2.3.0 download-licenses From e02a4ff22f04bbc857aefddd73e2b886d1597cc0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 26 Oct 2023 20:30:35 +0000 Subject: [PATCH 03/14] build(deps): bump api.adoptium.net from `a53e82a` to `b43606a` Bumps [api.adoptium.net](https://github.com/adoptium/api.adoptium.net) from `a53e82a` to `b43606a`. - [Commits](https://github.com/adoptium/api.adoptium.net/compare/a53e82a2fcc9b7d07bb47a838532eca2e2917857...b43606a1463a046d9686a51a7d5f156d16aff1d7) --- updated-dependencies: - dependency-name: api.adoptium.net dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- api.adoptium.net | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api.adoptium.net b/api.adoptium.net index a53e82a2..b43606a1 160000 --- a/api.adoptium.net +++ b/api.adoptium.net @@ -1 +1 @@ -Subproject commit a53e82a2fcc9b7d07bb47a838532eca2e2917857 +Subproject commit b43606a1463a046d9686a51a7d5f156d16aff1d7 From c66fbe575a02180ef1e8bb4fd35d1dfe945434cc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 26 Oct 2023 21:00:10 +0000 Subject: [PATCH 04/14] build(deps): bump io.smallrye:smallrye-open-api-maven-plugin Bumps io.smallrye:smallrye-open-api-maven-plugin from 3.6.2 to 3.7.0. --- updated-dependencies: - dependency-name: io.smallrye:smallrye-open-api-maven-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5de91c82..7a355d20 100644 --- a/pom.xml +++ b/pom.xml @@ -118,7 +118,7 @@ smallrye-open-api-maven-plugin io.smallrye - 3.6.2 + 3.7.0 org.jetbrains.kotlin From d7de308f999c3bf820b0eb96e27b8077cdbd723a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 26 Oct 2023 21:00:22 +0000 Subject: [PATCH 05/14] build(deps): bump org.apache.maven.plugins:maven-clean-plugin Bumps [org.apache.maven.plugins:maven-clean-plugin](https://github.com/apache/maven-clean-plugin) from 3.1.0 to 3.3.2. - [Release notes](https://github.com/apache/maven-clean-plugin/releases) - [Commits](https://github.com/apache/maven-clean-plugin/compare/maven-clean-plugin-3.1.0...maven-clean-plugin-3.3.2) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-clean-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- adoptium-marketplace-server/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adoptium-marketplace-server/pom.xml b/adoptium-marketplace-server/pom.xml index 666013ba..bb77c773 100644 --- a/adoptium-marketplace-server/pom.xml +++ b/adoptium-marketplace-server/pom.xml @@ -93,7 +93,7 @@ org.apache.maven.plugins maven-clean-plugin - 3.1.0 + 3.3.2 org.apache.maven.plugins From 879b4f1e7c261754a8cad8a3f4f29e92f7b4a66b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 30 Oct 2023 20:31:07 +0000 Subject: [PATCH 06/14] build(deps): bump api.adoptium.net from `b43606a` to `72ce35a` Bumps [api.adoptium.net](https://github.com/adoptium/api.adoptium.net) from `b43606a` to `72ce35a`. - [Commits](https://github.com/adoptium/api.adoptium.net/compare/b43606a1463a046d9686a51a7d5f156d16aff1d7...72ce35a5798da4c52ea8f278bc15ec2b45463fae) --- updated-dependencies: - dependency-name: api.adoptium.net dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- api.adoptium.net | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api.adoptium.net b/api.adoptium.net index b43606a1..72ce35a5 160000 --- a/api.adoptium.net +++ b/api.adoptium.net @@ -1 +1 @@ -Subproject commit b43606a1463a046d9686a51a7d5f156d16aff1d7 +Subproject commit 72ce35a5798da4c52ea8f278bc15ec2b45463fae From 1bf0c318deaf5b63fad0a01d1807916e747d0ff4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 30 Oct 2023 20:56:13 +0000 Subject: [PATCH 07/14] build(deps): bump kotlin.version from 1.9.20-RC2 to 1.9.20 Bumps `kotlin.version` from 1.9.20-RC2 to 1.9.20. Updates `org.jetbrains.kotlin:kotlin-maven-plugin` from 1.9.20-RC2 to 1.9.20 Updates `org.jetbrains.kotlin:kotlin-maven-allopen` from 1.8.10 to 1.9.20 --- updated-dependencies: - dependency-name: org.jetbrains.kotlin:kotlin-maven-plugin dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.jetbrains.kotlin:kotlin-maven-allopen dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- adoptium-marketplace-server/adoptium-repo/pom.xml | 2 +- adoptium-marketplace-staging-checker/pom.xml | 2 +- adoptium-marketplace-utils/pom.xml | 2 +- pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/adoptium-marketplace-server/adoptium-repo/pom.xml b/adoptium-marketplace-server/adoptium-repo/pom.xml index a4a387b1..7cc976e2 100644 --- a/adoptium-marketplace-server/adoptium-repo/pom.xml +++ b/adoptium-marketplace-server/adoptium-repo/pom.xml @@ -80,7 +80,7 @@ org.jetbrains.kotlin kotlin-maven-allopen - 1.8.10 + 1.9.20 diff --git a/adoptium-marketplace-staging-checker/pom.xml b/adoptium-marketplace-staging-checker/pom.xml index 43234a45..3b1c14a7 100644 --- a/adoptium-marketplace-staging-checker/pom.xml +++ b/adoptium-marketplace-staging-checker/pom.xml @@ -15,7 +15,7 @@ net.adoptium.marketplace.Main uber-jar -jar-with-dependencies - 1.9.20-RC2 + 1.9.20 diff --git a/adoptium-marketplace-utils/pom.xml b/adoptium-marketplace-utils/pom.xml index 03063df3..cb537148 100644 --- a/adoptium-marketplace-utils/pom.xml +++ b/adoptium-marketplace-utils/pom.xml @@ -89,7 +89,7 @@ org.jetbrains.kotlin kotlin-maven-allopen - 1.8.10 + 1.9.20 diff --git a/pom.xml b/pom.xml index 7a355d20..6e1008d7 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ 17 3.5.0 0.8.8 - 1.9.20-RC2 + 1.9.20 3.0.1-SNAPSHOT From 8c89e59170815b9a5474943f979177ffa161818c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 31 Oct 2023 08:52:17 +0000 Subject: [PATCH 08/14] build(deps): bump api.adoptium.net from `72ce35a` to `b8f0c49` Bumps [api.adoptium.net](https://github.com/adoptium/api.adoptium.net) from `72ce35a` to `b8f0c49`. - [Commits](https://github.com/adoptium/api.adoptium.net/compare/72ce35a5798da4c52ea8f278bc15ec2b45463fae...b8f0c49541dceaffe5c5419d5b968d6e27b93087) --- updated-dependencies: - dependency-name: api.adoptium.net dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- api.adoptium.net | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api.adoptium.net b/api.adoptium.net index 72ce35a5..b8f0c495 160000 --- a/api.adoptium.net +++ b/api.adoptium.net @@ -1 +1 @@ -Subproject commit 72ce35a5798da4c52ea8f278bc15ec2b45463fae +Subproject commit b8f0c49541dceaffe5c5419d5b968d6e27b93087 From 0644557794535fdab8f312ed40c00c776841ca59 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 31 Oct 2023 08:52:27 +0000 Subject: [PATCH 09/14] build(deps): bump com.microsoft.azure:applicationinsights-runtime-attach Bumps [com.microsoft.azure:applicationinsights-runtime-attach](https://github.com/Microsoft/ApplicationInsights-Java) from 3.4.17 to 3.4.18. - [Release notes](https://github.com/Microsoft/ApplicationInsights-Java/releases) - [Changelog](https://github.com/microsoft/ApplicationInsights-Java/blob/main/CHANGELOG.md) - [Commits](https://github.com/Microsoft/ApplicationInsights-Java/compare/3.4.17...3.4.18) --- updated-dependencies: - dependency-name: com.microsoft.azure:applicationinsights-runtime-attach dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6e1008d7..0ca38b14 100644 --- a/pom.xml +++ b/pom.xml @@ -97,7 +97,7 @@ com.microsoft.azure applicationinsights-runtime-attach - 3.4.17 + 3.4.18 io.opentelemetry From 1131d6bf5a970c747745352bb555096a61b1c648 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 31 Oct 2023 20:26:38 +0000 Subject: [PATCH 10/14] build(deps): bump org.pitest:pitest-maven from 1.15.2 to 1.15.3 Bumps [org.pitest:pitest-maven](https://github.com/hcoles/pitest) from 1.15.2 to 1.15.3. - [Release notes](https://github.com/hcoles/pitest/releases) - [Commits](https://github.com/hcoles/pitest/compare/1.15.2...1.15.3) --- updated-dependencies: - dependency-name: org.pitest:pitest-maven dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- adoptium-marketplace-server/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adoptium-marketplace-server/pom.xml b/adoptium-marketplace-server/pom.xml index bb77c773..554cf210 100644 --- a/adoptium-marketplace-server/pom.xml +++ b/adoptium-marketplace-server/pom.xml @@ -297,7 +297,7 @@ org.pitest pitest-maven - 1.15.2 + 1.15.3 org.apache.maven.plugins From 482f19fbb155398b7d7652f7686fe6b6e798c8fd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 2 Nov 2023 21:08:26 +0000 Subject: [PATCH 11/14] build(deps): bump org.apache.maven.plugins:maven-pmd-plugin Bumps [org.apache.maven.plugins:maven-pmd-plugin](https://github.com/apache/maven-pmd-plugin) from 3.21.0 to 3.21.2. - [Release notes](https://github.com/apache/maven-pmd-plugin/releases) - [Commits](https://github.com/apache/maven-pmd-plugin/compare/maven-pmd-plugin-3.21.0...maven-pmd-plugin-3.21.2) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-pmd-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- adoptium-marketplace-server/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/adoptium-marketplace-server/pom.xml b/adoptium-marketplace-server/pom.xml index 554cf210..8c14baa2 100644 --- a/adoptium-marketplace-server/pom.xml +++ b/adoptium-marketplace-server/pom.xml @@ -162,7 +162,7 @@ org.apache.maven.plugins maven-pmd-plugin - 3.21.0 + 3.21.2 ${jdk.version} @@ -521,7 +521,7 @@ org.apache.maven.plugins maven-pmd-plugin - 3.21.0 + 3.21.2 ${jdk.version} From 10f6961c5db55d4aee6f5ab7913b00f37fac12c0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 3 Nov 2023 20:56:30 +0000 Subject: [PATCH 12/14] build(deps): bump api.adoptium.net from `b8f0c49` to `ed7f251` Bumps [api.adoptium.net](https://github.com/adoptium/api.adoptium.net) from `b8f0c49` to `ed7f251`. - [Commits](https://github.com/adoptium/api.adoptium.net/compare/b8f0c49541dceaffe5c5419d5b968d6e27b93087...ed7f251381bfc5c81701300f24adb1906671afe5) --- updated-dependencies: - dependency-name: api.adoptium.net dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- api.adoptium.net | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api.adoptium.net b/api.adoptium.net index b8f0c495..ed7f2513 160000 --- a/api.adoptium.net +++ b/api.adoptium.net @@ -1 +1 @@ -Subproject commit b8f0c49541dceaffe5c5419d5b968d6e27b93087 +Subproject commit ed7f251381bfc5c81701300f24adb1906671afe5 From aeba045ee8a60371d93bb532965d76d25d1a27fb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 6 Nov 2023 09:02:10 +0000 Subject: [PATCH 13/14] build(deps): bump api.adoptium.net from `ed7f251` to `52b895f` Bumps [api.adoptium.net](https://github.com/adoptium/api.adoptium.net) from `ed7f251` to `52b895f`. - [Commits](https://github.com/adoptium/api.adoptium.net/compare/ed7f251381bfc5c81701300f24adb1906671afe5...52b895f926f805b027cc3041b3ec0137dc1d1f6d) --- updated-dependencies: - dependency-name: api.adoptium.net dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- api.adoptium.net | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api.adoptium.net b/api.adoptium.net index ed7f2513..52b895f9 160000 --- a/api.adoptium.net +++ b/api.adoptium.net @@ -1 +1 @@ -Subproject commit ed7f251381bfc5c81701300f24adb1906671afe5 +Subproject commit 52b895f926f805b027cc3041b3ec0137dc1d1f6d From 58db141e895fffe680ba06e3a432cf21d558d5c1 Mon Sep 17 00:00:00 2001 From: John Oliver <1615532+johnoliver@users.noreply.github.com> Date: Mon, 6 Nov 2023 14:41:26 +0000 Subject: [PATCH 14/14] Merge similar Adoptium releases --- .../test/kotlin/ExtractAdoptiumReleases.kt | 60 +++++++++++++------ .../src/test/kotlin/ExtractIbmReleases.kt | 49 +++++++-------- .../src/test/kotlin/ExtractReleases.kt | 45 ++++++++------ 3 files changed, 94 insertions(+), 60 deletions(-) diff --git a/adoptium-marketplace-utils/src/test/kotlin/ExtractAdoptiumReleases.kt b/adoptium-marketplace-utils/src/test/kotlin/ExtractAdoptiumReleases.kt index 351a6858..2a6aa723 100644 --- a/adoptium-marketplace-utils/src/test/kotlin/ExtractAdoptiumReleases.kt +++ b/adoptium-marketplace-utils/src/test/kotlin/ExtractAdoptiumReleases.kt @@ -1,15 +1,6 @@ -import com.fasterxml.jackson.module.kotlin.readValue -import net.adoptium.api.v3.JsonMapper import net.adoptium.api.v3.models.Release -import net.adoptium.api.v3.parser.VersionParser -import net.adoptium.marketplace.client.MarketplaceMapper import net.adoptium.marketplace.schema.* -import org.eclipse.jetty.client.HttpClient import org.junit.jupiter.api.Test -import java.io.File -import java.io.FileWriter -import java.nio.file.Path -import java.nio.file.Paths import java.util.* class ExtractAdoptiumReleases { @@ -24,13 +15,43 @@ class ExtractAdoptiumReleases { ExtractReleases().buildRepo( VERSIONS, { version -> "https://api.adoptium.net/v3/assets/feature_releases/${version}/ga?page_size=50&vendor=eclipse" }, - { release -> toMarketplaceRelease(release, toMarketplaceBinaries(release)) }, + this::convertToMarketplaceSchema, "/tmp/adoptiumRepo", true ) } - private fun toMarketplaceRelease(release: Release, binaries: List): net.adoptium.marketplace.schema.Release { + private fun convertToMarketplaceSchema( + releases: List + ): List { + val marketplaceReleases = releases + .map { release -> + ReleaseList(listOf(toMarketplaceRelease(release, toMarketplaceBinaries(release)))) + } + .toList() + return mergeSimilarReleases(marketplaceReleases) + } + + private fun mergeSimilarReleases(marketplaceReleases: List): List { + // This can happen as Adoptium versions and OpenJDK versions are not 1:1, Adoptium can create multiple releases + // with different "Adoptium build number" that map to the same OpenJDK version. These releases need to be merged together + // as the marketplace is based on OpenJDK version + return marketplaceReleases + .flatMap { release -> + release.releases + } + .groupBy { Triple(it.openjdkVersionData, it.releaseLink, it.releaseName) } + .map { + ReleaseList(it.value) + } + .toList() + } + + + private fun toMarketplaceRelease( + release: Release, + binaries: List + ): net.adoptium.marketplace.schema.Release { return Release( release.release_link, release.release_name, @@ -92,14 +113,15 @@ class ExtractAdoptiumReleases { binary.`package`.signature_link ), if (binary.installer != null) { - listOf(Installer( - binary.installer!!.name, - binary.installer!!.link, - binary.installer!!.checksum, - binary.installer!!.checksum_link, - binary.installer!!.signature_link, - null - ) + listOf( + Installer( + binary.installer!!.name, + binary.installer!!.link, + binary.installer!!.checksum, + binary.installer!!.checksum_link, + binary.installer!!.signature_link, + null + ) ) } else null, Date.from(binary.updated_at.dateTime.toInstant()), diff --git a/adoptium-marketplace-utils/src/test/kotlin/ExtractIbmReleases.kt b/adoptium-marketplace-utils/src/test/kotlin/ExtractIbmReleases.kt index fd125737..dbfdbfba 100644 --- a/adoptium-marketplace-utils/src/test/kotlin/ExtractIbmReleases.kt +++ b/adoptium-marketplace-utils/src/test/kotlin/ExtractIbmReleases.kt @@ -1,18 +1,5 @@ -import com.fasterxml.jackson.module.kotlin.readValue import net.adoptium.api.v3.models.Release -import net.adoptium.marketplace.schema.Architecture -import net.adoptium.marketplace.schema.Binary -import net.adoptium.marketplace.schema.CLib -import net.adoptium.marketplace.schema.Distribution -import net.adoptium.marketplace.schema.ImageType -import net.adoptium.marketplace.schema.Installer -import net.adoptium.marketplace.schema.JvmImpl -import net.adoptium.marketplace.schema.OpenjdkVersionData -import net.adoptium.marketplace.schema.OperatingSystem -import net.adoptium.marketplace.schema.Package -import net.adoptium.marketplace.schema.ReleaseList -import net.adoptium.marketplace.schema.SourcePackage -import net.adoptium.marketplace.schema.Vendor +import net.adoptium.marketplace.schema.* import org.junit.jupiter.api.Test import java.util.* @@ -28,13 +15,26 @@ class ExtractIbmReleases { ExtractReleases().buildRepo( VERSIONS, { version -> "https://ibm.com/semeru-runtimes/api/v3/assets/feature_releases/${version}/ga?vendor=ibm_ce&page_size=100" }, - { release -> toMarketplaceRelease(release, toMarketplaceBinaries(release)) }, + this::convertToMarketplaceSchema, "/tmp/ibmRepo", false ) } - private fun toMarketplaceRelease(release: Release, binaries: List): net.adoptium.marketplace.schema.Release { + private fun convertToMarketplaceSchema( + releases: List + ): List { + return releases + .map { release -> + ReleaseList(listOf(toMarketplaceRelease(release, toMarketplaceBinaries(release)))) + } + .toList() + } + + private fun toMarketplaceRelease( + release: Release, + binaries: List + ): net.adoptium.marketplace.schema.Release { return net.adoptium.marketplace.schema.Release( release.release_link, release.release_name, @@ -86,14 +86,15 @@ class ExtractIbmReleases { binary.`package`.signature_link ), if (binary.installer != null) { - listOf(Installer( - binary.installer!!.name, - binary.installer!!.link, - binary.installer!!.checksum, - binary.installer!!.checksum_link, - binary.installer!!.signature_link, - null - ) + listOf( + Installer( + binary.installer!!.name, + binary.installer!!.link, + binary.installer!!.checksum, + binary.installer!!.checksum_link, + binary.installer!!.signature_link, + null + ) ) } else null, Date.from(binary.updated_at.dateTime.toInstant()), diff --git a/adoptium-marketplace-utils/src/test/kotlin/ExtractReleases.kt b/adoptium-marketplace-utils/src/test/kotlin/ExtractReleases.kt index 94744314..e5580fc6 100644 --- a/adoptium-marketplace-utils/src/test/kotlin/ExtractReleases.kt +++ b/adoptium-marketplace-utils/src/test/kotlin/ExtractReleases.kt @@ -6,6 +6,7 @@ import net.adoptium.marketplace.client.MarketplaceMapper import net.adoptium.marketplace.schema.IndexFile import net.adoptium.marketplace.schema.ReleaseList import org.eclipse.jetty.client.HttpClient +import org.slf4j.LoggerFactory import java.io.File import java.io.FileWriter import java.nio.file.Path @@ -13,12 +14,18 @@ import java.nio.file.Paths class ExtractReleases { + companion object { + @JvmStatic + private val LOGGER = LoggerFactory.getLogger(this::class.java) + } + fun buildRepo( versions: List, apiUrl: (Int) -> String, - dataMapper: (releases: Release) -> net.adoptium.marketplace.schema.Release, + convertToMarketplaceSchema:(releases: List) -> List, outputDir: String, - signAssets: Boolean) { + signAssets: Boolean + ) { val httpClient = HttpClient() httpClient.isFollowRedirects = true httpClient.start() @@ -40,7 +47,7 @@ class ExtractReleases { val releases = getAdoptiumReleases(apiUrl, httpClient, version) // Represent Adoptium releases in Marketplace schema - val marketplaceReleases = convertToMarketplaceSchema(releases, dataMapper) + val marketplaceReleases = convertToMarketplaceSchema(releases) // Create index file i.e './8/index.json val indexFile = IndexFile( @@ -55,18 +62,26 @@ class ExtractReleases { } val indexfw = FileWriter(file) indexfw.use { - it.write(MarketplaceMapper.repositoryObjectMapper.writerWithDefaultPrettyPrinter().writeValueAsString(indexFile)) + it.write( + MarketplaceMapper.repositoryObjectMapper.writerWithDefaultPrettyPrinter() + .writeValueAsString(indexFile) + ) } // Write all releases to file marketplaceReleases .forEach { release -> // write to file, i.e ./8/jdk8u302_b08.json - val fos = FileWriter(Paths.get(versionDir.absolutePath, toFileName(release.releases.first())).toFile()) + val fos = FileWriter( + Paths.get(versionDir.absolutePath, toFileName(release.releases.first())).toFile() + ) // Serialize object to file fos.use { - it.write(MarketplaceMapper.repositoryObjectMapper.writerWithDefaultPrettyPrinter().writeValueAsString(release)) + it.write( + MarketplaceMapper.repositoryObjectMapper.writerWithDefaultPrettyPrinter() + .writeValueAsString(release) + ) } } } @@ -101,27 +116,23 @@ class ExtractReleases { val indexfw = FileWriter(Paths.get(dir.toFile().absolutePath, "index.json").toFile()) indexfw.use { - it.write(MarketplaceMapper.repositoryObjectMapper.writerWithDefaultPrettyPrinter().writeValueAsString(indexFile)) + it.write( + MarketplaceMapper.repositoryObjectMapper.writerWithDefaultPrettyPrinter() + .writeValueAsString(indexFile) + ) } } - private fun convertToMarketplaceSchema(releases: List, dataMapper: (releases: Release) -> net.adoptium.marketplace.schema.Release): List { - val marketplaceReleases = releases - .map { release -> - ReleaseList(listOf(dataMapper(release))) - } - .toList() - return marketplaceReleases - } - private fun filterValidVersions(release: Release): Boolean { val validVersion = when (release.version_data.major) { 11 -> { VersionParser.parse("11.0.14.1+1") } + 17 -> { VersionParser.parse("17.0.2+8") } + else -> { VersionParser.parse("jdk8u322-b06") } @@ -140,7 +151,7 @@ class ExtractReleases { .map { release -> val filteredBinaries = release.binaries.filter { it.image_type == net.adoptium.api.v3.models.ImageType.jdk || - it.image_type == net.adoptium.api.v3.models.ImageType.jre + it.image_type == net.adoptium.api.v3.models.ImageType.jre } Release(release, filteredBinaries.toTypedArray())