diff --git a/0003-Use-modulemaker-maven-plugin-version-1.10-for-bundle.patch b/0003-Use-modulemaker-maven-plugin-version-1.10-for-bundle.patch new file mode 100644 index 0000000..a1d97ed --- /dev/null +++ b/0003-Use-modulemaker-maven-plugin-version-1.10-for-bundle.patch @@ -0,0 +1,22 @@ +From 806ef0cb110cbb306303f44089899e12cb5a33b4 Mon Sep 17 00:00:00 2001 +From: Marian Koncek +Date: Sat, 24 Feb 2024 21:56:48 +0100 +Subject: [PATCH] Use modulemaker-maven-plugin version 1.10 for bundled + provides + +--- + project/modulemaker-maven-plugin.properties | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/project/modulemaker-maven-plugin.properties b/project/modulemaker-maven-plugin.properties +index c9542ce..2b61467 100644 +--- a/project/modulemaker-maven-plugin.properties ++++ b/project/modulemaker-maven-plugin.properties +@@ -1,3 +1,3 @@ + url=https://github.com/raphw/modulemaker-maven-plugin.git + ref=modulemaker-maven-plugin-@.@ +-version=1.9 ++version=1.10 +-- +2.43.0 + diff --git a/javapackages-bootstrap.spec b/javapackages-bootstrap.spec index 31dbb0d..895c8d4 100644 --- a/javapackages-bootstrap.spec +++ b/javapackages-bootstrap.spec @@ -165,6 +165,8 @@ Source1118: xmvn-generator.tar.xz Source1119: xmvn.tar.xz Source1120: xz-java.tar.xz +Patch3: 0003-Use-modulemaker-maven-plugin-version-1.10-for-bundle.patch + BuildRequires: byaccj BuildRequires: gcc BuildRequires: java-21-openjdk-devel @@ -199,6 +201,7 @@ XMvn, allowing JPT to be used before one builds XMvn package. %prep %setup -q +%patch 3 -p1 # Dynamically generate bundled Provides %{SOURCE2} >bundled-provides.txt diff --git a/sources b/sources index 030c83e..940ffb6 100644 --- a/sources +++ b/sources @@ -83,7 +83,7 @@ SHA512 (maven.tar.xz) = 418e378a4312eb4f511043d60b8c0d2b9632794cac3c3a315ad0e6ed SHA512 (mockito.tar.xz) = 8fefdeae3e7bcb41c97080aa208bc9bb6fa787235cc572990ba376c9995f60fa7ab7534e88701da36b00b49eb7b5f2b1c479bbf0e9c86fc1923a7eddc68b4c77 SHA512 (modello.tar.xz) = a371fe1369d5453fb3a928f6053c36f1f39df970f322804e1daeef2b0c5f87556e42ff22508a57104d16e6c81584c77b34f6bbba6c7cc0f7084402767998ae82 SHA512 (moditect.tar.xz) = b17ea518671cfcfe52ec5a50253577b0d82281c3517a5dca93bbbb868438124f7e7c91eebde1d4816058d475d51606618bcb7040c97087844b001b1ded0c583d -SHA512 (modulemaker-maven-plugin.tar.xz) = a9d93ddd47419f5de597babf648e509084e7dd4a5c18ef8aed646fbcff886d20f2a7b297463ebaa1cf70f7e26bf3690c7a9b60e5e47fae6b7392807a133302ac +SHA512 (modulemaker-maven-plugin.tar.xz) = ad5e6b8c0cc6021e4f2f1d885cbd7dd89b3bcef2f530f4c0520ee699f27b48ab3b865e44103c509f764c70ab733e53915d167bdef2e4c02b6d73efe930532a8d SHA512 (mojo-parent-pom.tar.xz) = 94567865c57e4d1a8b9a6c2aa8aa2beabec142ffcd464d89a8f553af194820fb4546524e3c0723bcd7ab169007faa0c9d0410b2c363a8552ff32c79b117a2cb0 SHA512 (objenesis.tar.xz) = eb432f56318ed70aae56cb94b98818c92f30e7dd0d221eab1bfa15898b663da121c0ab4ffe283b4bf03ebadf411bc2ec742c31ca1a01f6e2c9da4a1b6798d912 SHA512 (opentest4j.tar.xz) = 3a5a80d7c982a7f024f169048833c4aa989f7f57e5ddeb9bd907aefdff937260c893b5fda1eb3646de105f7c8db45455a7438babd8007c6dbb6fe197dc5e20b5