Update to latest upstream snapshot

.gitignore

@@ -122,3 +122,6 @@
 /a0c34e8.tar.gz
 /98aeb0b.tar.gz
 /d76c032.tar.gz
+/00bdfe7.tar.gz
+/8493092.tar.gz
+/9f283b7.tar.gz

0001-Bind-to-OpenJDK-17-for-runtime.patch

@@ -4,19 +4,23 @@ Date: Wed, 8 Jul 2020 09:04:57 +0200
 Subject: [PATCH 2/2] Bind to OpenJDK 17 for runtime
 
 ---
- apache-maven/src/bin/mvn | 12 +-----------
- 1 file changed, 1 insertion(+), 11 deletions(-)
+ apache-maven/src/bin/mvn | 16 +---------------
+ 1 file changed, 1 insertion(+), 15 deletions(-)
 
 diff --git a/apache-maven/src/bin/mvn b/apache-maven/src/bin/mvn
-index a554c6617..23b9dd902 100755
+index dfa384b8e..2e9f10da0 100755
 --- a/downstream/maven/apache-maven/src/bin/mvn
 +++ b/downstream/maven/apache-maven/src/bin/mvn
-@@ -27,17 +27,7 @@
+@@ -27,21 +27,7 @@
  #   MAVEN_SKIP_RC   (Optional) Flag to disable loading of mavenrc files.
  # -----------------------------------------------------------------------------
  
 -if [ -z "$MAVEN_SKIP_RC" ] ; then
 -
+-  if [ -f /usr/local/etc/mavenrc ] ; then
+-    . /usr/local/etc/mavenrc
+-  fi
+-
 -  if [ -f /etc/mavenrc ] ; then
 -    . /etc/mavenrc
 -  fi
@@ -31,5 +35,5 @@ index a554c6617..23b9dd902 100755
  # OS specific support. $var _must_ be set to either true or false.
  cygwin=false;
 -- 
-2.25.4
+2.31.1
 

javapackages-bootstrap.spec

@@ -12,12 +12,12 @@
 %global artifactsPath %{_javadir}
 %global launchersPath %{_libexecdir}/%{name}
 
-%global git_hash d76c0320c61b46baaf6eb04a134f518a4e68f944
+%global git_hash 9f283b765ec39228d038f5ab63dcc72cf548cb7d
 %global git_short_hash %(echo %{git_hash} | cut -b -7)
 
 Name:           javapackages-bootstrap
-Version:        1.5.0^20211102.git%{git_short_hash}
-Release:        2%{?dist}
+Version:        1.5.0^20220105.git%{git_short_hash}
+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
@@ -25,7 +25,7 @@ URL:            https://github.com/fedora-java/javapackages-bootstrap
 BuildArch:      noarch
 
 # Source0:        https://github.com/fedora-java/javapackages-bootstrap/releases/download/%{version}/javapackages-bootstrap-%{version}.tar.xz
-Source0:        https://github.com/fedora-java/javapackages-bootstrap/archive/%{git_short_hash}.tar.gz
+Source0:        https://github.com/mkoncek/javapackages-bootstrap/archive/%{git_short_hash}.tar.gz
 
 # License breakdown
 Source1:        javapackages-bootstrap-PACKAGE-LICENSING
@@ -148,14 +148,14 @@ Source1108:     xz-java.tar.xz
 
 Patch0:         0001-Bind-to-OpenJDK-17-for-runtime.patch
 
-Provides:       bundled(ant) = 1.10.11
+Provides:       bundled(ant) = 1.10.12
 Provides:       bundled(apache-parent) = 23
 Provides:       bundled(apiguardian) = 1.1.2
 Provides:       bundled(objectweb-asm) = 9.2
 Provides:       bundled(assertj-core) = 3.19.0
 Provides:       bundled(aqute-bnd) = 5.2.0
 Provides:       bundled(maven-plugin-build-helper) = 3.2.0
-Provides:       bundled(byte-buddy) = 1.10.20
+Provides:       bundled(byte-buddy) = 1.11.22
 Provides:       bundled(cdi-api) = 2.0.2
 Provides:       bundled(cglib) = 3.3.0
 Provides:       bundled(jakarta-annotations) = 1.3.5
@@ -208,7 +208,7 @@ Provides:       bundled(maven-parent) = 34
 Provides:       bundled(maven-plugin-testing) = 3.3.0
 Provides:       bundled(maven-plugin-tools) = 3.6.0
 Provides:       bundled(maven-remote-resources-plugin) = 1.7.0
-Provides:       bundled(maven-resolver) = 1.6.1
+Provides:       bundled(maven-resolver) = 1.7.2
 Provides:       bundled(maven-resources-plugin) = 3.2.0
 Provides:       bundled(maven-resources) = 1.4
 Provides:       bundled(maven-shared-incremental) = 1.1
@@ -218,7 +218,7 @@ Provides:       bundled(maven-source-plugin) = 3.2.1
 Provides:       bundled(maven-surefire) = 3.0.0~M3
 Provides:       bundled(maven-verifier) = 1.7.2
 Provides:       bundled(maven-wagon) = 3.4.3
-Provides:       bundled(maven) = 3.6.3
+Provides:       bundled(maven) = 3.8.4
 Provides:       bundled(mockito) = 3.7.13
 Provides:       bundled(modello) = 1.11
 Provides:       bundled(mojo-parent) = 60
@@ -249,7 +249,7 @@ Provides:       bundled(sisu) = 0.3.4
 Provides:       bundled(sisu-mojos) = 0.3.5
 Provides:       bundled(sisu-plexus) = 0.3.4
 Provides:       bundled(slf4j) = 1.7.30
-Provides:       bundled(testng) = 7.3.0
+Provides:       bundled(testng) = 7.4.0
 Provides:       bundled(univocity-parsers) = 2.9.1
 Provides:       bundled(velocity) = 1.7
 Provides:       bundled(xbean) = 4.18
@@ -305,7 +305,9 @@ do
   patch_name="$(echo ${patch_path} | cut -f3 -d/)"
   
   pushd "downstream/${package_name}"
-  patch -p1 < "../../patches/${package_name}/${patch_name}"
+  # Unify line endings
+  find . -name '*.java' -exec sed -i 's/\r//' {} +
+  sed 's/\r//' "../../patches/${package_name}/${patch_name}" | patch -p1
   popd
 done
 
@@ -351,6 +353,9 @@ echo '%%jpb_env PATH=/usr/libexec/javapackages-bootstrap:$PATH' >%{buildroot}%{_
 %doc AUTHORS
 
 %changelog
+* Wed Jan 05 2022 Marian Koncek <mkoncek@redhat.com> - 1.5.0^20220105.git9f283b7-1
+- Update to latest upstream snapshot
+
 * Wed Nov 03 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.5.0^20211102.gitd76c032-2
 - Build with OpenJDK 17
 

sources

@@ -1,12 +1,12 @@
-SHA512 (d76c032.tar.gz) = 6ba0460f728f14f9911885c71ae856ca0f4803679dcb855b05c74f6b122c1dd3ca972658c6d08bd62aaa62f43354dcae376b13535a645fc439bed04067c63f0d
-SHA512 (ant.tar.xz) = ffbf7b103e0b306d2510df71859f738d5f026a846c62ec79e7c98e3b48fb656cacc24f83404408467164e7827177cbcb892fcf7c66dc21d324aefdc105f6d5ad
+SHA512 (9f283b7.tar.gz) = c307fd3815acd616a2efd2b219f260380f6711c0d6fb2ea033de7e667005495f71726ed871794cb008e5525c1cc5afb9c00bebe4c734e96ca21244e0d8c926cc
+SHA512 (ant.tar.xz) = d2a4babb7766fc2acf3e9377ffd5af790c7d0612d3e34a9642a9a2b85ffb0f15936ef2979389496dce8ea72ed941797cd1f7507beeb1853a46394019adde4152
 SHA512 (apache-pom.tar.xz) = e708b87010111c04d05df6d87137b21c29d256dc951b5a3503a5f3c84a954d14bc7a1e04e351e251a7c67a217ef93e36b164b368f807e3ee50b069c0af6c7172
 SHA512 (apiguardian.tar.xz) = c3d75e88a983eb53c06007fd01f11c89083e119d2d4ed5d0e97644f45d5e451fd611bee493d720d011562ae29e7cdfd1d6fb4621d17c9db4b61430e62afea2bf
 SHA512 (asm.tar.xz) = 8745a2279e0b4d9972d08b782586ddfabcd42d89fdcc06a24a29e75d9905cab0bf6a4c6d76fabd806fcde1159a2667c63bfac94bdce0a535acac1a5124bac2a8
 SHA512 (assertj-core.tar.xz) = 56c2f6a68cc7bbd5921640375656565a7854270b14f25f18df69d6ac39dfe8cc2625388ae13fa9747bf46d112782c5802b13b56b9f3e6b44be818a9e49f5fdc8
 SHA512 (bnd.tar.xz) = bb163a650a6f92f88051a6d169d40a2b1b103d12f5e219be55eac16acdf23868ab8544610891c7b0bd58e79a7c8d7dd5fc238b2bc5195b4510f764593966ba2a
 SHA512 (build-helper-maven-plugin.tar.xz) = eb45f6d26d89f21d0b306660421425cf0c3f10819f0b2d89c8db334c1574e2bf3196eb4f4cda65e8179ae4822a933190fb2c5276510daf52b2c26020e75f298e
-SHA512 (byte-buddy.tar.xz) = d77c1edd729fbf06ca47d23512974b5310a29f3902cccfa1fcf34585aa6beff424d87210014961183440f90748575b61c8640028e906122576a6b877bc938322
+SHA512 (byte-buddy.tar.xz) = dfcfffe72a47679ec8dbf152ad5dc3edb5c5614ad97a89e625dba94d44311d04cecf28256f0996652a6bbd413197eec1f90acc4128826865f1633d0b1e0f8f63
 SHA512 (cdi.tar.xz) = 334ffd958aa8915eabeaf8c554cffc0e636e73538d2efa2ddb405903814f9c3a0be99fbb325f2bd6a0207d71dcac7f5d1b82efb962b1ac24db263379c7f759ac
 SHA512 (cglib.tar.xz) = 2938c98ed74a95828a1353afae1e79b43725899e845a3e040c2fd9705f87fd523bb9c04f36d8ad1beec21c725bd85d40eeebc30e161334da0469b854f263e9c9
 SHA512 (common-annotations-api.tar.xz) = 2df37b149dd687bff64064ea393e8e93fe907079966c367963fe983ea6edd612f5208113e2432a515d68f2d3d6892a12582bfe1e304b8c71ebe2acbb35c3b2c4
@@ -59,7 +59,7 @@ SHA512 (maven-parent-pom.tar.xz) = 6ad4a0e113773375531d97f40970dc72b03745344af89
 SHA512 (maven-plugin-testing.tar.xz) = e72fcab892a00b52af06a821b3c2cff676af2bfc77ccaa851cf55017623bf89bb376a16f933fa0853087c1e8161336d21e649745ba2659c87795c4d8fad026df
 SHA512 (maven-plugin-tools.tar.xz) = 321d6b1d9de339a90cc280ec789adf7e2883723e5468a8620fd2d5acfcb019196a538bd985d0b11d881842e83ef25539b660247329b8642afa81500027873b25
 SHA512 (maven-remote-resources-plugin.tar.xz) = e027b341e8b46f7663066442b9a14c32e1dd030b6cce06498037882331c0d0103a5370903f1b9605b6c76b391dbe0d51f34e1f007b83faa6012529e0aa5ee5a6
-SHA512 (maven-resolver.tar.xz) = 1dad8d9d48d74ae19ca0b280960417a43d71b7ef6cfdd7a7320d29f63a4632215a3ba5b3947a2dc522872632fe1c23596ef71a43f9b94023b172088302d708c4
+SHA512 (maven-resolver.tar.xz) = 0991fef6f539eb6bb0c0e550c6f4b0b28b6eac8fc13b66e8807674dcec9dc891364b8ed1f5dfe9a775a0e35ac17520f924b75d836124ae48c42ddb573153576d
 SHA512 (maven-resources-plugin.tar.xz) = c68fdd88eb0ca1d88b97b76bcaf413591eaa69dd00c0e7e27398db80da57cd03b114331c51b7b2d87291764bd68e2ddef581d1ab58b0a0a3ecd8439c1297d1b0
 SHA512 (maven-resources.tar.xz) = e80f8798f79275bcaae529e11cddc52c4b2e09499caa9c5a8814008eff31a805b6288925afb790fa780f0e928638ab9a9541e6aea1dc5ec1549b846d49553678
 SHA512 (maven-shared-incremental.tar.xz) = 77ca067f25b396ccef4f4f911323a3b8bfae11c321628e32e012fb1a4dbfbba3a7a0451789b1513aa72ea408bed4a10782f5995eff8083a6af818a97a9842379
@@ -69,7 +69,7 @@ SHA512 (maven-source-plugin.tar.xz) = a512ba17da295771e488fbf9c4f8fd488ed82f07e9
 SHA512 (maven-surefire.tar.xz) = f2069b89a5d5d8e335ab10b227973b3c43e58deaa006b9c4eb4419aaab5c4eee0159dbc8448f8df26fe3c8c00017bf5535b6a6fea962fbbfc2b2b808b1444264
 SHA512 (maven-verifier.tar.xz) = 74977699bf37a9c0929a9583c57128b6c58376953248c16b3aa40f836613e7f0caba0229f5a6d622f814b7d4a94fd201034be7c98d8f9568f93269beccb3ae95
 SHA512 (maven-wagon.tar.xz) = 96e615abcf41bbd192eaf3630abd17ac6bde768905877ceeb6538d406ad0cdc38f6e9862def9effb0a309688043b429488ba2d0fe6f42b0acff39d64064625b3
-SHA512 (maven.tar.xz) = e540647cc807b4e412d4e2f5af87254afdcf4aefcb61d880463537bc703fa61921bba7beb2bd55770713673e7541fa55174b5f66266474ce82183ab535021155
+SHA512 (maven.tar.xz) = 11696c2eedb1f1a58c473b9cfce9489cb0a382cc1830750226ff7ec36a013c10e959129d1f47d6ca36c1a0009984acaec0751aa4547f01ed2c2a21cba78f68f5
 SHA512 (mockito.tar.xz) = 8fefdeae3e7bcb41c97080aa208bc9bb6fa787235cc572990ba376c9995f60fa7ab7534e88701da36b00b49eb7b5f2b1c479bbf0e9c86fc1923a7eddc68b4c77
 SHA512 (modello.tar.xz) = 7b3309faf893f90bf778429a452fc579ec30a355968143e3dedafbad1a0068bff4dad4ccd614ce8347753624c1ed767dada7b09b41d9f4d7048d7fcff4f4bfd7
 SHA512 (mojo-parent-pom.tar.xz) = 74dd480f93c83c18b1c6402b8ed9e7472fcc94d35fe64504006fa8e789741a14dfd63e0a52f6accce89568d1837de8854782f298b7b57c7b3d8ac9b9cad180d8
@@ -100,7 +100,7 @@ SHA512 (sisu-inject.tar.xz) = c44a8ee7999f4411f855e028f514f1f75c5b13faddcf793ce3
 SHA512 (sisu-mojos.tar.xz) = ed9462baa5f59561131d84b6ea8d114a16b99fec0c502e2698e38556f1247a3c3550172d551ad8f38107558a8c78890a09ceebfee7ca2fceffea334b3da13ded
 SHA512 (sisu-plexus.tar.xz) = 851660ef15f937c0c7e47a539ab35c0bb3afd9e4a8ef7f375b66d066b37bb06b6343cb28fe1dc83cb94a072e76b424740926d6d2802a61f07d977b6adf082340
 SHA512 (slf4j.tar.xz) = 0ca1edd19492d08c5ee61d17b6be6468091176acbfa3cd43a902412614cdf591ea3b769100ee645ac16339ac4fa4667e9294468b2ce9f764717b7a8b4862ab02
-SHA512 (testng.tar.xz) = fe77f378643d8ad076df3fac333fe96087a17b8bb4eb3d7f3e55f617a5331e6b8f87f73ce1256f1983b972bb824c7e395af8c543fa76c9497d5cf74dfb963a94
+SHA512 (testng.tar.xz) = 409fafaa772b92db0ac1978d1de108ed952d8d53ca3fd5d3c212dd67fb8408d45ea0cf9b94e25b08b1d6fe0d5bfcc3175d87fff2c151bb7ba29672fa10e801ae
 SHA512 (univocity-parsers.tar.xz) = 7daa3f54d26d7c64714990c7ad9d539bc7dd531917354b5b90970114e51c20aedac3e1fdd8b45e073d8c196b4ce2fa93c2f84a5498147de951ac147900ce51fa
 SHA512 (velocity-engine.tar.xz) = c8baa9e159acae579848c1dd33b488eb70f64280e2f806e0e2ccf3024d1bc4f588086cb523e0d8e6ea2f8802ff908ff5578e86e646131768356c6d6e9b7214d0
 SHA512 (xbean.tar.xz) = 78bd8f7ed95b04e23df68f89890b16d86e7328b00881ddaaedcde07456761992cf4a25f4e83ebf48637ccb09dd48ff8d6646f8e3062468eb4f2a5f100369a756