From 7c46bd6274eea7ec61d1451f5e7225914e3be986 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Thu, 5 May 2022 06:35:11 +0200
Subject: [PATCH] Update to latest upstream snapshot

---
 .gitignore                               |   2 +
 javapackages-bootstrap-PACKAGE-LICENSING |   2 +-
 javapackages-bootstrap.spec              | 177 ++++++++++++-----------
 sources                                  |   3 +-
 4 files changed, 96 insertions(+), 88 deletions(-)

diff --git a/.gitignore b/.gitignore
index 64c44a8..1cbd7cd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -126,3 +126,5 @@
 /8493092.tar.gz
 /9f283b7.tar.gz
 /1cfada9.tar.gz
+/4f9a68a.tar.gz
+/extra-enforcer-rules.tar.xz
diff --git a/javapackages-bootstrap-PACKAGE-LICENSING b/javapackages-bootstrap-PACKAGE-LICENSING
index 17e3b09..b9c9ed8 100644
--- a/javapackages-bootstrap-PACKAGE-LICENSING
+++ b/javapackages-bootstrap-PACKAGE-LICENSING
@@ -23,6 +23,7 @@ downstream/commons-logging: ASL 2.0
 downstream/commons-parent-pom: ASL 2.0
 downstream/cup: MIT
 downstream/easymock: ASL 2.0
+downstream/extra-enforcer-rules: ASL 2.0
 downstream/felix-parent-pom: ASL 2.0
 downstream/felix-utils: ASL 2.0
 downstream/fusesource-pom: ASL 2.0
@@ -48,7 +49,6 @@ downstream/jcommander: ASL 2.0
 downstream/jdom: BSD with advertising
 downstream/jdom2: BSD with advertising
 downstream/jflex: BSD
-downstream/jsoup: MIT
 downstream/jsr-305: BSD
 downstream/junit4: EPL-1.0
 downstream/junit5: EPL-2.0
diff --git a/javapackages-bootstrap.spec b/javapackages-bootstrap.spec
index 940cd3e..6d33726 100644
--- a/javapackages-bootstrap.spec
+++ b/javapackages-bootstrap.spec
@@ -12,11 +12,11 @@
 %global artifactsPath %{_javadir}
 %global launchersPath %{_libexecdir}/%{name}
 
-%global git_hash 1cfada994e2c42d22289dbe02e656bb31e24852f
+%global git_hash 4f9a68a793de4e82003514fc3dff9167fc26b1ea
 %global git_short_hash %(echo %{git_hash} | cut -b -7)
 
 Name:           javapackages-bootstrap
-Version:        1.5.0^20220429.git%{git_short_hash}
+Version:        1.5.0^20220505.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
@@ -60,90 +60,91 @@ Source1020:     commons-logging.tar.xz
 Source1021:     commons-parent-pom.tar.xz
 Source1022:     cup.tar.xz
 Source1023:     easymock.tar.xz
-Source1024:     felix-parent-pom.tar.xz
-Source1025:     felix-utils.tar.xz
-Source1026:     fusesource-pom.tar.xz
-Source1027:     guava.tar.xz
-Source1028:     guice.tar.xz
-Source1029:     hamcrest.tar.xz
-Source1030:     httpcomponents-client.tar.xz
-Source1031:     httpcomponents-core.tar.xz
-Source1032:     httpcomponents-parent-pom.tar.xz
-Source1033:     injection-api.tar.xz
-Source1034:     jansi.tar.xz
-Source1035:     jcommander.tar.xz
-Source1036:     jdom.tar.xz
-Source1037:     jdom2.tar.xz
-Source1038:     jflex.tar.xz
-Source1039:     jsr-305.tar.xz
-Source1040:     junit4.tar.xz
-Source1041:     junit5.tar.xz
-Source1042:     maven-antrun-plugin.tar.xz
-Source1043:     maven-archiver.tar.xz
-Source1044:     maven-artifact-transfer.tar.xz
-Source1045:     maven-assembly-plugin.tar.xz
-Source1046:     maven-bundle-plugin.tar.xz
-Source1047:     maven-common-artifact-filters.tar.xz
-Source1048:     maven-compiler-plugin.tar.xz
-Source1049:     maven-dependency-analyzer.tar.xz
-Source1050:     maven-dependency-plugin.tar.xz
-Source1051:     maven-dependency-tree.tar.xz
-Source1052:     maven-enforcer.tar.xz
-Source1053:     maven-file-management.tar.xz
-Source1054:     maven-filtering.tar.xz
-Source1055:     maven-jar-plugin.tar.xz
-Source1056:     maven-parent-pom.tar.xz
-Source1057:     maven-plugin-testing.tar.xz
-Source1058:     maven-plugin-tools.tar.xz
-Source1059:     maven-remote-resources-plugin.tar.xz
-Source1060:     maven-resolver.tar.xz
-Source1061:     maven-resources-plugin.tar.xz
-Source1062:     maven-resources.tar.xz
-Source1063:     maven-shared-incremental.tar.xz
-Source1064:     maven-shared-io.tar.xz
-Source1065:     maven-shared-utils.tar.xz
-Source1066:     maven-source-plugin.tar.xz
-Source1067:     maven-surefire.tar.xz
-Source1068:     maven-verifier.tar.xz
-Source1069:     maven-wagon.tar.xz
-Source1070:     maven.tar.xz
-Source1071:     mockito.tar.xz
-Source1072:     modello.tar.xz
-Source1073:     mojo-parent-pom.tar.xz
-Source1074:     munge-maven-plugin.tar.xz
-Source1075:     objenesis.tar.xz
-Source1076:     opentest4j.tar.xz
-Source1077:     osgi-annotation.tar.xz
-Source1078:     osgi-cmpn.tar.xz
-Source1079:     osgi-core.tar.xz
-Source1080:     oss-parent-pom.tar.xz
-Source1081:     plexus-archiver.tar.xz
-Source1082:     plexus-build-api.tar.xz
-Source1083:     plexus-cipher.tar.xz
-Source1084:     plexus-classworlds.tar.xz
-Source1085:     plexus-compiler.tar.xz
-Source1086:     plexus-components-pom.tar.xz
-Source1087:     plexus-containers.tar.xz
-Source1088:     plexus-interpolation.tar.xz
-Source1089:     plexus-io.tar.xz
-Source1090:     plexus-languages.tar.xz
-Source1091:     plexus-pom.tar.xz
-Source1092:     plexus-resources.tar.xz
-Source1093:     plexus-sec-dispatcher.tar.xz
-Source1094:     plexus-utils.tar.xz
-Source1095:     qdox.tar.xz
-Source1096:     servlet-api.tar.xz
-Source1097:     sisu-inject.tar.xz
-Source1098:     sisu-mojos.tar.xz
-Source1099:     sisu-plexus.tar.xz
-Source1100:     slf4j.tar.xz
-Source1101:     testng.tar.xz
-Source1102:     univocity-parsers.tar.xz
-Source1103:     velocity-engine.tar.xz
-Source1104:     xbean.tar.xz
-Source1105:     xmlunit.tar.xz
-Source1106:     xmvn.tar.xz
-Source1107:     xz-java.tar.xz
+Source1024:     extra-enforcer-rules.tar.xz
+Source1025:     felix-parent-pom.tar.xz
+Source1026:     felix-utils.tar.xz
+Source1027:     fusesource-pom.tar.xz
+Source1028:     guava.tar.xz
+Source1029:     guice.tar.xz
+Source1030:     hamcrest.tar.xz
+Source1031:     httpcomponents-client.tar.xz
+Source1032:     httpcomponents-core.tar.xz
+Source1033:     httpcomponents-parent-pom.tar.xz
+Source1034:     injection-api.tar.xz
+Source1035:     jansi.tar.xz
+Source1036:     jcommander.tar.xz
+Source1037:     jdom.tar.xz
+Source1038:     jdom2.tar.xz
+Source1039:     jflex.tar.xz
+Source1040:     jsr-305.tar.xz
+Source1041:     junit4.tar.xz
+Source1042:     junit5.tar.xz
+Source1043:     maven-antrun-plugin.tar.xz
+Source1044:     maven-archiver.tar.xz
+Source1045:     maven-artifact-transfer.tar.xz
+Source1046:     maven-assembly-plugin.tar.xz
+Source1047:     maven-bundle-plugin.tar.xz
+Source1048:     maven-common-artifact-filters.tar.xz
+Source1049:     maven-compiler-plugin.tar.xz
+Source1050:     maven-dependency-analyzer.tar.xz
+Source1051:     maven-dependency-plugin.tar.xz
+Source1052:     maven-dependency-tree.tar.xz
+Source1053:     maven-enforcer.tar.xz
+Source1054:     maven-file-management.tar.xz
+Source1055:     maven-filtering.tar.xz
+Source1056:     maven-jar-plugin.tar.xz
+Source1057:     maven-parent-pom.tar.xz
+Source1058:     maven-plugin-testing.tar.xz
+Source1059:     maven-plugin-tools.tar.xz
+Source1060:     maven-remote-resources-plugin.tar.xz
+Source1061:     maven-resolver.tar.xz
+Source1062:     maven-resources-plugin.tar.xz
+Source1063:     maven-resources.tar.xz
+Source1064:     maven-shared-incremental.tar.xz
+Source1065:     maven-shared-io.tar.xz
+Source1066:     maven-shared-utils.tar.xz
+Source1067:     maven-source-plugin.tar.xz
+Source1068:     maven-surefire.tar.xz
+Source1069:     maven-verifier.tar.xz
+Source1070:     maven-wagon.tar.xz
+Source1071:     maven.tar.xz
+Source1072:     mockito.tar.xz
+Source1073:     modello.tar.xz
+Source1074:     mojo-parent-pom.tar.xz
+Source1075:     munge-maven-plugin.tar.xz
+Source1076:     objenesis.tar.xz
+Source1077:     opentest4j.tar.xz
+Source1078:     osgi-annotation.tar.xz
+Source1079:     osgi-cmpn.tar.xz
+Source1080:     osgi-core.tar.xz
+Source1081:     oss-parent-pom.tar.xz
+Source1082:     plexus-archiver.tar.xz
+Source1083:     plexus-build-api.tar.xz
+Source1084:     plexus-cipher.tar.xz
+Source1085:     plexus-classworlds.tar.xz
+Source1086:     plexus-compiler.tar.xz
+Source1087:     plexus-components-pom.tar.xz
+Source1088:     plexus-containers.tar.xz
+Source1089:     plexus-interpolation.tar.xz
+Source1090:     plexus-io.tar.xz
+Source1091:     plexus-languages.tar.xz
+Source1092:     plexus-pom.tar.xz
+Source1093:     plexus-resources.tar.xz
+Source1094:     plexus-sec-dispatcher.tar.xz
+Source1095:     plexus-utils.tar.xz
+Source1096:     qdox.tar.xz
+Source1097:     servlet-api.tar.xz
+Source1098:     sisu-inject.tar.xz
+Source1099:     sisu-mojos.tar.xz
+Source1100:     sisu-plexus.tar.xz
+Source1101:     slf4j.tar.xz
+Source1102:     testng.tar.xz
+Source1103:     univocity-parsers.tar.xz
+Source1104:     velocity-engine.tar.xz
+Source1105:     xbean.tar.xz
+Source1106:     xmlunit.tar.xz
+Source1107:     xmvn.tar.xz
+Source1108:     xz-java.tar.xz
 
 Patch0:         0001-Bind-to-OpenJDK-17-for-runtime.patch
 
@@ -170,6 +171,7 @@ Provides:       bundled(apache-commons-logging) = 1.2
 Provides:       bundled(apache-commons-parent) = 52
 Provides:       bundled(java_cup) = 0.11b
 Provides:       bundled(easymock) = 4.3
+Provides:       bundled(extra-enforcer-rules) = 1.5.1
 Provides:       bundled(felix-parent) = 7
 Provides:       bundled(felix-utils) = 1.11.8
 Provides:       bundled(fusesource-pom) = 1.12
@@ -351,6 +353,9 @@ echo '%%jpb_env PATH=/usr/libexec/javapackages-bootstrap:$PATH' >%{buildroot}%{_
 %doc AUTHORS
 
 %changelog
+* Thu May 05 2022 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.5.0^20220505.git4f9a68a-1
+- Update to latest upstream snapshot
+
 * Fri Apr 29 2022 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.5.0^20220429.git1cfada9-1
 - Update to latest upstream snapshot
 
diff --git a/sources b/sources
index c15ed05..c79d5b5 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
-SHA512 (1cfada9.tar.gz) = b5d876a6241d214562aa52c1e5419f2beef9d600cbf9d664ae1e450aee74cfa94cd8f1cbaa5bfcc0b614c5750882568b9446886f808cb1a04a5d7d99c7de46b5
+SHA512 (4f9a68a.tar.gz) = 5aa782c3d7f588668f6a9893d6bc0937cd8b7b324bb88f7d8e7f919fb1e952c5f6ff7aaf8cb9f9890875b09f8342f969957ad5bed7102551fedf36d56ce36ff1
 SHA512 (ant.tar.xz) = d2a4babb7766fc2acf3e9377ffd5af790c7d0612d3e34a9642a9a2b85ffb0f15936ef2979389496dce8ea72ed941797cd1f7507beeb1853a46394019adde4152
 SHA512 (apache-pom.tar.xz) = e708b87010111c04d05df6d87137b21c29d256dc951b5a3503a5f3c84a954d14bc7a1e04e351e251a7c67a217ef93e36b164b368f807e3ee50b069c0af6c7172
 SHA512 (apiguardian.tar.xz) = c3d75e88a983eb53c06007fd01f11c89083e119d2d4ed5d0e97644f45d5e451fd611bee493d720d011562ae29e7cdfd1d6fb4621d17c9db4b61430e62afea2bf
@@ -22,6 +22,7 @@ SHA512 (commons-logging.tar.xz) = 78a6b9e0139bb2d365438fa74e88f55fbeccb2e4a52659
 SHA512 (commons-parent-pom.tar.xz) = a79ec3f65ea172a8c15d655911ceffa01fc9c5b338bcaf3f2712d16f8da6be4a35549f07b6b4634bf7516a6a2ce90cec760a2a0acb1778c2d0596d82e9075f0f
 SHA512 (cup.tar.xz) = 8624696fed9ed0045873a48a75f55f248faa9b3cfc5573182b4c67469d43dfde55d4e676dad6636d31c1f3729456e29b2facc4754e5d4caaaf39dfe6e1fd6af5
 SHA512 (easymock.tar.xz) = 48489da810750bd9351327584f78d58cf4965ac22341ad4d964edead04c2665a5ea003c245c644f52a04f75e3b046ed3562e483657355ad414ecfc5ed69f965a
+SHA512 (extra-enforcer-rules.tar.xz) = 0c0dc6a79d83cad0ab5637e0fb99ca75e925890654bce225e6772f1fd943eb1b0b95dd8068291e0a7b077230c9cb995cb77ae9d8110e7e0c6d0e75d28cd7af9d
 SHA512 (felix-parent-pom.tar.xz) = c8d5ec33af31d4fc51d24245576f4d081aafb073339739a2689dc221c42fbe0dc4411e8c97448a21ce8d517dea940281fcfd2b7c6acddff0e9b13d7d3630b87f
 SHA512 (felix-utils.tar.xz) = 39b32a2bb3b527b040796c06632d916ed53feaf728eee8902bab712d889d6c9118d925f1b957bc5ee66a4cf6be58e43f4992c7636f61d0c3c385c23f2ffc4a9c
 SHA512 (fusesource-pom.tar.xz) = 1fe5d089eac6dbd2885d3ce1174e313d33e9b02ad24e700e033895bd73dace81ff8cccf7382f51ec8a3f0aa5cec515bb3018fa8a2f62cf7fcfc077991ba65f51