Update to upstream version 1.7.1

This commit is contained in:
Mikolaj Izdebski 2022-06-22 08:32:21 +02:00
parent e8684079a1
commit 4cba018d0f
5 changed files with 10 additions and 1969 deletions

1
.gitignore vendored
View File

@ -129,3 +129,4 @@
/4f9a68a.tar.gz
/extra-enforcer-rules.tar.xz
/javapackages-bootstrap-1.7.0.tar.xz
/javapackages-bootstrap-1.7.1.tar.xz

File diff suppressed because it is too large Load Diff

View File

@ -1,49 +0,0 @@
From 60154680d275ef707d7a3a9f32721b02e38199cd Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Fri, 13 May 2022 14:17:13 +0200
Subject: [PATCH 2/2] Remove mojo-parent dependency on junit-bom
---
.../0001-Remove-dependency-on-junit-bom.patch | 30 +++++++++++++++++++
1 file changed, 30 insertions(+)
create mode 100644 patches/mojo-parent-pom/0001-Remove-dependency-on-junit-bom.patch
diff --git a/patches/mojo-parent-pom/0001-Remove-dependency-on-junit-bom.patch b/patches/mojo-parent-pom/0001-Remove-dependency-on-junit-bom.patch
new file mode 100644
index 0000000..dab700a
--- /dev/null
+++ b/patches/mojo-parent-pom/0001-Remove-dependency-on-junit-bom.patch
@@ -0,0 +1,30 @@
+From 64b34bc217f861e84017b56522e8e0efbc267405 Mon Sep 17 00:00:00 2001
+From: Mikolaj Izdebski <mizdebsk@redhat.com>
+Date: Fri, 13 May 2022 14:11:25 +0200
+Subject: [PATCH] Remove dependency on junit-bom
+
+---
+ pom.xml | 7 -------
+ 1 file changed, 7 deletions(-)
+
+diff --git a/pom.xml b/pom.xml
+index 8785f76..5b2c08b 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -275,13 +275,6 @@
+ <version>4.13.2</version>
+ <scope>test</scope>
+ </dependency>
+- <dependency>
+- <groupId>org.junit</groupId>
+- <artifactId>junit-bom</artifactId>
+- <version>${junit5.version}</version>
+- <type>pom</type>
+- <scope>import</scope>
+- </dependency>
+ <dependency>
+ <groupId>org.apache.maven.plugin-tools</groupId>
+ <artifactId>maven-plugin-annotations</artifactId>
+--
+2.35.1
+
--
2.35.1

View File

@ -16,8 +16,8 @@
#global git_short_hash %(echo %{git_hash} | cut -b -7)
Name: javapackages-bootstrap
Version: 1.7.0
Release: 3%{?dist}
Version: 1.7.1
Release: 1%{?dist}
Summary: A means of bootstrapping Java Packages Tools
# For detailed info see the file javapackages-bootstrap-PACKAGE-LICENSING
License: ASL 2.0 and ASL 1.1 and (ASL 2.0 or EPL-2.0) and (EPL-2.0 or GPLv2 with exceptions) and MIT and BSD with advertising and BSD and EPL-1.0 and EPL-2.0 and CDDL-1.0 and xpp and CC0 and Public Domain
@ -150,8 +150,6 @@ Source1107: xmvn.tar.xz
Source1108: xz-java.tar.xz
Patch0: 0001-Bind-to-OpenJDK-17-for-runtime.patch
Patch1: 0001-Revert-Update-maven-surefire-to-version-3.0.0-M6.patch
Patch2: 0002-Remove-mojo-parent-dependency-on-junit-bom.patch
Provides: bundled(ant) = 1.10.12
Provides: bundled(apache-parent) = 26
@ -220,7 +218,7 @@ Provides: bundled(maven-shared-incremental) = 1.1
Provides: bundled(maven-shared-io) = 3.0.0
Provides: bundled(maven-shared-utils) = 3.3.4
Provides: bundled(maven-source-plugin) = 3.2.1
Provides: bundled(maven-surefire) = 3.0.0~M3
Provides: bundled(maven-surefire) = 3.0.0~M6
Provides: bundled(maven-verifier) = 1.7.2
Provides: bundled(maven-wagon) = 3.5.1
Provides: bundled(maven) = 3.8.5
@ -310,8 +308,6 @@ do
done
%patch0 -p1
%patch1 -p1
%patch2 -p1
for patch_path in patches/*/*
do
@ -365,6 +361,9 @@ echo '%%jpb_env PATH=/usr/libexec/javapackages-bootstrap:$PATH' >%{buildroot}%{_
%doc AUTHORS
%changelog
* Wed Jun 22 2022 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.7.1-1
- Update to upstream version 1.7.1
* Tue Jun 14 2022 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.7.0-3
- Add openjdk8 toolchain subpackage

View File

@ -1,4 +1,4 @@
SHA512 (javapackages-bootstrap-1.7.0.tar.xz) = a2c176448b2beb7f29c81f17102c36c387d36c6f4be543b9e69ee3b76480cde631e5f5aeb05c2e206fbe3aff1b2adb1bc27bc0d360ee2d746f03d8a9a999c16a
SHA512 (javapackages-bootstrap-1.7.1.tar.xz) = 2bb425478127950d242193f62cb2eb19abc6ed017368f6ca9b7449ea4688542e8d9abf8f523f88259d0fd2bf741ea317e388597771735493ebeca2aead5c1f46
SHA512 (ant.tar.xz) = d2a4babb7766fc2acf3e9377ffd5af790c7d0612d3e34a9642a9a2b85ffb0f15936ef2979389496dce8ea72ed941797cd1f7507beeb1853a46394019adde4152
SHA512 (apache-pom.tar.xz) = feebe0142114a6fb61dec26153bdef4314554d109bcf4910518ae9ecaf27e5dd9dc1f03d48271833f3497ab7045265900c5816708f513ae834643c533cd1291f
SHA512 (apiguardian.tar.xz) = c3d75e88a983eb53c06007fd01f11c89083e119d2d4ed5d0e97644f45d5e451fd611bee493d720d011562ae29e7cdfd1d6fb4621d17c9db4b61430e62afea2bf
@ -66,7 +66,7 @@ SHA512 (maven-shared-incremental.tar.xz) = 77ca067f25b396ccef4f4f911323a3b8bfae1
SHA512 (maven-shared-io.tar.xz) = 0963cca6ff1acb9090d703d384f54f2b036be032f4ebdbbc59fafff806c593a17afe25cedaa562d47dcc2e0ab2b66e4ed7f3b0c66e133ebdee8ede3c81a3d2dd
SHA512 (maven-shared-utils.tar.xz) = 1c73783e10a47595963ee93db8090abf18e69395a62917993d3f4ee3a99c27e38c813ba881deb1d24d3e7c1c0b17d6a3e06123e054a1aa2908a85ec90a5bb68c
SHA512 (maven-source-plugin.tar.xz) = a512ba17da295771e488fbf9c4f8fd488ed82f07e9a5d56d5327dc6aef28788ed4ff36e65c7231ea70c874425212ccd9a3e3c562a6d96ed6225eaaaed1d873a2
SHA512 (maven-surefire.tar.xz) = f2069b89a5d5d8e335ab10b227973b3c43e58deaa006b9c4eb4419aaab5c4eee0159dbc8448f8df26fe3c8c00017bf5535b6a6fea962fbbfc2b2b808b1444264
SHA512 (maven-surefire.tar.xz) = 96b4f2457e78bc272d6054a17b3b27ec7204bcc5c16e83564fc2abeb17214e5810f91f25cf3b172a5e750dfa72b4c3bc0dac861d9751c8db73190480e3acaff7
SHA512 (maven-verifier.tar.xz) = 74977699bf37a9c0929a9583c57128b6c58376953248c16b3aa40f836613e7f0caba0229f5a6d622f814b7d4a94fd201034be7c98d8f9568f93269beccb3ae95
SHA512 (maven-wagon.tar.xz) = abac6ca4ec8b813a7829dea5b90c67938d0c23a03dd24b08b64df005cf5cf113ab0806501a61faa41331f2b399decb1f5259a01fe0ecc4aab4d349dcaa9b1553
SHA512 (maven.tar.xz) = dca267003c12bfbde23bdf5b0a3f90351ba79e7a4a5b3fd7e062441c5b94909043791bc4c2ccd4313c72ddd280502361bd53106b4fc99c6b1cc3fd2c07d4b74c
@ -100,7 +100,7 @@ SHA512 (sisu-inject.tar.xz) = 419f2065f1acdce764ffcfcfb3716fb67a3b85cf596e047f66
SHA512 (sisu-mojos.tar.xz) = ed9462baa5f59561131d84b6ea8d114a16b99fec0c502e2698e38556f1247a3c3550172d551ad8f38107558a8c78890a09ceebfee7ca2fceffea334b3da13ded
SHA512 (sisu-plexus.tar.xz) = 044d8738f5387cdecc9e2fdf78ff7b7c46e2240ea982aa09057aa6518c19b8537a115839e3a474ca271cbdf9f1225fc4610a28c875d0759a5af1e7c9f03711d1
SHA512 (slf4j.tar.xz) = 434da37f9efaa3faba2ccda7781290a92904c29a24be6234c4a681bd55d9e33e3e4242282a4995cd40cf72b507aa26d761c8d8de1781d1c4997b50323b9250a6
SHA512 (testng.tar.xz) = 409fafaa772b92db0ac1978d1de108ed952d8d53ca3fd5d3c212dd67fb8408d45ea0cf9b94e25b08b1d6fe0d5bfcc3175d87fff2c151bb7ba29672fa10e801ae
SHA512 (testng.tar.xz) = 0990fe21441057f08beffad08feb0be62b5a207001bd05c122dd0356231f3ca3ac91ae7cbe974ef2192f1803cd889a389d039b1b9b4136795f279825e03dd6ed
SHA512 (univocity-parsers.tar.xz) = 7daa3f54d26d7c64714990c7ad9d539bc7dd531917354b5b90970114e51c20aedac3e1fdd8b45e073d8c196b4ce2fa93c2f84a5498147de951ac147900ce51fa
SHA512 (velocity-engine.tar.xz) = c8baa9e159acae579848c1dd33b488eb70f64280e2f806e0e2ccf3024d1bc4f588086cb523e0d8e6ea2f8802ff908ff5578e86e646131768356c6d6e9b7214d0
SHA512 (xbean.tar.xz) = 78bd8f7ed95b04e23df68f89890b16d86e7328b00881ddaaedcde07456761992cf4a25f4e83ebf48637ccb09dd48ff8d6646f8e3062468eb4f2a5f100369a756