From 3fe6b5c6aac7b1f7cadc85fff1b16913a0667cdc Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Mon, 30 Nov 2020 14:53:11 +0000 Subject: [PATCH 01/77] Added the README --- README.md | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 0000000..f6b4b45 --- /dev/null +++ b/README.md @@ -0,0 +1,3 @@ +# javapackages-bootstrap + +The javapackages-bootstrap package From 43afe0b01fb388fad941d1340c6509d4f239929e Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Mon, 30 Nov 2020 17:23:38 +0100 Subject: [PATCH 02/77] Initial commit --- .gitignore | 114 ++++++++++ javapackages-bootstrap.spec | 411 ++++++++++++++++++++++++++++++++++++ sources | 114 ++++++++++ 3 files changed, 639 insertions(+) create mode 100644 .gitignore create mode 100644 javapackages-bootstrap.spec create mode 100644 sources diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..3408f79 --- /dev/null +++ b/.gitignore @@ -0,0 +1,114 @@ +/javapackages-bootstrap-1.0.0.tar.xz +/javapackages-bootstrap-PACKAGE-LICENSING +/plexus-compiler-LICENSE-MIT +/plexus-containers-LICENSE-MIT +/plexus-interpolation-LICENSE-MIT +/plexus-resources-LICENSE-MIT +/ant.tar.xz +/apache-pom.tar.xz +/apiguardian.tar.xz +/asm.tar.xz +/assertj-core.tar.xz +/bnd.tar.xz +/build-helper-maven-plugin.tar.xz +/byte-buddy.tar.xz +/cdi.tar.xz +/cglib.tar.xz +/common-annotations-api.tar.xz +/commons-beanutils.tar.xz +/commons-cli.tar.xz +/commons-codec.tar.xz +/commons-collections.tar.xz +/commons-compress.tar.xz +/commons-io.tar.xz +/commons-jxpath.tar.xz +/commons-lang.tar.xz +/commons-logging.tar.xz +/commons-parent-pom.tar.xz +/cup.tar.xz +/easymock.tar.xz +/felix-parent-pom.tar.xz +/felix-utils.tar.xz +/fusesource-pom.tar.xz +/guava.tar.xz +/guice.tar.xz +/hamcrest.tar.xz +/httpcomponents-client.tar.xz +/httpcomponents-core.tar.xz +/httpcomponents-parent-pom.tar.xz +/injection-api.tar.xz +/jansi.tar.xz +/jcommander.tar.xz +/jdom2.tar.xz +/jdom.tar.xz +/jflex.tar.xz +/jsoup.tar.xz +/jsr-305.tar.xz +/junit4.tar.xz +/junit5.tar.xz +/maven-antrun-plugin.tar.xz +/maven-archiver.tar.xz +/maven-artifact-transfer.tar.xz +/maven-assembly-plugin.tar.xz +/maven-bundle-plugin.tar.xz +/maven-common-artifact-filters.tar.xz +/maven-compiler-plugin.tar.xz +/maven-dependency-analyzer.tar.xz +/maven-dependency-plugin.tar.xz +/maven-dependency-tree.tar.xz +/maven-enforcer.tar.xz +/maven-file-management.tar.xz +/maven-filtering.tar.xz +/maven-jar-plugin.tar.xz +/maven-parent-pom.tar.xz +/maven-plugin-testing.tar.xz +/maven-plugin-tools.tar.xz +/maven-remote-resources-plugin.tar.xz +/maven-resolver.tar.xz +/maven-resources-plugin.tar.xz +/maven-resources.tar.xz +/maven-shared-incremental.tar.xz +/maven-shared-io.tar.xz +/maven-shared-utils.tar.xz +/maven-source-plugin.tar.xz +/maven-surefire.tar.xz +/maven.tar.xz +/maven-verifier.tar.xz +/maven-wagon.tar.xz +/mockito.tar.xz +/modello.tar.xz +/mojo-parent-pom.tar.xz +/munge-maven-plugin.tar.xz +/objenesis.tar.xz +/opentest4j.tar.xz +/osgi-annotation.tar.xz +/osgi-cmpn.tar.xz +/osgi-core.tar.xz +/oss-parent-pom.tar.xz +/plexus-archiver.tar.xz +/plexus-cipher.tar.xz +/plexus-classworlds.tar.xz +/plexus-compiler.tar.xz +/plexus-components-pom.tar.xz +/plexus-containers.tar.xz +/plexus-interpolation.tar.xz +/plexus-io.tar.xz +/plexus-languages.tar.xz +/plexus-pom.tar.xz +/plexus-resources.tar.xz +/plexus-sec-dispatcher.tar.xz +/plexus-utils.tar.xz +/qdox.tar.xz +/servlet-api.tar.xz +/sisu-build-api.tar.xz +/sisu-inject.tar.xz +/sisu-mojos.tar.xz +/sisu-plexus.tar.xz +/slf4j.tar.xz +/testng.tar.xz +/univocity-parsers.tar.xz +/velocity-engine.tar.xz +/xbean.tar.xz +/xmlunit.tar.xz +/xmvn.tar.xz +/xz-java.tar.xz diff --git a/javapackages-bootstrap.spec b/javapackages-bootstrap.spec new file mode 100644 index 0000000..c89181c --- /dev/null +++ b/javapackages-bootstrap.spec @@ -0,0 +1,411 @@ +# Exclude automatically generated requires on java interpreter which is not +# owned by any package +%global __requires_exclude ^/usr/lib/jvm/java + +Name: javapackages-bootstrap +Version: 1.0.0 +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 +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 + +# License breakdown +Source1: javapackages-bootstrap-PACKAGE-LICENSING + +# Extracted custom license files +Source2: plexus-compiler-LICENSE-MIT +Source3: plexus-containers-LICENSE-MIT +Source4: plexus-interpolation-LICENSE-MIT +Source5: plexus-resources-LICENSE-MIT + +# To obtain the following sources: +# git clone https://github.com/fedora-java/javapackages-bootstrap.git +# pushd javapackages-bootstrap-${version} +# ./downstream.sh clone +# ./downstream.sh prep +# ./downstream.sh archive +# The results are in the archive directory +Source1002: apache-pom.tar.xz +Source1001: ant.tar.xz +Source1003: apiguardian.tar.xz +Source1004: asm.tar.xz +Source1005: assertj-core.tar.xz +Source1006: bnd.tar.xz +Source1007: build-helper-maven-plugin.tar.xz +Source1008: byte-buddy.tar.xz +Source1009: cdi.tar.xz +Source1010: cglib.tar.xz +Source1011: common-annotations-api.tar.xz +Source1012: commons-beanutils.tar.xz +Source1013: commons-cli.tar.xz +Source1014: commons-codec.tar.xz +Source1015: commons-collections.tar.xz +Source1016: commons-compress.tar.xz +Source1017: commons-io.tar.xz +Source1018: commons-jxpath.tar.xz +Source1019: commons-lang.tar.xz +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: jsoup.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-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-build-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 + +Provides: bundled(ant) = 1.10.9 +Provides: bundled(apache-parent) = 23 +Provides: bundled(apiguardian) = 1.1.0 +Provides: bundled(objectweb-asm) = 9.0 +Provides: bundled(assertj-core) = 3.17.2 +Provides: bundled(aqute-bnd) = 5.1.2 +Provides: bundled(maven-plugin-build-helper) = 3.2.0 +Provides: bundled(byte-buddy) = 1.10.16 +Provides: bundled(cdi-api) = 2.0.2 +Provides: bundled(cglib) = 3.3.0 +Provides: bundled(jakarta-annotations) = 1.3.5 +Provides: bundled(apache-commons-beanutils) = 1.9.4 +Provides: bundled(apache-commons-cli) = 1.4 +Provides: bundled(apache-commons-codec) = 1.15 +Provides: bundled(apache-commons-collections) = 3.2.2 +Provides: bundled(apache-commons-compress) = 1.20 +Provides: bundled(apache-commons-io) = 2.8.0 +Provides: bundled(apache-commons-jxpath) = 1.3 +Provides: bundled(apache-commons-lang3) = 3.11 +Provides: bundled(apache-commons-logging) = 1.2 +Provides: bundled(apache-commons-parent) = 52 +Provides: bundled(java_cup) = 0.11b +Provides: bundled(easymock) = 4.2 +Provides: bundled(felix-parent) = 7 +Provides: bundled(felix-utils) = 1.11.4 +Provides: bundled(fusesource-pom) = 1.12 +Provides: bundled(guava) = 29.0 +Provides: bundled(google-guice) = 4.2.3 +Provides: bundled(hamcrest) = 2.2 +Provides: bundled(httpcomponents-client) = 4.5.11 +Provides: bundled(httpcomponents-core) = 4.4.13 +Provides: bundled(httpcomponents-project) = 12 +Provides: bundled(atinject) = 1.0.3 +Provides: bundled(jansi) = 1.18 +Provides: bundled(beust-jcommander) = 1.78 +Provides: bundled(jdom) = 1.1.3 +Provides: bundled(jdom2) = 2.0.6 +Provides: bundled(jflex) = 1.7.0 +Provides: bundled(jsoup) = 1.13.1 +Provides: bundled(jsr-305) = 3.0.2 +Provides: bundled(junit) = 4.13 +Provides: bundled(junit5) = 5.7.0 +Provides: bundled(maven-antrun-plugin) = 3.0.0 +Provides: bundled(maven-archiver) = 3.5.0 +Provides: bundled(maven-artifact-transfer) = 0.12.0 +Provides: bundled(maven-assembly-plugin) = 3.3.0 +Provides: bundled(maven-plugin-bundle) = 5.1.1 +Provides: bundled(maven-common-artifact-filters) = 3.1.0 +Provides: bundled(maven-compiler-plugin) = 3.8.1 +Provides: bundled(maven-dependency-analyzer) = 1.11.3 +Provides: bundled(maven-dependency-plugin) = 3.1.2 +Provides: bundled(maven-dependency-tree) = 3.0.1 +Provides: bundled(maven-enforcer) = 3.0.0~M2 +Provides: bundled(maven-file-management) = 3.0.0 +Provides: bundled(maven-filtering) = 3.2.0 +Provides: bundled(maven-jar-plugin) = 3.2.0 +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.4.2 +Provides: bundled(maven-resources-plugin) = 3.2.0 +Provides: bundled(maven-resources) = 1.4 +Provides: bundled(maven-shared-incremental) = 1.1 +Provides: bundled(maven-shared-io) = 3.0.0 +Provides: bundled(maven-shared-utils) = 3.3.3 +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.1 +Provides: bundled(maven) = 3.6.3 +Provides: bundled(mockito) = 3.5.13 +Provides: bundled(modello) = 1.11 +Provides: bundled(mojo-parent) = 50 +Provides: bundled(munge-maven-plugin) = 1.0 +Provides: bundled(objenesis) = 3.1 +Provides: bundled(opentest4j) = 1.2.0 +Provides: bundled(osgi-annotation) = 7.0.0 +Provides: bundled(osgi-compendium) = 7.0.0 +Provides: bundled(osgi-core) = 7.0.0 +Provides: bundled(sonatype-oss-parent) = 7 +Provides: bundled(plexus-archiver) = 4.2.2 +Provides: bundled(plexus-cipher) = 1.7 +Provides: bundled(plexus-classworlds) = 2.6.0 +Provides: bundled(plexus-compiler) = 2.8.8 +Provides: bundled(plexus-components-pom) = 6.4 +Provides: bundled(plexus-containers) = 2.1.0 +Provides: bundled(plexus-interpolation) = 1.26 +Provides: bundled(plexus-io) = 3.2.0 +Provides: bundled(plexus-languages) = 1.0.5 +Provides: bundled(plexus-pom) = 6.4 +Provides: bundled(plexus-resources) = 1.1.0 +Provides: bundled(plexus-sec-dispatcher) = 1.4 +Provides: bundled(plexus-utils) = 3.3.0 +Provides: bundled(qdox) = 2.0.0 +Provides: bundled(jakarta-servlet) = 4.0.3 +Provides: bundled(plexus-build-api) = 0.0.7 +Provides: bundled(sisu) = 0.3.4 +Provides: bundled(sisu-mojos) = 0.3.4 +Provides: bundled(sisu-plexus) = 0.3.4 +Provides: bundled(slf4j) = 1.7.30 +Provides: bundled(testng) = 7.3.0 +Provides: bundled(univocity-parsers) = 2.9.0 +Provides: bundled(velocity) = 1.7 +Provides: bundled(xbean) = 4.14 +Provides: bundled(xmlunit) = 2.7.0 +Provides: bundled(xmvn) = 4.0.0~SNAPSHOT +Provides: bundled(xz-java) = 1.8 + +BuildRequires: byaccj +BuildRequires: java-11-openjdk-devel +BuildRequires: java-1.8.0-openjdk-devel +BuildRequires: javapackages-local + +Requires: bash +Requires: coreutils +Requires: java-11-openjdk-devel +Requires: java-headless +Requires: javapackages-filesystem +Requires: procps-ng + +%description +In a nutshell, Java Packages Bootstrap (JPB) is a standalone build of all Java +software packages that are required for Java Packages Tools (JPT) to work. + +In order to achieve reliable and reproducible builds of Java packages while +meeting Fedora policy that requires everything to be built from source, without +using prebuilt binary artifacts, it is necessary to build the packages in a +well-defined, acyclic order. Dependency cycles between packages are the biggest +obstacle to achieving this goal and JPT is the biggest offender -- it requires +more than a hundred of Java packages, all of which in turn build-require JPT. + +JPB comes with a solution to this problem -- it builds everything that JPT needs +to work, without reliance on any Java software other than OpenJDK. JPT can +depend on JPB for everything, without depending on any other Java packages. For +example, JPB contains embedded version of XMvn, removing dependency of JPT on +XMvn, allowing JPT to be used before one builds XMvn package. + +%prep +%setup -q + +mkdir licenses +cp -p %(echo %{sources} | cut -d' ' -f2-6) licenses + +# leave out the first source as it has already been extracted +# leave out license files +other_sources=$(echo %{sources} | cut -d' ' -f7-) + +for source in ${other_sources} +do + tar -xf "${source}" +done + +for patch_path in patches/*/* +do + package_name="$(echo ${patch_path} | cut -f2 -d/)" + patch_name="$(echo ${patch_path} | cut -f3 -d/)" + + pushd "downstream/${package_name}" + patch -p1 < "../../patches/${package_name}/${patch_name}" + popd +done + +# This file would otherwise be installed along with the executables +rm downstream/maven/apache-maven/src/bin/.gitattributes + +%build +export LC_ALL=C.utf8 +./mbi.j build -parallel + +%install +./mbi.j dist \ + -installRoot=%{buildroot} \ + -mavenHomePath=%{_datadir}/%{name} \ + -metadataPath=%{_datadir}/%{name}/maven-metadata \ + -artifactsPath=%{_javadir}/%{name} \ + -launchersPath=%{_datadir}/%{name}/bin \ + +# fix permissions +for f in mvn mvnDebug mvnyjp +do + chmod +x "%{buildroot}%{_datadir}/%{name}/bin/${f}" +done + +for f in ant cup jflex xmvn-install xmvn-resolve xmvn-subst +do + chmod g-w "%{buildroot}%{_datadir}/%{name}/bin/${f}" +done + +# remove zero-size files +find %{buildroot}%{_javadir}/%{name} -type f -size 0 -delete + +# install license files +license_directory="%{buildroot}%{_licensedir}/%{name}" + +install -d -m 755 "${license_directory}" + +## install license breakdown and extracted custom licenses +for license_file in licenses/* +do + install -p -m 644 "${license_file}" "${license_directory}/$(basename ${license_file})" +done + +## install downstream licenses +install -p -m 644 LICENSE "${license_directory}/LICENSE" +install -p -m 644 NOTICE "${license_directory}/NOTICE" + +function install_license() +{ + install -p -m 644 "downstream/${1}/${2}" "${license_directory}/${1}-${2}" +} + +install_license ant NOTICE +install_license bnd LICENSE +install_license build-helper-maven-plugin LICENSE.txt +install_license byte-buddy NOTICE +install_license cglib NOTICE +install_license common-annotations-api LICENSE.md +install_license common-annotations-api NOTICE.md +install_license commons-beanutils NOTICE.txt +install_license commons-cli NOTICE.txt +install_license commons-codec NOTICE.txt +install_license commons-collections NOTICE.txt +install_license commons-compress NOTICE.txt +install_license commons-io NOTICE.txt +install_license commons-jxpath NOTICE.txt +install_license commons-lang NOTICE.txt +install_license commons-logging NOTICE.txt +install_license commons-parent-pom NOTICE.txt +install_license cup licence.txt +install_license felix-parent-pom NOTICE +install_license felix-utils NOTICE +install_license fusesource-pom notice.txt +install_license httpcomponents-client NOTICE.txt +install_license httpcomponents-core NOTICE.txt +install_license httpcomponents-parent-pom NOTICE.txt +install_license injection-api NOTICE.md +install_license jcommander notice.md +install_license jsoup LICENSE +install_license junit4 LICENSE-junit.txt +install_license junit5 LICENSE.md +install_license maven-bundle-plugin NOTICE +install_license maven-enforcer NOTICE +install_license maven NOTICE +install_license mockito LICENSE +install_license modello LICENSE.txt +install_license munge-maven-plugin LICENSE +install_license plexus-cipher NOTICE.txt +install_license plexus-io NOTICE.txt +install_license plexus-utils NOTICE.txt +install_license servlet-api LICENSE.md +install_license servlet-api NOTICE.md +install_license sisu-inject LICENSE.txt +install_license sisu-mojos LICENSE.txt +install_license sisu-plexus LICENSE.txt +install_license slf4j LICENSE.txt +install_license velocity-engine NOTICE +install_license xbean NOTICE +install_license xmvn NOTICE + +%files +%{_datadir}/%{name} +%{_javadir}/%{name}/* + +%license %{_licensedir}/%{name} +%doc README.md +%doc AUTHORS + +%changelog +* Wed Nov 25 2020 Marian Koncek - 1.0.0-1 +- Initial commit diff --git a/sources b/sources new file mode 100644 index 0000000..5c42367 --- /dev/null +++ b/sources @@ -0,0 +1,114 @@ +SHA512 (javapackages-bootstrap-1.0.0.tar.xz) = fccc4c83b1c698e5047cf5baaef3c527ba3a5f483cc569b000e76ae234b166730123813d54d50ba44b898a36b265314dbcf29e87abe05d5cbd75f5d907c28b88 +SHA512 (javapackages-bootstrap-PACKAGE-LICENSING) = eb0f118119f6559cd3379bdb131faa652ca8cc7ce8c07d798882af9cd6207110b30fbff951241d755e366330bbf6213a9e4a0f63e47c5d86f080bdb0f192a3ec +SHA512 (plexus-compiler-LICENSE-MIT) = fc8b3ef27d68a96ee34e5b6431d72de54d62f38c18301417d5f11d969b46c9010e44bd4e52cb3eda47eb2ec682e18e2f3e7d8c0136ee996a9de9beca7034fb6c +SHA512 (plexus-containers-LICENSE-MIT) = a8ac75a8e5f00a0bda94733cc6c5dd1497ae1a717157e5e0c7106c60806a2bbdc69c5b05c44a134a525b0ff7d50116b1c0ffb2b542e4681e16bd390e4dcab83b +SHA512 (plexus-interpolation-LICENSE-MIT) = 7cfc63f792766b5328d0adf20db77d2d5cf4cce278114055b3e7672dc595b7024aaed5772f8857571f42915d4aee771a5e77e76cb2276303579c649720736c8a +SHA512 (plexus-resources-LICENSE-MIT) = 7cfc63f792766b5328d0adf20db77d2d5cf4cce278114055b3e7672dc595b7024aaed5772f8857571f42915d4aee771a5e77e76cb2276303579c649720736c8a +SHA512 (ant.tar.xz) = d514610ca6be05efdeabebaeecaa515790bfa65b83c85de557686fa42135e7510440f04aa1890143255ca8e937d39b3e5b4c2ade7059224227c1982f7f87f9bc +SHA512 (apache-pom.tar.xz) = add7ac6b664307f36c55950597876216c2e0fc9193ea2c00214c22d38d4c249fdea639f36618e49a66193da8f076bd6a76bc5136e3f4ef5b3bc28b779a9f5004 +SHA512 (apiguardian.tar.xz) = c037c0afd3bb869585a99871c610bdc231ca66cf890199136bc822a67e0ddf252cf757d8ee04e56645117e75c816172e4e58efca39b3825c71e4b26a1d753fab +SHA512 (asm.tar.xz) = 0963a638f147c30f12de78afa27f7cb05ff15ad84a12a8f6dd22964c8acf59301451ea5af969d67b7c8167c2195cfd01d15a7d42c6f1fc32c1726be35ccf0453 +SHA512 (assertj-core.tar.xz) = 76afff13cd817c77ae35d6cb4d37600f373e71647554d6fdd8313f25d6a738aaa33b053dabc2047f364ea56b9a054f89eed6f6156b3fcb06112accf6258e9cbe +SHA512 (bnd.tar.xz) = 4e83f6fda5d6dd6edeb4d94f0a788737f8f99fba1c9e8c455b1700b9ae5823392630323efc98c4dc9c4b025867978fd27bce2ebbefa9f6949af9a0d5ebfa6630 +SHA512 (build-helper-maven-plugin.tar.xz) = a10176b562e2d7edbe109aec397e4ae1cdca1b3d27494644b483c874d08731478413eb0f3a4308aa2279d2883fba072fbd1b8a8f428447044a18195a46942219 +SHA512 (byte-buddy.tar.xz) = 9e264947b24953a46c29c569e4999e4802ef08525f0016f83596b86cbbe9daa6fb802c2365293d3664334bd053f41f29f1b83286b949c7f10904478f781cd79f +SHA512 (cdi.tar.xz) = 95b9c229ab2106de9133a9cea45f56bc85c2b32d348af0b56386ea782764a5cad1330aa9c8f68a92c0cad9a932a50fadd1a6f6f173a0497ccb267f7cad5f7b29 +SHA512 (cglib.tar.xz) = 6641fdbcac9f68bf5fcd97a102e18fc62491894155b8d26fb3d6ee393d12c5165890f4c1346b4b1d1736fdeea2f489aefad2a4b82000b16ef5c6f71fa5e720d0 +SHA512 (common-annotations-api.tar.xz) = 7f135480c6b8b9b3fc9472f570f4b82df773d9971814558f2742eed1f5ef5747daa95cfe88765edc72ba1d68c743e780733b115130ac93bdc8394f4824a42ed4 +SHA512 (commons-beanutils.tar.xz) = c949b81843aad73e969c3671649d48efab9d29dffd74e752e7c17af39d0332c9bfd8c17fb4d0d66873db24adbb37ecf682a47ec248c131c844a0d067c6f58b35 +SHA512 (commons-cli.tar.xz) = ee6ae7dd58aea611fbf8770d131dc226b20e189dc33ef99d13eb71b7700336cff973d26942c6b76c5142e3f397046e8a7480048aec59a2460cfb53a7a292d350 +SHA512 (commons-codec.tar.xz) = 6dcff937bf44772a5741fc823a5a5e97394e440968ebad83101761f929ba6c0c6a24f775cb86d7ba094e2a7ee5c8e468d425ef99b23aae869eb927ae397142ce +SHA512 (commons-collections.tar.xz) = 4101d7590734932f08cf5a51d2c28a4e1b7d4a61b013f4f24e4f042ef70081225ef5b2d47620a0a34a216b8245c9a7a2f63f9a3d9d5d73e23e107218f0f3bf51 +SHA512 (commons-compress.tar.xz) = 2ddd542560f6547bc742aff869f6619dbbf8ce2143dca34087e9ed0bca903614e74a0b7c2ea219957822776c2e5f36121604eadb214850574cecc2482b71ddae +SHA512 (commons-io.tar.xz) = 1703930014c68e870d865ff94c4ba3c103b2e4487e87635fc6ded00daa2b17731f34923ac4b1617cf77c28aab2a7473725da1df803d6c97a58b4288ba301d8c4 +SHA512 (commons-jxpath.tar.xz) = 1bbc91d1755a115044aa631f042d05e192050feebd29f515e6fd8216e01b1c2654961c353c6f515b7e02d7022bd7c45ed85a5c5e232c8c89f9f0892081f2f27c +SHA512 (commons-lang.tar.xz) = a17b17c4703fbdc48265829974f356985f8dbfe570473cc76d00d760ae1bb339637c1d40b5cbab7e218e0c2fa2fb8b42c0c5cb9b94d4bd26b8c9029e000b5911 +SHA512 (commons-logging.tar.xz) = d406a137a6375f01b399d82d868694d28a2c3613f8afafe54aa0c29fa83f730ee6c460ad93c83e97ca0e6b883216e37ad4fad226d1a2616bab9e154e5f3c4d0a +SHA512 (commons-parent-pom.tar.xz) = 15c4dc847f446358a80a0c08042c78a4329b322cbf6420c42d66fa63aa5c7965e3351fa8221bf45e5b49e934e6a9c2453e92cc7cd7781d501a3124f7f2a46dfe +SHA512 (cup.tar.xz) = 2520269875b67d92898e94e313712b9c21f302eed7c5589a93890818e375e0cb748a83dbca2c175260dff0d59fead4ce12cb80728186562dffd830d5fc8ec19a +SHA512 (easymock.tar.xz) = cf219a1e07425021fcddc4fba3dabb0b99cae62f9960f3904cff5d9d045ae84d6c7dbeda872f94b1f8788e00eb6cb2ba99a7332178b7b78b4e782764faa32775 +SHA512 (felix-parent-pom.tar.xz) = 25a8795f628f165e52a475252441457e3aed9efec3532a96ed8f061df1f22d8e0f08900e20ec7cd85322ff5112b39303fe9a1f5b6390eb5401fc475aff7fbc6f +SHA512 (felix-utils.tar.xz) = a2199ced40f9cc87bccf4f1e02566c2c360b3adfa1f44252b3facf7b046280f85ab9d57f27b0eb15bf8687c6857ec1a98dccb326ead2d73c26bf16c9782feaa5 +SHA512 (fusesource-pom.tar.xz) = 79868d1ade2ed501ff6857dc4a547f8c0e9d9e1423908e16c308f44cf26d4e677faa6632e77dd6c8e6e6ce1377c2dc967fd244e16b56b22a9b786fbb50f67df9 +SHA512 (guava.tar.xz) = e9e521153d75752f25095bc2c66a7b98c53e06c6721c86003e42d3bbfa22db46bb98ef29e67c832edfe145e0b6abc6ef5cd7d5bc768dc3024ccf39b9264f80e6 +SHA512 (guice.tar.xz) = 233b8361107bfbd5cf13757ca864833d863968a39b5e30482d50f32626b903f4ae5d9d63e02cad17777f4050793c54a9091603bbf1dc670a84e88c5130ed943a +SHA512 (hamcrest.tar.xz) = 9ab6d70ab5611b6fc52bf31afad93e76394d9341dace0361128bb22f77b974b62fa581926aa768850f2b24e758c7307f1f56e4dfa85ceeac83447ac7c9eada36 +SHA512 (httpcomponents-client.tar.xz) = ba2f8cab32104aadf5a77ed3e1e16798b05471695eca9efe22b1a0fccf839540610ad55c65a5c3b948983e905b178eb7527da5e309d7a21f0c57bdead8150f26 +SHA512 (httpcomponents-core.tar.xz) = 73e3bb628f57a0fa17994b4b66b54248c3abb548492a965e50a48067a7bffd983468f57720d5473100794e176415584849c04271d308f6ed5b9e6f31148d0443 +SHA512 (httpcomponents-parent-pom.tar.xz) = 5b877ef9f038312fe2cd17f5e9930b6fb771ff5d1d57d6e60812332502e2fde0ca53498be53a85d8652427afdc73dc747d21ec69c25a059a4dc53758ff405df8 +SHA512 (injection-api.tar.xz) = 2bfdb53c69322a5f7458a3acc59dd4b83b7969eb8312534ac8c0e60d4fb2f679df4690c6268b453ec19c791a156d111fafda5d113892e2412327d02325af4a16 +SHA512 (jansi.tar.xz) = 2a503443fd3793d42a8ce7247a3e25949a3b97868dd0914d90bff47c9b18b6e08122ab1d5a0436c94f57f4aec6ad36b9f16ee042f0ad7027fc1c066ab38340aa +SHA512 (jcommander.tar.xz) = 344b800b5d7e5028dfabfe70a08f84a19371d2bbbde1a9771a9bf02cbd47026bd5a78a397e588f28077b9f5576d4ea1d563c99b2c6c2eed5ca0cd32d2da5f1e1 +SHA512 (jdom2.tar.xz) = d3a3d8cf69fcfda48ced37f73a97711a5607bcf3a9fa73fe3cf0f3eb1dd6e2c4e727cb9f8b496ef9f3f9f46aab1e4f656d13059c798e713bd2b996a007e4f259 +SHA512 (jdom.tar.xz) = ced2c0c810be0b39b788259c649a2035d88710de5c5ae7a71daa62c7cdf81e38644f0cc289ae4a74ab313e50a5d05555423932af50b09e3a85e72d9440cb3c6a +SHA512 (jflex.tar.xz) = ef9ee7dd44b8fbf9a40e9e3f7169ce9bd14d8d724a8f3ca3ac0a6d00d0d8093bf8ebd047c99338613e3eb5d6942bba3d1c1ef36e113660ae41207f69d25af042 +SHA512 (jsoup.tar.xz) = da78d6698f9edc8ad3f2585f1c3581a16af65610cf4e4a2df6581dfa6a6917aab64ee85a8d706028b199f6f87f0dcc6227f9b6b312fdf50776827200971037c8 +SHA512 (jsr-305.tar.xz) = 58843b9aa8cc959af6203ee73191ec8d8b1b8a3ab17e23c25bd6ad977c26cbeaeb3ff87ffbfb89e28dafd7406ff4eeb67a904caded9ff7246e917cc10017932e +SHA512 (junit4.tar.xz) = d151567d91efaa79b6a167d497881f60760e5397a970766bb234ed28ac2a62903e157aa5d6ff9f06f11af224b020ed6f1c334a4119c3a19ed54dfc68c9a625b0 +SHA512 (junit5.tar.xz) = a97a08baea4b2810dcac689b77f6fc0522f7241e27cbd0454181b4c591676a08c5f8428b2ed38e46202074a7016c684085732c8d045f55a2c4c342ddec69195a +SHA512 (maven-antrun-plugin.tar.xz) = c06c14dc0bd3dd1cbdba4a6168ac7a7b678d77d136bec615316e025548f13a6311c829cd79de5436ff268a44a956aea479a9b1af935e46ee97e693031fcb9000 +SHA512 (maven-archiver.tar.xz) = b18419367d2061ac0af9c6306d490eb197d444ba9761c65ae9599aef6064ecf942025c4eed69285cd1c34bfe31aec01a32610713a090b48693900e6c90f42b1a +SHA512 (maven-artifact-transfer.tar.xz) = 3348eda1c4030deb69f86d29ebb533e14ddf13bb55654bf50c5ce421a6397e7d050722967cc832804ec98919a8edbfa5968d8125fe26330ee1ee218e7c53aa5a +SHA512 (maven-assembly-plugin.tar.xz) = 3d4d5b90c780301b7fd2c7c0cb1f87d1bbf6747f00b08075584e9995bb87f18a9434c7c62aa73f4a34648609bd101b2f535148e19c5f2f8dab493995882fdbf9 +SHA512 (maven-bundle-plugin.tar.xz) = 203999f023e09789c304a080d390ebbf7def09babbf8e99684c1d668f3ee6071b56c0f5f17359c9ff6646ce6f1507353d408e8d17f55f29723474533abe14f56 +SHA512 (maven-common-artifact-filters.tar.xz) = 21dfc5641ad0bb72c01014283e7071192a2b26b075da54a2fe38b67118a5b00846d57de7ad89455779ba3cb3a29a533642498a1e2aa9cb77768e164b52e630bb +SHA512 (maven-compiler-plugin.tar.xz) = 29dcab26314ff2a2a34ff98b8193af9d78c86f779f2d8a59424a6c959e4a5883455d4f7a25015cdfa5e7661d4f2224f7c50e7b6b16a41daee7f09aa9eaf8ec62 +SHA512 (maven-dependency-analyzer.tar.xz) = 9179c32f86349b1b939aa862c9d04fa1b1c7731d31b1702e71a8c7175125d8eab5c0fcccce8af95280073345d53953e2a37ce8cddd31b9efb0f8b27aecaef278 +SHA512 (maven-dependency-plugin.tar.xz) = 02ff9fd3c265648e5ac17441c277295003a813cda2c2f5b3517cd044d109faa057997105fa3b4683f0ac1e79758e1eafc6f7158033fb697355979a92e264ae2f +SHA512 (maven-dependency-tree.tar.xz) = c3d34b25c8457bb4b65fae74cf1ac52d337ffaf0db6a40b5b85d586c9ff26c733bd673f67a24077a94769650266d9f5d170a934ecfdd4fc44d0d3dcd05278a36 +SHA512 (maven-enforcer.tar.xz) = 0b0115fb7294ff3e8dcfd899c13d2674b535fbf3172dd9d3a334c1f2240df4a409a5801c878e8c8433079d16a047104645d031bfa188dad0c422c64210afd97d +SHA512 (maven-file-management.tar.xz) = e72fa521c57dda10977b5ca91a4b13adca878900a53165c48d58d4720f2380b3c53b9113239d5a71353f13b0d043c409185db40158b7ec6928d99a0d7b5e1fed +SHA512 (maven-filtering.tar.xz) = 2933b27f170ff25c74ab8ead5d00f1c11782d31df283a4e400775ab5e3cb981218c8da76b8b75e9a322938af32e9d4b44747253a69a55c6b4b6b4dcbf877c126 +SHA512 (maven-jar-plugin.tar.xz) = 8d319a9099cf8c5d891fd7d0d0d9c274b814fda000975b14298e03ba354ae63ae9de10d34a6306fdd6fc45493e64679fd56f019ad52adf0a41e10a7927291340 +SHA512 (maven-parent-pom.tar.xz) = dbed2a2f9f54c7e123124ef5479d71ee0a93b3139a0824c9b3b4b3f6c4d586a57f60e05ff183b1bc538f5b353c8873f6f860a81ec63e1c48127513a137f0f3ba +SHA512 (maven-plugin-testing.tar.xz) = c343fdc258b5884e801d74926767ba84c7dd1769d8215bf05c7dee955f3327cf216cffd39be4b96224523e4c16430edec81b934ab1543b328fd28f461360a2eb +SHA512 (maven-plugin-tools.tar.xz) = f084a81115c66f5be4c031cf23a522aaf5955cb0167155d998c71340591298e6744f932134b425b63acefc9af7a140484d2d99b263b0b702e091da392a88a7ae +SHA512 (maven-remote-resources-plugin.tar.xz) = 4c54f1a75c4dec4c48961f7c1ded4bb219dc10b246346a267a44b7e4a178b2cb23c25e81a41bd041975ed9ca37cdc0120b1e1da0fef86e56bb3a8415b26a9c39 +SHA512 (maven-resolver.tar.xz) = 167fef0ccbf6ef739b2b7be9ca91f55cf9583f6058143cabcfa395001f1263e5c3fbd87ec08ed4a832cbc2bc2dc741c7759859e0f6f4270650f7f4266d8a77ff +SHA512 (maven-resources-plugin.tar.xz) = f28fe60efe7c619201fba582327048e4bfe49b7ad8e55bf684c5c5e4ff12d23c92e3e02cbc0bd6ba977920c9a891ff6b27666b1f4a9ce0c5b03aeeedb7bf1843 +SHA512 (maven-resources.tar.xz) = 9be130f3b9e098635e5f62acabd60d4ae66b1658b18ed8630aecec8ac7fc9e5c19e04894e79b5a11e656c1261d5b270beb9f71080b404a0db8927853cfdfa8aa +SHA512 (maven-shared-incremental.tar.xz) = 50f7cbcc3496fcf4b834bfeeac770d610deb8b35a60bdf3cd5d18eac0615bd1853377a83dc1bc1744c3b3e4d66df8cea722f3b7be626c855053c337deb0d1118 +SHA512 (maven-shared-io.tar.xz) = e56af091151ee53587edd52943e7527bf6329920d0ebe2011aec075d56e05ce5b36c99f49e31adb5ee62dea6af1b977376df4f3646e306f9e8d9854d23aae587 +SHA512 (maven-shared-utils.tar.xz) = a72f958b7a8d3537f613a08e6d7b25d424b40eec714a7b11aa639ccfef0db4f3db400e49bf0bc48b94155bba84187178552a7c1163d934e43c900fd4c8a8fb4b +SHA512 (maven-source-plugin.tar.xz) = da94c4fbc819fb04a7ba6efd9fceac194837bf6cf754f00fe162db964321f2fb860f7c074b51693bfc0aedb31f9eadc0356d5e694838a4ef8c8fb9d390d454e8 +SHA512 (maven-surefire.tar.xz) = 136d6ff35242e11ae293f21e9e42d2ab0b6ec379e64324a82ec5d0b8ae43072b68557f87c5f02227064899a638560c67e82ae4a5a7a1313eb8d198a60603c26b +SHA512 (maven.tar.xz) = d1392683175146e1328e97e24ba03eeda8d77f5b59695259971bbbc5d2c427954d6e06127b0445b8cbb3c156d0cf751d68668f62936256442e376cdc2b0e0725 +SHA512 (maven-verifier.tar.xz) = 54deb814e5d254ec50c20c76f59f164ed7063a85b5828bf9fd4a727e4a4f936ae3d07a5854b016bc491e6730550eca5dd694c873cdbdc84f9b867f6daf4bcd14 +SHA512 (maven-wagon.tar.xz) = d51b293ff3e92af40f2e330f0f3cc320760926b2d5bf40906afa0989b15042692f4bd4675944aab38bb3f77f38404c0b1075d1d7b8548c073999419442acd3ef +SHA512 (mockito.tar.xz) = 06490cc44bc41c9168c1748c7a53b3cb8b54d84dcf487388e1a7d1c33be09a0ef39586ca0fae503a5fec133480d48f85ba5e3cfe4d5629b0357aa26557b1fef9 +SHA512 (modello.tar.xz) = 93d92ea186d830bcc388b459d3b28a2612ffe5de5ad9d28acc20441d0ee07951ade832fd8e68616314e9b8ec66db1db2713839b20350c4833ed9beecc7ab58fb +SHA512 (mojo-parent-pom.tar.xz) = e5be5393f3f27bcf89b2f3d83efa21e7cefedd1379f419ee886c381bf8650d6fa596fc2a946201fae3e99ea914136ba0e35024d007ff46c5f36c9ca5571a7a30 +SHA512 (munge-maven-plugin.tar.xz) = 573c010ca107cdf32440d5dfa95a1ca400da7fd3d56f8355fd99257fb4ec83d2818638c06f06ba8f0ea882a3515fc64931c6342e4ec167488b11555023a5e7ed +SHA512 (objenesis.tar.xz) = 99a3b9da3baec726aeb643a72494617d5234d31e063e0e81c0716a3e0a7d9b773b591f215ea82f3dc6d781d4294e60143794409073739caf07917b14b231015c +SHA512 (opentest4j.tar.xz) = f28358721018eb98959427553300e2bba4cf592016c7e83f25c907236caab0e77c537cbe1fd9685edae3e125bf0feb87560ccc991d37e381d377c1d48197c2a4 +SHA512 (osgi-annotation.tar.xz) = 2f2990d6b29f930699fefc4c01c2fbeadc69c7b469c566b79cc561120d1f672fd95c78f4bd518128082d0f5c80bc0d589b5167b8b56f204dfacf60f9ae5f47f7 +SHA512 (osgi-cmpn.tar.xz) = 1c3ee095a8b89e8a553d3e0f2a0b8cabdec203aa0810829b64bae885de701541ce11185b02bb5d09c5965fa66390b534997ed0440008a46bd09e3673f72f6ecd +SHA512 (osgi-core.tar.xz) = 6b4ee1d3e495dd14bade260d43a960836a591fea0c285e36904b1b6c8f785432e198f2d460e5aa4281020e6d1f09d2ff95457c6fcd176f8f113e6ed3fc4dcc19 +SHA512 (oss-parent-pom.tar.xz) = 11e88e748e13a48262f34de209169e60da5f8c9f548b80212a80ae767d7f5d3aeac7d03d420d78da14e9e64a299904411c54d59a0361c4290c696c52efe350d4 +SHA512 (plexus-archiver.tar.xz) = 67b79e1c99e1e78fceaf887d3e68f158833c01b43b98a5546165d3d29674ac7510ea3cbb12d63e21c00efeaae76bdf8059a0fb9cd284b7062377c1d9ac2341e8 +SHA512 (plexus-cipher.tar.xz) = 4080ff531e2d75ed114670861f7ccc80348588a0aa133e17811e3f0ba6a8af44ed749df8d10f41f58790e3309859eff9e995945a5f9356d86c9b46c254ab449e +SHA512 (plexus-classworlds.tar.xz) = 769af97c043b3675a49960cbabff04e748134770fc36d9ede6e52a0acb6b2ddc9dc0e51e05cc6d3e8e2c33a76441794381f05c4927d70d4b1fc9ea7ee84472a6 +SHA512 (plexus-compiler.tar.xz) = 4c9af6a934d2f8cf0712fee364d9a4723323102b4f6b64ccf4b74bcf3fe8cdb9d04d50261026dbd63a770fab97f03fd3ecf99f903d6707e29dfcaedc74b092d7 +SHA512 (plexus-components-pom.tar.xz) = d7386aeb60591b6facc7d99d9910b1623ebb8de61b9b0d781fae22ba9eb02ff864e67f6198054eed41c2454b82f26848c3d6ed6bf1113dab338f70fc1aab61dc +SHA512 (plexus-containers.tar.xz) = 7e7a34374e66cf1f4540c4246260e0d65088f87eef79583f3ada3b49d317395d7f6420d2baf4ea6cc37c5ba2ee7cde1490b1ab61074423de1f01a4054069f85b +SHA512 (plexus-interpolation.tar.xz) = 5f93f9e88aef39753d3901785421367253948449044990d1d974b99f2ae110a52d314a13264766312a9597ef2f8f40240e7773f51daf5d8d162848d95c37bd8c +SHA512 (plexus-io.tar.xz) = e2bd3152749001a9133f2d2184b5559a2bdcc8991d00ee6cabfd8998fde8446ac05c48aca0e427cac06e6589afb466034d26300b5ccede74259ad6b37c382595 +SHA512 (plexus-languages.tar.xz) = 6346800073ca39f24acafac1a42e3aa1fb6ee5f6a9cf3ad3ca0cab8fe59003a244ca478a77cb2cc097f1912efb7fa94966585b62b9f6c225fdb424e596d75655 +SHA512 (plexus-pom.tar.xz) = 10a015077d1589db071e1b8fd4cee3199d4cc17381f74621a202a8a5ab03dd6af594d2d9136ae5f0c8b15db4f3605188ce82518caf685e0631b2ea1e3bf8c8ad +SHA512 (plexus-resources.tar.xz) = 8b7c55468661311b1faf1eee83d0c491986cfbe5aed38b9298362b82bb384cd583ea476b337dd6393c492c16f70192cd9a763d53920df64210ce9c22f4be635b +SHA512 (plexus-sec-dispatcher.tar.xz) = 4fa97396d72f6f7c43160c1f303bd4e5ada5bef4b912a7fdf75f5721e466c420c4415e0031d58fa060493ea2a1c1ee39800250d6f13a8b1fb19b10e729413764 +SHA512 (plexus-utils.tar.xz) = ccf1d201f1d8682cab36764b9a8ce946a26013980d9df3087dbe8d8136bf7b9191029be6836108506ca9dc662e92cd8809835b7ff1c23c6ca2ab4901d67f8c93 +SHA512 (qdox.tar.xz) = 922111989f6472c1bfdffe78d91ea8da94e704f122a6c3f9d5d87c22647c412b69f0ebbd4a737650163b14c7102aaddbd1164dfb364c6a92a3638ac5b6c9c264 +SHA512 (servlet-api.tar.xz) = f1731aa67600034edeb10a60030cb22f650b036de71a8309dddd3fdfb475436512a35dbdb6f1b985fa31964b018cddad51c5909a9c6a2bcab025593ecce4c74b +SHA512 (sisu-build-api.tar.xz) = 6d1dc0cbfba6d78eb12f2e68c955c49a85ee5a07a696d83d31efe8eba8ccedb887036be280de0c805c0aeb6b8ff35ff4ceab5231ead8cc9d467fc27226e576d4 +SHA512 (sisu-inject.tar.xz) = b0111b6c8e4103029c528a2bb169a4afd5bc58e52564cc34fbc006adb653abb265a92114bb2461ae6720e6787a5f60a32897781cbe0f54e070edb6520b145750 +SHA512 (sisu-mojos.tar.xz) = 32a31bd01af618f04fdfc1f3e5aa850d4ac8f3f2b6ed4e1ad2f8bbf65b7e6a75f0aa91c4e3ec5a361b8b3f0d25120ddd5a5c17ef11ddb4ea31491784d66cdaf8 +SHA512 (sisu-plexus.tar.xz) = 736896a5bb6230338341ebca1cbbc4d258faf5affac88d178252eed6173dada281299ecac9df03f133c3199eac7230c7a37d3f1902c6a164453b120015030c7b +SHA512 (slf4j.tar.xz) = 5071068364c08e65058f367fed61b8298e2e19aff6fcced4fb6cd170d7a71b4e24c25e7192745bb3759c35078fff37f7c196a758dc3faee11e696a43db3d553f +SHA512 (testng.tar.xz) = 3377c6a6f40740b0def5eca5b89e522d1a41e6e7c41cbb944baa524b838b203a6458a6dfa234f38b23e45a7de1e6a16ecf288f3d1271812700dc2d82303c63fd +SHA512 (univocity-parsers.tar.xz) = db5d154a34d56c5aa1269bf04174f86a45eacb12976904ab4a7c55db03d8e7b7d7f5e2ab913e6674165728f3e7ed34e34b84079b9761c1699e76b0314c2437cc +SHA512 (velocity-engine.tar.xz) = 81f647534f4361fc8e7065282b1182b4f0c5009ef5b63a85c2c4668e2d0281689970df06f3f7566f77140e157dea674ecd2a120d48d75ab9c7de1cb35a2b7992 +SHA512 (xbean.tar.xz) = 2401d47384ba5ef36ab8f4fd634ab298c39aeecaeb89ce1fe92b3c7c1224bd73eca817038dc5cbaa558f8dea178d2c75193e6ca5037c36db8da25fbcf22bd514 +SHA512 (xmlunit.tar.xz) = 6a95939eeb0d45496bc8612fe41a424d9a5cc7092e7895833f30dd4b152102d469c66515faee91924c6d44d3a67b9234349fccf11e2ae74dd54d3536e3f7c6b9 +SHA512 (xmvn.tar.xz) = 9c4ed80f866c2010db6f8c827f1cacff6d34585b8dc01e857a8677eaa86f41586ce16b0b69b7938b9433740affdf822a78ce68d031cabf0926db805833e685da +SHA512 (xz-java.tar.xz) = 287335c084b80a1fc7510f1dc8d1cc17a815f6ae40f70cca1b08112fe8ba48181a9da3c0bc9328adcece74b677fef1659461ce03082e87a01b8d753fc3ffe680 From 1cfbee7d2c1faced240f1a23bb3ed366cd853360 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Mon, 30 Nov 2020 17:31:31 +0100 Subject: [PATCH 03/77] Move license files to dist-git --- .gitignore | 5 - javapackages-bootstrap-PACKAGE-LICENSING | 621 +++++++++++++++++++++++ plexus-compiler-LICENSE-MIT | 24 + plexus-containers-LICENSE-MIT | 25 + plexus-interpolation-LICENSE-MIT | 23 + plexus-resources-LICENSE-MIT | 23 + sources | 5 - 7 files changed, 716 insertions(+), 10 deletions(-) create mode 100644 javapackages-bootstrap-PACKAGE-LICENSING create mode 100644 plexus-compiler-LICENSE-MIT create mode 100644 plexus-containers-LICENSE-MIT create mode 100644 plexus-interpolation-LICENSE-MIT create mode 100644 plexus-resources-LICENSE-MIT diff --git a/.gitignore b/.gitignore index 3408f79..4e4da7e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,9 +1,4 @@ /javapackages-bootstrap-1.0.0.tar.xz -/javapackages-bootstrap-PACKAGE-LICENSING -/plexus-compiler-LICENSE-MIT -/plexus-containers-LICENSE-MIT -/plexus-interpolation-LICENSE-MIT -/plexus-resources-LICENSE-MIT /ant.tar.xz /apache-pom.tar.xz /apiguardian.tar.xz diff --git a/javapackages-bootstrap-PACKAGE-LICENSING b/javapackages-bootstrap-PACKAGE-LICENSING new file mode 100644 index 0000000..17e3b09 --- /dev/null +++ b/javapackages-bootstrap-PACKAGE-LICENSING @@ -0,0 +1,621 @@ +# This is the license breakdown of each component + +downstream/ant: ASL 2.0 +downstream/apache-pom: ASL 2.0 +downstream/apiguardian: ASL 2.0 +downstream/asm: BSD +downstream/assertj-core: ASL 2.0 +downstream/bnd: ASL 2.0 or EPL-2.0 +downstream/build-helper-maven-plugin: MIT +downstream/byte-buddy: ASL 2.0 +downstream/cdi: ASL 2.0 +downstream/cglib: ASL 2.0 +downstream/common-annotations-api: EPL-2.0 or GPLv2 with exceptions +downstream/commons-beanutils: ASL 2.0 +downstream/commons-cli: ASL 2.0 +downstream/commons-codec: ASL 2.0 +downstream/commons-collections: ASL 2.0 +downstream/commons-compress: ASL 2.0 +downstream/commons-io: ASL 2.0 +downstream/commons-jxpath: ASL 2.0 +downstream/commons-lang: ASL 2.0 +downstream/commons-logging: ASL 2.0 +downstream/commons-parent-pom: ASL 2.0 +downstream/cup: MIT +downstream/easymock: ASL 2.0 +downstream/felix-parent-pom: ASL 2.0 +downstream/felix-utils: ASL 2.0 +downstream/fusesource-pom: ASL 2.0 +downstream/guava: ASL 2.0 and CC0 + com/google/common/hash/Striped64.java: CC0 + com/google/common/hash/LongAdder.java: CC0 + com/google/common/collect/Hashing.java: ASL 2.0 and CC0 + com/google/common/cache/Striped64.java: CC0 + com/google/common/cache/LongAdder.java: CC0 + com/google/common/util/concurrent/AtomicDoubleArray.java: CC0 + com/google/common/util/concurrent/Striped.java: ASL 2.0 and CC0 + com/google/common/util/concurrent/MoreExecutors.java: ASL 2.0 and CC0 + com/google/common/base/SmallCharMatcher.java: ASL 2.0 and CC0 + everything else is ASL 2.0 +downstream/guice: ASL 2.0 +downstream/hamcrest: BSD +downstream/httpcomponents-client: ASL 2.0 +downstream/httpcomponents-core: ASL 2.0 +downstream/httpcomponents-parent-pom: ASL 2.0 +downstream/injection-api: ASL 2.0 +downstream/jansi: ASL 2.0 +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 +downstream/maven: ASL 2.0 +downstream/maven-antrun-plugin: ASL 2.0 +downstream/maven-archiver: ASL 2.0 +downstream/maven-artifact-transfer: ASL 2.0 +downstream/maven-assembly-plugin: ASL 2.0 +downstream/maven-bundle-plugin: ASL 2.0 +downstream/maven-common-artifact-filters: ASL 2.0 +downstream/maven-compiler-plugin: ASL 2.0 +downstream/maven-dependency-analyzer: ASL 2.0 +downstream/maven-dependency-plugin: ASL 2.0 +downstream/maven-dependency-tree: ASL 2.0 +downstream/maven-enforcer: ASL 2.0 +downstream/maven-file-management: ASL 2.0 +downstream/maven-filtering: ASL 2.0 +downstream/maven-jar-plugin: ASL 2.0 +downstream/maven-parent-pom: ASL 2.0 +downstream/maven-plugin-testing: ASL 2.0 +downstream/maven-plugin-tools: ASL 2.0 +downstream/maven-remote-resources-plugin: ASL 2.0 +downstream/maven-resolver: ASL 2.0 +downstream/maven-resources: ASL 2.0 +downstream/maven-resources-plugin: ASL 2.0 +downstream/maven-shared-incremental: ASL 2.0 +downstream/maven-shared-io: ASL 2.0 +downstream/maven-shared-utils: ASL 2.0 +downstream/maven-source-plugin: ASL 2.0 +downstream/maven-surefire: ASL 2.0 +downstream/maven-verifier: ASL 2.0 +downstream/maven-wagon: ASL 2.0 +downstream/mockito: MIT +downstream/modello: MIT and ASL 2.0 + modello-plugins/modello-plugin-java/src/test/java/org/codehaus/modello/plugin/java/BiDirectionalOverrideJavaGeneratorTest.java: Apache License 2.0 + modello-plugins/modello-plugin-java/src/test/java/org/codehaus/modello/plugin/java/Permission.java: Apache License 2.0 + modello-plugins/modello-plugin-java/src/test/java/org/codehaus/modello/plugin/java/Role.java: Apache License 2.0 + modello-plugins/modello-plugin-java/src/main/java/org/codehaus/modello/plugin/java/javasource/JArrayType.java: Apache License 2.0 + modello-plugins/modello-plugin-java/src/main/java/org/codehaus/modello/plugin/java/javasource/JCollectionType.java: Apache License 2.0 + modello-plugins/modello-plugin-java/src/main/java/org/codehaus/modello/plugin/java/javasource/JComponentizedType.java: Apache License 2.0 + modello-plugins/modello-plugin-jdom/src/main/java/org/codehaus/modello/plugin/jdom/JDOMWriterGenerator.java: Apache License 2.0 + modello-plugins/modello-plugin-xsd/src/main/java/org/codehaus/modello/plugin/xsd/metadata/XsdAssociationMetadata.java: Apache License 2.0 + modello-plugins/modello-plugin-xsd/src/main/java/org/codehaus/modello/plugin/xsd/metadata/XsdClassMetadata.java: Apache License 2.0 + modello-plugins/modello-plugin-xsd/src/main/java/org/codehaus/modello/plugin/xsd/metadata/XsdFieldMetadata.java: Apache License 2.0 + modello-plugins/modello-plugin-xsd/src/main/java/org/codehaus/modello/plugin/xsd/metadata/XsdInterfaceMetadata.java: Apache License 2.0 + modello-plugins/modello-plugin-xsd/src/main/java/org/codehaus/modello/plugin/xsd/metadata/XsdMetadataPlugin.java: Apache License 2.0 + modello-plugins/modello-plugin-xsd/src/main/java/org/codehaus/modello/plugin/xsd/metadata/XsdModelMetadata.java: Apache License 2.0 + everything else is MIT +downstream/mojo-parent-pom: ASL 2.0 +downstream/munnge-maven-plugin: CDDL-1.0 +downstream/objenesis: ASL 2.0 +downstream/opentest4j: ASL 2.0 +downstream/osgi-annotation: ASL 2.0 +downstream/osgi-cmpn: ASL 2.0 +downstream/osgi-core: ASL 2.0 +downstream/oss-parent-pom: ASL 2.0 +downstream/plexus-archiver: ASL 2.0 +downstream/plexus-cipher: ASL 2.0 +downstream/plexus-classworlds: ASL 2.0 +downstream/plexus-compiler: MIT and ASL 2.0 + complete breakdown: + plexus-compiler-api/src/main/java/org/codehaus/plexus/compiler/CompilerMessage.java: MIT and ASL 2.0 + plexus-compilers/plexus-compiler-javac/src/main/java/org/codehaus/plexus/compiler/javac/JavacCompiler.java: MIT and ASL 2.0 + + plexus-compiler-api/src/main/java/org/codehaus/plexus/compiler/CompilerError.java: ASL 2.0 + plexus-compiler-api/src/main/java/org/codehaus/plexus/compiler/CompilerResult.java: ASL 2.0 + plexus-compiler-api/src/main/java/org/codehaus/plexus/compiler/util/scan/AbstractSourceInclusionScanner.java: ASL 2.0 + plexus-compiler-api/src/main/java/org/codehaus/plexus/compiler/util/scan/InclusionScanException.java: ASL 2.0 + plexus-compiler-api/src/main/java/org/codehaus/plexus/compiler/util/scan/SourceInclusionScanner.java: ASL 2.0 + plexus-compiler-api/src/main/java/org/codehaus/plexus/compiler/util/scan/StaleSourceScanner.java: ASL 2.0 + plexus-compiler-api/src/main/java/org/codehaus/plexus/compiler/util/scan/mapping/SourceMapping.java: ASL 2.0 + plexus-compiler-api/src/main/java/org/codehaus/plexus/compiler/util/scan/mapping/SuffixMapping.java: ASL 2.0 + plexus-compilers/plexus-compiler-javac/src/main/java/org/codehaus/plexus/compiler/javac/JavaxToolsCompiler.java: ASL 2.0 + + plexus-compiler-api/src/main/java/org/codehaus/plexus/compiler/AbstractCompiler.java: MIT + plexus-compiler-api/src/main/java/org/codehaus/plexus/compiler/Compiler.java: MIT + plexus-compiler-api/src/main/java/org/codehaus/plexus/compiler/CompilerConfiguration.java: MIT + plexus-compiler-api/src/main/java/org/codehaus/plexus/compiler/CompilerException.java: MIT + plexus-compiler-api/src/main/java/org/codehaus/plexus/compiler/CompilerNotImplementedException.java: MIT + plexus-compiler-api/src/main/java/org/codehaus/plexus/compiler/CompilerOutputStyle.java: MIT + plexus-compiler-api/src/main/java/org/codehaus/plexus/compiler/util/StreamPumper.java: MIT + plexus-compiler-api/src/main/java/org/codehaus/plexus/compiler/util/scan/SimpleSourceInclusionScanner.java: MIT + plexus-compiler-api/src/main/java/org/codehaus/plexus/compiler/util/scan/mapping/SingleTargetSourceMapping.java: MIT + plexus-compiler-manager/src/main/java/org/codehaus/plexus/compiler/manager/CompilerManager.java: MIT + plexus-compiler-manager/src/main/java/org/codehaus/plexus/compiler/manager/DefaultCompilerManager.java: MIT + plexus-compiler-manager/src/main/java/org/codehaus/plexus/compiler/manager/NoSuchCompilerException.java: MIT + plexus-compilers/plexus-compiler-javac/src/main/java/org/codehaus/plexus/compiler/javac/IsolatedClassLoader.java: MIT + + plexus-compilers/plexus-compiler-javac/src/main/java/org/codehaus/plexus/compiler/javac/InProcessCompiler.java: ASL 2.0 +downstream/plexus-components-pom: ASL 2.0 +downstream/plexus-containers: ASL 2.0 and MIT and xpp + complete breakdown: + plexus-component-metadata/src/main/java/org/codehaus/plexus/metadata/merge/Driver.java: xpp + plexus-component-metadata/src/main/java/org/codehaus/plexus/metadata/merge/MXParser.java: xpp + + plexus-container-default/src/main/java/org/codehaus/plexus/ClassRealmUtil.java: ASL 2.0 + plexus-container-default/src/main/java/org/codehaus/plexus/ComponentRegistry.java: ASL 2.0 + plexus-container-default/src/main/java/org/codehaus/plexus/ContainerConfiguration.java: ASL 2.0 + plexus-container-default/src/main/java/org/codehaus/plexus/DefaultComponentRegistry.java: ASL 2.0 + plexus-container-default/src/main/java/org/codehaus/plexus/DefaultContainerConfiguration.java: ASL 2.0 + plexus-container-default/src/main/java/org/codehaus/plexus/DefaultPlexusContainer.java: ASL 2.0 + plexus-container-default/src/main/java/org/codehaus/plexus/DuplicateChildContainerException.java: ASL 2.0 + plexus-container-default/src/main/java/org/codehaus/plexus/MutablePlexusContainer.java: ASL 2.0 + plexus-container-default/src/main/java/org/codehaus/plexus/PlexusConstants.java: ASL 2.0 + plexus-container-default/src/main/java/org/codehaus/plexus/PlexusContainer.java: ASL 2.0 + plexus-container-default/src/main/java/org/codehaus/plexus/PlexusContainerException.java: ASL 2.0 + plexus-container-default/src/main/java/org/codehaus/plexus/PlexusJUnit4TestCase.java: ASL 2.0 + plexus-container-default/src/main/java/org/codehaus/plexus/PlexusTestCase.java: ASL 2.0 + plexus-container-default/src/main/java/org/codehaus/plexus/component/CastUtils.java: ASL 2.0 + plexus-container-default/src/main/java/org/codehaus/plexus/component/MapOrientedComponent.java: ASL 2.0 + plexus-container-default/src/main/java/org/codehaus/plexus/configuration/DefaultPlexusConfiguration.java: ASL 2.0 + plexus-container-default/src/main/java/org/codehaus/plexus/configuration/PlexusComponentDescriptorMerger.java: ASL 2.0 + plexus-container-default/src/main/java/org/codehaus/plexus/configuration/PlexusConfiguration.java: ASL 2.0 + plexus-container-default/src/main/java/org/codehaus/plexus/configuration/PlexusConfigurationException.java: ASL 2.0 + plexus-container-default/src/main/java/org/codehaus/plexus/configuration/PlexusConfigurationMerger.java: ASL 2.0 + plexus-container-default/src/main/java/org/codehaus/plexus/configuration/PlexusConfigurationResourceException.java: ASL 2.0 + plexus-container-default/src/main/java/org/codehaus/plexus/context/Context.java: ASL 2.0 + plexus-container-default/src/main/java/org/codehaus/plexus/context/ContextException.java: ASL 2.0 + plexus-container-default/src/main/java/org/codehaus/plexus/context/ContextMapAdapter.java: ASL 2.0 + plexus-container-default/src/main/java/org/codehaus/plexus/context/DefaultContext.java: ASL 2.0 + plexus-container-default/src/main/java/org/codehaus/plexus/lifecycle/AbstractLifecycleHandler.java: ASL 2.0 + plexus-container-default/src/main/java/org/codehaus/plexus/lifecycle/BasicLifecycleHandler.java: ASL 2.0 + plexus-container-default/src/main/java/org/codehaus/plexus/lifecycle/DefaultLifecycleHandlerManager.java: ASL 2.0 + plexus-container-default/src/main/java/org/codehaus/plexus/lifecycle/LifecycleHandler.java: ASL 2.0 + plexus-container-default/src/main/java/org/codehaus/plexus/lifecycle/LifecycleHandlerManager.java: ASL 2.0 + plexus-container-default/src/main/java/org/codehaus/plexus/lifecycle/UndefinedLifecycleHandlerException.java: ASL 2.0 + plexus-container-default/src/main/java/org/codehaus/plexus/logging/AbstractLogEnabled.java: ASL 2.0 + plexus-container-default/src/main/java/org/codehaus/plexus/logging/AbstractLogger.java: ASL 2.0 + plexus-container-default/src/main/java/org/codehaus/plexus/logging/AbstractLoggerManager.java: ASL 2.0 + plexus-container-default/src/main/java/org/codehaus/plexus/logging/BaseLoggerManager.java: ASL 2.0 + plexus-container-default/src/main/java/org/codehaus/plexus/logging/LogEnabled.java: ASL 2.0 + plexus-container-default/src/main/java/org/codehaus/plexus/logging/Logger.java: ASL 2.0 + plexus-container-default/src/main/java/org/codehaus/plexus/logging/LoggerManager.java: ASL 2.0 + plexus-container-default/src/main/java/org/codehaus/plexus/component/builder/AbstractComponentBuildListener.java: ASL 2.0 + plexus-container-default/src/main/java/org/codehaus/plexus/component/builder/ComponentBuildListener.java: ASL 2.0 + plexus-container-default/src/main/java/org/codehaus/plexus/component/builder/ComponentBuilder.java: ASL 2.0 + plexus-container-default/src/main/java/org/codehaus/plexus/component/builder/XBeanComponentBuilder.java: ASL 2.0 + plexus-container-default/src/main/java/org/codehaus/plexus/component/collections/AbstractComponentCollection.java: ASL 2.0 + plexus-container-default/src/main/java/org/codehaus/plexus/component/collections/ComponentList.java: ASL 2.0 + plexus-container-default/src/main/java/org/codehaus/plexus/component/collections/ComponentMap.java: ASL 2.0 + plexus-container-default/src/main/java/org/codehaus/plexus/component/composition/CompositionResolver.java: ASL 2.0 + plexus-container-default/src/main/java/org/codehaus/plexus/component/composition/CycleDetectedInComponentGraphException.java: ASL 2.0 + plexus-container-default/src/main/java/org/codehaus/plexus/component/composition/DefaultCompositionResolver.java: ASL 2.0 + plexus-container-default/src/main/java/org/codehaus/plexus/component/composition/UndefinedComponentComposerException.java: ASL 2.0 + plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/AbstractComponentConfigurator.java: MIT + plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/BasicComponentConfigurator.java: MIT + plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/ComponentConfigurationException.java: ASL 2.0 + plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/ComponentConfigurator.java: MIT + plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/ConfigurationListener.java: MIT + plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/MapOrientedComponentConfigurator.java: ASL 2.0 + plexus-container-default/src/main/java/org/codehaus/plexus/component/discovery/AbstractResourceBasedComponentDiscoverer.java: ASL 2.0 + plexus-container-default/src/main/java/org/codehaus/plexus/component/discovery/AnnotationBasedComponentDiscoverer.java: ASL 2.0 + plexus-container-default/src/main/java/org/codehaus/plexus/component/discovery/ComponentDiscoverer.java: ASL 2.0 + plexus-container-default/src/main/java/org/codehaus/plexus/component/discovery/ComponentDiscovererManager.java: ASL 2.0 + plexus-container-default/src/main/java/org/codehaus/plexus/component/discovery/ComponentDiscoveryEvent.java: ASL 2.0 + plexus-container-default/src/main/java/org/codehaus/plexus/component/discovery/ComponentDiscoveryListener.java: ASL 2.0 + plexus-container-default/src/main/java/org/codehaus/plexus/component/discovery/DefaultComponentDiscoverer.java: ASL 2.0 + plexus-container-default/src/main/java/org/codehaus/plexus/component/discovery/DefaultComponentDiscovererManager.java: ASL 2.0 + plexus-container-default/src/main/java/org/codehaus/plexus/component/discovery/DiscoveryListenerDescriptor.java: ASL 2.0 + plexus-container-default/src/main/java/org/codehaus/plexus/component/discovery/PlexusXmlComponentDiscoverer.java: ASL 2.0 + plexus-container-default/src/main/java/org/codehaus/plexus/component/discovery/ResourceBasedComponentDiscoverer.java: ASL 2.0 + plexus-container-default/src/main/java/org/codehaus/plexus/component/factory/AbstractComponentFactory.java: ASL 2.0 + plexus-container-default/src/main/java/org/codehaus/plexus/component/factory/ComponentFactory.java: ASL 2.0 + plexus-container-default/src/main/java/org/codehaus/plexus/component/factory/ComponentFactoryManager.java: ASL 2.0 + plexus-container-default/src/main/java/org/codehaus/plexus/component/factory/ComponentInstantiationException.java: ASL 2.0 + plexus-container-default/src/main/java/org/codehaus/plexus/component/factory/DefaultComponentFactoryManager.java: ASL 2.0 + plexus-container-default/src/main/java/org/codehaus/plexus/component/factory/UndefinedComponentFactoryException.java: ASL 2.0 + plexus-container-default/src/main/java/org/codehaus/plexus/component/manager/AbstractComponentManager.java: ASL 2.0 + plexus-container-default/src/main/java/org/codehaus/plexus/component/manager/ComponentManager.java: ASL 2.0 + plexus-container-default/src/main/java/org/codehaus/plexus/component/manager/ComponentManagerFactory.java: ASL 2.0 + plexus-container-default/src/main/java/org/codehaus/plexus/component/manager/PerLookupComponentManager.java: ASL 2.0 + plexus-container-default/src/main/java/org/codehaus/plexus/component/manager/PerLookupComponentManagerFactory.java: ASL 2.0 + plexus-container-default/src/main/java/org/codehaus/plexus/component/manager/SingletonComponentManager.java: ASL 2.0 + plexus-container-default/src/main/java/org/codehaus/plexus/component/manager/SingletonComponentManagerFactory.java: ASL 2.0 + plexus-container-default/src/main/java/org/codehaus/plexus/component/manager/UndefinedComponentManagerException.java: ASL 2.0 + plexus-container-default/src/main/java/org/codehaus/plexus/component/repository/ComponentDependency.java: ASL 2.0 + plexus-container-default/src/main/java/org/codehaus/plexus/component/repository/ComponentDescriptor.java: ASL 2.0 + plexus-container-default/src/main/java/org/codehaus/plexus/component/repository/ComponentRepository.java: ASL 2.0 + plexus-container-default/src/main/java/org/codehaus/plexus/component/repository/ComponentRequirement.java: ASL 2.0 + plexus-container-default/src/main/java/org/codehaus/plexus/component/repository/ComponentRequirementList.java: ASL 2.0 + plexus-container-default/src/main/java/org/codehaus/plexus/component/repository/ComponentSetDescriptor.java: ASL 2.0 + plexus-container-default/src/main/java/org/codehaus/plexus/component/repository/DefaultComponentRepository.java: ASL 2.0 + plexus-container-default/src/main/java/org/codehaus/plexus/configuration/io/PlexusConfigurationReader.java: ASL 2.0 + plexus-container-default/src/main/java/org/codehaus/plexus/configuration/io/PlexusConfigurationWriter.java: ASL 2.0 + plexus-container-default/src/main/java/org/codehaus/plexus/configuration/io/XmlPlexusConfigurationReader.java: ASL 2.0 + plexus-container-default/src/main/java/org/codehaus/plexus/configuration/io/XmlPlexusConfigurationWriter.java: ASL 2.0 + plexus-container-default/src/main/java/org/codehaus/plexus/configuration/source/ChainedConfigurationSource.java: ASL 2.0 + plexus-container-default/src/main/java/org/codehaus/plexus/configuration/source/ConfigurationSource.java: ASL 2.0 + plexus-container-default/src/main/java/org/codehaus/plexus/configuration/source/ContainerConfigurationSource.java: ASL 2.0 + plexus-container-default/src/main/java/org/codehaus/plexus/configuration/xml/XmlPlexusConfiguration.java: ASL 2.0 + plexus-container-default/src/main/java/org/codehaus/plexus/container/initialization/AbstractContainerInitializationPhase.java: ASL 2.0 + plexus-container-default/src/main/java/org/codehaus/plexus/container/initialization/AbstractCoreComponentInitializationPhase.java: ASL 2.0 + plexus-container-default/src/main/java/org/codehaus/plexus/container/initialization/ContainerInitializationContext.java: ASL 2.0 + plexus-container-default/src/main/java/org/codehaus/plexus/container/initialization/ContainerInitializationException.java: ASL 2.0 + plexus-container-default/src/main/java/org/codehaus/plexus/container/initialization/ContainerInitializationPhase.java: ASL 2.0 + plexus-container-default/src/main/java/org/codehaus/plexus/container/initialization/InitializeComponentDiscovererManagerPhase.java: ASL 2.0 + plexus-container-default/src/main/java/org/codehaus/plexus/container/initialization/InitializeComponentFactoryManagerPhase.java: ASL 2.0 + plexus-container-default/src/main/java/org/codehaus/plexus/container/initialization/InitializeComponentRegistryPhase.java: ASL 2.0 + plexus-container-default/src/main/java/org/codehaus/plexus/container/initialization/InitializeContainerConfigurationSourcePhase.java: ASL 2.0 + plexus-container-default/src/main/java/org/codehaus/plexus/container/initialization/InitializeLoggerManagerPhase.java: ASL 2.0 + plexus-container-default/src/main/java/org/codehaus/plexus/container/initialization/InitializeSystemPropertiesPhase.java: ASL 2.0 + plexus-container-default/src/main/java/org/codehaus/plexus/container/initialization/InitializeUserConfigurationSourcePhase.java: ASL 2.0 + plexus-container-default/src/main/java/org/codehaus/plexus/lifecycle/phase/AbstractPhase.java: ASL 2.0 + plexus-container-default/src/main/java/org/codehaus/plexus/lifecycle/phase/Phase.java: ASL 2.0 + plexus-container-default/src/main/java/org/codehaus/plexus/logging/console/ConsoleLogger.java: ASL 2.0 + plexus-container-default/src/main/java/org/codehaus/plexus/logging/console/ConsoleLoggerManager.java: ASL 2.0 + plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/converters/AbstractConfigurationConverter.java: MIT + plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/converters/ComponentValueSetter.java: ASL 2.0 + plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/converters/ConfigurationConverter.java: MIT + plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/expression/DefaultExpressionEvaluator.java: ASL 2.0 + plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/expression/ExpressionEvaluationException.java: ASL 2.0 + plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/expression/ExpressionEvaluator.java: ASL 2.0 + plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/expression/TypeAwareExpressionEvaluator.java: ASL 2.0 + plexus-container-default/src/main/java/org/codehaus/plexus/component/factory/java/JavaComponentFactory.java: ASL 2.0 + plexus-container-default/src/main/java/org/codehaus/plexus/component/repository/exception/ComponentConfigurationException.java: ASL 2.0 + plexus-container-default/src/main/java/org/codehaus/plexus/component/repository/exception/ComponentDescriptorUnmarshallingException.java: ASL 2.0 + plexus-container-default/src/main/java/org/codehaus/plexus/component/repository/exception/ComponentImplementationNotFoundException.java: ASL 2.0 + plexus-container-default/src/main/java/org/codehaus/plexus/component/repository/exception/ComponentLifecycleException.java: ASL 2.0 + plexus-container-default/src/main/java/org/codehaus/plexus/component/repository/exception/ComponentLookupException.java: ASL 2.0 + plexus-container-default/src/main/java/org/codehaus/plexus/component/repository/exception/ComponentLookupRuntimeException.java: ASL 2.0 + plexus-container-default/src/main/java/org/codehaus/plexus/component/repository/exception/ComponentManagerImplementationNotFoundException.java: ASL 2.0 + plexus-container-default/src/main/java/org/codehaus/plexus/component/repository/exception/ComponentProfileException.java: ASL 2.0 + plexus-container-default/src/main/java/org/codehaus/plexus/component/repository/exception/ComponentRepositoryException.java: ASL 2.0 + plexus-container-default/src/main/java/org/codehaus/plexus/component/repository/io/PlexusTools.java: ASL 2.0 + plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/converters/basic/AbstractBasicConverter.java: MIT + plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/converters/basic/BooleanConverter.java: MIT + plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/converters/basic/ByteConverter.java: MIT + plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/converters/basic/CharConverter.java: MIT + plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/converters/basic/ClassConverter.java: ASL 2.0 + plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/converters/basic/Converter.java: MIT + plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/converters/basic/DateConverter.java: MIT + plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/converters/basic/DoubleConverter.java: MIT + plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/converters/basic/EnumConverter.java: MIT + plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/converters/basic/FileConverter.java: MIT + plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/converters/basic/FloatConverter.java: MIT + plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/converters/basic/IntConverter.java: MIT + plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/converters/basic/LongConverter.java: MIT + plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/converters/basic/ShortConverter.java: MIT + plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/converters/basic/StringBufferConverter.java: MIT + plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/converters/basic/StringConverter.java: MIT + plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/converters/basic/UriConverter.java: ASL 2.0 + plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/converters/basic/UrlConverter.java: MIT + plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/converters/composite/ArrayConverter.java: MIT + plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/converters/composite/CollectionConverter.java: MIT + plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/converters/composite/MapConverter.java: MIT + plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/converters/composite/ObjectWithFieldsConverter.java: MIT + plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/converters/composite/PlexusConfigurationConverter.java: MIT + plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/converters/composite/PropertiesConverter.java: MIT + plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/converters/lookup/ConverterLookup.java: MIT + plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/converters/lookup/DefaultConverterLookup.java: MIT + plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/converters/special/ClassRealmConverter.java: ASL 2.0 + plexus-container-default/src/main/java/org/codehaus/plexus/personality/plexus/lifecycle/phase/AutoConfigurePhase.java: ASL 2.0 + plexus-container-default/src/main/java/org/codehaus/plexus/personality/plexus/lifecycle/phase/Configurable.java: ASL 2.0 + plexus-container-default/src/main/java/org/codehaus/plexus/personality/plexus/lifecycle/phase/ConfigurablePhase.java: ASL 2.0 + plexus-container-default/src/main/java/org/codehaus/plexus/personality/plexus/lifecycle/phase/Contextualizable.java: ASL 2.0 + plexus-container-default/src/main/java/org/codehaus/plexus/personality/plexus/lifecycle/phase/ContextualizePhase.java: ASL 2.0 + plexus-container-default/src/main/java/org/codehaus/plexus/personality/plexus/lifecycle/phase/Disposable.java: ASL 2.0 + plexus-container-default/src/main/java/org/codehaus/plexus/personality/plexus/lifecycle/phase/DisposePhase.java: ASL 2.0 + plexus-container-default/src/main/java/org/codehaus/plexus/personality/plexus/lifecycle/phase/Initializable.java: ASL 2.0 + plexus-container-default/src/main/java/org/codehaus/plexus/personality/plexus/lifecycle/phase/InitializationException.java: ASL 2.0 + plexus-container-default/src/main/java/org/codehaus/plexus/personality/plexus/lifecycle/phase/InitializePhase.java: ASL 2.0 + plexus-container-default/src/main/java/org/codehaus/plexus/personality/plexus/lifecycle/phase/LogDisablePhase.java: ASL 2.0 + plexus-container-default/src/main/java/org/codehaus/plexus/personality/plexus/lifecycle/phase/LogEnablePhase.java: ASL 2.0 + plexus-container-default/src/main/java/org/codehaus/plexus/personality/plexus/lifecycle/phase/PhaseExecutionException.java: ASL 2.0 + plexus-container-default/src/main/java/org/codehaus/plexus/personality/plexus/lifecycle/phase/PlexusContainerLocator.java: ASL 2.0 + plexus-container-default/src/main/java/org/codehaus/plexus/personality/plexus/lifecycle/phase/ResumePhase.java: ASL 2.0 + plexus-container-default/src/main/java/org/codehaus/plexus/personality/plexus/lifecycle/phase/ServiceLocator.java: ASL 2.0 + plexus-container-default/src/main/java/org/codehaus/plexus/personality/plexus/lifecycle/phase/Serviceable.java: ASL 2.0 + plexus-container-default/src/main/java/org/codehaus/plexus/personality/plexus/lifecycle/phase/ServiceablePhase.java: ASL 2.0 + plexus-container-default/src/main/java/org/codehaus/plexus/personality/plexus/lifecycle/phase/StartPhase.java: ASL 2.0 + plexus-container-default/src/main/java/org/codehaus/plexus/personality/plexus/lifecycle/phase/Startable.java: ASL 2.0 + plexus-container-default/src/main/java/org/codehaus/plexus/personality/plexus/lifecycle/phase/StartingException.java: ASL 2.0 + plexus-container-default/src/main/java/org/codehaus/plexus/personality/plexus/lifecycle/phase/StopPhase.java: ASL 2.0 + plexus-container-default/src/main/java/org/codehaus/plexus/personality/plexus/lifecycle/phase/StoppingException.java: ASL 2.0 + plexus-container-default/src/main/java/org/codehaus/plexus/personality/plexus/lifecycle/phase/SuspendPhase.java: ASL 2.0 + plexus-container-default/src/main/java/org/codehaus/plexus/personality/plexus/lifecycle/phase/Suspendable.java: ASL 2.0 + + plexus-component-metadata/src/main/java/org/codehaus/plexus/metadata/ClassComponentDescriptorExtractor.java: ASL 2.0 + plexus-component-metadata/src/main/java/org/codehaus/plexus/metadata/ComponentDescriptorExtractor.java: ASL 2.0 + plexus-component-metadata/src/main/java/org/codehaus/plexus/metadata/ComponentDescriptorExtractorSupport.java: ASL 2.0 + plexus-component-metadata/src/main/java/org/codehaus/plexus/metadata/ComponentDescriptorWriteException.java: MIT + plexus-component-metadata/src/main/java/org/codehaus/plexus/metadata/ComponentDescriptorWriter.java: MIT + plexus-component-metadata/src/main/java/org/codehaus/plexus/metadata/DefaultComponentDescriptorWriter.java: MIT + plexus-component-metadata/src/main/java/org/codehaus/plexus/metadata/DefaultMetadataGenerator.java: MIT + plexus-component-metadata/src/main/java/org/codehaus/plexus/metadata/MetadataGenerationRequest.java: ASL 2.0 + plexus-component-metadata/src/main/java/org/codehaus/plexus/metadata/MetadataGenerator.java: ASL 2.0 + plexus-component-metadata/src/main/java/org/codehaus/plexus/metadata/SourceComponentDescriptorExtractor.java: ASL 2.0 + plexus-component-metadata/src/main/java/org/codehaus/plexus/component/repository/ComponentDescriptor.java: ASL 2.0 + plexus-component-metadata/src/main/java/org/codehaus/plexus/component/repository/ComponentRequirement.java: ASL 2.0 + plexus-component-metadata/src/main/java/org/codehaus/plexus/component/repository/ComponentRequirementList.java: ASL 2.0 + plexus-component-metadata/src/main/java/org/codehaus/plexus/component/repository/ComponentSetDescriptor.java: ASL 2.0 + plexus-component-metadata/src/main/java/org/codehaus/plexus/component/repository/README.txt: ASL 2.0 + plexus-component-metadata/src/main/java/org/codehaus/plexus/maven/plugin/AbstractDescriptorMojo.java: MIT + plexus-component-metadata/src/main/java/org/codehaus/plexus/maven/plugin/PlexusDescriptorMojo.java: MIT + plexus-component-metadata/src/main/java/org/codehaus/plexus/maven/plugin/PlexusMergeMojo.java: MIT + plexus-component-metadata/src/main/java/org/codehaus/plexus/maven/plugin/PlexusTestDescriptorMojo.java: MIT + plexus-component-metadata/src/main/java/org/codehaus/plexus/metadata/ann/Ann.java: ASL 2.0 + plexus-component-metadata/src/main/java/org/codehaus/plexus/metadata/ann/AnnClass.java: ASL 2.0 + plexus-component-metadata/src/main/java/org/codehaus/plexus/metadata/ann/AnnEnum.java: ASL 2.0 + plexus-component-metadata/src/main/java/org/codehaus/plexus/metadata/ann/AnnField.java: ASL 2.0 + plexus-component-metadata/src/main/java/org/codehaus/plexus/metadata/ann/AnnInvocationHandler.java: ASL 2.0 + plexus-component-metadata/src/main/java/org/codehaus/plexus/metadata/ann/AnnMethod.java: ASL 2.0 + plexus-component-metadata/src/main/java/org/codehaus/plexus/metadata/ann/AnnReader.java: ASL 2.0 + plexus-component-metadata/src/main/java/org/codehaus/plexus/metadata/gleaner/AnnotationComponentGleaner.java: ASL 2.0 + plexus-component-metadata/src/main/java/org/codehaus/plexus/metadata/gleaner/ClassComponentGleaner.java: ASL 2.0 + plexus-component-metadata/src/main/java/org/codehaus/plexus/metadata/gleaner/ComponentGleanerException.java: MIT + plexus-component-metadata/src/main/java/org/codehaus/plexus/metadata/gleaner/ComponentGleanerSupport.java: ASL 2.0 + plexus-component-metadata/src/main/java/org/codehaus/plexus/metadata/gleaner/QDoxComponentGleaner.java: MIT + plexus-component-metadata/src/main/java/org/codehaus/plexus/metadata/gleaner/SourceComponentGleaner.java: ASL 2.0 + plexus-component-metadata/src/main/java/org/codehaus/plexus/metadata/merge/AbstractMerger.java: MIT + plexus-component-metadata/src/main/java/org/codehaus/plexus/metadata/merge/ComponentsXmlMerger.java: MIT + plexus-component-metadata/src/main/java/org/codehaus/plexus/metadata/merge/MergeException.java: MIT + plexus-component-metadata/src/main/java/org/codehaus/plexus/metadata/merge/MergeStrategy.java: MIT + plexus-component-metadata/src/main/java/org/codehaus/plexus/metadata/merge/Merger.java: MIT + plexus-component-metadata/src/main/java/org/codehaus/plexus/metadata/merge/PlexusXmlMerger.java: MIT + plexus-component-metadata/src/main/java/org/codehaus/plexus/metadata/merge/support/AbstractMergeableElement.java: MIT + plexus-component-metadata/src/main/java/org/codehaus/plexus/metadata/merge/support/AbstractMergeableElementList.java: MIT + plexus-component-metadata/src/main/java/org/codehaus/plexus/metadata/merge/support/AbstractMergeableSupport.java: MIT + plexus-component-metadata/src/main/java/org/codehaus/plexus/metadata/merge/support/ComponentElement.java: MIT + plexus-component-metadata/src/main/java/org/codehaus/plexus/metadata/merge/support/ComponentSetElement.java: MIT + plexus-component-metadata/src/main/java/org/codehaus/plexus/metadata/merge/support/ComponentsElement.java: MIT + plexus-component-metadata/src/main/java/org/codehaus/plexus/metadata/merge/support/ConfigurationElement.java: MIT + plexus-component-metadata/src/main/java/org/codehaus/plexus/metadata/merge/support/DescriptorTag.java: ASL 2.0 + plexus-component-metadata/src/main/java/org/codehaus/plexus/metadata/merge/support/MergeStrategies.java: MIT + plexus-component-metadata/src/main/java/org/codehaus/plexus/metadata/merge/support/Mergeable.java: MIT + plexus-component-metadata/src/main/java/org/codehaus/plexus/metadata/merge/support/PlexusRootElement.java: MIT + plexus-component-metadata/src/main/java/org/codehaus/plexus/metadata/merge/support/PlexusXmlTag.java: ASL 2.0 + plexus-component-metadata/src/main/java/org/codehaus/plexus/metadata/merge/support/RequirementElement.java: MIT + plexus-component-metadata/src/main/java/org/codehaus/plexus/metadata/merge/support/RequirementsElement.java: MIT +downstream/plexus-interpolation: ASL 2.0 and ASL 1.1 and MIT + complete breakdown: + src/main/java/org/codehaus/plexus/interpolation/AbstractDelegatingValueSource.java: ASL 2.0 + src/main/java/org/codehaus/plexus/interpolation/AbstractFunctionValueSourceWrapper.java: ASL 2.0 + src/main/java/org/codehaus/plexus/interpolation/AbstractValueSource.java: ASL 2.0 + src/main/java/org/codehaus/plexus/interpolation/BasicInterpolator.java: ASL 2.0 + src/main/java/org/codehaus/plexus/interpolation/EnvarBasedValueSource.java: ASL 2.0 + src/main/java/org/codehaus/plexus/interpolation/FeedbackEnabledValueSource.java: ASL 2.0 + src/main/java/org/codehaus/plexus/interpolation/FixedInterpolatorValueSource.java: ASL 2.0 + src/main/java/org/codehaus/plexus/interpolation/InterpolationCycleException.java: ASL 2.0 + src/main/java/org/codehaus/plexus/interpolation/InterpolationException.java: ASL 2.0 + src/main/java/org/codehaus/plexus/interpolation/InterpolationPostProcessor.java: ASL 2.0 + src/main/java/org/codehaus/plexus/interpolation/Interpolator.java: ASL 2.0 + src/main/java/org/codehaus/plexus/interpolation/InterpolatorFilterReader.java: ASL 1.1 + src/main/java/org/codehaus/plexus/interpolation/MapBasedValueSource.java: ASL 2.0 + src/main/java/org/codehaus/plexus/interpolation/ObjectBasedValueSource.java: ASL 2.0 + src/main/java/org/codehaus/plexus/interpolation/PrefixAwareRecursionInterceptor.java: ASL 2.0 + src/main/java/org/codehaus/plexus/interpolation/PrefixedObjectValueSource.java: ASL 2.0 + src/main/java/org/codehaus/plexus/interpolation/PrefixedPropertiesValueSource.java: ASL 2.0 + src/main/java/org/codehaus/plexus/interpolation/PrefixedValueSourceWrapper.java: ASL 2.0 + src/main/java/org/codehaus/plexus/interpolation/PropertiesBasedValueSource.java: ASL 2.0 + src/main/java/org/codehaus/plexus/interpolation/QueryEnabledValueSource.java: ASL 2.0 + src/main/java/org/codehaus/plexus/interpolation/RecursionInterceptor.java: ASL 2.0 + src/main/java/org/codehaus/plexus/interpolation/RegexBasedInterpolator.java: ASL 2.0 + src/main/java/org/codehaus/plexus/interpolation/SimpleRecursionInterceptor.java: ASL 2.0 + src/main/java/org/codehaus/plexus/interpolation/SingleResponseValueSource.java: ASL 2.0 + src/main/java/org/codehaus/plexus/interpolation/StringSearchInterpolator.java: ASL 2.0 + src/main/java/org/codehaus/plexus/interpolation/ValueSource.java: ASL 2.0 + src/main/java/org/codehaus/plexus/interpolation/fixed/AbstractDelegatingValueSource.java: ASL 2.0 + src/main/java/org/codehaus/plexus/interpolation/fixed/EnvarBasedValueSource.java: ASL 2.0 + src/main/java/org/codehaus/plexus/interpolation/fixed/FixedStringSearchInterpolator.java: ASL 2.0 + src/main/java/org/codehaus/plexus/interpolation/fixed/FixedValueSource.java: ASL 2.0 + src/main/java/org/codehaus/plexus/interpolation/fixed/InterpolationCycleException.java: ASL 2.0 + src/main/java/org/codehaus/plexus/interpolation/fixed/InterpolationState.java: ASL 2.0 + src/main/java/org/codehaus/plexus/interpolation/fixed/MapBasedValueSource.java: ASL 2.0 + src/main/java/org/codehaus/plexus/interpolation/fixed/ObjectBasedValueSource.java: ASL 2.0 + src/main/java/org/codehaus/plexus/interpolation/fixed/PrefixedObjectValueSource.java: ASL 2.0 + src/main/java/org/codehaus/plexus/interpolation/fixed/PrefixedPropertiesValueSource.java: ASL 2.0 + src/main/java/org/codehaus/plexus/interpolation/fixed/PrefixedValueSourceWrapper.java: ASL 2.0 + src/main/java/org/codehaus/plexus/interpolation/fixed/PropertiesBasedValueSource.java: ASL 2.0 + src/main/java/org/codehaus/plexus/interpolation/multi/DelimiterSpecification.java: ASL 2.0 + src/main/java/org/codehaus/plexus/interpolation/multi/MultiDelimiterInterpolatorFilterReader.java: ASL 1.1 + src/main/java/org/codehaus/plexus/interpolation/multi/MultiDelimiterStringSearchInterpolator.java: ASL 2.0 + src/main/java/org/codehaus/plexus/interpolation/object/FieldBasedObjectInterpolator.java: ASL 2.0 + src/main/java/org/codehaus/plexus/interpolation/object/ObjectInterpolationWarning.java: ASL 2.0 + src/main/java/org/codehaus/plexus/interpolation/object/ObjectInterpolator.java: ASL 2.0 + src/main/java/org/codehaus/plexus/interpolation/os/OperatingSystemUtils.java: MIT + src/main/java/org/codehaus/plexus/interpolation/os/Os.java: ASL 1.1 + src/main/java/org/codehaus/plexus/interpolation/reflection/ClassMap.java: ASL 2.0 + src/main/java/org/codehaus/plexus/interpolation/reflection/MethodMap.java: ASL 2.0 + src/main/java/org/codehaus/plexus/interpolation/reflection/ReflectionValueExtractor.java: ASL 2.0 + src/main/java/org/codehaus/plexus/interpolation/util/StringUtils.java: ASL 1.1 + src/main/java/org/codehaus/plexus/interpolation/util/ValueSourceUtils.java: ASL 2.0 +downstream/plexus-io: ASL 2.0 +downstream/plexus-languages: ASL 2.0 +downstream/plexus-pom: ASL 2.0 +downstream/plexus-resources: MIT +downstream/plexus-sec-dispatcher: ASL 2.0 +downstream/plexus-utils: ASL 2.0 and ASL 1.1 and BSD and xpp and Public Domain + complete breakdown: + src/main/java/org/codehaus/plexus/util/AbstractScanner.java: ASL 2.0 + src/main/java/org/codehaus/plexus/util/Base64.java: ASL 2.0 + src/main/java/org/codehaus/plexus/util/CollectionUtils.java: ASL 2.0 + src/main/java/org/codehaus/plexus/util/DirectoryWalkListener.java: ASL 2.0 + src/main/java/org/codehaus/plexus/util/DirectoryWalker.java: ASL 2.0 + src/main/java/org/codehaus/plexus/util/Java7Detector.java: ASL 2.0 + src/main/java/org/codehaus/plexus/util/LineOrientedInterpolatingReader.java: ASL 2.0 + src/main/java/org/codehaus/plexus/util/MatchPattern.java: ASL 2.0 + src/main/java/org/codehaus/plexus/util/NioFiles.java: ASL 2.0 + src/main/java/org/codehaus/plexus/util/PathTool.java: ASL 2.0 + src/main/java/org/codehaus/plexus/util/PropertyUtils.java: ASL 2.0 + src/main/java/org/codehaus/plexus/util/ReaderFactory.java: ASL 2.0 + src/main/java/org/codehaus/plexus/util/ReflectionUtils.java: ASL 2.0 + src/main/java/org/codehaus/plexus/util/Scanner.java: ASL 2.0 + src/main/java/org/codehaus/plexus/util/StringOutputStream.java: ASL 2.0 + src/main/java/org/codehaus/plexus/util/SweeperPool.java: ASL 2.0 + src/main/java/org/codehaus/plexus/util/WriterFactory.java: ASL 2.0 + src/main/java/org/codehaus/plexus/util/cli/AbstractStreamHandler.java: ASL 2.0 + src/main/java/org/codehaus/plexus/util/cli/Arg.java: ASL 2.0 + src/main/java/org/codehaus/plexus/util/cli/CommandLineCallable.java: ASL 2.0 + src/main/java/org/codehaus/plexus/util/cli/CommandLineException.java: ASL 2.0 + src/main/java/org/codehaus/plexus/util/cli/CommandLineTimeOutException.java: ASL 2.0 + src/main/java/org/codehaus/plexus/util/cli/CommandLineUtils.java: ASL 2.0 + src/main/java/org/codehaus/plexus/util/cli/DefaultConsumer.java: ASL 2.0 + src/main/java/org/codehaus/plexus/util/cli/EnhancedStringTokenizer.java: ASL 2.0 + src/main/java/org/codehaus/plexus/util/cli/ShutdownHookUtils.java: ASL 2.0 + src/main/java/org/codehaus/plexus/util/cli/StreamFeeder.java: ASL 2.0 + src/main/java/org/codehaus/plexus/util/cli/WriterStreamConsumer.java: ASL 2.0 + src/main/java/org/codehaus/plexus/util/dag/CycleDetectedException.java: ASL 2.0 + src/main/java/org/codehaus/plexus/util/dag/CycleDetector.java: ASL 2.0 + src/main/java/org/codehaus/plexus/util/dag/DAG.java: ASL 2.0 + src/main/java/org/codehaus/plexus/util/dag/TopologicalSorter.java: ASL 2.0 + src/main/java/org/codehaus/plexus/util/dag/Vertex.java: ASL 2.0 + src/main/java/org/codehaus/plexus/util/introspection/ClassMap.java: ASL 2.0 + src/main/java/org/codehaus/plexus/util/introspection/MethodMap.java: ASL 2.0 + src/main/java/org/codehaus/plexus/util/introspection/ReflectionValueExtractor.java: ASL 2.0 + src/main/java/org/codehaus/plexus/util/io/InputStreamFacade.java: ASL 2.0 + src/main/java/org/codehaus/plexus/util/io/RawInputStreamFacade.java: ASL 2.0 + src/main/java/org/codehaus/plexus/util/io/URLInputStreamFacade.java: ASL 2.0 + src/main/java/org/codehaus/plexus/util/reflection/Reflector.java: ASL 2.0 + src/main/java/org/codehaus/plexus/util/reflection/ReflectorException.java: ASL 2.0 + src/main/java/org/codehaus/plexus/util/xml/CompactXMLWriter.java: ASL 2.0 + src/main/java/org/codehaus/plexus/util/xml/PrettyPrintXMLWriter.java: ASL 2.0 + src/main/java/org/codehaus/plexus/util/xml/SerializerXMLWriter.java: ASL 2.0 + src/main/java/org/codehaus/plexus/util/xml/XMLWriter.java: ASL 2.0 + src/main/java/org/codehaus/plexus/util/xml/XmlReader.java: ASL 2.0 + src/main/java/org/codehaus/plexus/util/xml/XmlReaderException.java: ASL 2.0 + src/main/java/org/codehaus/plexus/util/xml/XmlStreamReader.java: ASL 2.0 + src/main/java/org/codehaus/plexus/util/xml/XmlStreamReaderException.java: ASL 2.0 + src/main/java/org/codehaus/plexus/util/xml/XmlStreamWriter.java: ASL 2.0 + src/main/java/org/codehaus/plexus/util/xml/XmlUtil.java: ASL 2.0 + src/main/java/org/codehaus/plexus/util/xml/XmlWriterUtil.java: ASL 2.0 + src/main/java/org/codehaus/plexus/util/xml/Xpp3Dom.java: ASL 2.0 + src/main/java/org/codehaus/plexus/util/xml/Xpp3DomBuilder.java: ASL 2.0 + src/main/java/org/codehaus/plexus/util/xml/Xpp3DomUtils.java: ASL 2.0 + src/main/java/org/codehaus/plexus/util/xml/Xpp3DomWriter.java: ASL 2.0 + src/main/java/org/codehaus/plexus/util/cli/shell/BourneShell.java: ASL 2.0 + src/main/java/org/codehaus/plexus/util/cli/shell/CmdShell.java: ASL 2.0 + src/main/java/org/codehaus/plexus/util/cli/shell/CommandShell.java: ASL 2.0 + src/main/java/org/codehaus/plexus/util/cli/shell/Shell.java: ASL 2.0 + src/main/java/org/codehaus/plexus/util/xml/pull/EntityReplacementMap.java: ASL 2.0 + + src/main/java/org/codehaus/plexus/util/cli/Commandline.java: BSD and ASL 2.0 + src/main/java/org/codehaus/plexus/util/cli/StreamConsumer.java: BSD and ASL 2.0 + src/main/java/org/codehaus/plexus/util/cli/StreamPumper.java: BSD and ASL 2.0 + + src/main/java/org/codehaus/plexus/util/CachedMap.java: Public Domain + src/main/java/org/codehaus/plexus/util/FastMap.java: Public Domain + src/main/java/org/codehaus/plexus/util/TypeFormat.java: Public Domain + + src/main/java/org/codehaus/plexus/util/xml/pull/MXParser.java: xpp + src/main/java/org/codehaus/plexus/util/xml/pull/MXSerializer.java: xpp + src/main/java/org/codehaus/plexus/util/xml/pull/XmlPullParser.java: xpp + src/main/java/org/codehaus/plexus/util/xml/pull/XmlPullParserException.java: xpp + src/main/java/org/codehaus/plexus/util/xml/pull/XmlSerializer.java: xpp + + src/main/java/org/codehaus/plexus/util/DirectoryScanner.java: ASL 1.1 + src/main/java/org/codehaus/plexus/util/ExceptionUtils.java: ASL 1.1 + src/main/java/org/codehaus/plexus/util/Expand.java: ASL 1.1 + src/main/java/org/codehaus/plexus/util/FileUtils.java: ASL 1.1 + src/main/java/org/codehaus/plexus/util/IOUtil.java: ASL 1.1 + src/main/java/org/codehaus/plexus/util/InterpolationFilterReader.java: ASL 1.1 + src/main/java/org/codehaus/plexus/util/Os.java: ASL 1.1 + src/main/java/org/codehaus/plexus/util/SelectorUtils.java: ASL 1.1 + src/main/java/org/codehaus/plexus/util/StringInputStream.java: ASL 1.1 + src/main/java/org/codehaus/plexus/util/StringUtils.java: ASL 1.1 +downstream/qdox: ASL 2.0 +downstream/servlet-api: ASL 2.0 and (EPL-2.0 or GPLv2 with exceptions) + complete breakdown: + api/src/main/java/javax/servlet/RequestDispatcher.java: ASL 2.0 + api/src/main/java/javax/servlet/annotation/HttpMethodConstraint.java: EPL-2.0 or GPLv2 with exceptions + api/src/main/java/javax/servlet/annotation/HttpConstraint.java: EPL-2.0 or GPLv2 with exceptions + api/src/main/java/javax/servlet/annotation/HandlesTypes.java: EPL-2.0 or GPLv2 with exceptions + api/src/main/java/javax/servlet/annotation/WebServlet.java: EPL-2.0 or GPLv2 with exceptions + api/src/main/java/javax/servlet/annotation/WebInitParam.java: EPL-2.0 or GPLv2 with exceptions + api/src/main/java/javax/servlet/annotation/WebListener.java: EPL-2.0 or GPLv2 with exceptions + api/src/main/java/javax/servlet/annotation/WebFilter.java: EPL-2.0 or GPLv2 with exceptions + api/src/main/java/javax/servlet/annotation/ServletSecurity.java: EPL-2.0 or GPLv2 with exceptions + api/src/main/java/javax/servlet/annotation/MultipartConfig.java: EPL-2.0 or GPLv2 with exceptions + api/src/main/java/javax/servlet/ServletRequestAttributeEvent.java: ASL 2.0 + api/src/main/java/javax/servlet/ServletConfig.java: ASL 2.0 + api/src/main/java/javax/servlet/WriteListener.java: EPL-2.0 or GPLv2 with exceptions + api/src/main/java/javax/servlet/ServletSecurityElement.java: EPL-2.0 or GPLv2 with exceptions + api/src/main/java/javax/servlet/ServletRegistration.java: EPL-2.0 or GPLv2 with exceptions + api/src/main/java/javax/servlet/HttpMethodConstraintElement.java: EPL-2.0 or GPLv2 with exceptions + api/src/main/java/javax/servlet/SessionTrackingMode.java: EPL-2.0 or GPLv2 with exceptions + api/src/main/java/javax/servlet/ServletContextEvent.java: ASL 2.0 + api/src/main/java/javax/servlet/SingleThreadModel.java: ASL 2.0 + api/src/main/java/javax/servlet/ServletRequestAttributeListener.java: ASL 2.0 + api/src/main/java/javax/servlet/SessionCookieConfig.java: EPL-2.0 or GPLv2 with exceptions + api/src/main/java/javax/servlet/GenericServlet.java: ASL 2.0 + api/src/main/java/javax/servlet/ServletInputStream.java: ASL 2.0 + api/src/main/java/javax/servlet/ServletContextAttributeEvent.java: ASL 2.0 + api/src/main/java/javax/servlet/Servlet.java: ASL 2.0 + api/src/main/java/javax/servlet/ServletContextListener.java: ASL 2.0 + api/src/main/java/javax/servlet/HttpConstraintElement.java: EPL-2.0 or GPLv2 with exceptions + api/src/main/java/javax/servlet/AsyncContext.java: EPL-2.0 or GPLv2 with exceptions + api/src/main/java/javax/servlet/ServletResponse.java: ASL 2.0 + api/src/main/java/javax/servlet/ServletResponseWrapper.java: ASL 2.0 + api/src/main/java/javax/servlet/Registration.java: EPL-2.0 or GPLv2 with exceptions + api/src/main/java/javax/servlet/DispatcherType.java: EPL-2.0 or GPLv2 with exceptions + api/src/main/java/javax/servlet/ServletContainerInitializer.java: EPL-2.0 or GPLv2 with exceptions + api/src/main/java/javax/servlet/ServletException.java: ASL 2.0 + api/src/main/java/javax/servlet/MultipartConfigElement.java: EPL-2.0 or GPLv2 with exceptions + api/src/main/java/javax/servlet/descriptor/TaglibDescriptor.java: EPL-2.0 or GPLv2 with exceptions + api/src/main/java/javax/servlet/descriptor/JspPropertyGroupDescriptor.java: EPL-2.0 or GPLv2 with exceptions + api/src/main/java/javax/servlet/descriptor/JspConfigDescriptor.java: EPL-2.0 or GPLv2 with exceptions + api/src/main/java/javax/servlet/ServletContextAttributeListener.java: ASL 2.0 + api/src/main/java/javax/servlet/GenericFilter.java: EPL-2.0 or GPLv2 with exceptions + api/src/main/java/javax/servlet/ServletRequest.java: ASL 2.0 + api/src/main/java/javax/servlet/Filter.java: ASL 2.0 + api/src/main/java/javax/servlet/http/HttpServlet.java: ASL 2.0 + api/src/main/java/javax/servlet/http/HttpSessionAttributeListener.java: ASL 2.0 + api/src/main/java/javax/servlet/http/HttpServletRequest.java: ASL 2.0 + api/src/main/java/javax/servlet/http/HttpUpgradeHandler.java: EPL-2.0 or GPLv2 with exceptions + api/src/main/java/javax/servlet/http/HttpSessionBindingEvent.java: ASL 2.0 + api/src/main/java/javax/servlet/http/HttpSessionListener.java: ASL 2.0 + api/src/main/java/javax/servlet/http/WebConnection.java: EPL-2.0 or GPLv2 with exceptions + api/src/main/java/javax/servlet/http/HttpSessionIdListener.java: EPL-2.0 or GPLv2 with exceptions + api/src/main/java/javax/servlet/http/HttpSessionBindingListener.java: ASL 2.0 + api/src/main/java/javax/servlet/http/HttpServletRequestWrapper.java: ASL 2.0 + api/src/main/java/javax/servlet/http/HttpSession.java: ASL 2.0 + api/src/main/java/javax/servlet/http/MappingMatch.java: EPL-2.0 or GPLv2 with exceptions + api/src/main/java/javax/servlet/http/HttpSessionContext.java: ASL 2.0 + api/src/main/java/javax/servlet/http/HttpFilter.java: EPL-2.0 or GPLv2 with exceptions + api/src/main/java/javax/servlet/http/HttpSessionEvent.java: ASL 2.0 + api/src/main/java/javax/servlet/http/HttpSessionActivationListener.java: ASL 2.0 + api/src/main/java/javax/servlet/http/HttpServletResponseWrapper.java: ASL 2.0 + api/src/main/java/javax/servlet/http/Part.java: EPL-2.0 or GPLv2 with exceptions + api/src/main/java/javax/servlet/http/PushBuilder.java: EPL-2.0 or GPLv2 with exceptions + api/src/main/java/javax/servlet/http/HttpUtils.java: ASL 2.0 + api/src/main/java/javax/servlet/http/HttpServletResponse.java: ASL 2.0 + api/src/main/java/javax/servlet/http/HttpServletMapping.java: EPL-2.0 or GPLv2 with exceptions + api/src/main/java/javax/servlet/http/Cookie.java: ASL 2.0 + api/src/main/java/javax/servlet/UnavailableException.java: ASL 2.0 + api/src/main/java/javax/servlet/FilterRegistration.java: EPL-2.0 or GPLv2 with exceptions + api/src/main/java/javax/servlet/ServletRequestEvent.java: ASL 2.0 + api/src/main/java/javax/servlet/FilterChain.java: ASL 2.0 + api/src/main/java/javax/servlet/AsyncEvent.java: EPL-2.0 or GPLv2 with exceptions + api/src/main/java/javax/servlet/ServletContext.java: ASL 2.0 + api/src/main/java/javax/servlet/ServletOutputStream.java: ASL 2.0 + api/src/main/java/javax/servlet/ServletRequestWrapper.java: ASL 2.0 + api/src/main/java/javax/servlet/ServletRequestListener.java: ASL 2.0 + api/src/main/java/javax/servlet/FilterConfig.java: ASL 2.0 + api/src/main/java/javax/servlet/ReadListener.java: EPL-2.0 or GPLv2 with exceptions + api/src/main/java/javax/servlet/AsyncListener.java: EPL-2.0 or GPLv2 with exceptions +downstream/sisu-build-api: ASL 2.0 +downstream/sisu-inject: EPL-1.0 and BSD + org.eclipse.sisu.inject/src/org/eclipse/sisu/space/asm/*: BSD + everything else: EPL-1.0 +downstream/sisu-mojos: EPL-1.0 +downstream/sisu-plexus: EPL-1.0 +downstream/slf4j: MIT +downstream/testng: ASL 2.0 +downstream/univocity-parsers: ASL 2.0 +downstream/velocity-engine: ASL 2.0 +downstream/xbean: ASL 2.0 +downstream/xmlunit: ASL 2.0 +downstream/xmvn: ASL 2.0 +downstream/xz-java: Public Domain +mbi: ASL 2.0 diff --git a/plexus-compiler-LICENSE-MIT b/plexus-compiler-LICENSE-MIT new file mode 100644 index 0000000..3fe7307 --- /dev/null +++ b/plexus-compiler-LICENSE-MIT @@ -0,0 +1,24 @@ +/** + * The MIT License + * + * Copyright (c) 2004, The Codehaus + * Copyright (c) 2005, The Codehaus + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies + * of the Software, and to permit persons to whom the Software is furnished to do + * so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ diff --git a/plexus-containers-LICENSE-MIT b/plexus-containers-LICENSE-MIT new file mode 100644 index 0000000..e5002f8 --- /dev/null +++ b/plexus-containers-LICENSE-MIT @@ -0,0 +1,25 @@ +/* + * The MIT License + * + * Copyright (c) 2004, The Codehaus + * Copyright (c) 2006, The Codehaus + * Copyright (c) 2007, The Codehaus + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies + * of the Software, and to permit persons to whom the Software is furnished to do + * so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ diff --git a/plexus-interpolation-LICENSE-MIT b/plexus-interpolation-LICENSE-MIT new file mode 100644 index 0000000..bee70c5 --- /dev/null +++ b/plexus-interpolation-LICENSE-MIT @@ -0,0 +1,23 @@ +/* + * The MIT License + * + * Copyright (c) 2004, The Codehaus + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies + * of the Software, and to permit persons to whom the Software is furnished to do + * so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ diff --git a/plexus-resources-LICENSE-MIT b/plexus-resources-LICENSE-MIT new file mode 100644 index 0000000..bee70c5 --- /dev/null +++ b/plexus-resources-LICENSE-MIT @@ -0,0 +1,23 @@ +/* + * The MIT License + * + * Copyright (c) 2004, The Codehaus + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies + * of the Software, and to permit persons to whom the Software is furnished to do + * so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ diff --git a/sources b/sources index 5c42367..75089d6 100644 --- a/sources +++ b/sources @@ -1,9 +1,4 @@ SHA512 (javapackages-bootstrap-1.0.0.tar.xz) = fccc4c83b1c698e5047cf5baaef3c527ba3a5f483cc569b000e76ae234b166730123813d54d50ba44b898a36b265314dbcf29e87abe05d5cbd75f5d907c28b88 -SHA512 (javapackages-bootstrap-PACKAGE-LICENSING) = eb0f118119f6559cd3379bdb131faa652ca8cc7ce8c07d798882af9cd6207110b30fbff951241d755e366330bbf6213a9e4a0f63e47c5d86f080bdb0f192a3ec -SHA512 (plexus-compiler-LICENSE-MIT) = fc8b3ef27d68a96ee34e5b6431d72de54d62f38c18301417d5f11d969b46c9010e44bd4e52cb3eda47eb2ec682e18e2f3e7d8c0136ee996a9de9beca7034fb6c -SHA512 (plexus-containers-LICENSE-MIT) = a8ac75a8e5f00a0bda94733cc6c5dd1497ae1a717157e5e0c7106c60806a2bbdc69c5b05c44a134a525b0ff7d50116b1c0ffb2b542e4681e16bd390e4dcab83b -SHA512 (plexus-interpolation-LICENSE-MIT) = 7cfc63f792766b5328d0adf20db77d2d5cf4cce278114055b3e7672dc595b7024aaed5772f8857571f42915d4aee771a5e77e76cb2276303579c649720736c8a -SHA512 (plexus-resources-LICENSE-MIT) = 7cfc63f792766b5328d0adf20db77d2d5cf4cce278114055b3e7672dc595b7024aaed5772f8857571f42915d4aee771a5e77e76cb2276303579c649720736c8a SHA512 (ant.tar.xz) = d514610ca6be05efdeabebaeecaa515790bfa65b83c85de557686fa42135e7510440f04aa1890143255ca8e937d39b3e5b4c2ade7059224227c1982f7f87f9bc SHA512 (apache-pom.tar.xz) = add7ac6b664307f36c55950597876216c2e0fc9193ea2c00214c22d38d4c249fdea639f36618e49a66193da8f076bd6a76bc5136e3f4ef5b3bc28b779a9f5004 SHA512 (apiguardian.tar.xz) = c037c0afd3bb869585a99871c610bdc231ca66cf890199136bc822a67e0ddf252cf757d8ee04e56645117e75c816172e4e58efca39b3825c71e4b26a1d753fab From 863fe191fe24bb5d17d2011b637a35576a836ee3 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 30 Nov 2020 18:31:25 +0100 Subject: [PATCH 04/77] Don't run OSGi dependency generators on private (bundled) JARs --- javapackages-bootstrap.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/javapackages-bootstrap.spec b/javapackages-bootstrap.spec index c89181c..13d346b 100644 --- a/javapackages-bootstrap.spec +++ b/javapackages-bootstrap.spec @@ -2,6 +2,10 @@ # owned by any package %global __requires_exclude ^/usr/lib/jvm/java +# Don't run OSGi dependency generators on private (bundled) JARs +%global __requires_exclude_from \\.jar$ +%global __provides_exclude_from \\.jar$ + Name: javapackages-bootstrap Version: 1.0.0 Release: 1%{?dist} From 41096ec232f31f6d956099429c46b341ffabfb68 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 30 Nov 2020 18:32:17 +0100 Subject: [PATCH 05/77] BR javapackages-generators instead of full javapackages-local --- javapackages-bootstrap.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/javapackages-bootstrap.spec b/javapackages-bootstrap.spec index 13d346b..5511f79 100644 --- a/javapackages-bootstrap.spec +++ b/javapackages-bootstrap.spec @@ -254,7 +254,7 @@ Provides: bundled(xz-java) = 1.8 BuildRequires: byaccj BuildRequires: java-11-openjdk-devel BuildRequires: java-1.8.0-openjdk-devel -BuildRequires: javapackages-local +BuildRequires: javapackages-generators Requires: bash Requires: coreutils From e7bc6a2ebc53800ec1c9f3b468ba2af990cc43e4 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 30 Nov 2020 18:32:45 +0100 Subject: [PATCH 06/77] Drop needless requires --- javapackages-bootstrap.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/javapackages-bootstrap.spec b/javapackages-bootstrap.spec index 5511f79..e1e3df7 100644 --- a/javapackages-bootstrap.spec +++ b/javapackages-bootstrap.spec @@ -259,8 +259,6 @@ BuildRequires: javapackages-generators Requires: bash Requires: coreutils Requires: java-11-openjdk-devel -Requires: java-headless -Requires: javapackages-filesystem Requires: procps-ng %description From 57030343bac8c2ba89a59e02e5fbb2a415fe1668 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 30 Nov 2020 18:43:43 +0100 Subject: [PATCH 07/77] Make package layout more easily configurable --- javapackages-bootstrap.spec | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/javapackages-bootstrap.spec b/javapackages-bootstrap.spec index e1e3df7..dc0e79a 100644 --- a/javapackages-bootstrap.spec +++ b/javapackages-bootstrap.spec @@ -6,6 +6,11 @@ %global __requires_exclude_from \\.jar$ %global __provides_exclude_from \\.jar$ +%global mavenHomePath %{_datadir}/%{name} +%global metadataPath %{mavenHomePath}/maven-metadata +%global artifactsPath %{_javadir} +%global launchersPath %{mavenHomePath}/bin + Name: javapackages-bootstrap Version: 1.0.0 Release: 1%{?dist} @@ -312,25 +317,26 @@ export LC_ALL=C.utf8 %install ./mbi.j dist \ + -basePackageName=%{name} \ -installRoot=%{buildroot} \ - -mavenHomePath=%{_datadir}/%{name} \ - -metadataPath=%{_datadir}/%{name}/maven-metadata \ - -artifactsPath=%{_javadir}/%{name} \ - -launchersPath=%{_datadir}/%{name}/bin \ + -mavenHomePath=%{mavenHomePath} \ + -metadataPath=%{metadataPath} \ + -artifactsPath=%{artifactsPath} \ + -launchersPath=%{launchersPath} \ # fix permissions for f in mvn mvnDebug mvnyjp do - chmod +x "%{buildroot}%{_datadir}/%{name}/bin/${f}" + chmod +x "%{buildroot}%{mavenHomePath}/bin/${f}" done for f in ant cup jflex xmvn-install xmvn-resolve xmvn-subst do - chmod g-w "%{buildroot}%{_datadir}/%{name}/bin/${f}" + chmod g-w "%{buildroot}%{launchersPath}/${f}" done # remove zero-size files -find %{buildroot}%{_javadir}/%{name} -type f -size 0 -delete +find %{buildroot}%{artifactsPath} -type f -size 0 -delete # install license files license_directory="%{buildroot}%{_licensedir}/%{name}" @@ -401,8 +407,10 @@ install_license xbean NOTICE install_license xmvn NOTICE %files -%{_datadir}/%{name} -%{_javadir}/%{name}/* +%{mavenHomePath} +%{metadataPath}/* +%{artifactsPath}/* +%{launchersPath}/* %license %{_licensedir}/%{name} %doc README.md From 0f036edc1c5a694b78987aac51fa8fc2f798a067 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 30 Nov 2020 18:44:51 +0100 Subject: [PATCH 08/77] Apply module-specific customizations --- javapackages-bootstrap.spec | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/javapackages-bootstrap.spec b/javapackages-bootstrap.spec index dc0e79a..d142219 100644 --- a/javapackages-bootstrap.spec +++ b/javapackages-bootstrap.spec @@ -6,10 +6,17 @@ %global __requires_exclude_from \\.jar$ %global __provides_exclude_from \\.jar$ +%if 0%{?_module_build} +%global mavenHomePath %{_datadir}/xmvn +%global metadataPath %{_datadir}/maven-metadata +%global artifactsPath %{_javadir} +%global launchersPath %{_bindir} +%else %global mavenHomePath %{_datadir}/%{name} %global metadataPath %{mavenHomePath}/maven-metadata %global artifactsPath %{_javadir} %global launchersPath %{mavenHomePath}/bin +%endif Name: javapackages-bootstrap Version: 1.0.0 @@ -266,6 +273,13 @@ Requires: coreutils Requires: java-11-openjdk-devel Requires: procps-ng +%if 0%{?_module_build} +Provides: ant +Provides: ant-junit +Provides: java_cup +Provides: jflex +%endif + %description In a nutshell, Java Packages Bootstrap (JPB) is a standalone build of all Java software packages that are required for Java Packages Tools (JPT) to work. @@ -406,6 +420,11 @@ install_license velocity-engine NOTICE install_license xbean NOTICE install_license xmvn NOTICE +# Use toolchains.xml provided by javapackages-tools +%if 0%{?_module_build} +rm %{buildroot}%{_datadir}/xmvn/conf/toolchains.xml +%endif + %files %{mavenHomePath} %{metadataPath}/* From 3cd63ca3f6ae23362f13a2d7c27c6d51a5708b7c Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 3 Dec 2020 13:59:28 +0100 Subject: [PATCH 09/77] Update to upstream version 1.1.0 --- javapackages-bootstrap.spec | 98 +++----------------------------- plexus-compiler-LICENSE-MIT | 24 -------- plexus-containers-LICENSE-MIT | 25 -------- plexus-interpolation-LICENSE-MIT | 23 -------- plexus-resources-LICENSE-MIT | 23 -------- 5 files changed, 7 insertions(+), 186 deletions(-) delete mode 100644 plexus-compiler-LICENSE-MIT delete mode 100644 plexus-containers-LICENSE-MIT delete mode 100644 plexus-interpolation-LICENSE-MIT delete mode 100644 plexus-resources-LICENSE-MIT diff --git a/javapackages-bootstrap.spec b/javapackages-bootstrap.spec index d142219..7016c95 100644 --- a/javapackages-bootstrap.spec +++ b/javapackages-bootstrap.spec @@ -19,7 +19,7 @@ %endif Name: javapackages-bootstrap -Version: 1.0.0 +Version: 1.1.0 Release: 1%{?dist} Summary: A means of bootstrapping Java Packages Tools # For detailed info see the file javapackages-bootstrap-PACKAGE-LICENSING @@ -32,12 +32,6 @@ Source0: https://github.com/fedora-java/javapackages-bootstrap/releases/d # License breakdown Source1: javapackages-bootstrap-PACKAGE-LICENSING -# Extracted custom license files -Source2: plexus-compiler-LICENSE-MIT -Source3: plexus-containers-LICENSE-MIT -Source4: plexus-interpolation-LICENSE-MIT -Source5: plexus-resources-LICENSE-MIT - # To obtain the following sources: # git clone https://github.com/fedora-java/javapackages-bootstrap.git # pushd javapackages-bootstrap-${version} @@ -300,12 +294,9 @@ XMvn, allowing JPT to be used before one builds XMvn package. %prep %setup -q -mkdir licenses -cp -p %(echo %{sources} | cut -d' ' -f2-6) licenses - # leave out the first source as it has already been extracted -# leave out license files -other_sources=$(echo %{sources} | cut -d' ' -f7-) +# leave out licensing breakdown file +other_sources=$(echo %{sources} | cut -d' ' -f3-) for source in ${other_sources} do @@ -322,9 +313,6 @@ do popd done -# This file would otherwise be installed along with the executables -rm downstream/maven/apache-maven/src/bin/.gitattributes - %build export LC_ALL=C.utf8 ./mbi.j build -parallel @@ -337,6 +325,7 @@ export LC_ALL=C.utf8 -metadataPath=%{metadataPath} \ -artifactsPath=%{artifactsPath} \ -launchersPath=%{launchersPath} \ + -licensesPath=%{_licensedir}/%{name} \ # fix permissions for f in mvn mvnDebug mvnyjp @@ -344,82 +333,6 @@ do chmod +x "%{buildroot}%{mavenHomePath}/bin/${f}" done -for f in ant cup jflex xmvn-install xmvn-resolve xmvn-subst -do - chmod g-w "%{buildroot}%{launchersPath}/${f}" -done - -# remove zero-size files -find %{buildroot}%{artifactsPath} -type f -size 0 -delete - -# install license files -license_directory="%{buildroot}%{_licensedir}/%{name}" - -install -d -m 755 "${license_directory}" - -## install license breakdown and extracted custom licenses -for license_file in licenses/* -do - install -p -m 644 "${license_file}" "${license_directory}/$(basename ${license_file})" -done - -## install downstream licenses -install -p -m 644 LICENSE "${license_directory}/LICENSE" -install -p -m 644 NOTICE "${license_directory}/NOTICE" - -function install_license() -{ - install -p -m 644 "downstream/${1}/${2}" "${license_directory}/${1}-${2}" -} - -install_license ant NOTICE -install_license bnd LICENSE -install_license build-helper-maven-plugin LICENSE.txt -install_license byte-buddy NOTICE -install_license cglib NOTICE -install_license common-annotations-api LICENSE.md -install_license common-annotations-api NOTICE.md -install_license commons-beanutils NOTICE.txt -install_license commons-cli NOTICE.txt -install_license commons-codec NOTICE.txt -install_license commons-collections NOTICE.txt -install_license commons-compress NOTICE.txt -install_license commons-io NOTICE.txt -install_license commons-jxpath NOTICE.txt -install_license commons-lang NOTICE.txt -install_license commons-logging NOTICE.txt -install_license commons-parent-pom NOTICE.txt -install_license cup licence.txt -install_license felix-parent-pom NOTICE -install_license felix-utils NOTICE -install_license fusesource-pom notice.txt -install_license httpcomponents-client NOTICE.txt -install_license httpcomponents-core NOTICE.txt -install_license httpcomponents-parent-pom NOTICE.txt -install_license injection-api NOTICE.md -install_license jcommander notice.md -install_license jsoup LICENSE -install_license junit4 LICENSE-junit.txt -install_license junit5 LICENSE.md -install_license maven-bundle-plugin NOTICE -install_license maven-enforcer NOTICE -install_license maven NOTICE -install_license mockito LICENSE -install_license modello LICENSE.txt -install_license munge-maven-plugin LICENSE -install_license plexus-cipher NOTICE.txt -install_license plexus-io NOTICE.txt -install_license plexus-utils NOTICE.txt -install_license servlet-api LICENSE.md -install_license servlet-api NOTICE.md -install_license sisu-inject LICENSE.txt -install_license sisu-mojos LICENSE.txt -install_license sisu-plexus LICENSE.txt -install_license slf4j LICENSE.txt -install_license velocity-engine NOTICE -install_license xbean NOTICE -install_license xmvn NOTICE - # Use toolchains.xml provided by javapackages-tools %if 0%{?_module_build} rm %{buildroot}%{_datadir}/xmvn/conf/toolchains.xml @@ -436,5 +349,8 @@ rm %{buildroot}%{_datadir}/xmvn/conf/toolchains.xml %doc AUTHORS %changelog +* Thu Dec 3 2020 Mikolaj Izdebski - 1.1.0-1 +- Update to upstream version 1.1.0 + * Wed Nov 25 2020 Marian Koncek - 1.0.0-1 - Initial commit diff --git a/plexus-compiler-LICENSE-MIT b/plexus-compiler-LICENSE-MIT deleted file mode 100644 index 3fe7307..0000000 --- a/plexus-compiler-LICENSE-MIT +++ /dev/null @@ -1,24 +0,0 @@ -/** - * The MIT License - * - * Copyright (c) 2004, The Codehaus - * Copyright (c) 2005, The Codehaus - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies - * of the Software, and to permit persons to whom the Software is furnished to do - * so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ diff --git a/plexus-containers-LICENSE-MIT b/plexus-containers-LICENSE-MIT deleted file mode 100644 index e5002f8..0000000 --- a/plexus-containers-LICENSE-MIT +++ /dev/null @@ -1,25 +0,0 @@ -/* - * The MIT License - * - * Copyright (c) 2004, The Codehaus - * Copyright (c) 2006, The Codehaus - * Copyright (c) 2007, The Codehaus - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies - * of the Software, and to permit persons to whom the Software is furnished to do - * so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ diff --git a/plexus-interpolation-LICENSE-MIT b/plexus-interpolation-LICENSE-MIT deleted file mode 100644 index bee70c5..0000000 --- a/plexus-interpolation-LICENSE-MIT +++ /dev/null @@ -1,23 +0,0 @@ -/* - * The MIT License - * - * Copyright (c) 2004, The Codehaus - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies - * of the Software, and to permit persons to whom the Software is furnished to do - * so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ diff --git a/plexus-resources-LICENSE-MIT b/plexus-resources-LICENSE-MIT deleted file mode 100644 index bee70c5..0000000 --- a/plexus-resources-LICENSE-MIT +++ /dev/null @@ -1,23 +0,0 @@ -/* - * The MIT License - * - * Copyright (c) 2004, The Codehaus - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies - * of the Software, and to permit persons to whom the Software is furnished to do - * so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ From bb6d03df8d8dd7d867099720c4a508acf014c8a0 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Thu, 3 Dec 2020 15:08:33 +0100 Subject: [PATCH 10/77] Add a simple %check --- javapackages-bootstrap.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/javapackages-bootstrap.spec b/javapackages-bootstrap.spec index 7016c95..c8213d6 100644 --- a/javapackages-bootstrap.spec +++ b/javapackages-bootstrap.spec @@ -338,6 +338,9 @@ done rm %{buildroot}%{_datadir}/xmvn/conf/toolchains.xml %endif +%check +%{buildroot}%{launchersPath}/xmvn --version + %files %{mavenHomePath} %{metadataPath}/* From e10cf9c2c8e99b24e576cc24f44087f579e571f7 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 3 Dec 2020 15:14:18 +0100 Subject: [PATCH 11/77] Upload sources --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 4e4da7e..6f74e56 100644 --- a/.gitignore +++ b/.gitignore @@ -107,3 +107,4 @@ /xmlunit.tar.xz /xmvn.tar.xz /xz-java.tar.xz +/javapackages-bootstrap-1.1.0.tar.xz diff --git a/sources b/sources index 75089d6..ec60a87 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -SHA512 (javapackages-bootstrap-1.0.0.tar.xz) = fccc4c83b1c698e5047cf5baaef3c527ba3a5f483cc569b000e76ae234b166730123813d54d50ba44b898a36b265314dbcf29e87abe05d5cbd75f5d907c28b88 +SHA512 (javapackages-bootstrap-1.1.0.tar.xz) = ba317687ba0bbadcd170d58bc9db2ea4fb5dc99ac718db8188ea9656f0ce23ef3ece21e973fa500c339554bcfc250aed72f6ec527e533b84efed02715847c401 SHA512 (ant.tar.xz) = d514610ca6be05efdeabebaeecaa515790bfa65b83c85de557686fa42135e7510440f04aa1890143255ca8e937d39b3e5b4c2ade7059224227c1982f7f87f9bc SHA512 (apache-pom.tar.xz) = add7ac6b664307f36c55950597876216c2e0fc9193ea2c00214c22d38d4c249fdea639f36618e49a66193da8f076bd6a76bc5136e3f4ef5b3bc28b779a9f5004 SHA512 (apiguardian.tar.xz) = c037c0afd3bb869585a99871c610bdc231ca66cf890199136bc822a67e0ddf252cf757d8ee04e56645117e75c816172e4e58efca39b3825c71e4b26a1d753fab From 4a90fe24d1a8754ae44973ebaaaff3cdc8751b8d Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Thu, 3 Dec 2020 15:34:45 +0100 Subject: [PATCH 12/77] Update instructions to obtain sources --- javapackages-bootstrap.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/javapackages-bootstrap.spec b/javapackages-bootstrap.spec index c8213d6..c85735c 100644 --- a/javapackages-bootstrap.spec +++ b/javapackages-bootstrap.spec @@ -33,8 +33,8 @@ Source0: https://github.com/fedora-java/javapackages-bootstrap/releases/d Source1: javapackages-bootstrap-PACKAGE-LICENSING # To obtain the following sources: -# git clone https://github.com/fedora-java/javapackages-bootstrap.git -# pushd javapackages-bootstrap-${version} +# tar -xf ${name}-${version}.tar.xz +# pushd ${name}-${version} # ./downstream.sh clone # ./downstream.sh prep # ./downstream.sh archive From 25d803822c8b0452ffd0bc55392b13e27d20d809 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 15 Dec 2020 16:42:54 +0100 Subject: [PATCH 13/77] Remove BR on java-1.8.0-openjdk-devel --- javapackages-bootstrap.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/javapackages-bootstrap.spec b/javapackages-bootstrap.spec index c85735c..60eaafa 100644 --- a/javapackages-bootstrap.spec +++ b/javapackages-bootstrap.spec @@ -259,7 +259,6 @@ Provides: bundled(xz-java) = 1.8 BuildRequires: byaccj BuildRequires: java-11-openjdk-devel -BuildRequires: java-1.8.0-openjdk-devel BuildRequires: javapackages-generators Requires: bash From e0989c750c16a6f624170d5a98d6ef63b1470135 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 16 Dec 2020 12:18:39 +0100 Subject: [PATCH 14/77] Update to upstream version 1.2.0 --- .gitignore | 1 + 0002-Bind-to-OpenJDK-11-for-runtime.patch | 35 +++++++++++++++++++++++ javapackages-bootstrap.spec | 13 +++++++-- sources | 2 +- 4 files changed, 47 insertions(+), 4 deletions(-) create mode 100644 0002-Bind-to-OpenJDK-11-for-runtime.patch diff --git a/.gitignore b/.gitignore index 6f74e56..c127809 100644 --- a/.gitignore +++ b/.gitignore @@ -108,3 +108,4 @@ /xmvn.tar.xz /xz-java.tar.xz /javapackages-bootstrap-1.1.0.tar.xz +/javapackages-bootstrap-1.2.0.tar.xz diff --git a/0002-Bind-to-OpenJDK-11-for-runtime.patch b/0002-Bind-to-OpenJDK-11-for-runtime.patch new file mode 100644 index 0000000..11367d8 --- /dev/null +++ b/0002-Bind-to-OpenJDK-11-for-runtime.patch @@ -0,0 +1,35 @@ +From ad65f62443f23076dfc520d3f0589282da9530fa Mon Sep 17 00:00:00 2001 +From: Mikolaj Izdebski +Date: Wed, 8 Jul 2020 09:04:57 +0200 +Subject: [PATCH 2/2] Bind to OpenJDK 11 for runtime + +--- + apache-maven/src/bin/mvn | 12 +----------- + 1 file changed, 1 insertion(+), 11 deletions(-) + +diff --git a/apache-maven/src/bin/mvn b/apache-maven/src/bin/mvn +index a554c6617..23b9dd902 100755 +--- a/downstream/maven/apache-maven/src/bin/mvn ++++ b/downstream/maven/apache-maven/src/bin/mvn +@@ -27,17 +27,7 @@ + # MAVEN_SKIP_RC (Optional) Flag to disable loading of mavenrc files. + # ----------------------------------------------------------------------------- + +-if [ -z "$MAVEN_SKIP_RC" ] ; then +- +- if [ -f /etc/mavenrc ] ; then +- . /etc/mavenrc +- fi +- +- if [ -f "$HOME/.mavenrc" ] ; then +- . "$HOME/.mavenrc" +- fi +- +-fi ++export JAVA_HOME=/usr/lib/jvm/java-11-openjdk + + # OS specific support. $var _must_ be set to either true or false. + cygwin=false; +-- +2.25.4 + diff --git a/javapackages-bootstrap.spec b/javapackages-bootstrap.spec index 60eaafa..9e9c161 100644 --- a/javapackages-bootstrap.spec +++ b/javapackages-bootstrap.spec @@ -19,7 +19,7 @@ %endif Name: javapackages-bootstrap -Version: 1.1.0 +Version: 1.2.0 Release: 1%{?dist} Summary: A means of bootstrapping Java Packages Tools # For detailed info see the file javapackages-bootstrap-PACKAGE-LICENSING @@ -148,6 +148,8 @@ Source1106: xmlunit.tar.xz Source1107: xmvn.tar.xz Source1108: xz-java.tar.xz +Patch0: 0002-Bind-to-OpenJDK-11-for-runtime.patch + Provides: bundled(ant) = 1.10.9 Provides: bundled(apache-parent) = 23 Provides: bundled(apiguardian) = 1.1.0 @@ -302,6 +304,8 @@ do tar -xf "${source}" done +%patch0 -p1 + for patch_path in patches/*/* do package_name="$(echo ${patch_path} | cut -f2 -d/)" @@ -314,10 +318,10 @@ done %build export LC_ALL=C.utf8 -./mbi.j build -parallel +JAVA_HOME=%{java_home} ./mbi.sh build -parallel %install -./mbi.j dist \ +JAVA_HOME=%{java_home} ./mbi.sh dist \ -basePackageName=%{name} \ -installRoot=%{buildroot} \ -mavenHomePath=%{mavenHomePath} \ @@ -351,6 +355,9 @@ rm %{buildroot}%{_datadir}/xmvn/conf/toolchains.xml %doc AUTHORS %changelog +* Wed Dec 16 2020 Mikolaj Izdebski - 1.2.0-1 +- Update to upstream version 1.2.0 + * Thu Dec 3 2020 Mikolaj Izdebski - 1.1.0-1 - Update to upstream version 1.1.0 diff --git a/sources b/sources index ec60a87..4d0f60e 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -SHA512 (javapackages-bootstrap-1.1.0.tar.xz) = ba317687ba0bbadcd170d58bc9db2ea4fb5dc99ac718db8188ea9656f0ce23ef3ece21e973fa500c339554bcfc250aed72f6ec527e533b84efed02715847c401 +SHA512 (javapackages-bootstrap-1.2.0.tar.xz) = e26a730552535ac823fcdbd93c100d44623057d1c9b700ec217903b08d3ad6541d2bc9e3c7bfcc8474117637e0c7de13f0c7200e75ca10c3c18fa340749f002c SHA512 (ant.tar.xz) = d514610ca6be05efdeabebaeecaa515790bfa65b83c85de557686fa42135e7510440f04aa1890143255ca8e937d39b3e5b4c2ade7059224227c1982f7f87f9bc SHA512 (apache-pom.tar.xz) = add7ac6b664307f36c55950597876216c2e0fc9193ea2c00214c22d38d4c249fdea639f36618e49a66193da8f076bd6a76bc5136e3f4ef5b3bc28b779a9f5004 SHA512 (apiguardian.tar.xz) = c037c0afd3bb869585a99871c610bdc231ca66cf890199136bc822a67e0ddf252cf757d8ee04e56645117e75c816172e4e58efca39b3825c71e4b26a1d753fab From fbf043f36587d300bd716b6dadc230474bd7f914 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 14:45:09 +0000 Subject: [PATCH 15/77] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- javapackages-bootstrap.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/javapackages-bootstrap.spec b/javapackages-bootstrap.spec index 9e9c161..de556f2 100644 --- a/javapackages-bootstrap.spec +++ b/javapackages-bootstrap.spec @@ -20,7 +20,7 @@ Name: javapackages-bootstrap Version: 1.2.0 -Release: 1%{?dist} +Release: 2%{?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 @@ -355,6 +355,9 @@ rm %{buildroot}%{_datadir}/xmvn/conf/toolchains.xml %doc AUTHORS %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 1.2.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Wed Dec 16 2020 Mikolaj Izdebski - 1.2.0-1 - Update to upstream version 1.2.0 From 3f045994daf7db1848bf1fef4e9010ab6278e7ae Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Mon, 8 Feb 2021 12:53:40 +0100 Subject: [PATCH 16/77] Update to upstream version 1.3.0 --- .gitignore | 1 + ... 0001-Bind-to-OpenJDK-11-for-runtime.patch | 0 javapackages-bootstrap.spec | 47 ++++++++++--------- sources | 42 ++++++++--------- 4 files changed, 47 insertions(+), 43 deletions(-) rename 0002-Bind-to-OpenJDK-11-for-runtime.patch => 0001-Bind-to-OpenJDK-11-for-runtime.patch (100%) diff --git a/.gitignore b/.gitignore index c127809..f9c1e07 100644 --- a/.gitignore +++ b/.gitignore @@ -109,3 +109,4 @@ /xz-java.tar.xz /javapackages-bootstrap-1.1.0.tar.xz /javapackages-bootstrap-1.2.0.tar.xz +/javapackages-bootstrap-1.3.0.tar.xz diff --git a/0002-Bind-to-OpenJDK-11-for-runtime.patch b/0001-Bind-to-OpenJDK-11-for-runtime.patch similarity index 100% rename from 0002-Bind-to-OpenJDK-11-for-runtime.patch rename to 0001-Bind-to-OpenJDK-11-for-runtime.patch diff --git a/javapackages-bootstrap.spec b/javapackages-bootstrap.spec index 9e9c161..aa87ebc 100644 --- a/javapackages-bootstrap.spec +++ b/javapackages-bootstrap.spec @@ -19,7 +19,7 @@ %endif Name: javapackages-bootstrap -Version: 1.2.0 +Version: 1.3.0 Release: 1%{?dist} Summary: A means of bootstrapping Java Packages Tools # For detailed info see the file javapackages-bootstrap-PACKAGE-LICENSING @@ -148,16 +148,16 @@ Source1106: xmlunit.tar.xz Source1107: xmvn.tar.xz Source1108: xz-java.tar.xz -Patch0: 0002-Bind-to-OpenJDK-11-for-runtime.patch +Patch0: 0001-Bind-to-OpenJDK-11-for-runtime.patch Provides: bundled(ant) = 1.10.9 Provides: bundled(apache-parent) = 23 -Provides: bundled(apiguardian) = 1.1.0 +Provides: bundled(apiguardian) = 1.1.1 Provides: bundled(objectweb-asm) = 9.0 -Provides: bundled(assertj-core) = 3.17.2 -Provides: bundled(aqute-bnd) = 5.1.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.16 +Provides: bundled(byte-buddy) = 1.10.20 Provides: bundled(cdi-api) = 2.0.2 Provides: bundled(cglib) = 3.3.0 Provides: bundled(jakarta-annotations) = 1.3.5 @@ -174,9 +174,9 @@ Provides: bundled(apache-commons-parent) = 52 Provides: bundled(java_cup) = 0.11b Provides: bundled(easymock) = 4.2 Provides: bundled(felix-parent) = 7 -Provides: bundled(felix-utils) = 1.11.4 +Provides: bundled(felix-utils) = 1.11.6 Provides: bundled(fusesource-pom) = 1.12 -Provides: bundled(guava) = 29.0 +Provides: bundled(guava) = 30.1 Provides: bundled(google-guice) = 4.2.3 Provides: bundled(hamcrest) = 2.2 Provides: bundled(httpcomponents-client) = 4.5.11 @@ -190,11 +190,11 @@ Provides: bundled(jdom2) = 2.0.6 Provides: bundled(jflex) = 1.7.0 Provides: bundled(jsoup) = 1.13.1 Provides: bundled(jsr-305) = 3.0.2 -Provides: bundled(junit) = 4.13 +Provides: bundled(junit) = 4.13.1 Provides: bundled(junit5) = 5.7.0 Provides: bundled(maven-antrun-plugin) = 3.0.0 -Provides: bundled(maven-archiver) = 3.5.0 -Provides: bundled(maven-artifact-transfer) = 0.12.0 +Provides: bundled(maven-archiver) = 3.5.1 +Provides: bundled(maven-artifact-transfer) = 0.13.1 Provides: bundled(maven-assembly-plugin) = 3.3.0 Provides: bundled(maven-plugin-bundle) = 5.1.1 Provides: bundled(maven-common-artifact-filters) = 3.1.0 @@ -210,7 +210,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.4.2 +Provides: bundled(maven-resolver) = 1.6.1 Provides: bundled(maven-resources-plugin) = 3.2.0 Provides: bundled(maven-resources) = 1.4 Provides: bundled(maven-shared-incremental) = 1.1 @@ -219,17 +219,17 @@ Provides: bundled(maven-shared-utils) = 3.3.3 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.1 +Provides: bundled(maven-wagon) = 3.4.2 Provides: bundled(maven) = 3.6.3 -Provides: bundled(mockito) = 3.5.13 +Provides: bundled(mockito) = 3.7.13 Provides: bundled(modello) = 1.11 -Provides: bundled(mojo-parent) = 50 +Provides: bundled(mojo-parent) = 60 Provides: bundled(munge-maven-plugin) = 1.0 Provides: bundled(objenesis) = 3.1 Provides: bundled(opentest4j) = 1.2.0 -Provides: bundled(osgi-annotation) = 7.0.0 +Provides: bundled(osgi-annotation) = 8.0.0 Provides: bundled(osgi-compendium) = 7.0.0 -Provides: bundled(osgi-core) = 7.0.0 +Provides: bundled(osgi-core) = 8.0.0 Provides: bundled(sonatype-oss-parent) = 7 Provides: bundled(plexus-archiver) = 4.2.2 Provides: bundled(plexus-cipher) = 1.7 @@ -239,8 +239,8 @@ Provides: bundled(plexus-components-pom) = 6.4 Provides: bundled(plexus-containers) = 2.1.0 Provides: bundled(plexus-interpolation) = 1.26 Provides: bundled(plexus-io) = 3.2.0 -Provides: bundled(plexus-languages) = 1.0.5 -Provides: bundled(plexus-pom) = 6.4 +Provides: bundled(plexus-languages) = 1.0.6 +Provides: bundled(plexus-pom) = 7 Provides: bundled(plexus-resources) = 1.1.0 Provides: bundled(plexus-sec-dispatcher) = 1.4 Provides: bundled(plexus-utils) = 3.3.0 @@ -252,10 +252,10 @@ Provides: bundled(sisu-mojos) = 0.3.4 Provides: bundled(sisu-plexus) = 0.3.4 Provides: bundled(slf4j) = 1.7.30 Provides: bundled(testng) = 7.3.0 -Provides: bundled(univocity-parsers) = 2.9.0 +Provides: bundled(univocity-parsers) = 2.9.1 Provides: bundled(velocity) = 1.7 -Provides: bundled(xbean) = 4.14 -Provides: bundled(xmlunit) = 2.7.0 +Provides: bundled(xbean) = 4.18 +Provides: bundled(xmlunit) = 2.8.2 Provides: bundled(xmvn) = 4.0.0~SNAPSHOT Provides: bundled(xz-java) = 1.8 @@ -355,6 +355,9 @@ rm %{buildroot}%{_datadir}/xmvn/conf/toolchains.xml %doc AUTHORS %changelog +* Mon Feb 08 2021 Marian Koncek - 1.3.0-1 +- Update to upstream version 1.3.0 + * Wed Dec 16 2020 Mikolaj Izdebski - 1.2.0-1 - Update to upstream version 1.2.0 diff --git a/sources b/sources index 4d0f60e..d57e42b 100644 --- a/sources +++ b/sources @@ -1,12 +1,12 @@ -SHA512 (javapackages-bootstrap-1.2.0.tar.xz) = e26a730552535ac823fcdbd93c100d44623057d1c9b700ec217903b08d3ad6541d2bc9e3c7bfcc8474117637e0c7de13f0c7200e75ca10c3c18fa340749f002c +SHA512 (javapackages-bootstrap-1.3.0.tar.xz) = c1c3d510edc01ac340d1c97af6c66cda8d0be502adedf3b0f7de2441c27b97e55ff832ab270be3a27184d76e7fa6d38450a2e9415a3394c2cb5e724bed3424a2 SHA512 (ant.tar.xz) = d514610ca6be05efdeabebaeecaa515790bfa65b83c85de557686fa42135e7510440f04aa1890143255ca8e937d39b3e5b4c2ade7059224227c1982f7f87f9bc SHA512 (apache-pom.tar.xz) = add7ac6b664307f36c55950597876216c2e0fc9193ea2c00214c22d38d4c249fdea639f36618e49a66193da8f076bd6a76bc5136e3f4ef5b3bc28b779a9f5004 -SHA512 (apiguardian.tar.xz) = c037c0afd3bb869585a99871c610bdc231ca66cf890199136bc822a67e0ddf252cf757d8ee04e56645117e75c816172e4e58efca39b3825c71e4b26a1d753fab +SHA512 (apiguardian.tar.xz) = 0a14ac34efcacc47736239059e33f9d30b7d8be1d692135b9f2ef785bfbdae1012e255d395fdb19c9b89b2d83a1ec7c015c9183b53ab33732814e357e76179ab SHA512 (asm.tar.xz) = 0963a638f147c30f12de78afa27f7cb05ff15ad84a12a8f6dd22964c8acf59301451ea5af969d67b7c8167c2195cfd01d15a7d42c6f1fc32c1726be35ccf0453 -SHA512 (assertj-core.tar.xz) = 76afff13cd817c77ae35d6cb4d37600f373e71647554d6fdd8313f25d6a738aaa33b053dabc2047f364ea56b9a054f89eed6f6156b3fcb06112accf6258e9cbe -SHA512 (bnd.tar.xz) = 4e83f6fda5d6dd6edeb4d94f0a788737f8f99fba1c9e8c455b1700b9ae5823392630323efc98c4dc9c4b025867978fd27bce2ebbefa9f6949af9a0d5ebfa6630 +SHA512 (assertj-core.tar.xz) = b8936be4f79845af8d9321dd2e41a35f7d716138f8cb3b34cd5932fb0479187f32a893c0a81074c2ff3fd010af31cc2bd743c5fdc2f1459a11ef33c87dc8f5d6 +SHA512 (bnd.tar.xz) = 4caaea5c02d302d052b753c7a4b4fc9f725239be1ba1824b9871b30842b32e7794a7580648a6bbcc7f6d2a8ff61fb8bd2293f90626a19453b55f5854f095caee SHA512 (build-helper-maven-plugin.tar.xz) = a10176b562e2d7edbe109aec397e4ae1cdca1b3d27494644b483c874d08731478413eb0f3a4308aa2279d2883fba072fbd1b8a8f428447044a18195a46942219 -SHA512 (byte-buddy.tar.xz) = 9e264947b24953a46c29c569e4999e4802ef08525f0016f83596b86cbbe9daa6fb802c2365293d3664334bd053f41f29f1b83286b949c7f10904478f781cd79f +SHA512 (byte-buddy.tar.xz) = a76b6bb9cfae056bb9dc470f284f1703ba116e90e2137f8f53b571aea335e639f386255bd78f874b6f5f2993c9a530b0c23ef40a20c1b222dbb1019146d3b0c4 SHA512 (cdi.tar.xz) = 95b9c229ab2106de9133a9cea45f56bc85c2b32d348af0b56386ea782764a5cad1330aa9c8f68a92c0cad9a932a50fadd1a6f6f173a0497ccb267f7cad5f7b29 SHA512 (cglib.tar.xz) = 6641fdbcac9f68bf5fcd97a102e18fc62491894155b8d26fb3d6ee393d12c5165890f4c1346b4b1d1736fdeea2f489aefad2a4b82000b16ef5c6f71fa5e720d0 SHA512 (common-annotations-api.tar.xz) = 7f135480c6b8b9b3fc9472f570f4b82df773d9971814558f2742eed1f5ef5747daa95cfe88765edc72ba1d68c743e780733b115130ac93bdc8394f4824a42ed4 @@ -23,9 +23,9 @@ SHA512 (commons-parent-pom.tar.xz) = 15c4dc847f446358a80a0c08042c78a4329b322cbf6 SHA512 (cup.tar.xz) = 2520269875b67d92898e94e313712b9c21f302eed7c5589a93890818e375e0cb748a83dbca2c175260dff0d59fead4ce12cb80728186562dffd830d5fc8ec19a SHA512 (easymock.tar.xz) = cf219a1e07425021fcddc4fba3dabb0b99cae62f9960f3904cff5d9d045ae84d6c7dbeda872f94b1f8788e00eb6cb2ba99a7332178b7b78b4e782764faa32775 SHA512 (felix-parent-pom.tar.xz) = 25a8795f628f165e52a475252441457e3aed9efec3532a96ed8f061df1f22d8e0f08900e20ec7cd85322ff5112b39303fe9a1f5b6390eb5401fc475aff7fbc6f -SHA512 (felix-utils.tar.xz) = a2199ced40f9cc87bccf4f1e02566c2c360b3adfa1f44252b3facf7b046280f85ab9d57f27b0eb15bf8687c6857ec1a98dccb326ead2d73c26bf16c9782feaa5 +SHA512 (felix-utils.tar.xz) = c75667cd76cd201ab09d8efae7ec5e52fe849e7e4376bdbb7b0ad79db311fdb1ec6fe69c0927b1b911daa60eb9b43ac15bd44e840f91a5da061c4dbe31361384 SHA512 (fusesource-pom.tar.xz) = 79868d1ade2ed501ff6857dc4a547f8c0e9d9e1423908e16c308f44cf26d4e677faa6632e77dd6c8e6e6ce1377c2dc967fd244e16b56b22a9b786fbb50f67df9 -SHA512 (guava.tar.xz) = e9e521153d75752f25095bc2c66a7b98c53e06c6721c86003e42d3bbfa22db46bb98ef29e67c832edfe145e0b6abc6ef5cd7d5bc768dc3024ccf39b9264f80e6 +SHA512 (guava.tar.xz) = d91e610900925e8159d0db11c5322b74e249e85a35aaeec6962d4eb06cb926fa3c717519ed87ecf11aaa22c46ef2db3aadf0b325382ac040753fd3bebcccb4c2 SHA512 (guice.tar.xz) = 233b8361107bfbd5cf13757ca864833d863968a39b5e30482d50f32626b903f4ae5d9d63e02cad17777f4050793c54a9091603bbf1dc670a84e88c5130ed943a SHA512 (hamcrest.tar.xz) = 9ab6d70ab5611b6fc52bf31afad93e76394d9341dace0361128bb22f77b974b62fa581926aa768850f2b24e758c7307f1f56e4dfa85ceeac83447ac7c9eada36 SHA512 (httpcomponents-client.tar.xz) = ba2f8cab32104aadf5a77ed3e1e16798b05471695eca9efe22b1a0fccf839540610ad55c65a5c3b948983e905b178eb7527da5e309d7a21f0c57bdead8150f26 @@ -39,11 +39,11 @@ SHA512 (jdom.tar.xz) = ced2c0c810be0b39b788259c649a2035d88710de5c5ae7a71daa62c7c SHA512 (jflex.tar.xz) = ef9ee7dd44b8fbf9a40e9e3f7169ce9bd14d8d724a8f3ca3ac0a6d00d0d8093bf8ebd047c99338613e3eb5d6942bba3d1c1ef36e113660ae41207f69d25af042 SHA512 (jsoup.tar.xz) = da78d6698f9edc8ad3f2585f1c3581a16af65610cf4e4a2df6581dfa6a6917aab64ee85a8d706028b199f6f87f0dcc6227f9b6b312fdf50776827200971037c8 SHA512 (jsr-305.tar.xz) = 58843b9aa8cc959af6203ee73191ec8d8b1b8a3ab17e23c25bd6ad977c26cbeaeb3ff87ffbfb89e28dafd7406ff4eeb67a904caded9ff7246e917cc10017932e -SHA512 (junit4.tar.xz) = d151567d91efaa79b6a167d497881f60760e5397a970766bb234ed28ac2a62903e157aa5d6ff9f06f11af224b020ed6f1c334a4119c3a19ed54dfc68c9a625b0 +SHA512 (junit4.tar.xz) = 05b76424587e3cf8847698e9cb65244baf3f68abaaef33a9d0a6d71eeecdb239a53846c377d74f708e4516fb3bda856fa68b9871d489286471ff12b5494dbf8c SHA512 (junit5.tar.xz) = a97a08baea4b2810dcac689b77f6fc0522f7241e27cbd0454181b4c591676a08c5f8428b2ed38e46202074a7016c684085732c8d045f55a2c4c342ddec69195a SHA512 (maven-antrun-plugin.tar.xz) = c06c14dc0bd3dd1cbdba4a6168ac7a7b678d77d136bec615316e025548f13a6311c829cd79de5436ff268a44a956aea479a9b1af935e46ee97e693031fcb9000 -SHA512 (maven-archiver.tar.xz) = b18419367d2061ac0af9c6306d490eb197d444ba9761c65ae9599aef6064ecf942025c4eed69285cd1c34bfe31aec01a32610713a090b48693900e6c90f42b1a -SHA512 (maven-artifact-transfer.tar.xz) = 3348eda1c4030deb69f86d29ebb533e14ddf13bb55654bf50c5ce421a6397e7d050722967cc832804ec98919a8edbfa5968d8125fe26330ee1ee218e7c53aa5a +SHA512 (maven-archiver.tar.xz) = 5372fc35dcb0487c8b0fd8c846dc30c6cda7233bf93d347d4317da8b322dbd5fe35968de7bef5ed33c07857571ba4ee84715fe613d57ce8db1338318a9ce5afc +SHA512 (maven-artifact-transfer.tar.xz) = e8b59a4352e2d047090bfb2d48117380dab12cbeffc7a1e96f23262f26877b7d582e92d1805672f40e53d8b39ca8fbb6ba5824dc49875d26310ae98b33b6c0c8 SHA512 (maven-assembly-plugin.tar.xz) = 3d4d5b90c780301b7fd2c7c0cb1f87d1bbf6747f00b08075584e9995bb87f18a9434c7c62aa73f4a34648609bd101b2f535148e19c5f2f8dab493995882fdbf9 SHA512 (maven-bundle-plugin.tar.xz) = 203999f023e09789c304a080d390ebbf7def09babbf8e99684c1d668f3ee6071b56c0f5f17359c9ff6646ce6f1507353d408e8d17f55f29723474533abe14f56 SHA512 (maven-common-artifact-filters.tar.xz) = 21dfc5641ad0bb72c01014283e7071192a2b26b075da54a2fe38b67118a5b00846d57de7ad89455779ba3cb3a29a533642498a1e2aa9cb77768e164b52e630bb @@ -59,7 +59,7 @@ SHA512 (maven-parent-pom.tar.xz) = dbed2a2f9f54c7e123124ef5479d71ee0a93b3139a082 SHA512 (maven-plugin-testing.tar.xz) = c343fdc258b5884e801d74926767ba84c7dd1769d8215bf05c7dee955f3327cf216cffd39be4b96224523e4c16430edec81b934ab1543b328fd28f461360a2eb SHA512 (maven-plugin-tools.tar.xz) = f084a81115c66f5be4c031cf23a522aaf5955cb0167155d998c71340591298e6744f932134b425b63acefc9af7a140484d2d99b263b0b702e091da392a88a7ae SHA512 (maven-remote-resources-plugin.tar.xz) = 4c54f1a75c4dec4c48961f7c1ded4bb219dc10b246346a267a44b7e4a178b2cb23c25e81a41bd041975ed9ca37cdc0120b1e1da0fef86e56bb3a8415b26a9c39 -SHA512 (maven-resolver.tar.xz) = 167fef0ccbf6ef739b2b7be9ca91f55cf9583f6058143cabcfa395001f1263e5c3fbd87ec08ed4a832cbc2bc2dc741c7759859e0f6f4270650f7f4266d8a77ff +SHA512 (maven-resolver.tar.xz) = b7549e87f6ff0c707edd0d9dad7dd3e48587d00867b0aa32c02ddb0966b897ed8521f3f33148307092b6559fa8e75213529360839f78ae145ffde5cd85725372 SHA512 (maven-resources-plugin.tar.xz) = f28fe60efe7c619201fba582327048e4bfe49b7ad8e55bf684c5c5e4ff12d23c92e3e02cbc0bd6ba977920c9a891ff6b27666b1f4a9ce0c5b03aeeedb7bf1843 SHA512 (maven-resources.tar.xz) = 9be130f3b9e098635e5f62acabd60d4ae66b1658b18ed8630aecec8ac7fc9e5c19e04894e79b5a11e656c1261d5b270beb9f71080b404a0db8927853cfdfa8aa SHA512 (maven-shared-incremental.tar.xz) = 50f7cbcc3496fcf4b834bfeeac770d610deb8b35a60bdf3cd5d18eac0615bd1853377a83dc1bc1744c3b3e4d66df8cea722f3b7be626c855053c337deb0d1118 @@ -69,16 +69,16 @@ SHA512 (maven-source-plugin.tar.xz) = da94c4fbc819fb04a7ba6efd9fceac194837bf6cf7 SHA512 (maven-surefire.tar.xz) = 136d6ff35242e11ae293f21e9e42d2ab0b6ec379e64324a82ec5d0b8ae43072b68557f87c5f02227064899a638560c67e82ae4a5a7a1313eb8d198a60603c26b SHA512 (maven.tar.xz) = d1392683175146e1328e97e24ba03eeda8d77f5b59695259971bbbc5d2c427954d6e06127b0445b8cbb3c156d0cf751d68668f62936256442e376cdc2b0e0725 SHA512 (maven-verifier.tar.xz) = 54deb814e5d254ec50c20c76f59f164ed7063a85b5828bf9fd4a727e4a4f936ae3d07a5854b016bc491e6730550eca5dd694c873cdbdc84f9b867f6daf4bcd14 -SHA512 (maven-wagon.tar.xz) = d51b293ff3e92af40f2e330f0f3cc320760926b2d5bf40906afa0989b15042692f4bd4675944aab38bb3f77f38404c0b1075d1d7b8548c073999419442acd3ef -SHA512 (mockito.tar.xz) = 06490cc44bc41c9168c1748c7a53b3cb8b54d84dcf487388e1a7d1c33be09a0ef39586ca0fae503a5fec133480d48f85ba5e3cfe4d5629b0357aa26557b1fef9 +SHA512 (maven-wagon.tar.xz) = 4fef09c0e98c3dca894b62f3f1751d27aca4d392ca730d6b4effc702b68100eaacdf18574a3c7fb495c2c4a66c5408c1dc8ccb802ac7908b3375fd946a10ee33 +SHA512 (mockito.tar.xz) = 3737689c08b6cc43b2422fdc6dd2e0fc3c7fc21a65fe7cc96f7f70466f086972b7436434d047e16d7e692eabf06183feef4b911a5bf327a8565a8972e4c823d6 SHA512 (modello.tar.xz) = 93d92ea186d830bcc388b459d3b28a2612ffe5de5ad9d28acc20441d0ee07951ade832fd8e68616314e9b8ec66db1db2713839b20350c4833ed9beecc7ab58fb -SHA512 (mojo-parent-pom.tar.xz) = e5be5393f3f27bcf89b2f3d83efa21e7cefedd1379f419ee886c381bf8650d6fa596fc2a946201fae3e99ea914136ba0e35024d007ff46c5f36c9ca5571a7a30 +SHA512 (mojo-parent-pom.tar.xz) = bcce1eb9c3a1c225a52f63b400b1dc1d3dc52650eb058fef0ec54f849862800d31e40929a20dd012839b4d4ac37cc6b49876b2244795a27b3a024fda9cb35ac5 SHA512 (munge-maven-plugin.tar.xz) = 573c010ca107cdf32440d5dfa95a1ca400da7fd3d56f8355fd99257fb4ec83d2818638c06f06ba8f0ea882a3515fc64931c6342e4ec167488b11555023a5e7ed SHA512 (objenesis.tar.xz) = 99a3b9da3baec726aeb643a72494617d5234d31e063e0e81c0716a3e0a7d9b773b591f215ea82f3dc6d781d4294e60143794409073739caf07917b14b231015c SHA512 (opentest4j.tar.xz) = f28358721018eb98959427553300e2bba4cf592016c7e83f25c907236caab0e77c537cbe1fd9685edae3e125bf0feb87560ccc991d37e381d377c1d48197c2a4 -SHA512 (osgi-annotation.tar.xz) = 2f2990d6b29f930699fefc4c01c2fbeadc69c7b469c566b79cc561120d1f672fd95c78f4bd518128082d0f5c80bc0d589b5167b8b56f204dfacf60f9ae5f47f7 +SHA512 (osgi-annotation.tar.xz) = 8c1d02688941727a6d550f678a8c85db656b30a10bc32eb0b7b28b0f9cf17a7d9b3f64d62c6f5e3176a86ef6eb915a92a6aff71034e17b9617ae02c47b4990d7 SHA512 (osgi-cmpn.tar.xz) = 1c3ee095a8b89e8a553d3e0f2a0b8cabdec203aa0810829b64bae885de701541ce11185b02bb5d09c5965fa66390b534997ed0440008a46bd09e3673f72f6ecd -SHA512 (osgi-core.tar.xz) = 6b4ee1d3e495dd14bade260d43a960836a591fea0c285e36904b1b6c8f785432e198f2d460e5aa4281020e6d1f09d2ff95457c6fcd176f8f113e6ed3fc4dcc19 +SHA512 (osgi-core.tar.xz) = b1e9c98a38cb7d6ea0bd495a9f5c28168fbec9474e782144ac42e0ce5b615d757345f319bfc2d40a3c04a1e460fbe2c7a9cf22920fd49990429838041962dac2 SHA512 (oss-parent-pom.tar.xz) = 11e88e748e13a48262f34de209169e60da5f8c9f548b80212a80ae767d7f5d3aeac7d03d420d78da14e9e64a299904411c54d59a0361c4290c696c52efe350d4 SHA512 (plexus-archiver.tar.xz) = 67b79e1c99e1e78fceaf887d3e68f158833c01b43b98a5546165d3d29674ac7510ea3cbb12d63e21c00efeaae76bdf8059a0fb9cd284b7062377c1d9ac2341e8 SHA512 (plexus-cipher.tar.xz) = 4080ff531e2d75ed114670861f7ccc80348588a0aa133e17811e3f0ba6a8af44ed749df8d10f41f58790e3309859eff9e995945a5f9356d86c9b46c254ab449e @@ -88,8 +88,8 @@ SHA512 (plexus-components-pom.tar.xz) = d7386aeb60591b6facc7d99d9910b1623ebb8de6 SHA512 (plexus-containers.tar.xz) = 7e7a34374e66cf1f4540c4246260e0d65088f87eef79583f3ada3b49d317395d7f6420d2baf4ea6cc37c5ba2ee7cde1490b1ab61074423de1f01a4054069f85b SHA512 (plexus-interpolation.tar.xz) = 5f93f9e88aef39753d3901785421367253948449044990d1d974b99f2ae110a52d314a13264766312a9597ef2f8f40240e7773f51daf5d8d162848d95c37bd8c SHA512 (plexus-io.tar.xz) = e2bd3152749001a9133f2d2184b5559a2bdcc8991d00ee6cabfd8998fde8446ac05c48aca0e427cac06e6589afb466034d26300b5ccede74259ad6b37c382595 -SHA512 (plexus-languages.tar.xz) = 6346800073ca39f24acafac1a42e3aa1fb6ee5f6a9cf3ad3ca0cab8fe59003a244ca478a77cb2cc097f1912efb7fa94966585b62b9f6c225fdb424e596d75655 -SHA512 (plexus-pom.tar.xz) = 10a015077d1589db071e1b8fd4cee3199d4cc17381f74621a202a8a5ab03dd6af594d2d9136ae5f0c8b15db4f3605188ce82518caf685e0631b2ea1e3bf8c8ad +SHA512 (plexus-languages.tar.xz) = 3bf471f223684a6e1cddb55e7448972d55dc48a7d4f7c36466e1505ca61bc8822b82b3d3aebefaad29d3be4cbe3bf55cb42c79eeb271fb5e656d9b7a0996ef3c +SHA512 (plexus-pom.tar.xz) = b10d906162c61563d87894ae42ab3f38b2ae3b56c5a131697cd51b80e7848b6d2222e2977cc30140fb9bd79282b57bcbb73016ed72e79d6517715036ec7e5db2 SHA512 (plexus-resources.tar.xz) = 8b7c55468661311b1faf1eee83d0c491986cfbe5aed38b9298362b82bb384cd583ea476b337dd6393c492c16f70192cd9a763d53920df64210ce9c22f4be635b SHA512 (plexus-sec-dispatcher.tar.xz) = 4fa97396d72f6f7c43160c1f303bd4e5ada5bef4b912a7fdf75f5721e466c420c4415e0031d58fa060493ea2a1c1ee39800250d6f13a8b1fb19b10e729413764 SHA512 (plexus-utils.tar.xz) = ccf1d201f1d8682cab36764b9a8ce946a26013980d9df3087dbe8d8136bf7b9191029be6836108506ca9dc662e92cd8809835b7ff1c23c6ca2ab4901d67f8c93 @@ -101,9 +101,9 @@ SHA512 (sisu-mojos.tar.xz) = 32a31bd01af618f04fdfc1f3e5aa850d4ac8f3f2b6ed4e1ad2f SHA512 (sisu-plexus.tar.xz) = 736896a5bb6230338341ebca1cbbc4d258faf5affac88d178252eed6173dada281299ecac9df03f133c3199eac7230c7a37d3f1902c6a164453b120015030c7b SHA512 (slf4j.tar.xz) = 5071068364c08e65058f367fed61b8298e2e19aff6fcced4fb6cd170d7a71b4e24c25e7192745bb3759c35078fff37f7c196a758dc3faee11e696a43db3d553f SHA512 (testng.tar.xz) = 3377c6a6f40740b0def5eca5b89e522d1a41e6e7c41cbb944baa524b838b203a6458a6dfa234f38b23e45a7de1e6a16ecf288f3d1271812700dc2d82303c63fd -SHA512 (univocity-parsers.tar.xz) = db5d154a34d56c5aa1269bf04174f86a45eacb12976904ab4a7c55db03d8e7b7d7f5e2ab913e6674165728f3e7ed34e34b84079b9761c1699e76b0314c2437cc +SHA512 (univocity-parsers.tar.xz) = 8438aa3cca3895c74473419f075e824e73bc7752e7fa6b6f33fa5be38a09af60d3485bef031486281b6f91e9b6129381dc742e71b35cf127dc33084a4fc18b3b SHA512 (velocity-engine.tar.xz) = 81f647534f4361fc8e7065282b1182b4f0c5009ef5b63a85c2c4668e2d0281689970df06f3f7566f77140e157dea674ecd2a120d48d75ab9c7de1cb35a2b7992 -SHA512 (xbean.tar.xz) = 2401d47384ba5ef36ab8f4fd634ab298c39aeecaeb89ce1fe92b3c7c1224bd73eca817038dc5cbaa558f8dea178d2c75193e6ca5037c36db8da25fbcf22bd514 -SHA512 (xmlunit.tar.xz) = 6a95939eeb0d45496bc8612fe41a424d9a5cc7092e7895833f30dd4b152102d469c66515faee91924c6d44d3a67b9234349fccf11e2ae74dd54d3536e3f7c6b9 +SHA512 (xbean.tar.xz) = 43c7ff1ad83c4b74990bb7e9b7d8f03f655ac15bb06f4833c1fb2dfabbfe7de61d664d4e5a6f7f34bb43f05d3641dd99ac46c3b25e7c568a67b7774fceba9d21 +SHA512 (xmlunit.tar.xz) = 1b91bd589b5bfc595533ee140c29b4da02bb59b17720a9b8e029d0110669f947137fcbdee75e04aea9bd91952719fbd8303d98f679ab8a2296d79ceecb327500 SHA512 (xmvn.tar.xz) = 9c4ed80f866c2010db6f8c827f1cacff6d34585b8dc01e857a8677eaa86f41586ce16b0b69b7938b9433740affdf822a78ce68d031cabf0926db805833e685da SHA512 (xz-java.tar.xz) = 287335c084b80a1fc7510f1dc8d1cc17a815f6ae40f70cca1b08112fe8ba48181a9da3c0bc9328adcece74b677fef1659461ce03082e87a01b8d753fc3ffe680 From e03ae40d1c905822397f839b9494d082241ad7b4 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 18 Mar 2021 16:47:41 +0100 Subject: [PATCH 17/77] Update to upstream version 1.4.0 --- .gitignore | 1 + javapackages-bootstrap.spec | 5 ++++- sources | 6 +++--- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index f9c1e07..8305b1f 100644 --- a/.gitignore +++ b/.gitignore @@ -110,3 +110,4 @@ /javapackages-bootstrap-1.1.0.tar.xz /javapackages-bootstrap-1.2.0.tar.xz /javapackages-bootstrap-1.3.0.tar.xz +/javapackages-bootstrap-1.4.0.tar.xz diff --git a/javapackages-bootstrap.spec b/javapackages-bootstrap.spec index aa87ebc..1fdab13 100644 --- a/javapackages-bootstrap.spec +++ b/javapackages-bootstrap.spec @@ -19,7 +19,7 @@ %endif Name: javapackages-bootstrap -Version: 1.3.0 +Version: 1.4.0 Release: 1%{?dist} Summary: A means of bootstrapping Java Packages Tools # For detailed info see the file javapackages-bootstrap-PACKAGE-LICENSING @@ -355,6 +355,9 @@ rm %{buildroot}%{_datadir}/xmvn/conf/toolchains.xml %doc AUTHORS %changelog +* Thu Mar 18 2021 Mikolaj Izdebski - 1.4.0-1 +- Update to upstream version 1.4.0 + * Mon Feb 08 2021 Marian Koncek - 1.3.0-1 - Update to upstream version 1.3.0 diff --git a/sources b/sources index d57e42b..60b7d75 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -SHA512 (javapackages-bootstrap-1.3.0.tar.xz) = c1c3d510edc01ac340d1c97af6c66cda8d0be502adedf3b0f7de2441c27b97e55ff832ab270be3a27184d76e7fa6d38450a2e9415a3394c2cb5e724bed3424a2 +SHA512 (javapackages-bootstrap-1.4.0.tar.xz) = 1ac6569499a5534bbbbb948d96be2886edd75e0b9c5ad61c3eb6b036f561c43644905a0a666a37fc82a29b42a4b7f8cc1db6499427cf409a68c5cfa28f4f5b42 SHA512 (ant.tar.xz) = d514610ca6be05efdeabebaeecaa515790bfa65b83c85de557686fa42135e7510440f04aa1890143255ca8e937d39b3e5b4c2ade7059224227c1982f7f87f9bc SHA512 (apache-pom.tar.xz) = add7ac6b664307f36c55950597876216c2e0fc9193ea2c00214c22d38d4c249fdea639f36618e49a66193da8f076bd6a76bc5136e3f4ef5b3bc28b779a9f5004 SHA512 (apiguardian.tar.xz) = 0a14ac34efcacc47736239059e33f9d30b7d8be1d692135b9f2ef785bfbdae1012e255d395fdb19c9b89b2d83a1ec7c015c9183b53ab33732814e357e76179ab @@ -17,7 +17,7 @@ SHA512 (commons-collections.tar.xz) = 4101d7590734932f08cf5a51d2c28a4e1b7d4a61b0 SHA512 (commons-compress.tar.xz) = 2ddd542560f6547bc742aff869f6619dbbf8ce2143dca34087e9ed0bca903614e74a0b7c2ea219957822776c2e5f36121604eadb214850574cecc2482b71ddae SHA512 (commons-io.tar.xz) = 1703930014c68e870d865ff94c4ba3c103b2e4487e87635fc6ded00daa2b17731f34923ac4b1617cf77c28aab2a7473725da1df803d6c97a58b4288ba301d8c4 SHA512 (commons-jxpath.tar.xz) = 1bbc91d1755a115044aa631f042d05e192050feebd29f515e6fd8216e01b1c2654961c353c6f515b7e02d7022bd7c45ed85a5c5e232c8c89f9f0892081f2f27c -SHA512 (commons-lang.tar.xz) = a17b17c4703fbdc48265829974f356985f8dbfe570473cc76d00d760ae1bb339637c1d40b5cbab7e218e0c2fa2fb8b42c0c5cb9b94d4bd26b8c9029e000b5911 +SHA512 (commons-lang.tar.xz) = 3d17f7013ec545faea8e6aa3809bd460efd6ce9d9908cd1d4a07c0062cfb66cf3ef345100d81222fc6bec49f5dd7203ef290cd572a13851a7e8c34aec828f394 SHA512 (commons-logging.tar.xz) = d406a137a6375f01b399d82d868694d28a2c3613f8afafe54aa0c29fa83f730ee6c460ad93c83e97ca0e6b883216e37ad4fad226d1a2616bab9e154e5f3c4d0a SHA512 (commons-parent-pom.tar.xz) = 15c4dc847f446358a80a0c08042c78a4329b322cbf6420c42d66fa63aa5c7965e3351fa8221bf45e5b49e934e6a9c2453e92cc7cd7781d501a3124f7f2a46dfe SHA512 (cup.tar.xz) = 2520269875b67d92898e94e313712b9c21f302eed7c5589a93890818e375e0cb748a83dbca2c175260dff0d59fead4ce12cb80728186562dffd830d5fc8ec19a @@ -40,7 +40,7 @@ SHA512 (jflex.tar.xz) = ef9ee7dd44b8fbf9a40e9e3f7169ce9bd14d8d724a8f3ca3ac0a6d00 SHA512 (jsoup.tar.xz) = da78d6698f9edc8ad3f2585f1c3581a16af65610cf4e4a2df6581dfa6a6917aab64ee85a8d706028b199f6f87f0dcc6227f9b6b312fdf50776827200971037c8 SHA512 (jsr-305.tar.xz) = 58843b9aa8cc959af6203ee73191ec8d8b1b8a3ab17e23c25bd6ad977c26cbeaeb3ff87ffbfb89e28dafd7406ff4eeb67a904caded9ff7246e917cc10017932e SHA512 (junit4.tar.xz) = 05b76424587e3cf8847698e9cb65244baf3f68abaaef33a9d0a6d71eeecdb239a53846c377d74f708e4516fb3bda856fa68b9871d489286471ff12b5494dbf8c -SHA512 (junit5.tar.xz) = a97a08baea4b2810dcac689b77f6fc0522f7241e27cbd0454181b4c591676a08c5f8428b2ed38e46202074a7016c684085732c8d045f55a2c4c342ddec69195a +SHA512 (junit5.tar.xz) = b5015485d56ad32dc66f4947438e6abb95d3d80a008d021fa46d7556c53069df40ec5fc1b7ad6ee9a2dd22ec6ca8b5ff942cbd9581ddeab30069e93a71e77826 SHA512 (maven-antrun-plugin.tar.xz) = c06c14dc0bd3dd1cbdba4a6168ac7a7b678d77d136bec615316e025548f13a6311c829cd79de5436ff268a44a956aea479a9b1af935e46ee97e693031fcb9000 SHA512 (maven-archiver.tar.xz) = 5372fc35dcb0487c8b0fd8c846dc30c6cda7233bf93d347d4317da8b322dbd5fe35968de7bef5ed33c07857571ba4ee84715fe613d57ce8db1338318a9ce5afc SHA512 (maven-artifact-transfer.tar.xz) = e8b59a4352e2d047090bfb2d48117380dab12cbeffc7a1e96f23262f26877b7d582e92d1805672f40e53d8b39ca8fbb6ba5824dc49875d26310ae98b33b6c0c8 From d8aea44ff42666b86c99c01eaecd5c9076ef8990 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Sat, 10 Apr 2021 17:39:38 +0200 Subject: [PATCH 18/77] New package layout for modular builds --- javapackages-bootstrap.spec | 24 ++++++------------------ 1 file changed, 6 insertions(+), 18 deletions(-) diff --git a/javapackages-bootstrap.spec b/javapackages-bootstrap.spec index 1fdab13..d7e0783 100644 --- a/javapackages-bootstrap.spec +++ b/javapackages-bootstrap.spec @@ -6,17 +6,10 @@ %global __requires_exclude_from \\.jar$ %global __provides_exclude_from \\.jar$ -%if 0%{?_module_build} -%global mavenHomePath %{_datadir}/xmvn -%global metadataPath %{_datadir}/maven-metadata -%global artifactsPath %{_javadir} -%global launchersPath %{_bindir} -%else %global mavenHomePath %{_datadir}/%{name} %global metadataPath %{mavenHomePath}/maven-metadata %global artifactsPath %{_javadir} -%global launchersPath %{mavenHomePath}/bin -%endif +%global launchersPath %{_libexecdir}/%{name} Name: javapackages-bootstrap Version: 1.4.0 @@ -268,13 +261,6 @@ Requires: coreutils Requires: java-11-openjdk-devel Requires: procps-ng -%if 0%{?_module_build} -Provides: ant -Provides: ant-junit -Provides: java_cup -Provides: jflex -%endif - %description In a nutshell, Java Packages Bootstrap (JPB) is a standalone build of all Java software packages that are required for Java Packages Tools (JPT) to work. @@ -337,9 +323,10 @@ do done # Use toolchains.xml provided by javapackages-tools -%if 0%{?_module_build} -rm %{buildroot}%{_datadir}/xmvn/conf/toolchains.xml -%endif +ln -sf %{_datadir}/xmvn/conf/toolchains.xml %{buildroot}%{mavenHomePath}/conf/toolchains.xml + +install -d -m 755 %{buildroot}%{_rpmmacrodir} +echo '%%jpb_env PATH=/usr/libexec/javapackages-bootstrap:$PATH' >%{buildroot}%{_rpmmacrodir}/macros.%{name} %check %{buildroot}%{launchersPath}/xmvn --version @@ -349,6 +336,7 @@ rm %{buildroot}%{_datadir}/xmvn/conf/toolchains.xml %{metadataPath}/* %{artifactsPath}/* %{launchersPath}/* +%{_rpmmacrodir} %license %{_licensedir}/%{name} %doc README.md From 9f5b12e9429a59c4891d29ef9f6e2388909e1057 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 22 Jul 2021 08:59:33 +0000 Subject: [PATCH 19/77] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- javapackages-bootstrap.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/javapackages-bootstrap.spec b/javapackages-bootstrap.spec index 97afbbf..8bcb8a4 100644 --- a/javapackages-bootstrap.spec +++ b/javapackages-bootstrap.spec @@ -13,7 +13,7 @@ Name: javapackages-bootstrap Version: 1.4.0 -Release: 1%{?dist} +Release: 2%{?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 @@ -343,6 +343,9 @@ echo '%%jpb_env PATH=/usr/libexec/javapackages-bootstrap:$PATH' >%{buildroot}%{_ %doc AUTHORS %changelog +* Thu Jul 22 2021 Fedora Release Engineering - 1.4.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Thu Mar 18 2021 Mikolaj Izdebski - 1.4.0-1 - Update to upstream version 1.4.0 From aaa1d3517c59b031ec68aa5cf55e418b7138a7f2 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 28 Jun 2021 15:33:58 +0200 Subject: [PATCH 20/77] Update to upstream version 1.5.0 --- .gitignore | 1 + javapackages-bootstrap.spec | 7 +++++-- sources | 8 ++++---- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 8305b1f..acfebe9 100644 --- a/.gitignore +++ b/.gitignore @@ -111,3 +111,4 @@ /javapackages-bootstrap-1.2.0.tar.xz /javapackages-bootstrap-1.3.0.tar.xz /javapackages-bootstrap-1.4.0.tar.xz +/javapackages-bootstrap-1.5.0.tar.xz diff --git a/javapackages-bootstrap.spec b/javapackages-bootstrap.spec index 8bcb8a4..45b5710 100644 --- a/javapackages-bootstrap.spec +++ b/javapackages-bootstrap.spec @@ -12,8 +12,8 @@ %global launchersPath %{_libexecdir}/%{name} Name: javapackages-bootstrap -Version: 1.4.0 -Release: 2%{?dist} +Version: 1.5.0 +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 @@ -343,6 +343,9 @@ echo '%%jpb_env PATH=/usr/libexec/javapackages-bootstrap:$PATH' >%{buildroot}%{_ %doc AUTHORS %changelog +* Mon Jul 26 2021 Mikolaj Izdebski - 1.5.0-1 +- Update to upstream version 1.5.0 + * Thu Jul 22 2021 Fedora Release Engineering - 1.4.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild diff --git a/sources b/sources index 60b7d75..c726978 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -SHA512 (javapackages-bootstrap-1.4.0.tar.xz) = 1ac6569499a5534bbbbb948d96be2886edd75e0b9c5ad61c3eb6b036f561c43644905a0a666a37fc82a29b42a4b7f8cc1db6499427cf409a68c5cfa28f4f5b42 +SHA512 (javapackages-bootstrap-1.5.0.tar.xz) = a1a24f16f454ff6ea84458ca1635ad437051ceba9910864fc7b42758ba22e4f15580f269b7cde09cdfa052912efd14a0810a29cff799c13207a9001135454944 SHA512 (ant.tar.xz) = d514610ca6be05efdeabebaeecaa515790bfa65b83c85de557686fa42135e7510440f04aa1890143255ca8e937d39b3e5b4c2ade7059224227c1982f7f87f9bc SHA512 (apache-pom.tar.xz) = add7ac6b664307f36c55950597876216c2e0fc9193ea2c00214c22d38d4c249fdea639f36618e49a66193da8f076bd6a76bc5136e3f4ef5b3bc28b779a9f5004 SHA512 (apiguardian.tar.xz) = 0a14ac34efcacc47736239059e33f9d30b7d8be1d692135b9f2ef785bfbdae1012e255d395fdb19c9b89b2d83a1ec7c015c9183b53ab33732814e357e76179ab @@ -32,7 +32,7 @@ SHA512 (httpcomponents-client.tar.xz) = ba2f8cab32104aadf5a77ed3e1e16798b0547169 SHA512 (httpcomponents-core.tar.xz) = 73e3bb628f57a0fa17994b4b66b54248c3abb548492a965e50a48067a7bffd983468f57720d5473100794e176415584849c04271d308f6ed5b9e6f31148d0443 SHA512 (httpcomponents-parent-pom.tar.xz) = 5b877ef9f038312fe2cd17f5e9930b6fb771ff5d1d57d6e60812332502e2fde0ca53498be53a85d8652427afdc73dc747d21ec69c25a059a4dc53758ff405df8 SHA512 (injection-api.tar.xz) = 2bfdb53c69322a5f7458a3acc59dd4b83b7969eb8312534ac8c0e60d4fb2f679df4690c6268b453ec19c791a156d111fafda5d113892e2412327d02325af4a16 -SHA512 (jansi.tar.xz) = 2a503443fd3793d42a8ce7247a3e25949a3b97868dd0914d90bff47c9b18b6e08122ab1d5a0436c94f57f4aec6ad36b9f16ee042f0ad7027fc1c066ab38340aa +SHA512 (jansi.tar.xz) = 2847c0d38b000d21acdeb1c32c6d9bc9796d0472b554aaae8c7144ec35f17b0d0e27268276568a5d61ea450e5a624c46732fb349c58a4900c02ea859e9ba7628 SHA512 (jcommander.tar.xz) = 344b800b5d7e5028dfabfe70a08f84a19371d2bbbde1a9771a9bf02cbd47026bd5a78a397e588f28077b9f5576d4ea1d563c99b2c6c2eed5ca0cd32d2da5f1e1 SHA512 (jdom2.tar.xz) = d3a3d8cf69fcfda48ced37f73a97711a5607bcf3a9fa73fe3cf0f3eb1dd6e2c4e727cb9f8b496ef9f3f9f46aab1e4f656d13059c798e713bd2b996a007e4f259 SHA512 (jdom.tar.xz) = ced2c0c810be0b39b788259c649a2035d88710de5c5ae7a71daa62c7cdf81e38644f0cc289ae4a74ab313e50a5d05555423932af50b09e3a85e72d9440cb3c6a @@ -64,7 +64,7 @@ SHA512 (maven-resources-plugin.tar.xz) = f28fe60efe7c619201fba582327048e4bfe49b7 SHA512 (maven-resources.tar.xz) = 9be130f3b9e098635e5f62acabd60d4ae66b1658b18ed8630aecec8ac7fc9e5c19e04894e79b5a11e656c1261d5b270beb9f71080b404a0db8927853cfdfa8aa SHA512 (maven-shared-incremental.tar.xz) = 50f7cbcc3496fcf4b834bfeeac770d610deb8b35a60bdf3cd5d18eac0615bd1853377a83dc1bc1744c3b3e4d66df8cea722f3b7be626c855053c337deb0d1118 SHA512 (maven-shared-io.tar.xz) = e56af091151ee53587edd52943e7527bf6329920d0ebe2011aec075d56e05ce5b36c99f49e31adb5ee62dea6af1b977376df4f3646e306f9e8d9854d23aae587 -SHA512 (maven-shared-utils.tar.xz) = a72f958b7a8d3537f613a08e6d7b25d424b40eec714a7b11aa639ccfef0db4f3db400e49bf0bc48b94155bba84187178552a7c1163d934e43c900fd4c8a8fb4b +SHA512 (maven-shared-utils.tar.xz) = c5f7d7c0830496e5d0191a77700f2d765ffc85d532063903a1d4f286adbfe3be87fcb257e9635b674cfa54654c352df996de665d60fa5d4ed42bd059b8048368 SHA512 (maven-source-plugin.tar.xz) = da94c4fbc819fb04a7ba6efd9fceac194837bf6cf754f00fe162db964321f2fb860f7c074b51693bfc0aedb31f9eadc0356d5e694838a4ef8c8fb9d390d454e8 SHA512 (maven-surefire.tar.xz) = 136d6ff35242e11ae293f21e9e42d2ab0b6ec379e64324a82ec5d0b8ae43072b68557f87c5f02227064899a638560c67e82ae4a5a7a1313eb8d198a60603c26b SHA512 (maven.tar.xz) = d1392683175146e1328e97e24ba03eeda8d77f5b59695259971bbbc5d2c427954d6e06127b0445b8cbb3c156d0cf751d68668f62936256442e376cdc2b0e0725 @@ -105,5 +105,5 @@ SHA512 (univocity-parsers.tar.xz) = 8438aa3cca3895c74473419f075e824e73bc7752e7fa SHA512 (velocity-engine.tar.xz) = 81f647534f4361fc8e7065282b1182b4f0c5009ef5b63a85c2c4668e2d0281689970df06f3f7566f77140e157dea674ecd2a120d48d75ab9c7de1cb35a2b7992 SHA512 (xbean.tar.xz) = 43c7ff1ad83c4b74990bb7e9b7d8f03f655ac15bb06f4833c1fb2dfabbfe7de61d664d4e5a6f7f34bb43f05d3641dd99ac46c3b25e7c568a67b7774fceba9d21 SHA512 (xmlunit.tar.xz) = 1b91bd589b5bfc595533ee140c29b4da02bb59b17720a9b8e029d0110669f947137fcbdee75e04aea9bd91952719fbd8303d98f679ab8a2296d79ceecb327500 -SHA512 (xmvn.tar.xz) = 9c4ed80f866c2010db6f8c827f1cacff6d34585b8dc01e857a8677eaa86f41586ce16b0b69b7938b9433740affdf822a78ce68d031cabf0926db805833e685da +SHA512 (xmvn.tar.xz) = 62c0a9ef0ad2bedfadbc6ec5846d7bb0f07f42dd8383163004f86278441db40bceef1840e1958270b048d74a18387f3397ae08143324640562ec374a1634508b SHA512 (xz-java.tar.xz) = 287335c084b80a1fc7510f1dc8d1cc17a815f6ae40f70cca1b08112fe8ba48181a9da3c0bc9328adcece74b677fef1659461ce03082e87a01b8d753fc3ffe680 From a22110bf8abc80b1337f76c5b6079c04b86c7080 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Fri, 15 Oct 2021 13:35:55 +0200 Subject: [PATCH 21/77] Update to upstream snapshot 1e296d550d91f89f383e42ceeb0856b97214b51a --- .gitignore | 1 + javapackages-bootstrap.spec | 15 ++++++++++++--- sources | 38 ++++++++++++++++++------------------- 3 files changed, 32 insertions(+), 22 deletions(-) diff --git a/.gitignore b/.gitignore index acfebe9..61eacaf 100644 --- a/.gitignore +++ b/.gitignore @@ -112,3 +112,4 @@ /javapackages-bootstrap-1.3.0.tar.xz /javapackages-bootstrap-1.4.0.tar.xz /javapackages-bootstrap-1.5.0.tar.xz +/1e296d5.tar.gz diff --git a/javapackages-bootstrap.spec b/javapackages-bootstrap.spec index 45b5710..d0d508c 100644 --- a/javapackages-bootstrap.spec +++ b/javapackages-bootstrap.spec @@ -11,8 +11,11 @@ %global artifactsPath %{_javadir} %global launchersPath %{_libexecdir}/%{name} +%global git_hash 1e296d550d91f89f383e42ceeb0856b97214b51a +%global git_short_hash %(echo %{git_hash} | cut -b -7) + Name: javapackages-bootstrap -Version: 1.5.0 +Version: 1.5.0^20211015%{git_short_hash} Release: 1%{?dist} Summary: A means of bootstrapping Java Packages Tools # For detailed info see the file javapackages-bootstrap-PACKAGE-LICENSING @@ -20,7 +23,8 @@ License: ASL 2.0 and ASL 1.1 and (ASL 2.0 or EPL-2.0) and (EPL-2.0 or GPL 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/releases/download/%{version}/javapackages-bootstrap-%{version}.tar.xz +Source0: https://github.com/fedora-java/javapackages-bootstrap/archive/%{git_short_hash}.tar.gz # License breakdown Source1: javapackages-bootstrap-PACKAGE-LICENSING @@ -279,7 +283,9 @@ example, JPB contains embedded version of XMvn, removing dependency of JPT on XMvn, allowing JPT to be used before one builds XMvn package. %prep -%setup -q +echo %{git_hash} +echo %{git_short_hash} +%setup -q -n %{name}-%{git_hash} # leave out the first source as it has already been extracted # leave out licensing breakdown file @@ -343,6 +349,9 @@ echo '%%jpb_env PATH=/usr/libexec/javapackages-bootstrap:$PATH' >%{buildroot}%{_ %doc AUTHORS %changelog +* Fri Oct 15 2021 Marian Koncek - 1.5.0~20211015.1e296d5-1 +- Update to upstream snapshot 1e296d550d91f89f383e42ceeb0856b97214b51a + * Mon Jul 26 2021 Mikolaj Izdebski - 1.5.0-1 - Update to upstream version 1.5.0 diff --git a/sources b/sources index c726978..cca342a 100644 --- a/sources +++ b/sources @@ -1,9 +1,9 @@ -SHA512 (javapackages-bootstrap-1.5.0.tar.xz) = a1a24f16f454ff6ea84458ca1635ad437051ceba9910864fc7b42758ba22e4f15580f269b7cde09cdfa052912efd14a0810a29cff799c13207a9001135454944 -SHA512 (ant.tar.xz) = d514610ca6be05efdeabebaeecaa515790bfa65b83c85de557686fa42135e7510440f04aa1890143255ca8e937d39b3e5b4c2ade7059224227c1982f7f87f9bc -SHA512 (apache-pom.tar.xz) = add7ac6b664307f36c55950597876216c2e0fc9193ea2c00214c22d38d4c249fdea639f36618e49a66193da8f076bd6a76bc5136e3f4ef5b3bc28b779a9f5004 -SHA512 (apiguardian.tar.xz) = 0a14ac34efcacc47736239059e33f9d30b7d8be1d692135b9f2ef785bfbdae1012e255d395fdb19c9b89b2d83a1ec7c015c9183b53ab33732814e357e76179ab -SHA512 (asm.tar.xz) = 0963a638f147c30f12de78afa27f7cb05ff15ad84a12a8f6dd22964c8acf59301451ea5af969d67b7c8167c2195cfd01d15a7d42c6f1fc32c1726be35ccf0453 -SHA512 (assertj-core.tar.xz) = b8936be4f79845af8d9321dd2e41a35f7d716138f8cb3b34cd5932fb0479187f32a893c0a81074c2ff3fd010af31cc2bd743c5fdc2f1459a11ef33c87dc8f5d6 +SHA512 (1e296d5.tar.gz) = 05df2a8d7fe021756262f0b45adf03c4560edd56c1d2351da8aa8c391914fd3049937d85dadd06929839754cd1dfbf4a8432728dc9803a88a823c7cfa1be5274 +SHA512 (ant.tar.xz) = df73f505ccb93552634bbf0068d1e1c130007c24cc4bfd5f4fd2650c9e046cad1d3e568e2a840cbca0680d1adf16354415c0d6a9327f32895ac09e8b2aa16eb5 +SHA512 (apache-pom.tar.xz) = 16f4785c147578496f3358c5c4201374c48203f5f1527dde51d4cb16bee5826b501c56d3a1c2fafd57f38812ab914d7002968dffc69fa256e041dc66d2a1b725 +SHA512 (apiguardian.tar.xz) = 55044887656bd23e08a8e546856b24bdeaab91499aa15d560a607e65b3346d78895b31a2a1e302edb7e2104ceed7e5c4b35f5de7ec0118fd1c0f19571ce41a45 +SHA512 (asm.tar.xz) = 6722097cb6f9137044b52e7a65445f9450fd15b5f1017d30dcbc9d5e387234316d4e26387634e2fa83ae55f3986d899e952571924b9e57eab926a51ab463c95b +SHA512 (assertj-core.tar.xz) = ff43826811e968d93724f3877afd8cfe99e0ad4877e568d288f5f813e6ba9652cb3fb259b14bff9252a89449d9a67bc7fe605f188d63d1936f90baedb0d03e52 SHA512 (bnd.tar.xz) = 4caaea5c02d302d052b753c7a4b4fc9f725239be1ba1824b9871b30842b32e7794a7580648a6bbcc7f6d2a8ff61fb8bd2293f90626a19453b55f5854f095caee SHA512 (build-helper-maven-plugin.tar.xz) = a10176b562e2d7edbe109aec397e4ae1cdca1b3d27494644b483c874d08731478413eb0f3a4308aa2279d2883fba072fbd1b8a8f428447044a18195a46942219 SHA512 (byte-buddy.tar.xz) = a76b6bb9cfae056bb9dc470f284f1703ba116e90e2137f8f53b571aea335e639f386255bd78f874b6f5f2993c9a530b0c23ef40a20c1b222dbb1019146d3b0c4 @@ -15,15 +15,15 @@ SHA512 (commons-cli.tar.xz) = ee6ae7dd58aea611fbf8770d131dc226b20e189dc33ef99d13 SHA512 (commons-codec.tar.xz) = 6dcff937bf44772a5741fc823a5a5e97394e440968ebad83101761f929ba6c0c6a24f775cb86d7ba094e2a7ee5c8e468d425ef99b23aae869eb927ae397142ce SHA512 (commons-collections.tar.xz) = 4101d7590734932f08cf5a51d2c28a4e1b7d4a61b013f4f24e4f042ef70081225ef5b2d47620a0a34a216b8245c9a7a2f63f9a3d9d5d73e23e107218f0f3bf51 SHA512 (commons-compress.tar.xz) = 2ddd542560f6547bc742aff869f6619dbbf8ce2143dca34087e9ed0bca903614e74a0b7c2ea219957822776c2e5f36121604eadb214850574cecc2482b71ddae -SHA512 (commons-io.tar.xz) = 1703930014c68e870d865ff94c4ba3c103b2e4487e87635fc6ded00daa2b17731f34923ac4b1617cf77c28aab2a7473725da1df803d6c97a58b4288ba301d8c4 +SHA512 (commons-io.tar.xz) = 3ad83ee71ef382b2e35be3f85b05cd19e3ea49c3a04018b7dbe866ac16be0b241b5ba93c03c2ea2ca441b9edd3ae54d36db12532de0b69453e0ab7cbe5f1302d SHA512 (commons-jxpath.tar.xz) = 1bbc91d1755a115044aa631f042d05e192050feebd29f515e6fd8216e01b1c2654961c353c6f515b7e02d7022bd7c45ed85a5c5e232c8c89f9f0892081f2f27c SHA512 (commons-lang.tar.xz) = 3d17f7013ec545faea8e6aa3809bd460efd6ce9d9908cd1d4a07c0062cfb66cf3ef345100d81222fc6bec49f5dd7203ef290cd572a13851a7e8c34aec828f394 SHA512 (commons-logging.tar.xz) = d406a137a6375f01b399d82d868694d28a2c3613f8afafe54aa0c29fa83f730ee6c460ad93c83e97ca0e6b883216e37ad4fad226d1a2616bab9e154e5f3c4d0a SHA512 (commons-parent-pom.tar.xz) = 15c4dc847f446358a80a0c08042c78a4329b322cbf6420c42d66fa63aa5c7965e3351fa8221bf45e5b49e934e6a9c2453e92cc7cd7781d501a3124f7f2a46dfe SHA512 (cup.tar.xz) = 2520269875b67d92898e94e313712b9c21f302eed7c5589a93890818e375e0cb748a83dbca2c175260dff0d59fead4ce12cb80728186562dffd830d5fc8ec19a -SHA512 (easymock.tar.xz) = cf219a1e07425021fcddc4fba3dabb0b99cae62f9960f3904cff5d9d045ae84d6c7dbeda872f94b1f8788e00eb6cb2ba99a7332178b7b78b4e782764faa32775 +SHA512 (easymock.tar.xz) = 33880a667843f06c9156f31960404d75850f494b72d7722a3bdd0cef8eab50ef1d6bcd0a08006c06e9e1a535336ca89fc8d267e560d47b43ec0f0ac595098133 SHA512 (felix-parent-pom.tar.xz) = 25a8795f628f165e52a475252441457e3aed9efec3532a96ed8f061df1f22d8e0f08900e20ec7cd85322ff5112b39303fe9a1f5b6390eb5401fc475aff7fbc6f -SHA512 (felix-utils.tar.xz) = c75667cd76cd201ab09d8efae7ec5e52fe849e7e4376bdbb7b0ad79db311fdb1ec6fe69c0927b1b911daa60eb9b43ac15bd44e840f91a5da061c4dbe31361384 +SHA512 (felix-utils.tar.xz) = 826954c0880127f2e6a7805424d26386a9ef6664b967f65ba644e9346dc9727a52e3622bdaa9dd692af7ae93f325e60c14c1c5498735a36de70182284c6e6ab4 SHA512 (fusesource-pom.tar.xz) = 79868d1ade2ed501ff6857dc4a547f8c0e9d9e1423908e16c308f44cf26d4e677faa6632e77dd6c8e6e6ce1377c2dc967fd244e16b56b22a9b786fbb50f67df9 SHA512 (guava.tar.xz) = d91e610900925e8159d0db11c5322b74e249e85a35aaeec6962d4eb06cb926fa3c717519ed87ecf11aaa22c46ef2db3aadf0b325382ac040753fd3bebcccb4c2 SHA512 (guice.tar.xz) = 233b8361107bfbd5cf13757ca864833d863968a39b5e30482d50f32626b903f4ae5d9d63e02cad17777f4050793c54a9091603bbf1dc670a84e88c5130ed943a @@ -33,14 +33,14 @@ SHA512 (httpcomponents-core.tar.xz) = 73e3bb628f57a0fa17994b4b66b54248c3abb54849 SHA512 (httpcomponents-parent-pom.tar.xz) = 5b877ef9f038312fe2cd17f5e9930b6fb771ff5d1d57d6e60812332502e2fde0ca53498be53a85d8652427afdc73dc747d21ec69c25a059a4dc53758ff405df8 SHA512 (injection-api.tar.xz) = 2bfdb53c69322a5f7458a3acc59dd4b83b7969eb8312534ac8c0e60d4fb2f679df4690c6268b453ec19c791a156d111fafda5d113892e2412327d02325af4a16 SHA512 (jansi.tar.xz) = 2847c0d38b000d21acdeb1c32c6d9bc9796d0472b554aaae8c7144ec35f17b0d0e27268276568a5d61ea450e5a624c46732fb349c58a4900c02ea859e9ba7628 -SHA512 (jcommander.tar.xz) = 344b800b5d7e5028dfabfe70a08f84a19371d2bbbde1a9771a9bf02cbd47026bd5a78a397e588f28077b9f5576d4ea1d563c99b2c6c2eed5ca0cd32d2da5f1e1 +SHA512 (jcommander.tar.xz) = f6d3355d29f4c722a5e2644b1b3ff91ce43096eb3464dbe4e4c73f23c92ece97dc8ddb38bd1e4eb184722612b14c39cedbb41886069debe8cb2eb5fab3d01e24 SHA512 (jdom2.tar.xz) = d3a3d8cf69fcfda48ced37f73a97711a5607bcf3a9fa73fe3cf0f3eb1dd6e2c4e727cb9f8b496ef9f3f9f46aab1e4f656d13059c798e713bd2b996a007e4f259 SHA512 (jdom.tar.xz) = ced2c0c810be0b39b788259c649a2035d88710de5c5ae7a71daa62c7cdf81e38644f0cc289ae4a74ab313e50a5d05555423932af50b09e3a85e72d9440cb3c6a SHA512 (jflex.tar.xz) = ef9ee7dd44b8fbf9a40e9e3f7169ce9bd14d8d724a8f3ca3ac0a6d00d0d8093bf8ebd047c99338613e3eb5d6942bba3d1c1ef36e113660ae41207f69d25af042 SHA512 (jsoup.tar.xz) = da78d6698f9edc8ad3f2585f1c3581a16af65610cf4e4a2df6581dfa6a6917aab64ee85a8d706028b199f6f87f0dcc6227f9b6b312fdf50776827200971037c8 SHA512 (jsr-305.tar.xz) = 58843b9aa8cc959af6203ee73191ec8d8b1b8a3ab17e23c25bd6ad977c26cbeaeb3ff87ffbfb89e28dafd7406ff4eeb67a904caded9ff7246e917cc10017932e SHA512 (junit4.tar.xz) = 05b76424587e3cf8847698e9cb65244baf3f68abaaef33a9d0a6d71eeecdb239a53846c377d74f708e4516fb3bda856fa68b9871d489286471ff12b5494dbf8c -SHA512 (junit5.tar.xz) = b5015485d56ad32dc66f4947438e6abb95d3d80a008d021fa46d7556c53069df40ec5fc1b7ad6ee9a2dd22ec6ca8b5ff942cbd9581ddeab30069e93a71e77826 +SHA512 (junit5.tar.xz) = 6a7bac6870c4e0532134695285fbe8be0c1f1561bf8266948306132aa7e0ba8a539aefd9fde54827f787fb8817ec2a31ea12aa24a4b792cf22258fc3fee017d9 SHA512 (maven-antrun-plugin.tar.xz) = c06c14dc0bd3dd1cbdba4a6168ac7a7b678d77d136bec615316e025548f13a6311c829cd79de5436ff268a44a956aea479a9b1af935e46ee97e693031fcb9000 SHA512 (maven-archiver.tar.xz) = 5372fc35dcb0487c8b0fd8c846dc30c6cda7233bf93d347d4317da8b322dbd5fe35968de7bef5ed33c07857571ba4ee84715fe613d57ce8db1338318a9ce5afc SHA512 (maven-artifact-transfer.tar.xz) = e8b59a4352e2d047090bfb2d48117380dab12cbeffc7a1e96f23262f26877b7d582e92d1805672f40e53d8b39ca8fbb6ba5824dc49875d26310ae98b33b6c0c8 @@ -69,35 +69,35 @@ SHA512 (maven-source-plugin.tar.xz) = da94c4fbc819fb04a7ba6efd9fceac194837bf6cf7 SHA512 (maven-surefire.tar.xz) = 136d6ff35242e11ae293f21e9e42d2ab0b6ec379e64324a82ec5d0b8ae43072b68557f87c5f02227064899a638560c67e82ae4a5a7a1313eb8d198a60603c26b SHA512 (maven.tar.xz) = d1392683175146e1328e97e24ba03eeda8d77f5b59695259971bbbc5d2c427954d6e06127b0445b8cbb3c156d0cf751d68668f62936256442e376cdc2b0e0725 SHA512 (maven-verifier.tar.xz) = 54deb814e5d254ec50c20c76f59f164ed7063a85b5828bf9fd4a727e4a4f936ae3d07a5854b016bc491e6730550eca5dd694c873cdbdc84f9b867f6daf4bcd14 -SHA512 (maven-wagon.tar.xz) = 4fef09c0e98c3dca894b62f3f1751d27aca4d392ca730d6b4effc702b68100eaacdf18574a3c7fb495c2c4a66c5408c1dc8ccb802ac7908b3375fd946a10ee33 +SHA512 (maven-wagon.tar.xz) = 04983cd8e4d4f7083dc847adba6f7063f995566bc1a5625c29ad5566ce871297dc7fbb2046b1ff8551d309463f82c041c7ce8311a1a9b53fb32b3866eb3cdece SHA512 (mockito.tar.xz) = 3737689c08b6cc43b2422fdc6dd2e0fc3c7fc21a65fe7cc96f7f70466f086972b7436434d047e16d7e692eabf06183feef4b911a5bf327a8565a8972e4c823d6 SHA512 (modello.tar.xz) = 93d92ea186d830bcc388b459d3b28a2612ffe5de5ad9d28acc20441d0ee07951ade832fd8e68616314e9b8ec66db1db2713839b20350c4833ed9beecc7ab58fb SHA512 (mojo-parent-pom.tar.xz) = bcce1eb9c3a1c225a52f63b400b1dc1d3dc52650eb058fef0ec54f849862800d31e40929a20dd012839b4d4ac37cc6b49876b2244795a27b3a024fda9cb35ac5 SHA512 (munge-maven-plugin.tar.xz) = 573c010ca107cdf32440d5dfa95a1ca400da7fd3d56f8355fd99257fb4ec83d2818638c06f06ba8f0ea882a3515fc64931c6342e4ec167488b11555023a5e7ed SHA512 (objenesis.tar.xz) = 99a3b9da3baec726aeb643a72494617d5234d31e063e0e81c0716a3e0a7d9b773b591f215ea82f3dc6d781d4294e60143794409073739caf07917b14b231015c SHA512 (opentest4j.tar.xz) = f28358721018eb98959427553300e2bba4cf592016c7e83f25c907236caab0e77c537cbe1fd9685edae3e125bf0feb87560ccc991d37e381d377c1d48197c2a4 -SHA512 (osgi-annotation.tar.xz) = 8c1d02688941727a6d550f678a8c85db656b30a10bc32eb0b7b28b0f9cf17a7d9b3f64d62c6f5e3176a86ef6eb915a92a6aff71034e17b9617ae02c47b4990d7 +SHA512 (osgi-annotation.tar.xz) = 76af1486e96eb79e6806c667ec5e578730a5feacbaa4b557311bf18699aca4880aec2ba196479e4d723401726a90e4523b31e4fc1c8f03f0259a1aa8f6899478 SHA512 (osgi-cmpn.tar.xz) = 1c3ee095a8b89e8a553d3e0f2a0b8cabdec203aa0810829b64bae885de701541ce11185b02bb5d09c5965fa66390b534997ed0440008a46bd09e3673f72f6ecd SHA512 (osgi-core.tar.xz) = b1e9c98a38cb7d6ea0bd495a9f5c28168fbec9474e782144ac42e0ce5b615d757345f319bfc2d40a3c04a1e460fbe2c7a9cf22920fd49990429838041962dac2 SHA512 (oss-parent-pom.tar.xz) = 11e88e748e13a48262f34de209169e60da5f8c9f548b80212a80ae767d7f5d3aeac7d03d420d78da14e9e64a299904411c54d59a0361c4290c696c52efe350d4 -SHA512 (plexus-archiver.tar.xz) = 67b79e1c99e1e78fceaf887d3e68f158833c01b43b98a5546165d3d29674ac7510ea3cbb12d63e21c00efeaae76bdf8059a0fb9cd284b7062377c1d9ac2341e8 +SHA512 (plexus-archiver.tar.xz) = 21d34a9df09f4a89bd14fab2ee8f10a257c58f8f8a7fd11c7cc57b5f7fb327768c1a92542a2f0286f24aa6aaa91322d484f463310ef5bedb26d9f2dfad893d5d SHA512 (plexus-cipher.tar.xz) = 4080ff531e2d75ed114670861f7ccc80348588a0aa133e17811e3f0ba6a8af44ed749df8d10f41f58790e3309859eff9e995945a5f9356d86c9b46c254ab449e SHA512 (plexus-classworlds.tar.xz) = 769af97c043b3675a49960cbabff04e748134770fc36d9ede6e52a0acb6b2ddc9dc0e51e05cc6d3e8e2c33a76441794381f05c4927d70d4b1fc9ea7ee84472a6 SHA512 (plexus-compiler.tar.xz) = 4c9af6a934d2f8cf0712fee364d9a4723323102b4f6b64ccf4b74bcf3fe8cdb9d04d50261026dbd63a770fab97f03fd3ecf99f903d6707e29dfcaedc74b092d7 -SHA512 (plexus-components-pom.tar.xz) = d7386aeb60591b6facc7d99d9910b1623ebb8de61b9b0d781fae22ba9eb02ff864e67f6198054eed41c2454b82f26848c3d6ed6bf1113dab338f70fc1aab61dc +SHA512 (plexus-components-pom.tar.xz) = db043d3217366428f15e2cd9289e53d16b6c47cf25ed83e69dcab225c20aba965f7974e4ea1aa4d62084bf30e4c0c37859720fe8dc6f624348fd71d567d78dd0 SHA512 (plexus-containers.tar.xz) = 7e7a34374e66cf1f4540c4246260e0d65088f87eef79583f3ada3b49d317395d7f6420d2baf4ea6cc37c5ba2ee7cde1490b1ab61074423de1f01a4054069f85b SHA512 (plexus-interpolation.tar.xz) = 5f93f9e88aef39753d3901785421367253948449044990d1d974b99f2ae110a52d314a13264766312a9597ef2f8f40240e7773f51daf5d8d162848d95c37bd8c SHA512 (plexus-io.tar.xz) = e2bd3152749001a9133f2d2184b5559a2bdcc8991d00ee6cabfd8998fde8446ac05c48aca0e427cac06e6589afb466034d26300b5ccede74259ad6b37c382595 -SHA512 (plexus-languages.tar.xz) = 3bf471f223684a6e1cddb55e7448972d55dc48a7d4f7c36466e1505ca61bc8822b82b3d3aebefaad29d3be4cbe3bf55cb42c79eeb271fb5e656d9b7a0996ef3c -SHA512 (plexus-pom.tar.xz) = b10d906162c61563d87894ae42ab3f38b2ae3b56c5a131697cd51b80e7848b6d2222e2977cc30140fb9bd79282b57bcbb73016ed72e79d6517715036ec7e5db2 +SHA512 (plexus-languages.tar.xz) = 3ac9565c15d885c84a7eaa50e10ee318cbca1a9a39b6c1b5bbfe2a0b50dabc17f1f23544dba97a1a4b0a6f6e2970ca6fda7ad3601ffdfbe2da54708765781f4c +SHA512 (plexus-pom.tar.xz) = d4a16a42bed1ad143e0fc87b754f9299082e29aefbf44b3b134dfb74f0ea9813bd955491605a859d253d7d70c0f6f32a7cb475bbfd4fe2baf2197375003e9f6a SHA512 (plexus-resources.tar.xz) = 8b7c55468661311b1faf1eee83d0c491986cfbe5aed38b9298362b82bb384cd583ea476b337dd6393c492c16f70192cd9a763d53920df64210ce9c22f4be635b SHA512 (plexus-sec-dispatcher.tar.xz) = 4fa97396d72f6f7c43160c1f303bd4e5ada5bef4b912a7fdf75f5721e466c420c4415e0031d58fa060493ea2a1c1ee39800250d6f13a8b1fb19b10e729413764 -SHA512 (plexus-utils.tar.xz) = ccf1d201f1d8682cab36764b9a8ce946a26013980d9df3087dbe8d8136bf7b9191029be6836108506ca9dc662e92cd8809835b7ff1c23c6ca2ab4901d67f8c93 +SHA512 (plexus-utils.tar.xz) = 7d7b07bf744a6feb2bdd92c684a0330213c9c8e6518ffc6edb3f72bc6bfb8a24f5721acb7189912af9f53c03e5f9119300533c9615007fe03d38047237b67891 SHA512 (qdox.tar.xz) = 922111989f6472c1bfdffe78d91ea8da94e704f122a6c3f9d5d87c22647c412b69f0ebbd4a737650163b14c7102aaddbd1164dfb364c6a92a3638ac5b6c9c264 SHA512 (servlet-api.tar.xz) = f1731aa67600034edeb10a60030cb22f650b036de71a8309dddd3fdfb475436512a35dbdb6f1b985fa31964b018cddad51c5909a9c6a2bcab025593ecce4c74b SHA512 (sisu-build-api.tar.xz) = 6d1dc0cbfba6d78eb12f2e68c955c49a85ee5a07a696d83d31efe8eba8ccedb887036be280de0c805c0aeb6b8ff35ff4ceab5231ead8cc9d467fc27226e576d4 SHA512 (sisu-inject.tar.xz) = b0111b6c8e4103029c528a2bb169a4afd5bc58e52564cc34fbc006adb653abb265a92114bb2461ae6720e6787a5f60a32897781cbe0f54e070edb6520b145750 -SHA512 (sisu-mojos.tar.xz) = 32a31bd01af618f04fdfc1f3e5aa850d4ac8f3f2b6ed4e1ad2f8bbf65b7e6a75f0aa91c4e3ec5a361b8b3f0d25120ddd5a5c17ef11ddb4ea31491784d66cdaf8 +SHA512 (sisu-mojos.tar.xz) = 3ff273562c3b7f061dc66c53bd39a32914b9ba45f37b99a023fe7f9d65bdb4333fe45f9b9a687e83531566ad64f4b3e24d35e6f9effd6b55e8b396daa5f3f7cf SHA512 (sisu-plexus.tar.xz) = 736896a5bb6230338341ebca1cbbc4d258faf5affac88d178252eed6173dada281299ecac9df03f133c3199eac7230c7a37d3f1902c6a164453b120015030c7b SHA512 (slf4j.tar.xz) = 5071068364c08e65058f367fed61b8298e2e19aff6fcced4fb6cd170d7a71b4e24c25e7192745bb3759c35078fff37f7c196a758dc3faee11e696a43db3d553f SHA512 (testng.tar.xz) = 3377c6a6f40740b0def5eca5b89e522d1a41e6e7c41cbb944baa524b838b203a6458a6dfa234f38b23e45a7de1e6a16ecf288f3d1271812700dc2d82303c63fd From 874d5b683d845efc492050fcd1edb1c3f56c5a8f Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 20 Oct 2021 11:42:11 +0200 Subject: [PATCH 22/77] Update to latest upstream snapshot --- .gitignore | 5 ++ generate-bundled-provides.sh | 42 +++++++++++++++++ generate-sources-list.sh | 8 ++++ javapackages-bootstrap.spec | 91 +++++++++++++++++++----------------- sources | 16 +++---- 5 files changed, 110 insertions(+), 52 deletions(-) create mode 100755 generate-bundled-provides.sh create mode 100755 generate-sources-list.sh diff --git a/.gitignore b/.gitignore index 61eacaf..8394289 100644 --- a/.gitignore +++ b/.gitignore @@ -113,3 +113,8 @@ /javapackages-bootstrap-1.4.0.tar.xz /javapackages-bootstrap-1.5.0.tar.xz /1e296d5.tar.gz +/d348d92.tar.gz +/plexus-build-api.tar.xz +/94debe8.tar.gz +/1ccbeaf.tar.gz +/2daa95f.tar.gz diff --git a/generate-bundled-provides.sh b/generate-bundled-provides.sh new file mode 100755 index 0000000..c882335 --- /dev/null +++ b/generate-bundled-provides.sh @@ -0,0 +1,42 @@ +#!/bin/sh +set -eu + +./generate-sources-list.sh | sed -n ' +s/^.* \(.*\)\.tar\.xz$/\1 \1/ +T +s/^commons-beanutils /apache-commons-beanutils / +s/^commons-cli /apache-commons-cli / +s/^commons-codec /apache-commons-codec / +s/^commons-collections /apache-commons-collections / +s/^commons-compress /apache-commons-compress / +s/^commons-io /apache-commons-io / +s/^commons-jxpath /apache-commons-jxpath / +s/^commons-lang /apache-commons-lang3 / +s/^commons-logging /apache-commons-logging / +s/^commons-parent-pom /apache-commons-parent / +s/^apache-pom /apache-parent / +s/^bnd /aqute-bnd / +s/^injection-api /atinject / +s/^jcommander /beust-jcommander / +s/^cdi /cdi-api / +s/^felix-parent-pom /felix-parent / +s/^guice /google-guice / +s/^httpcomponents-parent-pom /httpcomponents-project / +s/^common-annotations-api /jakarta-annotations / +s/^servlet-api /jakarta-servlet / +s/^cup /java_cup / +s/^junit4 /junit / +s/^maven-parent-pom /maven-parent / +s/^build-helper-maven-plugin /maven-plugin-build-helper / +s/^maven-bundle-plugin /maven-plugin-bundle / +s/^mojo-parent-pom /mojo-parent / +s/^asm /objectweb-asm / +s/^osgi-cmpn /osgi-compendium / +s/^sisu-inject /sisu / +s/^oss-parent-pom /sonatype-oss-parent / +s/^velocity-engine /velocity / +p +' | while read fp mp; do +. ./javapackages-bootstrap-*/project/$mp.properties +echo "Provides: bundled($fp) = $version" +done diff --git a/generate-sources-list.sh b/generate-sources-list.sh new file mode 100755 index 0000000..a372245 --- /dev/null +++ b/generate-sources-list.sh @@ -0,0 +1,8 @@ +#!/bin/sh +set -eu + +i=1000 +for p in $(ls javapackages-bootstrap-*/project/*.properties | xargs -n1 basename | sed s/.properties$//); do + i=$(expr $i + 1) + echo "Source$i: $p.tar.xz" +done diff --git a/javapackages-bootstrap.spec b/javapackages-bootstrap.spec index d0d508c..0bb79cd 100644 --- a/javapackages-bootstrap.spec +++ b/javapackages-bootstrap.spec @@ -11,11 +11,11 @@ %global artifactsPath %{_javadir} %global launchersPath %{_libexecdir}/%{name} -%global git_hash 1e296d550d91f89f383e42ceeb0856b97214b51a +%global git_hash 2daa95f42e9c03bfe58a72e171a6fd442ac38823 %global git_short_hash %(echo %{git_hash} | cut -b -7) Name: javapackages-bootstrap -Version: 1.5.0^20211015%{git_short_hash} +Version: 1.5.0^20211028.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 @@ -36,8 +36,8 @@ Source1: javapackages-bootstrap-PACKAGE-LICENSING # ./downstream.sh prep # ./downstream.sh archive # The results are in the archive directory -Source1002: apache-pom.tar.xz Source1001: ant.tar.xz +Source1002: apache-pom.tar.xz Source1003: apiguardian.tar.xz Source1004: asm.tar.xz Source1005: assertj-core.tar.xz @@ -118,21 +118,21 @@ Source1079: osgi-cmpn.tar.xz Source1080: osgi-core.tar.xz Source1081: oss-parent-pom.tar.xz Source1082: plexus-archiver.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-build-api.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 @@ -147,11 +147,11 @@ Source1108: xz-java.tar.xz Patch0: 0001-Bind-to-OpenJDK-11-for-runtime.patch -Provides: bundled(ant) = 1.10.9 -Provides: bundled(apache-parent) = 23 -Provides: bundled(apiguardian) = 1.1.1 -Provides: bundled(objectweb-asm) = 9.0 -Provides: bundled(assertj-core) = 3.19.0 +Provides: bundled(ant) = 1.10.11 +Provides: bundled(apache-parent) = 24 +Provides: bundled(apiguardian) = 1.1.2 +Provides: bundled(objectweb-asm) = 9.2 +Provides: bundled(assertj-core) = 3.21.0 Provides: bundled(aqute-bnd) = 5.2.0 Provides: bundled(maven-plugin-build-helper) = 3.2.0 Provides: bundled(byte-buddy) = 1.10.20 @@ -163,32 +163,32 @@ Provides: bundled(apache-commons-cli) = 1.4 Provides: bundled(apache-commons-codec) = 1.15 Provides: bundled(apache-commons-collections) = 3.2.2 Provides: bundled(apache-commons-compress) = 1.20 -Provides: bundled(apache-commons-io) = 2.8.0 +Provides: bundled(apache-commons-io) = 2.11.0 Provides: bundled(apache-commons-jxpath) = 1.3 -Provides: bundled(apache-commons-lang3) = 3.11 +Provides: bundled(apache-commons-lang3) = 3.12.0 Provides: bundled(apache-commons-logging) = 1.2 Provides: bundled(apache-commons-parent) = 52 Provides: bundled(java_cup) = 0.11b -Provides: bundled(easymock) = 4.2 +Provides: bundled(easymock) = 4.3 Provides: bundled(felix-parent) = 7 -Provides: bundled(felix-utils) = 1.11.6 +Provides: bundled(felix-utils) = 1.11.8 Provides: bundled(fusesource-pom) = 1.12 -Provides: bundled(guava) = 30.1 +Provides: bundled(guava) = 31.0.1 Provides: bundled(google-guice) = 4.2.3 Provides: bundled(hamcrest) = 2.2 Provides: bundled(httpcomponents-client) = 4.5.11 Provides: bundled(httpcomponents-core) = 4.4.13 Provides: bundled(httpcomponents-project) = 12 Provides: bundled(atinject) = 1.0.3 -Provides: bundled(jansi) = 1.18 -Provides: bundled(beust-jcommander) = 1.78 +Provides: bundled(jansi) = 2.3.3 +Provides: bundled(beust-jcommander) = 1.81 Provides: bundled(jdom) = 1.1.3 Provides: bundled(jdom2) = 2.0.6 Provides: bundled(jflex) = 1.7.0 Provides: bundled(jsoup) = 1.13.1 Provides: bundled(jsr-305) = 3.0.2 Provides: bundled(junit) = 4.13.1 -Provides: bundled(junit5) = 5.7.0 +Provides: bundled(junit5) = 5.8.1 Provides: bundled(maven-antrun-plugin) = 3.0.0 Provides: bundled(maven-archiver) = 3.5.1 Provides: bundled(maven-artifact-transfer) = 0.13.1 @@ -212,11 +212,11 @@ Provides: bundled(maven-resources-plugin) = 3.2.0 Provides: bundled(maven-resources) = 1.4 Provides: bundled(maven-shared-incremental) = 1.1 Provides: bundled(maven-shared-io) = 3.0.0 -Provides: bundled(maven-shared-utils) = 3.3.3 +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-verifier) = 1.7.2 -Provides: bundled(maven-wagon) = 3.4.2 +Provides: bundled(maven-wagon) = 3.4.3 Provides: bundled(maven) = 3.6.3 Provides: bundled(mockito) = 3.7.13 Provides: bundled(modello) = 1.11 @@ -224,28 +224,28 @@ Provides: bundled(mojo-parent) = 60 Provides: bundled(munge-maven-plugin) = 1.0 Provides: bundled(objenesis) = 3.1 Provides: bundled(opentest4j) = 1.2.0 -Provides: bundled(osgi-annotation) = 8.0.0 +Provides: bundled(osgi-annotation) = 8.0.1 Provides: bundled(osgi-compendium) = 7.0.0 Provides: bundled(osgi-core) = 8.0.0 Provides: bundled(sonatype-oss-parent) = 7 -Provides: bundled(plexus-archiver) = 4.2.2 -Provides: bundled(plexus-cipher) = 1.7 +Provides: bundled(plexus-archiver) = 4.2.5 +Provides: bundled(plexus-build-api) = 0.0.7 +Provides: bundled(plexus-cipher) = 2.0 Provides: bundled(plexus-classworlds) = 2.6.0 Provides: bundled(plexus-compiler) = 2.8.8 -Provides: bundled(plexus-components-pom) = 6.4 +Provides: bundled(plexus-components-pom) = 6.6 Provides: bundled(plexus-containers) = 2.1.0 Provides: bundled(plexus-interpolation) = 1.26 Provides: bundled(plexus-io) = 3.2.0 -Provides: bundled(plexus-languages) = 1.0.6 -Provides: bundled(plexus-pom) = 7 +Provides: bundled(plexus-languages) = 1.1.0 +Provides: bundled(plexus-pom) = 8 Provides: bundled(plexus-resources) = 1.1.0 -Provides: bundled(plexus-sec-dispatcher) = 1.4 -Provides: bundled(plexus-utils) = 3.3.0 +Provides: bundled(plexus-sec-dispatcher) = 2.0 +Provides: bundled(plexus-utils) = 3.4.1 Provides: bundled(qdox) = 2.0.0 Provides: bundled(jakarta-servlet) = 4.0.3 -Provides: bundled(plexus-build-api) = 0.0.7 Provides: bundled(sisu) = 0.3.4 -Provides: bundled(sisu-mojos) = 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 @@ -253,7 +253,7 @@ Provides: bundled(univocity-parsers) = 2.9.1 Provides: bundled(velocity) = 1.7 Provides: bundled(xbean) = 4.18 Provides: bundled(xmlunit) = 2.8.2 -Provides: bundled(xmvn) = 4.0.0~SNAPSHOT +Provides: bundled(xmvn) = 4.0.0 Provides: bundled(xz-java) = 1.8 BuildRequires: byaccj @@ -349,6 +349,9 @@ echo '%%jpb_env PATH=/usr/libexec/javapackages-bootstrap:$PATH' >%{buildroot}%{_ %doc AUTHORS %changelog +* Thu Oct 28 2021 Mikolaj Izdebski - 1.5.0^20211028.git2daa95f-1 +- Update to latest upstream snapshot + * Fri Oct 15 2021 Marian Koncek - 1.5.0~20211015.1e296d5-1 - Update to upstream snapshot 1e296d550d91f89f383e42ceeb0856b97214b51a diff --git a/sources b/sources index cca342a..a9f910a 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -SHA512 (1e296d5.tar.gz) = 05df2a8d7fe021756262f0b45adf03c4560edd56c1d2351da8aa8c391914fd3049937d85dadd06929839754cd1dfbf4a8432728dc9803a88a823c7cfa1be5274 +SHA512 (2daa95f.tar.gz) = 91e592ae75aaee07950b658e2144e1b75de72ea0cc7ef7c1d613fd0b643e3ab5e200b52ab531c987d59690af11d38bcce5b0f57cc12d74be743c6cafa220e78a SHA512 (ant.tar.xz) = df73f505ccb93552634bbf0068d1e1c130007c24cc4bfd5f4fd2650c9e046cad1d3e568e2a840cbca0680d1adf16354415c0d6a9327f32895ac09e8b2aa16eb5 SHA512 (apache-pom.tar.xz) = 16f4785c147578496f3358c5c4201374c48203f5f1527dde51d4cb16bee5826b501c56d3a1c2fafd57f38812ab914d7002968dffc69fa256e041dc66d2a1b725 SHA512 (apiguardian.tar.xz) = 55044887656bd23e08a8e546856b24bdeaab91499aa15d560a607e65b3346d78895b31a2a1e302edb7e2104ceed7e5c4b35f5de7ec0118fd1c0f19571ce41a45 @@ -25,7 +25,7 @@ SHA512 (easymock.tar.xz) = 33880a667843f06c9156f31960404d75850f494b72d7722a3bdd0 SHA512 (felix-parent-pom.tar.xz) = 25a8795f628f165e52a475252441457e3aed9efec3532a96ed8f061df1f22d8e0f08900e20ec7cd85322ff5112b39303fe9a1f5b6390eb5401fc475aff7fbc6f SHA512 (felix-utils.tar.xz) = 826954c0880127f2e6a7805424d26386a9ef6664b967f65ba644e9346dc9727a52e3622bdaa9dd692af7ae93f325e60c14c1c5498735a36de70182284c6e6ab4 SHA512 (fusesource-pom.tar.xz) = 79868d1ade2ed501ff6857dc4a547f8c0e9d9e1423908e16c308f44cf26d4e677faa6632e77dd6c8e6e6ce1377c2dc967fd244e16b56b22a9b786fbb50f67df9 -SHA512 (guava.tar.xz) = d91e610900925e8159d0db11c5322b74e249e85a35aaeec6962d4eb06cb926fa3c717519ed87ecf11aaa22c46ef2db3aadf0b325382ac040753fd3bebcccb4c2 +SHA512 (guava.tar.xz) = 8db347a5b4d2da14dcd03c54b42b8b39c89931104e8be0c3709d25af2e5da2071b2d3543f4e90bbc5ad7924454fad4ab8186d30ec676ea50534adda821b93291 SHA512 (guice.tar.xz) = 233b8361107bfbd5cf13757ca864833d863968a39b5e30482d50f32626b903f4ae5d9d63e02cad17777f4050793c54a9091603bbf1dc670a84e88c5130ed943a SHA512 (hamcrest.tar.xz) = 9ab6d70ab5611b6fc52bf31afad93e76394d9341dace0361128bb22f77b974b62fa581926aa768850f2b24e758c7307f1f56e4dfa85ceeac83447ac7c9eada36 SHA512 (httpcomponents-client.tar.xz) = ba2f8cab32104aadf5a77ed3e1e16798b05471695eca9efe22b1a0fccf839540610ad55c65a5c3b948983e905b178eb7527da5e309d7a21f0c57bdead8150f26 @@ -34,13 +34,13 @@ SHA512 (httpcomponents-parent-pom.tar.xz) = 5b877ef9f038312fe2cd17f5e9930b6fb771 SHA512 (injection-api.tar.xz) = 2bfdb53c69322a5f7458a3acc59dd4b83b7969eb8312534ac8c0e60d4fb2f679df4690c6268b453ec19c791a156d111fafda5d113892e2412327d02325af4a16 SHA512 (jansi.tar.xz) = 2847c0d38b000d21acdeb1c32c6d9bc9796d0472b554aaae8c7144ec35f17b0d0e27268276568a5d61ea450e5a624c46732fb349c58a4900c02ea859e9ba7628 SHA512 (jcommander.tar.xz) = f6d3355d29f4c722a5e2644b1b3ff91ce43096eb3464dbe4e4c73f23c92ece97dc8ddb38bd1e4eb184722612b14c39cedbb41886069debe8cb2eb5fab3d01e24 -SHA512 (jdom2.tar.xz) = d3a3d8cf69fcfda48ced37f73a97711a5607bcf3a9fa73fe3cf0f3eb1dd6e2c4e727cb9f8b496ef9f3f9f46aab1e4f656d13059c798e713bd2b996a007e4f259 SHA512 (jdom.tar.xz) = ced2c0c810be0b39b788259c649a2035d88710de5c5ae7a71daa62c7cdf81e38644f0cc289ae4a74ab313e50a5d05555423932af50b09e3a85e72d9440cb3c6a +SHA512 (jdom2.tar.xz) = d3a3d8cf69fcfda48ced37f73a97711a5607bcf3a9fa73fe3cf0f3eb1dd6e2c4e727cb9f8b496ef9f3f9f46aab1e4f656d13059c798e713bd2b996a007e4f259 SHA512 (jflex.tar.xz) = ef9ee7dd44b8fbf9a40e9e3f7169ce9bd14d8d724a8f3ca3ac0a6d00d0d8093bf8ebd047c99338613e3eb5d6942bba3d1c1ef36e113660ae41207f69d25af042 SHA512 (jsoup.tar.xz) = da78d6698f9edc8ad3f2585f1c3581a16af65610cf4e4a2df6581dfa6a6917aab64ee85a8d706028b199f6f87f0dcc6227f9b6b312fdf50776827200971037c8 SHA512 (jsr-305.tar.xz) = 58843b9aa8cc959af6203ee73191ec8d8b1b8a3ab17e23c25bd6ad977c26cbeaeb3ff87ffbfb89e28dafd7406ff4eeb67a904caded9ff7246e917cc10017932e SHA512 (junit4.tar.xz) = 05b76424587e3cf8847698e9cb65244baf3f68abaaef33a9d0a6d71eeecdb239a53846c377d74f708e4516fb3bda856fa68b9871d489286471ff12b5494dbf8c -SHA512 (junit5.tar.xz) = 6a7bac6870c4e0532134695285fbe8be0c1f1561bf8266948306132aa7e0ba8a539aefd9fde54827f787fb8817ec2a31ea12aa24a4b792cf22258fc3fee017d9 +SHA512 (junit5.tar.xz) = 971ab7277efc436709350a178a2d4390d391f2993868c547804c786efeadb82b43600c2df93c68b588e9adff1977306ee660fb347e38ef9aabe851717bed17f8 SHA512 (maven-antrun-plugin.tar.xz) = c06c14dc0bd3dd1cbdba4a6168ac7a7b678d77d136bec615316e025548f13a6311c829cd79de5436ff268a44a956aea479a9b1af935e46ee97e693031fcb9000 SHA512 (maven-archiver.tar.xz) = 5372fc35dcb0487c8b0fd8c846dc30c6cda7233bf93d347d4317da8b322dbd5fe35968de7bef5ed33c07857571ba4ee84715fe613d57ce8db1338318a9ce5afc SHA512 (maven-artifact-transfer.tar.xz) = e8b59a4352e2d047090bfb2d48117380dab12cbeffc7a1e96f23262f26877b7d582e92d1805672f40e53d8b39ca8fbb6ba5824dc49875d26310ae98b33b6c0c8 @@ -67,9 +67,9 @@ SHA512 (maven-shared-io.tar.xz) = e56af091151ee53587edd52943e7527bf6329920d0ebe2 SHA512 (maven-shared-utils.tar.xz) = c5f7d7c0830496e5d0191a77700f2d765ffc85d532063903a1d4f286adbfe3be87fcb257e9635b674cfa54654c352df996de665d60fa5d4ed42bd059b8048368 SHA512 (maven-source-plugin.tar.xz) = da94c4fbc819fb04a7ba6efd9fceac194837bf6cf754f00fe162db964321f2fb860f7c074b51693bfc0aedb31f9eadc0356d5e694838a4ef8c8fb9d390d454e8 SHA512 (maven-surefire.tar.xz) = 136d6ff35242e11ae293f21e9e42d2ab0b6ec379e64324a82ec5d0b8ae43072b68557f87c5f02227064899a638560c67e82ae4a5a7a1313eb8d198a60603c26b -SHA512 (maven.tar.xz) = d1392683175146e1328e97e24ba03eeda8d77f5b59695259971bbbc5d2c427954d6e06127b0445b8cbb3c156d0cf751d68668f62936256442e376cdc2b0e0725 SHA512 (maven-verifier.tar.xz) = 54deb814e5d254ec50c20c76f59f164ed7063a85b5828bf9fd4a727e4a4f936ae3d07a5854b016bc491e6730550eca5dd694c873cdbdc84f9b867f6daf4bcd14 SHA512 (maven-wagon.tar.xz) = 04983cd8e4d4f7083dc847adba6f7063f995566bc1a5625c29ad5566ce871297dc7fbb2046b1ff8551d309463f82c041c7ce8311a1a9b53fb32b3866eb3cdece +SHA512 (maven.tar.xz) = d1392683175146e1328e97e24ba03eeda8d77f5b59695259971bbbc5d2c427954d6e06127b0445b8cbb3c156d0cf751d68668f62936256442e376cdc2b0e0725 SHA512 (mockito.tar.xz) = 3737689c08b6cc43b2422fdc6dd2e0fc3c7fc21a65fe7cc96f7f70466f086972b7436434d047e16d7e692eabf06183feef4b911a5bf327a8565a8972e4c823d6 SHA512 (modello.tar.xz) = 93d92ea186d830bcc388b459d3b28a2612ffe5de5ad9d28acc20441d0ee07951ade832fd8e68616314e9b8ec66db1db2713839b20350c4833ed9beecc7ab58fb SHA512 (mojo-parent-pom.tar.xz) = bcce1eb9c3a1c225a52f63b400b1dc1d3dc52650eb058fef0ec54f849862800d31e40929a20dd012839b4d4ac37cc6b49876b2244795a27b3a024fda9cb35ac5 @@ -81,7 +81,8 @@ SHA512 (osgi-cmpn.tar.xz) = 1c3ee095a8b89e8a553d3e0f2a0b8cabdec203aa0810829b64ba SHA512 (osgi-core.tar.xz) = b1e9c98a38cb7d6ea0bd495a9f5c28168fbec9474e782144ac42e0ce5b615d757345f319bfc2d40a3c04a1e460fbe2c7a9cf22920fd49990429838041962dac2 SHA512 (oss-parent-pom.tar.xz) = 11e88e748e13a48262f34de209169e60da5f8c9f548b80212a80ae767d7f5d3aeac7d03d420d78da14e9e64a299904411c54d59a0361c4290c696c52efe350d4 SHA512 (plexus-archiver.tar.xz) = 21d34a9df09f4a89bd14fab2ee8f10a257c58f8f8a7fd11c7cc57b5f7fb327768c1a92542a2f0286f24aa6aaa91322d484f463310ef5bedb26d9f2dfad893d5d -SHA512 (plexus-cipher.tar.xz) = 4080ff531e2d75ed114670861f7ccc80348588a0aa133e17811e3f0ba6a8af44ed749df8d10f41f58790e3309859eff9e995945a5f9356d86c9b46c254ab449e +SHA512 (plexus-build-api.tar.xz) = 53798b7ade9d645035c4feee7862d4ede715937fe3d317acd3e19070366e8eae47dfc639a76f55a8bdddce1f6efec385775f91581279bee5ae98c52e3b92fc9d +SHA512 (plexus-cipher.tar.xz) = c24484c9a4280f9ec8bcd36ad27a452f9bff1bcbc717a41c23be5b0c5dff583730c91fc4355bc8656840a9ef5ab1dfbfa13ff9f96d2cc5aa705a57d554aea9d9 SHA512 (plexus-classworlds.tar.xz) = 769af97c043b3675a49960cbabff04e748134770fc36d9ede6e52a0acb6b2ddc9dc0e51e05cc6d3e8e2c33a76441794381f05c4927d70d4b1fc9ea7ee84472a6 SHA512 (plexus-compiler.tar.xz) = 4c9af6a934d2f8cf0712fee364d9a4723323102b4f6b64ccf4b74bcf3fe8cdb9d04d50261026dbd63a770fab97f03fd3ecf99f903d6707e29dfcaedc74b092d7 SHA512 (plexus-components-pom.tar.xz) = db043d3217366428f15e2cd9289e53d16b6c47cf25ed83e69dcab225c20aba965f7974e4ea1aa4d62084bf30e4c0c37859720fe8dc6f624348fd71d567d78dd0 @@ -91,11 +92,10 @@ SHA512 (plexus-io.tar.xz) = e2bd3152749001a9133f2d2184b5559a2bdcc8991d00ee6cabfd SHA512 (plexus-languages.tar.xz) = 3ac9565c15d885c84a7eaa50e10ee318cbca1a9a39b6c1b5bbfe2a0b50dabc17f1f23544dba97a1a4b0a6f6e2970ca6fda7ad3601ffdfbe2da54708765781f4c SHA512 (plexus-pom.tar.xz) = d4a16a42bed1ad143e0fc87b754f9299082e29aefbf44b3b134dfb74f0ea9813bd955491605a859d253d7d70c0f6f32a7cb475bbfd4fe2baf2197375003e9f6a SHA512 (plexus-resources.tar.xz) = 8b7c55468661311b1faf1eee83d0c491986cfbe5aed38b9298362b82bb384cd583ea476b337dd6393c492c16f70192cd9a763d53920df64210ce9c22f4be635b -SHA512 (plexus-sec-dispatcher.tar.xz) = 4fa97396d72f6f7c43160c1f303bd4e5ada5bef4b912a7fdf75f5721e466c420c4415e0031d58fa060493ea2a1c1ee39800250d6f13a8b1fb19b10e729413764 +SHA512 (plexus-sec-dispatcher.tar.xz) = bb1818f464352a663981af47eafeefc0c2f871ea3c872b3e7678acfdc10bbaa162934e720cfb1c9c3a53b9ca88ab13109a4be219513c16164373008871b84f35 SHA512 (plexus-utils.tar.xz) = 7d7b07bf744a6feb2bdd92c684a0330213c9c8e6518ffc6edb3f72bc6bfb8a24f5721acb7189912af9f53c03e5f9119300533c9615007fe03d38047237b67891 SHA512 (qdox.tar.xz) = 922111989f6472c1bfdffe78d91ea8da94e704f122a6c3f9d5d87c22647c412b69f0ebbd4a737650163b14c7102aaddbd1164dfb364c6a92a3638ac5b6c9c264 SHA512 (servlet-api.tar.xz) = f1731aa67600034edeb10a60030cb22f650b036de71a8309dddd3fdfb475436512a35dbdb6f1b985fa31964b018cddad51c5909a9c6a2bcab025593ecce4c74b -SHA512 (sisu-build-api.tar.xz) = 6d1dc0cbfba6d78eb12f2e68c955c49a85ee5a07a696d83d31efe8eba8ccedb887036be280de0c805c0aeb6b8ff35ff4ceab5231ead8cc9d467fc27226e576d4 SHA512 (sisu-inject.tar.xz) = b0111b6c8e4103029c528a2bb169a4afd5bc58e52564cc34fbc006adb653abb265a92114bb2461ae6720e6787a5f60a32897781cbe0f54e070edb6520b145750 SHA512 (sisu-mojos.tar.xz) = 3ff273562c3b7f061dc66c53bd39a32914b9ba45f37b99a023fe7f9d65bdb4333fe45f9b9a687e83531566ad64f4b3e24d35e6f9effd6b55e8b396daa5f3f7cf SHA512 (sisu-plexus.tar.xz) = 736896a5bb6230338341ebca1cbbc4d258faf5affac88d178252eed6173dada281299ecac9df03f133c3199eac7230c7a37d3f1902c6a164453b120015030c7b From b8e791b96bfa037bac8760375bd90f51649ee07f Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 2 Nov 2021 20:03:01 +0100 Subject: [PATCH 23/77] Re-upload sources --- sources | 216 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 108 insertions(+), 108 deletions(-) diff --git a/sources b/sources index a9f910a..99cb819 100644 --- a/sources +++ b/sources @@ -1,109 +1,109 @@ SHA512 (2daa95f.tar.gz) = 91e592ae75aaee07950b658e2144e1b75de72ea0cc7ef7c1d613fd0b643e3ab5e200b52ab531c987d59690af11d38bcce5b0f57cc12d74be743c6cafa220e78a -SHA512 (ant.tar.xz) = df73f505ccb93552634bbf0068d1e1c130007c24cc4bfd5f4fd2650c9e046cad1d3e568e2a840cbca0680d1adf16354415c0d6a9327f32895ac09e8b2aa16eb5 -SHA512 (apache-pom.tar.xz) = 16f4785c147578496f3358c5c4201374c48203f5f1527dde51d4cb16bee5826b501c56d3a1c2fafd57f38812ab914d7002968dffc69fa256e041dc66d2a1b725 -SHA512 (apiguardian.tar.xz) = 55044887656bd23e08a8e546856b24bdeaab91499aa15d560a607e65b3346d78895b31a2a1e302edb7e2104ceed7e5c4b35f5de7ec0118fd1c0f19571ce41a45 -SHA512 (asm.tar.xz) = 6722097cb6f9137044b52e7a65445f9450fd15b5f1017d30dcbc9d5e387234316d4e26387634e2fa83ae55f3986d899e952571924b9e57eab926a51ab463c95b -SHA512 (assertj-core.tar.xz) = ff43826811e968d93724f3877afd8cfe99e0ad4877e568d288f5f813e6ba9652cb3fb259b14bff9252a89449d9a67bc7fe605f188d63d1936f90baedb0d03e52 -SHA512 (bnd.tar.xz) = 4caaea5c02d302d052b753c7a4b4fc9f725239be1ba1824b9871b30842b32e7794a7580648a6bbcc7f6d2a8ff61fb8bd2293f90626a19453b55f5854f095caee -SHA512 (build-helper-maven-plugin.tar.xz) = a10176b562e2d7edbe109aec397e4ae1cdca1b3d27494644b483c874d08731478413eb0f3a4308aa2279d2883fba072fbd1b8a8f428447044a18195a46942219 -SHA512 (byte-buddy.tar.xz) = a76b6bb9cfae056bb9dc470f284f1703ba116e90e2137f8f53b571aea335e639f386255bd78f874b6f5f2993c9a530b0c23ef40a20c1b222dbb1019146d3b0c4 -SHA512 (cdi.tar.xz) = 95b9c229ab2106de9133a9cea45f56bc85c2b32d348af0b56386ea782764a5cad1330aa9c8f68a92c0cad9a932a50fadd1a6f6f173a0497ccb267f7cad5f7b29 -SHA512 (cglib.tar.xz) = 6641fdbcac9f68bf5fcd97a102e18fc62491894155b8d26fb3d6ee393d12c5165890f4c1346b4b1d1736fdeea2f489aefad2a4b82000b16ef5c6f71fa5e720d0 -SHA512 (common-annotations-api.tar.xz) = 7f135480c6b8b9b3fc9472f570f4b82df773d9971814558f2742eed1f5ef5747daa95cfe88765edc72ba1d68c743e780733b115130ac93bdc8394f4824a42ed4 -SHA512 (commons-beanutils.tar.xz) = c949b81843aad73e969c3671649d48efab9d29dffd74e752e7c17af39d0332c9bfd8c17fb4d0d66873db24adbb37ecf682a47ec248c131c844a0d067c6f58b35 -SHA512 (commons-cli.tar.xz) = ee6ae7dd58aea611fbf8770d131dc226b20e189dc33ef99d13eb71b7700336cff973d26942c6b76c5142e3f397046e8a7480048aec59a2460cfb53a7a292d350 -SHA512 (commons-codec.tar.xz) = 6dcff937bf44772a5741fc823a5a5e97394e440968ebad83101761f929ba6c0c6a24f775cb86d7ba094e2a7ee5c8e468d425ef99b23aae869eb927ae397142ce -SHA512 (commons-collections.tar.xz) = 4101d7590734932f08cf5a51d2c28a4e1b7d4a61b013f4f24e4f042ef70081225ef5b2d47620a0a34a216b8245c9a7a2f63f9a3d9d5d73e23e107218f0f3bf51 -SHA512 (commons-compress.tar.xz) = 2ddd542560f6547bc742aff869f6619dbbf8ce2143dca34087e9ed0bca903614e74a0b7c2ea219957822776c2e5f36121604eadb214850574cecc2482b71ddae -SHA512 (commons-io.tar.xz) = 3ad83ee71ef382b2e35be3f85b05cd19e3ea49c3a04018b7dbe866ac16be0b241b5ba93c03c2ea2ca441b9edd3ae54d36db12532de0b69453e0ab7cbe5f1302d -SHA512 (commons-jxpath.tar.xz) = 1bbc91d1755a115044aa631f042d05e192050feebd29f515e6fd8216e01b1c2654961c353c6f515b7e02d7022bd7c45ed85a5c5e232c8c89f9f0892081f2f27c -SHA512 (commons-lang.tar.xz) = 3d17f7013ec545faea8e6aa3809bd460efd6ce9d9908cd1d4a07c0062cfb66cf3ef345100d81222fc6bec49f5dd7203ef290cd572a13851a7e8c34aec828f394 -SHA512 (commons-logging.tar.xz) = d406a137a6375f01b399d82d868694d28a2c3613f8afafe54aa0c29fa83f730ee6c460ad93c83e97ca0e6b883216e37ad4fad226d1a2616bab9e154e5f3c4d0a -SHA512 (commons-parent-pom.tar.xz) = 15c4dc847f446358a80a0c08042c78a4329b322cbf6420c42d66fa63aa5c7965e3351fa8221bf45e5b49e934e6a9c2453e92cc7cd7781d501a3124f7f2a46dfe -SHA512 (cup.tar.xz) = 2520269875b67d92898e94e313712b9c21f302eed7c5589a93890818e375e0cb748a83dbca2c175260dff0d59fead4ce12cb80728186562dffd830d5fc8ec19a -SHA512 (easymock.tar.xz) = 33880a667843f06c9156f31960404d75850f494b72d7722a3bdd0cef8eab50ef1d6bcd0a08006c06e9e1a535336ca89fc8d267e560d47b43ec0f0ac595098133 -SHA512 (felix-parent-pom.tar.xz) = 25a8795f628f165e52a475252441457e3aed9efec3532a96ed8f061df1f22d8e0f08900e20ec7cd85322ff5112b39303fe9a1f5b6390eb5401fc475aff7fbc6f -SHA512 (felix-utils.tar.xz) = 826954c0880127f2e6a7805424d26386a9ef6664b967f65ba644e9346dc9727a52e3622bdaa9dd692af7ae93f325e60c14c1c5498735a36de70182284c6e6ab4 -SHA512 (fusesource-pom.tar.xz) = 79868d1ade2ed501ff6857dc4a547f8c0e9d9e1423908e16c308f44cf26d4e677faa6632e77dd6c8e6e6ce1377c2dc967fd244e16b56b22a9b786fbb50f67df9 -SHA512 (guava.tar.xz) = 8db347a5b4d2da14dcd03c54b42b8b39c89931104e8be0c3709d25af2e5da2071b2d3543f4e90bbc5ad7924454fad4ab8186d30ec676ea50534adda821b93291 -SHA512 (guice.tar.xz) = 233b8361107bfbd5cf13757ca864833d863968a39b5e30482d50f32626b903f4ae5d9d63e02cad17777f4050793c54a9091603bbf1dc670a84e88c5130ed943a -SHA512 (hamcrest.tar.xz) = 9ab6d70ab5611b6fc52bf31afad93e76394d9341dace0361128bb22f77b974b62fa581926aa768850f2b24e758c7307f1f56e4dfa85ceeac83447ac7c9eada36 -SHA512 (httpcomponents-client.tar.xz) = ba2f8cab32104aadf5a77ed3e1e16798b05471695eca9efe22b1a0fccf839540610ad55c65a5c3b948983e905b178eb7527da5e309d7a21f0c57bdead8150f26 -SHA512 (httpcomponents-core.tar.xz) = 73e3bb628f57a0fa17994b4b66b54248c3abb548492a965e50a48067a7bffd983468f57720d5473100794e176415584849c04271d308f6ed5b9e6f31148d0443 -SHA512 (httpcomponents-parent-pom.tar.xz) = 5b877ef9f038312fe2cd17f5e9930b6fb771ff5d1d57d6e60812332502e2fde0ca53498be53a85d8652427afdc73dc747d21ec69c25a059a4dc53758ff405df8 -SHA512 (injection-api.tar.xz) = 2bfdb53c69322a5f7458a3acc59dd4b83b7969eb8312534ac8c0e60d4fb2f679df4690c6268b453ec19c791a156d111fafda5d113892e2412327d02325af4a16 -SHA512 (jansi.tar.xz) = 2847c0d38b000d21acdeb1c32c6d9bc9796d0472b554aaae8c7144ec35f17b0d0e27268276568a5d61ea450e5a624c46732fb349c58a4900c02ea859e9ba7628 -SHA512 (jcommander.tar.xz) = f6d3355d29f4c722a5e2644b1b3ff91ce43096eb3464dbe4e4c73f23c92ece97dc8ddb38bd1e4eb184722612b14c39cedbb41886069debe8cb2eb5fab3d01e24 -SHA512 (jdom.tar.xz) = ced2c0c810be0b39b788259c649a2035d88710de5c5ae7a71daa62c7cdf81e38644f0cc289ae4a74ab313e50a5d05555423932af50b09e3a85e72d9440cb3c6a -SHA512 (jdom2.tar.xz) = d3a3d8cf69fcfda48ced37f73a97711a5607bcf3a9fa73fe3cf0f3eb1dd6e2c4e727cb9f8b496ef9f3f9f46aab1e4f656d13059c798e713bd2b996a007e4f259 -SHA512 (jflex.tar.xz) = ef9ee7dd44b8fbf9a40e9e3f7169ce9bd14d8d724a8f3ca3ac0a6d00d0d8093bf8ebd047c99338613e3eb5d6942bba3d1c1ef36e113660ae41207f69d25af042 -SHA512 (jsoup.tar.xz) = da78d6698f9edc8ad3f2585f1c3581a16af65610cf4e4a2df6581dfa6a6917aab64ee85a8d706028b199f6f87f0dcc6227f9b6b312fdf50776827200971037c8 -SHA512 (jsr-305.tar.xz) = 58843b9aa8cc959af6203ee73191ec8d8b1b8a3ab17e23c25bd6ad977c26cbeaeb3ff87ffbfb89e28dafd7406ff4eeb67a904caded9ff7246e917cc10017932e -SHA512 (junit4.tar.xz) = 05b76424587e3cf8847698e9cb65244baf3f68abaaef33a9d0a6d71eeecdb239a53846c377d74f708e4516fb3bda856fa68b9871d489286471ff12b5494dbf8c -SHA512 (junit5.tar.xz) = 971ab7277efc436709350a178a2d4390d391f2993868c547804c786efeadb82b43600c2df93c68b588e9adff1977306ee660fb347e38ef9aabe851717bed17f8 -SHA512 (maven-antrun-plugin.tar.xz) = c06c14dc0bd3dd1cbdba4a6168ac7a7b678d77d136bec615316e025548f13a6311c829cd79de5436ff268a44a956aea479a9b1af935e46ee97e693031fcb9000 -SHA512 (maven-archiver.tar.xz) = 5372fc35dcb0487c8b0fd8c846dc30c6cda7233bf93d347d4317da8b322dbd5fe35968de7bef5ed33c07857571ba4ee84715fe613d57ce8db1338318a9ce5afc -SHA512 (maven-artifact-transfer.tar.xz) = e8b59a4352e2d047090bfb2d48117380dab12cbeffc7a1e96f23262f26877b7d582e92d1805672f40e53d8b39ca8fbb6ba5824dc49875d26310ae98b33b6c0c8 -SHA512 (maven-assembly-plugin.tar.xz) = 3d4d5b90c780301b7fd2c7c0cb1f87d1bbf6747f00b08075584e9995bb87f18a9434c7c62aa73f4a34648609bd101b2f535148e19c5f2f8dab493995882fdbf9 -SHA512 (maven-bundle-plugin.tar.xz) = 203999f023e09789c304a080d390ebbf7def09babbf8e99684c1d668f3ee6071b56c0f5f17359c9ff6646ce6f1507353d408e8d17f55f29723474533abe14f56 -SHA512 (maven-common-artifact-filters.tar.xz) = 21dfc5641ad0bb72c01014283e7071192a2b26b075da54a2fe38b67118a5b00846d57de7ad89455779ba3cb3a29a533642498a1e2aa9cb77768e164b52e630bb -SHA512 (maven-compiler-plugin.tar.xz) = 29dcab26314ff2a2a34ff98b8193af9d78c86f779f2d8a59424a6c959e4a5883455d4f7a25015cdfa5e7661d4f2224f7c50e7b6b16a41daee7f09aa9eaf8ec62 -SHA512 (maven-dependency-analyzer.tar.xz) = 9179c32f86349b1b939aa862c9d04fa1b1c7731d31b1702e71a8c7175125d8eab5c0fcccce8af95280073345d53953e2a37ce8cddd31b9efb0f8b27aecaef278 -SHA512 (maven-dependency-plugin.tar.xz) = 02ff9fd3c265648e5ac17441c277295003a813cda2c2f5b3517cd044d109faa057997105fa3b4683f0ac1e79758e1eafc6f7158033fb697355979a92e264ae2f -SHA512 (maven-dependency-tree.tar.xz) = c3d34b25c8457bb4b65fae74cf1ac52d337ffaf0db6a40b5b85d586c9ff26c733bd673f67a24077a94769650266d9f5d170a934ecfdd4fc44d0d3dcd05278a36 -SHA512 (maven-enforcer.tar.xz) = 0b0115fb7294ff3e8dcfd899c13d2674b535fbf3172dd9d3a334c1f2240df4a409a5801c878e8c8433079d16a047104645d031bfa188dad0c422c64210afd97d -SHA512 (maven-file-management.tar.xz) = e72fa521c57dda10977b5ca91a4b13adca878900a53165c48d58d4720f2380b3c53b9113239d5a71353f13b0d043c409185db40158b7ec6928d99a0d7b5e1fed -SHA512 (maven-filtering.tar.xz) = 2933b27f170ff25c74ab8ead5d00f1c11782d31df283a4e400775ab5e3cb981218c8da76b8b75e9a322938af32e9d4b44747253a69a55c6b4b6b4dcbf877c126 -SHA512 (maven-jar-plugin.tar.xz) = 8d319a9099cf8c5d891fd7d0d0d9c274b814fda000975b14298e03ba354ae63ae9de10d34a6306fdd6fc45493e64679fd56f019ad52adf0a41e10a7927291340 -SHA512 (maven-parent-pom.tar.xz) = dbed2a2f9f54c7e123124ef5479d71ee0a93b3139a0824c9b3b4b3f6c4d586a57f60e05ff183b1bc538f5b353c8873f6f860a81ec63e1c48127513a137f0f3ba -SHA512 (maven-plugin-testing.tar.xz) = c343fdc258b5884e801d74926767ba84c7dd1769d8215bf05c7dee955f3327cf216cffd39be4b96224523e4c16430edec81b934ab1543b328fd28f461360a2eb -SHA512 (maven-plugin-tools.tar.xz) = f084a81115c66f5be4c031cf23a522aaf5955cb0167155d998c71340591298e6744f932134b425b63acefc9af7a140484d2d99b263b0b702e091da392a88a7ae -SHA512 (maven-remote-resources-plugin.tar.xz) = 4c54f1a75c4dec4c48961f7c1ded4bb219dc10b246346a267a44b7e4a178b2cb23c25e81a41bd041975ed9ca37cdc0120b1e1da0fef86e56bb3a8415b26a9c39 -SHA512 (maven-resolver.tar.xz) = b7549e87f6ff0c707edd0d9dad7dd3e48587d00867b0aa32c02ddb0966b897ed8521f3f33148307092b6559fa8e75213529360839f78ae145ffde5cd85725372 -SHA512 (maven-resources-plugin.tar.xz) = f28fe60efe7c619201fba582327048e4bfe49b7ad8e55bf684c5c5e4ff12d23c92e3e02cbc0bd6ba977920c9a891ff6b27666b1f4a9ce0c5b03aeeedb7bf1843 -SHA512 (maven-resources.tar.xz) = 9be130f3b9e098635e5f62acabd60d4ae66b1658b18ed8630aecec8ac7fc9e5c19e04894e79b5a11e656c1261d5b270beb9f71080b404a0db8927853cfdfa8aa -SHA512 (maven-shared-incremental.tar.xz) = 50f7cbcc3496fcf4b834bfeeac770d610deb8b35a60bdf3cd5d18eac0615bd1853377a83dc1bc1744c3b3e4d66df8cea722f3b7be626c855053c337deb0d1118 -SHA512 (maven-shared-io.tar.xz) = e56af091151ee53587edd52943e7527bf6329920d0ebe2011aec075d56e05ce5b36c99f49e31adb5ee62dea6af1b977376df4f3646e306f9e8d9854d23aae587 -SHA512 (maven-shared-utils.tar.xz) = c5f7d7c0830496e5d0191a77700f2d765ffc85d532063903a1d4f286adbfe3be87fcb257e9635b674cfa54654c352df996de665d60fa5d4ed42bd059b8048368 -SHA512 (maven-source-plugin.tar.xz) = da94c4fbc819fb04a7ba6efd9fceac194837bf6cf754f00fe162db964321f2fb860f7c074b51693bfc0aedb31f9eadc0356d5e694838a4ef8c8fb9d390d454e8 -SHA512 (maven-surefire.tar.xz) = 136d6ff35242e11ae293f21e9e42d2ab0b6ec379e64324a82ec5d0b8ae43072b68557f87c5f02227064899a638560c67e82ae4a5a7a1313eb8d198a60603c26b -SHA512 (maven-verifier.tar.xz) = 54deb814e5d254ec50c20c76f59f164ed7063a85b5828bf9fd4a727e4a4f936ae3d07a5854b016bc491e6730550eca5dd694c873cdbdc84f9b867f6daf4bcd14 -SHA512 (maven-wagon.tar.xz) = 04983cd8e4d4f7083dc847adba6f7063f995566bc1a5625c29ad5566ce871297dc7fbb2046b1ff8551d309463f82c041c7ce8311a1a9b53fb32b3866eb3cdece -SHA512 (maven.tar.xz) = d1392683175146e1328e97e24ba03eeda8d77f5b59695259971bbbc5d2c427954d6e06127b0445b8cbb3c156d0cf751d68668f62936256442e376cdc2b0e0725 -SHA512 (mockito.tar.xz) = 3737689c08b6cc43b2422fdc6dd2e0fc3c7fc21a65fe7cc96f7f70466f086972b7436434d047e16d7e692eabf06183feef4b911a5bf327a8565a8972e4c823d6 -SHA512 (modello.tar.xz) = 93d92ea186d830bcc388b459d3b28a2612ffe5de5ad9d28acc20441d0ee07951ade832fd8e68616314e9b8ec66db1db2713839b20350c4833ed9beecc7ab58fb -SHA512 (mojo-parent-pom.tar.xz) = bcce1eb9c3a1c225a52f63b400b1dc1d3dc52650eb058fef0ec54f849862800d31e40929a20dd012839b4d4ac37cc6b49876b2244795a27b3a024fda9cb35ac5 -SHA512 (munge-maven-plugin.tar.xz) = 573c010ca107cdf32440d5dfa95a1ca400da7fd3d56f8355fd99257fb4ec83d2818638c06f06ba8f0ea882a3515fc64931c6342e4ec167488b11555023a5e7ed -SHA512 (objenesis.tar.xz) = 99a3b9da3baec726aeb643a72494617d5234d31e063e0e81c0716a3e0a7d9b773b591f215ea82f3dc6d781d4294e60143794409073739caf07917b14b231015c -SHA512 (opentest4j.tar.xz) = f28358721018eb98959427553300e2bba4cf592016c7e83f25c907236caab0e77c537cbe1fd9685edae3e125bf0feb87560ccc991d37e381d377c1d48197c2a4 -SHA512 (osgi-annotation.tar.xz) = 76af1486e96eb79e6806c667ec5e578730a5feacbaa4b557311bf18699aca4880aec2ba196479e4d723401726a90e4523b31e4fc1c8f03f0259a1aa8f6899478 -SHA512 (osgi-cmpn.tar.xz) = 1c3ee095a8b89e8a553d3e0f2a0b8cabdec203aa0810829b64bae885de701541ce11185b02bb5d09c5965fa66390b534997ed0440008a46bd09e3673f72f6ecd -SHA512 (osgi-core.tar.xz) = b1e9c98a38cb7d6ea0bd495a9f5c28168fbec9474e782144ac42e0ce5b615d757345f319bfc2d40a3c04a1e460fbe2c7a9cf22920fd49990429838041962dac2 -SHA512 (oss-parent-pom.tar.xz) = 11e88e748e13a48262f34de209169e60da5f8c9f548b80212a80ae767d7f5d3aeac7d03d420d78da14e9e64a299904411c54d59a0361c4290c696c52efe350d4 -SHA512 (plexus-archiver.tar.xz) = 21d34a9df09f4a89bd14fab2ee8f10a257c58f8f8a7fd11c7cc57b5f7fb327768c1a92542a2f0286f24aa6aaa91322d484f463310ef5bedb26d9f2dfad893d5d -SHA512 (plexus-build-api.tar.xz) = 53798b7ade9d645035c4feee7862d4ede715937fe3d317acd3e19070366e8eae47dfc639a76f55a8bdddce1f6efec385775f91581279bee5ae98c52e3b92fc9d -SHA512 (plexus-cipher.tar.xz) = c24484c9a4280f9ec8bcd36ad27a452f9bff1bcbc717a41c23be5b0c5dff583730c91fc4355bc8656840a9ef5ab1dfbfa13ff9f96d2cc5aa705a57d554aea9d9 -SHA512 (plexus-classworlds.tar.xz) = 769af97c043b3675a49960cbabff04e748134770fc36d9ede6e52a0acb6b2ddc9dc0e51e05cc6d3e8e2c33a76441794381f05c4927d70d4b1fc9ea7ee84472a6 -SHA512 (plexus-compiler.tar.xz) = 4c9af6a934d2f8cf0712fee364d9a4723323102b4f6b64ccf4b74bcf3fe8cdb9d04d50261026dbd63a770fab97f03fd3ecf99f903d6707e29dfcaedc74b092d7 -SHA512 (plexus-components-pom.tar.xz) = db043d3217366428f15e2cd9289e53d16b6c47cf25ed83e69dcab225c20aba965f7974e4ea1aa4d62084bf30e4c0c37859720fe8dc6f624348fd71d567d78dd0 -SHA512 (plexus-containers.tar.xz) = 7e7a34374e66cf1f4540c4246260e0d65088f87eef79583f3ada3b49d317395d7f6420d2baf4ea6cc37c5ba2ee7cde1490b1ab61074423de1f01a4054069f85b -SHA512 (plexus-interpolation.tar.xz) = 5f93f9e88aef39753d3901785421367253948449044990d1d974b99f2ae110a52d314a13264766312a9597ef2f8f40240e7773f51daf5d8d162848d95c37bd8c -SHA512 (plexus-io.tar.xz) = e2bd3152749001a9133f2d2184b5559a2bdcc8991d00ee6cabfd8998fde8446ac05c48aca0e427cac06e6589afb466034d26300b5ccede74259ad6b37c382595 -SHA512 (plexus-languages.tar.xz) = 3ac9565c15d885c84a7eaa50e10ee318cbca1a9a39b6c1b5bbfe2a0b50dabc17f1f23544dba97a1a4b0a6f6e2970ca6fda7ad3601ffdfbe2da54708765781f4c -SHA512 (plexus-pom.tar.xz) = d4a16a42bed1ad143e0fc87b754f9299082e29aefbf44b3b134dfb74f0ea9813bd955491605a859d253d7d70c0f6f32a7cb475bbfd4fe2baf2197375003e9f6a -SHA512 (plexus-resources.tar.xz) = 8b7c55468661311b1faf1eee83d0c491986cfbe5aed38b9298362b82bb384cd583ea476b337dd6393c492c16f70192cd9a763d53920df64210ce9c22f4be635b -SHA512 (plexus-sec-dispatcher.tar.xz) = bb1818f464352a663981af47eafeefc0c2f871ea3c872b3e7678acfdc10bbaa162934e720cfb1c9c3a53b9ca88ab13109a4be219513c16164373008871b84f35 -SHA512 (plexus-utils.tar.xz) = 7d7b07bf744a6feb2bdd92c684a0330213c9c8e6518ffc6edb3f72bc6bfb8a24f5721acb7189912af9f53c03e5f9119300533c9615007fe03d38047237b67891 -SHA512 (qdox.tar.xz) = 922111989f6472c1bfdffe78d91ea8da94e704f122a6c3f9d5d87c22647c412b69f0ebbd4a737650163b14c7102aaddbd1164dfb364c6a92a3638ac5b6c9c264 -SHA512 (servlet-api.tar.xz) = f1731aa67600034edeb10a60030cb22f650b036de71a8309dddd3fdfb475436512a35dbdb6f1b985fa31964b018cddad51c5909a9c6a2bcab025593ecce4c74b -SHA512 (sisu-inject.tar.xz) = b0111b6c8e4103029c528a2bb169a4afd5bc58e52564cc34fbc006adb653abb265a92114bb2461ae6720e6787a5f60a32897781cbe0f54e070edb6520b145750 -SHA512 (sisu-mojos.tar.xz) = 3ff273562c3b7f061dc66c53bd39a32914b9ba45f37b99a023fe7f9d65bdb4333fe45f9b9a687e83531566ad64f4b3e24d35e6f9effd6b55e8b396daa5f3f7cf -SHA512 (sisu-plexus.tar.xz) = 736896a5bb6230338341ebca1cbbc4d258faf5affac88d178252eed6173dada281299ecac9df03f133c3199eac7230c7a37d3f1902c6a164453b120015030c7b -SHA512 (slf4j.tar.xz) = 5071068364c08e65058f367fed61b8298e2e19aff6fcced4fb6cd170d7a71b4e24c25e7192745bb3759c35078fff37f7c196a758dc3faee11e696a43db3d553f -SHA512 (testng.tar.xz) = 3377c6a6f40740b0def5eca5b89e522d1a41e6e7c41cbb944baa524b838b203a6458a6dfa234f38b23e45a7de1e6a16ecf288f3d1271812700dc2d82303c63fd -SHA512 (univocity-parsers.tar.xz) = 8438aa3cca3895c74473419f075e824e73bc7752e7fa6b6f33fa5be38a09af60d3485bef031486281b6f91e9b6129381dc742e71b35cf127dc33084a4fc18b3b -SHA512 (velocity-engine.tar.xz) = 81f647534f4361fc8e7065282b1182b4f0c5009ef5b63a85c2c4668e2d0281689970df06f3f7566f77140e157dea674ecd2a120d48d75ab9c7de1cb35a2b7992 -SHA512 (xbean.tar.xz) = 43c7ff1ad83c4b74990bb7e9b7d8f03f655ac15bb06f4833c1fb2dfabbfe7de61d664d4e5a6f7f34bb43f05d3641dd99ac46c3b25e7c568a67b7774fceba9d21 -SHA512 (xmlunit.tar.xz) = 1b91bd589b5bfc595533ee140c29b4da02bb59b17720a9b8e029d0110669f947137fcbdee75e04aea9bd91952719fbd8303d98f679ab8a2296d79ceecb327500 -SHA512 (xmvn.tar.xz) = 62c0a9ef0ad2bedfadbc6ec5846d7bb0f07f42dd8383163004f86278441db40bceef1840e1958270b048d74a18387f3397ae08143324640562ec374a1634508b -SHA512 (xz-java.tar.xz) = 287335c084b80a1fc7510f1dc8d1cc17a815f6ae40f70cca1b08112fe8ba48181a9da3c0bc9328adcece74b677fef1659461ce03082e87a01b8d753fc3ffe680 +SHA512 (ant.tar.xz) = ffbf7b103e0b306d2510df71859f738d5f026a846c62ec79e7c98e3b48fb656cacc24f83404408467164e7827177cbcb892fcf7c66dc21d324aefdc105f6d5ad +SHA512 (apache-pom.tar.xz) = 5d6a2aa92a0f6bd5c287c245e696a1ba91d086e9d72e0bd6c4bfa403dbb627976c747ec4bc1cdf7089fea8939f5b0b5862b73f7e02ce374501639fa25df1d47a +SHA512 (apiguardian.tar.xz) = c3d75e88a983eb53c06007fd01f11c89083e119d2d4ed5d0e97644f45d5e451fd611bee493d720d011562ae29e7cdfd1d6fb4621d17c9db4b61430e62afea2bf +SHA512 (asm.tar.xz) = 8745a2279e0b4d9972d08b782586ddfabcd42d89fdcc06a24a29e75d9905cab0bf6a4c6d76fabd806fcde1159a2667c63bfac94bdce0a535acac1a5124bac2a8 +SHA512 (assertj-core.tar.xz) = 72052a4d49a261677e323aeea504d6ae31e097a8b4cb558c551901e0ef3949e9f6a6d80b599477cdb7251bee40038a05b5d40f3c6876869bd5a267b4543411b5 +SHA512 (bnd.tar.xz) = bb163a650a6f92f88051a6d169d40a2b1b103d12f5e219be55eac16acdf23868ab8544610891c7b0bd58e79a7c8d7dd5fc238b2bc5195b4510f764593966ba2a +SHA512 (build-helper-maven-plugin.tar.xz) = eb45f6d26d89f21d0b306660421425cf0c3f10819f0b2d89c8db334c1574e2bf3196eb4f4cda65e8179ae4822a933190fb2c5276510daf52b2c26020e75f298e +SHA512 (byte-buddy.tar.xz) = d77c1edd729fbf06ca47d23512974b5310a29f3902cccfa1fcf34585aa6beff424d87210014961183440f90748575b61c8640028e906122576a6b877bc938322 +SHA512 (cdi.tar.xz) = 334ffd958aa8915eabeaf8c554cffc0e636e73538d2efa2ddb405903814f9c3a0be99fbb325f2bd6a0207d71dcac7f5d1b82efb962b1ac24db263379c7f759ac +SHA512 (cglib.tar.xz) = 2938c98ed74a95828a1353afae1e79b43725899e845a3e040c2fd9705f87fd523bb9c04f36d8ad1beec21c725bd85d40eeebc30e161334da0469b854f263e9c9 +SHA512 (common-annotations-api.tar.xz) = 2df37b149dd687bff64064ea393e8e93fe907079966c367963fe983ea6edd612f5208113e2432a515d68f2d3d6892a12582bfe1e304b8c71ebe2acbb35c3b2c4 +SHA512 (commons-beanutils.tar.xz) = 8d88c5d46f0536dc952da85fe3554f4d682b03eba4adcd01d9726821d03193d236a5bb89c3b3469c86a767bf969628bdce6916b48a6a4aa0952ae36e1a8a0831 +SHA512 (commons-cli.tar.xz) = 241dbd30e5b8d50664bbf7a17194b5d6300e2f33e0ad1ad150da2ae08eda3a15a4c987c2feb8fda0deef5ddbf1f6b3052712f3ec7ec545e5a5939828c52eccb8 +SHA512 (commons-codec.tar.xz) = 97a2204042029dec4bf92cfc53211510f156bbaaac35a6d58281acb34762ab4179dda5f4e3d806030548c780050753bf7356a80474a372c0fa82f62fff1d785a +SHA512 (commons-collections.tar.xz) = 5033b96edd59c6eba0c6fcb2208755e0a317a66cc218df7e5ad05fa063055085ac0ed683728a979b54ddb10b71c7a0d7fbb2a3249bca361be7a428d84a049f56 +SHA512 (commons-compress.tar.xz) = bf9ffcf78cf348174b1825bebc09fb992e4c5a3f51cfd8db86fad73cdbfd0b89e7d94bcf378a7c2b2683d64a425ff1568f4876a2550e6bbc63ac4c76a48035c4 +SHA512 (commons-io.tar.xz) = db2b973f68240622a4d4b821704478e45bcba73227fe95119bae9a6263344f3d1d91dab11edfb70a70e479470196980e96ac2866f9b6206b37cfc3018ce36fef +SHA512 (commons-jxpath.tar.xz) = 6ad0e7e2f5f3dd377d78af1a49f5b7fa41ad66b71b80f73ac822e49a006b79dd06ee872c508dc8eb7696ef71bea2ee89c186b6dfc2cdcc4cc2da778f6950d2f5 +SHA512 (commons-lang.tar.xz) = 8d5dd8cfa07792987fb17dfc5fbbf987f3812be9b7cd7473885b068f9a60bd5418dec9574fb122c060a82564b84b31901c8f0d7f2f610dd244806d66285a6c72 +SHA512 (commons-logging.tar.xz) = 78a6b9e0139bb2d365438fa74e88f55fbeccb2e4a526592869c1a23719bd6340e25ecbb04888f4f284cc4fe2e153122b56f56f4af479d45c8b77c7c0708e39f3 +SHA512 (commons-parent-pom.tar.xz) = a79ec3f65ea172a8c15d655911ceffa01fc9c5b338bcaf3f2712d16f8da6be4a35549f07b6b4634bf7516a6a2ce90cec760a2a0acb1778c2d0596d82e9075f0f +SHA512 (cup.tar.xz) = 8624696fed9ed0045873a48a75f55f248faa9b3cfc5573182b4c67469d43dfde55d4e676dad6636d31c1f3729456e29b2facc4754e5d4caaaf39dfe6e1fd6af5 +SHA512 (easymock.tar.xz) = 48489da810750bd9351327584f78d58cf4965ac22341ad4d964edead04c2665a5ea003c245c644f52a04f75e3b046ed3562e483657355ad414ecfc5ed69f965a +SHA512 (felix-parent-pom.tar.xz) = c8d5ec33af31d4fc51d24245576f4d081aafb073339739a2689dc221c42fbe0dc4411e8c97448a21ce8d517dea940281fcfd2b7c6acddff0e9b13d7d3630b87f +SHA512 (felix-utils.tar.xz) = 39b32a2bb3b527b040796c06632d916ed53feaf728eee8902bab712d889d6c9118d925f1b957bc5ee66a4cf6be58e43f4992c7636f61d0c3c385c23f2ffc4a9c +SHA512 (fusesource-pom.tar.xz) = 1fe5d089eac6dbd2885d3ce1174e313d33e9b02ad24e700e033895bd73dace81ff8cccf7382f51ec8a3f0aa5cec515bb3018fa8a2f62cf7fcfc077991ba65f51 +SHA512 (guava.tar.xz) = 584db48bb5816be1e015a80dc1eb29c8c995e0c4500ae55088cf1a1b13215930b70643a1e79b36c59c99efa19ff6c1571ec76693d6199e8668b4b9d6140f36dc +SHA512 (guice.tar.xz) = cfe2dcb98f45d2ba1caf4f4a07bbd847fd78ca61ad10cc4c4f822b5d19e4e90a5a69062851f21b3b2c3f347fcf24a20afe04e0a799b3bf4f2b1a003ff20c0f65 +SHA512 (hamcrest.tar.xz) = 2049a59774773c2369e4c561545067524402a420bace29dc8cffac0fca8b6aa870e3de1882cc4a35549b67269ecbfc54e335ffd0c599ddb4b56341948da777a2 +SHA512 (httpcomponents-client.tar.xz) = c9a75660fdec07f309a257b67e1e6a77cb635c2c4e43333e5d2a5b196aaf48509c3ca4ca140445558a16f2d264052702c0f3be63d14ff5468b8f7adc7f90e0e9 +SHA512 (httpcomponents-core.tar.xz) = 6b643a3808e966b3f1d2dcdc5539d1d547f6e7460eef2dab92aa5ff161db1f4c7e9ddfda6539c6d5efe8b15751461410d949780d7d6e4880eee7776ebbe3a976 +SHA512 (httpcomponents-parent-pom.tar.xz) = 587e23e2c6caff80b61e1c6fc8b2a591ffb1175c1e3a5a95d611d9fb3e2dab85ef317b3f982424b727070356240fd24a7cbcce20e2e5bd787cac2bc6d93e2a71 +SHA512 (injection-api.tar.xz) = 13e7d88d9010ec964044770a45f5d7e6e0b3bbaca3338974f99f46d3ef2db50fa021c95eaa68fab1797af697d4f6aa0cb8f8c8d7edcfc1d85466a2c329c90ec3 +SHA512 (jansi.tar.xz) = 5044ffd685358816caa5e8713624031981809e8dc8913ad5bdb3cba2decf975651629eafe49bdb80c60baa8e1eb8c0a40c04001c1cd9b200d7b8fb2d6d80aab9 +SHA512 (jcommander.tar.xz) = 9ff34b0e5dd391125c1f9a03175dffece39107ee133f5553323762ac10421161d693711934f10666b8177ab801a0dd03a63942b5635dae1aeb3432635cecb10e +SHA512 (jdom.tar.xz) = 1a36168a0b8f2b9057855198e097fcb50992d9d79892cdeeb20eada43ad7a79acf4fda0a06496b8a36cb537577575504efc066774912a1c4d08288e716232579 +SHA512 (jdom2.tar.xz) = f05f9114c337a20111a88e6e045de57d034344246f568f09f75344160cd8243a6bb5cbf14429f09090a1e3c3dcd2b05e5441ee7686c4a222f433eade81c25384 +SHA512 (jflex.tar.xz) = 3e291540af7f4ac83c786f79d9500265d2f49d54d2a472f565f92233e536af6cd4b5d775ad0eb5990a14edf682512bdc48c7eb30bef7a243292a0165e331f393 +SHA512 (jsoup.tar.xz) = 5a1ce9c51c34c93c0de9d335ea187b37a6823e8532d76973c5f2f439eb57b64f78953c8e10d30b7cab9b77180ae6558157bebbd23863de0826a53b33c2cf4416 +SHA512 (jsr-305.tar.xz) = fb666ec0dd8d4fe13eb88a9ce3a7b912c66e53b152d3742133a1b81d0b9d22f4a98187e7f55bc3d3d20c47ae4b8576e03e5ed42b957d706cd951214f7216be6c +SHA512 (junit4.tar.xz) = 305f5e74d0c39e93211eac9e4da568a06e24305b6f87b970c8bf83df638223bc3c66a0acc01b191978fe6d3b08dc8b00f68613e0d06a9d5eb051de6a29e05ef1 +SHA512 (junit5.tar.xz) = d37b08df14edb763c6ddc81a67cbefe3b8bd2b384431f71b9bd5852182bf1cf7d9ca28c1c21758c2617b99880dc05cb830291b9925d671a83b3381302ba1d130 +SHA512 (maven-antrun-plugin.tar.xz) = d99863b055d3881e91e7d1d48cd4a4d5816ca9bfb36c1ab5c4abdf0a8198fde643a75157c96ed3a966e53ba30271d6f3cf78fd05b52a2fade947dc0bf25d1b43 +SHA512 (maven-archiver.tar.xz) = ddcccd12e7c327c56125d944167f995a4de8a4bc1c4c9294cd8b6cceba28782782cb47e0b3c0f6491b519711131bb6e683be8c0081c1737cb286871805df298b +SHA512 (maven-artifact-transfer.tar.xz) = eb023b00573a10f2002b2b23b048ef3c0e59d33c20cefd8915227450923f6ba7850ac9d96b73fec9b2fd0127bcfdcd08deefd47803aa7a0e6c6ccc0d40dc2fc2 +SHA512 (maven-assembly-plugin.tar.xz) = a24c5a78933c191d01ad92f1040260c2cb270294cb1cf1f345f0430b8a0e630d2e90cee99769b5eef9eda68eb2a11adbdd611e94ce495db9d287cc9fb2fb7203 +SHA512 (maven-bundle-plugin.tar.xz) = e0837cee004b25f8a9e85c4cc27f31b3a05a7fba94728d6a9a769118dac34c20640285ae67eaef0a49376fe6f55afd819c7ee55f908207af6a3799594941ba78 +SHA512 (maven-common-artifact-filters.tar.xz) = 99f7847259d05ad84e506173b315c487ce91f6d9be8e383d76d31726c2d038c38a432a10d720c7a2168abc1a9fdd2886789f6263ef4ce894bb0fef4f05ca33b9 +SHA512 (maven-compiler-plugin.tar.xz) = 062fd09f96e3e82383b09fcaa5c3d90f0d9c37a429d2e37c7a85b7f75f9bfc06ea2217c61b9a8389f89c41f56f73d27903b100e70ec7c0bc98986f46d659a1ae +SHA512 (maven-dependency-analyzer.tar.xz) = 70409bfaa35bcb0f8549a5ab588ca0d70ca4e238586d5d1a988922dde13b73727acc99c1c5c0f1cbad314674de6b9eb4a38ed1b7d2d6c6ad5b85e6587d269f28 +SHA512 (maven-dependency-plugin.tar.xz) = f6c4d3c9337baf11181b08cd22701a2ba728a5436f8cf26506989803fff5135622fdf5c126f3d9513a482dbf4052d332c94d740c24e02f45fa5189950aeda0e6 +SHA512 (maven-dependency-tree.tar.xz) = 54376856557794976793d2d3a3aa48f3f9cd08594d4c579714fa0b840bbeacab70e555c8a42e2deb41d4d9fefef18f1f918c9a86c315fe37c97529994aa2daeb +SHA512 (maven-enforcer.tar.xz) = 33b3e4e43614d062ed2c0f2362b5780f10ce7305c2c6b429c8192c7db028da564441ee98d1da06cec07d08154ea719dde9e5b551f3961085816f48ae01a0a5d3 +SHA512 (maven-file-management.tar.xz) = f8593f376d827be2eedbda2e10a8401072feba87748185aabf2aec87e965768567fa9795bc483ea47cc93cd7584f59077f78fdfe83f0f858aef7fdeb3f7c73e2 +SHA512 (maven-filtering.tar.xz) = 6095ece59d2ae4955cdb8e5b476d63c20f64bb81c3d8341edd916c5d155c47cdaaa994813a7807673ad9552b6f4254c5a67f803af55eb42f44ac23ea52e8a67b +SHA512 (maven-jar-plugin.tar.xz) = 990f83b1068d417613b061b5bb60b65717813c787e1e2ec77e11fc04ed27d2e436bbbf45abb52a5b168cc01efef3f08d5e5e0313a84974c081fdb11c63a8cc50 +SHA512 (maven-parent-pom.tar.xz) = 6ad4a0e113773375531d97f40970dc72b03745344af89bc8cf3ba2c1926f749d97508787a841416e52c4b87fb49e8acfb8bfbfd2b76f11e166f09c84f33a5075 +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-resources-plugin.tar.xz) = c68fdd88eb0ca1d88b97b76bcaf413591eaa69dd00c0e7e27398db80da57cd03b114331c51b7b2d87291764bd68e2ddef581d1ab58b0a0a3ecd8439c1297d1b0 +SHA512 (maven-resources.tar.xz) = e80f8798f79275bcaae529e11cddc52c4b2e09499caa9c5a8814008eff31a805b6288925afb790fa780f0e928638ab9a9541e6aea1dc5ec1549b846d49553678 +SHA512 (maven-shared-incremental.tar.xz) = 77ca067f25b396ccef4f4f911323a3b8bfae11c321628e32e012fb1a4dbfbba3a7a0451789b1513aa72ea408bed4a10782f5995eff8083a6af818a97a9842379 +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-verifier.tar.xz) = 74977699bf37a9c0929a9583c57128b6c58376953248c16b3aa40f836613e7f0caba0229f5a6d622f814b7d4a94fd201034be7c98d8f9568f93269beccb3ae95 +SHA512 (maven-wagon.tar.xz) = 96e615abcf41bbd192eaf3630abd17ac6bde768905877ceeb6538d406ad0cdc38f6e9862def9effb0a309688043b429488ba2d0fe6f42b0acff39d64064625b3 +SHA512 (maven.tar.xz) = e540647cc807b4e412d4e2f5af87254afdcf4aefcb61d880463537bc703fa61921bba7beb2bd55770713673e7541fa55174b5f66266474ce82183ab535021155 +SHA512 (mockito.tar.xz) = 8fefdeae3e7bcb41c97080aa208bc9bb6fa787235cc572990ba376c9995f60fa7ab7534e88701da36b00b49eb7b5f2b1c479bbf0e9c86fc1923a7eddc68b4c77 +SHA512 (modello.tar.xz) = 7b3309faf893f90bf778429a452fc579ec30a355968143e3dedafbad1a0068bff4dad4ccd614ce8347753624c1ed767dada7b09b41d9f4d7048d7fcff4f4bfd7 +SHA512 (mojo-parent-pom.tar.xz) = 74dd480f93c83c18b1c6402b8ed9e7472fcc94d35fe64504006fa8e789741a14dfd63e0a52f6accce89568d1837de8854782f298b7b57c7b3d8ac9b9cad180d8 +SHA512 (munge-maven-plugin.tar.xz) = 898d65256a04ebb108effe1d9b2b973f744556c0e7c16c99139c8fa1f059f0e32a13e01d872d8b6cd3cb056337e9ffa69ec0f8248131ee51d012c008b91290d9 +SHA512 (objenesis.tar.xz) = 40395a14bcc6a01ee1c0d8c2c2476876cae905461119bcdeb748f42860cd0f5e945ddbc4e54eb26a53e639da71ff3f35f107c64666a54dc3aa1b774397448765 +SHA512 (opentest4j.tar.xz) = de1ed222741fe2c9b507946ce14a7039bb5d4b234982e55a763a1582e68fd3c56497c5f5d9345698522d2cf0a83079a6c53160820e725e9401872c2fe4364691 +SHA512 (osgi-annotation.tar.xz) = 50ace49682061546a20d6ef8772281fbf3c8965b6c294826f0699f048a1570e19fb146a0343f59724101166a28ff934ca319de5484d997264c6e3399f27d5666 +SHA512 (osgi-cmpn.tar.xz) = 1be16086c97a7375b89516d86c0381ed5c9f1c86b4b2c3f60e02d974de588f7de1b29f6b8c99b1392d449559588d64817f4de92e3a27ef6b544538881eb03831 +SHA512 (osgi-core.tar.xz) = caf409302ff430f6b4d13155152a5b8524a828c88f6260a745c041fa37c44628894d3649620e381f8a407a49402b30877a37613a0bb129c236587210a9475759 +SHA512 (oss-parent-pom.tar.xz) = 1b7559cf4ab9a5e4b86caab4247ccbba7136f893662475e08b3c989956a2d50fb44a18a98c9ab7595c3aa84415b94ff8f74f4255c1764006509120cb08e3e641 +SHA512 (plexus-archiver.tar.xz) = 58f7096ba3640f469c32f652483b5407ce34934563c4d759aa73affcb26e9e28236c9f6a30e7330348a8c4c05ac94ba7c753b7e6856c1ac47eab519ae37470b2 +SHA512 (plexus-build-api.tar.xz) = 1908f360b9926a752dd3950d85e9aa6cbb0f5ebfd92198ed4d04372e5f47a3d5aa771b25b75f6f4dea50ef909b1c4b5084e7b8a40a260c3c5dbfc12b43bf05a7 +SHA512 (plexus-cipher.tar.xz) = 28243457ee852513938fcff991dfa59098845145807bc0682a7ff815591a444bd89dd812f72b0fff8cfbb21b26d310c4653c05467bae3fb55d0995fe7bd1dfb9 +SHA512 (plexus-classworlds.tar.xz) = d7c22e1a34395f698a76aeffcd2cde23fd9077f07d186b91442d34b2a80a1745795b9cfc9d7370c44dbf2c4969d5f977321d1a2a25ddf6833a94baac1f6f6037 +SHA512 (plexus-compiler.tar.xz) = d15943c35af56cdeac569c69ca492f1b3197803a83cddd6beb675e4efa7de8613ec68513e720188a7cf732674e5019bcf34480e4d0ba6c6781c0cd815afde989 +SHA512 (plexus-components-pom.tar.xz) = 84070dfff4c079f18e528d1388b46751132f2da25e91b5adf69fcadc7f3a602753f1080b83f94b96ee63e0de06b014eb53213f77ad6e51fcc2ee386466842d5e +SHA512 (plexus-containers.tar.xz) = 29b74507975a6b5529c580908da3af491299a22f2e59ec2428d39041d56b2d47a49d5fbb971df1e6ce3ef2e27b8bfad40576e9924f8739773bc25e8379b2bd22 +SHA512 (plexus-interpolation.tar.xz) = 1e200b309979e874546ba03b6ae7fe166e2f0dfb71c0b05399ee0a986de6be171456a545719671e502968a91b1af5cfcf046fd1d2f9d9cca51aa0081466dea21 +SHA512 (plexus-io.tar.xz) = 1582ddeb4486e1408421f50144352f352bec60b158473b16351f0ad02b114718a0f3a35e8c60bd21fb840c267e3fc08dc1ec48335a9fab1ef30ca3397d2238fc +SHA512 (plexus-languages.tar.xz) = 6c19243689b852d362138ed96bf7fa22e58c19fedca4031b1a300110a69224b94bf8eef53bb1df475d772ac2f039fe21398a5de91c312b23e4d33511f9f59fed +SHA512 (plexus-pom.tar.xz) = ebdf75fc7e1fc4f1d6642d2a8bb548a30b706938f778eedfc75feb79d26705f265600dbe8067ea287e2f50c42689d062384dd5f58e1ee75c10664ba3476a6143 +SHA512 (plexus-resources.tar.xz) = 257a832db95eb73a8e553f895160f3e680ef7a0af3803d6ad755924510ed65bbb685539c25e6a56e2a11baad1bece94dcff09e1a9cf4f09cea31201737a1cf36 +SHA512 (plexus-sec-dispatcher.tar.xz) = 4c9be8c78ff3f6ab2ff1a5271602b66b61546294bdedc1e3cf5b92e8daa8365bcf721beaf12ba7ae16f2da24f506fbd04f3c9203b4627a930c359ca68f9ead4f +SHA512 (plexus-utils.tar.xz) = e13c4605d4268ec85fb10fa1c365455f8c8ac43db85760af68f079f78809c2c5d31df887d66f21fffa096c38c4f742d9c4b1eb7ae0de943c2c0734de89800d03 +SHA512 (qdox.tar.xz) = 48c904a6e4ec4dfd66b47238e4151fb0ca092751a9e6a89f1bd89d9b6cd4a33e9493f0b2ee5e06ea81d956c3eeb81fba8b8552053e49b3155cc42a00a8af9e11 +SHA512 (servlet-api.tar.xz) = a255c21c248dcb6a72022146f58e09cef03e388e6a64d97f5dfbbcfffce57fe88ef4255c2c1c1195958c70a4495b9512d6c2fff588c5e7df66394a45e44262ab +SHA512 (sisu-inject.tar.xz) = c44a8ee7999f4411f855e028f514f1f75c5b13faddcf793ce361090741f1e95e902c25b82bc6f3a3b92c4fc3a7720a5cf667f4a4839c6b04bf6512921211df7b +SHA512 (sisu-mojos.tar.xz) = ed9462baa5f59561131d84b6ea8d114a16b99fec0c502e2698e38556f1247a3c3550172d551ad8f38107558a8c78890a09ceebfee7ca2fceffea334b3da13ded +SHA512 (sisu-plexus.tar.xz) = 851660ef15f937c0c7e47a539ab35c0bb3afd9e4a8ef7f375b66d066b37bb06b6343cb28fe1dc83cb94a072e76b424740926d6d2802a61f07d977b6adf082340 +SHA512 (slf4j.tar.xz) = 0ca1edd19492d08c5ee61d17b6be6468091176acbfa3cd43a902412614cdf591ea3b769100ee645ac16339ac4fa4667e9294468b2ce9f764717b7a8b4862ab02 +SHA512 (testng.tar.xz) = fe77f378643d8ad076df3fac333fe96087a17b8bb4eb3d7f3e55f617a5331e6b8f87f73ce1256f1983b972bb824c7e395af8c543fa76c9497d5cf74dfb963a94 +SHA512 (univocity-parsers.tar.xz) = 7daa3f54d26d7c64714990c7ad9d539bc7dd531917354b5b90970114e51c20aedac3e1fdd8b45e073d8c196b4ce2fa93c2f84a5498147de951ac147900ce51fa +SHA512 (velocity-engine.tar.xz) = c8baa9e159acae579848c1dd33b488eb70f64280e2f806e0e2ccf3024d1bc4f588086cb523e0d8e6ea2f8802ff908ff5578e86e646131768356c6d6e9b7214d0 +SHA512 (xbean.tar.xz) = 78bd8f7ed95b04e23df68f89890b16d86e7328b00881ddaaedcde07456761992cf4a25f4e83ebf48637ccb09dd48ff8d6646f8e3062468eb4f2a5f100369a756 +SHA512 (xmlunit.tar.xz) = 2fa565f76c7e53283bf2aed9d0b092ec331352e5348b964de4ee9308e4094961b7509f5930575dc33ec623b7a074964019bfe247356507d7ec21dc18b2a8f58c +SHA512 (xmvn.tar.xz) = 9d8393b5000e981bfb4aefe6a6352d5235d15f312af4d82170b90fec5f32619419e20c11cdc819aed280c681091cbe8a27d8a50193ee24303a08eb4ba30c0eec +SHA512 (xz-java.tar.xz) = 8c4ef8a617ba8d4df2df604c8490fcef504c68fdc1102c58c678648c9c680fa25078b78589e7cd012e03ba438df44a1397b55af2af8aa6609be4f3ad334ae6fb From 6e01307ba174c2ada5b656483d15bce173712b7e Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 2 Nov 2021 20:32:59 +0100 Subject: [PATCH 24/77] Update to latest upstream snapshot --- .gitignore | 4 ++++ javapackages-bootstrap.spec | 15 +++++++++------ sources | 10 +++++----- 3 files changed, 18 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index 8394289..e0c02d0 100644 --- a/.gitignore +++ b/.gitignore @@ -118,3 +118,7 @@ /94debe8.tar.gz /1ccbeaf.tar.gz /2daa95f.tar.gz +/d896ef9.tar.gz +/a0c34e8.tar.gz +/98aeb0b.tar.gz +/d76c032.tar.gz diff --git a/javapackages-bootstrap.spec b/javapackages-bootstrap.spec index 0bb79cd..222c79a 100644 --- a/javapackages-bootstrap.spec +++ b/javapackages-bootstrap.spec @@ -11,11 +11,11 @@ %global artifactsPath %{_javadir} %global launchersPath %{_libexecdir}/%{name} -%global git_hash 2daa95f42e9c03bfe58a72e171a6fd442ac38823 +%global git_hash d76c0320c61b46baaf6eb04a134f518a4e68f944 %global git_short_hash %(echo %{git_hash} | cut -b -7) Name: javapackages-bootstrap -Version: 1.5.0^20211028.git%{git_short_hash} +Version: 1.5.0^20211102.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 @@ -148,10 +148,10 @@ Source1108: xz-java.tar.xz Patch0: 0001-Bind-to-OpenJDK-11-for-runtime.patch Provides: bundled(ant) = 1.10.11 -Provides: bundled(apache-parent) = 24 +Provides: bundled(apache-parent) = 23 Provides: bundled(apiguardian) = 1.1.2 Provides: bundled(objectweb-asm) = 9.2 -Provides: bundled(assertj-core) = 3.21.0 +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 @@ -233,12 +233,12 @@ Provides: bundled(plexus-build-api) = 0.0.7 Provides: bundled(plexus-cipher) = 2.0 Provides: bundled(plexus-classworlds) = 2.6.0 Provides: bundled(plexus-compiler) = 2.8.8 -Provides: bundled(plexus-components-pom) = 6.6 +Provides: bundled(plexus-components-pom) = 6.4 Provides: bundled(plexus-containers) = 2.1.0 Provides: bundled(plexus-interpolation) = 1.26 Provides: bundled(plexus-io) = 3.2.0 Provides: bundled(plexus-languages) = 1.1.0 -Provides: bundled(plexus-pom) = 8 +Provides: bundled(plexus-pom) = 7 Provides: bundled(plexus-resources) = 1.1.0 Provides: bundled(plexus-sec-dispatcher) = 2.0 Provides: bundled(plexus-utils) = 3.4.1 @@ -349,6 +349,9 @@ echo '%%jpb_env PATH=/usr/libexec/javapackages-bootstrap:$PATH' >%{buildroot}%{_ %doc AUTHORS %changelog +* Tue Nov 02 2021 Mikolaj Izdebski - 1.5.0^20211102.gitd76c032-1 +- Update to latest upstream snapshot + * Thu Oct 28 2021 Mikolaj Izdebski - 1.5.0^20211028.git2daa95f-1 - Update to latest upstream snapshot diff --git a/sources b/sources index 99cb819..10b679a 100644 --- a/sources +++ b/sources @@ -1,9 +1,9 @@ -SHA512 (2daa95f.tar.gz) = 91e592ae75aaee07950b658e2144e1b75de72ea0cc7ef7c1d613fd0b643e3ab5e200b52ab531c987d59690af11d38bcce5b0f57cc12d74be743c6cafa220e78a +SHA512 (d76c032.tar.gz) = 6ba0460f728f14f9911885c71ae856ca0f4803679dcb855b05c74f6b122c1dd3ca972658c6d08bd62aaa62f43354dcae376b13535a645fc439bed04067c63f0d SHA512 (ant.tar.xz) = ffbf7b103e0b306d2510df71859f738d5f026a846c62ec79e7c98e3b48fb656cacc24f83404408467164e7827177cbcb892fcf7c66dc21d324aefdc105f6d5ad -SHA512 (apache-pom.tar.xz) = 5d6a2aa92a0f6bd5c287c245e696a1ba91d086e9d72e0bd6c4bfa403dbb627976c747ec4bc1cdf7089fea8939f5b0b5862b73f7e02ce374501639fa25df1d47a +SHA512 (apache-pom.tar.xz) = e708b87010111c04d05df6d87137b21c29d256dc951b5a3503a5f3c84a954d14bc7a1e04e351e251a7c67a217ef93e36b164b368f807e3ee50b069c0af6c7172 SHA512 (apiguardian.tar.xz) = c3d75e88a983eb53c06007fd01f11c89083e119d2d4ed5d0e97644f45d5e451fd611bee493d720d011562ae29e7cdfd1d6fb4621d17c9db4b61430e62afea2bf SHA512 (asm.tar.xz) = 8745a2279e0b4d9972d08b782586ddfabcd42d89fdcc06a24a29e75d9905cab0bf6a4c6d76fabd806fcde1159a2667c63bfac94bdce0a535acac1a5124bac2a8 -SHA512 (assertj-core.tar.xz) = 72052a4d49a261677e323aeea504d6ae31e097a8b4cb558c551901e0ef3949e9f6a6d80b599477cdb7251bee40038a05b5d40f3c6876869bd5a267b4543411b5 +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 @@ -85,12 +85,12 @@ SHA512 (plexus-build-api.tar.xz) = 1908f360b9926a752dd3950d85e9aa6cbb0f5ebfd9219 SHA512 (plexus-cipher.tar.xz) = 28243457ee852513938fcff991dfa59098845145807bc0682a7ff815591a444bd89dd812f72b0fff8cfbb21b26d310c4653c05467bae3fb55d0995fe7bd1dfb9 SHA512 (plexus-classworlds.tar.xz) = d7c22e1a34395f698a76aeffcd2cde23fd9077f07d186b91442d34b2a80a1745795b9cfc9d7370c44dbf2c4969d5f977321d1a2a25ddf6833a94baac1f6f6037 SHA512 (plexus-compiler.tar.xz) = d15943c35af56cdeac569c69ca492f1b3197803a83cddd6beb675e4efa7de8613ec68513e720188a7cf732674e5019bcf34480e4d0ba6c6781c0cd815afde989 -SHA512 (plexus-components-pom.tar.xz) = 84070dfff4c079f18e528d1388b46751132f2da25e91b5adf69fcadc7f3a602753f1080b83f94b96ee63e0de06b014eb53213f77ad6e51fcc2ee386466842d5e +SHA512 (plexus-components-pom.tar.xz) = c35bbce1e5e664e3ef133ca8b4e994f1a40d37ae36b164519f8b4c204c687120eb3da20edb45855cb08011404320acf210ae73893ca82f25697ba09b7d31f718 SHA512 (plexus-containers.tar.xz) = 29b74507975a6b5529c580908da3af491299a22f2e59ec2428d39041d56b2d47a49d5fbb971df1e6ce3ef2e27b8bfad40576e9924f8739773bc25e8379b2bd22 SHA512 (plexus-interpolation.tar.xz) = 1e200b309979e874546ba03b6ae7fe166e2f0dfb71c0b05399ee0a986de6be171456a545719671e502968a91b1af5cfcf046fd1d2f9d9cca51aa0081466dea21 SHA512 (plexus-io.tar.xz) = 1582ddeb4486e1408421f50144352f352bec60b158473b16351f0ad02b114718a0f3a35e8c60bd21fb840c267e3fc08dc1ec48335a9fab1ef30ca3397d2238fc SHA512 (plexus-languages.tar.xz) = 6c19243689b852d362138ed96bf7fa22e58c19fedca4031b1a300110a69224b94bf8eef53bb1df475d772ac2f039fe21398a5de91c312b23e4d33511f9f59fed -SHA512 (plexus-pom.tar.xz) = ebdf75fc7e1fc4f1d6642d2a8bb548a30b706938f778eedfc75feb79d26705f265600dbe8067ea287e2f50c42689d062384dd5f58e1ee75c10664ba3476a6143 +SHA512 (plexus-pom.tar.xz) = c71e79b7b569c311d07de1593ed821937c28721dc7a5c47637c81944825dafd2b52d706b97d4eff5604cd3a506d38f6639f657684bf385f80e79b4a89b1c07e8 SHA512 (plexus-resources.tar.xz) = 257a832db95eb73a8e553f895160f3e680ef7a0af3803d6ad755924510ed65bbb685539c25e6a56e2a11baad1bece94dcff09e1a9cf4f09cea31201737a1cf36 SHA512 (plexus-sec-dispatcher.tar.xz) = 4c9be8c78ff3f6ab2ff1a5271602b66b61546294bdedc1e3cf5b92e8daa8365bcf721beaf12ba7ae16f2da24f506fbd04f3c9203b4627a930c359ca68f9ead4f SHA512 (plexus-utils.tar.xz) = e13c4605d4268ec85fb10fa1c365455f8c8ac43db85760af68f079f78809c2c5d31df887d66f21fffa096c38c4f742d9c4b1eb7ae0de943c2c0734de89800d03 From 33885fb4415ab8f5b11367defa0e20a797553496 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 2 Nov 2021 15:23:59 +0100 Subject: [PATCH 25/77] Build with OpenJDK 17 --- ... 0001-Bind-to-OpenJDK-17-for-runtime.patch | 4 ++-- javapackages-bootstrap.spec | 19 ++++++++++++------- 2 files changed, 14 insertions(+), 9 deletions(-) rename 0001-Bind-to-OpenJDK-11-for-runtime.patch => 0001-Bind-to-OpenJDK-17-for-runtime.patch (90%) diff --git a/0001-Bind-to-OpenJDK-11-for-runtime.patch b/0001-Bind-to-OpenJDK-17-for-runtime.patch similarity index 90% rename from 0001-Bind-to-OpenJDK-11-for-runtime.patch rename to 0001-Bind-to-OpenJDK-17-for-runtime.patch index 11367d8..a5d15e9 100644 --- a/0001-Bind-to-OpenJDK-11-for-runtime.patch +++ b/0001-Bind-to-OpenJDK-17-for-runtime.patch @@ -1,7 +1,7 @@ From ad65f62443f23076dfc520d3f0589282da9530fa Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 8 Jul 2020 09:04:57 +0200 -Subject: [PATCH 2/2] Bind to OpenJDK 11 for runtime +Subject: [PATCH 2/2] Bind to OpenJDK 17 for runtime --- apache-maven/src/bin/mvn | 12 +----------- @@ -26,7 +26,7 @@ index a554c6617..23b9dd902 100755 - fi - -fi -+export JAVA_HOME=/usr/lib/jvm/java-11-openjdk ++export JAVA_HOME=/usr/lib/jvm/java-17-openjdk # OS specific support. $var _must_ be set to either true or false. cygwin=false; diff --git a/javapackages-bootstrap.spec b/javapackages-bootstrap.spec index 222c79a..e9cb10b 100644 --- a/javapackages-bootstrap.spec +++ b/javapackages-bootstrap.spec @@ -1,11 +1,12 @@ # Exclude automatically generated requires on java interpreter which is not # owned by any package -%global __requires_exclude ^/usr/lib/jvm/java +%global __requires_exclude ^%{_jvmdir}/java # Don't run OSGi dependency generators on private (bundled) JARs %global __requires_exclude_from \\.jar$ %global __provides_exclude_from \\.jar$ +%global javaHomePath %{_jvmdir}/java-17-openjdk %global mavenHomePath %{_datadir}/%{name} %global metadataPath %{mavenHomePath}/maven-metadata %global artifactsPath %{_javadir} @@ -16,7 +17,7 @@ Name: javapackages-bootstrap Version: 1.5.0^20211102.git%{git_short_hash} -Release: 1%{?dist} +Release: 2%{?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 @@ -145,7 +146,7 @@ Source1106: xmlunit.tar.xz Source1107: xmvn.tar.xz Source1108: xz-java.tar.xz -Patch0: 0001-Bind-to-OpenJDK-11-for-runtime.patch +Patch0: 0001-Bind-to-OpenJDK-17-for-runtime.patch Provides: bundled(ant) = 1.10.11 Provides: bundled(apache-parent) = 23 @@ -257,12 +258,12 @@ Provides: bundled(xmvn) = 4.0.0 Provides: bundled(xz-java) = 1.8 BuildRequires: byaccj -BuildRequires: java-11-openjdk-devel +BuildRequires: java-17-openjdk-devel BuildRequires: javapackages-generators Requires: bash Requires: coreutils -Requires: java-11-openjdk-devel +Requires: java-17-openjdk-devel Requires: procps-ng %description @@ -310,10 +311,11 @@ done %build export LC_ALL=C.utf8 -JAVA_HOME=%{java_home} ./mbi.sh build -parallel +JAVA_HOME=%{javaHomePath} ./mbi.sh build -parallel %install -JAVA_HOME=%{java_home} ./mbi.sh dist \ +JAVA_HOME=%{javaHomePath} ./mbi.sh dist \ + -javaCmdPath=%{javaHomePath}/bin/java \ -basePackageName=%{name} \ -installRoot=%{buildroot} \ -mavenHomePath=%{mavenHomePath} \ @@ -349,6 +351,9 @@ echo '%%jpb_env PATH=/usr/libexec/javapackages-bootstrap:$PATH' >%{buildroot}%{_ %doc AUTHORS %changelog +* Wed Nov 03 2021 Mikolaj Izdebski - 1.5.0^20211102.gitd76c032-2 +- Build with OpenJDK 17 + * Tue Nov 02 2021 Mikolaj Izdebski - 1.5.0^20211102.gitd76c032-1 - Update to latest upstream snapshot From 3df8d71da414ec06a580c05ee4b4b937ec0122fc Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Wed, 5 Jan 2022 16:00:16 +0100 Subject: [PATCH 26/77] Update to latest upstream snapshot --- .gitignore | 3 +++ 0001-Bind-to-OpenJDK-17-for-runtime.patch | 14 ++++++++----- javapackages-bootstrap.spec | 25 ++++++++++++++--------- sources | 12 +++++------ 4 files changed, 33 insertions(+), 21 deletions(-) diff --git a/.gitignore b/.gitignore index e0c02d0..2b87313 100644 --- a/.gitignore +++ b/.gitignore @@ -122,3 +122,6 @@ /a0c34e8.tar.gz /98aeb0b.tar.gz /d76c032.tar.gz +/00bdfe7.tar.gz +/8493092.tar.gz +/9f283b7.tar.gz diff --git a/0001-Bind-to-OpenJDK-17-for-runtime.patch b/0001-Bind-to-OpenJDK-17-for-runtime.patch index a5d15e9..4ddf31d 100644 --- a/0001-Bind-to-OpenJDK-17-for-runtime.patch +++ b/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 diff --git a/javapackages-bootstrap.spec b/javapackages-bootstrap.spec index e9cb10b..cb8b8ba 100644 --- a/javapackages-bootstrap.spec +++ b/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 - 1.5.0^20220105.git9f283b7-1 +- Update to latest upstream snapshot + * Wed Nov 03 2021 Mikolaj Izdebski - 1.5.0^20211102.gitd76c032-2 - Build with OpenJDK 17 diff --git a/sources b/sources index 10b679a..e969536 100644 --- a/sources +++ b/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 From 75d98a97eb9acf7e2e6b435fca68571a28f36e11 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jan 2022 13:42:25 +0000 Subject: [PATCH 27/77] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- javapackages-bootstrap.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/javapackages-bootstrap.spec b/javapackages-bootstrap.spec index cb8b8ba..32980cd 100644 --- a/javapackages-bootstrap.spec +++ b/javapackages-bootstrap.spec @@ -17,7 +17,7 @@ Name: javapackages-bootstrap Version: 1.5.0^20220105.git%{git_short_hash} -Release: 1%{?dist} +Release: 2%{?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 @@ -353,6 +353,9 @@ echo '%%jpb_env PATH=/usr/libexec/javapackages-bootstrap:$PATH' >%{buildroot}%{_ %doc AUTHORS %changelog +* Thu Jan 20 2022 Fedora Release Engineering - 1.5.0^20220105.git9f283b7-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Wed Jan 05 2022 Marian Koncek - 1.5.0^20220105.git9f283b7-1 - Update to latest upstream snapshot From 2ae8639fa6c5a9a70525140ccaad70f54b031087 Mon Sep 17 00:00:00 2001 From: Jiri Date: Sat, 5 Feb 2022 21:23:50 +0100 Subject: [PATCH 28/77] Rebuilt for java-17-openjdk as system jdk https://fedoraproject.org/wiki/Changes/Java17 --- javapackages-bootstrap.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/javapackages-bootstrap.spec b/javapackages-bootstrap.spec index 32980cd..d81b9f0 100644 --- a/javapackages-bootstrap.spec +++ b/javapackages-bootstrap.spec @@ -17,7 +17,7 @@ Name: javapackages-bootstrap Version: 1.5.0^20220105.git%{git_short_hash} -Release: 2%{?dist} +Release: 3%{?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 @@ -353,6 +353,9 @@ echo '%%jpb_env PATH=/usr/libexec/javapackages-bootstrap:$PATH' >%{buildroot}%{_ %doc AUTHORS %changelog +* Sat Feb 05 2022 Jiri Vanek - 1.5.0^20220105.git9f283b7-3 +- Rebuilt for java-17-openjdk as system jdk + * Thu Jan 20 2022 Fedora Release Engineering - 1.5.0^20220105.git9f283b7-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 008147dfae970980db39df8e1bf2174a105b5aae Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 28 Apr 2022 07:17:04 +0200 Subject: [PATCH 29/77] Update to latest upstream snapshot --- .gitignore | 1 + javapackages-bootstrap.spec | 175 ++++++++++++++++++------------------ sources | 27 +++--- 3 files changed, 102 insertions(+), 101 deletions(-) diff --git a/.gitignore b/.gitignore index 2b87313..64c44a8 100644 --- a/.gitignore +++ b/.gitignore @@ -125,3 +125,4 @@ /00bdfe7.tar.gz /8493092.tar.gz /9f283b7.tar.gz +/1cfada9.tar.gz diff --git a/javapackages-bootstrap.spec b/javapackages-bootstrap.spec index d81b9f0..940cd3e 100644 --- a/javapackages-bootstrap.spec +++ b/javapackages-bootstrap.spec @@ -12,12 +12,12 @@ %global artifactsPath %{_javadir} %global launchersPath %{_libexecdir}/%{name} -%global git_hash 9f283b765ec39228d038f5ab63dcc72cf548cb7d +%global git_hash 1cfada994e2c42d22289dbe02e656bb31e24852f %global git_short_hash %(echo %{git_hash} | cut -b -7) Name: javapackages-bootstrap -Version: 1.5.0^20220105.git%{git_short_hash} -Release: 3%{?dist} +Version: 1.5.0^20220429.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/mkoncek/javapackages-bootstrap/archive/%{git_short_hash}.tar.gz +Source0: https://github.com/fedora-java/javapackages-bootstrap/archive/%{git_short_hash}.tar.gz # License breakdown Source1: javapackages-bootstrap-PACKAGE-LICENSING @@ -75,76 +75,75 @@ Source1035: jcommander.tar.xz Source1036: jdom.tar.xz Source1037: jdom2.tar.xz Source1038: jflex.tar.xz -Source1039: jsoup.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 +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 Patch0: 0001-Bind-to-OpenJDK-17-for-runtime.patch @@ -186,7 +185,6 @@ Provides: bundled(beust-jcommander) = 1.81 Provides: bundled(jdom) = 1.1.3 Provides: bundled(jdom2) = 2.0.6 Provides: bundled(jflex) = 1.7.0 -Provides: bundled(jsoup) = 1.13.1 Provides: bundled(jsr-305) = 3.0.2 Provides: bundled(junit) = 4.13.1 Provides: bundled(junit5) = 5.8.1 @@ -196,17 +194,17 @@ Provides: bundled(maven-artifact-transfer) = 0.13.1 Provides: bundled(maven-assembly-plugin) = 3.3.0 Provides: bundled(maven-plugin-bundle) = 5.1.1 Provides: bundled(maven-common-artifact-filters) = 3.1.0 -Provides: bundled(maven-compiler-plugin) = 3.8.1 -Provides: bundled(maven-dependency-analyzer) = 1.11.3 -Provides: bundled(maven-dependency-plugin) = 3.1.2 -Provides: bundled(maven-dependency-tree) = 3.0.1 +Provides: bundled(maven-compiler-plugin) = 3.10.1 +Provides: bundled(maven-dependency-analyzer) = 1.12.0 +Provides: bundled(maven-dependency-plugin) = 3.3.0 +Provides: bundled(maven-dependency-tree) = 3.1.0 Provides: bundled(maven-enforcer) = 3.0.0~M2 Provides: bundled(maven-file-management) = 3.0.0 Provides: bundled(maven-filtering) = 3.2.0 Provides: bundled(maven-jar-plugin) = 3.2.0 Provides: bundled(maven-parent) = 34 Provides: bundled(maven-plugin-testing) = 3.3.0 -Provides: bundled(maven-plugin-tools) = 3.6.0 +Provides: bundled(maven-plugin-tools) = 3.6.4 Provides: bundled(maven-remote-resources-plugin) = 1.7.0 Provides: bundled(maven-resolver) = 1.7.2 Provides: bundled(maven-resources-plugin) = 3.2.0 @@ -217,10 +215,10 @@ 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-verifier) = 1.7.2 -Provides: bundled(maven-wagon) = 3.4.3 -Provides: bundled(maven) = 3.8.4 +Provides: bundled(maven-wagon) = 3.5.1 +Provides: bundled(maven) = 3.8.5 Provides: bundled(mockito) = 3.7.13 -Provides: bundled(modello) = 1.11 +Provides: bundled(modello) = 2.0.0 Provides: bundled(mojo-parent) = 60 Provides: bundled(munge-maven-plugin) = 1.0 Provides: bundled(objenesis) = 3.1 @@ -229,16 +227,16 @@ Provides: bundled(osgi-annotation) = 8.0.1 Provides: bundled(osgi-compendium) = 7.0.0 Provides: bundled(osgi-core) = 8.0.0 Provides: bundled(sonatype-oss-parent) = 7 -Provides: bundled(plexus-archiver) = 4.2.5 +Provides: bundled(plexus-archiver) = 4.2.7 Provides: bundled(plexus-build-api) = 0.0.7 Provides: bundled(plexus-cipher) = 2.0 Provides: bundled(plexus-classworlds) = 2.6.0 -Provides: bundled(plexus-compiler) = 2.8.8 -Provides: bundled(plexus-components-pom) = 6.4 +Provides: bundled(plexus-compiler) = 2.11.1 +Provides: bundled(plexus-components-pom) = 6.6 Provides: bundled(plexus-containers) = 2.1.0 Provides: bundled(plexus-interpolation) = 1.26 Provides: bundled(plexus-io) = 3.2.0 -Provides: bundled(plexus-languages) = 1.1.0 +Provides: bundled(plexus-languages) = 1.1.1 Provides: bundled(plexus-pom) = 7 Provides: bundled(plexus-resources) = 1.1.0 Provides: bundled(plexus-sec-dispatcher) = 2.0 @@ -353,6 +351,9 @@ echo '%%jpb_env PATH=/usr/libexec/javapackages-bootstrap:$PATH' >%{buildroot}%{_ %doc AUTHORS %changelog +* Fri Apr 29 2022 Mikolaj Izdebski - 1.5.0^20220429.git1cfada9-1 +- Update to latest upstream snapshot + * Sat Feb 05 2022 Jiri Vanek - 1.5.0^20220105.git9f283b7-3 - Rebuilt for java-17-openjdk as system jdk diff --git a/sources b/sources index e969536..c15ed05 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -SHA512 (9f283b7.tar.gz) = c307fd3815acd616a2efd2b219f260380f6711c0d6fb2ea033de7e667005495f71726ed871794cb008e5525c1cc5afb9c00bebe4c734e96ca21244e0d8c926cc +SHA512 (1cfada9.tar.gz) = b5d876a6241d214562aa52c1e5419f2beef9d600cbf9d664ae1e450aee74cfa94cd8f1cbaa5bfcc0b614c5750882568b9446886f808cb1a04a5d7d99c7de46b5 SHA512 (ant.tar.xz) = d2a4babb7766fc2acf3e9377ffd5af790c7d0612d3e34a9642a9a2b85ffb0f15936ef2979389496dce8ea72ed941797cd1f7507beeb1853a46394019adde4152 SHA512 (apache-pom.tar.xz) = e708b87010111c04d05df6d87137b21c29d256dc951b5a3503a5f3c84a954d14bc7a1e04e351e251a7c67a217ef93e36b164b368f807e3ee50b069c0af6c7172 SHA512 (apiguardian.tar.xz) = c3d75e88a983eb53c06007fd01f11c89083e119d2d4ed5d0e97644f45d5e451fd611bee493d720d011562ae29e7cdfd1d6fb4621d17c9db4b61430e62afea2bf @@ -37,7 +37,6 @@ SHA512 (jcommander.tar.xz) = 9ff34b0e5dd391125c1f9a03175dffece39107ee133f5553323 SHA512 (jdom.tar.xz) = 1a36168a0b8f2b9057855198e097fcb50992d9d79892cdeeb20eada43ad7a79acf4fda0a06496b8a36cb537577575504efc066774912a1c4d08288e716232579 SHA512 (jdom2.tar.xz) = f05f9114c337a20111a88e6e045de57d034344246f568f09f75344160cd8243a6bb5cbf14429f09090a1e3c3dcd2b05e5441ee7686c4a222f433eade81c25384 SHA512 (jflex.tar.xz) = 3e291540af7f4ac83c786f79d9500265d2f49d54d2a472f565f92233e536af6cd4b5d775ad0eb5990a14edf682512bdc48c7eb30bef7a243292a0165e331f393 -SHA512 (jsoup.tar.xz) = 5a1ce9c51c34c93c0de9d335ea187b37a6823e8532d76973c5f2f439eb57b64f78953c8e10d30b7cab9b77180ae6558157bebbd23863de0826a53b33c2cf4416 SHA512 (jsr-305.tar.xz) = fb666ec0dd8d4fe13eb88a9ce3a7b912c66e53b152d3742133a1b81d0b9d22f4a98187e7f55bc3d3d20c47ae4b8576e03e5ed42b957d706cd951214f7216be6c SHA512 (junit4.tar.xz) = 305f5e74d0c39e93211eac9e4da568a06e24305b6f87b970c8bf83df638223bc3c66a0acc01b191978fe6d3b08dc8b00f68613e0d06a9d5eb051de6a29e05ef1 SHA512 (junit5.tar.xz) = d37b08df14edb763c6ddc81a67cbefe3b8bd2b384431f71b9bd5852182bf1cf7d9ca28c1c21758c2617b99880dc05cb830291b9925d671a83b3381302ba1d130 @@ -47,17 +46,17 @@ SHA512 (maven-artifact-transfer.tar.xz) = eb023b00573a10f2002b2b23b048ef3c0e59d3 SHA512 (maven-assembly-plugin.tar.xz) = a24c5a78933c191d01ad92f1040260c2cb270294cb1cf1f345f0430b8a0e630d2e90cee99769b5eef9eda68eb2a11adbdd611e94ce495db9d287cc9fb2fb7203 SHA512 (maven-bundle-plugin.tar.xz) = e0837cee004b25f8a9e85c4cc27f31b3a05a7fba94728d6a9a769118dac34c20640285ae67eaef0a49376fe6f55afd819c7ee55f908207af6a3799594941ba78 SHA512 (maven-common-artifact-filters.tar.xz) = 99f7847259d05ad84e506173b315c487ce91f6d9be8e383d76d31726c2d038c38a432a10d720c7a2168abc1a9fdd2886789f6263ef4ce894bb0fef4f05ca33b9 -SHA512 (maven-compiler-plugin.tar.xz) = 062fd09f96e3e82383b09fcaa5c3d90f0d9c37a429d2e37c7a85b7f75f9bfc06ea2217c61b9a8389f89c41f56f73d27903b100e70ec7c0bc98986f46d659a1ae -SHA512 (maven-dependency-analyzer.tar.xz) = 70409bfaa35bcb0f8549a5ab588ca0d70ca4e238586d5d1a988922dde13b73727acc99c1c5c0f1cbad314674de6b9eb4a38ed1b7d2d6c6ad5b85e6587d269f28 -SHA512 (maven-dependency-plugin.tar.xz) = f6c4d3c9337baf11181b08cd22701a2ba728a5436f8cf26506989803fff5135622fdf5c126f3d9513a482dbf4052d332c94d740c24e02f45fa5189950aeda0e6 -SHA512 (maven-dependency-tree.tar.xz) = 54376856557794976793d2d3a3aa48f3f9cd08594d4c579714fa0b840bbeacab70e555c8a42e2deb41d4d9fefef18f1f918c9a86c315fe37c97529994aa2daeb +SHA512 (maven-compiler-plugin.tar.xz) = 0259e739d1675b5b3905a93ad392f9abe772d9324580898aeae16c33e27885a518003caa7546d624b937557cbd05d087c923081e8d21e6b84f9e46c4fb2d1234 +SHA512 (maven-dependency-analyzer.tar.xz) = 60c7c17621dbfe726b66ad70ca294c7f1405d5528e6c894cc38da637eb046162a43edad21b97aaa731c1ff31016ced1073e3eae3e42e4a9cae50a9b88f7ed619 +SHA512 (maven-dependency-plugin.tar.xz) = 4092de8c04a74939c7b552bb102a040925930aeff8c7788f1ccb464dcf2eadc5fb2f8004055368ea0a128267d8b2fc674fa9cb536c1c7b13bfcf41b3630adc28 +SHA512 (maven-dependency-tree.tar.xz) = be1f8848cd39e55fa2c3c13be29e4c03d73a0bca6c3218bd269c183703c5aee88af0f46c6f2901a20868eea0cb4b8817a48d467043079c8a4043e1a16f2c7456 SHA512 (maven-enforcer.tar.xz) = 33b3e4e43614d062ed2c0f2362b5780f10ce7305c2c6b429c8192c7db028da564441ee98d1da06cec07d08154ea719dde9e5b551f3961085816f48ae01a0a5d3 SHA512 (maven-file-management.tar.xz) = f8593f376d827be2eedbda2e10a8401072feba87748185aabf2aec87e965768567fa9795bc483ea47cc93cd7584f59077f78fdfe83f0f858aef7fdeb3f7c73e2 SHA512 (maven-filtering.tar.xz) = 6095ece59d2ae4955cdb8e5b476d63c20f64bb81c3d8341edd916c5d155c47cdaaa994813a7807673ad9552b6f4254c5a67f803af55eb42f44ac23ea52e8a67b SHA512 (maven-jar-plugin.tar.xz) = 990f83b1068d417613b061b5bb60b65717813c787e1e2ec77e11fc04ed27d2e436bbbf45abb52a5b168cc01efef3f08d5e5e0313a84974c081fdb11c63a8cc50 SHA512 (maven-parent-pom.tar.xz) = 6ad4a0e113773375531d97f40970dc72b03745344af89bc8cf3ba2c1926f749d97508787a841416e52c4b87fb49e8acfb8bfbfd2b76f11e166f09c84f33a5075 SHA512 (maven-plugin-testing.tar.xz) = e72fcab892a00b52af06a821b3c2cff676af2bfc77ccaa851cf55017623bf89bb376a16f933fa0853087c1e8161336d21e649745ba2659c87795c4d8fad026df -SHA512 (maven-plugin-tools.tar.xz) = 321d6b1d9de339a90cc280ec789adf7e2883723e5468a8620fd2d5acfcb019196a538bd985d0b11d881842e83ef25539b660247329b8642afa81500027873b25 +SHA512 (maven-plugin-tools.tar.xz) = 59f86ed1fcea2470e1a5d62b13fdb3622dd927978350d35768aab9306ace098ad3b701aa1e30a23e275ecc58a2ecdaa92a8f17620e6aeb8881273cd681627d5c SHA512 (maven-remote-resources-plugin.tar.xz) = e027b341e8b46f7663066442b9a14c32e1dd030b6cce06498037882331c0d0103a5370903f1b9605b6c76b391dbe0d51f34e1f007b83faa6012529e0aa5ee5a6 SHA512 (maven-resolver.tar.xz) = 0991fef6f539eb6bb0c0e550c6f4b0b28b6eac8fc13b66e8807674dcec9dc891364b8ed1f5dfe9a775a0e35ac17520f924b75d836124ae48c42ddb573153576d SHA512 (maven-resources-plugin.tar.xz) = c68fdd88eb0ca1d88b97b76bcaf413591eaa69dd00c0e7e27398db80da57cd03b114331c51b7b2d87291764bd68e2ddef581d1ab58b0a0a3ecd8439c1297d1b0 @@ -68,10 +67,10 @@ SHA512 (maven-shared-utils.tar.xz) = 1c73783e10a47595963ee93db8090abf18e69395a62 SHA512 (maven-source-plugin.tar.xz) = a512ba17da295771e488fbf9c4f8fd488ed82f07e9a5d56d5327dc6aef28788ed4ff36e65c7231ea70c874425212ccd9a3e3c562a6d96ed6225eaaaed1d873a2 SHA512 (maven-surefire.tar.xz) = f2069b89a5d5d8e335ab10b227973b3c43e58deaa006b9c4eb4419aaab5c4eee0159dbc8448f8df26fe3c8c00017bf5535b6a6fea962fbbfc2b2b808b1444264 SHA512 (maven-verifier.tar.xz) = 74977699bf37a9c0929a9583c57128b6c58376953248c16b3aa40f836613e7f0caba0229f5a6d622f814b7d4a94fd201034be7c98d8f9568f93269beccb3ae95 -SHA512 (maven-wagon.tar.xz) = 96e615abcf41bbd192eaf3630abd17ac6bde768905877ceeb6538d406ad0cdc38f6e9862def9effb0a309688043b429488ba2d0fe6f42b0acff39d64064625b3 -SHA512 (maven.tar.xz) = 11696c2eedb1f1a58c473b9cfce9489cb0a382cc1830750226ff7ec36a013c10e959129d1f47d6ca36c1a0009984acaec0751aa4547f01ed2c2a21cba78f68f5 +SHA512 (maven-wagon.tar.xz) = abac6ca4ec8b813a7829dea5b90c67938d0c23a03dd24b08b64df005cf5cf113ab0806501a61faa41331f2b399decb1f5259a01fe0ecc4aab4d349dcaa9b1553 +SHA512 (maven.tar.xz) = dca267003c12bfbde23bdf5b0a3f90351ba79e7a4a5b3fd7e062441c5b94909043791bc4c2ccd4313c72ddd280502361bd53106b4fc99c6b1cc3fd2c07d4b74c SHA512 (mockito.tar.xz) = 8fefdeae3e7bcb41c97080aa208bc9bb6fa787235cc572990ba376c9995f60fa7ab7534e88701da36b00b49eb7b5f2b1c479bbf0e9c86fc1923a7eddc68b4c77 -SHA512 (modello.tar.xz) = 7b3309faf893f90bf778429a452fc579ec30a355968143e3dedafbad1a0068bff4dad4ccd614ce8347753624c1ed767dada7b09b41d9f4d7048d7fcff4f4bfd7 +SHA512 (modello.tar.xz) = 7bdd8fd70336f305404bf3e320aba4edcf84fbeb49a8f5d1d027df6a1953ed82ebfcf90896093899a3818c186292793fc7764093f20e5a5a74e2e8c1137a95a3 SHA512 (mojo-parent-pom.tar.xz) = 74dd480f93c83c18b1c6402b8ed9e7472fcc94d35fe64504006fa8e789741a14dfd63e0a52f6accce89568d1837de8854782f298b7b57c7b3d8ac9b9cad180d8 SHA512 (munge-maven-plugin.tar.xz) = 898d65256a04ebb108effe1d9b2b973f744556c0e7c16c99139c8fa1f059f0e32a13e01d872d8b6cd3cb056337e9ffa69ec0f8248131ee51d012c008b91290d9 SHA512 (objenesis.tar.xz) = 40395a14bcc6a01ee1c0d8c2c2476876cae905461119bcdeb748f42860cd0f5e945ddbc4e54eb26a53e639da71ff3f35f107c64666a54dc3aa1b774397448765 @@ -80,16 +79,16 @@ SHA512 (osgi-annotation.tar.xz) = 50ace49682061546a20d6ef8772281fbf3c8965b6c2948 SHA512 (osgi-cmpn.tar.xz) = 1be16086c97a7375b89516d86c0381ed5c9f1c86b4b2c3f60e02d974de588f7de1b29f6b8c99b1392d449559588d64817f4de92e3a27ef6b544538881eb03831 SHA512 (osgi-core.tar.xz) = caf409302ff430f6b4d13155152a5b8524a828c88f6260a745c041fa37c44628894d3649620e381f8a407a49402b30877a37613a0bb129c236587210a9475759 SHA512 (oss-parent-pom.tar.xz) = 1b7559cf4ab9a5e4b86caab4247ccbba7136f893662475e08b3c989956a2d50fb44a18a98c9ab7595c3aa84415b94ff8f74f4255c1764006509120cb08e3e641 -SHA512 (plexus-archiver.tar.xz) = 58f7096ba3640f469c32f652483b5407ce34934563c4d759aa73affcb26e9e28236c9f6a30e7330348a8c4c05ac94ba7c753b7e6856c1ac47eab519ae37470b2 +SHA512 (plexus-archiver.tar.xz) = a16bbe67070552f3cda1099c626189d25898decd993563665cef3e9f9bb53e43e2819ff9457fb51d7318ca4f19a9b426588b40e1f519e04d3cfa0c9b85d708e8 SHA512 (plexus-build-api.tar.xz) = 1908f360b9926a752dd3950d85e9aa6cbb0f5ebfd92198ed4d04372e5f47a3d5aa771b25b75f6f4dea50ef909b1c4b5084e7b8a40a260c3c5dbfc12b43bf05a7 SHA512 (plexus-cipher.tar.xz) = 28243457ee852513938fcff991dfa59098845145807bc0682a7ff815591a444bd89dd812f72b0fff8cfbb21b26d310c4653c05467bae3fb55d0995fe7bd1dfb9 SHA512 (plexus-classworlds.tar.xz) = d7c22e1a34395f698a76aeffcd2cde23fd9077f07d186b91442d34b2a80a1745795b9cfc9d7370c44dbf2c4969d5f977321d1a2a25ddf6833a94baac1f6f6037 -SHA512 (plexus-compiler.tar.xz) = d15943c35af56cdeac569c69ca492f1b3197803a83cddd6beb675e4efa7de8613ec68513e720188a7cf732674e5019bcf34480e4d0ba6c6781c0cd815afde989 -SHA512 (plexus-components-pom.tar.xz) = c35bbce1e5e664e3ef133ca8b4e994f1a40d37ae36b164519f8b4c204c687120eb3da20edb45855cb08011404320acf210ae73893ca82f25697ba09b7d31f718 +SHA512 (plexus-compiler.tar.xz) = b4060ba77a058a21f01380eb4abd016708b7ad8d3b91aa2098868c093cc6e9d4e97f45bfd72b46c8c669271f40f9710e732f70186e484cf0e771f0d272e95c27 +SHA512 (plexus-components-pom.tar.xz) = d98db6011cc31c836f6c473f96413cf2260143ffe3395e8327230b808584111d6216c5780140452e109a74e98ad22dfabd1fa386521ac598979caf042d3347d9 SHA512 (plexus-containers.tar.xz) = 29b74507975a6b5529c580908da3af491299a22f2e59ec2428d39041d56b2d47a49d5fbb971df1e6ce3ef2e27b8bfad40576e9924f8739773bc25e8379b2bd22 SHA512 (plexus-interpolation.tar.xz) = 1e200b309979e874546ba03b6ae7fe166e2f0dfb71c0b05399ee0a986de6be171456a545719671e502968a91b1af5cfcf046fd1d2f9d9cca51aa0081466dea21 SHA512 (plexus-io.tar.xz) = 1582ddeb4486e1408421f50144352f352bec60b158473b16351f0ad02b114718a0f3a35e8c60bd21fb840c267e3fc08dc1ec48335a9fab1ef30ca3397d2238fc -SHA512 (plexus-languages.tar.xz) = 6c19243689b852d362138ed96bf7fa22e58c19fedca4031b1a300110a69224b94bf8eef53bb1df475d772ac2f039fe21398a5de91c312b23e4d33511f9f59fed +SHA512 (plexus-languages.tar.xz) = 5fff40f43a21f5da1596ff8d17d48f21e8908b8baa6aa63c6c665a1058b05b651c32faabca9f765084c68d9d528129bdbb93cba69e540933fb005e260a56db2c SHA512 (plexus-pom.tar.xz) = c71e79b7b569c311d07de1593ed821937c28721dc7a5c47637c81944825dafd2b52d706b97d4eff5604cd3a506d38f6639f657684bf385f80e79b4a89b1c07e8 SHA512 (plexus-resources.tar.xz) = 257a832db95eb73a8e553f895160f3e680ef7a0af3803d6ad755924510ed65bbb685539c25e6a56e2a11baad1bece94dcff09e1a9cf4f09cea31201737a1cf36 SHA512 (plexus-sec-dispatcher.tar.xz) = 4c9be8c78ff3f6ab2ff1a5271602b66b61546294bdedc1e3cf5b92e8daa8365bcf721beaf12ba7ae16f2da24f506fbd04f3c9203b4627a930c359ca68f9ead4f From 7c46bd6274eea7ec61d1451f5e7225914e3be986 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 5 May 2022 06:35:11 +0200 Subject: [PATCH 30/77] 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 - 1.5.0^20220505.git4f9a68a-1 +- Update to latest upstream snapshot + * Fri Apr 29 2022 Mikolaj Izdebski - 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 From dfc18968f7c4dba1b83cf3d3ee8d2e9d53e78562 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 5 May 2022 13:42:40 +0200 Subject: [PATCH 31/77] Fix dangling toolchains.xml symlink --- javapackages-bootstrap.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/javapackages-bootstrap.spec b/javapackages-bootstrap.spec index 6d33726..3be681b 100644 --- a/javapackages-bootstrap.spec +++ b/javapackages-bootstrap.spec @@ -17,7 +17,7 @@ Name: javapackages-bootstrap Version: 1.5.0^20220505.git%{git_short_hash} -Release: 1%{?dist} +Release: 2%{?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 @@ -333,7 +333,7 @@ do done # Use toolchains.xml provided by javapackages-tools -ln -sf %{_datadir}/xmvn/conf/toolchains.xml %{buildroot}%{mavenHomePath}/conf/toolchains.xml +rm %{buildroot}%{mavenHomePath}/conf/toolchains.xml install -d -m 755 %{buildroot}%{_rpmmacrodir} echo '%%jpb_env PATH=/usr/libexec/javapackages-bootstrap:$PATH' >%{buildroot}%{_rpmmacrodir}/macros.%{name} @@ -353,6 +353,9 @@ echo '%%jpb_env PATH=/usr/libexec/javapackages-bootstrap:$PATH' >%{buildroot}%{_ %doc AUTHORS %changelog +* Thu May 05 2022 Mikolaj Izdebski - 1.5.0^20220505.git4f9a68a-2 +- Fix dangling toolchains.xml symlink + * Thu May 05 2022 Mikolaj Izdebski - 1.5.0^20220505.git4f9a68a-1 - Update to latest upstream snapshot From 0b873c5b74e64860a6d25169ce958d032c840475 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Thu, 5 May 2022 11:31:23 +0200 Subject: [PATCH 32/77] Onboard package into gating --- .fmf/version | 1 + gating.yaml | 8 ++++++++ plans/javapackages.fmf | 9 +++++++++ 3 files changed, 18 insertions(+) create mode 100644 .fmf/version create mode 100644 gating.yaml create mode 100644 plans/javapackages.fmf diff --git a/.fmf/version b/.fmf/version new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/.fmf/version @@ -0,0 +1 @@ +1 diff --git a/gating.yaml b/gating.yaml new file mode 100644 index 0000000..05d1cc5 --- /dev/null +++ b/gating.yaml @@ -0,0 +1,8 @@ +--- !Policy +product_versions: + - fedora-* +decision_contexts: + - bodhi_update_push_testing + - bodhi_update_push_stable +rules: + - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional} diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf new file mode 100644 index 0000000..84c5808 --- /dev/null +++ b/plans/javapackages.fmf @@ -0,0 +1,9 @@ +summary: + Run javapackages-specific tests +discover: + how: fmf + url: https://pagure.io/javapackages-validator-tests +execute: + how: tmt +environment: + FMF_PACKAGE: javapackages-bootstrap From 603699159a2b3b35222a2e18decfb581b824171e Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 10 May 2022 11:08:24 +0200 Subject: [PATCH 33/77] Implement basic smoke test --- ci.fmf | 1 + gating.yaml | 3 ++- plans/smoke.fmf | 12 ++++++++++++ 3 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 ci.fmf create mode 100644 plans/smoke.fmf diff --git a/ci.fmf b/ci.fmf new file mode 100644 index 0000000..c5aa0e0 --- /dev/null +++ b/ci.fmf @@ -0,0 +1 @@ +resultsdb-testcase: separate diff --git a/gating.yaml b/gating.yaml index 05d1cc5..7b6e38f 100644 --- a/gating.yaml +++ b/gating.yaml @@ -5,4 +5,5 @@ decision_contexts: - bodhi_update_push_testing - bodhi_update_push_stable rules: - - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional} + - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/smoke.functional} + - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/javapackages.functional} diff --git a/plans/smoke.fmf b/plans/smoke.fmf new file mode 100644 index 0000000..ce42085 --- /dev/null +++ b/plans/smoke.fmf @@ -0,0 +1,12 @@ +summary: Basic smoke test +execute: + script: + - /usr/libexec/javapackages-bootstrap/mvn --version + - /usr/share/javapackages-bootstrap/bin/mvn --version + - /usr/libexec/javapackages-bootstrap/xmvn --version + - /usr/libexec/javapackages-bootstrap/xmvn-install --help + - /usr/libexec/javapackages-bootstrap/xmvn-resolve --help + - /usr/libexec/javapackages-bootstrap/xmvn-subst --help + - /usr/libexec/javapackages-bootstrap/ant -version + - echo 'non terminal bar; bar::=;' | /usr/libexec/javapackages-bootstrap/cup + - /usr/libexec/javapackages-bootstrap/jflex -version From d4857f2d4e4e9cd73521ef9c8ab63aaca9476a53 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 11 May 2022 15:25:37 +0200 Subject: [PATCH 34/77] Update test configuration --- plans/javapackages.fmf | 2 -- 1 file changed, 2 deletions(-) diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf index 84c5808..def0914 100644 --- a/plans/javapackages.fmf +++ b/plans/javapackages.fmf @@ -5,5 +5,3 @@ discover: url: https://pagure.io/javapackages-validator-tests execute: how: tmt -environment: - FMF_PACKAGE: javapackages-bootstrap From 5bbdb299a1cf5dd7f7fdab82accb8a1451b68729 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 12 May 2022 22:33:24 +0200 Subject: [PATCH 35/77] Add ExclusiveArch: %{java_arches} noarch See: https://fedoraproject.org/wiki/Changes/Drop_i686_JDKs --- javapackages-bootstrap.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/javapackages-bootstrap.spec b/javapackages-bootstrap.spec index 3be681b..a0d9e3d 100644 --- a/javapackages-bootstrap.spec +++ b/javapackages-bootstrap.spec @@ -23,6 +23,7 @@ Summary: A means of bootstrapping Java Packages Tools 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 URL: https://github.com/fedora-java/javapackages-bootstrap BuildArch: noarch +ExclusiveArch: %{java_arches} 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 From ce3adf5c6cc7d779b5028195cd782d8f89a1cfbb Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 13 May 2022 13:24:33 +0200 Subject: [PATCH 36/77] Update to upstream version 1.7.0 --- .gitignore | 1 + javapackages-bootstrap.spec | 63 +++++++++++++++++-------------------- sources | 40 +++++++++++------------ 3 files changed, 50 insertions(+), 54 deletions(-) diff --git a/.gitignore b/.gitignore index 1cbd7cd..95c3bb9 100644 --- a/.gitignore +++ b/.gitignore @@ -128,3 +128,4 @@ /1cfada9.tar.gz /4f9a68a.tar.gz /extra-enforcer-rules.tar.xz +/javapackages-bootstrap-1.7.0.tar.xz diff --git a/javapackages-bootstrap.spec b/javapackages-bootstrap.spec index a0d9e3d..acb7889 100644 --- a/javapackages-bootstrap.spec +++ b/javapackages-bootstrap.spec @@ -12,12 +12,12 @@ %global artifactsPath %{_javadir} %global launchersPath %{_libexecdir}/%{name} -%global git_hash 4f9a68a793de4e82003514fc3dff9167fc26b1ea -%global git_short_hash %(echo %{git_hash} | cut -b -7) +#global git_hash ... +#global git_short_hash %(echo %{git_hash} | cut -b -7) Name: javapackages-bootstrap -Version: 1.5.0^20220505.git%{git_short_hash} -Release: 2%{?dist} +Version: 1.7.0 +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,8 +25,8 @@ URL: https://github.com/fedora-java/javapackages-bootstrap BuildArch: noarch ExclusiveArch: %{java_arches} 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/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 # License breakdown Source1: javapackages-bootstrap-PACKAGE-LICENSING @@ -150,9 +150,9 @@ Source1108: xz-java.tar.xz Patch0: 0001-Bind-to-OpenJDK-17-for-runtime.patch Provides: bundled(ant) = 1.10.12 -Provides: bundled(apache-parent) = 23 +Provides: bundled(apache-parent) = 26 Provides: bundled(apiguardian) = 1.1.2 -Provides: bundled(objectweb-asm) = 9.2 +Provides: bundled(objectweb-asm) = 9.3 Provides: bundled(assertj-core) = 3.19.0 Provides: bundled(aqute-bnd) = 5.2.0 Provides: bundled(maven-plugin-build-helper) = 3.2.0 @@ -161,15 +161,15 @@ Provides: bundled(cdi-api) = 2.0.2 Provides: bundled(cglib) = 3.3.0 Provides: bundled(jakarta-annotations) = 1.3.5 Provides: bundled(apache-commons-beanutils) = 1.9.4 -Provides: bundled(apache-commons-cli) = 1.4 +Provides: bundled(apache-commons-cli) = 1.5.0 Provides: bundled(apache-commons-codec) = 1.15 Provides: bundled(apache-commons-collections) = 3.2.2 -Provides: bundled(apache-commons-compress) = 1.20 +Provides: bundled(apache-commons-compress) = 1.21 Provides: bundled(apache-commons-io) = 2.11.0 Provides: bundled(apache-commons-jxpath) = 1.3 Provides: bundled(apache-commons-lang3) = 3.12.0 Provides: bundled(apache-commons-logging) = 1.2 -Provides: bundled(apache-commons-parent) = 52 +Provides: bundled(apache-commons-parent) = 53 Provides: bundled(java_cup) = 0.11b Provides: bundled(easymock) = 4.3 Provides: bundled(extra-enforcer-rules) = 1.5.1 @@ -179,11 +179,11 @@ Provides: bundled(fusesource-pom) = 1.12 Provides: bundled(guava) = 31.0.1 Provides: bundled(google-guice) = 4.2.3 Provides: bundled(hamcrest) = 2.2 -Provides: bundled(httpcomponents-client) = 4.5.11 +Provides: bundled(httpcomponents-client) = 4.5.13 Provides: bundled(httpcomponents-core) = 4.4.13 Provides: bundled(httpcomponents-project) = 12 -Provides: bundled(atinject) = 1.0.3 -Provides: bundled(jansi) = 2.3.3 +Provides: bundled(atinject) = 1.0.5 +Provides: bundled(jansi) = 2.4.0 Provides: bundled(beust-jcommander) = 1.81 Provides: bundled(jdom) = 1.1.3 Provides: bundled(jdom2) = 2.0.6 @@ -196,12 +196,12 @@ Provides: bundled(maven-archiver) = 3.5.1 Provides: bundled(maven-artifact-transfer) = 0.13.1 Provides: bundled(maven-assembly-plugin) = 3.3.0 Provides: bundled(maven-plugin-bundle) = 5.1.1 -Provides: bundled(maven-common-artifact-filters) = 3.1.0 +Provides: bundled(maven-common-artifact-filters) = 3.2.0 Provides: bundled(maven-compiler-plugin) = 3.10.1 Provides: bundled(maven-dependency-analyzer) = 1.12.0 Provides: bundled(maven-dependency-plugin) = 3.3.0 Provides: bundled(maven-dependency-tree) = 3.1.0 -Provides: bundled(maven-enforcer) = 3.0.0~M2 +Provides: bundled(maven-enforcer) = 3.0.0 Provides: bundled(maven-file-management) = 3.0.0 Provides: bundled(maven-filtering) = 3.2.0 Provides: bundled(maven-jar-plugin) = 3.2.0 @@ -216,13 +216,13 @@ 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 Provides: bundled(mockito) = 3.7.13 Provides: bundled(modello) = 2.0.0 -Provides: bundled(mojo-parent) = 60 +Provides: bundled(mojo-parent) = 67 Provides: bundled(munge-maven-plugin) = 1.0 Provides: bundled(objenesis) = 3.1 Provides: bundled(opentest4j) = 1.2.0 @@ -236,27 +236,27 @@ Provides: bundled(plexus-cipher) = 2.0 Provides: bundled(plexus-classworlds) = 2.6.0 Provides: bundled(plexus-compiler) = 2.11.1 Provides: bundled(plexus-components-pom) = 6.6 -Provides: bundled(plexus-containers) = 2.1.0 +Provides: bundled(plexus-containers) = 2.1.1 Provides: bundled(plexus-interpolation) = 1.26 Provides: bundled(plexus-io) = 3.2.0 Provides: bundled(plexus-languages) = 1.1.1 -Provides: bundled(plexus-pom) = 7 -Provides: bundled(plexus-resources) = 1.1.0 +Provides: bundled(plexus-pom) = 8 +Provides: bundled(plexus-resources) = 1.2.0 Provides: bundled(plexus-sec-dispatcher) = 2.0 Provides: bundled(plexus-utils) = 3.4.1 Provides: bundled(qdox) = 2.0.0 Provides: bundled(jakarta-servlet) = 4.0.3 -Provides: bundled(sisu) = 0.3.4 +Provides: bundled(sisu) = 0.3.5 Provides: bundled(sisu-mojos) = 0.3.5 -Provides: bundled(sisu-plexus) = 0.3.4 -Provides: bundled(slf4j) = 1.7.30 +Provides: bundled(sisu-plexus) = 0.3.5 +Provides: bundled(slf4j) = 1.7.36 Provides: bundled(testng) = 7.4.0 Provides: bundled(univocity-parsers) = 2.9.1 Provides: bundled(velocity) = 1.7 Provides: bundled(xbean) = 4.18 Provides: bundled(xmlunit) = 2.8.2 Provides: bundled(xmvn) = 4.0.0 -Provides: bundled(xz-java) = 1.8 +Provides: bundled(xz-java) = 1.9 BuildRequires: byaccj BuildRequires: java-17-openjdk-devel @@ -285,9 +285,7 @@ example, JPB contains embedded version of XMvn, removing dependency of JPT on XMvn, allowing JPT to be used before one builds XMvn package. %prep -echo %{git_hash} -echo %{git_short_hash} -%setup -q -n %{name}-%{git_hash} +%setup -q # leave out the first source as it has already been extracted # leave out licensing breakdown file @@ -327,12 +325,6 @@ JAVA_HOME=%{javaHomePath} ./mbi.sh dist \ -launchersPath=%{launchersPath} \ -licensesPath=%{_licensedir}/%{name} \ -# fix permissions -for f in mvn mvnDebug mvnyjp -do - chmod +x "%{buildroot}%{mavenHomePath}/bin/${f}" -done - # Use toolchains.xml provided by javapackages-tools rm %{buildroot}%{mavenHomePath}/conf/toolchains.xml @@ -354,6 +346,9 @@ echo '%%jpb_env PATH=/usr/libexec/javapackages-bootstrap:$PATH' >%{buildroot}%{_ %doc AUTHORS %changelog +* Fri May 13 2022 Mikolaj Izdebski - 1.7.0-1 +- Update to upstream version 1.7.0 + * Thu May 05 2022 Mikolaj Izdebski - 1.5.0^20220505.git4f9a68a-2 - Fix dangling toolchains.xml symlink diff --git a/sources b/sources index c79d5b5..c2d4507 100644 --- a/sources +++ b/sources @@ -1,8 +1,8 @@ -SHA512 (4f9a68a.tar.gz) = 5aa782c3d7f588668f6a9893d6bc0937cd8b7b324bb88f7d8e7f919fb1e952c5f6ff7aaf8cb9f9890875b09f8342f969957ad5bed7102551fedf36d56ce36ff1 +SHA512 (javapackages-bootstrap-1.7.0.tar.xz) = a2c176448b2beb7f29c81f17102c36c387d36c6f4be543b9e69ee3b76480cde631e5f5aeb05c2e206fbe3aff1b2adb1bc27bc0d360ee2d746f03d8a9a999c16a SHA512 (ant.tar.xz) = d2a4babb7766fc2acf3e9377ffd5af790c7d0612d3e34a9642a9a2b85ffb0f15936ef2979389496dce8ea72ed941797cd1f7507beeb1853a46394019adde4152 -SHA512 (apache-pom.tar.xz) = e708b87010111c04d05df6d87137b21c29d256dc951b5a3503a5f3c84a954d14bc7a1e04e351e251a7c67a217ef93e36b164b368f807e3ee50b069c0af6c7172 +SHA512 (apache-pom.tar.xz) = feebe0142114a6fb61dec26153bdef4314554d109bcf4910518ae9ecaf27e5dd9dc1f03d48271833f3497ab7045265900c5816708f513ae834643c533cd1291f SHA512 (apiguardian.tar.xz) = c3d75e88a983eb53c06007fd01f11c89083e119d2d4ed5d0e97644f45d5e451fd611bee493d720d011562ae29e7cdfd1d6fb4621d17c9db4b61430e62afea2bf -SHA512 (asm.tar.xz) = 8745a2279e0b4d9972d08b782586ddfabcd42d89fdcc06a24a29e75d9905cab0bf6a4c6d76fabd806fcde1159a2667c63bfac94bdce0a535acac1a5124bac2a8 +SHA512 (asm.tar.xz) = 4e734062489794c72de2d65adfdb39a9fa498b967ec4c5f0e2f1279af71d11a7905539d73cffcb21832737c9339cc489fe7cce2e31d07283160c1a6517ea6ac1 SHA512 (assertj-core.tar.xz) = 56c2f6a68cc7bbd5921640375656565a7854270b14f25f18df69d6ac39dfe8cc2625388ae13fa9747bf46d112782c5802b13b56b9f3e6b44be818a9e49f5fdc8 SHA512 (bnd.tar.xz) = bb163a650a6f92f88051a6d169d40a2b1b103d12f5e219be55eac16acdf23868ab8544610891c7b0bd58e79a7c8d7dd5fc238b2bc5195b4510f764593966ba2a SHA512 (build-helper-maven-plugin.tar.xz) = eb45f6d26d89f21d0b306660421425cf0c3f10819f0b2d89c8db334c1574e2bf3196eb4f4cda65e8179ae4822a933190fb2c5276510daf52b2c26020e75f298e @@ -11,15 +11,15 @@ SHA512 (cdi.tar.xz) = 334ffd958aa8915eabeaf8c554cffc0e636e73538d2efa2ddb40590381 SHA512 (cglib.tar.xz) = 2938c98ed74a95828a1353afae1e79b43725899e845a3e040c2fd9705f87fd523bb9c04f36d8ad1beec21c725bd85d40eeebc30e161334da0469b854f263e9c9 SHA512 (common-annotations-api.tar.xz) = 2df37b149dd687bff64064ea393e8e93fe907079966c367963fe983ea6edd612f5208113e2432a515d68f2d3d6892a12582bfe1e304b8c71ebe2acbb35c3b2c4 SHA512 (commons-beanutils.tar.xz) = 8d88c5d46f0536dc952da85fe3554f4d682b03eba4adcd01d9726821d03193d236a5bb89c3b3469c86a767bf969628bdce6916b48a6a4aa0952ae36e1a8a0831 -SHA512 (commons-cli.tar.xz) = 241dbd30e5b8d50664bbf7a17194b5d6300e2f33e0ad1ad150da2ae08eda3a15a4c987c2feb8fda0deef5ddbf1f6b3052712f3ec7ec545e5a5939828c52eccb8 +SHA512 (commons-cli.tar.xz) = 9d9ea6a2a44b9c25f594cd3d7a2b1babaf523680d9b5ff97e9d1f8babfc87c24c07061a9160eaad637630dcd2e7234b89069cbf116da11f01b30496a981bfddb SHA512 (commons-codec.tar.xz) = 97a2204042029dec4bf92cfc53211510f156bbaaac35a6d58281acb34762ab4179dda5f4e3d806030548c780050753bf7356a80474a372c0fa82f62fff1d785a SHA512 (commons-collections.tar.xz) = 5033b96edd59c6eba0c6fcb2208755e0a317a66cc218df7e5ad05fa063055085ac0ed683728a979b54ddb10b71c7a0d7fbb2a3249bca361be7a428d84a049f56 -SHA512 (commons-compress.tar.xz) = bf9ffcf78cf348174b1825bebc09fb992e4c5a3f51cfd8db86fad73cdbfd0b89e7d94bcf378a7c2b2683d64a425ff1568f4876a2550e6bbc63ac4c76a48035c4 +SHA512 (commons-compress.tar.xz) = 9934b23c993630ddea5627d52e06fc2697e8d50bf227d613fa26fc9712457a85dc4910c983a8568eb8b884d4ed17aa81911304e0d486a9d40e5db5923b96b658 SHA512 (commons-io.tar.xz) = db2b973f68240622a4d4b821704478e45bcba73227fe95119bae9a6263344f3d1d91dab11edfb70a70e479470196980e96ac2866f9b6206b37cfc3018ce36fef SHA512 (commons-jxpath.tar.xz) = 6ad0e7e2f5f3dd377d78af1a49f5b7fa41ad66b71b80f73ac822e49a006b79dd06ee872c508dc8eb7696ef71bea2ee89c186b6dfc2cdcc4cc2da778f6950d2f5 SHA512 (commons-lang.tar.xz) = 8d5dd8cfa07792987fb17dfc5fbbf987f3812be9b7cd7473885b068f9a60bd5418dec9574fb122c060a82564b84b31901c8f0d7f2f610dd244806d66285a6c72 SHA512 (commons-logging.tar.xz) = 78a6b9e0139bb2d365438fa74e88f55fbeccb2e4a526592869c1a23719bd6340e25ecbb04888f4f284cc4fe2e153122b56f56f4af479d45c8b77c7c0708e39f3 -SHA512 (commons-parent-pom.tar.xz) = a79ec3f65ea172a8c15d655911ceffa01fc9c5b338bcaf3f2712d16f8da6be4a35549f07b6b4634bf7516a6a2ce90cec760a2a0acb1778c2d0596d82e9075f0f +SHA512 (commons-parent-pom.tar.xz) = 40db36c70a9c2128d8b678fbc7dc08d703dcfa140ac3bb4ebb471fa5b8eb19de0bea1504edda2a4f8507b8ab9f1a4012c19137fd247d2d0cc45e48a02d661ad3 SHA512 (cup.tar.xz) = 8624696fed9ed0045873a48a75f55f248faa9b3cfc5573182b4c67469d43dfde55d4e676dad6636d31c1f3729456e29b2facc4754e5d4caaaf39dfe6e1fd6af5 SHA512 (easymock.tar.xz) = 48489da810750bd9351327584f78d58cf4965ac22341ad4d964edead04c2665a5ea003c245c644f52a04f75e3b046ed3562e483657355ad414ecfc5ed69f965a SHA512 (extra-enforcer-rules.tar.xz) = 0c0dc6a79d83cad0ab5637e0fb99ca75e925890654bce225e6772f1fd943eb1b0b95dd8068291e0a7b077230c9cb995cb77ae9d8110e7e0c6d0e75d28cd7af9d @@ -29,11 +29,11 @@ SHA512 (fusesource-pom.tar.xz) = 1fe5d089eac6dbd2885d3ce1174e313d33e9b02ad24e700 SHA512 (guava.tar.xz) = 584db48bb5816be1e015a80dc1eb29c8c995e0c4500ae55088cf1a1b13215930b70643a1e79b36c59c99efa19ff6c1571ec76693d6199e8668b4b9d6140f36dc SHA512 (guice.tar.xz) = cfe2dcb98f45d2ba1caf4f4a07bbd847fd78ca61ad10cc4c4f822b5d19e4e90a5a69062851f21b3b2c3f347fcf24a20afe04e0a799b3bf4f2b1a003ff20c0f65 SHA512 (hamcrest.tar.xz) = 2049a59774773c2369e4c561545067524402a420bace29dc8cffac0fca8b6aa870e3de1882cc4a35549b67269ecbfc54e335ffd0c599ddb4b56341948da777a2 -SHA512 (httpcomponents-client.tar.xz) = c9a75660fdec07f309a257b67e1e6a77cb635c2c4e43333e5d2a5b196aaf48509c3ca4ca140445558a16f2d264052702c0f3be63d14ff5468b8f7adc7f90e0e9 +SHA512 (httpcomponents-client.tar.xz) = 2d6ad230847a7b256760623c57d909aae4013a987bc7fde8da4bba13047c6062866bb027254564036ffaef8e6d1f8745ddd9fdc0016f0e7c3904c55f608d9849 SHA512 (httpcomponents-core.tar.xz) = 6b643a3808e966b3f1d2dcdc5539d1d547f6e7460eef2dab92aa5ff161db1f4c7e9ddfda6539c6d5efe8b15751461410d949780d7d6e4880eee7776ebbe3a976 SHA512 (httpcomponents-parent-pom.tar.xz) = 587e23e2c6caff80b61e1c6fc8b2a591ffb1175c1e3a5a95d611d9fb3e2dab85ef317b3f982424b727070356240fd24a7cbcce20e2e5bd787cac2bc6d93e2a71 -SHA512 (injection-api.tar.xz) = 13e7d88d9010ec964044770a45f5d7e6e0b3bbaca3338974f99f46d3ef2db50fa021c95eaa68fab1797af697d4f6aa0cb8f8c8d7edcfc1d85466a2c329c90ec3 -SHA512 (jansi.tar.xz) = 5044ffd685358816caa5e8713624031981809e8dc8913ad5bdb3cba2decf975651629eafe49bdb80c60baa8e1eb8c0a40c04001c1cd9b200d7b8fb2d6d80aab9 +SHA512 (injection-api.tar.xz) = a0faaa4aa4a94d1cf01387b9d327da2be5d5c016b6fa6aca3aed0d75d4bec2c9a04df12fdc3c67f17b03918584ab5261f8dc20ab620f1289e34f8ad8ee23c9a6 +SHA512 (jansi.tar.xz) = 374f5ba2f55abd9ff5e15f009f94e9878bc077a62e0bd3ae3b18c5089c754478eefa991d8a4331330e052f7a65e551995821308cdb14e260dd84d6236945010e SHA512 (jcommander.tar.xz) = 9ff34b0e5dd391125c1f9a03175dffece39107ee133f5553323762ac10421161d693711934f10666b8177ab801a0dd03a63942b5635dae1aeb3432635cecb10e SHA512 (jdom.tar.xz) = 1a36168a0b8f2b9057855198e097fcb50992d9d79892cdeeb20eada43ad7a79acf4fda0a06496b8a36cb537577575504efc066774912a1c4d08288e716232579 SHA512 (jdom2.tar.xz) = f05f9114c337a20111a88e6e045de57d034344246f568f09f75344160cd8243a6bb5cbf14429f09090a1e3c3dcd2b05e5441ee7686c4a222f433eade81c25384 @@ -46,12 +46,12 @@ SHA512 (maven-archiver.tar.xz) = ddcccd12e7c327c56125d944167f995a4de8a4bc1c4c929 SHA512 (maven-artifact-transfer.tar.xz) = eb023b00573a10f2002b2b23b048ef3c0e59d33c20cefd8915227450923f6ba7850ac9d96b73fec9b2fd0127bcfdcd08deefd47803aa7a0e6c6ccc0d40dc2fc2 SHA512 (maven-assembly-plugin.tar.xz) = a24c5a78933c191d01ad92f1040260c2cb270294cb1cf1f345f0430b8a0e630d2e90cee99769b5eef9eda68eb2a11adbdd611e94ce495db9d287cc9fb2fb7203 SHA512 (maven-bundle-plugin.tar.xz) = e0837cee004b25f8a9e85c4cc27f31b3a05a7fba94728d6a9a769118dac34c20640285ae67eaef0a49376fe6f55afd819c7ee55f908207af6a3799594941ba78 -SHA512 (maven-common-artifact-filters.tar.xz) = 99f7847259d05ad84e506173b315c487ce91f6d9be8e383d76d31726c2d038c38a432a10d720c7a2168abc1a9fdd2886789f6263ef4ce894bb0fef4f05ca33b9 +SHA512 (maven-common-artifact-filters.tar.xz) = 2e0e351fdb30b8817cbd29a973a55fed9afd5978d174b0bdf563489dbfe88e7b95c97360655bd8cfaa4a232d6567bb561ddf661d2da4f9626a28b649041b8b90 SHA512 (maven-compiler-plugin.tar.xz) = 0259e739d1675b5b3905a93ad392f9abe772d9324580898aeae16c33e27885a518003caa7546d624b937557cbd05d087c923081e8d21e6b84f9e46c4fb2d1234 SHA512 (maven-dependency-analyzer.tar.xz) = 60c7c17621dbfe726b66ad70ca294c7f1405d5528e6c894cc38da637eb046162a43edad21b97aaa731c1ff31016ced1073e3eae3e42e4a9cae50a9b88f7ed619 SHA512 (maven-dependency-plugin.tar.xz) = 4092de8c04a74939c7b552bb102a040925930aeff8c7788f1ccb464dcf2eadc5fb2f8004055368ea0a128267d8b2fc674fa9cb536c1c7b13bfcf41b3630adc28 SHA512 (maven-dependency-tree.tar.xz) = be1f8848cd39e55fa2c3c13be29e4c03d73a0bca6c3218bd269c183703c5aee88af0f46c6f2901a20868eea0cb4b8817a48d467043079c8a4043e1a16f2c7456 -SHA512 (maven-enforcer.tar.xz) = 33b3e4e43614d062ed2c0f2362b5780f10ce7305c2c6b429c8192c7db028da564441ee98d1da06cec07d08154ea719dde9e5b551f3961085816f48ae01a0a5d3 +SHA512 (maven-enforcer.tar.xz) = 85d578149c2987e68c0adb9aa8247370075b1e85dcae894a0e7d2d3994ce48db03cae89725b45d8c53668a2c9f1b1984e8bf5c37557a44a144e68c384bb6f94b SHA512 (maven-file-management.tar.xz) = f8593f376d827be2eedbda2e10a8401072feba87748185aabf2aec87e965768567fa9795bc483ea47cc93cd7584f59077f78fdfe83f0f858aef7fdeb3f7c73e2 SHA512 (maven-filtering.tar.xz) = 6095ece59d2ae4955cdb8e5b476d63c20f64bb81c3d8341edd916c5d155c47cdaaa994813a7807673ad9552b6f4254c5a67f803af55eb42f44ac23ea52e8a67b SHA512 (maven-jar-plugin.tar.xz) = 990f83b1068d417613b061b5bb60b65717813c787e1e2ec77e11fc04ed27d2e436bbbf45abb52a5b168cc01efef3f08d5e5e0313a84974c081fdb11c63a8cc50 @@ -66,13 +66,13 @@ 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 SHA512 (mockito.tar.xz) = 8fefdeae3e7bcb41c97080aa208bc9bb6fa787235cc572990ba376c9995f60fa7ab7534e88701da36b00b49eb7b5f2b1c479bbf0e9c86fc1923a7eddc68b4c77 SHA512 (modello.tar.xz) = 7bdd8fd70336f305404bf3e320aba4edcf84fbeb49a8f5d1d027df6a1953ed82ebfcf90896093899a3818c186292793fc7764093f20e5a5a74e2e8c1137a95a3 -SHA512 (mojo-parent-pom.tar.xz) = 74dd480f93c83c18b1c6402b8ed9e7472fcc94d35fe64504006fa8e789741a14dfd63e0a52f6accce89568d1837de8854782f298b7b57c7b3d8ac9b9cad180d8 +SHA512 (mojo-parent-pom.tar.xz) = a9b9da6b088eb7c78e12734d0ecb5787a738d5956766a70dc2db70f47c0706b27f382c505d07638c5aaba8740721ae985a4abf38c6909b817fe6358eb8a506c3 SHA512 (munge-maven-plugin.tar.xz) = 898d65256a04ebb108effe1d9b2b973f744556c0e7c16c99139c8fa1f059f0e32a13e01d872d8b6cd3cb056337e9ffa69ec0f8248131ee51d012c008b91290d9 SHA512 (objenesis.tar.xz) = 40395a14bcc6a01ee1c0d8c2c2476876cae905461119bcdeb748f42860cd0f5e945ddbc4e54eb26a53e639da71ff3f35f107c64666a54dc3aa1b774397448765 SHA512 (opentest4j.tar.xz) = de1ed222741fe2c9b507946ce14a7039bb5d4b234982e55a763a1582e68fd3c56497c5f5d9345698522d2cf0a83079a6c53160820e725e9401872c2fe4364691 @@ -86,24 +86,24 @@ SHA512 (plexus-cipher.tar.xz) = 28243457ee852513938fcff991dfa59098845145807bc068 SHA512 (plexus-classworlds.tar.xz) = d7c22e1a34395f698a76aeffcd2cde23fd9077f07d186b91442d34b2a80a1745795b9cfc9d7370c44dbf2c4969d5f977321d1a2a25ddf6833a94baac1f6f6037 SHA512 (plexus-compiler.tar.xz) = b4060ba77a058a21f01380eb4abd016708b7ad8d3b91aa2098868c093cc6e9d4e97f45bfd72b46c8c669271f40f9710e732f70186e484cf0e771f0d272e95c27 SHA512 (plexus-components-pom.tar.xz) = d98db6011cc31c836f6c473f96413cf2260143ffe3395e8327230b808584111d6216c5780140452e109a74e98ad22dfabd1fa386521ac598979caf042d3347d9 -SHA512 (plexus-containers.tar.xz) = 29b74507975a6b5529c580908da3af491299a22f2e59ec2428d39041d56b2d47a49d5fbb971df1e6ce3ef2e27b8bfad40576e9924f8739773bc25e8379b2bd22 +SHA512 (plexus-containers.tar.xz) = 32218f1337cc490aa4a51e918d368e36894e4952c1e1686849a23ebda92b0fe893052deea774790980e2d7271b22cd58aa83dcd7b12d07fff3bf034c86e46cc1 SHA512 (plexus-interpolation.tar.xz) = 1e200b309979e874546ba03b6ae7fe166e2f0dfb71c0b05399ee0a986de6be171456a545719671e502968a91b1af5cfcf046fd1d2f9d9cca51aa0081466dea21 SHA512 (plexus-io.tar.xz) = 1582ddeb4486e1408421f50144352f352bec60b158473b16351f0ad02b114718a0f3a35e8c60bd21fb840c267e3fc08dc1ec48335a9fab1ef30ca3397d2238fc SHA512 (plexus-languages.tar.xz) = 5fff40f43a21f5da1596ff8d17d48f21e8908b8baa6aa63c6c665a1058b05b651c32faabca9f765084c68d9d528129bdbb93cba69e540933fb005e260a56db2c -SHA512 (plexus-pom.tar.xz) = c71e79b7b569c311d07de1593ed821937c28721dc7a5c47637c81944825dafd2b52d706b97d4eff5604cd3a506d38f6639f657684bf385f80e79b4a89b1c07e8 -SHA512 (plexus-resources.tar.xz) = 257a832db95eb73a8e553f895160f3e680ef7a0af3803d6ad755924510ed65bbb685539c25e6a56e2a11baad1bece94dcff09e1a9cf4f09cea31201737a1cf36 +SHA512 (plexus-pom.tar.xz) = 2f55ae0514e69cccc85bcd92becbad6c856cf6637e40d700867be849710a9bc9e8058ef4f3b0b30b5be089caeee19acef38d201bb91155858eec875448eb2db0 +SHA512 (plexus-resources.tar.xz) = 7c1cd518b75ba2b5653d5ec7f134985780450728e3a1943734bbd2b8227c6ccc73a2e076034fd46487329bd88cb4d4dfe36411482f8e8ee28aff4b1cf9c4f396 SHA512 (plexus-sec-dispatcher.tar.xz) = 4c9be8c78ff3f6ab2ff1a5271602b66b61546294bdedc1e3cf5b92e8daa8365bcf721beaf12ba7ae16f2da24f506fbd04f3c9203b4627a930c359ca68f9ead4f SHA512 (plexus-utils.tar.xz) = e13c4605d4268ec85fb10fa1c365455f8c8ac43db85760af68f079f78809c2c5d31df887d66f21fffa096c38c4f742d9c4b1eb7ae0de943c2c0734de89800d03 SHA512 (qdox.tar.xz) = 48c904a6e4ec4dfd66b47238e4151fb0ca092751a9e6a89f1bd89d9b6cd4a33e9493f0b2ee5e06ea81d956c3eeb81fba8b8552053e49b3155cc42a00a8af9e11 SHA512 (servlet-api.tar.xz) = a255c21c248dcb6a72022146f58e09cef03e388e6a64d97f5dfbbcfffce57fe88ef4255c2c1c1195958c70a4495b9512d6c2fff588c5e7df66394a45e44262ab -SHA512 (sisu-inject.tar.xz) = c44a8ee7999f4411f855e028f514f1f75c5b13faddcf793ce361090741f1e95e902c25b82bc6f3a3b92c4fc3a7720a5cf667f4a4839c6b04bf6512921211df7b +SHA512 (sisu-inject.tar.xz) = 419f2065f1acdce764ffcfcfb3716fb67a3b85cf596e047f66c5a6f1831dd5d96dd99583e6949d8b7ddee433f39a9a5731fa582f930ce6828e3a5139effcfa56 SHA512 (sisu-mojos.tar.xz) = ed9462baa5f59561131d84b6ea8d114a16b99fec0c502e2698e38556f1247a3c3550172d551ad8f38107558a8c78890a09ceebfee7ca2fceffea334b3da13ded -SHA512 (sisu-plexus.tar.xz) = 851660ef15f937c0c7e47a539ab35c0bb3afd9e4a8ef7f375b66d066b37bb06b6343cb28fe1dc83cb94a072e76b424740926d6d2802a61f07d977b6adf082340 -SHA512 (slf4j.tar.xz) = 0ca1edd19492d08c5ee61d17b6be6468091176acbfa3cd43a902412614cdf591ea3b769100ee645ac16339ac4fa4667e9294468b2ce9f764717b7a8b4862ab02 +SHA512 (sisu-plexus.tar.xz) = 044d8738f5387cdecc9e2fdf78ff7b7c46e2240ea982aa09057aa6518c19b8537a115839e3a474ca271cbdf9f1225fc4610a28c875d0759a5af1e7c9f03711d1 +SHA512 (slf4j.tar.xz) = 434da37f9efaa3faba2ccda7781290a92904c29a24be6234c4a681bd55d9e33e3e4242282a4995cd40cf72b507aa26d761c8d8de1781d1c4997b50323b9250a6 SHA512 (testng.tar.xz) = 409fafaa772b92db0ac1978d1de108ed952d8d53ca3fd5d3c212dd67fb8408d45ea0cf9b94e25b08b1d6fe0d5bfcc3175d87fff2c151bb7ba29672fa10e801ae SHA512 (univocity-parsers.tar.xz) = 7daa3f54d26d7c64714990c7ad9d539bc7dd531917354b5b90970114e51c20aedac3e1fdd8b45e073d8c196b4ce2fa93c2f84a5498147de951ac147900ce51fa SHA512 (velocity-engine.tar.xz) = c8baa9e159acae579848c1dd33b488eb70f64280e2f806e0e2ccf3024d1bc4f588086cb523e0d8e6ea2f8802ff908ff5578e86e646131768356c6d6e9b7214d0 SHA512 (xbean.tar.xz) = 78bd8f7ed95b04e23df68f89890b16d86e7328b00881ddaaedcde07456761992cf4a25f4e83ebf48637ccb09dd48ff8d6646f8e3062468eb4f2a5f100369a756 SHA512 (xmlunit.tar.xz) = 2fa565f76c7e53283bf2aed9d0b092ec331352e5348b964de4ee9308e4094961b7509f5930575dc33ec623b7a074964019bfe247356507d7ec21dc18b2a8f58c SHA512 (xmvn.tar.xz) = 9d8393b5000e981bfb4aefe6a6352d5235d15f312af4d82170b90fec5f32619419e20c11cdc819aed280c681091cbe8a27d8a50193ee24303a08eb4ba30c0eec -SHA512 (xz-java.tar.xz) = 8c4ef8a617ba8d4df2df604c8490fcef504c68fdc1102c58c678648c9c680fa25078b78589e7cd012e03ba438df44a1397b55af2af8aa6609be4f3ad334ae6fb +SHA512 (xz-java.tar.xz) = dc4314babc66bf33e2964b35552746e30ddae136d2b717c3e498f5109154198595bc42d0b266b9e9966298d53d2f5d0196823fae193776eae27047d225cd2137 From e6f90a5533af4b4c8eeee2e778c4d2897c79da3e Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 13 May 2022 13:51:25 +0200 Subject: [PATCH 37/77] Downgrade do maven-surefire-3.0.0~M3 for now --- ...e-maven-surefire-to-version-3.0.0-M6.patch | 1910 +++++++++++++++++ javapackages-bootstrap.spec | 4 +- sources | 2 +- 3 files changed, 1914 insertions(+), 2 deletions(-) create mode 100644 0001-Revert-Update-maven-surefire-to-version-3.0.0-M6.patch diff --git a/0001-Revert-Update-maven-surefire-to-version-3.0.0-M6.patch b/0001-Revert-Update-maven-surefire-to-version-3.0.0-M6.patch new file mode 100644 index 0000000..9ce5f87 --- /dev/null +++ b/0001-Revert-Update-maven-surefire-to-version-3.0.0-M6.patch @@ -0,0 +1,1910 @@ +From ed96595dda4b84370b88d7f784c0c69d243c3595 Mon Sep 17 00:00:00 2001 +From: Mikolaj Izdebski +Date: Fri, 13 May 2022 13:53:32 +0200 +Subject: [PATCH] Revert "Update maven-surefire to version 3.0.0~M6" + +This reverts commit 50c1e58288a8834aab84b1d370565e7b907cee1d. +--- + mbi/dist/metadata.txt | 28 +- + ...0.patch => 0001-Port-to-TestNG-6.11.patch} | 28 +- + ...2-Port-to-current-maven-shared-utils.patch | 72 + + ...003-Disable-JUnit-4.8-test-grouping.patch} | 31 +- + .../0003-Port-to-JUnit-5.8.1.patch | 71 - + ...004-Port-to-maven-shared-utils-3.3.3.patch | 59 + + .../0004-Unshade-dependencies.patch | 1392 ----------------- + project/maven-surefire.properties | 2 +- + project/maven-surefire.xml | 6 +- + 9 files changed, 173 insertions(+), 1516 deletions(-) + rename patches/maven-surefire/{0001-Port-to-TestNG-7.4.0.patch => 0001-Port-to-TestNG-6.11.patch} (83%) + create mode 100644 patches/maven-surefire/0002-Port-to-current-maven-shared-utils.patch + rename patches/maven-surefire/{0002-Disable-JUnit-4.8-test-grouping.patch => 0003-Disable-JUnit-4.8-test-grouping.patch} (87%) + delete mode 100644 patches/maven-surefire/0003-Port-to-JUnit-5.8.1.patch + create mode 100644 patches/maven-surefire/0004-Port-to-maven-shared-utils-3.3.3.patch + delete mode 100644 patches/maven-surefire/0004-Unshade-dependencies.patch + +diff --git a/mbi/dist/metadata.txt b/mbi/dist/metadata.txt +index 84aa01f..1b949de 100644 +--- a/mbi/dist/metadata.txt ++++ b/mbi/dist/metadata.txt +@@ -615,7 +615,6 @@ MOD maven-surefire + DEP org.apache.maven.surefire surefire-api + ART org.apache.maven.surefire surefire-junit3 + DEP org.apache.maven.surefire common-junit3 +- DEP org.apache.maven.surefire common-java5 + DEP org.apache.maven.surefire surefire-api + ART org.apache.maven.surefire surefire-junit4 + DEP org.apache.maven.surefire common-junit4 +@@ -633,40 +632,33 @@ MOD maven-surefire + DEP org.apache.maven.surefire common-java5 + DEP org.apache.maven.surefire surefire-testng-utils + DEP org.apache.maven.surefire surefire-api +- ART org.apache.maven.surefire surefire-shared-utils +- DEP org.apache.maven.shared maven-shared-utils +- DEP commons-io commons-io +- DEP org.apache.commons commons-lang3 +- DEP org.apache.commons commons-compress + ART org.apache.maven.surefire surefire-logger-api + ART org.apache.maven.surefire surefire-api + DEP org.apache.maven.surefire surefire-logger-api +- DEP org.apache.maven.surefire surefire-shared-utils +- ART org.apache.maven.surefire surefire-extensions-api +- DEP org.apache.maven.surefire surefire-shared-utils +- ART org.apache.maven.surefire surefire-extensions-spi +- DEP org.apache.maven.surefire surefire-api ++ DEP org.apache.maven.shared maven-shared-utils + ART org.apache.maven.surefire surefire-booter + DEP org.apache.maven.surefire surefire-api +- DEP org.apache.maven.surefire surefire-extensions-spi ++ DEP org.apache.commons commons-lang3 ++ DEP commons-io commons-io + ART org.apache.maven.surefire common-java5 +- DEP org.apache.maven.surefire surefire-shared-utils ++ DEP org.apache.maven.shared maven-shared-utils + DEP org.apache.maven.surefire surefire-api + MOD maven-surefire-plugin + ART org.apache.maven.plugins maven-surefire-plugin + DEP org.apache.maven.surefire maven-surefire-common + ART org.apache.maven.plugins maven-failsafe-plugin + DEP org.apache.maven.surefire maven-surefire-common ++ DEP org.apache.maven.shared maven-shared-utils ++ DEP org.apache.commons commons-lang3 ++ DEP commons-io commons-io + ART org.apache.maven.surefire maven-surefire-common + DEP org.apache.maven.surefire surefire-api +- DEP org.apache.maven.surefire surefire-extensions-api + DEP org.apache.maven.surefire surefire-booter + DEP org.apache.maven.shared maven-common-artifact-filters +- DEP org.apache.maven.shared maven-shared-utils +- DEP org.apache.maven maven-model +- DEP org.eclipse.sisu org.eclipse.sisu.plexus + DEP org.codehaus.plexus plexus-java +- DEP org.apache.maven.surefire surefire-shared-utils ++ DEP org.apache.maven.shared maven-shared-utils ++ DEP commons-io commons-io ++ DEP org.apache.commons commons-lang3 + MOD maven-verifier + ART org.apache.maven.shared maven-verifier + DEP org.apache.maven.shared maven-shared-utils +diff --git a/patches/maven-surefire/0001-Port-to-TestNG-7.4.0.patch b/patches/maven-surefire/0001-Port-to-TestNG-6.11.patch +similarity index 83% +rename from patches/maven-surefire/0001-Port-to-TestNG-7.4.0.patch +rename to patches/maven-surefire/0001-Port-to-TestNG-6.11.patch +index e6b6bd0..a1ca19d 100644 +--- a/patches/maven-surefire/0001-Port-to-TestNG-7.4.0.patch ++++ b/patches/maven-surefire/0001-Port-to-TestNG-6.11.patch +@@ -1,4 +1,4 @@ +-From 219edb700ee76f167a329e5bab64feceee5b6b8f Mon Sep 17 00:00:00 2001 ++From 14196b58bc1d96d76636914b575dc22b7cc94b1a Mon Sep 17 00:00:00 2001 + From: Mikolaj Izdebski + Date: Mon, 10 Jul 2017 10:37:50 +0200 + Subject: [PATCH 1/4] Port to TestNG 7.4.0 +@@ -11,21 +11,21 @@ Forwarded: no + 3 files changed, 3 insertions(+), 4 deletions(-) + + diff --git a/surefire-providers/surefire-testng/pom.xml b/surefire-providers/surefire-testng/pom.xml +-index ece647d6a..682f296e6 100644 ++index 49e75b6ea..a9db4a8d9 100644 + --- a/surefire-providers/surefire-testng/pom.xml + +++ b/surefire-providers/surefire-testng/pom.xml + @@ -51,8 +51,7 @@ +- +- org.testng +- testng +-- 5.10 +-- jdk15 +-+ 7.4.0 +- provided +- +- ++ ++ org.testng ++ testng ++- 5.10 ++- jdk15 +++ 7.4.0 ++ provided ++ ++ + diff --git a/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/AbstractDirectConfigurator.java b/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/AbstractDirectConfigurator.java +-index ed918f538..c4a0cd19d 100644 ++index e9667316b..7021ef561 100644 + --- a/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/AbstractDirectConfigurator.java + +++ b/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/AbstractDirectConfigurator.java + @@ -63,7 +63,7 @@ public void configure( TestNG testng, Map options ) +@@ -38,7 +38,7 @@ index ed918f538..c4a0cd19d 100644 + + @Override + diff --git a/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/TestNGMapConfigurator.java b/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/TestNGMapConfigurator.java +-index 6caf82459..2d988381f 100755 ++index b6bf82e03..8164f4f4d 100755 + --- a/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/TestNGMapConfigurator.java + +++ b/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/TestNGMapConfigurator.java + @@ -68,7 +68,7 @@ public void configure( XmlSuite suite, Map options ) +@@ -51,5 +51,5 @@ index 6caf82459..2d988381f 100755 + } + + -- +-2.35.1 ++2.31.1 + +diff --git a/patches/maven-surefire/0002-Port-to-current-maven-shared-utils.patch b/patches/maven-surefire/0002-Port-to-current-maven-shared-utils.patch +new file mode 100644 +index 0000000..e793bd2 +--- /dev/null ++++ b/patches/maven-surefire/0002-Port-to-current-maven-shared-utils.patch +@@ -0,0 +1,72 @@ ++From 6a94c7674f844218752827f2b62de629691fcf39 Mon Sep 17 00:00:00 2001 ++From: Michael Simacek ++Date: Fri, 16 Mar 2018 13:45:01 +0100 ++Subject: [PATCH 2/3] Port to current maven-shared-utils ++ ++Forwarded: no ++ ++--- ++ .../plugin/surefire/report/StatelessXmlReporter.java | 12 ++++++------ ++ 1 file changed, 6 insertions(+), 6 deletions(-) ++ ++diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/StatelessXmlReporter.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/StatelessXmlReporter.java ++index b89c4e9b0..8cf0b60c3 100644 ++--- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/StatelessXmlReporter.java +++++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/StatelessXmlReporter.java ++@@ -326,7 +326,7 @@ private static File getReportFile( ReportEntry report, File reportsDirectory, St ++ } ++ ++ private static void startTestElement( XMLWriter ppw, WrappedReportEntry report, String reportNameSuffix, ++- String timeAsString ) +++ String timeAsString ) throws IOException ++ { ++ ppw.startElement( "testcase" ); ++ ppw.addAttribute( "name", report.getReportName() ); ++@@ -349,7 +349,7 @@ private static void startTestElement( XMLWriter ppw, WrappedReportEntry report, ++ } ++ ++ private void createTestSuiteElement( XMLWriter ppw, WrappedReportEntry report, TestSetStats testSetStats, ++- String timeAsString ) +++ String timeAsString ) throws IOException ++ { ++ ppw.startElement( "testsuite" ); ++ ++@@ -377,7 +377,7 @@ private void createTestSuiteElement( XMLWriter ppw, WrappedReportEntry report, T ++ ++ private static void getTestProblems( OutputStreamWriter outputStreamWriter, XMLWriter ppw, ++ WrappedReportEntry report, boolean trimStackTrace, OutputStream fw, ++- String testErrorType, boolean createOutErrElementsInside ) +++ String testErrorType, boolean createOutErrElementsInside ) throws IOException ++ { ++ ppw.startElement( testErrorType ); ++ ++@@ -434,7 +434,7 @@ private static void getTestProblems( OutputStreamWriter outputStreamWriter, XMLW ++ ++ // Create system-out and system-err elements ++ private static void createOutErrElements( OutputStreamWriter outputStreamWriter, XMLWriter ppw, ++- WrappedReportEntry report, OutputStream fw ) +++ WrappedReportEntry report, OutputStream fw ) throws IOException ++ { ++ EncodingOutputStream eos = new EncodingOutputStream( fw ); ++ addOutputStreamElement( outputStreamWriter, eos, ppw, report.getStdout(), "system-out" ); ++@@ -444,7 +444,7 @@ private static void createOutErrElements( OutputStreamWriter outputStreamWriter, ++ private static void addOutputStreamElement( OutputStreamWriter outputStreamWriter, ++ EncodingOutputStream eos, XMLWriter xmlWriter, ++ Utf8RecodingDeferredFileOutputStream utf8RecodingDeferredFileOutputStream, ++- String name ) +++ String name ) throws IOException ++ { ++ if ( utf8RecodingDeferredFileOutputStream != null && utf8RecodingDeferredFileOutputStream.getByteCount() > 0 ) ++ { ++@@ -474,7 +474,7 @@ private static void addOutputStreamElement( OutputStreamWriter outputStreamWrite ++ * ++ * @param xmlWriter The test suite to report to ++ */ ++- private static void showProperties( XMLWriter xmlWriter, Map systemProperties ) +++ private static void showProperties( XMLWriter xmlWriter, Map systemProperties ) throws IOException ++ { ++ xmlWriter.startElement( "properties" ); ++ for ( final Entry entry : systemProperties.entrySet() ) ++-- ++2.25.2 ++ +diff --git a/patches/maven-surefire/0002-Disable-JUnit-4.8-test-grouping.patch b/patches/maven-surefire/0003-Disable-JUnit-4.8-test-grouping.patch +similarity index 87% +rename from patches/maven-surefire/0002-Disable-JUnit-4.8-test-grouping.patch +rename to patches/maven-surefire/0003-Disable-JUnit-4.8-test-grouping.patch +index 21fb0de..c80ab94 100644 +--- a/patches/maven-surefire/0002-Disable-JUnit-4.8-test-grouping.patch ++++ b/patches/maven-surefire/0003-Disable-JUnit-4.8-test-grouping.patch +@@ -1,36 +1,37 @@ +-From 68a41813f6fad18f5192932d5c07d89ef090643c Mon Sep 17 00:00:00 2001 ++From 21890515f3eeba73065b79b6a65678ec1e2a821d Mon Sep 17 00:00:00 2001 + From: Mikolaj Izdebski + Date: Mon, 27 Apr 2020 10:45:30 +0200 +-Subject: [PATCH 2/4] Disable JUnit 4.8 test grouping ++Subject: [PATCH 3/3] Disable JUnit 4.8 test grouping + + Forwarded: not-needed ++ + --- + .../surefire/junitcore/JUnitCoreProvider.java | 25 +++-------------- + .../maven/surefire/testng/TestNGExecutor.java | 27 ------------------- + 2 files changed, 3 insertions(+), 49 deletions(-) + + diff --git a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/JUnitCoreProvider.java b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/JUnitCoreProvider.java +-index 7ed483426..1ffd826db 100644 ++index 7c74e8b86..c86bb276c 100644 + --- a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/JUnitCoreProvider.java + +++ b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/JUnitCoreProvider.java +-@@ -40,7 +40,6 @@ ++@@ -25,7 +25,6 @@ + import org.apache.maven.surefire.common.junit4.JUnit4RunListener; + import org.apache.maven.surefire.common.junit4.JUnitTestFailureListener; + import org.apache.maven.surefire.common.junit4.Notifier; + -import org.apache.maven.surefire.common.junit48.FilterFactory; + import org.apache.maven.surefire.common.junit48.JUnit48Reflector; + import org.apache.maven.surefire.common.junit48.JUnit48TestChecker; +- import org.junit.runner.Description; +-@@ -51,6 +50,7 @@ +- import static org.apache.maven.surefire.api.report.RunMode.RERUN_TEST_AFTER_FAILURE; +- import static org.apache.maven.surefire.api.testset.TestListResolver.optionallyWildcardFilter; +- import static org.apache.maven.surefire.api.util.TestsToRun.fromClass; ++ import org.apache.maven.surefire.providerapi.AbstractProvider; ++@@ -47,6 +46,7 @@ ++ import java.util.concurrent.ConcurrentHashMap; ++ ++ import static org.apache.maven.surefire.booter.CommandReader.getReader; + +import static org.apache.maven.surefire.common.junit4.JUnit4ProviderUtil.createMatchAnyDescriptionFilter; + import static org.apache.maven.surefire.common.junit4.JUnit4ProviderUtil.generateFailingTestDescriptions; + import static org.apache.maven.surefire.common.junit4.JUnit4RunListenerFactory.createCustomListeners; + import static org.apache.maven.surefire.common.junit4.Notifier.pureNotifier; + @@ -126,7 +126,7 @@ public RunResult invoke( Object forkTestSet ) +- Notifier notifier = new Notifier( listener, getSkipAfterFailureCount() ); ++ new Notifier( createRunListener( reporterFactory, consoleStream ), getSkipAfterFailureCount() ); + // startCapture() called in createRunListener() in prior to setTestsToRun() + + - Filter filter = jUnit48Reflector.isJUnit48Available() ? createJUnit48Filter() : null; +@@ -38,7 +39,7 @@ index 7ed483426..1ffd826db 100644 + + if ( testsToRun == null ) + { +-@@ -169,8 +169,7 @@ public RunResult invoke( Object forkTestSet ) ++@@ -168,8 +168,7 @@ public RunResult invoke( Object forkTestSet ) + { + Set failures = generateFailingTestDescriptions( testFailureListener.getAllFailures() ); + testFailureListener.reset(); +@@ -48,7 +49,7 @@ index 7ed483426..1ffd826db 100644 + rerunCore.execute( testsToRun, failureDescriptionFilter ); + } + } +-@@ -271,24 +270,6 @@ private boolean isParallelTypes() ++@@ -270,24 +269,6 @@ private boolean isParallelTypes() + return jUnitCoreParameters.isParallelClasses() || jUnitCoreParameters.isParallelSuites(); + } + +@@ -74,10 +75,10 @@ index 7ed483426..1ffd826db 100644 + { + TestsToRun scanned = scanResult.applyFilter( scannerFilter, testClassLoader ); + diff --git a/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGExecutor.java b/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGExecutor.java +-index 7ed1719a8..07d3ad33c 100644 ++index 6bc30a300..05c55f55a 100644 + --- a/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGExecutor.java + +++ b/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGExecutor.java +-@@ -278,36 +278,9 @@ private static XmlMethodSelector createMethodNameFilteringSelector( TestListReso ++@@ -237,36 +237,9 @@ private static XmlMethodSelector createMethodNameFilteringSelector( TestListReso + private static XmlMethodSelector createGroupMatchingSelector( Map options ) + throws TestSetFailedException + { +@@ -115,5 +116,5 @@ index 7ed1719a8..07d3ad33c 100644 + + static void run( List suiteFiles, String testSourceDirectory, + -- +-2.35.1 ++2.25.2 + +diff --git a/patches/maven-surefire/0003-Port-to-JUnit-5.8.1.patch b/patches/maven-surefire/0003-Port-to-JUnit-5.8.1.patch +deleted file mode 100644 +index 80e492f..0000000 +--- a/patches/maven-surefire/0003-Port-to-JUnit-5.8.1.patch ++++ /dev/null +@@ -1,71 +0,0 @@ +-From 3d0dad9c32ce059b8f562e3c5bd754f6b3394a74 Mon Sep 17 00:00:00 2001 +-From: Mikolaj Izdebski +-Date: Fri, 22 Apr 2022 00:28:31 +0200 +-Subject: [PATCH 3/4] Port to JUnit 5.8.1 +- +-Forwarded: no +---- +- pom.xml | 6 +++--- +- .../maven/surefire/junitplatform/LazyLauncher.java | 14 ++++++++++++++ +- 2 files changed, 17 insertions(+), 3 deletions(-) +- +-diff --git a/pom.xml b/pom.xml +-index c261bf3c2..a75e156ce 100644 +---- a/pom.xml +-+++ b/pom.xml +-@@ -250,17 +250,17 @@ +- +- org.junit.platform +- junit-platform-launcher +-- 1.3.2 +-+ 1.8.1 +- +- +- org.junit.jupiter +- junit-jupiter-engine +-- 5.3.2 +-+ 5.8.1 +- +- +- org.junit.jupiter +- junit-jupiter-params +-- 5.3.2 +-+ 5.8.1 +- +- +- org.mockito +-diff --git a/surefire-providers/surefire-junit-platform/src/main/java/org/apache/maven/surefire/junitplatform/LazyLauncher.java b/surefire-providers/surefire-junit-platform/src/main/java/org/apache/maven/surefire/junitplatform/LazyLauncher.java +-index 6a1a3b3b3..dee110e3c 100644 +---- a/surefire-providers/surefire-junit-platform/src/main/java/org/apache/maven/surefire/junitplatform/LazyLauncher.java +-+++ b/surefire-providers/surefire-junit-platform/src/main/java/org/apache/maven/surefire/junitplatform/LazyLauncher.java +-@@ -21,6 +21,7 @@ +- +- import org.apache.maven.surefire.api.util.ReflectionUtils; +- import org.junit.platform.launcher.Launcher; +-+import org.junit.platform.launcher.LauncherDiscoveryListener; +- import org.junit.platform.launcher.LauncherDiscoveryRequest; +- import org.junit.platform.launcher.TestExecutionListener; +- import org.junit.platform.launcher.TestPlan; +-@@ -55,6 +56,19 @@ public void execute( LauncherDiscoveryRequest launcherDiscoveryRequest, +- launcher().execute( launcherDiscoveryRequest, testExecutionListeners ); +- } +- +-+ @Override +-+ public void execute( TestPlan testPlan, +-+ TestExecutionListener... testExecutionListeners ) +-+ { +-+ launcher().execute( testPlan, testExecutionListeners ); +-+ } +-+ +-+ @Override +-+ public void registerLauncherDiscoveryListeners( LauncherDiscoveryListener... launcherDiscoveryListeners ) +-+ { +-+ launcher().registerLauncherDiscoveryListeners( launcherDiscoveryListeners ); +-+ } +-+ +- private Launcher launcher() +- { +- if ( launcher == null ) +--- +-2.35.1 +- +diff --git a/patches/maven-surefire/0004-Port-to-maven-shared-utils-3.3.3.patch b/patches/maven-surefire/0004-Port-to-maven-shared-utils-3.3.3.patch +new file mode 100644 +index 0000000..cec5651 +--- /dev/null ++++ b/patches/maven-surefire/0004-Port-to-maven-shared-utils-3.3.3.patch +@@ -0,0 +1,59 @@ ++From 980a109bd3607f1035097d6ad923f82cc58c95d2 Mon Sep 17 00:00:00 2001 ++From: Marian Koncek ++Date: Fri, 11 Sep 2020 12:17:15 +0200 ++Subject: [PATCH] Port to maven-shared-utils 3.3.3 ++ ++Forwarded: no ++ ++--- ++ .../DefaultForkConfiguration.java | 26 ++++++++++++------- ++ 1 file changed, 16 insertions(+), 10 deletions(-) ++ ++diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/DefaultForkConfiguration.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/DefaultForkConfiguration.java ++index fa9945123..ed75ecdff 100644 ++--- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/DefaultForkConfiguration.java +++++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/DefaultForkConfiguration.java ++@@ -42,6 +42,8 @@ ++ import static org.apache.maven.plugin.surefire.SurefireHelper.replaceThreadNumberPlaceholders; ++ import static org.apache.maven.surefire.booter.Classpath.join; ++ +++import org.apache.maven.shared.utils.cli.CommandLineException; +++ ++ /** ++ * Basic framework which constructs CLI. ++ * ++@@ -131,17 +133,21 @@ public OutputStreamFlushableCommandline createCommandLine( @Nonnull StartupConfi ++ ++ cli.setExecutable( getJdkForTests().getJvmExecutable() ); ++ ++- String jvmArgLine = newJvmArgLine( forkNumber ); ++- if ( !jvmArgLine.isEmpty() ) ++- { ++- cli.createArg() ++- .setLine( jvmArgLine ); ++- } +++ try { +++ String jvmArgLine = newJvmArgLine( forkNumber ); +++ if ( !jvmArgLine.isEmpty() ) +++ { +++ cli.createArg() +++ .setLine( jvmArgLine ); +++ } ++ ++- if ( getDebugLine() != null && !getDebugLine().isEmpty() ) ++- { ++- cli.createArg() ++- .setLine( getDebugLine() ); +++ if ( getDebugLine() != null && !getDebugLine().isEmpty() ) +++ { +++ cli.createArg() +++ .setLine( getDebugLine() ); +++ } +++ } catch (CommandLineException ex) { +++ throw new SurefireBooterForkException("", ex); ++ } ++ ++ resolveClasspath( cli, findStartClass( config ), config, dumpLogDirectory ); ++-- ++2.26.2 ++ +diff --git a/patches/maven-surefire/0004-Unshade-dependencies.patch b/patches/maven-surefire/0004-Unshade-dependencies.patch +deleted file mode 100644 +index f8feb71..0000000 +--- a/patches/maven-surefire/0004-Unshade-dependencies.patch ++++ /dev/null +@@ -1,1392 +0,0 @@ +-From 8977691d5ff2842b06c5cfa5b8a2b14b3e7d684a Mon Sep 17 00:00:00 2001 +-From: Mikolaj Izdebski +-Date: Thu, 12 May 2022 06:57:19 +0200 +-Subject: [PATCH 4/4] Unshade dependencies +- +-Patch can be generated with: +- +- find -name \*.java -exec sed \ +- -e s/org.apache.maven.surefire.shared.utils/org.apache.maven.shared.utils/ \ +- -e s/org.apache.maven.surefire.shared.io/org.apache.commons.io/ \ +- -e s/org.apache.maven.surefire.shared.lang3/org.apache.commons.lang3/ \ +- -e s/org.apache.maven.surefire.shared.compress/org.apache.commons.compress/ \ +- -i \{\} \; +- +-Forwarded: not-needed +---- +- .../maven/plugin/failsafe/VerifyMojo.java | 2 +- +- .../util/FailsafeSummaryXmlUtils.java | 8 +++---- +- .../plugin/surefire/AbstractSurefireMojo.java | 22 +++++++++---------- +- .../surefire/StartupReportConfiguration.java | 2 +- +- .../maven/plugin/surefire/SurefireHelper.java | 2 +- +- .../plugin/surefire/SurefireProperties.java | 2 +- +- .../maven/plugin/surefire/TestClassPath.java | 2 +- +- .../ClasspathForkConfiguration.java | 2 +- +- .../DefaultForkConfiguration.java | 2 +- +- .../surefire/booterclient/ForkStarter.java | 4 ++-- +- .../JarManifestForkConfiguration.java | 8 +++---- +- .../ModularClasspathForkConfiguration.java | 2 +- +- .../lazytestprovider/Commandline.java | 6 ++--- +- .../extensions/SurefireForkChannel.java | 4 ++-- +- .../surefire/report/ConsoleReporter.java | 4 ++-- +- .../report/DefaultReporterFactory.java | 4 ++-- +- .../plugin/surefire/report/FileReporter.java | 2 +- +- .../surefire/report/FileReporterUtils.java | 2 +- +- .../surefire/report/StatelessXmlReporter.java | 6 ++--- +- .../plugin/surefire/report/TestSetStats.java | 4 ++-- +- .../surefire/report/WrappedReportEntry.java | 2 +- +- .../plugin/surefire/util/FileScanner.java | 2 +- +- .../plugin/surefire/util/ScannerUtil.java | 2 +- +- .../surefire/util/SpecificFileFilter.java | 2 +- +- .../maven/surefire/stream/EventDecoder.java | 2 +- +- .../surefire/AbstractSurefireMojoTest.java | 6 ++--- +- .../AbstractSurefireMojoToolchainsTest.java | 2 +- +- .../plugin/surefire/SurefireHelperTest.java | 2 +- +- ...DeserializerProviderConfigurationTest.java | 2 +- +- ...rDeserializerStartupConfigurationTest.java | 2 +- +- .../booterclient/ForkConfigurationTest.java | 16 +++++++------- +- .../booterclient/ForkStarterTest.java | 6 ++--- +- ...ModularClasspathForkConfigurationTest.java | 2 +- +- .../lazytestprovider/CommandlineTest.java | 4 ++-- +- .../report/DefaultReporterFactoryTest.java | 2 +- +- .../report/StatelessXmlReporterTest.java | 6 ++--- +- .../surefire/report/TestSetStatsTest.java | 2 +- +- .../runorder/RunEntryStatisticsMapTest.java | 2 +- +- .../StatelessTestsetInfoReporterTest.java | 2 +- +- .../report/ConsoleOutputFileReporterTest.java | 2 +- +- .../maven/surefire/api/booter/Command.java | 2 +- +- .../api/filter/SpecificTestClassFilter.java | 2 +- +- .../report/LegacyPojoStackTraceWriter.java | 2 +- +- .../api/stream/AbstractStreamDecoder.java | 2 +- +- .../surefire/api/testset/ResolvedTest.java | 14 ++++++------ +- .../api/testset/TestListResolver.java | 10 ++++----- +- .../api/util/DefaultDirectoryScanner.java | 4 ++-- +- .../api/util/internal/ClassMethod.java | 2 +- +- .../api/util/internal/ObjectUtils.java | 4 ++-- +- .../api/util/internal/ObjectUtilsTest.java | 4 ++-- +- .../maven/surefire/booter/CommandReader.java | 4 ++-- +- .../maven/surefire/booter/ForkedBooter.java | 2 +- +- .../maven/surefire/booter/PpidChecker.java | 12 +++++----- +- .../surefire/booter/ProcessCheckerType.java | 2 +- +- .../surefire/booter/PropertiesWrapper.java | 2 +- +- .../booter/SurefireBooterForkException.java | 2 +- +- .../maven/surefire/booter/SystemUtils.java | 14 ++++++------ +- .../booter/stream/CommandDecoder.java | 2 +- +- .../surefire/booter/ForkedBooterMockTest.java | 2 +- +- .../surefire/booter/ForkedBooterTest.java | 2 +- +- .../booter/IsolatedClassLoaderTest.java | 2 +- +- .../surefire/booter/NewClassLoaderRunner.java | 2 +- +- .../surefire/booter/PpidCheckerTest.java | 4 ++-- +- .../surefire/booter/SystemUtilsTest.java | 12 +++++----- +- .../extensions/ConsoleOutputReporter.java | 2 +- +- .../extensions/StatelessReporter.java | 2 +- +- .../extensions/util/CommandlineExecutor.java | 8 +++---- +- .../extensions/CommandlineExecutorTest.java | 4 ++-- +- .../report/SmartStackTraceParser.java | 4 ++-- +- .../junit4/JUnit4RunListenerFactory.java | 2 +- +- .../common/junit48/FilterFactory.java | 2 +- +- .../common/junit48/FilterFactoryTest.java | 2 +- +- .../junitplatform/JUnitPlatformProvider.java | 4 ++-- +- .../junitplatform/RunListenerAdapter.java | 2 +- +- .../surefire/junit/JUnitTestSetTest.java | 4 ++-- +- .../testng/TestNGDirectoryTestSuite.java | 2 +- +- .../maven/surefire/testng/TestNGExecutor.java | 2 +- +- 77 files changed, 154 insertions(+), 154 deletions(-) +- +-diff --git a/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/VerifyMojo.java b/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/VerifyMojo.java +-index 9c91bf70d..f3832727f 100644 +---- a/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/VerifyMojo.java +-+++ b/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/VerifyMojo.java +-@@ -39,7 +39,7 @@ +- import java.util.Collection; +- +- import static org.apache.maven.plugin.surefire.SurefireHelper.reportExecution; +--import static org.apache.maven.surefire.shared.utils.StringUtils.capitalizeFirstLetter; +-+import static org.apache.maven.shared.utils.StringUtils.capitalizeFirstLetter; +- import static org.apache.maven.surefire.api.suite.RunResult.noTestsRun; +- +- /** +-diff --git a/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/util/FailsafeSummaryXmlUtils.java b/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/util/FailsafeSummaryXmlUtils.java +-index 03e340ca7..b77c1b515 100644 +---- a/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/util/FailsafeSummaryXmlUtils.java +-+++ b/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/util/FailsafeSummaryXmlUtils.java +-@@ -19,7 +19,7 @@ +- * under the License. +- */ +- +--import org.apache.maven.surefire.shared.io.IOUtils; +-+import org.apache.commons.io.IOUtils; +- import org.apache.maven.surefire.api.suite.RunResult; +- import org.w3c.dom.Node; +- import org.xml.sax.InputSource; +-@@ -39,9 +39,9 @@ +- import static java.lang.String.format; +- import static java.nio.charset.StandardCharsets.UTF_8; +- import static javax.xml.xpath.XPathConstants.NODE; +--import static org.apache.maven.surefire.shared.lang3.StringEscapeUtils.escapeXml10; +--import static org.apache.maven.surefire.shared.lang3.StringEscapeUtils.unescapeXml; +--import static org.apache.maven.surefire.shared.utils.StringUtils.isBlank; +-+import static org.apache.commons.lang3.StringEscapeUtils.escapeXml10; +-+import static org.apache.commons.lang3.StringEscapeUtils.unescapeXml; +-+import static org.apache.maven.shared.utils.StringUtils.isBlank; +- +- /** +- * @author Tibor Digana (tibor17) +-diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java +-index 1937d75c7..7a7973069 100644 +---- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java +-+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java +-@@ -110,7 +110,7 @@ +- import org.apache.maven.surefire.providerapi.ProviderDetector; +- import org.apache.maven.surefire.providerapi.ProviderInfo; +- import org.apache.maven.surefire.providerapi.ProviderRequirements; +--import org.apache.maven.surefire.shared.utils.io.FileUtils; +-+import org.apache.maven.shared.utils.io.FileUtils; +- import org.apache.maven.toolchain.DefaultToolchain; +- import org.apache.maven.toolchain.Toolchain; +- import org.apache.maven.toolchain.ToolchainManager; +-@@ -147,16 +147,16 @@ +- import static org.apache.maven.surefire.booter.SystemUtils.isJava9AtLeast; +- import static org.apache.maven.surefire.booter.SystemUtils.toJdkHomeFromJvmExec; +- import static org.apache.maven.surefire.booter.SystemUtils.toJdkVersionFromReleaseFile; +--import static org.apache.maven.surefire.shared.lang3.JavaVersion.JAVA_RECENT; +--import static org.apache.maven.surefire.shared.lang3.StringUtils.substringBeforeLast; +--import static org.apache.maven.surefire.shared.lang3.SystemUtils.IS_OS_WINDOWS; +--import static org.apache.maven.surefire.shared.utils.StringUtils.capitalizeFirstLetter; +--import static org.apache.maven.surefire.shared.utils.StringUtils.isEmpty; +--import static org.apache.maven.surefire.shared.utils.StringUtils.isNotBlank; +--import static org.apache.maven.surefire.shared.utils.StringUtils.isNotEmpty; +--import static org.apache.maven.surefire.shared.utils.StringUtils.split; +--import static org.apache.maven.surefire.shared.utils.cli.ShutdownHookUtils.addShutDownHook; +--import static org.apache.maven.surefire.shared.utils.cli.ShutdownHookUtils.removeShutdownHook; +-+import static org.apache.commons.lang3.JavaVersion.JAVA_RECENT; +-+import static org.apache.commons.lang3.StringUtils.substringBeforeLast; +-+import static org.apache.commons.lang3.SystemUtils.IS_OS_WINDOWS; +-+import static org.apache.maven.shared.utils.StringUtils.capitalizeFirstLetter; +-+import static org.apache.maven.shared.utils.StringUtils.isEmpty; +-+import static org.apache.maven.shared.utils.StringUtils.isNotBlank; +-+import static org.apache.maven.shared.utils.StringUtils.isNotEmpty; +-+import static org.apache.maven.shared.utils.StringUtils.split; +-+import static org.apache.maven.shared.utils.cli.ShutdownHookUtils.addShutDownHook; +-+import static org.apache.maven.shared.utils.cli.ShutdownHookUtils.removeShutdownHook; +- +- /** +- * Abstract base class for running tests using Surefire. +-diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/StartupReportConfiguration.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/StartupReportConfiguration.java +-index a15f8027e..02ec44b8e 100644 +---- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/StartupReportConfiguration.java +-+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/StartupReportConfiguration.java +-@@ -41,7 +41,7 @@ +- import java.util.concurrent.ConcurrentHashMap; +- +- import static java.nio.charset.StandardCharsets.UTF_8; +--import static org.apache.maven.surefire.shared.lang3.StringUtils.trimToNull; +-+import static org.apache.commons.lang3.StringUtils.trimToNull; +- import static org.apache.maven.plugin.surefire.SurefireHelper.replaceForkThreadsInPath; +- import static org.apache.maven.plugin.surefire.report.ConsoleReporter.BRIEF; +- import static org.apache.maven.plugin.surefire.report.ConsoleReporter.PLAIN; +-diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/SurefireHelper.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/SurefireHelper.java +-index 582245104..e9b7cfcf3 100644 +---- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/SurefireHelper.java +-+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/SurefireHelper.java +-@@ -39,7 +39,7 @@ +- +- import static java.util.Collections.unmodifiableList; +- import static org.apache.maven.surefire.api.util.internal.DumpFileUtils.newFormattedDateFileName; +--import static org.apache.maven.surefire.shared.lang3.SystemUtils.IS_OS_WINDOWS; +-+import static org.apache.commons.lang3.SystemUtils.IS_OS_WINDOWS; +- import static org.apache.maven.surefire.api.booter.DumpErrorSingleton.DUMPSTREAM_FILE_EXT; +- import static org.apache.maven.surefire.api.booter.DumpErrorSingleton.DUMP_FILE_EXT; +- import static org.apache.maven.surefire.api.cli.CommandLineOption.LOGGING_LEVEL_DEBUG; +-diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/SurefireProperties.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/SurefireProperties.java +-index 2f5e91945..fb78191a8 100644 +---- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/SurefireProperties.java +-+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/SurefireProperties.java +-@@ -35,7 +35,7 @@ +- +- import org.apache.maven.surefire.booter.Classpath; +- import org.apache.maven.surefire.booter.KeyValueSource; +--import org.apache.maven.surefire.shared.utils.StringUtils; +-+import org.apache.maven.shared.utils.StringUtils; +- +- import static java.util.Arrays.asList; +- import static java.util.Map.Entry; +-diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/TestClassPath.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/TestClassPath.java +-index ba7336177..3a37816c0 100644 +---- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/TestClassPath.java +-+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/TestClassPath.java +-@@ -29,7 +29,7 @@ +- import java.util.Map; +- +- import static java.util.Collections.addAll; +--import static org.apache.maven.surefire.shared.utils.StringUtils.split; +-+import static org.apache.maven.shared.utils.StringUtils.split; +- +- final class TestClassPath +- { +-diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ClasspathForkConfiguration.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ClasspathForkConfiguration.java +-index 1ce9d617e..54f9fa9b1 100644 +---- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ClasspathForkConfiguration.java +-+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ClasspathForkConfiguration.java +-@@ -32,7 +32,7 @@ +- import java.util.Map; +- import java.util.Properties; +- +--import static org.apache.maven.surefire.shared.utils.StringUtils.join; +-+import static org.apache.maven.shared.utils.StringUtils.join; +- +- /** +- * @author Tibor Digana (tibor17) +-diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/DefaultForkConfiguration.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/DefaultForkConfiguration.java +-index c7a77e77f..8932ba4a7 100644 +---- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/DefaultForkConfiguration.java +-+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/DefaultForkConfiguration.java +-@@ -28,7 +28,7 @@ +- import org.apache.maven.surefire.booter.SurefireBooterForkException; +- import org.apache.maven.surefire.extensions.ForkNodeFactory; +- import org.apache.maven.surefire.api.util.internal.ImmutableMap; +--import org.apache.maven.surefire.shared.utils.cli.CommandLineException; +-+import org.apache.maven.shared.utils.cli.CommandLineException; +- +- import javax.annotation.Nonnull; +- import javax.annotation.Nullable; +-diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkStarter.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkStarter.java +-index 17b0e5412..796235c6d 100644 +---- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkStarter.java +-+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkStarter.java +-@@ -97,8 +97,8 @@ +- import static org.apache.maven.plugin.surefire.booterclient.lazytestprovider.TestLessInputStream.TestLessInputStreamBuilder; +- import static org.apache.maven.surefire.booter.SystemPropertyManager.writePropertiesFile; +- import static org.apache.maven.surefire.api.cli.CommandLineOption.SHOW_ERRORS; +--import static org.apache.maven.surefire.shared.utils.cli.ShutdownHookUtils.addShutDownHook; +--import static org.apache.maven.surefire.shared.utils.cli.ShutdownHookUtils.removeShutdownHook; +-+import static org.apache.maven.shared.utils.cli.ShutdownHookUtils.addShutDownHook; +-+import static org.apache.maven.shared.utils.cli.ShutdownHookUtils.removeShutdownHook; +- import static org.apache.maven.surefire.api.suite.RunResult.SUCCESS; +- import static org.apache.maven.surefire.api.suite.RunResult.failure; +- import static org.apache.maven.surefire.api.suite.RunResult.timeout; +-diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/JarManifestForkConfiguration.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/JarManifestForkConfiguration.java +-index 50caad055..40a57f797 100644 +---- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/JarManifestForkConfiguration.java +-+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/JarManifestForkConfiguration.java +-@@ -19,9 +19,9 @@ +- * under the License. +- */ +- +--import org.apache.maven.surefire.shared.compress.archivers.zip.Zip64Mode; +--import org.apache.maven.surefire.shared.compress.archivers.zip.ZipArchiveEntry; +--import org.apache.maven.surefire.shared.compress.archivers.zip.ZipArchiveOutputStream; +-+import org.apache.commons.compress.archivers.zip.Zip64Mode; +-+import org.apache.commons.compress.archivers.zip.ZipArchiveEntry; +-+import org.apache.commons.compress.archivers.zip.ZipArchiveOutputStream; +- import org.apache.maven.plugin.surefire.booterclient.lazytestprovider.Commandline; +- import org.apache.maven.plugin.surefire.booterclient.output.InPluginProcessDumpSingleton; +- import org.apache.maven.plugin.surefire.log.api.ConsoleLogger; +-@@ -54,7 +54,7 @@ +- import static org.apache.maven.plugin.surefire.SurefireHelper.escapeToPlatformPath; +- import static org.apache.maven.plugin.surefire.booterclient.JarManifestForkConfiguration.ClasspathElementUri.absolute; +- import static org.apache.maven.plugin.surefire.booterclient.JarManifestForkConfiguration.ClasspathElementUri.relative; +--import static org.apache.maven.surefire.shared.utils.StringUtils.isNotBlank; +-+import static org.apache.maven.shared.utils.StringUtils.isNotBlank; +- import static org.apache.maven.surefire.api.util.internal.StringUtils.NL; +- +- /** +-diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ModularClasspathForkConfiguration.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ModularClasspathForkConfiguration.java +-index 0fd796cdd..4ad180256 100644 +---- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ModularClasspathForkConfiguration.java +-+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ModularClasspathForkConfiguration.java +-@@ -46,7 +46,7 @@ +- import static java.io.File.pathSeparatorChar; +- import static org.apache.maven.plugin.surefire.SurefireHelper.escapeToPlatformPath; +- import static org.apache.maven.surefire.api.util.internal.StringUtils.NL; +--import static org.apache.maven.surefire.shared.utils.StringUtils.replace; +-+import static org.apache.maven.shared.utils.StringUtils.replace; +- +- /** +- * @author Tibor Digana (tibor17) +-diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/lazytestprovider/Commandline.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/lazytestprovider/Commandline.java +-index bbc14bfe8..d01e48b18 100644 +---- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/lazytestprovider/Commandline.java +-+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/lazytestprovider/Commandline.java +-@@ -25,17 +25,17 @@ +- import java.util.Set; +- import java.util.concurrent.ConcurrentLinkedDeque; +- +--import org.apache.maven.surefire.shared.utils.cli.CommandLineUtils; +-+import org.apache.maven.shared.utils.cli.CommandLineUtils; +- +- import static java.util.Collections.addAll; +- +- /** +-- * A {@link org.apache.maven.surefire.shared.utils.cli.Commandline} implementation. +-+ * A {@link org.apache.maven.shared.utils.cli.Commandline} implementation. +- * +- * @author Andreas Gudian +- */ +- public class Commandline +-- extends org.apache.maven.surefire.shared.utils.cli.Commandline +-+ extends org.apache.maven.shared.utils.cli.Commandline +- { +- private final Collection excludedEnvironmentVariables; +- private final Set addedEnvironmentVariables; +-diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/extensions/SurefireForkChannel.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/extensions/SurefireForkChannel.java +-index f0c5bbfef..a744f952a 100644 +---- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/extensions/SurefireForkChannel.java +-+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/extensions/SurefireForkChannel.java +-@@ -58,8 +58,8 @@ +- import static org.apache.maven.surefire.api.util.internal.Channels.newInputStream; +- import static org.apache.maven.surefire.api.util.internal.Channels.newOutputStream; +- import static org.apache.maven.surefire.api.util.internal.DaemonThreadFactory.newDaemonThreadFactory; +--import static org.apache.maven.surefire.shared.lang3.StringUtils.isBlank; +--import static org.apache.maven.surefire.shared.lang3.StringUtils.isNotBlank; +-+import static org.apache.commons.lang3.StringUtils.isBlank; +-+import static org.apache.commons.lang3.StringUtils.isNotBlank; +- +- /** +- * The TCP/IP server accepting only one client connection. The forked JVM connects to the server using the +-diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/ConsoleReporter.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/ConsoleReporter.java +-index 6541b05fb..00671663a 100644 +---- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/ConsoleReporter.java +-+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/ConsoleReporter.java +-@@ -22,14 +22,14 @@ +- import java.util.List; +- +- import org.apache.maven.plugin.surefire.log.api.ConsoleLogger; +--import org.apache.maven.surefire.shared.utils.logging.MessageBuilder; +-+import org.apache.maven.shared.utils.logging.MessageBuilder; +- import org.apache.maven.plugin.surefire.log.api.Level; +- import org.apache.maven.surefire.extensions.StatelessTestsetInfoConsoleReportEventListener; +- import org.apache.maven.surefire.api.report.TestSetReportEntry; +- +- import static org.apache.maven.plugin.surefire.log.api.Level.resolveLevel; +- import static org.apache.maven.plugin.surefire.report.TestSetStats.concatenateWithTestGroup; +--import static org.apache.maven.surefire.shared.utils.logging.MessageUtils.buffer; +-+import static org.apache.maven.shared.utils.logging.MessageUtils.buffer; +- +- /** +- * Base class for console reporters. +-diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/DefaultReporterFactory.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/DefaultReporterFactory.java +-index d45ae83cf..34f38b5a3 100644 +---- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/DefaultReporterFactory.java +-+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/DefaultReporterFactory.java +-@@ -24,7 +24,7 @@ +- import org.apache.maven.plugin.surefire.log.api.Level; +- import org.apache.maven.plugin.surefire.runorder.StatisticsReporter; +- import org.apache.maven.surefire.api.report.TestOutputReportEntry; +--import org.apache.maven.surefire.shared.utils.logging.MessageBuilder; +-+import org.apache.maven.shared.utils.logging.MessageBuilder; +- import org.apache.maven.surefire.extensions.ConsoleOutputReportEventListener; +- import org.apache.maven.surefire.extensions.StatelessReportEventListener; +- import org.apache.maven.surefire.extensions.StatelessTestsetInfoConsoleReportEventListener; +-@@ -55,7 +55,7 @@ +- import static org.apache.maven.plugin.surefire.report.ReportEntryType.ERROR; +- import static org.apache.maven.plugin.surefire.report.ReportEntryType.FAILURE; +- import static org.apache.maven.plugin.surefire.report.ReportEntryType.SUCCESS; +--import static org.apache.maven.surefire.shared.utils.logging.MessageUtils.buffer; +-+import static org.apache.maven.shared.utils.logging.MessageUtils.buffer; +- import static org.apache.maven.surefire.api.util.internal.ObjectUtils.useNonNull; +- +- /** +-diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/FileReporter.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/FileReporter.java +-index b3410f70b..eafba006f 100644 +---- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/FileReporter.java +-+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/FileReporter.java +-@@ -32,7 +32,7 @@ +- import java.util.List; +- +- import static org.apache.maven.plugin.surefire.report.FileReporterUtils.stripIllegalFilenameChars; +--import static org.apache.maven.surefire.shared.utils.StringUtils.isNotBlank; +-+import static org.apache.maven.shared.utils.StringUtils.isNotBlank; +- +- /** +- * Base class for file reporters. +-diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/FileReporterUtils.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/FileReporterUtils.java +-index 5ef061015..e27fe6d97 100644 +---- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/FileReporterUtils.java +-+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/FileReporterUtils.java +-@@ -19,7 +19,7 @@ +- * under the License. +- */ +- +--import static org.apache.maven.surefire.shared.lang3.SystemUtils.IS_OS_WINDOWS; +-+import static org.apache.commons.lang3.SystemUtils.IS_OS_WINDOWS; +- +- /** +- * Utils class for file-based reporters +-diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/StatelessXmlReporter.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/StatelessXmlReporter.java +-index 45f1c5003..e27691278 100644 +---- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/StatelessXmlReporter.java +-+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/StatelessXmlReporter.java +-@@ -20,8 +20,8 @@ +- */ +- +- import org.apache.maven.plugin.surefire.booterclient.output.InPluginProcessDumpSingleton; +--import org.apache.maven.surefire.shared.utils.xml.PrettyPrintXMLWriter; +--import org.apache.maven.surefire.shared.utils.xml.XMLWriter; +-+import org.apache.maven.shared.utils.xml.PrettyPrintXMLWriter; +-+import org.apache.maven.shared.utils.xml.XMLWriter; +- import org.apache.maven.surefire.extensions.StatelessReportEventListener; +- import org.apache.maven.surefire.api.report.SafeThrowable; +- +-@@ -47,7 +47,7 @@ +- import static org.apache.maven.plugin.surefire.report.FileReporterUtils.stripIllegalFilenameChars; +- import static org.apache.maven.plugin.surefire.report.ReportEntryType.SKIPPED; +- import static org.apache.maven.plugin.surefire.report.ReportEntryType.SUCCESS; +--import static org.apache.maven.surefire.shared.utils.StringUtils.isBlank; +-+import static org.apache.maven.shared.utils.StringUtils.isBlank; +- +- @SuppressWarnings( { "javadoc", "checkstyle:javadoctype" } ) +- // CHECKSTYLE_OFF: LineLength +-diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/TestSetStats.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/TestSetStats.java +-index 869f58a5a..dcf6b0709 100644 +---- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/TestSetStats.java +-+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/TestSetStats.java +-@@ -19,7 +19,7 @@ +- * under the License. +- */ +- +--import org.apache.maven.surefire.shared.utils.logging.MessageBuilder; +-+import org.apache.maven.shared.utils.logging.MessageBuilder; +- import org.apache.maven.surefire.api.report.ReportEntry; +- +- import java.util.ArrayList; +-@@ -28,7 +28,7 @@ +- import java.util.Queue; +- import java.util.concurrent.ConcurrentLinkedQueue; +- +--import static org.apache.maven.surefire.shared.utils.logging.MessageUtils.buffer; +-+import static org.apache.maven.shared.utils.logging.MessageUtils.buffer; +- import static org.apache.maven.surefire.api.report.CategorizedReportEntry.GROUP_PREFIX; +- +- /** +-diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/WrappedReportEntry.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/WrappedReportEntry.java +-index bc2fca0c5..1520caeb6 100644 +---- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/WrappedReportEntry.java +-+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/WrappedReportEntry.java +-@@ -31,7 +31,7 @@ +- import static java.util.Collections.unmodifiableMap; +- import static org.apache.maven.plugin.surefire.report.ReporterUtils.formatElapsedTime; +- import static org.apache.maven.surefire.api.util.internal.StringUtils.NL; +--import static org.apache.maven.surefire.shared.utils.StringUtils.isBlank; +-+import static org.apache.maven.shared.utils.StringUtils.isBlank; +- +- /** +- * @author Kristian Rosenvold +-diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/FileScanner.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/FileScanner.java +-index 69a6945a9..4fc533d3f 100644 +---- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/FileScanner.java +-+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/FileScanner.java +-@@ -24,7 +24,7 @@ +- import java.io.File; +- import java.util.Collection; +- +--import static org.apache.maven.surefire.shared.utils.StringUtils.isBlank; +-+import static org.apache.maven.shared.utils.StringUtils.isBlank; +- +- final class FileScanner +- { +-diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/ScannerUtil.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/ScannerUtil.java +-index afd9cf23e..8073907a8 100644 +---- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/ScannerUtil.java +-+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/ScannerUtil.java +-@@ -19,7 +19,7 @@ +- * under the License. +- */ +- +--import org.apache.maven.surefire.shared.lang3.StringUtils; +-+import org.apache.commons.lang3.StringUtils; +- import javax.annotation.Nonnull; +- +- final class ScannerUtil +-diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/SpecificFileFilter.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/SpecificFileFilter.java +-index 00ea5990a..6b97b2f4f 100644 +---- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/SpecificFileFilter.java +-+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/SpecificFileFilter.java +-@@ -24,7 +24,7 @@ +- +- import javax.annotation.Nullable; +- +--import org.apache.maven.surefire.shared.utils.io.SelectorUtils; +-+import org.apache.maven.shared.utils.io.SelectorUtils; +- +- import static org.apache.maven.plugin.surefire.util.ScannerUtil.convertSlashToSystemFileSeparator; +- +-diff --git a/maven-surefire-common/src/main/java/org/apache/maven/surefire/stream/EventDecoder.java b/maven-surefire-common/src/main/java/org/apache/maven/surefire/stream/EventDecoder.java +-index ea1188984..70ebd3c56 100644 +---- a/maven-surefire-common/src/main/java/org/apache/maven/surefire/stream/EventDecoder.java +-+++ b/maven-surefire-common/src/main/java/org/apache/maven/surefire/stream/EventDecoder.java +-@@ -72,7 +72,7 @@ +- import static org.apache.maven.surefire.api.stream.SegmentType.RUN_MODE; +- import static org.apache.maven.surefire.api.stream.SegmentType.STRING_ENCODING; +- import static org.apache.maven.surefire.api.stream.SegmentType.TEST_RUN_ID; +--import static org.apache.maven.surefire.shared.utils.cli.ShutdownHookUtils.addShutDownHook; +-+import static org.apache.maven.shared.utils.cli.ShutdownHookUtils.addShutDownHook; +- +- /** +- * +-diff --git a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/AbstractSurefireMojoTest.java b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/AbstractSurefireMojoTest.java +-index ec00a22a4..7bd3154cb 100644 +---- a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/AbstractSurefireMojoTest.java +-+++ b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/AbstractSurefireMojoTest.java +-@@ -97,9 +97,9 @@ +- import static java.util.Collections.singletonList; +- import static org.apache.maven.artifact.versioning.VersionRange.createFromVersion; +- import static org.apache.maven.artifact.versioning.VersionRange.createFromVersionSpec; +--import static org.apache.maven.surefire.shared.lang3.JavaVersion.JAVA_9; +--import static org.apache.maven.surefire.shared.lang3.JavaVersion.JAVA_RECENT; +--import static org.apache.maven.surefire.shared.lang3.SystemUtils.IS_OS_WINDOWS; +-+import static org.apache.commons.lang3.JavaVersion.JAVA_9; +-+import static org.apache.commons.lang3.JavaVersion.JAVA_RECENT; +-+import static org.apache.commons.lang3.SystemUtils.IS_OS_WINDOWS; +- import static org.assertj.core.api.Assertions.assertThat; +- import static org.codehaus.plexus.languages.java.jpms.ModuleNameSource.MODULEDESCRIPTOR; +- import static org.junit.Assert.fail; +-diff --git a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/AbstractSurefireMojoToolchainsTest.java b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/AbstractSurefireMojoToolchainsTest.java +-index 4ebe62a6e..6c5110f79 100644 +---- a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/AbstractSurefireMojoToolchainsTest.java +-+++ b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/AbstractSurefireMojoToolchainsTest.java +-@@ -21,7 +21,7 @@ +- +- import org.apache.maven.execution.MavenSession; +- import org.apache.maven.plugin.MojoFailureException; +--import org.apache.maven.surefire.shared.io.FilenameUtils; +-+import org.apache.commons.io.FilenameUtils; +- import org.apache.maven.toolchain.Toolchain; +- import org.apache.maven.toolchain.ToolchainManager; +- import org.apache.maven.toolchain.java.DefaultJavaToolChain; +-diff --git a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/SurefireHelperTest.java b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/SurefireHelperTest.java +-index dbe2c3697..570adf32b 100644 +---- a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/SurefireHelperTest.java +-+++ b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/SurefireHelperTest.java +-@@ -40,7 +40,7 @@ +- import static java.util.Collections.singleton; +- import static org.apache.maven.plugin.surefire.SurefireHelper.escapeToPlatformPath; +- import static org.apache.maven.plugin.surefire.SurefireHelper.reportExecution; +--import static org.apache.maven.surefire.shared.lang3.SystemUtils.IS_OS_WINDOWS; +-+import static org.apache.commons.lang3.SystemUtils.IS_OS_WINDOWS; +- import static org.assertj.core.api.Assertions.assertThat; +- import static org.hamcrest.Matchers.containsString; +- import static org.junit.Assume.assumeTrue; +-diff --git a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/BooterDeserializerProviderConfigurationTest.java b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/BooterDeserializerProviderConfigurationTest.java +-index 55f63f358..34c021269 100644 +---- a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/BooterDeserializerProviderConfigurationTest.java +-+++ b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/BooterDeserializerProviderConfigurationTest.java +-@@ -21,7 +21,7 @@ +- +- import junit.framework.Assert; +- import junit.framework.TestCase; +--import org.apache.maven.surefire.shared.io.FileUtils; +-+import org.apache.commons.io.FileUtils; +- import org.apache.maven.surefire.booter.BooterDeserializer; +- import org.apache.maven.surefire.booter.ClassLoaderConfiguration; +- import org.apache.maven.surefire.booter.ClasspathConfiguration; +-diff --git a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/BooterDeserializerStartupConfigurationTest.java b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/BooterDeserializerStartupConfigurationTest.java +-index 9baf914af..a2041a541 100644 +---- a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/BooterDeserializerStartupConfigurationTest.java +-+++ b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/BooterDeserializerStartupConfigurationTest.java +-@@ -31,7 +31,7 @@ +- import org.apache.maven.surefire.booter.StartupConfiguration; +- import org.apache.maven.surefire.api.cli.CommandLineOption; +- import org.apache.maven.surefire.api.report.ReporterConfiguration; +--import org.apache.maven.surefire.shared.io.FileUtils; +-+import org.apache.commons.io.FileUtils; +- import org.apache.maven.surefire.api.testset.DirectoryScannerParameters; +- import org.apache.maven.surefire.api.testset.RunOrderParameters; +- import org.apache.maven.surefire.api.testset.TestArtifactInfo; +-diff --git a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/ForkConfigurationTest.java b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/ForkConfigurationTest.java +-index d1771889e..89aeb679e 100644 +---- a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/ForkConfigurationTest.java +-+++ b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/ForkConfigurationTest.java +-@@ -31,7 +31,7 @@ +- import org.apache.maven.surefire.booter.StartupConfiguration; +- import org.apache.maven.surefire.booter.SurefireBooterForkException; +- import org.apache.maven.surefire.extensions.ForkNodeFactory; +--import org.apache.maven.surefire.shared.io.FileUtils; +-+import org.apache.commons.io.FileUtils; +- import org.junit.After; +- import org.junit.Before; +- import org.junit.Test; +-@@ -54,7 +54,7 @@ +- import static org.apache.maven.surefire.api.util.internal.StringUtils.NL; +- import static org.apache.maven.surefire.booter.Classpath.emptyClasspath; +- import static org.apache.maven.surefire.booter.ProcessCheckerType.ALL; +--import static org.apache.maven.surefire.shared.lang3.SystemUtils.IS_OS_WINDOWS; +-+import static org.apache.commons.lang3.SystemUtils.IS_OS_WINDOWS; +- import static org.assertj.core.api.Assertions.assertThat; +- import static org.apache.commons.io.FileUtils.getTempDirectory; +- import static org.junit.Assert.assertEquals; +-@@ -128,7 +128,7 @@ protected void resolveClasspath( @Nonnull Commandline cli, +- ClassLoaderConfiguration clc = new ClassLoaderConfiguration( true, true ); +- StartupConfiguration startup = new StartupConfiguration( "cls", cpConfig, clc, ALL, providerJpmsArgs ); +- +-- org.apache.maven.surefire.shared.utils.cli.Commandline +-+ org.apache.maven.shared.utils.cli.Commandline +- cli = config.createCommandLine( startup, 1, getTempDirectory() ); +- +- assertThat( cli.getEnvironmentVariables() ) +-@@ -159,7 +159,7 @@ public void testCliArgs() throws Exception +- ClassLoaderConfiguration clc = new ClassLoaderConfiguration( true, true ); +- StartupConfiguration startup = new StartupConfiguration( "cls", cpConfig, clc, ALL, providerJpmsArgs ); +- +-- org.apache.maven.surefire.shared.utils.cli.Commandline +-+ org.apache.maven.shared.utils.cli.Commandline +- cli = config.createCommandLine( startup, 1, getTempDirectory() ); +- String cliAsString = cli.toString(); +- +-@@ -237,7 +237,7 @@ protected void resolveClasspath( @Nonnull Commandline cli, +- assertThat( startup.isShadefire() ) +- .isFalse(); +- +-- org.apache.maven.surefire.shared.utils.cli.Commandline +-+ org.apache.maven.shared.utils.cli.Commandline +- cli = config.createCommandLine( startup, 1, getTempDirectory() ); +- +- assertThat( cli.toString() ) +-@@ -259,7 +259,7 @@ public void testCreateCommandLine_UseSystemClassLoaderForkOnce_ShouldConstructMa +- StartupConfiguration startup = +- new StartupConfiguration( "", cpConfig, clc, ALL, Collections.emptyList() ); +- +-- org.apache.maven.surefire.shared.utils.cli.Commandline +-+ org.apache.maven.shared.utils.cli.Commandline +- cli = config.createCommandLine( startup, 1, getTempDirectory() ); +- +- String line = join( " ", cli.getCommandline() ); +-@@ -281,7 +281,7 @@ public void testArglineWithNewline() +- StartupConfiguration startup = +- new StartupConfiguration( "", cpConfig, clc, ALL, Collections.emptyList() ); +- +-- org.apache.maven.surefire.shared.utils.cli.Commandline +-+ org.apache.maven.shared.utils.cli.Commandline +- commandLine = config.createCommandLine( startup, 1, getTempDirectory() ); +- assertThat( commandLine.toString() ).contains( IS_OS_WINDOWS ? "abc def" : "'abc' 'def'" ); +- } +-@@ -298,7 +298,7 @@ public void testCurrentWorkingDirectoryPropagationIncludingForkNumberExpansion() +- StartupConfiguration startup = +- new StartupConfiguration( "", cpConfig, clc, ALL, Collections.emptyList() ); +- ForkConfiguration config = getForkConfiguration( cwd.getCanonicalFile() ); +-- org.apache.maven.surefire.shared.utils.cli.Commandline +-+ org.apache.maven.shared.utils.cli.Commandline +- commandLine = config.createCommandLine( startup, 1, getTempDirectory() ); +- +- File forkDirectory = new File( basedir, "fork_1" ); +-diff --git a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/ForkStarterTest.java b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/ForkStarterTest.java +-index ff04152a5..7b88ada69 100644 +---- a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/ForkStarterTest.java +-+++ b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/ForkStarterTest.java +-@@ -43,9 +43,9 @@ +- import org.apache.maven.surefire.booter.SurefireBooterForkException; +- import org.apache.maven.surefire.extensions.ForkNodeFactory; +- import org.apache.maven.surefire.api.report.ReporterConfiguration; +--import org.apache.maven.surefire.shared.compress.archivers.zip.Zip64Mode; +--import org.apache.maven.surefire.shared.compress.archivers.zip.ZipArchiveEntry; +--import org.apache.maven.surefire.shared.compress.archivers.zip.ZipArchiveOutputStream; +-+import org.apache.commons.compress.archivers.zip.Zip64Mode; +-+import org.apache.commons.compress.archivers.zip.ZipArchiveEntry; +-+import org.apache.commons.compress.archivers.zip.ZipArchiveOutputStream; +- import org.junit.AfterClass; +- import org.junit.BeforeClass; +- import org.junit.Rule; +-diff --git a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/ModularClasspathForkConfigurationTest.java b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/ModularClasspathForkConfigurationTest.java +-index 668859185..bca3acd9c 100644 +---- a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/ModularClasspathForkConfigurationTest.java +-+++ b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/ModularClasspathForkConfigurationTest.java +-@@ -45,7 +45,7 @@ +- import static java.util.Arrays.asList; +- import static java.util.Collections.singleton; +- import static org.apache.maven.surefire.booter.Classpath.emptyClasspath; +--import static org.apache.maven.surefire.shared.utils.StringUtils.replace; +-+import static org.apache.maven.shared.utils.StringUtils.replace; +- import static org.assertj.core.api.Assertions.assertThat; +- import static org.mockito.Mockito.mock; +- +-diff --git a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/lazytestprovider/CommandlineTest.java b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/lazytestprovider/CommandlineTest.java +-index 86d3f3c22..40ad62dd5 100644 +---- a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/lazytestprovider/CommandlineTest.java +-+++ b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/lazytestprovider/CommandlineTest.java +-@@ -19,11 +19,11 @@ +- * under the License. +- */ +- +--import org.apache.maven.surefire.shared.utils.cli.CommandLineException; +-+import org.apache.maven.shared.utils.cli.CommandLineException; +- import org.assertj.core.api.Condition; +- import org.junit.Test; +- +--import static org.apache.maven.surefire.shared.lang3.SystemUtils.IS_OS_WINDOWS; +-+import static org.apache.commons.lang3.SystemUtils.IS_OS_WINDOWS; +- import static org.assertj.core.api.Assertions.assertThat; +- +- /** +-diff --git a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/report/DefaultReporterFactoryTest.java b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/report/DefaultReporterFactoryTest.java +-index ded28a3d3..8d03ee1b7 100644 +---- a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/report/DefaultReporterFactoryTest.java +-+++ b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/report/DefaultReporterFactoryTest.java +-@@ -35,7 +35,7 @@ +- import org.apache.maven.plugin.surefire.log.api.ConsoleLogger; +- import org.apache.maven.surefire.api.report.TestOutputReportEntry; +- import org.apache.maven.surefire.api.report.TestReportListener; +--import org.apache.maven.surefire.shared.utils.logging.MessageUtils; +-+import org.apache.maven.shared.utils.logging.MessageUtils; +- import org.apache.maven.surefire.report.RunStatistics; +- import org.apache.maven.surefire.api.report.SafeThrowable; +- import org.apache.maven.surefire.api.report.StackTraceWriter; +-diff --git a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/report/StatelessXmlReporterTest.java b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/report/StatelessXmlReporterTest.java +-index 8744c91f0..99d4dcfed 100644 +---- a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/report/StatelessXmlReporterTest.java +-+++ b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/report/StatelessXmlReporterTest.java +-@@ -24,8 +24,8 @@ +- import org.apache.maven.surefire.api.report.ReportEntry; +- import org.apache.maven.surefire.api.report.SimpleReportEntry; +- import org.apache.maven.surefire.api.report.StackTraceWriter; +--import org.apache.maven.surefire.shared.utils.xml.Xpp3Dom; +--import org.apache.maven.surefire.shared.utils.xml.Xpp3DomBuilder; +-+import org.apache.maven.shared.utils.xml.Xpp3Dom; +-+import org.apache.maven.shared.utils.xml.Xpp3DomBuilder; +- +- import java.io.ByteArrayOutputStream; +- import java.io.File; +-@@ -49,7 +49,7 @@ +- import static org.apache.maven.surefire.api.report.RunMode.NORMAL_RUN; +- import static org.apache.maven.surefire.api.report.RunMode.RERUN_TEST_AFTER_FAILURE; +- import static org.apache.maven.surefire.api.util.internal.ObjectUtils.systemProps; +--import static org.apache.maven.surefire.shared.utils.StringUtils.isEmpty; +-+import static org.apache.maven.shared.utils.StringUtils.isEmpty; +- import static org.assertj.core.api.Assertions.assertThat; +- import static org.mockito.Mockito.doThrow; +- import static org.mockito.Mockito.mock; +-diff --git a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/report/TestSetStatsTest.java b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/report/TestSetStatsTest.java +-index 0d9bd6a48..c26051c26 100644 +---- a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/report/TestSetStatsTest.java +-+++ b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/report/TestSetStatsTest.java +-@@ -26,7 +26,7 @@ +- import org.powermock.core.classloader.annotations.PowerMockIgnore; +- import org.powermock.modules.junit4.PowerMockRunner; +- +--import static org.apache.maven.surefire.shared.utils.logging.MessageUtils.buffer; +-+import static org.apache.maven.shared.utils.logging.MessageUtils.buffer; +- import static org.assertj.core.api.Assertions.assertThat; +- import static org.mockito.Mockito.times; +- import static org.mockito.Mockito.verify; +-diff --git a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/runorder/RunEntryStatisticsMapTest.java b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/runorder/RunEntryStatisticsMapTest.java +-index 8f5f58054..86db1648d 100644 +---- a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/runorder/RunEntryStatisticsMapTest.java +-+++ b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/runorder/RunEntryStatisticsMapTest.java +-@@ -39,7 +39,7 @@ +- +- import static java.nio.charset.StandardCharsets.UTF_8; +- import static org.apache.maven.surefire.api.report.RunMode.NORMAL_RUN; +--import static org.apache.maven.surefire.shared.io.IOUtils.readLines; +-+import static org.apache.commons.io.IOUtils.readLines; +- import static org.apache.maven.surefire.api.util.internal.StringUtils.NL; +- import static org.assertj.core.api.Assertions.assertThat; +- import static org.powermock.reflect.Whitebox.getInternalState; +-diff --git a/maven-surefire-common/src/test/java/org/apache/maven/surefire/extensions/StatelessTestsetInfoReporterTest.java b/maven-surefire-common/src/test/java/org/apache/maven/surefire/extensions/StatelessTestsetInfoReporterTest.java +-index 58d2803e8..3abdc2927 100644 +---- a/maven-surefire-common/src/test/java/org/apache/maven/surefire/extensions/StatelessTestsetInfoReporterTest.java +-+++ b/maven-surefire-common/src/test/java/org/apache/maven/surefire/extensions/StatelessTestsetInfoReporterTest.java +-@@ -27,7 +27,7 @@ +- import org.apache.maven.plugin.surefire.report.TestSetStats; +- import org.apache.maven.plugin.surefire.report.WrappedReportEntry; +- import org.apache.maven.surefire.api.report.TestSetReportEntry; +--import org.apache.maven.surefire.shared.utils.logging.MessageUtils; +-+import org.apache.maven.shared.utils.logging.MessageUtils; +- import org.junit.Test; +- import org.junit.runner.RunWith; +- import org.mockito.ArgumentCaptor; +-diff --git a/maven-surefire-common/src/test/java/org/apache/maven/surefire/report/ConsoleOutputFileReporterTest.java b/maven-surefire-common/src/test/java/org/apache/maven/surefire/report/ConsoleOutputFileReporterTest.java +-index 6b0ee446a..71d70a7f4 100644 +---- a/maven-surefire-common/src/test/java/org/apache/maven/surefire/report/ConsoleOutputFileReporterTest.java +-+++ b/maven-surefire-common/src/test/java/org/apache/maven/surefire/report/ConsoleOutputFileReporterTest.java +-@@ -31,7 +31,7 @@ +- import org.apache.maven.surefire.api.report.SimpleReportEntry; +- import org.apache.maven.surefire.api.report.TestOutputReportEntry; +- import org.apache.maven.surefire.api.report.TestSetReportEntry; +--import org.apache.maven.surefire.shared.utils.io.FileUtils; +-+import org.apache.maven.shared.utils.io.FileUtils; +- +- import static java.nio.charset.StandardCharsets.US_ASCII; +- import static org.apache.maven.surefire.api.report.RunMode.NORMAL_RUN; +-diff --git a/surefire-api/src/main/java/org/apache/maven/surefire/api/booter/Command.java b/surefire-api/src/main/java/org/apache/maven/surefire/api/booter/Command.java +-index d768e1142..a74d97fe0 100644 +---- a/surefire-api/src/main/java/org/apache/maven/surefire/api/booter/Command.java +-+++ b/surefire-api/src/main/java/org/apache/maven/surefire/api/booter/Command.java +-@@ -22,7 +22,7 @@ +- import java.util.Objects; +- +- import static java.util.Objects.requireNonNull; +--import static org.apache.maven.surefire.shared.utils.StringUtils.isBlank; +-+import static org.apache.maven.shared.utils.StringUtils.isBlank; +- +- /** +- * Encapsulates data and command sent from master to forked process. +-diff --git a/surefire-api/src/main/java/org/apache/maven/surefire/api/filter/SpecificTestClassFilter.java b/surefire-api/src/main/java/org/apache/maven/surefire/api/filter/SpecificTestClassFilter.java +-index 112f5eece..a768b15dd 100644 +---- a/surefire-api/src/main/java/org/apache/maven/surefire/api/filter/SpecificTestClassFilter.java +-+++ b/surefire-api/src/main/java/org/apache/maven/surefire/api/filter/SpecificTestClassFilter.java +-@@ -22,7 +22,7 @@ +- import java.util.Collections; +- import java.util.HashSet; +- import java.util.Set; +--import org.apache.maven.surefire.shared.utils.io.SelectorUtils; +-+import org.apache.maven.shared.utils.io.SelectorUtils; +- import org.apache.maven.surefire.api.util.ScannerFilter; +- +- /** +-diff --git a/surefire-api/src/main/java/org/apache/maven/surefire/api/report/LegacyPojoStackTraceWriter.java b/surefire-api/src/main/java/org/apache/maven/surefire/api/report/LegacyPojoStackTraceWriter.java +-index ffb09c7fa..83bf77834 100644 +---- a/surefire-api/src/main/java/org/apache/maven/surefire/api/report/LegacyPojoStackTraceWriter.java +-+++ b/surefire-api/src/main/java/org/apache/maven/surefire/api/report/LegacyPojoStackTraceWriter.java +-@@ -21,7 +21,7 @@ +- +- +- import org.apache.maven.surefire.api.util.internal.StringUtils; +--import static org.apache.maven.surefire.shared.utils.StringUtils.isNotEmpty; +-+import static org.apache.maven.shared.utils.StringUtils.isNotEmpty; +- +- import java.io.PrintWriter; +- import java.io.StringWriter; +-diff --git a/surefire-api/src/main/java/org/apache/maven/surefire/api/stream/AbstractStreamDecoder.java b/surefire-api/src/main/java/org/apache/maven/surefire/api/stream/AbstractStreamDecoder.java +-index facf30bcb..4614926ea 100644 +---- a/surefire-api/src/main/java/org/apache/maven/surefire/api/stream/AbstractStreamDecoder.java +-+++ b/surefire-api/src/main/java/org/apache/maven/surefire/api/stream/AbstractStreamDecoder.java +-@@ -46,7 +46,7 @@ +- import static org.apache.maven.surefire.api.booter.Constants.DEFAULT_STREAM_ENCODING; +- import static org.apache.maven.surefire.api.stream.AbstractStreamDecoder.StreamReadStatus.OVERFLOW; +- import static org.apache.maven.surefire.api.stream.AbstractStreamDecoder.StreamReadStatus.UNDERFLOW; +--import static org.apache.maven.surefire.shared.lang3.StringUtils.isBlank; +-+import static org.apache.commons.lang3.StringUtils.isBlank; +- +- /** +- * @param message object +-diff --git a/surefire-api/src/main/java/org/apache/maven/surefire/api/testset/ResolvedTest.java b/surefire-api/src/main/java/org/apache/maven/surefire/api/testset/ResolvedTest.java +-index 24503581c..aa690d34e 100644 +---- a/surefire-api/src/main/java/org/apache/maven/surefire/api/testset/ResolvedTest.java +-+++ b/surefire-api/src/main/java/org/apache/maven/surefire/api/testset/ResolvedTest.java +-@@ -19,18 +19,18 @@ +- * under the License. +- */ +- +--import org.apache.maven.surefire.shared.utils.StringUtils; +--import org.apache.maven.surefire.shared.utils.io.MatchPatterns; +-+import org.apache.maven.shared.utils.StringUtils; +-+import org.apache.maven.shared.utils.io.MatchPatterns; +- +- import java.util.regex.Pattern; +- +- import static java.io.File.separatorChar; +- import static java.util.regex.Pattern.compile; +--import static org.apache.maven.surefire.shared.utils.StringUtils.isBlank; +--import static org.apache.maven.surefire.shared.utils.io.MatchPatterns.from; +--import static org.apache.maven.surefire.shared.utils.io.SelectorUtils.PATTERN_HANDLER_SUFFIX; +--import static org.apache.maven.surefire.shared.utils.io.SelectorUtils.REGEX_HANDLER_PREFIX; +--import static org.apache.maven.surefire.shared.utils.io.SelectorUtils.matchPath; +-+import static org.apache.maven.shared.utils.StringUtils.isBlank; +-+import static org.apache.maven.shared.utils.io.MatchPatterns.from; +-+import static org.apache.maven.shared.utils.io.SelectorUtils.PATTERN_HANDLER_SUFFIX; +-+import static org.apache.maven.shared.utils.io.SelectorUtils.REGEX_HANDLER_PREFIX; +-+import static org.apache.maven.shared.utils.io.SelectorUtils.matchPath; +- +- /** +- * Single pattern test filter resolved from multi pattern filter -Dtest=MyTest#test,AnotherTest#otherTest. +-diff --git a/surefire-api/src/main/java/org/apache/maven/surefire/api/testset/TestListResolver.java b/surefire-api/src/main/java/org/apache/maven/surefire/api/testset/TestListResolver.java +-index bae7c2924..799011a69 100644 +---- a/surefire-api/src/main/java/org/apache/maven/surefire/api/testset/TestListResolver.java +-+++ b/surefire-api/src/main/java/org/apache/maven/surefire/api/testset/TestListResolver.java +-@@ -26,11 +26,11 @@ +- import java.util.Set; +- +- import static java.util.Collections.unmodifiableSet; +--import static org.apache.maven.surefire.shared.utils.StringUtils.isBlank; +--import static org.apache.maven.surefire.shared.utils.StringUtils.isNotBlank; +--import static org.apache.maven.surefire.shared.utils.StringUtils.split; +--import static org.apache.maven.surefire.shared.utils.io.SelectorUtils.PATTERN_HANDLER_SUFFIX; +--import static org.apache.maven.surefire.shared.utils.io.SelectorUtils.REGEX_HANDLER_PREFIX; +-+import static org.apache.maven.shared.utils.StringUtils.isBlank; +-+import static org.apache.maven.shared.utils.StringUtils.isNotBlank; +-+import static org.apache.maven.shared.utils.StringUtils.split; +-+import static org.apache.maven.shared.utils.io.SelectorUtils.PATTERN_HANDLER_SUFFIX; +-+import static org.apache.maven.shared.utils.io.SelectorUtils.REGEX_HANDLER_PREFIX; +- import static java.util.Collections.singleton; +- import static org.apache.maven.surefire.api.testset.ResolvedTest.Type.CLASS; +- import static org.apache.maven.surefire.api.testset.ResolvedTest.Type.METHOD; +-diff --git a/surefire-api/src/main/java/org/apache/maven/surefire/api/util/DefaultDirectoryScanner.java b/surefire-api/src/main/java/org/apache/maven/surefire/api/util/DefaultDirectoryScanner.java +-index fcdba6bd7..8edee7816 100644 +---- a/surefire-api/src/main/java/org/apache/maven/surefire/api/util/DefaultDirectoryScanner.java +-+++ b/surefire-api/src/main/java/org/apache/maven/surefire/api/util/DefaultDirectoryScanner.java +-@@ -109,8 +109,8 @@ String[] collectTests() +- String[] tests = EMPTY_STRING_ARRAY; +- if ( basedir.exists() ) +- { +-- org.apache.maven.surefire.shared.utils.io.DirectoryScanner scanner = +-- new org.apache.maven.surefire.shared.utils.io.DirectoryScanner(); +-+ org.apache.maven.shared.utils.io.DirectoryScanner scanner = +-+ new org.apache.maven.shared.utils.io.DirectoryScanner(); +- +- scanner.setBasedir( basedir ); +- +-diff --git a/surefire-api/src/main/java/org/apache/maven/surefire/api/util/internal/ClassMethod.java b/surefire-api/src/main/java/org/apache/maven/surefire/api/util/internal/ClassMethod.java +-index 03661d825..1d2a060d6 100644 +---- a/surefire-api/src/main/java/org/apache/maven/surefire/api/util/internal/ClassMethod.java +-+++ b/surefire-api/src/main/java/org/apache/maven/surefire/api/util/internal/ClassMethod.java +-@@ -21,7 +21,7 @@ +- +- import java.util.Objects; +- +--import static org.apache.maven.surefire.shared.utils.StringUtils.isBlank; +-+import static org.apache.maven.shared.utils.StringUtils.isBlank; +- +- /** +- * Data transfer object of class and method literals. +-diff --git a/surefire-api/src/main/java/org/apache/maven/surefire/api/util/internal/ObjectUtils.java b/surefire-api/src/main/java/org/apache/maven/surefire/api/util/internal/ObjectUtils.java +-index 9ee7571e4..58276b9d0 100644 +---- a/surefire-api/src/main/java/org/apache/maven/surefire/api/util/internal/ObjectUtils.java +-+++ b/surefire-api/src/main/java/org/apache/maven/surefire/api/util/internal/ObjectUtils.java +-@@ -22,8 +22,8 @@ +- import java.lang.management.ManagementFactory; +- import java.util.Map; +- +--import static org.apache.maven.surefire.shared.lang3.JavaVersion.JAVA_17; +--import static org.apache.maven.surefire.shared.lang3.JavaVersion.JAVA_RECENT; +-+import static org.apache.commons.lang3.JavaVersion.JAVA_17; +-+import static org.apache.commons.lang3.JavaVersion.JAVA_RECENT; +- +- /** +- * Similar to Java 7 java.util.Objects. +-diff --git a/surefire-api/src/test/java/org/apache/maven/surefire/api/util/internal/ObjectUtilsTest.java b/surefire-api/src/test/java/org/apache/maven/surefire/api/util/internal/ObjectUtilsTest.java +-index ef5035ec4..303b0ea85 100644 +---- a/surefire-api/src/test/java/org/apache/maven/surefire/api/util/internal/ObjectUtilsTest.java +-+++ b/surefire-api/src/test/java/org/apache/maven/surefire/api/util/internal/ObjectUtilsTest.java +-@@ -21,8 +21,8 @@ +- +- import org.junit.Test; +- +--import static org.apache.maven.surefire.shared.lang3.JavaVersion.JAVA_17; +--import static org.apache.maven.surefire.shared.lang3.JavaVersion.JAVA_RECENT; +-+import static org.apache.commons.lang3.JavaVersion.JAVA_17; +-+import static org.apache.commons.lang3.JavaVersion.JAVA_RECENT; +- import static org.assertj.core.api.Assertions.assertThat; +- +- /** +-diff --git a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/CommandReader.java b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/CommandReader.java +-index 609327ccf..a88bbd621 100644 +---- a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/CommandReader.java +-+++ b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/CommandReader.java +-@@ -54,8 +54,8 @@ +- import static org.apache.maven.surefire.api.booter.MasterProcessCommand.NOOP; +- import static org.apache.maven.surefire.api.booter.MasterProcessCommand.SHUTDOWN; +- import static org.apache.maven.surefire.api.booter.MasterProcessCommand.SKIP_SINCE_NEXT_TEST; +--import static org.apache.maven.surefire.shared.utils.StringUtils.isBlank; +--import static org.apache.maven.surefire.shared.utils.StringUtils.isNotBlank; +-+import static org.apache.maven.shared.utils.StringUtils.isBlank; +-+import static org.apache.maven.shared.utils.StringUtils.isNotBlank; +- import static org.apache.maven.surefire.api.util.internal.DaemonThreadFactory.newDaemonThread; +- +- /** +-diff --git a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ForkedBooter.java b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ForkedBooter.java +-index bd44d55c4..e750194bf 100644 +---- a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ForkedBooter.java +-+++ b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ForkedBooter.java +-@@ -34,7 +34,7 @@ +- import org.apache.maven.surefire.api.testset.TestSetFailedException; +- import org.apache.maven.surefire.booter.spi.LegacyMasterProcessChannelProcessorFactory; +- import org.apache.maven.surefire.booter.spi.SurefireMasterProcessChannelProcessorFactory; +--import org.apache.maven.surefire.shared.utils.cli.ShutdownHookUtils; +-+import org.apache.maven.shared.utils.cli.ShutdownHookUtils; +- import org.apache.maven.surefire.spi.MasterProcessChannelProcessorFactory; +- +- import java.io.File; +-diff --git a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/PpidChecker.java b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/PpidChecker.java +-index 1fb8a30ae..4e21f43c9 100644 +---- a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/PpidChecker.java +-+++ b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/PpidChecker.java +-@@ -45,12 +45,12 @@ +- import static java.util.concurrent.TimeUnit.HOURS; +- import static java.util.concurrent.TimeUnit.MINUTES; +- import static java.util.regex.Pattern.compile; +--import static org.apache.maven.surefire.shared.io.IOUtils.closeQuietly; +--import static org.apache.maven.surefire.shared.lang3.StringUtils.isNotBlank; +--import static org.apache.maven.surefire.shared.lang3.SystemUtils.IS_OS_HP_UX; +--import static org.apache.maven.surefire.shared.lang3.SystemUtils.IS_OS_LINUX; +--import static org.apache.maven.surefire.shared.lang3.SystemUtils.IS_OS_UNIX; +--import static org.apache.maven.surefire.shared.lang3.SystemUtils.IS_OS_WINDOWS; +-+import static org.apache.commons.io.IOUtils.closeQuietly; +-+import static org.apache.commons.lang3.StringUtils.isNotBlank; +-+import static org.apache.commons.lang3.SystemUtils.IS_OS_HP_UX; +-+import static org.apache.commons.lang3.SystemUtils.IS_OS_LINUX; +-+import static org.apache.commons.lang3.SystemUtils.IS_OS_UNIX; +-+import static org.apache.commons.lang3.SystemUtils.IS_OS_WINDOWS; +- import static org.apache.maven.surefire.booter.ProcessInfo.unixProcessInfo; +- import static org.apache.maven.surefire.booter.ProcessInfo.windowsProcessInfo; +- import static org.apache.maven.surefire.booter.ProcessInfo.ERR_PROCESS_INFO; +-diff --git a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ProcessCheckerType.java b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ProcessCheckerType.java +-index 03a0e880d..281d5b4f0 100644 +---- a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ProcessCheckerType.java +-+++ b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ProcessCheckerType.java +-@@ -19,7 +19,7 @@ +- * under the License. +- */ +- +--import static org.apache.maven.surefire.shared.utils.StringUtils.isBlank; +-+import static org.apache.maven.shared.utils.StringUtils.isBlank; +- +- /** +- * +-diff --git a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/PropertiesWrapper.java b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/PropertiesWrapper.java +-index b5cccf478..13e60aec0 100644 +---- a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/PropertiesWrapper.java +-+++ b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/PropertiesWrapper.java +-@@ -23,7 +23,7 @@ +- import java.util.ArrayList; +- import java.util.List; +- import java.util.Map; +--import org.apache.maven.surefire.shared.utils.StringUtils; +-+import org.apache.maven.shared.utils.StringUtils; +- +- /** +- * @author Kristian Rosenvold +-diff --git a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/SurefireBooterForkException.java b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/SurefireBooterForkException.java +-index bae4ed086..8620be11b 100644 +---- a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/SurefireBooterForkException.java +-+++ b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/SurefireBooterForkException.java +-@@ -22,7 +22,7 @@ +- +- import org.apache.maven.surefire.api.suite.RunResult; +- +--import static org.apache.maven.surefire.shared.utils.StringUtils.isNotBlank; +-+import static org.apache.maven.shared.utils.StringUtils.isNotBlank; +- +- /** +- * Encapsulates exceptions thrown during Surefire forking. +-diff --git a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/SystemUtils.java b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/SystemUtils.java +-index 674cb22ed..844c4ce11 100644 +---- a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/SystemUtils.java +-+++ b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/SystemUtils.java +-@@ -36,15 +36,15 @@ +- import static java.lang.Thread.currentThread; +- import static java.util.Objects.requireNonNull; +- import static org.apache.maven.surefire.api.util.ReflectionUtils.invokeMethodWithArray; +--import static org.apache.maven.surefire.shared.lang3.JavaVersion.JAVA_RECENT; +--import static org.apache.maven.surefire.shared.lang3.JavaVersion.JAVA_9; +--import static org.apache.maven.surefire.shared.lang3.StringUtils.isNumeric; +-+import static org.apache.commons.lang3.JavaVersion.JAVA_RECENT; +-+import static org.apache.commons.lang3.JavaVersion.JAVA_9; +-+import static org.apache.commons.lang3.StringUtils.isNumeric; +- import static org.apache.maven.surefire.api.util.ReflectionUtils.invokeMethodChain; +- import static org.apache.maven.surefire.api.util.ReflectionUtils.tryLoadClass; +--import static org.apache.maven.surefire.shared.lang3.SystemUtils.IS_OS_LINUX; +--import static org.apache.maven.surefire.shared.lang3.SystemUtils.IS_OS_FREE_BSD; +--import static org.apache.maven.surefire.shared.lang3.SystemUtils.IS_OS_NET_BSD; +--import static org.apache.maven.surefire.shared.lang3.SystemUtils.IS_OS_OPEN_BSD; +-+import static org.apache.commons.lang3.SystemUtils.IS_OS_LINUX; +-+import static org.apache.commons.lang3.SystemUtils.IS_OS_FREE_BSD; +-+import static org.apache.commons.lang3.SystemUtils.IS_OS_NET_BSD; +-+import static org.apache.commons.lang3.SystemUtils.IS_OS_OPEN_BSD; +- +- /** +- * JDK 9 support. +-diff --git a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/stream/CommandDecoder.java b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/stream/CommandDecoder.java +-index 4a7e257f7..86235dbfc 100644 +---- a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/stream/CommandDecoder.java +-+++ b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/stream/CommandDecoder.java +-@@ -48,7 +48,7 @@ +- import static org.apache.maven.surefire.api.stream.SegmentType.DATA_STRING; +- import static org.apache.maven.surefire.api.stream.SegmentType.END_OF_FRAME; +- import static org.apache.maven.surefire.api.stream.SegmentType.STRING_ENCODING; +--import static org.apache.maven.surefire.shared.utils.cli.ShutdownHookUtils.addShutDownHook; +-+import static org.apache.maven.shared.utils.cli.ShutdownHookUtils.addShutDownHook; +- +- /** +- * +-diff --git a/surefire-booter/src/test/java/org/apache/maven/surefire/booter/ForkedBooterMockTest.java b/surefire-booter/src/test/java/org/apache/maven/surefire/booter/ForkedBooterMockTest.java +-index 62df89930..fe02fdc7e 100644 +---- a/surefire-booter/src/test/java/org/apache/maven/surefire/booter/ForkedBooterMockTest.java +-+++ b/surefire-booter/src/test/java/org/apache/maven/surefire/booter/ForkedBooterMockTest.java +-@@ -29,7 +29,7 @@ +- import org.apache.maven.surefire.booter.spi.EventChannelEncoder; +- import org.apache.maven.surefire.booter.spi.LegacyMasterProcessChannelProcessorFactory; +- import org.apache.maven.surefire.booter.spi.SurefireMasterProcessChannelProcessorFactory; +--import org.apache.maven.surefire.shared.utils.cli.ShutdownHookUtils; +-+import org.apache.maven.shared.utils.cli.ShutdownHookUtils; +- import org.apache.maven.surefire.spi.MasterProcessChannelProcessorFactory; +- import org.junit.Rule; +- import org.junit.Test; +-diff --git a/surefire-booter/src/test/java/org/apache/maven/surefire/booter/ForkedBooterTest.java b/surefire-booter/src/test/java/org/apache/maven/surefire/booter/ForkedBooterTest.java +-index b5a1851ea..e367798fe 100644 +---- a/surefire-booter/src/test/java/org/apache/maven/surefire/booter/ForkedBooterTest.java +-+++ b/surefire-booter/src/test/java/org/apache/maven/surefire/booter/ForkedBooterTest.java +-@@ -19,7 +19,7 @@ +- * under the License. +- */ +- +--import org.apache.maven.surefire.shared.io.FileUtils; +-+import org.apache.commons.io.FileUtils; +- import org.junit.Test; +- +- import java.io.File; +-diff --git a/surefire-booter/src/test/java/org/apache/maven/surefire/booter/IsolatedClassLoaderTest.java b/surefire-booter/src/test/java/org/apache/maven/surefire/booter/IsolatedClassLoaderTest.java +-index 801346633..3eff7b13c 100644 +---- a/surefire-booter/src/test/java/org/apache/maven/surefire/booter/IsolatedClassLoaderTest.java +-+++ b/surefire-booter/src/test/java/org/apache/maven/surefire/booter/IsolatedClassLoaderTest.java +-@@ -20,7 +20,7 @@ +- */ +- +- import org.apache.maven.surefire.api.provider.AbstractProvider; +--import org.apache.maven.surefire.shared.utils.io.FileUtils; +-+import org.apache.maven.shared.utils.io.FileUtils; +- import org.junit.Before; +- import org.junit.Test; +- +-diff --git a/surefire-booter/src/test/java/org/apache/maven/surefire/booter/NewClassLoaderRunner.java b/surefire-booter/src/test/java/org/apache/maven/surefire/booter/NewClassLoaderRunner.java +-index ecc997d97..188cff090 100644 +---- a/surefire-booter/src/test/java/org/apache/maven/surefire/booter/NewClassLoaderRunner.java +-+++ b/surefire-booter/src/test/java/org/apache/maven/surefire/booter/NewClassLoaderRunner.java +-@@ -19,7 +19,7 @@ +- * under the License. +- */ +- +--import org.apache.maven.surefire.shared.utils.io.FileUtils; +-+import org.apache.maven.shared.utils.io.FileUtils; +- import org.junit.After; +- import org.junit.Before; +- import org.junit.Test; +-diff --git a/surefire-booter/src/test/java/org/apache/maven/surefire/booter/PpidCheckerTest.java b/surefire-booter/src/test/java/org/apache/maven/surefire/booter/PpidCheckerTest.java +-index c5d916e5e..fa6d0df88 100644 +---- a/surefire-booter/src/test/java/org/apache/maven/surefire/booter/PpidCheckerTest.java +-+++ b/surefire-booter/src/test/java/org/apache/maven/surefire/booter/PpidCheckerTest.java +-@@ -38,8 +38,8 @@ +- import static java.nio.charset.StandardCharsets.US_ASCII; +- import static java.nio.file.Files.readAllBytes; +- import static java.util.concurrent.TimeUnit.SECONDS; +--import static org.apache.maven.surefire.shared.lang3.SystemUtils.IS_OS_UNIX; +--import static org.apache.maven.surefire.shared.lang3.SystemUtils.IS_OS_WINDOWS; +-+import static org.apache.commons.lang3.SystemUtils.IS_OS_UNIX; +-+import static org.apache.commons.lang3.SystemUtils.IS_OS_WINDOWS; +- import static org.apache.maven.surefire.booter.ProcessInfo.unixProcessInfo; +- import static org.apache.maven.surefire.booter.ProcessInfo.windowsProcessInfo; +- import static org.assertj.core.api.Assertions.assertThat; +-diff --git a/surefire-booter/src/test/java/org/apache/maven/surefire/booter/SystemUtilsTest.java b/surefire-booter/src/test/java/org/apache/maven/surefire/booter/SystemUtilsTest.java +-index 6b2ac265f..3fa825cab 100644 +---- a/surefire-booter/src/test/java/org/apache/maven/surefire/booter/SystemUtilsTest.java +-+++ b/surefire-booter/src/test/java/org/apache/maven/surefire/booter/SystemUtilsTest.java +-@@ -32,12 +32,12 @@ +- import java.math.BigDecimal; +- +- import static java.io.File.separator; +--import static org.apache.maven.surefire.shared.lang3.JavaVersion.JAVA_9; +--import static org.apache.maven.surefire.shared.lang3.JavaVersion.JAVA_RECENT; +--import static org.apache.maven.surefire.shared.lang3.SystemUtils.IS_OS_FREE_BSD; +--import static org.apache.maven.surefire.shared.lang3.SystemUtils.IS_OS_LINUX; +--import static org.apache.maven.surefire.shared.lang3.SystemUtils.IS_OS_NET_BSD; +--import static org.apache.maven.surefire.shared.lang3.SystemUtils.IS_OS_OPEN_BSD; +-+import static org.apache.commons.lang3.JavaVersion.JAVA_9; +-+import static org.apache.commons.lang3.JavaVersion.JAVA_RECENT; +-+import static org.apache.commons.lang3.SystemUtils.IS_OS_FREE_BSD; +-+import static org.apache.commons.lang3.SystemUtils.IS_OS_LINUX; +-+import static org.apache.commons.lang3.SystemUtils.IS_OS_NET_BSD; +-+import static org.apache.commons.lang3.SystemUtils.IS_OS_OPEN_BSD; +- import static org.assertj.core.api.Assertions.assertThat; +- import static org.junit.Assume.assumeTrue; +- import static org.mockito.Matchers.any; +-diff --git a/surefire-extensions-api/src/main/java/org/apache/maven/surefire/extensions/ConsoleOutputReporter.java b/surefire-extensions-api/src/main/java/org/apache/maven/surefire/extensions/ConsoleOutputReporter.java +-index ae9d92799..eaf017b12 100644 +---- a/surefire-extensions-api/src/main/java/org/apache/maven/surefire/extensions/ConsoleOutputReporter.java +-+++ b/surefire-extensions-api/src/main/java/org/apache/maven/surefire/extensions/ConsoleOutputReporter.java +-@@ -22,7 +22,7 @@ +- import java.io.File; +- import java.io.PrintStream; +- +--import static org.apache.maven.surefire.shared.utils.StringUtils.isBlank; +-+import static org.apache.maven.shared.utils.StringUtils.isBlank; +- +- /** +- * Extension for logger. +-diff --git a/surefire-extensions-api/src/main/java/org/apache/maven/surefire/extensions/StatelessReporter.java b/surefire-extensions-api/src/main/java/org/apache/maven/surefire/extensions/StatelessReporter.java +-index effb7de73..3dd0678b1 100644 +---- a/surefire-extensions-api/src/main/java/org/apache/maven/surefire/extensions/StatelessReporter.java +-+++ b/surefire-extensions-api/src/main/java/org/apache/maven/surefire/extensions/StatelessReporter.java +-@@ -21,7 +21,7 @@ +- +- import org.apache.maven.surefire.api.report.TestSetReportEntry; +- +--import static org.apache.maven.surefire.shared.utils.StringUtils.isBlank; +-+import static org.apache.maven.shared.utils.StringUtils.isBlank; +- +- /** +- * Extension for stateless reporter. +-diff --git a/surefire-extensions-api/src/main/java/org/apache/maven/surefire/extensions/util/CommandlineExecutor.java b/surefire-extensions-api/src/main/java/org/apache/maven/surefire/extensions/util/CommandlineExecutor.java +-index 14a055d94..ddb96cf67 100644 +---- a/surefire-extensions-api/src/main/java/org/apache/maven/surefire/extensions/util/CommandlineExecutor.java +-+++ b/surefire-extensions-api/src/main/java/org/apache/maven/surefire/extensions/util/CommandlineExecutor.java +-@@ -19,13 +19,13 @@ +- * under the License. +- */ +- +--import org.apache.maven.surefire.shared.utils.cli.CommandLineException; +--import org.apache.maven.surefire.shared.utils.cli.Commandline; +-+import org.apache.maven.shared.utils.cli.CommandLineException; +-+import org.apache.maven.shared.utils.cli.Commandline; +- +- import java.io.Closeable; +- +--import static org.apache.maven.surefire.shared.utils.cli.ShutdownHookUtils.addShutDownHook; +--import static org.apache.maven.surefire.shared.utils.cli.ShutdownHookUtils.removeShutdownHook; +-+import static org.apache.maven.shared.utils.cli.ShutdownHookUtils.addShutDownHook; +-+import static org.apache.maven.shared.utils.cli.ShutdownHookUtils.removeShutdownHook; +- +- /** +- * Programming model with this class: +-diff --git a/surefire-extensions-api/src/test/java/org/apache/maven/plugin/surefire/extensions/CommandlineExecutorTest.java b/surefire-extensions-api/src/test/java/org/apache/maven/plugin/surefire/extensions/CommandlineExecutorTest.java +-index e3197befe..4f98c9634 100644 +---- a/surefire-extensions-api/src/test/java/org/apache/maven/plugin/surefire/extensions/CommandlineExecutorTest.java +-+++ b/surefire-extensions-api/src/test/java/org/apache/maven/plugin/surefire/extensions/CommandlineExecutorTest.java +-@@ -24,7 +24,7 @@ +- import org.apache.maven.surefire.extensions.util.CommandlineStreams; +- import org.apache.maven.surefire.extensions.util.CountdownCloseable; +- import org.apache.maven.surefire.extensions.util.LineConsumerThread; +--import org.apache.maven.surefire.shared.utils.cli.Commandline; +-+import org.apache.maven.shared.utils.cli.Commandline; +- import org.junit.After; +- import org.junit.Before; +- import org.junit.Test; +-@@ -32,7 +32,7 @@ +- import java.io.Closeable; +- import java.nio.file.Paths; +- +--import static org.apache.maven.surefire.shared.lang3.SystemUtils.IS_OS_WINDOWS; +-+import static org.apache.commons.lang3.SystemUtils.IS_OS_WINDOWS; +- import static org.assertj.core.api.Assertions.assertThat; +- import static org.assertj.core.util.Files.delete; +- import static org.mockito.ArgumentMatchers.contains; +-diff --git a/surefire-providers/common-java5/src/main/java/org/apache/maven/surefire/report/SmartStackTraceParser.java b/surefire-providers/common-java5/src/main/java/org/apache/maven/surefire/report/SmartStackTraceParser.java +-index 3770f2bab..4e3396a4e 100644 +---- a/surefire-providers/common-java5/src/main/java/org/apache/maven/surefire/report/SmartStackTraceParser.java +-+++ b/surefire-providers/common-java5/src/main/java/org/apache/maven/surefire/report/SmartStackTraceParser.java +-@@ -27,8 +27,8 @@ +- +- import static java.util.Arrays.asList; +- import static java.util.Collections.reverse; +--import static org.apache.maven.surefire.shared.utils.StringUtils.chompLast; +--import static org.apache.maven.surefire.shared.utils.StringUtils.isNotEmpty; +-+import static org.apache.maven.shared.utils.StringUtils.chompLast; +-+import static org.apache.maven.shared.utils.StringUtils.isNotEmpty; +- +- /** +- * @author Kristian Rosenvold +-diff --git a/surefire-providers/common-junit4/src/main/java/org/apache/maven/surefire/common/junit4/JUnit4RunListenerFactory.java b/surefire-providers/common-junit4/src/main/java/org/apache/maven/surefire/common/junit4/JUnit4RunListenerFactory.java +-index f1f54e076..d6478f3c4 100644 +---- a/surefire-providers/common-junit4/src/main/java/org/apache/maven/surefire/common/junit4/JUnit4RunListenerFactory.java +-+++ b/surefire-providers/common-junit4/src/main/java/org/apache/maven/surefire/common/junit4/JUnit4RunListenerFactory.java +-@@ -26,7 +26,7 @@ +- +- import org.junit.runner.notification.RunListener; +- +--import static org.apache.maven.surefire.shared.utils.StringUtils.isNotBlank; +-+import static org.apache.maven.shared.utils.StringUtils.isNotBlank; +- +- /** +- * @author Kristian Rosenvold +-diff --git a/surefire-providers/common-junit48/src/main/java/org/apache/maven/surefire/common/junit48/FilterFactory.java b/surefire-providers/common-junit48/src/main/java/org/apache/maven/surefire/common/junit48/FilterFactory.java +-index c532404e5..5f3400e26 100644 +---- a/surefire-providers/common-junit48/src/main/java/org/apache/maven/surefire/common/junit48/FilterFactory.java +-+++ b/surefire-providers/common-junit48/src/main/java/org/apache/maven/surefire/common/junit48/FilterFactory.java +-@@ -32,7 +32,7 @@ +- +- import static org.apache.maven.surefire.api.booter.ProviderParameterNames.TESTNG_EXCLUDEDGROUPS_PROP; +- import static org.apache.maven.surefire.api.booter.ProviderParameterNames.TESTNG_GROUPS_PROP; +--import static org.apache.maven.surefire.shared.utils.StringUtils.isNotBlank; +-+import static org.apache.maven.shared.utils.StringUtils.isNotBlank; +- +- /** +- * @author Todd Lipcon +-diff --git a/surefire-providers/common-junit48/src/test/java/org/apache/maven/surefire/common/junit48/FilterFactoryTest.java b/surefire-providers/common-junit48/src/test/java/org/apache/maven/surefire/common/junit48/FilterFactoryTest.java +-index a69d87007..f3c41ef3f 100644 +---- a/surefire-providers/common-junit48/src/test/java/org/apache/maven/surefire/common/junit48/FilterFactoryTest.java +-+++ b/surefire-providers/common-junit48/src/test/java/org/apache/maven/surefire/common/junit48/FilterFactoryTest.java +-@@ -19,7 +19,7 @@ +- * under the License. +- */ +- +--import org.apache.maven.surefire.shared.utils.io.MatchPatterns; +-+import org.apache.maven.shared.utils.io.MatchPatterns; +- import org.apache.maven.surefire.common.junit48.tests.pt.PT; +- import org.apache.maven.surefire.api.testset.ResolvedTest; +- import org.apache.maven.surefire.api.testset.TestListResolver; +-diff --git a/surefire-providers/surefire-junit-platform/src/main/java/org/apache/maven/surefire/junitplatform/JUnitPlatformProvider.java b/surefire-providers/surefire-junit-platform/src/main/java/org/apache/maven/surefire/junitplatform/JUnitPlatformProvider.java +-index ad2ec944d..5022107a5 100644 +---- a/surefire-providers/surefire-junit-platform/src/main/java/org/apache/maven/surefire/junitplatform/JUnitPlatformProvider.java +-+++ b/surefire-providers/surefire-junit-platform/src/main/java/org/apache/maven/surefire/junitplatform/JUnitPlatformProvider.java +-@@ -34,7 +34,7 @@ +- import static org.apache.maven.surefire.api.report.RunMode.RERUN_TEST_AFTER_FAILURE; +- import static org.apache.maven.surefire.api.testset.TestListResolver.optionallyWildcardFilter; +- import static org.apache.maven.surefire.api.util.TestsToRun.fromClass; +--import static org.apache.maven.surefire.shared.utils.StringUtils.isBlank; +-+import static org.apache.maven.shared.utils.StringUtils.isBlank; +- import static org.junit.platform.engine.discovery.DiscoverySelectors.selectClass; +- import static org.junit.platform.engine.discovery.DiscoverySelectors.selectUniqueId; +- import static org.junit.platform.launcher.core.LauncherDiscoveryRequestBuilder.request; +-@@ -60,7 +60,7 @@ +- import org.apache.maven.surefire.api.util.ScanResult; +- import org.apache.maven.surefire.api.util.SurefireReflectionException; +- import org.apache.maven.surefire.api.util.TestsToRun; +--import org.apache.maven.surefire.shared.utils.StringUtils; +-+import org.apache.maven.shared.utils.StringUtils; +- import org.junit.platform.engine.DiscoverySelector; +- import org.junit.platform.engine.Filter; +- import org.junit.platform.launcher.EngineFilter; +-diff --git a/surefire-providers/surefire-junit-platform/src/main/java/org/apache/maven/surefire/junitplatform/RunListenerAdapter.java b/surefire-providers/surefire-junit-platform/src/main/java/org/apache/maven/surefire/junitplatform/RunListenerAdapter.java +-index aeb24576e..3fd39d4b3 100644 +---- a/surefire-providers/surefire-junit-platform/src/main/java/org/apache/maven/surefire/junitplatform/RunListenerAdapter.java +-+++ b/surefire-providers/surefire-junit-platform/src/main/java/org/apache/maven/surefire/junitplatform/RunListenerAdapter.java +-@@ -22,7 +22,7 @@ +- import static java.util.Collections.emptyMap; +- import static java.util.stream.Collectors.joining; +- import static org.apache.maven.surefire.api.util.internal.ObjectUtils.systemProps; +--import static org.apache.maven.surefire.shared.lang3.StringUtils.isNotBlank; +-+import static org.apache.commons.lang3.StringUtils.isNotBlank; +- import static org.junit.platform.engine.TestExecutionResult.Status.FAILED; +- +- import java.util.Map; +-diff --git a/surefire-providers/surefire-junit3/src/test/java/org/apache/maven/surefire/junit/JUnitTestSetTest.java b/surefire-providers/surefire-junit3/src/test/java/org/apache/maven/surefire/junit/JUnitTestSetTest.java +-index 417511a72..6593fbd4a 100644 +---- a/surefire-providers/surefire-junit3/src/test/java/org/apache/maven/surefire/junit/JUnitTestSetTest.java +-+++ b/surefire-providers/surefire-junit3/src/test/java/org/apache/maven/surefire/junit/JUnitTestSetTest.java +-@@ -36,8 +36,8 @@ +- import java.util.ArrayList; +- import java.util.List; +- +--import static org.apache.maven.surefire.shared.lang3.JavaVersion.JAVA_17; +--import static org.apache.maven.surefire.shared.lang3.JavaVersion.JAVA_RECENT; +-+import static org.apache.commons.lang3.JavaVersion.JAVA_17; +-+import static org.apache.commons.lang3.JavaVersion.JAVA_RECENT; +- +- /** +- * +-diff --git a/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGDirectoryTestSuite.java b/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGDirectoryTestSuite.java +-index e9ede9d15..8d56b5653 100644 +---- a/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGDirectoryTestSuite.java +-+++ b/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGDirectoryTestSuite.java +-@@ -34,7 +34,7 @@ +- +- import static java.util.Collections.singleton; +- import static org.apache.maven.surefire.testng.TestNGExecutor.run; +--import static org.apache.maven.surefire.shared.utils.StringUtils.isBlank; +-+import static org.apache.maven.shared.utils.StringUtils.isBlank; +- +- /** +- * Test suite for TestNG based on a directory of Java test classes. Can also execute JUnit tests. +-diff --git a/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGExecutor.java b/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGExecutor.java +-index 07d3ad33c..ba5610bb6 100644 +---- a/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGExecutor.java +-+++ b/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGExecutor.java +-@@ -29,7 +29,7 @@ +- import org.apache.maven.surefire.testng.utils.Stoppable; +- import org.apache.maven.surefire.api.testset.TestListResolver; +- import org.apache.maven.surefire.api.testset.TestSetFailedException; +--import org.apache.maven.surefire.shared.utils.StringUtils; +-+import org.apache.maven.shared.utils.StringUtils; +- import org.testng.ITestNGListener; +- import org.testng.TestNG; +- import org.testng.annotations.Test; +--- +-2.35.1 +- +diff --git a/project/maven-surefire.properties b/project/maven-surefire.properties +index e78136e..52be8fe 100644 +--- a/project/maven-surefire.properties ++++ b/project/maven-surefire.properties +@@ -1,3 +1,3 @@ + url=https://github.com/apache/maven-surefire.git + ref=surefire-@.@.@-@@ +-version=3.0.0~M6 ++version=3.0.0~M3 +diff --git a/project/maven-surefire.xml b/project/maven-surefire.xml +index 83633d3..089e5c6 100644 +--- a/project/maven-surefire.xml ++++ b/project/maven-surefire.xml +@@ -14,8 +14,6 @@ + + surefire-api/src/main/java + surefire-booter/src/main/java +- surefire-extensions-api/src/main/java +- surefire-extensions-spi/src/main/java + surefire-logger-api/src/main/java + surefire-providers/common-java5/src/main/java + surefire-providers/common-junit3/src/main/java +@@ -30,6 +28,7 @@ + org/apache/maven/surefire/common/junit48/FilterFactory + org/apache/maven/surefire/common/junit48/GroupMatcherCategoryFilter + org/apache/maven/surefire/testng/utils/GroupMatcherMethodSelector ++ surefire-api/src/main/resources + + + +@@ -50,8 +49,6 @@ + maven-artifact + asm + plexus-java +- commons-compress +- plexus-component-annotations + + + src/main/java +@@ -61,7 +58,6 @@ + + maven-surefire-plugin + +- + + + +-- +2.35.1 + diff --git a/javapackages-bootstrap.spec b/javapackages-bootstrap.spec index acb7889..cb9a93e 100644 --- a/javapackages-bootstrap.spec +++ b/javapackages-bootstrap.spec @@ -148,6 +148,7 @@ 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 Provides: bundled(ant) = 1.10.12 Provides: bundled(apache-parent) = 26 @@ -216,7 +217,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~M6 +Provides: bundled(maven-surefire) = 3.0.0~M3 Provides: bundled(maven-verifier) = 1.7.2 Provides: bundled(maven-wagon) = 3.5.1 Provides: bundled(maven) = 3.8.5 @@ -297,6 +298,7 @@ do done %patch0 -p1 +%patch1 -p1 for patch_path in patches/*/* do diff --git a/sources b/sources index c2d4507..e11279c 100644 --- a/sources +++ b/sources @@ -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) = 96b4f2457e78bc272d6054a17b3b27ec7204bcc5c16e83564fc2abeb17214e5810f91f25cf3b172a5e750dfa72b4c3bc0dac861d9751c8db73190480e3acaff7 +SHA512 (maven-surefire.tar.xz) = f2069b89a5d5d8e335ab10b227973b3c43e58deaa006b9c4eb4419aaab5c4eee0159dbc8448f8df26fe3c8c00017bf5535b6a6fea962fbbfc2b2b808b1444264 SHA512 (maven-verifier.tar.xz) = 74977699bf37a9c0929a9583c57128b6c58376953248c16b3aa40f836613e7f0caba0229f5a6d622f814b7d4a94fd201034be7c98d8f9568f93269beccb3ae95 SHA512 (maven-wagon.tar.xz) = abac6ca4ec8b813a7829dea5b90c67938d0c23a03dd24b08b64df005cf5cf113ab0806501a61faa41331f2b399decb1f5259a01fe0ecc4aab4d349dcaa9b1553 SHA512 (maven.tar.xz) = dca267003c12bfbde23bdf5b0a3f90351ba79e7a4a5b3fd7e062441c5b94909043791bc4c2ccd4313c72ddd280502361bd53106b4fc99c6b1cc3fd2c07d4b74c From c2e09f71c8387d5ae8c8031ba8620ce5e2165022 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 13 May 2022 14:18:51 +0200 Subject: [PATCH 38/77] Remove mojo-parent dependency on junit-bom --- ...e-maven-surefire-to-version-3.0.0-M6.patch | 2 +- ...-mojo-parent-dependency-on-junit-bom.patch | 49 +++++++++++++++++++ javapackages-bootstrap.spec | 2 + 3 files changed, 52 insertions(+), 1 deletion(-) create mode 100644 0002-Remove-mojo-parent-dependency-on-junit-bom.patch diff --git a/0001-Revert-Update-maven-surefire-to-version-3.0.0-M6.patch b/0001-Revert-Update-maven-surefire-to-version-3.0.0-M6.patch index 9ce5f87..38c1726 100644 --- a/0001-Revert-Update-maven-surefire-to-version-3.0.0-M6.patch +++ b/0001-Revert-Update-maven-surefire-to-version-3.0.0-M6.patch @@ -1,7 +1,7 @@ From ed96595dda4b84370b88d7f784c0c69d243c3595 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 13 May 2022 13:53:32 +0200 -Subject: [PATCH] Revert "Update maven-surefire to version 3.0.0~M6" +Subject: [PATCH 1/2] Revert "Update maven-surefire to version 3.0.0~M6" This reverts commit 50c1e58288a8834aab84b1d370565e7b907cee1d. --- diff --git a/0002-Remove-mojo-parent-dependency-on-junit-bom.patch b/0002-Remove-mojo-parent-dependency-on-junit-bom.patch new file mode 100644 index 0000000..ae17435 --- /dev/null +++ b/0002-Remove-mojo-parent-dependency-on-junit-bom.patch @@ -0,0 +1,49 @@ +From 60154680d275ef707d7a3a9f32721b02e38199cd Mon Sep 17 00:00:00 2001 +From: Mikolaj Izdebski +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 ++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 @@ ++ 4.13.2 ++ test ++ ++- ++- org.junit ++- junit-bom ++- ${junit5.version} ++- pom ++- import ++- ++ ++ org.apache.maven.plugin-tools ++ maven-plugin-annotations ++-- ++2.35.1 ++ +-- +2.35.1 + diff --git a/javapackages-bootstrap.spec b/javapackages-bootstrap.spec index cb9a93e..a894680 100644 --- a/javapackages-bootstrap.spec +++ b/javapackages-bootstrap.spec @@ -149,6 +149,7 @@ 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 @@ -299,6 +300,7 @@ done %patch0 -p1 %patch1 -p1 +%patch2 -p1 for patch_path in patches/*/* do From 24bfb113aa103fdc89d7b4f27c76c50e9621b735 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 6 Jun 2022 07:19:12 +0200 Subject: [PATCH 39/77] Drop build-requires on javapackages-generators --- javapackages-bootstrap.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/javapackages-bootstrap.spec b/javapackages-bootstrap.spec index a894680..9711030 100644 --- a/javapackages-bootstrap.spec +++ b/javapackages-bootstrap.spec @@ -17,7 +17,7 @@ Name: javapackages-bootstrap Version: 1.7.0 -Release: 1%{?dist} +Release: 2%{?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 @@ -262,7 +262,6 @@ Provides: bundled(xz-java) = 1.9 BuildRequires: byaccj BuildRequires: java-17-openjdk-devel -BuildRequires: javapackages-generators Requires: bash Requires: coreutils @@ -350,6 +349,9 @@ echo '%%jpb_env PATH=/usr/libexec/javapackages-bootstrap:$PATH' >%{buildroot}%{_ %doc AUTHORS %changelog +* Mon Jun 06 2022 Mikolaj Izdebski - 1.7.0-2 +- Drop build-requires on javapackages-generators + * Fri May 13 2022 Mikolaj Izdebski - 1.7.0-1 - Update to upstream version 1.7.0 From 17394a79fda4debdc985c7b1fb11a3160d2575a2 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 7 Jun 2022 10:33:39 +0200 Subject: [PATCH 40/77] Use C.UTF-8 locale instead of C.utf8 While both C.UTF-8 and C.utf8 work in Fedora and RHEL, only C.UTF-8 seems to work in Mageia. --- javapackages-bootstrap.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/javapackages-bootstrap.spec b/javapackages-bootstrap.spec index 9711030..02ce9cd 100644 --- a/javapackages-bootstrap.spec +++ b/javapackages-bootstrap.spec @@ -314,7 +314,7 @@ do done %build -export LC_ALL=C.utf8 +export LC_ALL=C.UTF-8 JAVA_HOME=%{javaHomePath} ./mbi.sh build -parallel %install From e8684079a1670db5aa943ae300d587257120e553 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 14 Jun 2022 08:12:52 +0200 Subject: [PATCH 41/77] Add openjdk8 subpackage --- javapackages-bootstrap.spec | 27 +++++++++++++++++++++++---- toolchains-openjdk8.xml | 11 +++++++++++ 2 files changed, 34 insertions(+), 4 deletions(-) create mode 100644 toolchains-openjdk8.xml diff --git a/javapackages-bootstrap.spec b/javapackages-bootstrap.spec index 02ce9cd..da3808d 100644 --- a/javapackages-bootstrap.spec +++ b/javapackages-bootstrap.spec @@ -17,7 +17,7 @@ Name: javapackages-bootstrap Version: 1.7.0 -Release: 2%{?dist} +Release: 3%{?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 @@ -31,6 +31,8 @@ Source0: https://github.com/fedora-java/javapackages-bootstrap/releases/d # License breakdown Source1: javapackages-bootstrap-PACKAGE-LICENSING +Source101: toolchains-openjdk8.xml + # To obtain the following sources: # tar -xf ${name}-${version}.tar.xz # pushd ${name}-${version} @@ -268,6 +270,8 @@ Requires: coreutils Requires: java-17-openjdk-devel Requires: procps-ng +Requires: javapackages-common + %description In a nutshell, Java Packages Bootstrap (JPB) is a standalone build of all Java software packages that are required for Java Packages Tools (JPT) to work. @@ -285,12 +289,20 @@ depend on JPB for everything, without depending on any other Java packages. For example, JPB contains embedded version of XMvn, removing dependency of JPT on XMvn, allowing JPT to be used before one builds XMvn package. +%package openjdk8 +Summary: OpenJDK 8 toolchain for Java Packages Bootstrap +Requires: %{name} +Requires: java-1.8.0-openjdk-devel + +%description openjdk8 +OpenJDK 8 toolchain for Java Packages Bootstrap. + %prep %setup -q # leave out the first source as it has already been extracted # leave out licensing breakdown file -other_sources=$(echo %{sources} | cut -d' ' -f3-) +other_sources=$(echo %{sources} | cut -d' ' -f4-) for source in ${other_sources} do @@ -328,8 +340,8 @@ JAVA_HOME=%{javaHomePath} ./mbi.sh dist \ -launchersPath=%{launchersPath} \ -licensesPath=%{_licensedir}/%{name} \ -# Use toolchains.xml provided by javapackages-tools -rm %{buildroot}%{mavenHomePath}/conf/toolchains.xml +# Use custom toolchains.xml +cp -p %{SOURCE101} %{buildroot}%{mavenHomePath}/conf/toolchains.xml install -d -m 755 %{buildroot}%{_rpmmacrodir} echo '%%jpb_env PATH=/usr/libexec/javapackages-bootstrap:$PATH' >%{buildroot}%{_rpmmacrodir}/macros.%{name} @@ -339,16 +351,23 @@ echo '%%jpb_env PATH=/usr/libexec/javapackages-bootstrap:$PATH' >%{buildroot}%{_ %files %{mavenHomePath} +%exclude %{mavenHomePath}/conf/toolchains.xml %{metadataPath}/* %{artifactsPath}/* %{launchersPath}/* %{_rpmmacrodir} +%files openjdk8 +%{mavenHomePath}/conf/toolchains.xml + %license %{_licensedir}/%{name} %doc README.md %doc AUTHORS %changelog +* Tue Jun 14 2022 Mikolaj Izdebski - 1.7.0-3 +- Add openjdk8 toolchain subpackage + * Mon Jun 06 2022 Mikolaj Izdebski - 1.7.0-2 - Drop build-requires on javapackages-generators diff --git a/toolchains-openjdk8.xml b/toolchains-openjdk8.xml new file mode 100644 index 0000000..25d130f --- /dev/null +++ b/toolchains-openjdk8.xml @@ -0,0 +1,11 @@ + + + jdk + + xmvn + + + /usr/lib/jvm/java-1.8.0-openjdk + + + From 4cba018d0f42d75a7d74e774ecccb8c06bd3b779 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 22 Jun 2022 08:32:21 +0200 Subject: [PATCH 42/77] Update to upstream version 1.7.1 --- .gitignore | 1 + ...e-maven-surefire-to-version-3.0.0-M6.patch | 1910 ----------------- ...-mojo-parent-dependency-on-junit-bom.patch | 49 - javapackages-bootstrap.spec | 13 +- sources | 6 +- 5 files changed, 10 insertions(+), 1969 deletions(-) delete mode 100644 0001-Revert-Update-maven-surefire-to-version-3.0.0-M6.patch delete mode 100644 0002-Remove-mojo-parent-dependency-on-junit-bom.patch diff --git a/.gitignore b/.gitignore index 95c3bb9..26aa478 100644 --- a/.gitignore +++ b/.gitignore @@ -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 diff --git a/0001-Revert-Update-maven-surefire-to-version-3.0.0-M6.patch b/0001-Revert-Update-maven-surefire-to-version-3.0.0-M6.patch deleted file mode 100644 index 38c1726..0000000 --- a/0001-Revert-Update-maven-surefire-to-version-3.0.0-M6.patch +++ /dev/null @@ -1,1910 +0,0 @@ -From ed96595dda4b84370b88d7f784c0c69d243c3595 Mon Sep 17 00:00:00 2001 -From: Mikolaj Izdebski -Date: Fri, 13 May 2022 13:53:32 +0200 -Subject: [PATCH 1/2] Revert "Update maven-surefire to version 3.0.0~M6" - -This reverts commit 50c1e58288a8834aab84b1d370565e7b907cee1d. ---- - mbi/dist/metadata.txt | 28 +- - ...0.patch => 0001-Port-to-TestNG-6.11.patch} | 28 +- - ...2-Port-to-current-maven-shared-utils.patch | 72 + - ...003-Disable-JUnit-4.8-test-grouping.patch} | 31 +- - .../0003-Port-to-JUnit-5.8.1.patch | 71 - - ...004-Port-to-maven-shared-utils-3.3.3.patch | 59 + - .../0004-Unshade-dependencies.patch | 1392 ----------------- - project/maven-surefire.properties | 2 +- - project/maven-surefire.xml | 6 +- - 9 files changed, 173 insertions(+), 1516 deletions(-) - rename patches/maven-surefire/{0001-Port-to-TestNG-7.4.0.patch => 0001-Port-to-TestNG-6.11.patch} (83%) - create mode 100644 patches/maven-surefire/0002-Port-to-current-maven-shared-utils.patch - rename patches/maven-surefire/{0002-Disable-JUnit-4.8-test-grouping.patch => 0003-Disable-JUnit-4.8-test-grouping.patch} (87%) - delete mode 100644 patches/maven-surefire/0003-Port-to-JUnit-5.8.1.patch - create mode 100644 patches/maven-surefire/0004-Port-to-maven-shared-utils-3.3.3.patch - delete mode 100644 patches/maven-surefire/0004-Unshade-dependencies.patch - -diff --git a/mbi/dist/metadata.txt b/mbi/dist/metadata.txt -index 84aa01f..1b949de 100644 ---- a/mbi/dist/metadata.txt -+++ b/mbi/dist/metadata.txt -@@ -615,7 +615,6 @@ MOD maven-surefire - DEP org.apache.maven.surefire surefire-api - ART org.apache.maven.surefire surefire-junit3 - DEP org.apache.maven.surefire common-junit3 -- DEP org.apache.maven.surefire common-java5 - DEP org.apache.maven.surefire surefire-api - ART org.apache.maven.surefire surefire-junit4 - DEP org.apache.maven.surefire common-junit4 -@@ -633,40 +632,33 @@ MOD maven-surefire - DEP org.apache.maven.surefire common-java5 - DEP org.apache.maven.surefire surefire-testng-utils - DEP org.apache.maven.surefire surefire-api -- ART org.apache.maven.surefire surefire-shared-utils -- DEP org.apache.maven.shared maven-shared-utils -- DEP commons-io commons-io -- DEP org.apache.commons commons-lang3 -- DEP org.apache.commons commons-compress - ART org.apache.maven.surefire surefire-logger-api - ART org.apache.maven.surefire surefire-api - DEP org.apache.maven.surefire surefire-logger-api -- DEP org.apache.maven.surefire surefire-shared-utils -- ART org.apache.maven.surefire surefire-extensions-api -- DEP org.apache.maven.surefire surefire-shared-utils -- ART org.apache.maven.surefire surefire-extensions-spi -- DEP org.apache.maven.surefire surefire-api -+ DEP org.apache.maven.shared maven-shared-utils - ART org.apache.maven.surefire surefire-booter - DEP org.apache.maven.surefire surefire-api -- DEP org.apache.maven.surefire surefire-extensions-spi -+ DEP org.apache.commons commons-lang3 -+ DEP commons-io commons-io - ART org.apache.maven.surefire common-java5 -- DEP org.apache.maven.surefire surefire-shared-utils -+ DEP org.apache.maven.shared maven-shared-utils - DEP org.apache.maven.surefire surefire-api - MOD maven-surefire-plugin - ART org.apache.maven.plugins maven-surefire-plugin - DEP org.apache.maven.surefire maven-surefire-common - ART org.apache.maven.plugins maven-failsafe-plugin - DEP org.apache.maven.surefire maven-surefire-common -+ DEP org.apache.maven.shared maven-shared-utils -+ DEP org.apache.commons commons-lang3 -+ DEP commons-io commons-io - ART org.apache.maven.surefire maven-surefire-common - DEP org.apache.maven.surefire surefire-api -- DEP org.apache.maven.surefire surefire-extensions-api - DEP org.apache.maven.surefire surefire-booter - DEP org.apache.maven.shared maven-common-artifact-filters -- DEP org.apache.maven.shared maven-shared-utils -- DEP org.apache.maven maven-model -- DEP org.eclipse.sisu org.eclipse.sisu.plexus - DEP org.codehaus.plexus plexus-java -- DEP org.apache.maven.surefire surefire-shared-utils -+ DEP org.apache.maven.shared maven-shared-utils -+ DEP commons-io commons-io -+ DEP org.apache.commons commons-lang3 - MOD maven-verifier - ART org.apache.maven.shared maven-verifier - DEP org.apache.maven.shared maven-shared-utils -diff --git a/patches/maven-surefire/0001-Port-to-TestNG-7.4.0.patch b/patches/maven-surefire/0001-Port-to-TestNG-6.11.patch -similarity index 83% -rename from patches/maven-surefire/0001-Port-to-TestNG-7.4.0.patch -rename to patches/maven-surefire/0001-Port-to-TestNG-6.11.patch -index e6b6bd0..a1ca19d 100644 ---- a/patches/maven-surefire/0001-Port-to-TestNG-7.4.0.patch -+++ b/patches/maven-surefire/0001-Port-to-TestNG-6.11.patch -@@ -1,4 +1,4 @@ --From 219edb700ee76f167a329e5bab64feceee5b6b8f Mon Sep 17 00:00:00 2001 -+From 14196b58bc1d96d76636914b575dc22b7cc94b1a Mon Sep 17 00:00:00 2001 - From: Mikolaj Izdebski - Date: Mon, 10 Jul 2017 10:37:50 +0200 - Subject: [PATCH 1/4] Port to TestNG 7.4.0 -@@ -11,21 +11,21 @@ Forwarded: no - 3 files changed, 3 insertions(+), 4 deletions(-) - - diff --git a/surefire-providers/surefire-testng/pom.xml b/surefire-providers/surefire-testng/pom.xml --index ece647d6a..682f296e6 100644 -+index 49e75b6ea..a9db4a8d9 100644 - --- a/surefire-providers/surefire-testng/pom.xml - +++ b/surefire-providers/surefire-testng/pom.xml - @@ -51,8 +51,7 @@ -- -- org.testng -- testng --- 5.10 --- jdk15 --+ 7.4.0 -- provided -- -- -+ -+ org.testng -+ testng -+- 5.10 -+- jdk15 -++ 7.4.0 -+ provided -+ -+ - diff --git a/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/AbstractDirectConfigurator.java b/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/AbstractDirectConfigurator.java --index ed918f538..c4a0cd19d 100644 -+index e9667316b..7021ef561 100644 - --- a/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/AbstractDirectConfigurator.java - +++ b/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/AbstractDirectConfigurator.java - @@ -63,7 +63,7 @@ public void configure( TestNG testng, Map options ) -@@ -38,7 +38,7 @@ index ed918f538..c4a0cd19d 100644 - - @Override - diff --git a/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/TestNGMapConfigurator.java b/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/TestNGMapConfigurator.java --index 6caf82459..2d988381f 100755 -+index b6bf82e03..8164f4f4d 100755 - --- a/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/TestNGMapConfigurator.java - +++ b/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/TestNGMapConfigurator.java - @@ -68,7 +68,7 @@ public void configure( XmlSuite suite, Map options ) -@@ -51,5 +51,5 @@ index 6caf82459..2d988381f 100755 - } - - -- --2.35.1 -+2.31.1 - -diff --git a/patches/maven-surefire/0002-Port-to-current-maven-shared-utils.patch b/patches/maven-surefire/0002-Port-to-current-maven-shared-utils.patch -new file mode 100644 -index 0000000..e793bd2 ---- /dev/null -+++ b/patches/maven-surefire/0002-Port-to-current-maven-shared-utils.patch -@@ -0,0 +1,72 @@ -+From 6a94c7674f844218752827f2b62de629691fcf39 Mon Sep 17 00:00:00 2001 -+From: Michael Simacek -+Date: Fri, 16 Mar 2018 13:45:01 +0100 -+Subject: [PATCH 2/3] Port to current maven-shared-utils -+ -+Forwarded: no -+ -+--- -+ .../plugin/surefire/report/StatelessXmlReporter.java | 12 ++++++------ -+ 1 file changed, 6 insertions(+), 6 deletions(-) -+ -+diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/StatelessXmlReporter.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/StatelessXmlReporter.java -+index b89c4e9b0..8cf0b60c3 100644 -+--- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/StatelessXmlReporter.java -++++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/StatelessXmlReporter.java -+@@ -326,7 +326,7 @@ private static File getReportFile( ReportEntry report, File reportsDirectory, St -+ } -+ -+ private static void startTestElement( XMLWriter ppw, WrappedReportEntry report, String reportNameSuffix, -+- String timeAsString ) -++ String timeAsString ) throws IOException -+ { -+ ppw.startElement( "testcase" ); -+ ppw.addAttribute( "name", report.getReportName() ); -+@@ -349,7 +349,7 @@ private static void startTestElement( XMLWriter ppw, WrappedReportEntry report, -+ } -+ -+ private void createTestSuiteElement( XMLWriter ppw, WrappedReportEntry report, TestSetStats testSetStats, -+- String timeAsString ) -++ String timeAsString ) throws IOException -+ { -+ ppw.startElement( "testsuite" ); -+ -+@@ -377,7 +377,7 @@ private void createTestSuiteElement( XMLWriter ppw, WrappedReportEntry report, T -+ -+ private static void getTestProblems( OutputStreamWriter outputStreamWriter, XMLWriter ppw, -+ WrappedReportEntry report, boolean trimStackTrace, OutputStream fw, -+- String testErrorType, boolean createOutErrElementsInside ) -++ String testErrorType, boolean createOutErrElementsInside ) throws IOException -+ { -+ ppw.startElement( testErrorType ); -+ -+@@ -434,7 +434,7 @@ private static void getTestProblems( OutputStreamWriter outputStreamWriter, XMLW -+ -+ // Create system-out and system-err elements -+ private static void createOutErrElements( OutputStreamWriter outputStreamWriter, XMLWriter ppw, -+- WrappedReportEntry report, OutputStream fw ) -++ WrappedReportEntry report, OutputStream fw ) throws IOException -+ { -+ EncodingOutputStream eos = new EncodingOutputStream( fw ); -+ addOutputStreamElement( outputStreamWriter, eos, ppw, report.getStdout(), "system-out" ); -+@@ -444,7 +444,7 @@ private static void createOutErrElements( OutputStreamWriter outputStreamWriter, -+ private static void addOutputStreamElement( OutputStreamWriter outputStreamWriter, -+ EncodingOutputStream eos, XMLWriter xmlWriter, -+ Utf8RecodingDeferredFileOutputStream utf8RecodingDeferredFileOutputStream, -+- String name ) -++ String name ) throws IOException -+ { -+ if ( utf8RecodingDeferredFileOutputStream != null && utf8RecodingDeferredFileOutputStream.getByteCount() > 0 ) -+ { -+@@ -474,7 +474,7 @@ private static void addOutputStreamElement( OutputStreamWriter outputStreamWrite -+ * -+ * @param xmlWriter The test suite to report to -+ */ -+- private static void showProperties( XMLWriter xmlWriter, Map systemProperties ) -++ private static void showProperties( XMLWriter xmlWriter, Map systemProperties ) throws IOException -+ { -+ xmlWriter.startElement( "properties" ); -+ for ( final Entry entry : systemProperties.entrySet() ) -+-- -+2.25.2 -+ -diff --git a/patches/maven-surefire/0002-Disable-JUnit-4.8-test-grouping.patch b/patches/maven-surefire/0003-Disable-JUnit-4.8-test-grouping.patch -similarity index 87% -rename from patches/maven-surefire/0002-Disable-JUnit-4.8-test-grouping.patch -rename to patches/maven-surefire/0003-Disable-JUnit-4.8-test-grouping.patch -index 21fb0de..c80ab94 100644 ---- a/patches/maven-surefire/0002-Disable-JUnit-4.8-test-grouping.patch -+++ b/patches/maven-surefire/0003-Disable-JUnit-4.8-test-grouping.patch -@@ -1,36 +1,37 @@ --From 68a41813f6fad18f5192932d5c07d89ef090643c Mon Sep 17 00:00:00 2001 -+From 21890515f3eeba73065b79b6a65678ec1e2a821d Mon Sep 17 00:00:00 2001 - From: Mikolaj Izdebski - Date: Mon, 27 Apr 2020 10:45:30 +0200 --Subject: [PATCH 2/4] Disable JUnit 4.8 test grouping -+Subject: [PATCH 3/3] Disable JUnit 4.8 test grouping - - Forwarded: not-needed -+ - --- - .../surefire/junitcore/JUnitCoreProvider.java | 25 +++-------------- - .../maven/surefire/testng/TestNGExecutor.java | 27 ------------------- - 2 files changed, 3 insertions(+), 49 deletions(-) - - diff --git a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/JUnitCoreProvider.java b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/JUnitCoreProvider.java --index 7ed483426..1ffd826db 100644 -+index 7c74e8b86..c86bb276c 100644 - --- a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/JUnitCoreProvider.java - +++ b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/JUnitCoreProvider.java --@@ -40,7 +40,6 @@ -+@@ -25,7 +25,6 @@ - import org.apache.maven.surefire.common.junit4.JUnit4RunListener; - import org.apache.maven.surefire.common.junit4.JUnitTestFailureListener; - import org.apache.maven.surefire.common.junit4.Notifier; - -import org.apache.maven.surefire.common.junit48.FilterFactory; - import org.apache.maven.surefire.common.junit48.JUnit48Reflector; - import org.apache.maven.surefire.common.junit48.JUnit48TestChecker; -- import org.junit.runner.Description; --@@ -51,6 +50,7 @@ -- import static org.apache.maven.surefire.api.report.RunMode.RERUN_TEST_AFTER_FAILURE; -- import static org.apache.maven.surefire.api.testset.TestListResolver.optionallyWildcardFilter; -- import static org.apache.maven.surefire.api.util.TestsToRun.fromClass; -+ import org.apache.maven.surefire.providerapi.AbstractProvider; -+@@ -47,6 +46,7 @@ -+ import java.util.concurrent.ConcurrentHashMap; -+ -+ import static org.apache.maven.surefire.booter.CommandReader.getReader; - +import static org.apache.maven.surefire.common.junit4.JUnit4ProviderUtil.createMatchAnyDescriptionFilter; - import static org.apache.maven.surefire.common.junit4.JUnit4ProviderUtil.generateFailingTestDescriptions; - import static org.apache.maven.surefire.common.junit4.JUnit4RunListenerFactory.createCustomListeners; - import static org.apache.maven.surefire.common.junit4.Notifier.pureNotifier; - @@ -126,7 +126,7 @@ public RunResult invoke( Object forkTestSet ) -- Notifier notifier = new Notifier( listener, getSkipAfterFailureCount() ); -+ new Notifier( createRunListener( reporterFactory, consoleStream ), getSkipAfterFailureCount() ); - // startCapture() called in createRunListener() in prior to setTestsToRun() - - - Filter filter = jUnit48Reflector.isJUnit48Available() ? createJUnit48Filter() : null; -@@ -38,7 +39,7 @@ index 7ed483426..1ffd826db 100644 - - if ( testsToRun == null ) - { --@@ -169,8 +169,7 @@ public RunResult invoke( Object forkTestSet ) -+@@ -168,8 +168,7 @@ public RunResult invoke( Object forkTestSet ) - { - Set failures = generateFailingTestDescriptions( testFailureListener.getAllFailures() ); - testFailureListener.reset(); -@@ -48,7 +49,7 @@ index 7ed483426..1ffd826db 100644 - rerunCore.execute( testsToRun, failureDescriptionFilter ); - } - } --@@ -271,24 +270,6 @@ private boolean isParallelTypes() -+@@ -270,24 +269,6 @@ private boolean isParallelTypes() - return jUnitCoreParameters.isParallelClasses() || jUnitCoreParameters.isParallelSuites(); - } - -@@ -74,10 +75,10 @@ index 7ed483426..1ffd826db 100644 - { - TestsToRun scanned = scanResult.applyFilter( scannerFilter, testClassLoader ); - diff --git a/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGExecutor.java b/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGExecutor.java --index 7ed1719a8..07d3ad33c 100644 -+index 6bc30a300..05c55f55a 100644 - --- a/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGExecutor.java - +++ b/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGExecutor.java --@@ -278,36 +278,9 @@ private static XmlMethodSelector createMethodNameFilteringSelector( TestListReso -+@@ -237,36 +237,9 @@ private static XmlMethodSelector createMethodNameFilteringSelector( TestListReso - private static XmlMethodSelector createGroupMatchingSelector( Map options ) - throws TestSetFailedException - { -@@ -115,5 +116,5 @@ index 7ed1719a8..07d3ad33c 100644 - - static void run( List suiteFiles, String testSourceDirectory, - -- --2.35.1 -+2.25.2 - -diff --git a/patches/maven-surefire/0003-Port-to-JUnit-5.8.1.patch b/patches/maven-surefire/0003-Port-to-JUnit-5.8.1.patch -deleted file mode 100644 -index 80e492f..0000000 ---- a/patches/maven-surefire/0003-Port-to-JUnit-5.8.1.patch -+++ /dev/null -@@ -1,71 +0,0 @@ --From 3d0dad9c32ce059b8f562e3c5bd754f6b3394a74 Mon Sep 17 00:00:00 2001 --From: Mikolaj Izdebski --Date: Fri, 22 Apr 2022 00:28:31 +0200 --Subject: [PATCH 3/4] Port to JUnit 5.8.1 -- --Forwarded: no ----- -- pom.xml | 6 +++--- -- .../maven/surefire/junitplatform/LazyLauncher.java | 14 ++++++++++++++ -- 2 files changed, 17 insertions(+), 3 deletions(-) -- --diff --git a/pom.xml b/pom.xml --index c261bf3c2..a75e156ce 100644 ----- a/pom.xml --+++ b/pom.xml --@@ -250,17 +250,17 @@ -- -- org.junit.platform -- junit-platform-launcher --- 1.3.2 --+ 1.8.1 -- -- -- org.junit.jupiter -- junit-jupiter-engine --- 5.3.2 --+ 5.8.1 -- -- -- org.junit.jupiter -- junit-jupiter-params --- 5.3.2 --+ 5.8.1 -- -- -- org.mockito --diff --git a/surefire-providers/surefire-junit-platform/src/main/java/org/apache/maven/surefire/junitplatform/LazyLauncher.java b/surefire-providers/surefire-junit-platform/src/main/java/org/apache/maven/surefire/junitplatform/LazyLauncher.java --index 6a1a3b3b3..dee110e3c 100644 ----- a/surefire-providers/surefire-junit-platform/src/main/java/org/apache/maven/surefire/junitplatform/LazyLauncher.java --+++ b/surefire-providers/surefire-junit-platform/src/main/java/org/apache/maven/surefire/junitplatform/LazyLauncher.java --@@ -21,6 +21,7 @@ -- -- import org.apache.maven.surefire.api.util.ReflectionUtils; -- import org.junit.platform.launcher.Launcher; --+import org.junit.platform.launcher.LauncherDiscoveryListener; -- import org.junit.platform.launcher.LauncherDiscoveryRequest; -- import org.junit.platform.launcher.TestExecutionListener; -- import org.junit.platform.launcher.TestPlan; --@@ -55,6 +56,19 @@ public void execute( LauncherDiscoveryRequest launcherDiscoveryRequest, -- launcher().execute( launcherDiscoveryRequest, testExecutionListeners ); -- } -- --+ @Override --+ public void execute( TestPlan testPlan, --+ TestExecutionListener... testExecutionListeners ) --+ { --+ launcher().execute( testPlan, testExecutionListeners ); --+ } --+ --+ @Override --+ public void registerLauncherDiscoveryListeners( LauncherDiscoveryListener... launcherDiscoveryListeners ) --+ { --+ launcher().registerLauncherDiscoveryListeners( launcherDiscoveryListeners ); --+ } --+ -- private Launcher launcher() -- { -- if ( launcher == null ) ---- --2.35.1 -- -diff --git a/patches/maven-surefire/0004-Port-to-maven-shared-utils-3.3.3.patch b/patches/maven-surefire/0004-Port-to-maven-shared-utils-3.3.3.patch -new file mode 100644 -index 0000000..cec5651 ---- /dev/null -+++ b/patches/maven-surefire/0004-Port-to-maven-shared-utils-3.3.3.patch -@@ -0,0 +1,59 @@ -+From 980a109bd3607f1035097d6ad923f82cc58c95d2 Mon Sep 17 00:00:00 2001 -+From: Marian Koncek -+Date: Fri, 11 Sep 2020 12:17:15 +0200 -+Subject: [PATCH] Port to maven-shared-utils 3.3.3 -+ -+Forwarded: no -+ -+--- -+ .../DefaultForkConfiguration.java | 26 ++++++++++++------- -+ 1 file changed, 16 insertions(+), 10 deletions(-) -+ -+diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/DefaultForkConfiguration.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/DefaultForkConfiguration.java -+index fa9945123..ed75ecdff 100644 -+--- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/DefaultForkConfiguration.java -++++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/DefaultForkConfiguration.java -+@@ -42,6 +42,8 @@ -+ import static org.apache.maven.plugin.surefire.SurefireHelper.replaceThreadNumberPlaceholders; -+ import static org.apache.maven.surefire.booter.Classpath.join; -+ -++import org.apache.maven.shared.utils.cli.CommandLineException; -++ -+ /** -+ * Basic framework which constructs CLI. -+ * -+@@ -131,17 +133,21 @@ public OutputStreamFlushableCommandline createCommandLine( @Nonnull StartupConfi -+ -+ cli.setExecutable( getJdkForTests().getJvmExecutable() ); -+ -+- String jvmArgLine = newJvmArgLine( forkNumber ); -+- if ( !jvmArgLine.isEmpty() ) -+- { -+- cli.createArg() -+- .setLine( jvmArgLine ); -+- } -++ try { -++ String jvmArgLine = newJvmArgLine( forkNumber ); -++ if ( !jvmArgLine.isEmpty() ) -++ { -++ cli.createArg() -++ .setLine( jvmArgLine ); -++ } -+ -+- if ( getDebugLine() != null && !getDebugLine().isEmpty() ) -+- { -+- cli.createArg() -+- .setLine( getDebugLine() ); -++ if ( getDebugLine() != null && !getDebugLine().isEmpty() ) -++ { -++ cli.createArg() -++ .setLine( getDebugLine() ); -++ } -++ } catch (CommandLineException ex) { -++ throw new SurefireBooterForkException("", ex); -+ } -+ -+ resolveClasspath( cli, findStartClass( config ), config, dumpLogDirectory ); -+-- -+2.26.2 -+ -diff --git a/patches/maven-surefire/0004-Unshade-dependencies.patch b/patches/maven-surefire/0004-Unshade-dependencies.patch -deleted file mode 100644 -index f8feb71..0000000 ---- a/patches/maven-surefire/0004-Unshade-dependencies.patch -+++ /dev/null -@@ -1,1392 +0,0 @@ --From 8977691d5ff2842b06c5cfa5b8a2b14b3e7d684a Mon Sep 17 00:00:00 2001 --From: Mikolaj Izdebski --Date: Thu, 12 May 2022 06:57:19 +0200 --Subject: [PATCH 4/4] Unshade dependencies -- --Patch can be generated with: -- -- find -name \*.java -exec sed \ -- -e s/org.apache.maven.surefire.shared.utils/org.apache.maven.shared.utils/ \ -- -e s/org.apache.maven.surefire.shared.io/org.apache.commons.io/ \ -- -e s/org.apache.maven.surefire.shared.lang3/org.apache.commons.lang3/ \ -- -e s/org.apache.maven.surefire.shared.compress/org.apache.commons.compress/ \ -- -i \{\} \; -- --Forwarded: not-needed ----- -- .../maven/plugin/failsafe/VerifyMojo.java | 2 +- -- .../util/FailsafeSummaryXmlUtils.java | 8 +++---- -- .../plugin/surefire/AbstractSurefireMojo.java | 22 +++++++++---------- -- .../surefire/StartupReportConfiguration.java | 2 +- -- .../maven/plugin/surefire/SurefireHelper.java | 2 +- -- .../plugin/surefire/SurefireProperties.java | 2 +- -- .../maven/plugin/surefire/TestClassPath.java | 2 +- -- .../ClasspathForkConfiguration.java | 2 +- -- .../DefaultForkConfiguration.java | 2 +- -- .../surefire/booterclient/ForkStarter.java | 4 ++-- -- .../JarManifestForkConfiguration.java | 8 +++---- -- .../ModularClasspathForkConfiguration.java | 2 +- -- .../lazytestprovider/Commandline.java | 6 ++--- -- .../extensions/SurefireForkChannel.java | 4 ++-- -- .../surefire/report/ConsoleReporter.java | 4 ++-- -- .../report/DefaultReporterFactory.java | 4 ++-- -- .../plugin/surefire/report/FileReporter.java | 2 +- -- .../surefire/report/FileReporterUtils.java | 2 +- -- .../surefire/report/StatelessXmlReporter.java | 6 ++--- -- .../plugin/surefire/report/TestSetStats.java | 4 ++-- -- .../surefire/report/WrappedReportEntry.java | 2 +- -- .../plugin/surefire/util/FileScanner.java | 2 +- -- .../plugin/surefire/util/ScannerUtil.java | 2 +- -- .../surefire/util/SpecificFileFilter.java | 2 +- -- .../maven/surefire/stream/EventDecoder.java | 2 +- -- .../surefire/AbstractSurefireMojoTest.java | 6 ++--- -- .../AbstractSurefireMojoToolchainsTest.java | 2 +- -- .../plugin/surefire/SurefireHelperTest.java | 2 +- -- ...DeserializerProviderConfigurationTest.java | 2 +- -- ...rDeserializerStartupConfigurationTest.java | 2 +- -- .../booterclient/ForkConfigurationTest.java | 16 +++++++------- -- .../booterclient/ForkStarterTest.java | 6 ++--- -- ...ModularClasspathForkConfigurationTest.java | 2 +- -- .../lazytestprovider/CommandlineTest.java | 4 ++-- -- .../report/DefaultReporterFactoryTest.java | 2 +- -- .../report/StatelessXmlReporterTest.java | 6 ++--- -- .../surefire/report/TestSetStatsTest.java | 2 +- -- .../runorder/RunEntryStatisticsMapTest.java | 2 +- -- .../StatelessTestsetInfoReporterTest.java | 2 +- -- .../report/ConsoleOutputFileReporterTest.java | 2 +- -- .../maven/surefire/api/booter/Command.java | 2 +- -- .../api/filter/SpecificTestClassFilter.java | 2 +- -- .../report/LegacyPojoStackTraceWriter.java | 2 +- -- .../api/stream/AbstractStreamDecoder.java | 2 +- -- .../surefire/api/testset/ResolvedTest.java | 14 ++++++------ -- .../api/testset/TestListResolver.java | 10 ++++----- -- .../api/util/DefaultDirectoryScanner.java | 4 ++-- -- .../api/util/internal/ClassMethod.java | 2 +- -- .../api/util/internal/ObjectUtils.java | 4 ++-- -- .../api/util/internal/ObjectUtilsTest.java | 4 ++-- -- .../maven/surefire/booter/CommandReader.java | 4 ++-- -- .../maven/surefire/booter/ForkedBooter.java | 2 +- -- .../maven/surefire/booter/PpidChecker.java | 12 +++++----- -- .../surefire/booter/ProcessCheckerType.java | 2 +- -- .../surefire/booter/PropertiesWrapper.java | 2 +- -- .../booter/SurefireBooterForkException.java | 2 +- -- .../maven/surefire/booter/SystemUtils.java | 14 ++++++------ -- .../booter/stream/CommandDecoder.java | 2 +- -- .../surefire/booter/ForkedBooterMockTest.java | 2 +- -- .../surefire/booter/ForkedBooterTest.java | 2 +- -- .../booter/IsolatedClassLoaderTest.java | 2 +- -- .../surefire/booter/NewClassLoaderRunner.java | 2 +- -- .../surefire/booter/PpidCheckerTest.java | 4 ++-- -- .../surefire/booter/SystemUtilsTest.java | 12 +++++----- -- .../extensions/ConsoleOutputReporter.java | 2 +- -- .../extensions/StatelessReporter.java | 2 +- -- .../extensions/util/CommandlineExecutor.java | 8 +++---- -- .../extensions/CommandlineExecutorTest.java | 4 ++-- -- .../report/SmartStackTraceParser.java | 4 ++-- -- .../junit4/JUnit4RunListenerFactory.java | 2 +- -- .../common/junit48/FilterFactory.java | 2 +- -- .../common/junit48/FilterFactoryTest.java | 2 +- -- .../junitplatform/JUnitPlatformProvider.java | 4 ++-- -- .../junitplatform/RunListenerAdapter.java | 2 +- -- .../surefire/junit/JUnitTestSetTest.java | 4 ++-- -- .../testng/TestNGDirectoryTestSuite.java | 2 +- -- .../maven/surefire/testng/TestNGExecutor.java | 2 +- -- 77 files changed, 154 insertions(+), 154 deletions(-) -- --diff --git a/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/VerifyMojo.java b/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/VerifyMojo.java --index 9c91bf70d..f3832727f 100644 ----- a/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/VerifyMojo.java --+++ b/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/VerifyMojo.java --@@ -39,7 +39,7 @@ -- import java.util.Collection; -- -- import static org.apache.maven.plugin.surefire.SurefireHelper.reportExecution; ---import static org.apache.maven.surefire.shared.utils.StringUtils.capitalizeFirstLetter; --+import static org.apache.maven.shared.utils.StringUtils.capitalizeFirstLetter; -- import static org.apache.maven.surefire.api.suite.RunResult.noTestsRun; -- -- /** --diff --git a/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/util/FailsafeSummaryXmlUtils.java b/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/util/FailsafeSummaryXmlUtils.java --index 03e340ca7..b77c1b515 100644 ----- a/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/util/FailsafeSummaryXmlUtils.java --+++ b/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/util/FailsafeSummaryXmlUtils.java --@@ -19,7 +19,7 @@ -- * under the License. -- */ -- ---import org.apache.maven.surefire.shared.io.IOUtils; --+import org.apache.commons.io.IOUtils; -- import org.apache.maven.surefire.api.suite.RunResult; -- import org.w3c.dom.Node; -- import org.xml.sax.InputSource; --@@ -39,9 +39,9 @@ -- import static java.lang.String.format; -- import static java.nio.charset.StandardCharsets.UTF_8; -- import static javax.xml.xpath.XPathConstants.NODE; ---import static org.apache.maven.surefire.shared.lang3.StringEscapeUtils.escapeXml10; ---import static org.apache.maven.surefire.shared.lang3.StringEscapeUtils.unescapeXml; ---import static org.apache.maven.surefire.shared.utils.StringUtils.isBlank; --+import static org.apache.commons.lang3.StringEscapeUtils.escapeXml10; --+import static org.apache.commons.lang3.StringEscapeUtils.unescapeXml; --+import static org.apache.maven.shared.utils.StringUtils.isBlank; -- -- /** -- * @author Tibor Digana (tibor17) --diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java --index 1937d75c7..7a7973069 100644 ----- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java --+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java --@@ -110,7 +110,7 @@ -- import org.apache.maven.surefire.providerapi.ProviderDetector; -- import org.apache.maven.surefire.providerapi.ProviderInfo; -- import org.apache.maven.surefire.providerapi.ProviderRequirements; ---import org.apache.maven.surefire.shared.utils.io.FileUtils; --+import org.apache.maven.shared.utils.io.FileUtils; -- import org.apache.maven.toolchain.DefaultToolchain; -- import org.apache.maven.toolchain.Toolchain; -- import org.apache.maven.toolchain.ToolchainManager; --@@ -147,16 +147,16 @@ -- import static org.apache.maven.surefire.booter.SystemUtils.isJava9AtLeast; -- import static org.apache.maven.surefire.booter.SystemUtils.toJdkHomeFromJvmExec; -- import static org.apache.maven.surefire.booter.SystemUtils.toJdkVersionFromReleaseFile; ---import static org.apache.maven.surefire.shared.lang3.JavaVersion.JAVA_RECENT; ---import static org.apache.maven.surefire.shared.lang3.StringUtils.substringBeforeLast; ---import static org.apache.maven.surefire.shared.lang3.SystemUtils.IS_OS_WINDOWS; ---import static org.apache.maven.surefire.shared.utils.StringUtils.capitalizeFirstLetter; ---import static org.apache.maven.surefire.shared.utils.StringUtils.isEmpty; ---import static org.apache.maven.surefire.shared.utils.StringUtils.isNotBlank; ---import static org.apache.maven.surefire.shared.utils.StringUtils.isNotEmpty; ---import static org.apache.maven.surefire.shared.utils.StringUtils.split; ---import static org.apache.maven.surefire.shared.utils.cli.ShutdownHookUtils.addShutDownHook; ---import static org.apache.maven.surefire.shared.utils.cli.ShutdownHookUtils.removeShutdownHook; --+import static org.apache.commons.lang3.JavaVersion.JAVA_RECENT; --+import static org.apache.commons.lang3.StringUtils.substringBeforeLast; --+import static org.apache.commons.lang3.SystemUtils.IS_OS_WINDOWS; --+import static org.apache.maven.shared.utils.StringUtils.capitalizeFirstLetter; --+import static org.apache.maven.shared.utils.StringUtils.isEmpty; --+import static org.apache.maven.shared.utils.StringUtils.isNotBlank; --+import static org.apache.maven.shared.utils.StringUtils.isNotEmpty; --+import static org.apache.maven.shared.utils.StringUtils.split; --+import static org.apache.maven.shared.utils.cli.ShutdownHookUtils.addShutDownHook; --+import static org.apache.maven.shared.utils.cli.ShutdownHookUtils.removeShutdownHook; -- -- /** -- * Abstract base class for running tests using Surefire. --diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/StartupReportConfiguration.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/StartupReportConfiguration.java --index a15f8027e..02ec44b8e 100644 ----- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/StartupReportConfiguration.java --+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/StartupReportConfiguration.java --@@ -41,7 +41,7 @@ -- import java.util.concurrent.ConcurrentHashMap; -- -- import static java.nio.charset.StandardCharsets.UTF_8; ---import static org.apache.maven.surefire.shared.lang3.StringUtils.trimToNull; --+import static org.apache.commons.lang3.StringUtils.trimToNull; -- import static org.apache.maven.plugin.surefire.SurefireHelper.replaceForkThreadsInPath; -- import static org.apache.maven.plugin.surefire.report.ConsoleReporter.BRIEF; -- import static org.apache.maven.plugin.surefire.report.ConsoleReporter.PLAIN; --diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/SurefireHelper.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/SurefireHelper.java --index 582245104..e9b7cfcf3 100644 ----- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/SurefireHelper.java --+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/SurefireHelper.java --@@ -39,7 +39,7 @@ -- -- import static java.util.Collections.unmodifiableList; -- import static org.apache.maven.surefire.api.util.internal.DumpFileUtils.newFormattedDateFileName; ---import static org.apache.maven.surefire.shared.lang3.SystemUtils.IS_OS_WINDOWS; --+import static org.apache.commons.lang3.SystemUtils.IS_OS_WINDOWS; -- import static org.apache.maven.surefire.api.booter.DumpErrorSingleton.DUMPSTREAM_FILE_EXT; -- import static org.apache.maven.surefire.api.booter.DumpErrorSingleton.DUMP_FILE_EXT; -- import static org.apache.maven.surefire.api.cli.CommandLineOption.LOGGING_LEVEL_DEBUG; --diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/SurefireProperties.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/SurefireProperties.java --index 2f5e91945..fb78191a8 100644 ----- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/SurefireProperties.java --+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/SurefireProperties.java --@@ -35,7 +35,7 @@ -- -- import org.apache.maven.surefire.booter.Classpath; -- import org.apache.maven.surefire.booter.KeyValueSource; ---import org.apache.maven.surefire.shared.utils.StringUtils; --+import org.apache.maven.shared.utils.StringUtils; -- -- import static java.util.Arrays.asList; -- import static java.util.Map.Entry; --diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/TestClassPath.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/TestClassPath.java --index ba7336177..3a37816c0 100644 ----- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/TestClassPath.java --+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/TestClassPath.java --@@ -29,7 +29,7 @@ -- import java.util.Map; -- -- import static java.util.Collections.addAll; ---import static org.apache.maven.surefire.shared.utils.StringUtils.split; --+import static org.apache.maven.shared.utils.StringUtils.split; -- -- final class TestClassPath -- { --diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ClasspathForkConfiguration.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ClasspathForkConfiguration.java --index 1ce9d617e..54f9fa9b1 100644 ----- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ClasspathForkConfiguration.java --+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ClasspathForkConfiguration.java --@@ -32,7 +32,7 @@ -- import java.util.Map; -- import java.util.Properties; -- ---import static org.apache.maven.surefire.shared.utils.StringUtils.join; --+import static org.apache.maven.shared.utils.StringUtils.join; -- -- /** -- * @author Tibor Digana (tibor17) --diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/DefaultForkConfiguration.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/DefaultForkConfiguration.java --index c7a77e77f..8932ba4a7 100644 ----- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/DefaultForkConfiguration.java --+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/DefaultForkConfiguration.java --@@ -28,7 +28,7 @@ -- import org.apache.maven.surefire.booter.SurefireBooterForkException; -- import org.apache.maven.surefire.extensions.ForkNodeFactory; -- import org.apache.maven.surefire.api.util.internal.ImmutableMap; ---import org.apache.maven.surefire.shared.utils.cli.CommandLineException; --+import org.apache.maven.shared.utils.cli.CommandLineException; -- -- import javax.annotation.Nonnull; -- import javax.annotation.Nullable; --diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkStarter.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkStarter.java --index 17b0e5412..796235c6d 100644 ----- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkStarter.java --+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkStarter.java --@@ -97,8 +97,8 @@ -- import static org.apache.maven.plugin.surefire.booterclient.lazytestprovider.TestLessInputStream.TestLessInputStreamBuilder; -- import static org.apache.maven.surefire.booter.SystemPropertyManager.writePropertiesFile; -- import static org.apache.maven.surefire.api.cli.CommandLineOption.SHOW_ERRORS; ---import static org.apache.maven.surefire.shared.utils.cli.ShutdownHookUtils.addShutDownHook; ---import static org.apache.maven.surefire.shared.utils.cli.ShutdownHookUtils.removeShutdownHook; --+import static org.apache.maven.shared.utils.cli.ShutdownHookUtils.addShutDownHook; --+import static org.apache.maven.shared.utils.cli.ShutdownHookUtils.removeShutdownHook; -- import static org.apache.maven.surefire.api.suite.RunResult.SUCCESS; -- import static org.apache.maven.surefire.api.suite.RunResult.failure; -- import static org.apache.maven.surefire.api.suite.RunResult.timeout; --diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/JarManifestForkConfiguration.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/JarManifestForkConfiguration.java --index 50caad055..40a57f797 100644 ----- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/JarManifestForkConfiguration.java --+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/JarManifestForkConfiguration.java --@@ -19,9 +19,9 @@ -- * under the License. -- */ -- ---import org.apache.maven.surefire.shared.compress.archivers.zip.Zip64Mode; ---import org.apache.maven.surefire.shared.compress.archivers.zip.ZipArchiveEntry; ---import org.apache.maven.surefire.shared.compress.archivers.zip.ZipArchiveOutputStream; --+import org.apache.commons.compress.archivers.zip.Zip64Mode; --+import org.apache.commons.compress.archivers.zip.ZipArchiveEntry; --+import org.apache.commons.compress.archivers.zip.ZipArchiveOutputStream; -- import org.apache.maven.plugin.surefire.booterclient.lazytestprovider.Commandline; -- import org.apache.maven.plugin.surefire.booterclient.output.InPluginProcessDumpSingleton; -- import org.apache.maven.plugin.surefire.log.api.ConsoleLogger; --@@ -54,7 +54,7 @@ -- import static org.apache.maven.plugin.surefire.SurefireHelper.escapeToPlatformPath; -- import static org.apache.maven.plugin.surefire.booterclient.JarManifestForkConfiguration.ClasspathElementUri.absolute; -- import static org.apache.maven.plugin.surefire.booterclient.JarManifestForkConfiguration.ClasspathElementUri.relative; ---import static org.apache.maven.surefire.shared.utils.StringUtils.isNotBlank; --+import static org.apache.maven.shared.utils.StringUtils.isNotBlank; -- import static org.apache.maven.surefire.api.util.internal.StringUtils.NL; -- -- /** --diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ModularClasspathForkConfiguration.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ModularClasspathForkConfiguration.java --index 0fd796cdd..4ad180256 100644 ----- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ModularClasspathForkConfiguration.java --+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ModularClasspathForkConfiguration.java --@@ -46,7 +46,7 @@ -- import static java.io.File.pathSeparatorChar; -- import static org.apache.maven.plugin.surefire.SurefireHelper.escapeToPlatformPath; -- import static org.apache.maven.surefire.api.util.internal.StringUtils.NL; ---import static org.apache.maven.surefire.shared.utils.StringUtils.replace; --+import static org.apache.maven.shared.utils.StringUtils.replace; -- -- /** -- * @author Tibor Digana (tibor17) --diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/lazytestprovider/Commandline.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/lazytestprovider/Commandline.java --index bbc14bfe8..d01e48b18 100644 ----- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/lazytestprovider/Commandline.java --+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/lazytestprovider/Commandline.java --@@ -25,17 +25,17 @@ -- import java.util.Set; -- import java.util.concurrent.ConcurrentLinkedDeque; -- ---import org.apache.maven.surefire.shared.utils.cli.CommandLineUtils; --+import org.apache.maven.shared.utils.cli.CommandLineUtils; -- -- import static java.util.Collections.addAll; -- -- /** --- * A {@link org.apache.maven.surefire.shared.utils.cli.Commandline} implementation. --+ * A {@link org.apache.maven.shared.utils.cli.Commandline} implementation. -- * -- * @author Andreas Gudian -- */ -- public class Commandline --- extends org.apache.maven.surefire.shared.utils.cli.Commandline --+ extends org.apache.maven.shared.utils.cli.Commandline -- { -- private final Collection excludedEnvironmentVariables; -- private final Set addedEnvironmentVariables; --diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/extensions/SurefireForkChannel.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/extensions/SurefireForkChannel.java --index f0c5bbfef..a744f952a 100644 ----- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/extensions/SurefireForkChannel.java --+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/extensions/SurefireForkChannel.java --@@ -58,8 +58,8 @@ -- import static org.apache.maven.surefire.api.util.internal.Channels.newInputStream; -- import static org.apache.maven.surefire.api.util.internal.Channels.newOutputStream; -- import static org.apache.maven.surefire.api.util.internal.DaemonThreadFactory.newDaemonThreadFactory; ---import static org.apache.maven.surefire.shared.lang3.StringUtils.isBlank; ---import static org.apache.maven.surefire.shared.lang3.StringUtils.isNotBlank; --+import static org.apache.commons.lang3.StringUtils.isBlank; --+import static org.apache.commons.lang3.StringUtils.isNotBlank; -- -- /** -- * The TCP/IP server accepting only one client connection. The forked JVM connects to the server using the --diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/ConsoleReporter.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/ConsoleReporter.java --index 6541b05fb..00671663a 100644 ----- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/ConsoleReporter.java --+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/ConsoleReporter.java --@@ -22,14 +22,14 @@ -- import java.util.List; -- -- import org.apache.maven.plugin.surefire.log.api.ConsoleLogger; ---import org.apache.maven.surefire.shared.utils.logging.MessageBuilder; --+import org.apache.maven.shared.utils.logging.MessageBuilder; -- import org.apache.maven.plugin.surefire.log.api.Level; -- import org.apache.maven.surefire.extensions.StatelessTestsetInfoConsoleReportEventListener; -- import org.apache.maven.surefire.api.report.TestSetReportEntry; -- -- import static org.apache.maven.plugin.surefire.log.api.Level.resolveLevel; -- import static org.apache.maven.plugin.surefire.report.TestSetStats.concatenateWithTestGroup; ---import static org.apache.maven.surefire.shared.utils.logging.MessageUtils.buffer; --+import static org.apache.maven.shared.utils.logging.MessageUtils.buffer; -- -- /** -- * Base class for console reporters. --diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/DefaultReporterFactory.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/DefaultReporterFactory.java --index d45ae83cf..34f38b5a3 100644 ----- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/DefaultReporterFactory.java --+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/DefaultReporterFactory.java --@@ -24,7 +24,7 @@ -- import org.apache.maven.plugin.surefire.log.api.Level; -- import org.apache.maven.plugin.surefire.runorder.StatisticsReporter; -- import org.apache.maven.surefire.api.report.TestOutputReportEntry; ---import org.apache.maven.surefire.shared.utils.logging.MessageBuilder; --+import org.apache.maven.shared.utils.logging.MessageBuilder; -- import org.apache.maven.surefire.extensions.ConsoleOutputReportEventListener; -- import org.apache.maven.surefire.extensions.StatelessReportEventListener; -- import org.apache.maven.surefire.extensions.StatelessTestsetInfoConsoleReportEventListener; --@@ -55,7 +55,7 @@ -- import static org.apache.maven.plugin.surefire.report.ReportEntryType.ERROR; -- import static org.apache.maven.plugin.surefire.report.ReportEntryType.FAILURE; -- import static org.apache.maven.plugin.surefire.report.ReportEntryType.SUCCESS; ---import static org.apache.maven.surefire.shared.utils.logging.MessageUtils.buffer; --+import static org.apache.maven.shared.utils.logging.MessageUtils.buffer; -- import static org.apache.maven.surefire.api.util.internal.ObjectUtils.useNonNull; -- -- /** --diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/FileReporter.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/FileReporter.java --index b3410f70b..eafba006f 100644 ----- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/FileReporter.java --+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/FileReporter.java --@@ -32,7 +32,7 @@ -- import java.util.List; -- -- import static org.apache.maven.plugin.surefire.report.FileReporterUtils.stripIllegalFilenameChars; ---import static org.apache.maven.surefire.shared.utils.StringUtils.isNotBlank; --+import static org.apache.maven.shared.utils.StringUtils.isNotBlank; -- -- /** -- * Base class for file reporters. --diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/FileReporterUtils.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/FileReporterUtils.java --index 5ef061015..e27fe6d97 100644 ----- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/FileReporterUtils.java --+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/FileReporterUtils.java --@@ -19,7 +19,7 @@ -- * under the License. -- */ -- ---import static org.apache.maven.surefire.shared.lang3.SystemUtils.IS_OS_WINDOWS; --+import static org.apache.commons.lang3.SystemUtils.IS_OS_WINDOWS; -- -- /** -- * Utils class for file-based reporters --diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/StatelessXmlReporter.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/StatelessXmlReporter.java --index 45f1c5003..e27691278 100644 ----- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/StatelessXmlReporter.java --+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/StatelessXmlReporter.java --@@ -20,8 +20,8 @@ -- */ -- -- import org.apache.maven.plugin.surefire.booterclient.output.InPluginProcessDumpSingleton; ---import org.apache.maven.surefire.shared.utils.xml.PrettyPrintXMLWriter; ---import org.apache.maven.surefire.shared.utils.xml.XMLWriter; --+import org.apache.maven.shared.utils.xml.PrettyPrintXMLWriter; --+import org.apache.maven.shared.utils.xml.XMLWriter; -- import org.apache.maven.surefire.extensions.StatelessReportEventListener; -- import org.apache.maven.surefire.api.report.SafeThrowable; -- --@@ -47,7 +47,7 @@ -- import static org.apache.maven.plugin.surefire.report.FileReporterUtils.stripIllegalFilenameChars; -- import static org.apache.maven.plugin.surefire.report.ReportEntryType.SKIPPED; -- import static org.apache.maven.plugin.surefire.report.ReportEntryType.SUCCESS; ---import static org.apache.maven.surefire.shared.utils.StringUtils.isBlank; --+import static org.apache.maven.shared.utils.StringUtils.isBlank; -- -- @SuppressWarnings( { "javadoc", "checkstyle:javadoctype" } ) -- // CHECKSTYLE_OFF: LineLength --diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/TestSetStats.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/TestSetStats.java --index 869f58a5a..dcf6b0709 100644 ----- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/TestSetStats.java --+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/TestSetStats.java --@@ -19,7 +19,7 @@ -- * under the License. -- */ -- ---import org.apache.maven.surefire.shared.utils.logging.MessageBuilder; --+import org.apache.maven.shared.utils.logging.MessageBuilder; -- import org.apache.maven.surefire.api.report.ReportEntry; -- -- import java.util.ArrayList; --@@ -28,7 +28,7 @@ -- import java.util.Queue; -- import java.util.concurrent.ConcurrentLinkedQueue; -- ---import static org.apache.maven.surefire.shared.utils.logging.MessageUtils.buffer; --+import static org.apache.maven.shared.utils.logging.MessageUtils.buffer; -- import static org.apache.maven.surefire.api.report.CategorizedReportEntry.GROUP_PREFIX; -- -- /** --diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/WrappedReportEntry.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/WrappedReportEntry.java --index bc2fca0c5..1520caeb6 100644 ----- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/WrappedReportEntry.java --+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/WrappedReportEntry.java --@@ -31,7 +31,7 @@ -- import static java.util.Collections.unmodifiableMap; -- import static org.apache.maven.plugin.surefire.report.ReporterUtils.formatElapsedTime; -- import static org.apache.maven.surefire.api.util.internal.StringUtils.NL; ---import static org.apache.maven.surefire.shared.utils.StringUtils.isBlank; --+import static org.apache.maven.shared.utils.StringUtils.isBlank; -- -- /** -- * @author Kristian Rosenvold --diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/FileScanner.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/FileScanner.java --index 69a6945a9..4fc533d3f 100644 ----- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/FileScanner.java --+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/FileScanner.java --@@ -24,7 +24,7 @@ -- import java.io.File; -- import java.util.Collection; -- ---import static org.apache.maven.surefire.shared.utils.StringUtils.isBlank; --+import static org.apache.maven.shared.utils.StringUtils.isBlank; -- -- final class FileScanner -- { --diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/ScannerUtil.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/ScannerUtil.java --index afd9cf23e..8073907a8 100644 ----- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/ScannerUtil.java --+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/ScannerUtil.java --@@ -19,7 +19,7 @@ -- * under the License. -- */ -- ---import org.apache.maven.surefire.shared.lang3.StringUtils; --+import org.apache.commons.lang3.StringUtils; -- import javax.annotation.Nonnull; -- -- final class ScannerUtil --diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/SpecificFileFilter.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/SpecificFileFilter.java --index 00ea5990a..6b97b2f4f 100644 ----- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/SpecificFileFilter.java --+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/SpecificFileFilter.java --@@ -24,7 +24,7 @@ -- -- import javax.annotation.Nullable; -- ---import org.apache.maven.surefire.shared.utils.io.SelectorUtils; --+import org.apache.maven.shared.utils.io.SelectorUtils; -- -- import static org.apache.maven.plugin.surefire.util.ScannerUtil.convertSlashToSystemFileSeparator; -- --diff --git a/maven-surefire-common/src/main/java/org/apache/maven/surefire/stream/EventDecoder.java b/maven-surefire-common/src/main/java/org/apache/maven/surefire/stream/EventDecoder.java --index ea1188984..70ebd3c56 100644 ----- a/maven-surefire-common/src/main/java/org/apache/maven/surefire/stream/EventDecoder.java --+++ b/maven-surefire-common/src/main/java/org/apache/maven/surefire/stream/EventDecoder.java --@@ -72,7 +72,7 @@ -- import static org.apache.maven.surefire.api.stream.SegmentType.RUN_MODE; -- import static org.apache.maven.surefire.api.stream.SegmentType.STRING_ENCODING; -- import static org.apache.maven.surefire.api.stream.SegmentType.TEST_RUN_ID; ---import static org.apache.maven.surefire.shared.utils.cli.ShutdownHookUtils.addShutDownHook; --+import static org.apache.maven.shared.utils.cli.ShutdownHookUtils.addShutDownHook; -- -- /** -- * --diff --git a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/AbstractSurefireMojoTest.java b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/AbstractSurefireMojoTest.java --index ec00a22a4..7bd3154cb 100644 ----- a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/AbstractSurefireMojoTest.java --+++ b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/AbstractSurefireMojoTest.java --@@ -97,9 +97,9 @@ -- import static java.util.Collections.singletonList; -- import static org.apache.maven.artifact.versioning.VersionRange.createFromVersion; -- import static org.apache.maven.artifact.versioning.VersionRange.createFromVersionSpec; ---import static org.apache.maven.surefire.shared.lang3.JavaVersion.JAVA_9; ---import static org.apache.maven.surefire.shared.lang3.JavaVersion.JAVA_RECENT; ---import static org.apache.maven.surefire.shared.lang3.SystemUtils.IS_OS_WINDOWS; --+import static org.apache.commons.lang3.JavaVersion.JAVA_9; --+import static org.apache.commons.lang3.JavaVersion.JAVA_RECENT; --+import static org.apache.commons.lang3.SystemUtils.IS_OS_WINDOWS; -- import static org.assertj.core.api.Assertions.assertThat; -- import static org.codehaus.plexus.languages.java.jpms.ModuleNameSource.MODULEDESCRIPTOR; -- import static org.junit.Assert.fail; --diff --git a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/AbstractSurefireMojoToolchainsTest.java b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/AbstractSurefireMojoToolchainsTest.java --index 4ebe62a6e..6c5110f79 100644 ----- a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/AbstractSurefireMojoToolchainsTest.java --+++ b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/AbstractSurefireMojoToolchainsTest.java --@@ -21,7 +21,7 @@ -- -- import org.apache.maven.execution.MavenSession; -- import org.apache.maven.plugin.MojoFailureException; ---import org.apache.maven.surefire.shared.io.FilenameUtils; --+import org.apache.commons.io.FilenameUtils; -- import org.apache.maven.toolchain.Toolchain; -- import org.apache.maven.toolchain.ToolchainManager; -- import org.apache.maven.toolchain.java.DefaultJavaToolChain; --diff --git a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/SurefireHelperTest.java b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/SurefireHelperTest.java --index dbe2c3697..570adf32b 100644 ----- a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/SurefireHelperTest.java --+++ b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/SurefireHelperTest.java --@@ -40,7 +40,7 @@ -- import static java.util.Collections.singleton; -- import static org.apache.maven.plugin.surefire.SurefireHelper.escapeToPlatformPath; -- import static org.apache.maven.plugin.surefire.SurefireHelper.reportExecution; ---import static org.apache.maven.surefire.shared.lang3.SystemUtils.IS_OS_WINDOWS; --+import static org.apache.commons.lang3.SystemUtils.IS_OS_WINDOWS; -- import static org.assertj.core.api.Assertions.assertThat; -- import static org.hamcrest.Matchers.containsString; -- import static org.junit.Assume.assumeTrue; --diff --git a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/BooterDeserializerProviderConfigurationTest.java b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/BooterDeserializerProviderConfigurationTest.java --index 55f63f358..34c021269 100644 ----- a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/BooterDeserializerProviderConfigurationTest.java --+++ b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/BooterDeserializerProviderConfigurationTest.java --@@ -21,7 +21,7 @@ -- -- import junit.framework.Assert; -- import junit.framework.TestCase; ---import org.apache.maven.surefire.shared.io.FileUtils; --+import org.apache.commons.io.FileUtils; -- import org.apache.maven.surefire.booter.BooterDeserializer; -- import org.apache.maven.surefire.booter.ClassLoaderConfiguration; -- import org.apache.maven.surefire.booter.ClasspathConfiguration; --diff --git a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/BooterDeserializerStartupConfigurationTest.java b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/BooterDeserializerStartupConfigurationTest.java --index 9baf914af..a2041a541 100644 ----- a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/BooterDeserializerStartupConfigurationTest.java --+++ b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/BooterDeserializerStartupConfigurationTest.java --@@ -31,7 +31,7 @@ -- import org.apache.maven.surefire.booter.StartupConfiguration; -- import org.apache.maven.surefire.api.cli.CommandLineOption; -- import org.apache.maven.surefire.api.report.ReporterConfiguration; ---import org.apache.maven.surefire.shared.io.FileUtils; --+import org.apache.commons.io.FileUtils; -- import org.apache.maven.surefire.api.testset.DirectoryScannerParameters; -- import org.apache.maven.surefire.api.testset.RunOrderParameters; -- import org.apache.maven.surefire.api.testset.TestArtifactInfo; --diff --git a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/ForkConfigurationTest.java b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/ForkConfigurationTest.java --index d1771889e..89aeb679e 100644 ----- a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/ForkConfigurationTest.java --+++ b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/ForkConfigurationTest.java --@@ -31,7 +31,7 @@ -- import org.apache.maven.surefire.booter.StartupConfiguration; -- import org.apache.maven.surefire.booter.SurefireBooterForkException; -- import org.apache.maven.surefire.extensions.ForkNodeFactory; ---import org.apache.maven.surefire.shared.io.FileUtils; --+import org.apache.commons.io.FileUtils; -- import org.junit.After; -- import org.junit.Before; -- import org.junit.Test; --@@ -54,7 +54,7 @@ -- import static org.apache.maven.surefire.api.util.internal.StringUtils.NL; -- import static org.apache.maven.surefire.booter.Classpath.emptyClasspath; -- import static org.apache.maven.surefire.booter.ProcessCheckerType.ALL; ---import static org.apache.maven.surefire.shared.lang3.SystemUtils.IS_OS_WINDOWS; --+import static org.apache.commons.lang3.SystemUtils.IS_OS_WINDOWS; -- import static org.assertj.core.api.Assertions.assertThat; -- import static org.apache.commons.io.FileUtils.getTempDirectory; -- import static org.junit.Assert.assertEquals; --@@ -128,7 +128,7 @@ protected void resolveClasspath( @Nonnull Commandline cli, -- ClassLoaderConfiguration clc = new ClassLoaderConfiguration( true, true ); -- StartupConfiguration startup = new StartupConfiguration( "cls", cpConfig, clc, ALL, providerJpmsArgs ); -- --- org.apache.maven.surefire.shared.utils.cli.Commandline --+ org.apache.maven.shared.utils.cli.Commandline -- cli = config.createCommandLine( startup, 1, getTempDirectory() ); -- -- assertThat( cli.getEnvironmentVariables() ) --@@ -159,7 +159,7 @@ public void testCliArgs() throws Exception -- ClassLoaderConfiguration clc = new ClassLoaderConfiguration( true, true ); -- StartupConfiguration startup = new StartupConfiguration( "cls", cpConfig, clc, ALL, providerJpmsArgs ); -- --- org.apache.maven.surefire.shared.utils.cli.Commandline --+ org.apache.maven.shared.utils.cli.Commandline -- cli = config.createCommandLine( startup, 1, getTempDirectory() ); -- String cliAsString = cli.toString(); -- --@@ -237,7 +237,7 @@ protected void resolveClasspath( @Nonnull Commandline cli, -- assertThat( startup.isShadefire() ) -- .isFalse(); -- --- org.apache.maven.surefire.shared.utils.cli.Commandline --+ org.apache.maven.shared.utils.cli.Commandline -- cli = config.createCommandLine( startup, 1, getTempDirectory() ); -- -- assertThat( cli.toString() ) --@@ -259,7 +259,7 @@ public void testCreateCommandLine_UseSystemClassLoaderForkOnce_ShouldConstructMa -- StartupConfiguration startup = -- new StartupConfiguration( "", cpConfig, clc, ALL, Collections.emptyList() ); -- --- org.apache.maven.surefire.shared.utils.cli.Commandline --+ org.apache.maven.shared.utils.cli.Commandline -- cli = config.createCommandLine( startup, 1, getTempDirectory() ); -- -- String line = join( " ", cli.getCommandline() ); --@@ -281,7 +281,7 @@ public void testArglineWithNewline() -- StartupConfiguration startup = -- new StartupConfiguration( "", cpConfig, clc, ALL, Collections.emptyList() ); -- --- org.apache.maven.surefire.shared.utils.cli.Commandline --+ org.apache.maven.shared.utils.cli.Commandline -- commandLine = config.createCommandLine( startup, 1, getTempDirectory() ); -- assertThat( commandLine.toString() ).contains( IS_OS_WINDOWS ? "abc def" : "'abc' 'def'" ); -- } --@@ -298,7 +298,7 @@ public void testCurrentWorkingDirectoryPropagationIncludingForkNumberExpansion() -- StartupConfiguration startup = -- new StartupConfiguration( "", cpConfig, clc, ALL, Collections.emptyList() ); -- ForkConfiguration config = getForkConfiguration( cwd.getCanonicalFile() ); --- org.apache.maven.surefire.shared.utils.cli.Commandline --+ org.apache.maven.shared.utils.cli.Commandline -- commandLine = config.createCommandLine( startup, 1, getTempDirectory() ); -- -- File forkDirectory = new File( basedir, "fork_1" ); --diff --git a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/ForkStarterTest.java b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/ForkStarterTest.java --index ff04152a5..7b88ada69 100644 ----- a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/ForkStarterTest.java --+++ b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/ForkStarterTest.java --@@ -43,9 +43,9 @@ -- import org.apache.maven.surefire.booter.SurefireBooterForkException; -- import org.apache.maven.surefire.extensions.ForkNodeFactory; -- import org.apache.maven.surefire.api.report.ReporterConfiguration; ---import org.apache.maven.surefire.shared.compress.archivers.zip.Zip64Mode; ---import org.apache.maven.surefire.shared.compress.archivers.zip.ZipArchiveEntry; ---import org.apache.maven.surefire.shared.compress.archivers.zip.ZipArchiveOutputStream; --+import org.apache.commons.compress.archivers.zip.Zip64Mode; --+import org.apache.commons.compress.archivers.zip.ZipArchiveEntry; --+import org.apache.commons.compress.archivers.zip.ZipArchiveOutputStream; -- import org.junit.AfterClass; -- import org.junit.BeforeClass; -- import org.junit.Rule; --diff --git a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/ModularClasspathForkConfigurationTest.java b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/ModularClasspathForkConfigurationTest.java --index 668859185..bca3acd9c 100644 ----- a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/ModularClasspathForkConfigurationTest.java --+++ b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/ModularClasspathForkConfigurationTest.java --@@ -45,7 +45,7 @@ -- import static java.util.Arrays.asList; -- import static java.util.Collections.singleton; -- import static org.apache.maven.surefire.booter.Classpath.emptyClasspath; ---import static org.apache.maven.surefire.shared.utils.StringUtils.replace; --+import static org.apache.maven.shared.utils.StringUtils.replace; -- import static org.assertj.core.api.Assertions.assertThat; -- import static org.mockito.Mockito.mock; -- --diff --git a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/lazytestprovider/CommandlineTest.java b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/lazytestprovider/CommandlineTest.java --index 86d3f3c22..40ad62dd5 100644 ----- a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/lazytestprovider/CommandlineTest.java --+++ b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/lazytestprovider/CommandlineTest.java --@@ -19,11 +19,11 @@ -- * under the License. -- */ -- ---import org.apache.maven.surefire.shared.utils.cli.CommandLineException; --+import org.apache.maven.shared.utils.cli.CommandLineException; -- import org.assertj.core.api.Condition; -- import org.junit.Test; -- ---import static org.apache.maven.surefire.shared.lang3.SystemUtils.IS_OS_WINDOWS; --+import static org.apache.commons.lang3.SystemUtils.IS_OS_WINDOWS; -- import static org.assertj.core.api.Assertions.assertThat; -- -- /** --diff --git a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/report/DefaultReporterFactoryTest.java b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/report/DefaultReporterFactoryTest.java --index ded28a3d3..8d03ee1b7 100644 ----- a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/report/DefaultReporterFactoryTest.java --+++ b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/report/DefaultReporterFactoryTest.java --@@ -35,7 +35,7 @@ -- import org.apache.maven.plugin.surefire.log.api.ConsoleLogger; -- import org.apache.maven.surefire.api.report.TestOutputReportEntry; -- import org.apache.maven.surefire.api.report.TestReportListener; ---import org.apache.maven.surefire.shared.utils.logging.MessageUtils; --+import org.apache.maven.shared.utils.logging.MessageUtils; -- import org.apache.maven.surefire.report.RunStatistics; -- import org.apache.maven.surefire.api.report.SafeThrowable; -- import org.apache.maven.surefire.api.report.StackTraceWriter; --diff --git a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/report/StatelessXmlReporterTest.java b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/report/StatelessXmlReporterTest.java --index 8744c91f0..99d4dcfed 100644 ----- a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/report/StatelessXmlReporterTest.java --+++ b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/report/StatelessXmlReporterTest.java --@@ -24,8 +24,8 @@ -- import org.apache.maven.surefire.api.report.ReportEntry; -- import org.apache.maven.surefire.api.report.SimpleReportEntry; -- import org.apache.maven.surefire.api.report.StackTraceWriter; ---import org.apache.maven.surefire.shared.utils.xml.Xpp3Dom; ---import org.apache.maven.surefire.shared.utils.xml.Xpp3DomBuilder; --+import org.apache.maven.shared.utils.xml.Xpp3Dom; --+import org.apache.maven.shared.utils.xml.Xpp3DomBuilder; -- -- import java.io.ByteArrayOutputStream; -- import java.io.File; --@@ -49,7 +49,7 @@ -- import static org.apache.maven.surefire.api.report.RunMode.NORMAL_RUN; -- import static org.apache.maven.surefire.api.report.RunMode.RERUN_TEST_AFTER_FAILURE; -- import static org.apache.maven.surefire.api.util.internal.ObjectUtils.systemProps; ---import static org.apache.maven.surefire.shared.utils.StringUtils.isEmpty; --+import static org.apache.maven.shared.utils.StringUtils.isEmpty; -- import static org.assertj.core.api.Assertions.assertThat; -- import static org.mockito.Mockito.doThrow; -- import static org.mockito.Mockito.mock; --diff --git a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/report/TestSetStatsTest.java b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/report/TestSetStatsTest.java --index 0d9bd6a48..c26051c26 100644 ----- a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/report/TestSetStatsTest.java --+++ b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/report/TestSetStatsTest.java --@@ -26,7 +26,7 @@ -- import org.powermock.core.classloader.annotations.PowerMockIgnore; -- import org.powermock.modules.junit4.PowerMockRunner; -- ---import static org.apache.maven.surefire.shared.utils.logging.MessageUtils.buffer; --+import static org.apache.maven.shared.utils.logging.MessageUtils.buffer; -- import static org.assertj.core.api.Assertions.assertThat; -- import static org.mockito.Mockito.times; -- import static org.mockito.Mockito.verify; --diff --git a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/runorder/RunEntryStatisticsMapTest.java b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/runorder/RunEntryStatisticsMapTest.java --index 8f5f58054..86db1648d 100644 ----- a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/runorder/RunEntryStatisticsMapTest.java --+++ b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/runorder/RunEntryStatisticsMapTest.java --@@ -39,7 +39,7 @@ -- -- import static java.nio.charset.StandardCharsets.UTF_8; -- import static org.apache.maven.surefire.api.report.RunMode.NORMAL_RUN; ---import static org.apache.maven.surefire.shared.io.IOUtils.readLines; --+import static org.apache.commons.io.IOUtils.readLines; -- import static org.apache.maven.surefire.api.util.internal.StringUtils.NL; -- import static org.assertj.core.api.Assertions.assertThat; -- import static org.powermock.reflect.Whitebox.getInternalState; --diff --git a/maven-surefire-common/src/test/java/org/apache/maven/surefire/extensions/StatelessTestsetInfoReporterTest.java b/maven-surefire-common/src/test/java/org/apache/maven/surefire/extensions/StatelessTestsetInfoReporterTest.java --index 58d2803e8..3abdc2927 100644 ----- a/maven-surefire-common/src/test/java/org/apache/maven/surefire/extensions/StatelessTestsetInfoReporterTest.java --+++ b/maven-surefire-common/src/test/java/org/apache/maven/surefire/extensions/StatelessTestsetInfoReporterTest.java --@@ -27,7 +27,7 @@ -- import org.apache.maven.plugin.surefire.report.TestSetStats; -- import org.apache.maven.plugin.surefire.report.WrappedReportEntry; -- import org.apache.maven.surefire.api.report.TestSetReportEntry; ---import org.apache.maven.surefire.shared.utils.logging.MessageUtils; --+import org.apache.maven.shared.utils.logging.MessageUtils; -- import org.junit.Test; -- import org.junit.runner.RunWith; -- import org.mockito.ArgumentCaptor; --diff --git a/maven-surefire-common/src/test/java/org/apache/maven/surefire/report/ConsoleOutputFileReporterTest.java b/maven-surefire-common/src/test/java/org/apache/maven/surefire/report/ConsoleOutputFileReporterTest.java --index 6b0ee446a..71d70a7f4 100644 ----- a/maven-surefire-common/src/test/java/org/apache/maven/surefire/report/ConsoleOutputFileReporterTest.java --+++ b/maven-surefire-common/src/test/java/org/apache/maven/surefire/report/ConsoleOutputFileReporterTest.java --@@ -31,7 +31,7 @@ -- import org.apache.maven.surefire.api.report.SimpleReportEntry; -- import org.apache.maven.surefire.api.report.TestOutputReportEntry; -- import org.apache.maven.surefire.api.report.TestSetReportEntry; ---import org.apache.maven.surefire.shared.utils.io.FileUtils; --+import org.apache.maven.shared.utils.io.FileUtils; -- -- import static java.nio.charset.StandardCharsets.US_ASCII; -- import static org.apache.maven.surefire.api.report.RunMode.NORMAL_RUN; --diff --git a/surefire-api/src/main/java/org/apache/maven/surefire/api/booter/Command.java b/surefire-api/src/main/java/org/apache/maven/surefire/api/booter/Command.java --index d768e1142..a74d97fe0 100644 ----- a/surefire-api/src/main/java/org/apache/maven/surefire/api/booter/Command.java --+++ b/surefire-api/src/main/java/org/apache/maven/surefire/api/booter/Command.java --@@ -22,7 +22,7 @@ -- import java.util.Objects; -- -- import static java.util.Objects.requireNonNull; ---import static org.apache.maven.surefire.shared.utils.StringUtils.isBlank; --+import static org.apache.maven.shared.utils.StringUtils.isBlank; -- -- /** -- * Encapsulates data and command sent from master to forked process. --diff --git a/surefire-api/src/main/java/org/apache/maven/surefire/api/filter/SpecificTestClassFilter.java b/surefire-api/src/main/java/org/apache/maven/surefire/api/filter/SpecificTestClassFilter.java --index 112f5eece..a768b15dd 100644 ----- a/surefire-api/src/main/java/org/apache/maven/surefire/api/filter/SpecificTestClassFilter.java --+++ b/surefire-api/src/main/java/org/apache/maven/surefire/api/filter/SpecificTestClassFilter.java --@@ -22,7 +22,7 @@ -- import java.util.Collections; -- import java.util.HashSet; -- import java.util.Set; ---import org.apache.maven.surefire.shared.utils.io.SelectorUtils; --+import org.apache.maven.shared.utils.io.SelectorUtils; -- import org.apache.maven.surefire.api.util.ScannerFilter; -- -- /** --diff --git a/surefire-api/src/main/java/org/apache/maven/surefire/api/report/LegacyPojoStackTraceWriter.java b/surefire-api/src/main/java/org/apache/maven/surefire/api/report/LegacyPojoStackTraceWriter.java --index ffb09c7fa..83bf77834 100644 ----- a/surefire-api/src/main/java/org/apache/maven/surefire/api/report/LegacyPojoStackTraceWriter.java --+++ b/surefire-api/src/main/java/org/apache/maven/surefire/api/report/LegacyPojoStackTraceWriter.java --@@ -21,7 +21,7 @@ -- -- -- import org.apache.maven.surefire.api.util.internal.StringUtils; ---import static org.apache.maven.surefire.shared.utils.StringUtils.isNotEmpty; --+import static org.apache.maven.shared.utils.StringUtils.isNotEmpty; -- -- import java.io.PrintWriter; -- import java.io.StringWriter; --diff --git a/surefire-api/src/main/java/org/apache/maven/surefire/api/stream/AbstractStreamDecoder.java b/surefire-api/src/main/java/org/apache/maven/surefire/api/stream/AbstractStreamDecoder.java --index facf30bcb..4614926ea 100644 ----- a/surefire-api/src/main/java/org/apache/maven/surefire/api/stream/AbstractStreamDecoder.java --+++ b/surefire-api/src/main/java/org/apache/maven/surefire/api/stream/AbstractStreamDecoder.java --@@ -46,7 +46,7 @@ -- import static org.apache.maven.surefire.api.booter.Constants.DEFAULT_STREAM_ENCODING; -- import static org.apache.maven.surefire.api.stream.AbstractStreamDecoder.StreamReadStatus.OVERFLOW; -- import static org.apache.maven.surefire.api.stream.AbstractStreamDecoder.StreamReadStatus.UNDERFLOW; ---import static org.apache.maven.surefire.shared.lang3.StringUtils.isBlank; --+import static org.apache.commons.lang3.StringUtils.isBlank; -- -- /** -- * @param message object --diff --git a/surefire-api/src/main/java/org/apache/maven/surefire/api/testset/ResolvedTest.java b/surefire-api/src/main/java/org/apache/maven/surefire/api/testset/ResolvedTest.java --index 24503581c..aa690d34e 100644 ----- a/surefire-api/src/main/java/org/apache/maven/surefire/api/testset/ResolvedTest.java --+++ b/surefire-api/src/main/java/org/apache/maven/surefire/api/testset/ResolvedTest.java --@@ -19,18 +19,18 @@ -- * under the License. -- */ -- ---import org.apache.maven.surefire.shared.utils.StringUtils; ---import org.apache.maven.surefire.shared.utils.io.MatchPatterns; --+import org.apache.maven.shared.utils.StringUtils; --+import org.apache.maven.shared.utils.io.MatchPatterns; -- -- import java.util.regex.Pattern; -- -- import static java.io.File.separatorChar; -- import static java.util.regex.Pattern.compile; ---import static org.apache.maven.surefire.shared.utils.StringUtils.isBlank; ---import static org.apache.maven.surefire.shared.utils.io.MatchPatterns.from; ---import static org.apache.maven.surefire.shared.utils.io.SelectorUtils.PATTERN_HANDLER_SUFFIX; ---import static org.apache.maven.surefire.shared.utils.io.SelectorUtils.REGEX_HANDLER_PREFIX; ---import static org.apache.maven.surefire.shared.utils.io.SelectorUtils.matchPath; --+import static org.apache.maven.shared.utils.StringUtils.isBlank; --+import static org.apache.maven.shared.utils.io.MatchPatterns.from; --+import static org.apache.maven.shared.utils.io.SelectorUtils.PATTERN_HANDLER_SUFFIX; --+import static org.apache.maven.shared.utils.io.SelectorUtils.REGEX_HANDLER_PREFIX; --+import static org.apache.maven.shared.utils.io.SelectorUtils.matchPath; -- -- /** -- * Single pattern test filter resolved from multi pattern filter -Dtest=MyTest#test,AnotherTest#otherTest. --diff --git a/surefire-api/src/main/java/org/apache/maven/surefire/api/testset/TestListResolver.java b/surefire-api/src/main/java/org/apache/maven/surefire/api/testset/TestListResolver.java --index bae7c2924..799011a69 100644 ----- a/surefire-api/src/main/java/org/apache/maven/surefire/api/testset/TestListResolver.java --+++ b/surefire-api/src/main/java/org/apache/maven/surefire/api/testset/TestListResolver.java --@@ -26,11 +26,11 @@ -- import java.util.Set; -- -- import static java.util.Collections.unmodifiableSet; ---import static org.apache.maven.surefire.shared.utils.StringUtils.isBlank; ---import static org.apache.maven.surefire.shared.utils.StringUtils.isNotBlank; ---import static org.apache.maven.surefire.shared.utils.StringUtils.split; ---import static org.apache.maven.surefire.shared.utils.io.SelectorUtils.PATTERN_HANDLER_SUFFIX; ---import static org.apache.maven.surefire.shared.utils.io.SelectorUtils.REGEX_HANDLER_PREFIX; --+import static org.apache.maven.shared.utils.StringUtils.isBlank; --+import static org.apache.maven.shared.utils.StringUtils.isNotBlank; --+import static org.apache.maven.shared.utils.StringUtils.split; --+import static org.apache.maven.shared.utils.io.SelectorUtils.PATTERN_HANDLER_SUFFIX; --+import static org.apache.maven.shared.utils.io.SelectorUtils.REGEX_HANDLER_PREFIX; -- import static java.util.Collections.singleton; -- import static org.apache.maven.surefire.api.testset.ResolvedTest.Type.CLASS; -- import static org.apache.maven.surefire.api.testset.ResolvedTest.Type.METHOD; --diff --git a/surefire-api/src/main/java/org/apache/maven/surefire/api/util/DefaultDirectoryScanner.java b/surefire-api/src/main/java/org/apache/maven/surefire/api/util/DefaultDirectoryScanner.java --index fcdba6bd7..8edee7816 100644 ----- a/surefire-api/src/main/java/org/apache/maven/surefire/api/util/DefaultDirectoryScanner.java --+++ b/surefire-api/src/main/java/org/apache/maven/surefire/api/util/DefaultDirectoryScanner.java --@@ -109,8 +109,8 @@ String[] collectTests() -- String[] tests = EMPTY_STRING_ARRAY; -- if ( basedir.exists() ) -- { --- org.apache.maven.surefire.shared.utils.io.DirectoryScanner scanner = --- new org.apache.maven.surefire.shared.utils.io.DirectoryScanner(); --+ org.apache.maven.shared.utils.io.DirectoryScanner scanner = --+ new org.apache.maven.shared.utils.io.DirectoryScanner(); -- -- scanner.setBasedir( basedir ); -- --diff --git a/surefire-api/src/main/java/org/apache/maven/surefire/api/util/internal/ClassMethod.java b/surefire-api/src/main/java/org/apache/maven/surefire/api/util/internal/ClassMethod.java --index 03661d825..1d2a060d6 100644 ----- a/surefire-api/src/main/java/org/apache/maven/surefire/api/util/internal/ClassMethod.java --+++ b/surefire-api/src/main/java/org/apache/maven/surefire/api/util/internal/ClassMethod.java --@@ -21,7 +21,7 @@ -- -- import java.util.Objects; -- ---import static org.apache.maven.surefire.shared.utils.StringUtils.isBlank; --+import static org.apache.maven.shared.utils.StringUtils.isBlank; -- -- /** -- * Data transfer object of class and method literals. --diff --git a/surefire-api/src/main/java/org/apache/maven/surefire/api/util/internal/ObjectUtils.java b/surefire-api/src/main/java/org/apache/maven/surefire/api/util/internal/ObjectUtils.java --index 9ee7571e4..58276b9d0 100644 ----- a/surefire-api/src/main/java/org/apache/maven/surefire/api/util/internal/ObjectUtils.java --+++ b/surefire-api/src/main/java/org/apache/maven/surefire/api/util/internal/ObjectUtils.java --@@ -22,8 +22,8 @@ -- import java.lang.management.ManagementFactory; -- import java.util.Map; -- ---import static org.apache.maven.surefire.shared.lang3.JavaVersion.JAVA_17; ---import static org.apache.maven.surefire.shared.lang3.JavaVersion.JAVA_RECENT; --+import static org.apache.commons.lang3.JavaVersion.JAVA_17; --+import static org.apache.commons.lang3.JavaVersion.JAVA_RECENT; -- -- /** -- * Similar to Java 7 java.util.Objects. --diff --git a/surefire-api/src/test/java/org/apache/maven/surefire/api/util/internal/ObjectUtilsTest.java b/surefire-api/src/test/java/org/apache/maven/surefire/api/util/internal/ObjectUtilsTest.java --index ef5035ec4..303b0ea85 100644 ----- a/surefire-api/src/test/java/org/apache/maven/surefire/api/util/internal/ObjectUtilsTest.java --+++ b/surefire-api/src/test/java/org/apache/maven/surefire/api/util/internal/ObjectUtilsTest.java --@@ -21,8 +21,8 @@ -- -- import org.junit.Test; -- ---import static org.apache.maven.surefire.shared.lang3.JavaVersion.JAVA_17; ---import static org.apache.maven.surefire.shared.lang3.JavaVersion.JAVA_RECENT; --+import static org.apache.commons.lang3.JavaVersion.JAVA_17; --+import static org.apache.commons.lang3.JavaVersion.JAVA_RECENT; -- import static org.assertj.core.api.Assertions.assertThat; -- -- /** --diff --git a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/CommandReader.java b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/CommandReader.java --index 609327ccf..a88bbd621 100644 ----- a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/CommandReader.java --+++ b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/CommandReader.java --@@ -54,8 +54,8 @@ -- import static org.apache.maven.surefire.api.booter.MasterProcessCommand.NOOP; -- import static org.apache.maven.surefire.api.booter.MasterProcessCommand.SHUTDOWN; -- import static org.apache.maven.surefire.api.booter.MasterProcessCommand.SKIP_SINCE_NEXT_TEST; ---import static org.apache.maven.surefire.shared.utils.StringUtils.isBlank; ---import static org.apache.maven.surefire.shared.utils.StringUtils.isNotBlank; --+import static org.apache.maven.shared.utils.StringUtils.isBlank; --+import static org.apache.maven.shared.utils.StringUtils.isNotBlank; -- import static org.apache.maven.surefire.api.util.internal.DaemonThreadFactory.newDaemonThread; -- -- /** --diff --git a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ForkedBooter.java b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ForkedBooter.java --index bd44d55c4..e750194bf 100644 ----- a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ForkedBooter.java --+++ b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ForkedBooter.java --@@ -34,7 +34,7 @@ -- import org.apache.maven.surefire.api.testset.TestSetFailedException; -- import org.apache.maven.surefire.booter.spi.LegacyMasterProcessChannelProcessorFactory; -- import org.apache.maven.surefire.booter.spi.SurefireMasterProcessChannelProcessorFactory; ---import org.apache.maven.surefire.shared.utils.cli.ShutdownHookUtils; --+import org.apache.maven.shared.utils.cli.ShutdownHookUtils; -- import org.apache.maven.surefire.spi.MasterProcessChannelProcessorFactory; -- -- import java.io.File; --diff --git a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/PpidChecker.java b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/PpidChecker.java --index 1fb8a30ae..4e21f43c9 100644 ----- a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/PpidChecker.java --+++ b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/PpidChecker.java --@@ -45,12 +45,12 @@ -- import static java.util.concurrent.TimeUnit.HOURS; -- import static java.util.concurrent.TimeUnit.MINUTES; -- import static java.util.regex.Pattern.compile; ---import static org.apache.maven.surefire.shared.io.IOUtils.closeQuietly; ---import static org.apache.maven.surefire.shared.lang3.StringUtils.isNotBlank; ---import static org.apache.maven.surefire.shared.lang3.SystemUtils.IS_OS_HP_UX; ---import static org.apache.maven.surefire.shared.lang3.SystemUtils.IS_OS_LINUX; ---import static org.apache.maven.surefire.shared.lang3.SystemUtils.IS_OS_UNIX; ---import static org.apache.maven.surefire.shared.lang3.SystemUtils.IS_OS_WINDOWS; --+import static org.apache.commons.io.IOUtils.closeQuietly; --+import static org.apache.commons.lang3.StringUtils.isNotBlank; --+import static org.apache.commons.lang3.SystemUtils.IS_OS_HP_UX; --+import static org.apache.commons.lang3.SystemUtils.IS_OS_LINUX; --+import static org.apache.commons.lang3.SystemUtils.IS_OS_UNIX; --+import static org.apache.commons.lang3.SystemUtils.IS_OS_WINDOWS; -- import static org.apache.maven.surefire.booter.ProcessInfo.unixProcessInfo; -- import static org.apache.maven.surefire.booter.ProcessInfo.windowsProcessInfo; -- import static org.apache.maven.surefire.booter.ProcessInfo.ERR_PROCESS_INFO; --diff --git a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ProcessCheckerType.java b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ProcessCheckerType.java --index 03a0e880d..281d5b4f0 100644 ----- a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ProcessCheckerType.java --+++ b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ProcessCheckerType.java --@@ -19,7 +19,7 @@ -- * under the License. -- */ -- ---import static org.apache.maven.surefire.shared.utils.StringUtils.isBlank; --+import static org.apache.maven.shared.utils.StringUtils.isBlank; -- -- /** -- * --diff --git a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/PropertiesWrapper.java b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/PropertiesWrapper.java --index b5cccf478..13e60aec0 100644 ----- a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/PropertiesWrapper.java --+++ b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/PropertiesWrapper.java --@@ -23,7 +23,7 @@ -- import java.util.ArrayList; -- import java.util.List; -- import java.util.Map; ---import org.apache.maven.surefire.shared.utils.StringUtils; --+import org.apache.maven.shared.utils.StringUtils; -- -- /** -- * @author Kristian Rosenvold --diff --git a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/SurefireBooterForkException.java b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/SurefireBooterForkException.java --index bae4ed086..8620be11b 100644 ----- a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/SurefireBooterForkException.java --+++ b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/SurefireBooterForkException.java --@@ -22,7 +22,7 @@ -- -- import org.apache.maven.surefire.api.suite.RunResult; -- ---import static org.apache.maven.surefire.shared.utils.StringUtils.isNotBlank; --+import static org.apache.maven.shared.utils.StringUtils.isNotBlank; -- -- /** -- * Encapsulates exceptions thrown during Surefire forking. --diff --git a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/SystemUtils.java b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/SystemUtils.java --index 674cb22ed..844c4ce11 100644 ----- a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/SystemUtils.java --+++ b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/SystemUtils.java --@@ -36,15 +36,15 @@ -- import static java.lang.Thread.currentThread; -- import static java.util.Objects.requireNonNull; -- import static org.apache.maven.surefire.api.util.ReflectionUtils.invokeMethodWithArray; ---import static org.apache.maven.surefire.shared.lang3.JavaVersion.JAVA_RECENT; ---import static org.apache.maven.surefire.shared.lang3.JavaVersion.JAVA_9; ---import static org.apache.maven.surefire.shared.lang3.StringUtils.isNumeric; --+import static org.apache.commons.lang3.JavaVersion.JAVA_RECENT; --+import static org.apache.commons.lang3.JavaVersion.JAVA_9; --+import static org.apache.commons.lang3.StringUtils.isNumeric; -- import static org.apache.maven.surefire.api.util.ReflectionUtils.invokeMethodChain; -- import static org.apache.maven.surefire.api.util.ReflectionUtils.tryLoadClass; ---import static org.apache.maven.surefire.shared.lang3.SystemUtils.IS_OS_LINUX; ---import static org.apache.maven.surefire.shared.lang3.SystemUtils.IS_OS_FREE_BSD; ---import static org.apache.maven.surefire.shared.lang3.SystemUtils.IS_OS_NET_BSD; ---import static org.apache.maven.surefire.shared.lang3.SystemUtils.IS_OS_OPEN_BSD; --+import static org.apache.commons.lang3.SystemUtils.IS_OS_LINUX; --+import static org.apache.commons.lang3.SystemUtils.IS_OS_FREE_BSD; --+import static org.apache.commons.lang3.SystemUtils.IS_OS_NET_BSD; --+import static org.apache.commons.lang3.SystemUtils.IS_OS_OPEN_BSD; -- -- /** -- * JDK 9 support. --diff --git a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/stream/CommandDecoder.java b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/stream/CommandDecoder.java --index 4a7e257f7..86235dbfc 100644 ----- a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/stream/CommandDecoder.java --+++ b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/stream/CommandDecoder.java --@@ -48,7 +48,7 @@ -- import static org.apache.maven.surefire.api.stream.SegmentType.DATA_STRING; -- import static org.apache.maven.surefire.api.stream.SegmentType.END_OF_FRAME; -- import static org.apache.maven.surefire.api.stream.SegmentType.STRING_ENCODING; ---import static org.apache.maven.surefire.shared.utils.cli.ShutdownHookUtils.addShutDownHook; --+import static org.apache.maven.shared.utils.cli.ShutdownHookUtils.addShutDownHook; -- -- /** -- * --diff --git a/surefire-booter/src/test/java/org/apache/maven/surefire/booter/ForkedBooterMockTest.java b/surefire-booter/src/test/java/org/apache/maven/surefire/booter/ForkedBooterMockTest.java --index 62df89930..fe02fdc7e 100644 ----- a/surefire-booter/src/test/java/org/apache/maven/surefire/booter/ForkedBooterMockTest.java --+++ b/surefire-booter/src/test/java/org/apache/maven/surefire/booter/ForkedBooterMockTest.java --@@ -29,7 +29,7 @@ -- import org.apache.maven.surefire.booter.spi.EventChannelEncoder; -- import org.apache.maven.surefire.booter.spi.LegacyMasterProcessChannelProcessorFactory; -- import org.apache.maven.surefire.booter.spi.SurefireMasterProcessChannelProcessorFactory; ---import org.apache.maven.surefire.shared.utils.cli.ShutdownHookUtils; --+import org.apache.maven.shared.utils.cli.ShutdownHookUtils; -- import org.apache.maven.surefire.spi.MasterProcessChannelProcessorFactory; -- import org.junit.Rule; -- import org.junit.Test; --diff --git a/surefire-booter/src/test/java/org/apache/maven/surefire/booter/ForkedBooterTest.java b/surefire-booter/src/test/java/org/apache/maven/surefire/booter/ForkedBooterTest.java --index b5a1851ea..e367798fe 100644 ----- a/surefire-booter/src/test/java/org/apache/maven/surefire/booter/ForkedBooterTest.java --+++ b/surefire-booter/src/test/java/org/apache/maven/surefire/booter/ForkedBooterTest.java --@@ -19,7 +19,7 @@ -- * under the License. -- */ -- ---import org.apache.maven.surefire.shared.io.FileUtils; --+import org.apache.commons.io.FileUtils; -- import org.junit.Test; -- -- import java.io.File; --diff --git a/surefire-booter/src/test/java/org/apache/maven/surefire/booter/IsolatedClassLoaderTest.java b/surefire-booter/src/test/java/org/apache/maven/surefire/booter/IsolatedClassLoaderTest.java --index 801346633..3eff7b13c 100644 ----- a/surefire-booter/src/test/java/org/apache/maven/surefire/booter/IsolatedClassLoaderTest.java --+++ b/surefire-booter/src/test/java/org/apache/maven/surefire/booter/IsolatedClassLoaderTest.java --@@ -20,7 +20,7 @@ -- */ -- -- import org.apache.maven.surefire.api.provider.AbstractProvider; ---import org.apache.maven.surefire.shared.utils.io.FileUtils; --+import org.apache.maven.shared.utils.io.FileUtils; -- import org.junit.Before; -- import org.junit.Test; -- --diff --git a/surefire-booter/src/test/java/org/apache/maven/surefire/booter/NewClassLoaderRunner.java b/surefire-booter/src/test/java/org/apache/maven/surefire/booter/NewClassLoaderRunner.java --index ecc997d97..188cff090 100644 ----- a/surefire-booter/src/test/java/org/apache/maven/surefire/booter/NewClassLoaderRunner.java --+++ b/surefire-booter/src/test/java/org/apache/maven/surefire/booter/NewClassLoaderRunner.java --@@ -19,7 +19,7 @@ -- * under the License. -- */ -- ---import org.apache.maven.surefire.shared.utils.io.FileUtils; --+import org.apache.maven.shared.utils.io.FileUtils; -- import org.junit.After; -- import org.junit.Before; -- import org.junit.Test; --diff --git a/surefire-booter/src/test/java/org/apache/maven/surefire/booter/PpidCheckerTest.java b/surefire-booter/src/test/java/org/apache/maven/surefire/booter/PpidCheckerTest.java --index c5d916e5e..fa6d0df88 100644 ----- a/surefire-booter/src/test/java/org/apache/maven/surefire/booter/PpidCheckerTest.java --+++ b/surefire-booter/src/test/java/org/apache/maven/surefire/booter/PpidCheckerTest.java --@@ -38,8 +38,8 @@ -- import static java.nio.charset.StandardCharsets.US_ASCII; -- import static java.nio.file.Files.readAllBytes; -- import static java.util.concurrent.TimeUnit.SECONDS; ---import static org.apache.maven.surefire.shared.lang3.SystemUtils.IS_OS_UNIX; ---import static org.apache.maven.surefire.shared.lang3.SystemUtils.IS_OS_WINDOWS; --+import static org.apache.commons.lang3.SystemUtils.IS_OS_UNIX; --+import static org.apache.commons.lang3.SystemUtils.IS_OS_WINDOWS; -- import static org.apache.maven.surefire.booter.ProcessInfo.unixProcessInfo; -- import static org.apache.maven.surefire.booter.ProcessInfo.windowsProcessInfo; -- import static org.assertj.core.api.Assertions.assertThat; --diff --git a/surefire-booter/src/test/java/org/apache/maven/surefire/booter/SystemUtilsTest.java b/surefire-booter/src/test/java/org/apache/maven/surefire/booter/SystemUtilsTest.java --index 6b2ac265f..3fa825cab 100644 ----- a/surefire-booter/src/test/java/org/apache/maven/surefire/booter/SystemUtilsTest.java --+++ b/surefire-booter/src/test/java/org/apache/maven/surefire/booter/SystemUtilsTest.java --@@ -32,12 +32,12 @@ -- import java.math.BigDecimal; -- -- import static java.io.File.separator; ---import static org.apache.maven.surefire.shared.lang3.JavaVersion.JAVA_9; ---import static org.apache.maven.surefire.shared.lang3.JavaVersion.JAVA_RECENT; ---import static org.apache.maven.surefire.shared.lang3.SystemUtils.IS_OS_FREE_BSD; ---import static org.apache.maven.surefire.shared.lang3.SystemUtils.IS_OS_LINUX; ---import static org.apache.maven.surefire.shared.lang3.SystemUtils.IS_OS_NET_BSD; ---import static org.apache.maven.surefire.shared.lang3.SystemUtils.IS_OS_OPEN_BSD; --+import static org.apache.commons.lang3.JavaVersion.JAVA_9; --+import static org.apache.commons.lang3.JavaVersion.JAVA_RECENT; --+import static org.apache.commons.lang3.SystemUtils.IS_OS_FREE_BSD; --+import static org.apache.commons.lang3.SystemUtils.IS_OS_LINUX; --+import static org.apache.commons.lang3.SystemUtils.IS_OS_NET_BSD; --+import static org.apache.commons.lang3.SystemUtils.IS_OS_OPEN_BSD; -- import static org.assertj.core.api.Assertions.assertThat; -- import static org.junit.Assume.assumeTrue; -- import static org.mockito.Matchers.any; --diff --git a/surefire-extensions-api/src/main/java/org/apache/maven/surefire/extensions/ConsoleOutputReporter.java b/surefire-extensions-api/src/main/java/org/apache/maven/surefire/extensions/ConsoleOutputReporter.java --index ae9d92799..eaf017b12 100644 ----- a/surefire-extensions-api/src/main/java/org/apache/maven/surefire/extensions/ConsoleOutputReporter.java --+++ b/surefire-extensions-api/src/main/java/org/apache/maven/surefire/extensions/ConsoleOutputReporter.java --@@ -22,7 +22,7 @@ -- import java.io.File; -- import java.io.PrintStream; -- ---import static org.apache.maven.surefire.shared.utils.StringUtils.isBlank; --+import static org.apache.maven.shared.utils.StringUtils.isBlank; -- -- /** -- * Extension for logger. --diff --git a/surefire-extensions-api/src/main/java/org/apache/maven/surefire/extensions/StatelessReporter.java b/surefire-extensions-api/src/main/java/org/apache/maven/surefire/extensions/StatelessReporter.java --index effb7de73..3dd0678b1 100644 ----- a/surefire-extensions-api/src/main/java/org/apache/maven/surefire/extensions/StatelessReporter.java --+++ b/surefire-extensions-api/src/main/java/org/apache/maven/surefire/extensions/StatelessReporter.java --@@ -21,7 +21,7 @@ -- -- import org.apache.maven.surefire.api.report.TestSetReportEntry; -- ---import static org.apache.maven.surefire.shared.utils.StringUtils.isBlank; --+import static org.apache.maven.shared.utils.StringUtils.isBlank; -- -- /** -- * Extension for stateless reporter. --diff --git a/surefire-extensions-api/src/main/java/org/apache/maven/surefire/extensions/util/CommandlineExecutor.java b/surefire-extensions-api/src/main/java/org/apache/maven/surefire/extensions/util/CommandlineExecutor.java --index 14a055d94..ddb96cf67 100644 ----- a/surefire-extensions-api/src/main/java/org/apache/maven/surefire/extensions/util/CommandlineExecutor.java --+++ b/surefire-extensions-api/src/main/java/org/apache/maven/surefire/extensions/util/CommandlineExecutor.java --@@ -19,13 +19,13 @@ -- * under the License. -- */ -- ---import org.apache.maven.surefire.shared.utils.cli.CommandLineException; ---import org.apache.maven.surefire.shared.utils.cli.Commandline; --+import org.apache.maven.shared.utils.cli.CommandLineException; --+import org.apache.maven.shared.utils.cli.Commandline; -- -- import java.io.Closeable; -- ---import static org.apache.maven.surefire.shared.utils.cli.ShutdownHookUtils.addShutDownHook; ---import static org.apache.maven.surefire.shared.utils.cli.ShutdownHookUtils.removeShutdownHook; --+import static org.apache.maven.shared.utils.cli.ShutdownHookUtils.addShutDownHook; --+import static org.apache.maven.shared.utils.cli.ShutdownHookUtils.removeShutdownHook; -- -- /** -- * Programming model with this class: --diff --git a/surefire-extensions-api/src/test/java/org/apache/maven/plugin/surefire/extensions/CommandlineExecutorTest.java b/surefire-extensions-api/src/test/java/org/apache/maven/plugin/surefire/extensions/CommandlineExecutorTest.java --index e3197befe..4f98c9634 100644 ----- a/surefire-extensions-api/src/test/java/org/apache/maven/plugin/surefire/extensions/CommandlineExecutorTest.java --+++ b/surefire-extensions-api/src/test/java/org/apache/maven/plugin/surefire/extensions/CommandlineExecutorTest.java --@@ -24,7 +24,7 @@ -- import org.apache.maven.surefire.extensions.util.CommandlineStreams; -- import org.apache.maven.surefire.extensions.util.CountdownCloseable; -- import org.apache.maven.surefire.extensions.util.LineConsumerThread; ---import org.apache.maven.surefire.shared.utils.cli.Commandline; --+import org.apache.maven.shared.utils.cli.Commandline; -- import org.junit.After; -- import org.junit.Before; -- import org.junit.Test; --@@ -32,7 +32,7 @@ -- import java.io.Closeable; -- import java.nio.file.Paths; -- ---import static org.apache.maven.surefire.shared.lang3.SystemUtils.IS_OS_WINDOWS; --+import static org.apache.commons.lang3.SystemUtils.IS_OS_WINDOWS; -- import static org.assertj.core.api.Assertions.assertThat; -- import static org.assertj.core.util.Files.delete; -- import static org.mockito.ArgumentMatchers.contains; --diff --git a/surefire-providers/common-java5/src/main/java/org/apache/maven/surefire/report/SmartStackTraceParser.java b/surefire-providers/common-java5/src/main/java/org/apache/maven/surefire/report/SmartStackTraceParser.java --index 3770f2bab..4e3396a4e 100644 ----- a/surefire-providers/common-java5/src/main/java/org/apache/maven/surefire/report/SmartStackTraceParser.java --+++ b/surefire-providers/common-java5/src/main/java/org/apache/maven/surefire/report/SmartStackTraceParser.java --@@ -27,8 +27,8 @@ -- -- import static java.util.Arrays.asList; -- import static java.util.Collections.reverse; ---import static org.apache.maven.surefire.shared.utils.StringUtils.chompLast; ---import static org.apache.maven.surefire.shared.utils.StringUtils.isNotEmpty; --+import static org.apache.maven.shared.utils.StringUtils.chompLast; --+import static org.apache.maven.shared.utils.StringUtils.isNotEmpty; -- -- /** -- * @author Kristian Rosenvold --diff --git a/surefire-providers/common-junit4/src/main/java/org/apache/maven/surefire/common/junit4/JUnit4RunListenerFactory.java b/surefire-providers/common-junit4/src/main/java/org/apache/maven/surefire/common/junit4/JUnit4RunListenerFactory.java --index f1f54e076..d6478f3c4 100644 ----- a/surefire-providers/common-junit4/src/main/java/org/apache/maven/surefire/common/junit4/JUnit4RunListenerFactory.java --+++ b/surefire-providers/common-junit4/src/main/java/org/apache/maven/surefire/common/junit4/JUnit4RunListenerFactory.java --@@ -26,7 +26,7 @@ -- -- import org.junit.runner.notification.RunListener; -- ---import static org.apache.maven.surefire.shared.utils.StringUtils.isNotBlank; --+import static org.apache.maven.shared.utils.StringUtils.isNotBlank; -- -- /** -- * @author Kristian Rosenvold --diff --git a/surefire-providers/common-junit48/src/main/java/org/apache/maven/surefire/common/junit48/FilterFactory.java b/surefire-providers/common-junit48/src/main/java/org/apache/maven/surefire/common/junit48/FilterFactory.java --index c532404e5..5f3400e26 100644 ----- a/surefire-providers/common-junit48/src/main/java/org/apache/maven/surefire/common/junit48/FilterFactory.java --+++ b/surefire-providers/common-junit48/src/main/java/org/apache/maven/surefire/common/junit48/FilterFactory.java --@@ -32,7 +32,7 @@ -- -- import static org.apache.maven.surefire.api.booter.ProviderParameterNames.TESTNG_EXCLUDEDGROUPS_PROP; -- import static org.apache.maven.surefire.api.booter.ProviderParameterNames.TESTNG_GROUPS_PROP; ---import static org.apache.maven.surefire.shared.utils.StringUtils.isNotBlank; --+import static org.apache.maven.shared.utils.StringUtils.isNotBlank; -- -- /** -- * @author Todd Lipcon --diff --git a/surefire-providers/common-junit48/src/test/java/org/apache/maven/surefire/common/junit48/FilterFactoryTest.java b/surefire-providers/common-junit48/src/test/java/org/apache/maven/surefire/common/junit48/FilterFactoryTest.java --index a69d87007..f3c41ef3f 100644 ----- a/surefire-providers/common-junit48/src/test/java/org/apache/maven/surefire/common/junit48/FilterFactoryTest.java --+++ b/surefire-providers/common-junit48/src/test/java/org/apache/maven/surefire/common/junit48/FilterFactoryTest.java --@@ -19,7 +19,7 @@ -- * under the License. -- */ -- ---import org.apache.maven.surefire.shared.utils.io.MatchPatterns; --+import org.apache.maven.shared.utils.io.MatchPatterns; -- import org.apache.maven.surefire.common.junit48.tests.pt.PT; -- import org.apache.maven.surefire.api.testset.ResolvedTest; -- import org.apache.maven.surefire.api.testset.TestListResolver; --diff --git a/surefire-providers/surefire-junit-platform/src/main/java/org/apache/maven/surefire/junitplatform/JUnitPlatformProvider.java b/surefire-providers/surefire-junit-platform/src/main/java/org/apache/maven/surefire/junitplatform/JUnitPlatformProvider.java --index ad2ec944d..5022107a5 100644 ----- a/surefire-providers/surefire-junit-platform/src/main/java/org/apache/maven/surefire/junitplatform/JUnitPlatformProvider.java --+++ b/surefire-providers/surefire-junit-platform/src/main/java/org/apache/maven/surefire/junitplatform/JUnitPlatformProvider.java --@@ -34,7 +34,7 @@ -- import static org.apache.maven.surefire.api.report.RunMode.RERUN_TEST_AFTER_FAILURE; -- import static org.apache.maven.surefire.api.testset.TestListResolver.optionallyWildcardFilter; -- import static org.apache.maven.surefire.api.util.TestsToRun.fromClass; ---import static org.apache.maven.surefire.shared.utils.StringUtils.isBlank; --+import static org.apache.maven.shared.utils.StringUtils.isBlank; -- import static org.junit.platform.engine.discovery.DiscoverySelectors.selectClass; -- import static org.junit.platform.engine.discovery.DiscoverySelectors.selectUniqueId; -- import static org.junit.platform.launcher.core.LauncherDiscoveryRequestBuilder.request; --@@ -60,7 +60,7 @@ -- import org.apache.maven.surefire.api.util.ScanResult; -- import org.apache.maven.surefire.api.util.SurefireReflectionException; -- import org.apache.maven.surefire.api.util.TestsToRun; ---import org.apache.maven.surefire.shared.utils.StringUtils; --+import org.apache.maven.shared.utils.StringUtils; -- import org.junit.platform.engine.DiscoverySelector; -- import org.junit.platform.engine.Filter; -- import org.junit.platform.launcher.EngineFilter; --diff --git a/surefire-providers/surefire-junit-platform/src/main/java/org/apache/maven/surefire/junitplatform/RunListenerAdapter.java b/surefire-providers/surefire-junit-platform/src/main/java/org/apache/maven/surefire/junitplatform/RunListenerAdapter.java --index aeb24576e..3fd39d4b3 100644 ----- a/surefire-providers/surefire-junit-platform/src/main/java/org/apache/maven/surefire/junitplatform/RunListenerAdapter.java --+++ b/surefire-providers/surefire-junit-platform/src/main/java/org/apache/maven/surefire/junitplatform/RunListenerAdapter.java --@@ -22,7 +22,7 @@ -- import static java.util.Collections.emptyMap; -- import static java.util.stream.Collectors.joining; -- import static org.apache.maven.surefire.api.util.internal.ObjectUtils.systemProps; ---import static org.apache.maven.surefire.shared.lang3.StringUtils.isNotBlank; --+import static org.apache.commons.lang3.StringUtils.isNotBlank; -- import static org.junit.platform.engine.TestExecutionResult.Status.FAILED; -- -- import java.util.Map; --diff --git a/surefire-providers/surefire-junit3/src/test/java/org/apache/maven/surefire/junit/JUnitTestSetTest.java b/surefire-providers/surefire-junit3/src/test/java/org/apache/maven/surefire/junit/JUnitTestSetTest.java --index 417511a72..6593fbd4a 100644 ----- a/surefire-providers/surefire-junit3/src/test/java/org/apache/maven/surefire/junit/JUnitTestSetTest.java --+++ b/surefire-providers/surefire-junit3/src/test/java/org/apache/maven/surefire/junit/JUnitTestSetTest.java --@@ -36,8 +36,8 @@ -- import java.util.ArrayList; -- import java.util.List; -- ---import static org.apache.maven.surefire.shared.lang3.JavaVersion.JAVA_17; ---import static org.apache.maven.surefire.shared.lang3.JavaVersion.JAVA_RECENT; --+import static org.apache.commons.lang3.JavaVersion.JAVA_17; --+import static org.apache.commons.lang3.JavaVersion.JAVA_RECENT; -- -- /** -- * --diff --git a/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGDirectoryTestSuite.java b/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGDirectoryTestSuite.java --index e9ede9d15..8d56b5653 100644 ----- a/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGDirectoryTestSuite.java --+++ b/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGDirectoryTestSuite.java --@@ -34,7 +34,7 @@ -- -- import static java.util.Collections.singleton; -- import static org.apache.maven.surefire.testng.TestNGExecutor.run; ---import static org.apache.maven.surefire.shared.utils.StringUtils.isBlank; --+import static org.apache.maven.shared.utils.StringUtils.isBlank; -- -- /** -- * Test suite for TestNG based on a directory of Java test classes. Can also execute JUnit tests. --diff --git a/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGExecutor.java b/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGExecutor.java --index 07d3ad33c..ba5610bb6 100644 ----- a/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGExecutor.java --+++ b/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGExecutor.java --@@ -29,7 +29,7 @@ -- import org.apache.maven.surefire.testng.utils.Stoppable; -- import org.apache.maven.surefire.api.testset.TestListResolver; -- import org.apache.maven.surefire.api.testset.TestSetFailedException; ---import org.apache.maven.surefire.shared.utils.StringUtils; --+import org.apache.maven.shared.utils.StringUtils; -- import org.testng.ITestNGListener; -- import org.testng.TestNG; -- import org.testng.annotations.Test; ---- --2.35.1 -- -diff --git a/project/maven-surefire.properties b/project/maven-surefire.properties -index e78136e..52be8fe 100644 ---- a/project/maven-surefire.properties -+++ b/project/maven-surefire.properties -@@ -1,3 +1,3 @@ - url=https://github.com/apache/maven-surefire.git - ref=surefire-@.@.@-@@ --version=3.0.0~M6 -+version=3.0.0~M3 -diff --git a/project/maven-surefire.xml b/project/maven-surefire.xml -index 83633d3..089e5c6 100644 ---- a/project/maven-surefire.xml -+++ b/project/maven-surefire.xml -@@ -14,8 +14,6 @@ - - surefire-api/src/main/java - surefire-booter/src/main/java -- surefire-extensions-api/src/main/java -- surefire-extensions-spi/src/main/java - surefire-logger-api/src/main/java - surefire-providers/common-java5/src/main/java - surefire-providers/common-junit3/src/main/java -@@ -30,6 +28,7 @@ - org/apache/maven/surefire/common/junit48/FilterFactory - org/apache/maven/surefire/common/junit48/GroupMatcherCategoryFilter - org/apache/maven/surefire/testng/utils/GroupMatcherMethodSelector -+ surefire-api/src/main/resources - - - -@@ -50,8 +49,6 @@ - maven-artifact - asm - plexus-java -- commons-compress -- plexus-component-annotations - - - src/main/java -@@ -61,7 +58,6 @@ - - maven-surefire-plugin - -- - - - --- -2.35.1 - diff --git a/0002-Remove-mojo-parent-dependency-on-junit-bom.patch b/0002-Remove-mojo-parent-dependency-on-junit-bom.patch deleted file mode 100644 index ae17435..0000000 --- a/0002-Remove-mojo-parent-dependency-on-junit-bom.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 60154680d275ef707d7a3a9f32721b02e38199cd Mon Sep 17 00:00:00 2001 -From: Mikolaj Izdebski -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 -+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 @@ -+ 4.13.2 -+ test -+ -+- -+- org.junit -+- junit-bom -+- ${junit5.version} -+- pom -+- import -+- -+ -+ org.apache.maven.plugin-tools -+ maven-plugin-annotations -+-- -+2.35.1 -+ --- -2.35.1 - diff --git a/javapackages-bootstrap.spec b/javapackages-bootstrap.spec index da3808d..d0c0909 100644 --- a/javapackages-bootstrap.spec +++ b/javapackages-bootstrap.spec @@ -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 - 1.7.1-1 +- Update to upstream version 1.7.1 + * Tue Jun 14 2022 Mikolaj Izdebski - 1.7.0-3 - Add openjdk8 toolchain subpackage diff --git a/sources b/sources index e11279c..99ca6af 100644 --- a/sources +++ b/sources @@ -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 From f486e38f48a27198d533aef5ea87d0227b04353d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 21 Jul 2022 15:08:01 +0000 Subject: [PATCH 43/77] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- javapackages-bootstrap.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/javapackages-bootstrap.spec b/javapackages-bootstrap.spec index d0c0909..201634e 100644 --- a/javapackages-bootstrap.spec +++ b/javapackages-bootstrap.spec @@ -17,7 +17,7 @@ Name: javapackages-bootstrap Version: 1.7.1 -Release: 1%{?dist} +Release: 2%{?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 @@ -361,6 +361,9 @@ echo '%%jpb_env PATH=/usr/libexec/javapackages-bootstrap:$PATH' >%{buildroot}%{_ %doc AUTHORS %changelog +* Thu Jul 21 2022 Fedora Release Engineering - 1.7.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Wed Jun 22 2022 Mikolaj Izdebski - 1.7.1-1 - Update to upstream version 1.7.1 From ccecbc77bc5bc170b09badd2f2ef54aa06d2c667 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 18 Aug 2022 15:10:04 +0200 Subject: [PATCH 44/77] Refactor smoke tests Give smoke tests signifficant names so that they can be distinguished more easily in the results. --- plans/javapackages.fmf | 3 +-- plans/smoke.fmf | 32 ++++++++++++++++++++++---------- 2 files changed, 23 insertions(+), 12 deletions(-) diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf index def0914..ec45f1f 100644 --- a/plans/javapackages.fmf +++ b/plans/javapackages.fmf @@ -1,5 +1,4 @@ -summary: - Run javapackages-specific tests +summary: Run javapackages-specific tests discover: how: fmf url: https://pagure.io/javapackages-validator-tests diff --git a/plans/smoke.fmf b/plans/smoke.fmf index ce42085..fa03fc2 100644 --- a/plans/smoke.fmf +++ b/plans/smoke.fmf @@ -1,12 +1,24 @@ summary: Basic smoke test +discover: + how: shell + tests: + - name: /smoke/maven-version + test: /usr/libexec/javapackages-bootstrap/mvn --version + - name: /smoke/maven-home-version + test: /usr/share/javapackages-bootstrap/bin/mvn --version + - name: /smoke/xmvn-version + test: /usr/libexec/javapackages-bootstrap/xmvn --version + - name: /smoke/xmvn-install-help + test: /usr/libexec/javapackages-bootstrap/xmvn-install --help + - name: /smoke/xmvn-resolve-help + test: /usr/libexec/javapackages-bootstrap/xmvn-resolve --help + - name: /smoke/xmvn-subst-help + test: /usr/libexec/javapackages-bootstrap/xmvn-subst --help + - name: /smoke/ant-version + test: /usr/libexec/javapackages-bootstrap/ant -version + - name: /smoke/cup + test: echo 'non terminal bar; bar::=;' | /usr/libexec/javapackages-bootstrap/cup + - name: /smoke/jflex-version + test: /usr/libexec/javapackages-bootstrap/jflex -version execute: - script: - - /usr/libexec/javapackages-bootstrap/mvn --version - - /usr/share/javapackages-bootstrap/bin/mvn --version - - /usr/libexec/javapackages-bootstrap/xmvn --version - - /usr/libexec/javapackages-bootstrap/xmvn-install --help - - /usr/libexec/javapackages-bootstrap/xmvn-resolve --help - - /usr/libexec/javapackages-bootstrap/xmvn-subst --help - - /usr/libexec/javapackages-bootstrap/ant -version - - echo 'non terminal bar; bar::=;' | /usr/libexec/javapackages-bootstrap/cup - - /usr/libexec/javapackages-bootstrap/jflex -version + how: tmt From fd21a5b8dda89d169ef0e9d9fe22613c164e6dbb Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 18 Aug 2022 15:40:32 +0200 Subject: [PATCH 45/77] Unify indentation across fmf files --- plans/javapackages.fmf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf index ec45f1f..d89ae51 100644 --- a/plans/javapackages.fmf +++ b/plans/javapackages.fmf @@ -1,6 +1,6 @@ summary: Run javapackages-specific tests discover: - how: fmf - url: https://pagure.io/javapackages-validator-tests + how: fmf + url: https://pagure.io/javapackages-validator-tests execute: - how: tmt + how: tmt From 9251754e65eff220f86e04148f3bf2bee878663d Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 25 Aug 2022 07:44:26 +0200 Subject: [PATCH 46/77] Update javapackages test plan --- plans/javapackages.fmf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf index d89ae51..8f6c9cb 100644 --- a/plans/javapackages.fmf +++ b/plans/javapackages.fmf @@ -1,6 +1,7 @@ summary: Run javapackages-specific tests discover: how: fmf - url: https://pagure.io/javapackages-validator-tests + url: https://src.fedoraproject.org/tests/javapackages + ref: f37 execute: how: tmt From d6326e00cedabd3d3d77e533f5875d9667a133e7 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Wed, 19 Oct 2022 12:03:04 +0200 Subject: [PATCH 47/77] Change shell code style inside .spec --- javapackages-bootstrap.spec | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/javapackages-bootstrap.spec b/javapackages-bootstrap.spec index 201634e..13db9a3 100644 --- a/javapackages-bootstrap.spec +++ b/javapackages-bootstrap.spec @@ -302,15 +302,13 @@ OpenJDK 8 toolchain for Java Packages Bootstrap. # leave out licensing breakdown file other_sources=$(echo %{sources} | cut -d' ' -f4-) -for source in ${other_sources} -do +for source in ${other_sources}; do tar -xf "${source}" done %patch0 -p1 -for patch_path in patches/*/* -do +for patch_path in patches/*/*; do package_name="$(echo ${patch_path} | cut -f2 -d/)" patch_name="$(echo ${patch_path} | cut -f3 -d/)" From 177f2943201ea80628176a24e9132d67abff5294 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Wed, 31 Aug 2022 14:40:57 +0200 Subject: [PATCH 48/77] Update to upstream version 1.7.2 --- .gitignore | 3 +++ javapackages-bootstrap.spec | 7 +++++-- sources | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 26aa478..3c2d508 100644 --- a/.gitignore +++ b/.gitignore @@ -130,3 +130,6 @@ /extra-enforcer-rules.tar.xz /javapackages-bootstrap-1.7.0.tar.xz /javapackages-bootstrap-1.7.1.tar.xz +/7fae2e4.tar.gz +/9e621d9.tar.gz +/javapackages-bootstrap-1.7.2.tar.xz diff --git a/javapackages-bootstrap.spec b/javapackages-bootstrap.spec index 13db9a3..1496777 100644 --- a/javapackages-bootstrap.spec +++ b/javapackages-bootstrap.spec @@ -16,8 +16,8 @@ #global git_short_hash %(echo %{git_hash} | cut -b -7) Name: javapackages-bootstrap -Version: 1.7.1 -Release: 2%{?dist} +Version: 1.7.2 +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 @@ -359,6 +359,9 @@ echo '%%jpb_env PATH=/usr/libexec/javapackages-bootstrap:$PATH' >%{buildroot}%{_ %doc AUTHORS %changelog +* Wed Oct 19 2022 Marian Koncek - 1.7.2-1 +- Update to upstream version 1.7.2 + * Thu Jul 21 2022 Fedora Release Engineering - 1.7.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild diff --git a/sources b/sources index 99ca6af..bf0bd0d 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -SHA512 (javapackages-bootstrap-1.7.1.tar.xz) = 2bb425478127950d242193f62cb2eb19abc6ed017368f6ca9b7449ea4688542e8d9abf8f523f88259d0fd2bf741ea317e388597771735493ebeca2aead5c1f46 +SHA512 (javapackages-bootstrap-1.7.2.tar.xz) = 4734dbbebe81eaf9ebca934c4a73f86c9e0fc93d707d9d967f3d24f64fd61af1bd2c359fc56f5068814b175bc0741fd4832759abd0f44c176f60553fdc8e5aa3 SHA512 (ant.tar.xz) = d2a4babb7766fc2acf3e9377ffd5af790c7d0612d3e34a9642a9a2b85ffb0f15936ef2979389496dce8ea72ed941797cd1f7507beeb1853a46394019adde4152 SHA512 (apache-pom.tar.xz) = feebe0142114a6fb61dec26153bdef4314554d109bcf4910518ae9ecaf27e5dd9dc1f03d48271833f3497ab7045265900c5816708f513ae834643c533cd1291f SHA512 (apiguardian.tar.xz) = c3d75e88a983eb53c06007fd01f11c89083e119d2d4ed5d0e97644f45d5e451fd611bee493d720d011562ae29e7cdfd1d6fb4621d17c9db4b61430e62afea2bf From a71c310d088cab0ee33d445e815f3e94ede9240d Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Wed, 26 Oct 2022 10:04:46 +0200 Subject: [PATCH 49/77] Rebase to curent xmvn --- 0002-Rebase-xmvn-to-current-trunk.patch | 1094 +++++++++++++++++++++++ javapackages-bootstrap.spec | 2 + 2 files changed, 1096 insertions(+) create mode 100644 0002-Rebase-xmvn-to-current-trunk.patch diff --git a/0002-Rebase-xmvn-to-current-trunk.patch b/0002-Rebase-xmvn-to-current-trunk.patch new file mode 100644 index 0000000..07cc6bd --- /dev/null +++ b/0002-Rebase-xmvn-to-current-trunk.patch @@ -0,0 +1,1094 @@ +From 176c6273f7d725bdb2178be7dabaeab2db9f9e33 Mon Sep 17 00:00:00 2001 +From: Marian Koncek +Date: Wed, 26 Oct 2022 09:53:13 +0200 +Subject: [PATCH] Rebase xmvn to current trunk + +--- + patches/xmvn/0001-Port-to-current-trunk.patch | 1075 +++++++++++++++++ + 1 file changed, 1075 insertions(+) + create mode 100644 patches/xmvn/0001-Port-to-current-trunk.patch + +diff --git a/patches/xmvn/0001-Port-to-current-trunk.patch b/patches/xmvn/0001-Port-to-current-trunk.patch +new file mode 100644 +index 0000000..5e0e1ac +--- /dev/null ++++ b/patches/xmvn/0001-Port-to-current-trunk.patch +@@ -0,0 +1,1075 @@ ++diff --git a/.github/workflows/Dockerfile b/.github/workflows/Dockerfile ++index 6eaf6875..154e10d9 100644 ++--- a/.github/workflows/Dockerfile +++++ b/.github/workflows/Dockerfile ++@@ -14,5 +14,5 @@ ++ # limitations under the License. ++ # ++ ++-FROM registry.access.redhat.com/ubi8 ++-RUN dnf -y module enable maven:3.6 && dnf -y update && dnf -y install git-core maven-openjdk11 +++FROM registry.access.redhat.com/ubi9 +++RUN dnf -y update && dnf -y install git-core maven-openjdk8 ++diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml ++index 0dc14a3f..775c25c6 100644 ++--- a/.github/workflows/maven.yml +++++ b/.github/workflows/maven.yml ++@@ -27,8 +27,8 @@ jobs: ++ container: quay.io/mizdebsk/maven:latest ++ steps: ++ - name: Checkout git repository ++- uses: actions/checkout@v2 +++ uses: actions/checkout@v3 ++ - name: Run build ++- run: mvn -B -Dgpg.skip -Prun-its verify +++ run: mvn -V -B -Dgpg.skip -Pquality,run-its,release verify ++ - name: Upload coverage report to Codecov ++- uses: codecov/codecov-action@v2.0.2 +++ uses: codecov/codecov-action@v3.1.0 ++diff --git a/aux/license-header.txt b/aux/license-header.txt ++index 78ec7dee..9212e864 100644 ++--- a/aux/license-header.txt +++++ b/aux/license-header.txt ++@@ -1,5 +1,5 @@ ++ ^/\*-$ ++-^ \* Copyright \(c\) (20(1[2-9]|2[0-0])-)?2021 Red Hat, Inc\.$ +++^ \* Copyright \(c\) (20(1[2-9]|2[0-1])-)?202[1-2] Red Hat, Inc\.$ ++ ^ \*$ ++ ^ \* Licensed under the Apache License, Version 2\.0 \(the "License"\);$ ++ ^ \* you may not use this file except in compliance with the License\.$ ++diff --git a/xmvn-api/.classpath b/xmvn-api/.classpath ++index 6c61e620..12aa8aee 100644 ++--- a/xmvn-api/.classpath +++++ b/xmvn-api/.classpath ++@@ -13,7 +13,7 @@ ++ ++ ++ ++- +++ ++ ++ ++ ++diff --git a/xmvn-api/.settings/org.eclipse.jdt.core.prefs b/xmvn-api/.settings/org.eclipse.jdt.core.prefs ++index 2d67d3f3..2f39a66b 100644 ++--- a/xmvn-api/.settings/org.eclipse.jdt.core.prefs +++++ b/xmvn-api/.settings/org.eclipse.jdt.core.prefs ++@@ -8,8 +8,8 @@ org.eclipse.jdt.core.compiler.annotation.nonnullbydefault.secondary= ++ org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable ++ org.eclipse.jdt.core.compiler.annotation.nullable.secondary= ++ org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled ++-org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 ++-org.eclipse.jdt.core.compiler.compliance=11 +++org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +++org.eclipse.jdt.core.compiler.compliance=1.8 ++ org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning ++ org.eclipse.jdt.core.compiler.problem.autoboxing=ignore ++ org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning ++@@ -97,8 +97,8 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning ++ org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning ++ org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning ++ org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning ++-org.eclipse.jdt.core.compiler.release=enabled ++-org.eclipse.jdt.core.compiler.source=11 +++org.eclipse.jdt.core.compiler.release=disabled +++org.eclipse.jdt.core.compiler.source=1.8 ++ org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false ++ org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647 ++ org.eclipse.jdt.core.formatter.align_type_members_on_columns=false ++diff --git a/xmvn-api/pom.xml b/xmvn-api/pom.xml ++index 74b961d8..247eaad7 100644 ++--- a/xmvn-api/pom.xml +++++ b/xmvn-api/pom.xml ++@@ -38,7 +38,7 @@ ++ modello-maven-plugin ++ ++ 3.2.0 ++- true +++ 8 ++ false ++ ++ src/main/mdo/config.mdo ++diff --git a/xmvn-api/src/main/java/org/fedoraproject/xmvn/deployer/DependencyDescriptor.java b/xmvn-api/src/main/java/org/fedoraproject/xmvn/deployer/DependencyDescriptor.java ++index 9918affe..1af7d2fb 100644 ++--- a/xmvn-api/src/main/java/org/fedoraproject/xmvn/deployer/DependencyDescriptor.java +++++ b/xmvn-api/src/main/java/org/fedoraproject/xmvn/deployer/DependencyDescriptor.java ++@@ -15,6 +15,7 @@ ++ */ ++ package org.fedoraproject.xmvn.deployer; ++ +++import java.util.Collections; ++ import java.util.List; ++ ++ import org.fedoraproject.xmvn.artifact.Artifact; ++@@ -34,7 +35,7 @@ public class DependencyDescriptor ++ { ++ this.dependencyArtifact = dependencyArtifact; ++ this.optional = optional; ++- this.exclusions = List.copyOf( exclusions ); +++ this.exclusions = Collections.unmodifiableList( exclusions ); ++ } ++ ++ public Artifact getDependencyArtifact() ++diff --git a/xmvn-api/src/main/java/org/fedoraproject/xmvn/deployer/DeploymentRequest.java b/xmvn-api/src/main/java/org/fedoraproject/xmvn/deployer/DeploymentRequest.java ++index 6c67d2c7..16e48471 100644 ++--- a/xmvn-api/src/main/java/org/fedoraproject/xmvn/deployer/DeploymentRequest.java +++++ b/xmvn-api/src/main/java/org/fedoraproject/xmvn/deployer/DeploymentRequest.java ++@@ -19,6 +19,7 @@ import java.nio.file.Path; ++ import java.nio.file.Paths; ++ import java.util.ArrayList; ++ import java.util.Arrays; +++import java.util.Collections; ++ import java.util.Iterator; ++ import java.util.LinkedHashMap; ++ import java.util.List; ++@@ -53,7 +54,7 @@ public class DeploymentRequest ++ ++ public List getDependencies() ++ { ++- return List.copyOf( dependencies ); +++ return Collections.unmodifiableList( dependencies ); ++ } ++ ++ public void addDependency( Artifact dependencyArtifact, Artifact... exclusions ) ++@@ -85,7 +86,7 @@ public class DeploymentRequest ++ ++ public Map getProperties() ++ { ++- return Map.copyOf( properties ); +++ return Collections.unmodifiableMap( properties ); ++ } ++ ++ public String getProperty( String key ) ++diff --git a/xmvn-connector/.classpath b/xmvn-connector/.classpath ++index 97c81cef..4f8e155a 100644 ++--- a/xmvn-connector/.classpath +++++ b/xmvn-connector/.classpath ++@@ -13,7 +13,7 @@ ++ ++ ++ ++- +++ ++ ++ ++ ++diff --git a/xmvn-connector/.settings/org.eclipse.jdt.core.prefs b/xmvn-connector/.settings/org.eclipse.jdt.core.prefs ++index 2d67d3f3..2f39a66b 100644 ++--- a/xmvn-connector/.settings/org.eclipse.jdt.core.prefs +++++ b/xmvn-connector/.settings/org.eclipse.jdt.core.prefs ++@@ -8,8 +8,8 @@ org.eclipse.jdt.core.compiler.annotation.nonnullbydefault.secondary= ++ org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable ++ org.eclipse.jdt.core.compiler.annotation.nullable.secondary= ++ org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled ++-org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 ++-org.eclipse.jdt.core.compiler.compliance=11 +++org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +++org.eclipse.jdt.core.compiler.compliance=1.8 ++ org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning ++ org.eclipse.jdt.core.compiler.problem.autoboxing=ignore ++ org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning ++@@ -97,8 +97,8 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning ++ org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning ++ org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning ++ org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning ++-org.eclipse.jdt.core.compiler.release=enabled ++-org.eclipse.jdt.core.compiler.source=11 +++org.eclipse.jdt.core.compiler.release=disabled +++org.eclipse.jdt.core.compiler.source=1.8 ++ org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false ++ org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647 ++ org.eclipse.jdt.core.formatter.align_type_members_on_columns=false ++diff --git a/xmvn-connector/src/main/java/org/fedoraproject/xmvn/connector/maven/XMvnModelValidator.java b/xmvn-connector/src/main/java/org/fedoraproject/xmvn/connector/maven/XMvnModelValidator.java ++index a3fe4712..d340b91f 100644 ++--- a/xmvn-connector/src/main/java/org/fedoraproject/xmvn/connector/maven/XMvnModelValidator.java +++++ b/xmvn-connector/src/main/java/org/fedoraproject/xmvn/connector/maven/XMvnModelValidator.java ++@@ -27,6 +27,7 @@ import org.apache.maven.model.Model; ++ import org.apache.maven.model.Plugin; ++ import org.apache.maven.model.building.ModelBuildingRequest; ++ import org.apache.maven.model.building.ModelProblemCollector; +++import org.apache.maven.model.interpolation.DefaultModelVersionProcessor; ++ import org.apache.maven.model.validation.DefaultModelValidator; ++ import org.apache.maven.model.validation.ModelValidator; ++ import org.codehaus.plexus.component.annotations.Component; ++@@ -52,6 +53,11 @@ public class XMvnModelValidator ++ @Requirement ++ private Configurator configurator; ++ +++ public XMvnModelValidator() +++ { +++ super( new DefaultModelVersionProcessor() ); +++ } +++ ++ @Override ++ public void validateEffectiveModel( Model model, ModelBuildingRequest request, ModelProblemCollector problems ) ++ { ++diff --git a/xmvn-connector/src/main/java/org/fedoraproject/xmvn/connector/maven/XMvnMojoExecutionListener.java b/xmvn-connector/src/main/java/org/fedoraproject/xmvn/connector/maven/XMvnMojoExecutionListener.java ++index dc312edf..812ecd83 100644 ++--- a/xmvn-connector/src/main/java/org/fedoraproject/xmvn/connector/maven/XMvnMojoExecutionListener.java +++++ b/xmvn-connector/src/main/java/org/fedoraproject/xmvn/connector/maven/XMvnMojoExecutionListener.java ++@@ -25,6 +25,7 @@ import java.nio.file.Files; ++ import java.nio.file.Path; ++ import java.nio.file.Paths; ++ import java.util.ArrayList; +++import java.util.Collections; ++ import java.util.List; ++ import java.util.Properties; ++ ++@@ -276,7 +277,7 @@ public class XMvnMojoExecutionListener ++ } ++ else if ( XMVN_BUILDDEP.equals( execution ) ) ++ { ++- trySetBeanProperty( mojo, "resolutions", List.copyOf( resolutions ) ); +++ trySetBeanProperty( mojo, "resolutions", Collections.unmodifiableList( new ArrayList<>( resolutions ) ) ); ++ } ++ } ++ ++diff --git a/xmvn-connector/src/main/java/org/fedoraproject/xmvn/connector/maven/XMvnToolchainManager.java b/xmvn-connector/src/main/java/org/fedoraproject/xmvn/connector/maven/XMvnToolchainManager.java ++index 53f1020d..1fb59cb3 100644 ++--- a/xmvn-connector/src/main/java/org/fedoraproject/xmvn/connector/maven/XMvnToolchainManager.java +++++ b/xmvn-connector/src/main/java/org/fedoraproject/xmvn/connector/maven/XMvnToolchainManager.java ++@@ -22,6 +22,7 @@ import org.apache.maven.execution.MavenSession; ++ import org.apache.maven.project.MavenProject; ++ import org.apache.maven.toolchain.DefaultToolchainManagerPrivate; ++ import org.apache.maven.toolchain.MisconfiguredToolchainException; +++import org.apache.maven.toolchain.ToolchainPrivate; ++ import org.codehaus.plexus.component.annotations.Component; ++ ++ /** ++@@ -38,11 +39,11 @@ public class XMvnToolchainManager ++ ++ try ++ { ++- for ( var toolchain : getToolchainsForType( "jdk", session ) ) +++ for ( ToolchainPrivate toolchain : getToolchainsForType( "jdk", session ) ) ++ { ++ if ( toolchain.matchesRequirements( Collections.singletonMap( "xmvn", "xmvn" ) ) ) ++ { ++- for ( var project : session.getAllProjects() ) +++ for ( MavenProject project : session.getAllProjects() ) ++ { ++ session.setCurrentProject( project ); ++ storeToolchainToBuildContext( toolchain, session ); ++diff --git a/xmvn-core/.classpath b/xmvn-core/.classpath ++index 0fb79cfe..002ad570 100644 ++--- a/xmvn-core/.classpath +++++ b/xmvn-core/.classpath ++@@ -24,7 +24,7 @@ ++ ++ ++ ++- +++ ++ ++ ++ ++diff --git a/xmvn-core/.settings/org.eclipse.jdt.core.prefs b/xmvn-core/.settings/org.eclipse.jdt.core.prefs ++index 2d67d3f3..2f39a66b 100644 ++--- a/xmvn-core/.settings/org.eclipse.jdt.core.prefs +++++ b/xmvn-core/.settings/org.eclipse.jdt.core.prefs ++@@ -8,8 +8,8 @@ org.eclipse.jdt.core.compiler.annotation.nonnullbydefault.secondary= ++ org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable ++ org.eclipse.jdt.core.compiler.annotation.nullable.secondary= ++ org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled ++-org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 ++-org.eclipse.jdt.core.compiler.compliance=11 +++org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +++org.eclipse.jdt.core.compiler.compliance=1.8 ++ org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning ++ org.eclipse.jdt.core.compiler.problem.autoboxing=ignore ++ org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning ++@@ -97,8 +97,8 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning ++ org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning ++ org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning ++ org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning ++-org.eclipse.jdt.core.compiler.release=enabled ++-org.eclipse.jdt.core.compiler.source=11 +++org.eclipse.jdt.core.compiler.release=disabled +++org.eclipse.jdt.core.compiler.source=1.8 ++ org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false ++ org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647 ++ org.eclipse.jdt.core.formatter.align_type_members_on_columns=false ++diff --git a/xmvn-core/src/test/java/org/fedoraproject/xmvn/deployer/BasicDeployerTest.java b/xmvn-core/src/test/java/org/fedoraproject/xmvn/deployer/BasicDeployerTest.java ++index f79e5b64..0028f4f1 100644 ++--- a/xmvn-core/src/test/java/org/fedoraproject/xmvn/deployer/BasicDeployerTest.java +++++ b/xmvn-core/src/test/java/org/fedoraproject/xmvn/deployer/BasicDeployerTest.java ++@@ -28,6 +28,7 @@ import java.nio.file.Paths; ++ import java.nio.file.attribute.PosixFilePermission; ++ import java.util.Arrays; ++ import java.util.Collections; +++import java.util.regex.Matcher; ++ import java.util.regex.Pattern; ++ ++ import org.junit.jupiter.api.Test; ++@@ -149,7 +150,7 @@ public class BasicDeployerTest ++ { ++ return Files.lines( Paths.get( "/proc/self/status" ) ).map( s -> ++ { ++- var matcher = PROCESS_UID_PATTERN.matcher( s ); +++ Matcher matcher = PROCESS_UID_PATTERN.matcher( s ); ++ ++ if ( matcher.matches() ) ++ { ++diff --git a/xmvn-it/.classpath b/xmvn-it/.classpath ++index 2fcc9100..8131be0e 100644 ++--- a/xmvn-it/.classpath +++++ b/xmvn-it/.classpath ++@@ -19,7 +19,7 @@ ++ ++ ++ ++- +++ ++ ++ ++ ++diff --git a/xmvn-it/.settings/org.eclipse.jdt.core.prefs b/xmvn-it/.settings/org.eclipse.jdt.core.prefs ++index 2d67d3f3..2f39a66b 100644 ++--- a/xmvn-it/.settings/org.eclipse.jdt.core.prefs +++++ b/xmvn-it/.settings/org.eclipse.jdt.core.prefs ++@@ -8,8 +8,8 @@ org.eclipse.jdt.core.compiler.annotation.nonnullbydefault.secondary= ++ org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable ++ org.eclipse.jdt.core.compiler.annotation.nullable.secondary= ++ org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled ++-org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 ++-org.eclipse.jdt.core.compiler.compliance=11 +++org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +++org.eclipse.jdt.core.compiler.compliance=1.8 ++ org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning ++ org.eclipse.jdt.core.compiler.problem.autoboxing=ignore ++ org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning ++@@ -97,8 +97,8 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning ++ org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning ++ org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning ++ org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning ++-org.eclipse.jdt.core.compiler.release=enabled ++-org.eclipse.jdt.core.compiler.source=11 +++org.eclipse.jdt.core.compiler.release=disabled +++org.eclipse.jdt.core.compiler.source=1.8 ++ org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false ++ org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647 ++ org.eclipse.jdt.core.formatter.align_type_members_on_columns=false ++diff --git a/xmvn-it/src/test/java/org/fedoraproject/xmvn/it/AbstractIntegrationTest.java b/xmvn-it/src/test/java/org/fedoraproject/xmvn/it/AbstractIntegrationTest.java ++index f8a4e01a..c2e2d74e 100644 ++--- a/xmvn-it/src/test/java/org/fedoraproject/xmvn/it/AbstractIntegrationTest.java +++++ b/xmvn-it/src/test/java/org/fedoraproject/xmvn/it/AbstractIntegrationTest.java ++@@ -167,6 +167,11 @@ public abstract class AbstractIntegrationTest ++ return Files.lines( baseDir.resolve( STDERR ) ); ++ } ++ +++ public static int getJavaVersion() +++ { +++ return Integer.parseInt( System.getProperty( "java.version" ).replaceAll( "\\..*", "" ) ); +++ } +++ ++ /** ++ * @author Mikolaj Izdebski ++ */ ++diff --git a/xmvn-it/src/test/java/org/fedoraproject/xmvn/it/ArchiveLayoutIntegrationTest.java b/xmvn-it/src/test/java/org/fedoraproject/xmvn/it/ArchiveLayoutIntegrationTest.java ++index db7f59cb..dd8edf02 100644 ++--- a/xmvn-it/src/test/java/org/fedoraproject/xmvn/it/ArchiveLayoutIntegrationTest.java +++++ b/xmvn-it/src/test/java/org/fedoraproject/xmvn/it/ArchiveLayoutIntegrationTest.java ++@@ -190,7 +190,10 @@ public class ArchiveLayoutIntegrationTest ++ expect( 1, 1, "lib/" ); ++ expect( 30, 60, "lib/[^/]*\\.jar" ); ++ expect( 15, 30, "lib/[^/]*\\.license" ); ++- expect( 10, 100, "lib/jansi-native/.*" ); +++ +++ expect( 1, 1, "lib/jansi-native/" ); +++ expect( 1, 1, "lib/jansi-native/README\\.txt" ); +++ expect( 3, 9, "lib/jansi-native/Windows/.*" ); ++ ++ expect( 1, 1, "lib/ext/" ); ++ expect( 1, 1, "lib/ext/README\\.txt" ); ++diff --git a/xmvn-it/src/test/java/org/fedoraproject/xmvn/it/maven/mojo/javadoc/JavadocJPMSIntegrationTest.java b/xmvn-it/src/test/java/org/fedoraproject/xmvn/it/maven/mojo/javadoc/JavadocJPMSIntegrationTest.java ++index 2c28702a..78d6e394 100644 ++--- a/xmvn-it/src/test/java/org/fedoraproject/xmvn/it/maven/mojo/javadoc/JavadocJPMSIntegrationTest.java +++++ b/xmvn-it/src/test/java/org/fedoraproject/xmvn/it/maven/mojo/javadoc/JavadocJPMSIntegrationTest.java ++@@ -16,6 +16,7 @@ ++ package org.fedoraproject.xmvn.it.maven.mojo.javadoc; ++ ++ import static org.junit.jupiter.api.Assertions.assertTrue; +++import static org.junit.jupiter.api.Assumptions.assumeTrue; ++ ++ import java.nio.file.Files; ++ import java.nio.file.Paths; ++@@ -36,6 +37,7 @@ public class JavadocJPMSIntegrationTest ++ public void testJavadocJPMS() ++ throws Exception ++ { +++ assumeTrue( getJavaVersion() >= 9 ); ++ performTest( "verify", "org.fedoraproject.xmvn:xmvn-mojo:javadoc" ); ++ ++ assertTrue( Files.isDirectory( Paths.get( "target/xmvn-apidocs" ) ) ); ++diff --git a/xmvn-it/src/test/java/org/fedoraproject/xmvn/it/maven/mojo/javadoc/JavadocToolchainsIntegrationTest.java b/xmvn-it/src/test/java/org/fedoraproject/xmvn/it/maven/mojo/javadoc/JavadocToolchainsIntegrationTest.java ++new file mode 100644 ++index 00000000..c552652d ++--- /dev/null +++++ b/xmvn-it/src/test/java/org/fedoraproject/xmvn/it/maven/mojo/javadoc/JavadocToolchainsIntegrationTest.java ++@@ -0,0 +1,39 @@ +++/*- +++ * Copyright (c) 2021 Red Hat, Inc. +++ * +++ * Licensed under the Apache License, Version 2.0 (the "License"); +++ * you may not use this file except in compliance with the License. +++ * You may obtain a copy of the License at +++ * +++ * http://www.apache.org/licenses/LICENSE-2.0 +++ * +++ * Unless required by applicable law or agreed to in writing, software +++ * distributed under the License is distributed on an "AS IS" BASIS, +++ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +++ * See the License for the specific language governing permissions and +++ * limitations under the License. +++ */ +++package org.fedoraproject.xmvn.it.maven.mojo.javadoc; +++ +++import static org.junit.jupiter.api.Assertions.assertTrue; +++ +++import org.junit.jupiter.api.Test; +++ +++import org.fedoraproject.xmvn.it.maven.mojo.AbstractMojoIntegrationTest; +++ +++/** +++ * Integration tests for javadoc MOJO. +++ * +++ * @author Mikolaj Izdebski +++ */ +++public class JavadocToolchainsIntegrationTest +++ extends AbstractMojoIntegrationTest +++{ +++ @Test +++ public void testJavadocToolchains() +++ throws Exception +++ { +++ performTest( "org.fedoraproject.xmvn:xmvn-mojo:javadoc" ); +++ assertTrue( getStdout().anyMatch( s -> s.equals( "[INFO] Toolchain in xmvn-mojo: JDK[/tmp]" ) ) ); +++ } +++} ++diff --git a/xmvn-it/src/test/resources/testBuilddepPackaging/child/pom.xml b/xmvn-it/src/test/resources/testBuilddepPackaging/child/pom.xml ++index 49027aa8..66351388 100644 ++--- a/xmvn-it/src/test/resources/testBuilddepPackaging/child/pom.xml +++++ b/xmvn-it/src/test/resources/testBuilddepPackaging/child/pom.xml ++@@ -13,7 +13,7 @@ ++ ++ junit ++ junit ++- 4.12 +++ 4.13.1 ++ ++ ++ ++diff --git a/xmvn-it/src/test/resources/testBuilddepPackagingExternal/parent/pom.xml b/xmvn-it/src/test/resources/testBuilddepPackagingExternal/parent/pom.xml ++index 588a6c6b..c59dc398 100644 ++--- a/xmvn-it/src/test/resources/testBuilddepPackagingExternal/parent/pom.xml +++++ b/xmvn-it/src/test/resources/testBuilddepPackagingExternal/parent/pom.xml ++@@ -9,7 +9,7 @@ ++ ++ junit ++ junit ++- 4.12 +++ 4.13.1 ++ ++ ++ ++diff --git a/xmvn-it/src/test/resources/testBuilddepProfileActivation/pom.xml b/xmvn-it/src/test/resources/testBuilddepProfileActivation/pom.xml ++index 361b404a..fe2a495b 100644 ++--- a/xmvn-it/src/test/resources/testBuilddepProfileActivation/pom.xml +++++ b/xmvn-it/src/test/resources/testBuilddepProfileActivation/pom.xml ++@@ -19,7 +19,7 @@ ++ ++ junit ++ junit ++- 4.12 +++ 4.13.1 ++ ++ ++ ++diff --git a/xmvn-it/src/test/resources/testBuilddepProfiles/pom.xml b/xmvn-it/src/test/resources/testBuilddepProfiles/pom.xml ++index f009b33f..95c06ed4 100644 ++--- a/xmvn-it/src/test/resources/testBuilddepProfiles/pom.xml +++++ b/xmvn-it/src/test/resources/testBuilddepProfiles/pom.xml ++@@ -13,7 +13,7 @@ ++ ++ junit ++ junit ++- 4.12 +++ 4.13.1 ++ ++ ++ ++diff --git a/xmvn-it/src/test/resources/testBuilddepTychoPomless/.mvn/extensions.xml b/xmvn-it/src/test/resources/testBuilddepTychoPomless/.mvn/extensions.xml ++index 4632f0fa..10e3eba4 100644 ++--- a/xmvn-it/src/test/resources/testBuilddepTychoPomless/.mvn/extensions.xml +++++ b/xmvn-it/src/test/resources/testBuilddepTychoPomless/.mvn/extensions.xml ++@@ -3,6 +3,6 @@ ++ ++ org.eclipse.tycho.extras ++ tycho-pomless ++- 2.3.0 +++ 1.7.0 ++ ++ ++diff --git a/xmvn-it/src/test/resources/testBuilddepTychoPomless/pom.xml b/xmvn-it/src/test/resources/testBuilddepTychoPomless/pom.xml ++index 66ce6ab5..d7a58b1b 100644 ++--- a/xmvn-it/src/test/resources/testBuilddepTychoPomless/pom.xml +++++ b/xmvn-it/src/test/resources/testBuilddepTychoPomless/pom.xml ++@@ -13,7 +13,7 @@ ++ ++ org.eclipse.tycho ++ tycho-maven-plugin ++- 2.3.0 +++ 1.7.0 ++ true ++ ++ ++diff --git a/xmvn-it/src/test/resources/testJavadoc/pom.xml b/xmvn-it/src/test/resources/testJavadoc/pom.xml ++index 241bee4d..7e8703d9 100644 ++--- a/xmvn-it/src/test/resources/testJavadoc/pom.xml +++++ b/xmvn-it/src/test/resources/testJavadoc/pom.xml ++@@ -18,7 +18,7 @@ ++ ++ org.apache.commons ++ commons-compress ++- 1.20 +++ 1.21 ++ ++ ++ org.apache.maven ++diff --git a/xmvn-it/src/test/resources/testJavadocJPMS/pom.xml b/xmvn-it/src/test/resources/testJavadocJPMS/pom.xml ++index 6bb860ef..5b4afac5 100644 ++--- a/xmvn-it/src/test/resources/testJavadocJPMS/pom.xml +++++ b/xmvn-it/src/test/resources/testJavadocJPMS/pom.xml ++@@ -16,7 +16,7 @@ ++ maven-compiler-plugin ++ 3.8.1 ++ ++- 11 +++ 9 ++ ++ ++ ++diff --git a/xmvn-it/src/test/resources/testJavadocToolchains/.xmvn/configuration.xml b/xmvn-it/src/test/resources/testJavadocToolchains/.xmvn/configuration.xml ++new file mode 100644 ++index 00000000..06f5b389 ++--- /dev/null +++++ b/xmvn-it/src/test/resources/testJavadocToolchains/.xmvn/configuration.xml ++@@ -0,0 +1,7 @@ +++ +++ +++ +++ metadata.xml +++ +++ +++ ++diff --git a/xmvn-it/src/test/resources/testJavadocToolchains/pom.xml b/xmvn-it/src/test/resources/testJavadocToolchains/pom.xml ++new file mode 100644 ++index 00000000..5296a0fe ++--- /dev/null +++++ b/xmvn-it/src/test/resources/testJavadocToolchains/pom.xml ++@@ -0,0 +1,6 @@ +++ +++ 4.0.0 +++ xmvn.its +++ javadoc-toolchains-test +++ 0.0.0-SNAPSHOT +++ ++diff --git a/xmvn-it/src/test/resources/testJavadocToolchains/src/main/java/somepkg/SomeClass.java b/xmvn-it/src/test/resources/testJavadocToolchains/src/main/java/somepkg/SomeClass.java ++new file mode 100644 ++index 00000000..087d2158 ++--- /dev/null +++++ b/xmvn-it/src/test/resources/testJavadocToolchains/src/main/java/somepkg/SomeClass.java ++@@ -0,0 +1,24 @@ +++/*- +++ * Copyright (c) 2016-2021 Red Hat, Inc. +++ * +++ * Licensed under the Apache License, Version 2.0 (the "License"); +++ * you may not use this file except in compliance with the License. +++ * You may obtain a copy of the License at +++ * +++ * http://www.apache.org/licenses/LICENSE-2.0 +++ * +++ * Unless required by applicable law or agreed to in writing, software +++ * distributed under the License is distributed on an "AS IS" BASIS, +++ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +++ * See the License for the specific language governing permissions and +++ * limitations under the License. +++ */ +++package somepkg; +++ +++/** +++ * @author Mikolaj Izdebski +++ */ +++public class SomeClass +++{ +++ +++} ++diff --git a/xmvn-it/src/test/resources/testJavadocToolchains/toolchains.xml b/xmvn-it/src/test/resources/testJavadocToolchains/toolchains.xml ++new file mode 100644 ++index 00000000..9e92c646 ++--- /dev/null +++++ b/xmvn-it/src/test/resources/testJavadocToolchains/toolchains.xml ++@@ -0,0 +1,11 @@ +++ +++ +++ jdk +++ +++ xmvn +++ +++ +++ /tmp +++ +++ +++ ++diff --git a/xmvn-mojo/.classpath b/xmvn-mojo/.classpath ++index 4d004b9e..1a0c5608 100644 ++--- a/xmvn-mojo/.classpath +++++ b/xmvn-mojo/.classpath ++@@ -18,7 +18,7 @@ ++ ++ ++ ++- +++ ++ ++ ++ ++diff --git a/xmvn-mojo/.settings/org.eclipse.jdt.core.prefs b/xmvn-mojo/.settings/org.eclipse.jdt.core.prefs ++index 2d67d3f3..2f39a66b 100644 ++--- a/xmvn-mojo/.settings/org.eclipse.jdt.core.prefs +++++ b/xmvn-mojo/.settings/org.eclipse.jdt.core.prefs ++@@ -8,8 +8,8 @@ org.eclipse.jdt.core.compiler.annotation.nonnullbydefault.secondary= ++ org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable ++ org.eclipse.jdt.core.compiler.annotation.nullable.secondary= ++ org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled ++-org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 ++-org.eclipse.jdt.core.compiler.compliance=11 +++org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +++org.eclipse.jdt.core.compiler.compliance=1.8 ++ org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning ++ org.eclipse.jdt.core.compiler.problem.autoboxing=ignore ++ org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning ++@@ -97,8 +97,8 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning ++ org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning ++ org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning ++ org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning ++-org.eclipse.jdt.core.compiler.release=enabled ++-org.eclipse.jdt.core.compiler.source=11 +++org.eclipse.jdt.core.compiler.release=disabled +++org.eclipse.jdt.core.compiler.source=1.8 ++ org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false ++ org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647 ++ org.eclipse.jdt.core.formatter.align_type_members_on_columns=false ++diff --git a/xmvn-mojo/src/main/java/org/fedoraproject/xmvn/mojo/BuildDependencyVisitor.java b/xmvn-mojo/src/main/java/org/fedoraproject/xmvn/mojo/BuildDependencyVisitor.java ++index e77ca530..75cc4922 100644 ++--- a/xmvn-mojo/src/main/java/org/fedoraproject/xmvn/mojo/BuildDependencyVisitor.java +++++ b/xmvn-mojo/src/main/java/org/fedoraproject/xmvn/mojo/BuildDependencyVisitor.java ++@@ -16,6 +16,7 @@ ++ package org.fedoraproject.xmvn.mojo; ++ ++ import java.util.Arrays; +++import java.util.Collections; ++ import java.util.LinkedHashSet; ++ import java.util.List; ++ import java.util.Set; ++@@ -53,7 +54,7 @@ class BuildDependencyVisitor ++ ++ public Set getArtifacts() ++ { ++- return Set.copyOf( artifacts ); +++ return Collections.unmodifiableSet( artifacts ); ++ } ++ ++ private boolean isExternal( InputLocation location ) ++diff --git a/xmvn-mojo/src/main/java/org/fedoraproject/xmvn/mojo/JavadocMojo.java b/xmvn-mojo/src/main/java/org/fedoraproject/xmvn/mojo/JavadocMojo.java ++index b2cd41fd..20b0154a 100644 ++--- a/xmvn-mojo/src/main/java/org/fedoraproject/xmvn/mojo/JavadocMojo.java +++++ b/xmvn-mojo/src/main/java/org/fedoraproject/xmvn/mojo/JavadocMojo.java ++@@ -45,6 +45,8 @@ import org.apache.maven.project.DependencyResolutionRequest; ++ import org.apache.maven.project.DependencyResolutionResult; ++ import org.apache.maven.project.MavenProject; ++ import org.apache.maven.project.ProjectDependenciesResolver; +++import org.apache.maven.toolchain.Toolchain; +++import org.apache.maven.toolchain.ToolchainManager; ++ import org.codehaus.plexus.logging.Logger; ++ import org.codehaus.plexus.util.StringUtils; ++ import org.eclipse.aether.util.filter.AndDependencyFilter; ++@@ -67,7 +69,10 @@ public class JavadocMojo ++ private ProjectDependenciesResolver resolver; ++ ++ @Component ++- private Configurator confugurator; +++ private Configurator configurator; +++ +++ @Component +++ private ToolchainManager toolchainManager; ++ ++ @Parameter( defaultValue = "${session}", readonly = true ) ++ private MavenSession session; ++@@ -84,9 +89,12 @@ public class JavadocMojo ++ @Parameter( defaultValue = "${project.build.directory}", required = true ) ++ private File buildDirectory; ++ ++- @Parameter( property = "source" ) +++ @Parameter( property = "source", defaultValue = "${maven.compiler.source}" ) ++ private String source; ++ +++ @Parameter( defaultValue = "${maven.compiler.release}" ) +++ private String release; +++ ++ private static String quoted( Object obj ) ++ { ++ String arg = obj.toString(); ++@@ -161,12 +169,21 @@ public class JavadocMojo ++ public void execute() ++ throws MojoExecutionException, MojoFailureException ++ { +++ String javadocTool = null; +++ Toolchain tc = toolchainManager.getToolchainFromBuildContext( "jdk", session ); +++ if ( tc != null ) +++ { +++ logger.info( "Toolchain in xmvn-mojo: " + tc ); +++ javadocTool = tc.findTool( "javadoc" ); +++ } ++ Path javadocExecutable; ++- if ( System.getenv().containsKey( "JAVA_HOME" ) ) +++ if ( javadocTool != null && !javadocTool.isEmpty() ) ++ { ++- javadocExecutable = Paths.get( System.getenv( "JAVA_HOME" ) ) // ++- .resolve( "bin" ) // ++- .resolve( "javadoc" ); +++ javadocExecutable = Paths.get( javadocTool ); +++ } +++ else if ( System.getenv().containsKey( "JAVA_HOME" ) ) +++ { +++ javadocExecutable = Paths.get( System.getenv( "JAVA_HOME" ) ).resolve( "bin" ).resolve( "javadoc" ); ++ } ++ else ++ { ++@@ -222,8 +239,38 @@ public class JavadocMojo ++ List reactorClassPath = new ArrayList<>(); ++ List fullClassPath = new ArrayList<>(); ++ populateClasspath( reactorClassPath, fullClassPath ); +++ boolean isModular = !findFiles( reactorClassPath, "module-info\\.class" ).isEmpty(); ++ ++- if ( findFiles( reactorClassPath, "module-info\\.class" ).isEmpty() ) +++ String sourceLevel = null; +++ if ( release != null ) +++ { +++ opts.add( "--release" ); +++ opts.add( quoted( release ) ); +++ sourceLevel = release; +++ } +++ else if ( source != null ) +++ { +++ opts.add( "-source" ); +++ opts.add( quoted( source ) ); +++ sourceLevel = source; +++ } +++ +++ boolean skipModuleInfo = !isModular; +++ if ( sourceLevel != null ) +++ { +++ try +++ { +++ float f = Float.parseFloat( sourceLevel ); +++ if ( f < 9 ) +++ skipModuleInfo = true; +++ } +++ catch ( Exception e ) +++ { +++ // pass, we assume that we use modular Java +++ } +++ } +++ +++ if ( !isModular || skipModuleInfo ) ++ { ++ opts.add( "-classpath" ); ++ } ++@@ -244,15 +291,11 @@ public class JavadocMojo ++ opts.add( quoted( docencoding ) ); ++ opts.add( "-doctitle" ); ++ opts.add( quoted( "Javadoc for package XXX" ) ); ++- if ( source != null ) ++- { ++- opts.add( "-source" ); ++- opts.add( quoted( source ) ); ++- } ++ ++ for ( Path file : sourceFiles ) ++ { ++- opts.add( quoted( file ) ); +++ if ( !skipModuleInfo || !file.endsWith( "module-info.java" ) ) +++ opts.add( quoted( file ) ); ++ } ++ ++ Files.write( outputDir.resolve( "args" ), opts, StandardOpenOption.CREATE ); ++diff --git a/xmvn-parent/pom.xml b/xmvn-parent/pom.xml ++index 2dafffbe..030923f9 100644 ++--- a/xmvn-parent/pom.xml +++++ b/xmvn-parent/pom.xml ++@@ -77,47 +77,47 @@ ++ ++ US-ASCII ++ ++- 9.2 ++- 1.81 ++- 3.1.0 ++- 1.7.1 ++- 3.8.1 +++ 9.3 +++ 1.82 +++ 3.2.0 +++ 1.8.1 +++ 3.8.6 ++ 2.6.0 ++- 3.3.0 ++- 3.6.1 ++- 2.0.0-alpha2 +++ 3.4.2 +++ 3.6.4 +++ 2.0.0-alpha7 ++ 1.21 ++ ++ ++ 1.3.2.GA ++ 3.3.0 ++- 3.2.0 ++- 8.44 +++ 3.3.0 +++ 9.3 ++ 3.1.2 ++- 3.1.0 ++- 3.8.1 ++- 3.2.0 ++- 3.0.0-M1 +++ 3.2.0 +++ 3.10.1 +++ 3.3.0 +++ 3.0.0-M2 ++ 4.3 ++ 3.0.1 ++ 3.0.0-M1 ++- 0.8.7 ++- 3.2.0 ++- 3.3.0 ++- 5.7.2 +++ 0.8.8 +++ 3.2.2 +++ 3.4.0 +++ 5.8.2 ++ 2.3 ++ 1.0 ++- 1.11 ++- 1.6.8 +++ 2.0.0 +++ 1.6.13 ++ 3.0.1 ++ 3.0.0 ++- 2.1.0 ++- 0.13 +++ 2.1.1 +++ 0.14 ++ 3.2.0 ++- 3.9.1 +++ 3.12.0 ++ 3.2.1 ++- 3.0.0-M5 ++- 2.8.2 +++ 3.0.0-M7 +++ 2.9.0 ++ ++ ++ ++@@ -298,7 +298,8 @@ ++ maven-compiler-plugin ++ ${compilerPluginVersion} ++ ++- 11 +++ 1.8 +++ 1.8 ++ ++ ++ ++@@ -469,12 +470,6 @@ ++ ++ ++ release ++- ++- ++- env.CI ++- true ++- ++- ++ ++ ++ ++@@ -564,5 +559,27 @@ ++ ++ ++ +++ +++ jdk9+ +++ +++ [9,) +++ +++ +++ +++ +++ maven-compiler-plugin +++ +++ 8 +++ +++ +++ +++ maven-surefire-plugin +++ +++ --add-opens java.base/java.lang=ALL-UNNAMED +++ +++ +++ +++ +++ ++ ++ ++diff --git a/xmvn-tools/xmvn-install/.classpath b/xmvn-tools/xmvn-install/.classpath ++index 0fb79cfe..002ad570 100644 ++--- a/xmvn-tools/xmvn-install/.classpath +++++ b/xmvn-tools/xmvn-install/.classpath ++@@ -24,7 +24,7 @@ ++ ++ ++ ++- +++ ++ ++ ++ ++diff --git a/xmvn-tools/xmvn-install/.settings/org.eclipse.jdt.core.prefs b/xmvn-tools/xmvn-install/.settings/org.eclipse.jdt.core.prefs ++index 2d67d3f3..2f39a66b 100644 ++--- a/xmvn-tools/xmvn-install/.settings/org.eclipse.jdt.core.prefs +++++ b/xmvn-tools/xmvn-install/.settings/org.eclipse.jdt.core.prefs ++@@ -8,8 +8,8 @@ org.eclipse.jdt.core.compiler.annotation.nonnullbydefault.secondary= ++ org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable ++ org.eclipse.jdt.core.compiler.annotation.nullable.secondary= ++ org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled ++-org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 ++-org.eclipse.jdt.core.compiler.compliance=11 +++org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +++org.eclipse.jdt.core.compiler.compliance=1.8 ++ org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning ++ org.eclipse.jdt.core.compiler.problem.autoboxing=ignore ++ org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning ++@@ -97,8 +97,8 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning ++ org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning ++ org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning ++ org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning ++-org.eclipse.jdt.core.compiler.release=enabled ++-org.eclipse.jdt.core.compiler.source=11 +++org.eclipse.jdt.core.compiler.release=disabled +++org.eclipse.jdt.core.compiler.source=1.8 ++ org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false ++ org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647 ++ org.eclipse.jdt.core.formatter.align_type_members_on_columns=false ++diff --git a/xmvn-tools/xmvn-install/src/test/java/org/fedoraproject/xmvn/tools/install/JarUtilsTest.java b/xmvn-tools/xmvn-install/src/test/java/org/fedoraproject/xmvn/tools/install/JarUtilsTest.java ++index 8866752d..d2ef084e 100644 ++--- a/xmvn-tools/xmvn-install/src/test/java/org/fedoraproject/xmvn/tools/install/JarUtilsTest.java +++++ b/xmvn-tools/xmvn-install/src/test/java/org/fedoraproject/xmvn/tools/install/JarUtilsTest.java ++@@ -411,8 +411,8 @@ public class JarUtilsTest ++ ++ byte[] content = Files.readAllBytes( testJar ); ++ ++- var previousSecurity = System.getSecurityManager(); ++- var fobiddingSecurity = new ForbiddingSecurityManager( testJar.toString() ); +++ SecurityManager previousSecurity = System.getSecurityManager(); +++ SecurityManager fobiddingSecurity = new ForbiddingSecurityManager( testJar.toString() ); ++ ++ System.setSecurityManager( fobiddingSecurity ); ++ ++@@ -430,7 +430,7 @@ public class JarUtilsTest ++ "Content of the backup file is different from the content of the original file" ); ++ ++ System.setSecurityManager( previousSecurity ); ++- try ( var os = new FileOutputStream( testJar.toFile(), true ) ) +++ try ( FileOutputStream os = new FileOutputStream( testJar.toFile(), true ) ) ++ { ++ /// Append garbage to the original file to check if the content of the backup will be retained ++ os.write( 0 ); ++diff --git a/xmvn-tools/xmvn-resolve/.classpath b/xmvn-tools/xmvn-resolve/.classpath ++index 97c81cef..4f8e155a 100644 ++--- a/xmvn-tools/xmvn-resolve/.classpath +++++ b/xmvn-tools/xmvn-resolve/.classpath ++@@ -13,7 +13,7 @@ ++ ++ ++ ++- +++ ++ ++ ++ ++diff --git a/xmvn-tools/xmvn-resolve/.settings/org.eclipse.jdt.core.prefs b/xmvn-tools/xmvn-resolve/.settings/org.eclipse.jdt.core.prefs ++index 2d67d3f3..2f39a66b 100644 ++--- a/xmvn-tools/xmvn-resolve/.settings/org.eclipse.jdt.core.prefs +++++ b/xmvn-tools/xmvn-resolve/.settings/org.eclipse.jdt.core.prefs ++@@ -8,8 +8,8 @@ org.eclipse.jdt.core.compiler.annotation.nonnullbydefault.secondary= ++ org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable ++ org.eclipse.jdt.core.compiler.annotation.nullable.secondary= ++ org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled ++-org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 ++-org.eclipse.jdt.core.compiler.compliance=11 +++org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +++org.eclipse.jdt.core.compiler.compliance=1.8 ++ org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning ++ org.eclipse.jdt.core.compiler.problem.autoboxing=ignore ++ org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning ++@@ -97,8 +97,8 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning ++ org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning ++ org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning ++ org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning ++-org.eclipse.jdt.core.compiler.release=enabled ++-org.eclipse.jdt.core.compiler.source=11 +++org.eclipse.jdt.core.compiler.release=disabled +++org.eclipse.jdt.core.compiler.source=1.8 ++ org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false ++ org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647 ++ org.eclipse.jdt.core.formatter.align_type_members_on_columns=false ++diff --git a/xmvn-tools/xmvn-subst/.classpath b/xmvn-tools/xmvn-subst/.classpath ++index 4559ca0b..5e8a55fe 100644 ++--- a/xmvn-tools/xmvn-subst/.classpath +++++ b/xmvn-tools/xmvn-subst/.classpath ++@@ -13,7 +13,7 @@ ++ ++ ++ ++- +++ ++ ++ ++ ++diff --git a/xmvn-tools/xmvn-subst/.settings/org.eclipse.jdt.core.prefs b/xmvn-tools/xmvn-subst/.settings/org.eclipse.jdt.core.prefs ++index 2d67d3f3..2f39a66b 100644 ++--- a/xmvn-tools/xmvn-subst/.settings/org.eclipse.jdt.core.prefs +++++ b/xmvn-tools/xmvn-subst/.settings/org.eclipse.jdt.core.prefs ++@@ -8,8 +8,8 @@ org.eclipse.jdt.core.compiler.annotation.nonnullbydefault.secondary= ++ org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable ++ org.eclipse.jdt.core.compiler.annotation.nullable.secondary= ++ org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled ++-org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 ++-org.eclipse.jdt.core.compiler.compliance=11 +++org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +++org.eclipse.jdt.core.compiler.compliance=1.8 ++ org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning ++ org.eclipse.jdt.core.compiler.problem.autoboxing=ignore ++ org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning ++@@ -97,8 +97,8 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning ++ org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning ++ org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning ++ org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning ++-org.eclipse.jdt.core.compiler.release=enabled ++-org.eclipse.jdt.core.compiler.source=11 +++org.eclipse.jdt.core.compiler.release=disabled +++org.eclipse.jdt.core.compiler.source=1.8 ++ org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false ++ org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647 ++ org.eclipse.jdt.core.formatter.align_type_members_on_columns=false +-- +2.37.3 + diff --git a/javapackages-bootstrap.spec b/javapackages-bootstrap.spec index 1496777..5a3239f 100644 --- a/javapackages-bootstrap.spec +++ b/javapackages-bootstrap.spec @@ -150,6 +150,7 @@ Source1107: xmvn.tar.xz Source1108: xz-java.tar.xz Patch0: 0001-Bind-to-OpenJDK-17-for-runtime.patch +Patch1: 0002-Rebase-xmvn-to-current-trunk.patch Provides: bundled(ant) = 1.10.12 Provides: bundled(apache-parent) = 26 @@ -307,6 +308,7 @@ for source in ${other_sources}; do done %patch0 -p1 +%patch1 -p1 for patch_path in patches/*/*; do package_name="$(echo ${patch_path} | cut -f2 -d/)" From 7b51c19867839c4a33d59c7fe27a56bd8faff869 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 19 Jan 2023 13:37:45 +0000 Subject: [PATCH 50/77] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- javapackages-bootstrap.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/javapackages-bootstrap.spec b/javapackages-bootstrap.spec index 5a3239f..ee32162 100644 --- a/javapackages-bootstrap.spec +++ b/javapackages-bootstrap.spec @@ -17,7 +17,7 @@ Name: javapackages-bootstrap Version: 1.7.2 -Release: 1%{?dist} +Release: 2%{?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 @@ -361,6 +361,9 @@ echo '%%jpb_env PATH=/usr/libexec/javapackages-bootstrap:$PATH' >%{buildroot}%{_ %doc AUTHORS %changelog +* Thu Jan 19 2023 Fedora Release Engineering - 1.7.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Wed Oct 19 2022 Marian Koncek - 1.7.2-1 - Update to upstream version 1.7.2 From 518cfa09838f5276b86863f93b1a6b021807b4de Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 6 Mar 2023 13:31:50 +0100 Subject: [PATCH 51/77] Update to upstream version 1.8.0 --- .gitignore | 3 + javapackages-bootstrap.spec | 127 +++++++++++++++++++++--------------- sources | 8 ++- 3 files changed, 84 insertions(+), 54 deletions(-) diff --git a/.gitignore b/.gitignore index 3c2d508..7eb5671 100644 --- a/.gitignore +++ b/.gitignore @@ -133,3 +133,6 @@ /7fae2e4.tar.gz /9e621d9.tar.gz /javapackages-bootstrap-1.7.2.tar.xz +/javapackages-bootstrap-1.8.0.tar.xz +/modulemaker-maven-plugin.tar.xz +/xmvn-generator.tar.xz diff --git a/javapackages-bootstrap.spec b/javapackages-bootstrap.spec index ee32162..093f869 100644 --- a/javapackages-bootstrap.spec +++ b/javapackages-bootstrap.spec @@ -6,24 +6,25 @@ %global __requires_exclude_from \\.jar$ %global __provides_exclude_from \\.jar$ +%global debug_package %{nil} + %global javaHomePath %{_jvmdir}/java-17-openjdk %global mavenHomePath %{_datadir}/%{name} %global metadataPath %{mavenHomePath}/maven-metadata -%global artifactsPath %{_javadir} +%global artifactsPath %{_jnidir} %global launchersPath %{_libexecdir}/%{name} #global git_hash ... #global git_short_hash %(echo %{git_hash} | cut -b -7) Name: javapackages-bootstrap -Version: 1.7.2 -Release: 2%{?dist} +Version: 1.8.0 +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 URL: https://github.com/fedora-java/javapackages-bootstrap -BuildArch: noarch -ExclusiveArch: %{java_arches} noarch +ExclusiveArch: %{java_arches} 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 @@ -113,49 +114,48 @@ 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 -Patch1: 0002-Rebase-xmvn-to-current-trunk.patch +Source1074: modulemaker-maven-plugin.tar.xz +Source1075: mojo-parent-pom.tar.xz +Source1076: munge-maven-plugin.tar.xz +Source1077: objenesis.tar.xz +Source1078: opentest4j.tar.xz +Source1079: osgi-annotation.tar.xz +Source1080: osgi-cmpn.tar.xz +Source1081: osgi-core.tar.xz +Source1082: oss-parent-pom.tar.xz +Source1083: plexus-archiver.tar.xz +Source1084: plexus-build-api.tar.xz +Source1085: plexus-cipher.tar.xz +Source1086: plexus-classworlds.tar.xz +Source1087: plexus-compiler.tar.xz +Source1088: plexus-components-pom.tar.xz +Source1089: plexus-containers.tar.xz +Source1090: plexus-interpolation.tar.xz +Source1091: plexus-io.tar.xz +Source1092: plexus-languages.tar.xz +Source1093: plexus-pom.tar.xz +Source1094: plexus-resources.tar.xz +Source1095: plexus-sec-dispatcher.tar.xz +Source1096: plexus-utils.tar.xz +Source1097: qdox.tar.xz +Source1098: servlet-api.tar.xz +Source1099: sisu-inject.tar.xz +Source1100: sisu-mojos.tar.xz +Source1101: sisu-plexus.tar.xz +Source1102: slf4j.tar.xz +Source1103: testng.tar.xz +Source1104: univocity-parsers.tar.xz +Source1105: velocity-engine.tar.xz +Source1106: xbean.tar.xz +Source1107: xmlunit.tar.xz +Source1108: xmvn-generator.tar.xz +Source1109: xmvn.tar.xz +Source1110: xz-java.tar.xz Provides: bundled(ant) = 1.10.12 Provides: bundled(apache-parent) = 26 Provides: bundled(apiguardian) = 1.1.2 -Provides: bundled(objectweb-asm) = 9.3 +Provides: bundled(objectweb-asm) = 9.4 Provides: bundled(assertj-core) = 3.19.0 Provides: bundled(aqute-bnd) = 5.2.0 Provides: bundled(maven-plugin-build-helper) = 3.2.0 @@ -225,6 +225,7 @@ Provides: bundled(maven-wagon) = 3.5.1 Provides: bundled(maven) = 3.8.5 Provides: bundled(mockito) = 3.7.13 Provides: bundled(modello) = 2.0.0 +Provides: bundled(modulemaker-maven-plugin) = 1.9 Provides: bundled(mojo-parent) = 67 Provides: bundled(munge-maven-plugin) = 1.0 Provides: bundled(objenesis) = 3.1 @@ -258,16 +259,21 @@ Provides: bundled(univocity-parsers) = 2.9.1 Provides: bundled(velocity) = 1.7 Provides: bundled(xbean) = 4.18 Provides: bundled(xmlunit) = 2.8.2 -Provides: bundled(xmvn) = 4.0.0 +Provides: bundled(xmvn-generator) = 1.2.1 +Provides: bundled(xmvn) = 4.1.0 Provides: bundled(xz-java) = 1.9 BuildRequires: byaccj +BuildRequires: gcc BuildRequires: java-17-openjdk-devel +BuildRequires: jurand +BuildRequires: rpm-devel Requires: bash Requires: coreutils Requires: java-17-openjdk-devel Requires: procps-ng +Requires: lujavrite%{?_isa} Requires: javapackages-common @@ -307,9 +313,6 @@ for source in ${other_sources}; do tar -xf "${source}" done -%patch0 -p1 -%patch1 -p1 - for patch_path in patches/*/*; do package_name="$(echo ${patch_path} | cut -f2 -d/)" patch_name="$(echo ${patch_path} | cut -f3 -d/)" @@ -339,8 +342,24 @@ JAVA_HOME=%{javaHomePath} ./mbi.sh dist \ # Use custom toolchains.xml cp -p %{SOURCE101} %{buildroot}%{mavenHomePath}/conf/toolchains.xml -install -d -m 755 %{buildroot}%{_rpmmacrodir} -echo '%%jpb_env PATH=/usr/libexec/javapackages-bootstrap:$PATH' >%{buildroot}%{_rpmmacrodir}/macros.%{name} +install -D -p -m 644 downstream/xmvn-generator/src/main/lua/xmvn-generator.lua %{buildroot}%{_rpmluadir}/%{name}-generator.lua +install -D -p -m 644 downstream/xmvn-generator/src/main/rpm/macros.xmvngen %{buildroot}%{_rpmmacrodir}/macros.jpbgen +install -D -p -m 644 downstream/xmvn-generator/src/main/rpm/macros.xmvngenhook %{buildroot}%{_sysconfdir}/rpm/macros.jpbgenhook +install -D -p -m 644 downstream/xmvn-generator/src/main/rpm/xmvngen.attr %{buildroot}%{_fileattrsdir}/jpbgen.attr + +echo ' +%%__xmvngen_debug 1 +%%__xmvngen_libjvm %{javaHomePath}/lib/server/libjvm.so +%%__xmvngen_classpath %{artifactsPath}/%{name}/xmvn-generator.jar:%{artifactsPath}/%{name}/asm.jar:%{artifactsPath}/%{name}/commons-compress.jar +%%__xmvngen_provides_generators org.fedoraproject.xmvn.generator.jpms.JPMSGeneratorFactory +%%__xmvngen_requires_generators %%{nil} +%%__xmvngen_post_install_hooks org.fedoraproject.xmvn.generator.transformer.TransformerHookFactory +%%jpb_env PATH=/usr/libexec/javapackages-bootstrap:$PATH +' >%{buildroot}%{_rpmmacrodir}/macros.jpbgen + +sed -i s/xmvn-generator/%{name}-generator/ %{buildroot}%{_sysconfdir}/rpm/macros.jpbgenhook +sed -i s/xmvn-generator/%{name}-generator/ %{buildroot}%{_fileattrsdir}/jpbgen.attr +sed -i s/_xmvngen_/_jpbgen_/ %{buildroot}%{_fileattrsdir}/jpbgen.attr %check %{buildroot}%{launchersPath}/xmvn --version @@ -351,7 +370,10 @@ echo '%%jpb_env PATH=/usr/libexec/javapackages-bootstrap:$PATH' >%{buildroot}%{_ %{metadataPath}/* %{artifactsPath}/* %{launchersPath}/* -%{_rpmmacrodir} +%{_rpmluadir}/* +%{_rpmmacrodir}/* +%{_fileattrsdir}/* +%{_sysconfdir}/rpm/* %files openjdk8 %{mavenHomePath}/conf/toolchains.xml @@ -361,6 +383,9 @@ echo '%%jpb_env PATH=/usr/libexec/javapackages-bootstrap:$PATH' >%{buildroot}%{_ %doc AUTHORS %changelog +* Fri Mar 17 2023 Mikolaj Izdebski - 1.8.0-1 +- Update to upstream version 1.8.0 + * Thu Jan 19 2023 Fedora Release Engineering - 1.7.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild diff --git a/sources b/sources index bf0bd0d..b77bee8 100644 --- a/sources +++ b/sources @@ -1,8 +1,8 @@ -SHA512 (javapackages-bootstrap-1.7.2.tar.xz) = 4734dbbebe81eaf9ebca934c4a73f86c9e0fc93d707d9d967f3d24f64fd61af1bd2c359fc56f5068814b175bc0741fd4832759abd0f44c176f60553fdc8e5aa3 +SHA512 (javapackages-bootstrap-1.8.0.tar.xz) = 1a704004c23504673840d9de8dc623814d489c092de5ed7637b9ef09bd5a74917c4984cb35719d9df907b3471362d23abce444c61c9608a7211ceb571a87b4c4 SHA512 (ant.tar.xz) = d2a4babb7766fc2acf3e9377ffd5af790c7d0612d3e34a9642a9a2b85ffb0f15936ef2979389496dce8ea72ed941797cd1f7507beeb1853a46394019adde4152 SHA512 (apache-pom.tar.xz) = feebe0142114a6fb61dec26153bdef4314554d109bcf4910518ae9ecaf27e5dd9dc1f03d48271833f3497ab7045265900c5816708f513ae834643c533cd1291f SHA512 (apiguardian.tar.xz) = c3d75e88a983eb53c06007fd01f11c89083e119d2d4ed5d0e97644f45d5e451fd611bee493d720d011562ae29e7cdfd1d6fb4621d17c9db4b61430e62afea2bf -SHA512 (asm.tar.xz) = 4e734062489794c72de2d65adfdb39a9fa498b967ec4c5f0e2f1279af71d11a7905539d73cffcb21832737c9339cc489fe7cce2e31d07283160c1a6517ea6ac1 +SHA512 (asm.tar.xz) = c5c753e84f70f8ab17369d94e93d4e3fdbc717fd5579ea476c79dd883a1723b85268549cda26cc3bf355339755c7cc3620329a4313d5ffe9294b4de7ad537c52 SHA512 (assertj-core.tar.xz) = 56c2f6a68cc7bbd5921640375656565a7854270b14f25f18df69d6ac39dfe8cc2625388ae13fa9747bf46d112782c5802b13b56b9f3e6b44be818a9e49f5fdc8 SHA512 (bnd.tar.xz) = bb163a650a6f92f88051a6d169d40a2b1b103d12f5e219be55eac16acdf23868ab8544610891c7b0bd58e79a7c8d7dd5fc238b2bc5195b4510f764593966ba2a SHA512 (build-helper-maven-plugin.tar.xz) = eb45f6d26d89f21d0b306660421425cf0c3f10819f0b2d89c8db334c1574e2bf3196eb4f4cda65e8179ae4822a933190fb2c5276510daf52b2c26020e75f298e @@ -72,6 +72,7 @@ SHA512 (maven-wagon.tar.xz) = abac6ca4ec8b813a7829dea5b90c67938d0c23a03dd24b08b6 SHA512 (maven.tar.xz) = dca267003c12bfbde23bdf5b0a3f90351ba79e7a4a5b3fd7e062441c5b94909043791bc4c2ccd4313c72ddd280502361bd53106b4fc99c6b1cc3fd2c07d4b74c SHA512 (mockito.tar.xz) = 8fefdeae3e7bcb41c97080aa208bc9bb6fa787235cc572990ba376c9995f60fa7ab7534e88701da36b00b49eb7b5f2b1c479bbf0e9c86fc1923a7eddc68b4c77 SHA512 (modello.tar.xz) = 7bdd8fd70336f305404bf3e320aba4edcf84fbeb49a8f5d1d027df6a1953ed82ebfcf90896093899a3818c186292793fc7764093f20e5a5a74e2e8c1137a95a3 +SHA512 (modulemaker-maven-plugin.tar.xz) = a9d93ddd47419f5de597babf648e509084e7dd4a5c18ef8aed646fbcff886d20f2a7b297463ebaa1cf70f7e26bf3690c7a9b60e5e47fae6b7392807a133302ac SHA512 (mojo-parent-pom.tar.xz) = a9b9da6b088eb7c78e12734d0ecb5787a738d5956766a70dc2db70f47c0706b27f382c505d07638c5aaba8740721ae985a4abf38c6909b817fe6358eb8a506c3 SHA512 (munge-maven-plugin.tar.xz) = 898d65256a04ebb108effe1d9b2b973f744556c0e7c16c99139c8fa1f059f0e32a13e01d872d8b6cd3cb056337e9ffa69ec0f8248131ee51d012c008b91290d9 SHA512 (objenesis.tar.xz) = 40395a14bcc6a01ee1c0d8c2c2476876cae905461119bcdeb748f42860cd0f5e945ddbc4e54eb26a53e639da71ff3f35f107c64666a54dc3aa1b774397448765 @@ -105,5 +106,6 @@ SHA512 (univocity-parsers.tar.xz) = 7daa3f54d26d7c64714990c7ad9d539bc7dd53191735 SHA512 (velocity-engine.tar.xz) = c8baa9e159acae579848c1dd33b488eb70f64280e2f806e0e2ccf3024d1bc4f588086cb523e0d8e6ea2f8802ff908ff5578e86e646131768356c6d6e9b7214d0 SHA512 (xbean.tar.xz) = 78bd8f7ed95b04e23df68f89890b16d86e7328b00881ddaaedcde07456761992cf4a25f4e83ebf48637ccb09dd48ff8d6646f8e3062468eb4f2a5f100369a756 SHA512 (xmlunit.tar.xz) = 2fa565f76c7e53283bf2aed9d0b092ec331352e5348b964de4ee9308e4094961b7509f5930575dc33ec623b7a074964019bfe247356507d7ec21dc18b2a8f58c -SHA512 (xmvn.tar.xz) = 9d8393b5000e981bfb4aefe6a6352d5235d15f312af4d82170b90fec5f32619419e20c11cdc819aed280c681091cbe8a27d8a50193ee24303a08eb4ba30c0eec +SHA512 (xmvn-generator.tar.xz) = 63b40f3d4c57f18ae2aee720f87f891cce3e37a3f485b158931e35a9b653201f3f241edc580cbc357103813924e314ff4029e96d1abed73f51dbb123d04c335a +SHA512 (xmvn.tar.xz) = 13116e0c6a6c75ec3f665734934fc3bb7360e39b46e6616ecf6e529b4789c308e369173b295395f688662f4e26318cac1dc3415604120301804ef7f1e3111605 SHA512 (xz-java.tar.xz) = dc4314babc66bf33e2964b35552746e30ddae136d2b717c3e498f5109154198595bc42d0b266b9e9966298d53d2f5d0196823fae193776eae27047d225cd2137 From 8b6823cd0c4f2c9ac5974a03f47a9975f822b901 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 17 Mar 2023 11:19:10 +0100 Subject: [PATCH 52/77] Switch to javapackages-tests branch f39 --- plans/javapackages.fmf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf index 8f6c9cb..0cbb629 100644 --- a/plans/javapackages.fmf +++ b/plans/javapackages.fmf @@ -2,6 +2,6 @@ summary: Run javapackages-specific tests discover: how: fmf url: https://src.fedoraproject.org/tests/javapackages - ref: f37 + ref: f39 execute: how: tmt From dbd3103f839587d068bf4ae4a56dc4439bb39c6c Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 20 Mar 2023 09:15:42 +0100 Subject: [PATCH 53/77] Update to upstream version 1.8.1 --- .gitignore | 1 + javapackages-bootstrap.spec | 7 +++++-- sources | 4 ++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 7eb5671..c49d36f 100644 --- a/.gitignore +++ b/.gitignore @@ -136,3 +136,4 @@ /javapackages-bootstrap-1.8.0.tar.xz /modulemaker-maven-plugin.tar.xz /xmvn-generator.tar.xz +/javapackages-bootstrap-1.8.1.tar.xz diff --git a/javapackages-bootstrap.spec b/javapackages-bootstrap.spec index 093f869..e2c6be0 100644 --- a/javapackages-bootstrap.spec +++ b/javapackages-bootstrap.spec @@ -18,7 +18,7 @@ #global git_short_hash %(echo %{git_hash} | cut -b -7) Name: javapackages-bootstrap -Version: 1.8.0 +Version: 1.8.1 Release: 1%{?dist} Summary: A means of bootstrapping Java Packages Tools # For detailed info see the file javapackages-bootstrap-PACKAGE-LICENSING @@ -260,7 +260,7 @@ Provides: bundled(velocity) = 1.7 Provides: bundled(xbean) = 4.18 Provides: bundled(xmlunit) = 2.8.2 Provides: bundled(xmvn-generator) = 1.2.1 -Provides: bundled(xmvn) = 4.1.0 +Provides: bundled(xmvn) = 4.2.0 Provides: bundled(xz-java) = 1.9 BuildRequires: byaccj @@ -383,6 +383,9 @@ sed -i s/_xmvngen_/_jpbgen_/ %{buildroot}%{_fileattrsdir}/jpbgen.attr %doc AUTHORS %changelog +* Mon Mar 20 2023 Mikolaj Izdebski - 1.8.1-1 +- Update to upstream version 1.8.1 + * Fri Mar 17 2023 Mikolaj Izdebski - 1.8.0-1 - Update to upstream version 1.8.0 diff --git a/sources b/sources index b77bee8..23340e7 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -SHA512 (javapackages-bootstrap-1.8.0.tar.xz) = 1a704004c23504673840d9de8dc623814d489c092de5ed7637b9ef09bd5a74917c4984cb35719d9df907b3471362d23abce444c61c9608a7211ceb571a87b4c4 +SHA512 (javapackages-bootstrap-1.8.1.tar.xz) = 8f13a11d59ae27ec86389aed3b9896de60998a145b9663b2cd83c19e7a37335953e3bb76ab77f9e3651fe12a60bc75c0f28a494cb525b35324353a4b429d11b2 SHA512 (ant.tar.xz) = d2a4babb7766fc2acf3e9377ffd5af790c7d0612d3e34a9642a9a2b85ffb0f15936ef2979389496dce8ea72ed941797cd1f7507beeb1853a46394019adde4152 SHA512 (apache-pom.tar.xz) = feebe0142114a6fb61dec26153bdef4314554d109bcf4910518ae9ecaf27e5dd9dc1f03d48271833f3497ab7045265900c5816708f513ae834643c533cd1291f SHA512 (apiguardian.tar.xz) = c3d75e88a983eb53c06007fd01f11c89083e119d2d4ed5d0e97644f45d5e451fd611bee493d720d011562ae29e7cdfd1d6fb4621d17c9db4b61430e62afea2bf @@ -107,5 +107,5 @@ SHA512 (velocity-engine.tar.xz) = c8baa9e159acae579848c1dd33b488eb70f64280e2f806 SHA512 (xbean.tar.xz) = 78bd8f7ed95b04e23df68f89890b16d86e7328b00881ddaaedcde07456761992cf4a25f4e83ebf48637ccb09dd48ff8d6646f8e3062468eb4f2a5f100369a756 SHA512 (xmlunit.tar.xz) = 2fa565f76c7e53283bf2aed9d0b092ec331352e5348b964de4ee9308e4094961b7509f5930575dc33ec623b7a074964019bfe247356507d7ec21dc18b2a8f58c SHA512 (xmvn-generator.tar.xz) = 63b40f3d4c57f18ae2aee720f87f891cce3e37a3f485b158931e35a9b653201f3f241edc580cbc357103813924e314ff4029e96d1abed73f51dbb123d04c335a -SHA512 (xmvn.tar.xz) = 13116e0c6a6c75ec3f665734934fc3bb7360e39b46e6616ecf6e529b4789c308e369173b295395f688662f4e26318cac1dc3415604120301804ef7f1e3111605 +SHA512 (xmvn.tar.xz) = 3e75b3f9a2d33eac5f5b66e78d71b18a012320001dba7ef6c5c95ae3e24183d265a2d136ccf8886619ab63beeba6b7a95760247594b49df4d764c71c34dbdfb7 SHA512 (xz-java.tar.xz) = dc4314babc66bf33e2964b35552746e30ddae136d2b717c3e498f5109154198595bc42d0b266b9e9966298d53d2f5d0196823fae193776eae27047d225cd2137 From d6f782584b2f5bdaf2976cac10d9b8cd075ef387 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 27 Mar 2023 09:29:08 +0200 Subject: [PATCH 54/77] Update to upstream version 1.9.0 --- .gitignore | 2 + javapackages-bootstrap.spec | 167 ++++++++++++++++++------------------ sources | 14 +-- 3 files changed, 94 insertions(+), 89 deletions(-) diff --git a/.gitignore b/.gitignore index c49d36f..89c2e94 100644 --- a/.gitignore +++ b/.gitignore @@ -137,3 +137,5 @@ /modulemaker-maven-plugin.tar.xz /xmvn-generator.tar.xz /javapackages-bootstrap-1.8.1.tar.xz +/javapackages-bootstrap-1.9.0.tar.xz +/aopalliance.tar.xz diff --git a/javapackages-bootstrap.spec b/javapackages-bootstrap.spec index e2c6be0..e358d03 100644 --- a/javapackages-bootstrap.spec +++ b/javapackages-bootstrap.spec @@ -18,7 +18,7 @@ #global git_short_hash %(echo %{git_hash} | cut -b -7) Name: javapackages-bootstrap -Version: 1.8.1 +Version: 1.9.0 Release: 1%{?dist} Summary: A means of bootstrapping Java Packages Tools # For detailed info see the file javapackages-bootstrap-PACKAGE-LICENSING @@ -42,81 +42,81 @@ Source101: toolchains-openjdk8.xml # ./downstream.sh archive # The results are in the archive directory Source1001: ant.tar.xz -Source1002: apache-pom.tar.xz -Source1003: apiguardian.tar.xz -Source1004: asm.tar.xz -Source1005: assertj-core.tar.xz -Source1006: bnd.tar.xz -Source1007: build-helper-maven-plugin.tar.xz -Source1008: byte-buddy.tar.xz -Source1009: cdi.tar.xz -Source1010: cglib.tar.xz -Source1011: common-annotations-api.tar.xz -Source1012: commons-beanutils.tar.xz -Source1013: commons-cli.tar.xz -Source1014: commons-codec.tar.xz -Source1015: commons-collections.tar.xz -Source1016: commons-compress.tar.xz -Source1017: commons-io.tar.xz -Source1018: commons-jxpath.tar.xz -Source1019: commons-lang.tar.xz -Source1020: commons-logging.tar.xz -Source1021: commons-parent-pom.tar.xz -Source1022: cup.tar.xz -Source1023: easymock.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: modulemaker-maven-plugin.tar.xz -Source1075: mojo-parent-pom.tar.xz -Source1076: munge-maven-plugin.tar.xz +Source1002: aopalliance.tar.xz +Source1003: apache-pom.tar.xz +Source1004: apiguardian.tar.xz +Source1005: asm.tar.xz +Source1006: assertj-core.tar.xz +Source1007: bnd.tar.xz +Source1008: build-helper-maven-plugin.tar.xz +Source1009: byte-buddy.tar.xz +Source1010: cdi.tar.xz +Source1011: cglib.tar.xz +Source1012: common-annotations-api.tar.xz +Source1013: commons-beanutils.tar.xz +Source1014: commons-cli.tar.xz +Source1015: commons-codec.tar.xz +Source1016: commons-collections.tar.xz +Source1017: commons-compress.tar.xz +Source1018: commons-io.tar.xz +Source1019: commons-jxpath.tar.xz +Source1020: commons-lang.tar.xz +Source1021: commons-logging.tar.xz +Source1022: commons-parent-pom.tar.xz +Source1023: cup.tar.xz +Source1024: easymock.tar.xz +Source1025: extra-enforcer-rules.tar.xz +Source1026: felix-parent-pom.tar.xz +Source1027: felix-utils.tar.xz +Source1028: fusesource-pom.tar.xz +Source1029: guava.tar.xz +Source1030: guice.tar.xz +Source1031: hamcrest.tar.xz +Source1032: httpcomponents-client.tar.xz +Source1033: httpcomponents-core.tar.xz +Source1034: httpcomponents-parent-pom.tar.xz +Source1035: injection-api.tar.xz +Source1036: jansi.tar.xz +Source1037: jcommander.tar.xz +Source1038: jdom.tar.xz +Source1039: jdom2.tar.xz +Source1040: jflex.tar.xz +Source1041: jsr-305.tar.xz +Source1042: junit4.tar.xz +Source1043: junit5.tar.xz +Source1044: maven-antrun-plugin.tar.xz +Source1045: maven-archiver.tar.xz +Source1046: maven-artifact-transfer.tar.xz +Source1047: maven-assembly-plugin.tar.xz +Source1048: maven-bundle-plugin.tar.xz +Source1049: maven-common-artifact-filters.tar.xz +Source1050: maven-compiler-plugin.tar.xz +Source1051: maven-dependency-analyzer.tar.xz +Source1052: maven-dependency-plugin.tar.xz +Source1053: maven-dependency-tree.tar.xz +Source1054: maven-enforcer.tar.xz +Source1055: maven-file-management.tar.xz +Source1056: maven-filtering.tar.xz +Source1057: maven-jar-plugin.tar.xz +Source1058: maven-parent-pom.tar.xz +Source1059: maven-plugin-testing.tar.xz +Source1060: maven-plugin-tools.tar.xz +Source1061: maven-remote-resources-plugin.tar.xz +Source1062: maven-resolver.tar.xz +Source1063: maven-resources-plugin.tar.xz +Source1064: maven-resources.tar.xz +Source1065: maven-shared-incremental.tar.xz +Source1066: maven-shared-io.tar.xz +Source1067: maven-shared-utils.tar.xz +Source1068: maven-source-plugin.tar.xz +Source1069: maven-surefire.tar.xz +Source1070: maven-verifier.tar.xz +Source1071: maven-wagon.tar.xz +Source1072: maven.tar.xz +Source1073: mockito.tar.xz +Source1074: modello.tar.xz +Source1075: modulemaker-maven-plugin.tar.xz +Source1076: mojo-parent-pom.tar.xz Source1077: objenesis.tar.xz Source1078: opentest4j.tar.xz Source1079: osgi-annotation.tar.xz @@ -153,6 +153,7 @@ Source1109: xmvn.tar.xz Source1110: xz-java.tar.xz Provides: bundled(ant) = 1.10.12 +Provides: bundled(aopalliance) = 1.0 Provides: bundled(apache-parent) = 26 Provides: bundled(apiguardian) = 1.1.2 Provides: bundled(objectweb-asm) = 9.4 @@ -179,8 +180,8 @@ 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 -Provides: bundled(guava) = 31.0.1 -Provides: bundled(google-guice) = 4.2.3 +Provides: bundled(guava) = 31.1 +Provides: bundled(google-guice) = 5.1.0 Provides: bundled(hamcrest) = 2.2 Provides: bundled(httpcomponents-client) = 4.5.13 Provides: bundled(httpcomponents-core) = 4.4.13 @@ -208,11 +209,11 @@ Provides: bundled(maven-enforcer) = 3.0.0 Provides: bundled(maven-file-management) = 3.0.0 Provides: bundled(maven-filtering) = 3.2.0 Provides: bundled(maven-jar-plugin) = 3.2.0 -Provides: bundled(maven-parent) = 34 +Provides: bundled(maven-parent) = 39 Provides: bundled(maven-plugin-testing) = 3.3.0 Provides: bundled(maven-plugin-tools) = 3.6.4 Provides: bundled(maven-remote-resources-plugin) = 1.7.0 -Provides: bundled(maven-resolver) = 1.7.2 +Provides: bundled(maven-resolver) = 1.9.7 Provides: bundled(maven-resources-plugin) = 3.2.0 Provides: bundled(maven-resources) = 1.4 Provides: bundled(maven-shared-incremental) = 1.1 @@ -222,12 +223,11 @@ Provides: bundled(maven-source-plugin) = 3.2.1 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 +Provides: bundled(maven) = 3.9.1 Provides: bundled(mockito) = 3.7.13 Provides: bundled(modello) = 2.0.0 Provides: bundled(modulemaker-maven-plugin) = 1.9 Provides: bundled(mojo-parent) = 67 -Provides: bundled(munge-maven-plugin) = 1.0 Provides: bundled(objenesis) = 3.1 Provides: bundled(opentest4j) = 1.2.0 Provides: bundled(osgi-annotation) = 8.0.1 @@ -383,6 +383,9 @@ sed -i s/_xmvngen_/_jpbgen_/ %{buildroot}%{_fileattrsdir}/jpbgen.attr %doc AUTHORS %changelog +* Mon Mar 27 2023 Mikolaj Izdebski - 1.9.0-1 +- Update to upstream version 1.9.0 + * Mon Mar 20 2023 Mikolaj Izdebski - 1.8.1-1 - Update to upstream version 1.8.1 diff --git a/sources b/sources index 23340e7..292f7df 100644 --- a/sources +++ b/sources @@ -1,5 +1,6 @@ -SHA512 (javapackages-bootstrap-1.8.1.tar.xz) = 8f13a11d59ae27ec86389aed3b9896de60998a145b9663b2cd83c19e7a37335953e3bb76ab77f9e3651fe12a60bc75c0f28a494cb525b35324353a4b429d11b2 +SHA512 (javapackages-bootstrap-1.9.0.tar.xz) = 7569c33e54216fd0764a28d911a8d1d932f72d528cdaa830cf5bedb3d960b4137ca7a86fc03705ca75b961bc30a47402e7abd3c532d180f3388a509c51f58be3 SHA512 (ant.tar.xz) = d2a4babb7766fc2acf3e9377ffd5af790c7d0612d3e34a9642a9a2b85ffb0f15936ef2979389496dce8ea72ed941797cd1f7507beeb1853a46394019adde4152 +SHA512 (aopalliance.tar.xz) = 1f9a8a63edb76a73a40dcb3edee72fad069d4b509cc4b702cb9af9aaf694dadeef01fa7d20c285c6c37f7cb030643d267e3a1b834567785399fc986da474e626 SHA512 (apache-pom.tar.xz) = feebe0142114a6fb61dec26153bdef4314554d109bcf4910518ae9ecaf27e5dd9dc1f03d48271833f3497ab7045265900c5816708f513ae834643c533cd1291f SHA512 (apiguardian.tar.xz) = c3d75e88a983eb53c06007fd01f11c89083e119d2d4ed5d0e97644f45d5e451fd611bee493d720d011562ae29e7cdfd1d6fb4621d17c9db4b61430e62afea2bf SHA512 (asm.tar.xz) = c5c753e84f70f8ab17369d94e93d4e3fdbc717fd5579ea476c79dd883a1723b85268549cda26cc3bf355339755c7cc3620329a4313d5ffe9294b4de7ad537c52 @@ -26,8 +27,8 @@ SHA512 (extra-enforcer-rules.tar.xz) = 0c0dc6a79d83cad0ab5637e0fb99ca75e92589065 SHA512 (felix-parent-pom.tar.xz) = c8d5ec33af31d4fc51d24245576f4d081aafb073339739a2689dc221c42fbe0dc4411e8c97448a21ce8d517dea940281fcfd2b7c6acddff0e9b13d7d3630b87f SHA512 (felix-utils.tar.xz) = 39b32a2bb3b527b040796c06632d916ed53feaf728eee8902bab712d889d6c9118d925f1b957bc5ee66a4cf6be58e43f4992c7636f61d0c3c385c23f2ffc4a9c SHA512 (fusesource-pom.tar.xz) = 1fe5d089eac6dbd2885d3ce1174e313d33e9b02ad24e700e033895bd73dace81ff8cccf7382f51ec8a3f0aa5cec515bb3018fa8a2f62cf7fcfc077991ba65f51 -SHA512 (guava.tar.xz) = 584db48bb5816be1e015a80dc1eb29c8c995e0c4500ae55088cf1a1b13215930b70643a1e79b36c59c99efa19ff6c1571ec76693d6199e8668b4b9d6140f36dc -SHA512 (guice.tar.xz) = cfe2dcb98f45d2ba1caf4f4a07bbd847fd78ca61ad10cc4c4f822b5d19e4e90a5a69062851f21b3b2c3f347fcf24a20afe04e0a799b3bf4f2b1a003ff20c0f65 +SHA512 (guava.tar.xz) = b87dffe95e0775789435ca0541140922249dbd7ef73645fe3ff975cd29923df26b755cae1a9cbd11dbfd82ae1e540bff1e57a03fc041c1d852640a9510757d78 +SHA512 (guice.tar.xz) = ed7b98e8317c622dad0b6820a50ecc49d6153534250844fbde1dbcb60fc51d396267f5590c7a4fe06de020d86be7712f7d6edbd718c9590e406ff74b1e0ee71c SHA512 (hamcrest.tar.xz) = 2049a59774773c2369e4c561545067524402a420bace29dc8cffac0fca8b6aa870e3de1882cc4a35549b67269ecbfc54e335ffd0c599ddb4b56341948da777a2 SHA512 (httpcomponents-client.tar.xz) = 2d6ad230847a7b256760623c57d909aae4013a987bc7fde8da4bba13047c6062866bb027254564036ffaef8e6d1f8745ddd9fdc0016f0e7c3904c55f608d9849 SHA512 (httpcomponents-core.tar.xz) = 6b643a3808e966b3f1d2dcdc5539d1d547f6e7460eef2dab92aa5ff161db1f4c7e9ddfda6539c6d5efe8b15751461410d949780d7d6e4880eee7776ebbe3a976 @@ -55,11 +56,11 @@ SHA512 (maven-enforcer.tar.xz) = 85d578149c2987e68c0adb9aa8247370075b1e85dcae894 SHA512 (maven-file-management.tar.xz) = f8593f376d827be2eedbda2e10a8401072feba87748185aabf2aec87e965768567fa9795bc483ea47cc93cd7584f59077f78fdfe83f0f858aef7fdeb3f7c73e2 SHA512 (maven-filtering.tar.xz) = 6095ece59d2ae4955cdb8e5b476d63c20f64bb81c3d8341edd916c5d155c47cdaaa994813a7807673ad9552b6f4254c5a67f803af55eb42f44ac23ea52e8a67b SHA512 (maven-jar-plugin.tar.xz) = 990f83b1068d417613b061b5bb60b65717813c787e1e2ec77e11fc04ed27d2e436bbbf45abb52a5b168cc01efef3f08d5e5e0313a84974c081fdb11c63a8cc50 -SHA512 (maven-parent-pom.tar.xz) = 6ad4a0e113773375531d97f40970dc72b03745344af89bc8cf3ba2c1926f749d97508787a841416e52c4b87fb49e8acfb8bfbfd2b76f11e166f09c84f33a5075 +SHA512 (maven-parent-pom.tar.xz) = d0fc398066e5f465f5861555bdbb01e7220642b89d03c3adce716d07caae0a577c086c0257085d2ed45c4af4acd5c8ff7c5b815e4e9a7e1038a11618344578df SHA512 (maven-plugin-testing.tar.xz) = e72fcab892a00b52af06a821b3c2cff676af2bfc77ccaa851cf55017623bf89bb376a16f933fa0853087c1e8161336d21e649745ba2659c87795c4d8fad026df SHA512 (maven-plugin-tools.tar.xz) = 59f86ed1fcea2470e1a5d62b13fdb3622dd927978350d35768aab9306ace098ad3b701aa1e30a23e275ecc58a2ecdaa92a8f17620e6aeb8881273cd681627d5c SHA512 (maven-remote-resources-plugin.tar.xz) = e027b341e8b46f7663066442b9a14c32e1dd030b6cce06498037882331c0d0103a5370903f1b9605b6c76b391dbe0d51f34e1f007b83faa6012529e0aa5ee5a6 -SHA512 (maven-resolver.tar.xz) = 0991fef6f539eb6bb0c0e550c6f4b0b28b6eac8fc13b66e8807674dcec9dc891364b8ed1f5dfe9a775a0e35ac17520f924b75d836124ae48c42ddb573153576d +SHA512 (maven-resolver.tar.xz) = 19af9ca443e706b2980a3d6d69fa0244bbae7c92f8c5fe7e5ceb02f5971e1c61ca3123c181a781023fe7b2e12fd4c90aac91bf907e924f5c7b328f08426c24df SHA512 (maven-resources-plugin.tar.xz) = c68fdd88eb0ca1d88b97b76bcaf413591eaa69dd00c0e7e27398db80da57cd03b114331c51b7b2d87291764bd68e2ddef581d1ab58b0a0a3ecd8439c1297d1b0 SHA512 (maven-resources.tar.xz) = e80f8798f79275bcaae529e11cddc52c4b2e09499caa9c5a8814008eff31a805b6288925afb790fa780f0e928638ab9a9541e6aea1dc5ec1549b846d49553678 SHA512 (maven-shared-incremental.tar.xz) = 77ca067f25b396ccef4f4f911323a3b8bfae11c321628e32e012fb1a4dbfbba3a7a0451789b1513aa72ea408bed4a10782f5995eff8083a6af818a97a9842379 @@ -69,12 +70,11 @@ SHA512 (maven-source-plugin.tar.xz) = a512ba17da295771e488fbf9c4f8fd488ed82f07e9 SHA512 (maven-surefire.tar.xz) = 96b4f2457e78bc272d6054a17b3b27ec7204bcc5c16e83564fc2abeb17214e5810f91f25cf3b172a5e750dfa72b4c3bc0dac861d9751c8db73190480e3acaff7 SHA512 (maven-verifier.tar.xz) = 74977699bf37a9c0929a9583c57128b6c58376953248c16b3aa40f836613e7f0caba0229f5a6d622f814b7d4a94fd201034be7c98d8f9568f93269beccb3ae95 SHA512 (maven-wagon.tar.xz) = abac6ca4ec8b813a7829dea5b90c67938d0c23a03dd24b08b64df005cf5cf113ab0806501a61faa41331f2b399decb1f5259a01fe0ecc4aab4d349dcaa9b1553 -SHA512 (maven.tar.xz) = dca267003c12bfbde23bdf5b0a3f90351ba79e7a4a5b3fd7e062441c5b94909043791bc4c2ccd4313c72ddd280502361bd53106b4fc99c6b1cc3fd2c07d4b74c +SHA512 (maven.tar.xz) = e9906a5ec2249ff11341e027bcabb641a8d0a1a9229a38e5473760f0d59f6bf373a2315bc39a699038608f461992b26ccaaec0e40cabdf122febbe39771313cc SHA512 (mockito.tar.xz) = 8fefdeae3e7bcb41c97080aa208bc9bb6fa787235cc572990ba376c9995f60fa7ab7534e88701da36b00b49eb7b5f2b1c479bbf0e9c86fc1923a7eddc68b4c77 SHA512 (modello.tar.xz) = 7bdd8fd70336f305404bf3e320aba4edcf84fbeb49a8f5d1d027df6a1953ed82ebfcf90896093899a3818c186292793fc7764093f20e5a5a74e2e8c1137a95a3 SHA512 (modulemaker-maven-plugin.tar.xz) = a9d93ddd47419f5de597babf648e509084e7dd4a5c18ef8aed646fbcff886d20f2a7b297463ebaa1cf70f7e26bf3690c7a9b60e5e47fae6b7392807a133302ac SHA512 (mojo-parent-pom.tar.xz) = a9b9da6b088eb7c78e12734d0ecb5787a738d5956766a70dc2db70f47c0706b27f382c505d07638c5aaba8740721ae985a4abf38c6909b817fe6358eb8a506c3 -SHA512 (munge-maven-plugin.tar.xz) = 898d65256a04ebb108effe1d9b2b973f744556c0e7c16c99139c8fa1f059f0e32a13e01d872d8b6cd3cb056337e9ffa69ec0f8248131ee51d012c008b91290d9 SHA512 (objenesis.tar.xz) = 40395a14bcc6a01ee1c0d8c2c2476876cae905461119bcdeb748f42860cd0f5e945ddbc4e54eb26a53e639da71ff3f35f107c64666a54dc3aa1b774397448765 SHA512 (opentest4j.tar.xz) = de1ed222741fe2c9b507946ce14a7039bb5d4b234982e55a763a1582e68fd3c56497c5f5d9345698522d2cf0a83079a6c53160820e725e9401872c2fe4364691 SHA512 (osgi-annotation.tar.xz) = 50ace49682061546a20d6ef8772281fbf3c8965b6c294826f0699f048a1570e19fb146a0343f59724101166a28ff934ca319de5484d997264c6e3399f27d5666 From c05a3bdceb9b2f4cdff06094d1fdea01a15acffb Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 31 Mar 2023 20:12:16 +0200 Subject: [PATCH 55/77] Rebuild with no changes --- javapackages-bootstrap.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/javapackages-bootstrap.spec b/javapackages-bootstrap.spec index e358d03..54b66e5 100644 --- a/javapackages-bootstrap.spec +++ b/javapackages-bootstrap.spec @@ -19,7 +19,7 @@ Name: javapackages-bootstrap Version: 1.9.0 -Release: 1%{?dist} +Release: 2%{?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 @@ -383,6 +383,9 @@ sed -i s/_xmvngen_/_jpbgen_/ %{buildroot}%{_fileattrsdir}/jpbgen.attr %doc AUTHORS %changelog +* Fri Mar 31 2023 Mikolaj Izdebski - 1.9.0-2 +- Rebuild with no changes + * Mon Mar 27 2023 Mikolaj Izdebski - 1.9.0-1 - Update to upstream version 1.9.0 From 302a2d6fc850ae97ca2d4c4e15dd17e6e4bda554 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jul 2023 07:56:00 +0000 Subject: [PATCH 56/77] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- javapackages-bootstrap.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/javapackages-bootstrap.spec b/javapackages-bootstrap.spec index 54b66e5..402d410 100644 --- a/javapackages-bootstrap.spec +++ b/javapackages-bootstrap.spec @@ -19,7 +19,7 @@ Name: javapackages-bootstrap Version: 1.9.0 -Release: 2%{?dist} +Release: 3%{?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 @@ -383,6 +383,9 @@ sed -i s/_xmvngen_/_jpbgen_/ %{buildroot}%{_fileattrsdir}/jpbgen.attr %doc AUTHORS %changelog +* Thu Jul 20 2023 Fedora Release Engineering - 1.9.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Fri Mar 31 2023 Mikolaj Izdebski - 1.9.0-2 - Rebuild with no changes From 2acaa08381e93613040fd8638b5682bb7d37d0a5 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 10 Aug 2023 14:10:19 +0200 Subject: [PATCH 57/77] Update to upstream version 1.10.0 --- .gitignore | 6 ++ generate-bundled-provides.sh | 2 + javapackages-bootstrap.spec | 203 +++++++++++++++++++---------------- sources | 18 ++-- 4 files changed, 129 insertions(+), 100 deletions(-) diff --git a/.gitignore b/.gitignore index 89c2e94..43fc098 100644 --- a/.gitignore +++ b/.gitignore @@ -139,3 +139,9 @@ /javapackages-bootstrap-1.8.1.tar.xz /javapackages-bootstrap-1.9.0.tar.xz /aopalliance.tar.xz +/javapackages-bootstrap-1.10.0.tar.xz +/disruptor.tar.xz +/jaf-api.tar.xz +/jctools.tar.xz +/log4j.tar.xz +/mail-api.tar.xz diff --git a/generate-bundled-provides.sh b/generate-bundled-provides.sh index c882335..e1c248b 100755 --- a/generate-bundled-provides.sh +++ b/generate-bundled-provides.sh @@ -17,6 +17,7 @@ s/^commons-parent-pom /apache-commons-parent / s/^apache-pom /apache-parent / s/^bnd /aqute-bnd / s/^injection-api /atinject / +s/^jaf-api /jakarta-activation1 / s/^jcommander /beust-jcommander / s/^cdi /cdi-api / s/^felix-parent-pom /felix-parent / @@ -26,6 +27,7 @@ s/^common-annotations-api /jakarta-annotations / s/^servlet-api /jakarta-servlet / s/^cup /java_cup / s/^junit4 /junit / +s/^mail-api /jakarta-mail / s/^maven-parent-pom /maven-parent / s/^build-helper-maven-plugin /maven-plugin-build-helper / s/^maven-bundle-plugin /maven-plugin-bundle / diff --git a/javapackages-bootstrap.spec b/javapackages-bootstrap.spec index 402d410..22dc34c 100644 --- a/javapackages-bootstrap.spec +++ b/javapackages-bootstrap.spec @@ -18,8 +18,8 @@ #global git_short_hash %(echo %{git_hash} | cut -b -7) Name: javapackages-bootstrap -Version: 1.9.0 -Release: 3%{?dist} +Version: 1.10.0 +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 @@ -64,93 +64,99 @@ Source1020: commons-lang.tar.xz Source1021: commons-logging.tar.xz Source1022: commons-parent-pom.tar.xz Source1023: cup.tar.xz -Source1024: easymock.tar.xz -Source1025: extra-enforcer-rules.tar.xz -Source1026: felix-parent-pom.tar.xz -Source1027: felix-utils.tar.xz -Source1028: fusesource-pom.tar.xz -Source1029: guava.tar.xz -Source1030: guice.tar.xz -Source1031: hamcrest.tar.xz -Source1032: httpcomponents-client.tar.xz -Source1033: httpcomponents-core.tar.xz -Source1034: httpcomponents-parent-pom.tar.xz -Source1035: injection-api.tar.xz -Source1036: jansi.tar.xz -Source1037: jcommander.tar.xz -Source1038: jdom.tar.xz -Source1039: jdom2.tar.xz -Source1040: jflex.tar.xz -Source1041: jsr-305.tar.xz -Source1042: junit4.tar.xz -Source1043: junit5.tar.xz -Source1044: maven-antrun-plugin.tar.xz -Source1045: maven-archiver.tar.xz -Source1046: maven-artifact-transfer.tar.xz -Source1047: maven-assembly-plugin.tar.xz -Source1048: maven-bundle-plugin.tar.xz -Source1049: maven-common-artifact-filters.tar.xz -Source1050: maven-compiler-plugin.tar.xz -Source1051: maven-dependency-analyzer.tar.xz -Source1052: maven-dependency-plugin.tar.xz -Source1053: maven-dependency-tree.tar.xz -Source1054: maven-enforcer.tar.xz -Source1055: maven-file-management.tar.xz -Source1056: maven-filtering.tar.xz -Source1057: maven-jar-plugin.tar.xz -Source1058: maven-parent-pom.tar.xz -Source1059: maven-plugin-testing.tar.xz -Source1060: maven-plugin-tools.tar.xz -Source1061: maven-remote-resources-plugin.tar.xz -Source1062: maven-resolver.tar.xz -Source1063: maven-resources-plugin.tar.xz -Source1064: maven-resources.tar.xz -Source1065: maven-shared-incremental.tar.xz -Source1066: maven-shared-io.tar.xz -Source1067: maven-shared-utils.tar.xz -Source1068: maven-source-plugin.tar.xz -Source1069: maven-surefire.tar.xz -Source1070: maven-verifier.tar.xz -Source1071: maven-wagon.tar.xz -Source1072: maven.tar.xz -Source1073: mockito.tar.xz -Source1074: modello.tar.xz -Source1075: modulemaker-maven-plugin.tar.xz -Source1076: mojo-parent-pom.tar.xz -Source1077: objenesis.tar.xz -Source1078: opentest4j.tar.xz -Source1079: osgi-annotation.tar.xz -Source1080: osgi-cmpn.tar.xz -Source1081: osgi-core.tar.xz -Source1082: oss-parent-pom.tar.xz -Source1083: plexus-archiver.tar.xz -Source1084: plexus-build-api.tar.xz -Source1085: plexus-cipher.tar.xz -Source1086: plexus-classworlds.tar.xz -Source1087: plexus-compiler.tar.xz -Source1088: plexus-components-pom.tar.xz -Source1089: plexus-containers.tar.xz -Source1090: plexus-interpolation.tar.xz -Source1091: plexus-io.tar.xz -Source1092: plexus-languages.tar.xz -Source1093: plexus-pom.tar.xz -Source1094: plexus-resources.tar.xz -Source1095: plexus-sec-dispatcher.tar.xz -Source1096: plexus-utils.tar.xz -Source1097: qdox.tar.xz -Source1098: servlet-api.tar.xz -Source1099: sisu-inject.tar.xz -Source1100: sisu-mojos.tar.xz -Source1101: sisu-plexus.tar.xz -Source1102: slf4j.tar.xz -Source1103: testng.tar.xz -Source1104: univocity-parsers.tar.xz -Source1105: velocity-engine.tar.xz -Source1106: xbean.tar.xz -Source1107: xmlunit.tar.xz -Source1108: xmvn-generator.tar.xz -Source1109: xmvn.tar.xz -Source1110: xz-java.tar.xz +Source1024: disruptor.tar.xz +Source1025: easymock.tar.xz +Source1026: extra-enforcer-rules.tar.xz +Source1027: felix-parent-pom.tar.xz +Source1028: felix-utils.tar.xz +Source1029: fusesource-pom.tar.xz +Source1030: guava.tar.xz +Source1031: guice.tar.xz +Source1032: hamcrest.tar.xz +Source1033: httpcomponents-client.tar.xz +Source1034: httpcomponents-core.tar.xz +Source1035: httpcomponents-parent-pom.tar.xz +Source1036: injection-api.tar.xz +Source1037: jaf-api.tar.xz +Source1038: jansi.tar.xz +Source1039: jcommander.tar.xz +Source1040: jctools.tar.xz +Source1041: jdom.tar.xz +Source1042: jdom2.tar.xz +Source1043: jflex.tar.xz +Source1044: jsoup.tar.xz +Source1045: jsr-305.tar.xz +Source1046: junit4.tar.xz +Source1047: junit5.tar.xz +Source1048: log4j.tar.xz +Source1049: mail-api.tar.xz +Source1050: maven-antrun-plugin.tar.xz +Source1051: maven-archiver.tar.xz +Source1052: maven-artifact-transfer.tar.xz +Source1053: maven-assembly-plugin.tar.xz +Source1054: maven-bundle-plugin.tar.xz +Source1055: maven-common-artifact-filters.tar.xz +Source1056: maven-compiler-plugin.tar.xz +Source1057: maven-dependency-analyzer.tar.xz +Source1058: maven-dependency-plugin.tar.xz +Source1059: maven-dependency-tree.tar.xz +Source1060: maven-enforcer.tar.xz +Source1061: maven-file-management.tar.xz +Source1062: maven-filtering.tar.xz +Source1063: maven-jar-plugin.tar.xz +Source1064: maven-parent-pom.tar.xz +Source1065: maven-plugin-testing.tar.xz +Source1066: maven-plugin-tools.tar.xz +Source1067: maven-remote-resources-plugin.tar.xz +Source1068: maven-resolver.tar.xz +Source1069: maven-resources-plugin.tar.xz +Source1070: maven-resources.tar.xz +Source1071: maven-shared-incremental.tar.xz +Source1072: maven-shared-io.tar.xz +Source1073: maven-shared-utils.tar.xz +Source1074: maven-source-plugin.tar.xz +Source1075: maven-surefire.tar.xz +Source1076: maven-verifier.tar.xz +Source1077: maven-wagon.tar.xz +Source1078: maven.tar.xz +Source1079: mockito.tar.xz +Source1080: modello.tar.xz +Source1081: modulemaker-maven-plugin.tar.xz +Source1082: mojo-parent-pom.tar.xz +Source1083: objenesis.tar.xz +Source1084: opentest4j.tar.xz +Source1085: osgi-annotation.tar.xz +Source1086: osgi-cmpn.tar.xz +Source1087: osgi-core.tar.xz +Source1088: oss-parent-pom.tar.xz +Source1089: plexus-archiver.tar.xz +Source1090: plexus-build-api.tar.xz +Source1091: plexus-cipher.tar.xz +Source1092: plexus-classworlds.tar.xz +Source1093: plexus-compiler.tar.xz +Source1094: plexus-components-pom.tar.xz +Source1095: plexus-containers.tar.xz +Source1096: plexus-interpolation.tar.xz +Source1097: plexus-io.tar.xz +Source1098: plexus-languages.tar.xz +Source1099: plexus-pom.tar.xz +Source1100: plexus-resources.tar.xz +Source1101: plexus-sec-dispatcher.tar.xz +Source1102: plexus-utils.tar.xz +Source1103: qdox.tar.xz +Source1104: servlet-api.tar.xz +Source1105: sisu-inject.tar.xz +Source1106: sisu-mojos.tar.xz +Source1107: sisu-plexus.tar.xz +Source1108: slf4j.tar.xz +Source1109: testng.tar.xz +Source1110: univocity-parsers.tar.xz +Source1111: velocity-engine.tar.xz +Source1112: xbean.tar.xz +Source1113: xmlunit.tar.xz +Source1114: xmvn-generator.tar.xz +Source1115: xmvn.tar.xz +Source1116: xz-java.tar.xz Provides: bundled(ant) = 1.10.12 Provides: bundled(aopalliance) = 1.0 @@ -168,15 +174,16 @@ Provides: bundled(apache-commons-beanutils) = 1.9.4 Provides: bundled(apache-commons-cli) = 1.5.0 Provides: bundled(apache-commons-codec) = 1.15 Provides: bundled(apache-commons-collections) = 3.2.2 -Provides: bundled(apache-commons-compress) = 1.21 +Provides: bundled(apache-commons-compress) = 1.23.0 Provides: bundled(apache-commons-io) = 2.11.0 Provides: bundled(apache-commons-jxpath) = 1.3 Provides: bundled(apache-commons-lang3) = 3.12.0 Provides: bundled(apache-commons-logging) = 1.2 Provides: bundled(apache-commons-parent) = 53 Provides: bundled(java_cup) = 0.11b +Provides: bundled(disruptor) = 3.4.4 Provides: bundled(easymock) = 4.3 -Provides: bundled(extra-enforcer-rules) = 1.5.1 +Provides: bundled(extra-enforcer-rules) = 1.7.0 Provides: bundled(felix-parent) = 7 Provides: bundled(felix-utils) = 1.11.8 Provides: bundled(fusesource-pom) = 1.12 @@ -187,14 +194,19 @@ Provides: bundled(httpcomponents-client) = 4.5.13 Provides: bundled(httpcomponents-core) = 4.4.13 Provides: bundled(httpcomponents-project) = 12 Provides: bundled(atinject) = 1.0.5 +Provides: bundled(jakarta-activation1) = 1.2.2 Provides: bundled(jansi) = 2.4.0 Provides: bundled(beust-jcommander) = 1.81 +Provides: bundled(jctools) = 4.0.1 Provides: bundled(jdom) = 1.1.3 Provides: bundled(jdom2) = 2.0.6 Provides: bundled(jflex) = 1.7.0 +Provides: bundled(jsoup) = 1.16.1 Provides: bundled(jsr-305) = 3.0.2 Provides: bundled(junit) = 4.13.1 Provides: bundled(junit5) = 5.8.1 +Provides: bundled(log4j) = 2.17.2 +Provides: bundled(jakarta-mail) = 1.6.7 Provides: bundled(maven-antrun-plugin) = 3.0.0 Provides: bundled(maven-archiver) = 3.5.1 Provides: bundled(maven-artifact-transfer) = 0.13.1 @@ -205,13 +217,13 @@ Provides: bundled(maven-compiler-plugin) = 3.10.1 Provides: bundled(maven-dependency-analyzer) = 1.12.0 Provides: bundled(maven-dependency-plugin) = 3.3.0 Provides: bundled(maven-dependency-tree) = 3.1.0 -Provides: bundled(maven-enforcer) = 3.0.0 +Provides: bundled(maven-enforcer) = 3.3.0 Provides: bundled(maven-file-management) = 3.0.0 Provides: bundled(maven-filtering) = 3.2.0 Provides: bundled(maven-jar-plugin) = 3.2.0 Provides: bundled(maven-parent) = 39 Provides: bundled(maven-plugin-testing) = 3.3.0 -Provides: bundled(maven-plugin-tools) = 3.6.4 +Provides: bundled(maven-plugin-tools) = 3.9.0 Provides: bundled(maven-remote-resources-plugin) = 1.7.0 Provides: bundled(maven-resolver) = 1.9.7 Provides: bundled(maven-resources-plugin) = 3.2.0 @@ -247,7 +259,7 @@ Provides: bundled(plexus-languages) = 1.1.1 Provides: bundled(plexus-pom) = 8 Provides: bundled(plexus-resources) = 1.2.0 Provides: bundled(plexus-sec-dispatcher) = 2.0 -Provides: bundled(plexus-utils) = 3.4.1 +Provides: bundled(plexus-utils) = 3.5.1 Provides: bundled(qdox) = 2.0.0 Provides: bundled(jakarta-servlet) = 4.0.3 Provides: bundled(sisu) = 0.3.5 @@ -383,6 +395,9 @@ sed -i s/_xmvngen_/_jpbgen_/ %{buildroot}%{_fileattrsdir}/jpbgen.attr %doc AUTHORS %changelog +* Thu Aug 10 2023 Mikolaj Izdebski - 1.10.0-1 +- Update to upstream version 1.10.0 + * Thu Jul 20 2023 Fedora Release Engineering - 1.9.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild diff --git a/sources b/sources index 292f7df..12f2349 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -SHA512 (javapackages-bootstrap-1.9.0.tar.xz) = 7569c33e54216fd0764a28d911a8d1d932f72d528cdaa830cf5bedb3d960b4137ca7a86fc03705ca75b961bc30a47402e7abd3c532d180f3388a509c51f58be3 +SHA512 (javapackages-bootstrap-1.10.0.tar.xz) = fa722ab4c0a1391df736635c0cc236d7622fd323b6ee3e09c46085f75483c0ff6f1f12d57b1919ca19d4c6d30e8c251fef6ad002647d53e7784be6be800b8ef3 SHA512 (ant.tar.xz) = d2a4babb7766fc2acf3e9377ffd5af790c7d0612d3e34a9642a9a2b85ffb0f15936ef2979389496dce8ea72ed941797cd1f7507beeb1853a46394019adde4152 SHA512 (aopalliance.tar.xz) = 1f9a8a63edb76a73a40dcb3edee72fad069d4b509cc4b702cb9af9aaf694dadeef01fa7d20c285c6c37f7cb030643d267e3a1b834567785399fc986da474e626 SHA512 (apache-pom.tar.xz) = feebe0142114a6fb61dec26153bdef4314554d109bcf4910518ae9ecaf27e5dd9dc1f03d48271833f3497ab7045265900c5816708f513ae834643c533cd1291f @@ -15,15 +15,16 @@ SHA512 (commons-beanutils.tar.xz) = 8d88c5d46f0536dc952da85fe3554f4d682b03eba4ad SHA512 (commons-cli.tar.xz) = 9d9ea6a2a44b9c25f594cd3d7a2b1babaf523680d9b5ff97e9d1f8babfc87c24c07061a9160eaad637630dcd2e7234b89069cbf116da11f01b30496a981bfddb SHA512 (commons-codec.tar.xz) = 97a2204042029dec4bf92cfc53211510f156bbaaac35a6d58281acb34762ab4179dda5f4e3d806030548c780050753bf7356a80474a372c0fa82f62fff1d785a SHA512 (commons-collections.tar.xz) = 5033b96edd59c6eba0c6fcb2208755e0a317a66cc218df7e5ad05fa063055085ac0ed683728a979b54ddb10b71c7a0d7fbb2a3249bca361be7a428d84a049f56 -SHA512 (commons-compress.tar.xz) = 9934b23c993630ddea5627d52e06fc2697e8d50bf227d613fa26fc9712457a85dc4910c983a8568eb8b884d4ed17aa81911304e0d486a9d40e5db5923b96b658 +SHA512 (commons-compress.tar.xz) = ffaa8cc7f16304994f4a8da47f4d6688ea7e0cfdf10a21cb226e3b7c2b2ea490e44a2fb4996fac132f7a98eaf429ff45d9034f7f64497ee44b362d8ec74d3e19 SHA512 (commons-io.tar.xz) = db2b973f68240622a4d4b821704478e45bcba73227fe95119bae9a6263344f3d1d91dab11edfb70a70e479470196980e96ac2866f9b6206b37cfc3018ce36fef SHA512 (commons-jxpath.tar.xz) = 6ad0e7e2f5f3dd377d78af1a49f5b7fa41ad66b71b80f73ac822e49a006b79dd06ee872c508dc8eb7696ef71bea2ee89c186b6dfc2cdcc4cc2da778f6950d2f5 SHA512 (commons-lang.tar.xz) = 8d5dd8cfa07792987fb17dfc5fbbf987f3812be9b7cd7473885b068f9a60bd5418dec9574fb122c060a82564b84b31901c8f0d7f2f610dd244806d66285a6c72 SHA512 (commons-logging.tar.xz) = 78a6b9e0139bb2d365438fa74e88f55fbeccb2e4a526592869c1a23719bd6340e25ecbb04888f4f284cc4fe2e153122b56f56f4af479d45c8b77c7c0708e39f3 SHA512 (commons-parent-pom.tar.xz) = 40db36c70a9c2128d8b678fbc7dc08d703dcfa140ac3bb4ebb471fa5b8eb19de0bea1504edda2a4f8507b8ab9f1a4012c19137fd247d2d0cc45e48a02d661ad3 SHA512 (cup.tar.xz) = 8624696fed9ed0045873a48a75f55f248faa9b3cfc5573182b4c67469d43dfde55d4e676dad6636d31c1f3729456e29b2facc4754e5d4caaaf39dfe6e1fd6af5 +SHA512 (disruptor.tar.xz) = 370c5e9829b92fd948064ed61f907407d42b22aff6fa75f943d7e51af796a18d98e93005a5ce2fc780031405b1732b9d869bd36c9d4b114c8fad411598e59275 SHA512 (easymock.tar.xz) = 48489da810750bd9351327584f78d58cf4965ac22341ad4d964edead04c2665a5ea003c245c644f52a04f75e3b046ed3562e483657355ad414ecfc5ed69f965a -SHA512 (extra-enforcer-rules.tar.xz) = 0c0dc6a79d83cad0ab5637e0fb99ca75e925890654bce225e6772f1fd943eb1b0b95dd8068291e0a7b077230c9cb995cb77ae9d8110e7e0c6d0e75d28cd7af9d +SHA512 (extra-enforcer-rules.tar.xz) = 61598a329ffefc820ebf45ade558dcd89f7ef9a5501c932625404e93c84c16b96610d3d3e9f3ba96c2fc0fc65af765686b999ef07e7dbb076facd6b804ea06b0 SHA512 (felix-parent-pom.tar.xz) = c8d5ec33af31d4fc51d24245576f4d081aafb073339739a2689dc221c42fbe0dc4411e8c97448a21ce8d517dea940281fcfd2b7c6acddff0e9b13d7d3630b87f SHA512 (felix-utils.tar.xz) = 39b32a2bb3b527b040796c06632d916ed53feaf728eee8902bab712d889d6c9118d925f1b957bc5ee66a4cf6be58e43f4992c7636f61d0c3c385c23f2ffc4a9c SHA512 (fusesource-pom.tar.xz) = 1fe5d089eac6dbd2885d3ce1174e313d33e9b02ad24e700e033895bd73dace81ff8cccf7382f51ec8a3f0aa5cec515bb3018fa8a2f62cf7fcfc077991ba65f51 @@ -34,14 +35,19 @@ SHA512 (httpcomponents-client.tar.xz) = 2d6ad230847a7b256760623c57d909aae4013a98 SHA512 (httpcomponents-core.tar.xz) = 6b643a3808e966b3f1d2dcdc5539d1d547f6e7460eef2dab92aa5ff161db1f4c7e9ddfda6539c6d5efe8b15751461410d949780d7d6e4880eee7776ebbe3a976 SHA512 (httpcomponents-parent-pom.tar.xz) = 587e23e2c6caff80b61e1c6fc8b2a591ffb1175c1e3a5a95d611d9fb3e2dab85ef317b3f982424b727070356240fd24a7cbcce20e2e5bd787cac2bc6d93e2a71 SHA512 (injection-api.tar.xz) = a0faaa4aa4a94d1cf01387b9d327da2be5d5c016b6fa6aca3aed0d75d4bec2c9a04df12fdc3c67f17b03918584ab5261f8dc20ab620f1289e34f8ad8ee23c9a6 +SHA512 (jaf-api.tar.xz) = fd99989fedbbecbc9d150910d635b1e19d6f7e879d4d14850c32dfbb403aef44ab405c41463eef7f87805a2db883235ddf0e040e1fd06f890215ad6bdb28fddf SHA512 (jansi.tar.xz) = 374f5ba2f55abd9ff5e15f009f94e9878bc077a62e0bd3ae3b18c5089c754478eefa991d8a4331330e052f7a65e551995821308cdb14e260dd84d6236945010e SHA512 (jcommander.tar.xz) = 9ff34b0e5dd391125c1f9a03175dffece39107ee133f5553323762ac10421161d693711934f10666b8177ab801a0dd03a63942b5635dae1aeb3432635cecb10e +SHA512 (jctools.tar.xz) = f62c591f094c27dc59e6a4666377367f8ab6829540a5a7912c5007d5403be1db7d75b47c0636589c1df4ee252fdae89987d8c89e53d903347ec0862d39f3308c SHA512 (jdom.tar.xz) = 1a36168a0b8f2b9057855198e097fcb50992d9d79892cdeeb20eada43ad7a79acf4fda0a06496b8a36cb537577575504efc066774912a1c4d08288e716232579 SHA512 (jdom2.tar.xz) = f05f9114c337a20111a88e6e045de57d034344246f568f09f75344160cd8243a6bb5cbf14429f09090a1e3c3dcd2b05e5441ee7686c4a222f433eade81c25384 SHA512 (jflex.tar.xz) = 3e291540af7f4ac83c786f79d9500265d2f49d54d2a472f565f92233e536af6cd4b5d775ad0eb5990a14edf682512bdc48c7eb30bef7a243292a0165e331f393 +SHA512 (jsoup.tar.xz) = db0ac8d4387d0d6e9ce7236f1e233b80e8c9543c5680b8fab48cc9c64f7e7a5c669606eb6acda6e83d841c70cbd7fb64271f57ae6073fccf34ca5e645207c683 SHA512 (jsr-305.tar.xz) = fb666ec0dd8d4fe13eb88a9ce3a7b912c66e53b152d3742133a1b81d0b9d22f4a98187e7f55bc3d3d20c47ae4b8576e03e5ed42b957d706cd951214f7216be6c SHA512 (junit4.tar.xz) = 305f5e74d0c39e93211eac9e4da568a06e24305b6f87b970c8bf83df638223bc3c66a0acc01b191978fe6d3b08dc8b00f68613e0d06a9d5eb051de6a29e05ef1 SHA512 (junit5.tar.xz) = d37b08df14edb763c6ddc81a67cbefe3b8bd2b384431f71b9bd5852182bf1cf7d9ca28c1c21758c2617b99880dc05cb830291b9925d671a83b3381302ba1d130 +SHA512 (log4j.tar.xz) = d563d209a166ab1c536678e0958b4d1eccd8a7be1d12202e1d18b5e8e96f64f3992cf2337016d942e7d9d4ed7aa7eb670805cb94faf62d9e5e517e4d545989d0 +SHA512 (mail-api.tar.xz) = fed45a4127c972d38ac3d03a8e70f05199f4e74ab18786eae92564892606a52917f150bae7b0ac6fdd2a619fe9be88a95151ee24a05a1cf3539cd72fbd9e52d8 SHA512 (maven-antrun-plugin.tar.xz) = d99863b055d3881e91e7d1d48cd4a4d5816ca9bfb36c1ab5c4abdf0a8198fde643a75157c96ed3a966e53ba30271d6f3cf78fd05b52a2fade947dc0bf25d1b43 SHA512 (maven-archiver.tar.xz) = ddcccd12e7c327c56125d944167f995a4de8a4bc1c4c9294cd8b6cceba28782782cb47e0b3c0f6491b519711131bb6e683be8c0081c1737cb286871805df298b SHA512 (maven-artifact-transfer.tar.xz) = eb023b00573a10f2002b2b23b048ef3c0e59d33c20cefd8915227450923f6ba7850ac9d96b73fec9b2fd0127bcfdcd08deefd47803aa7a0e6c6ccc0d40dc2fc2 @@ -52,13 +58,13 @@ SHA512 (maven-compiler-plugin.tar.xz) = 0259e739d1675b5b3905a93ad392f9abe772d932 SHA512 (maven-dependency-analyzer.tar.xz) = 60c7c17621dbfe726b66ad70ca294c7f1405d5528e6c894cc38da637eb046162a43edad21b97aaa731c1ff31016ced1073e3eae3e42e4a9cae50a9b88f7ed619 SHA512 (maven-dependency-plugin.tar.xz) = 4092de8c04a74939c7b552bb102a040925930aeff8c7788f1ccb464dcf2eadc5fb2f8004055368ea0a128267d8b2fc674fa9cb536c1c7b13bfcf41b3630adc28 SHA512 (maven-dependency-tree.tar.xz) = be1f8848cd39e55fa2c3c13be29e4c03d73a0bca6c3218bd269c183703c5aee88af0f46c6f2901a20868eea0cb4b8817a48d467043079c8a4043e1a16f2c7456 -SHA512 (maven-enforcer.tar.xz) = 85d578149c2987e68c0adb9aa8247370075b1e85dcae894a0e7d2d3994ce48db03cae89725b45d8c53668a2c9f1b1984e8bf5c37557a44a144e68c384bb6f94b +SHA512 (maven-enforcer.tar.xz) = 377df2d2b784817ff5feb6b698098b32409d0f93a97869fce70fcafe5bf78561b8e4b9b4c94c8c7b283dc5b24cd93ccb8b9e20f4fa22a914113c1a60f975c6ad SHA512 (maven-file-management.tar.xz) = f8593f376d827be2eedbda2e10a8401072feba87748185aabf2aec87e965768567fa9795bc483ea47cc93cd7584f59077f78fdfe83f0f858aef7fdeb3f7c73e2 SHA512 (maven-filtering.tar.xz) = 6095ece59d2ae4955cdb8e5b476d63c20f64bb81c3d8341edd916c5d155c47cdaaa994813a7807673ad9552b6f4254c5a67f803af55eb42f44ac23ea52e8a67b SHA512 (maven-jar-plugin.tar.xz) = 990f83b1068d417613b061b5bb60b65717813c787e1e2ec77e11fc04ed27d2e436bbbf45abb52a5b168cc01efef3f08d5e5e0313a84974c081fdb11c63a8cc50 SHA512 (maven-parent-pom.tar.xz) = d0fc398066e5f465f5861555bdbb01e7220642b89d03c3adce716d07caae0a577c086c0257085d2ed45c4af4acd5c8ff7c5b815e4e9a7e1038a11618344578df SHA512 (maven-plugin-testing.tar.xz) = e72fcab892a00b52af06a821b3c2cff676af2bfc77ccaa851cf55017623bf89bb376a16f933fa0853087c1e8161336d21e649745ba2659c87795c4d8fad026df -SHA512 (maven-plugin-tools.tar.xz) = 59f86ed1fcea2470e1a5d62b13fdb3622dd927978350d35768aab9306ace098ad3b701aa1e30a23e275ecc58a2ecdaa92a8f17620e6aeb8881273cd681627d5c +SHA512 (maven-plugin-tools.tar.xz) = 044c982182ec94a2f60efebbe10307c093433219c8c8f98ca2d1f79f1695467d89ccff259cbbb3788a699f9cd435e1fcd2d06fbf7ab9e78d21ff5c5741fbefdd SHA512 (maven-remote-resources-plugin.tar.xz) = e027b341e8b46f7663066442b9a14c32e1dd030b6cce06498037882331c0d0103a5370903f1b9605b6c76b391dbe0d51f34e1f007b83faa6012529e0aa5ee5a6 SHA512 (maven-resolver.tar.xz) = 19af9ca443e706b2980a3d6d69fa0244bbae7c92f8c5fe7e5ceb02f5971e1c61ca3123c181a781023fe7b2e12fd4c90aac91bf907e924f5c7b328f08426c24df SHA512 (maven-resources-plugin.tar.xz) = c68fdd88eb0ca1d88b97b76bcaf413591eaa69dd00c0e7e27398db80da57cd03b114331c51b7b2d87291764bd68e2ddef581d1ab58b0a0a3ecd8439c1297d1b0 @@ -94,7 +100,7 @@ SHA512 (plexus-languages.tar.xz) = 5fff40f43a21f5da1596ff8d17d48f21e8908b8baa6aa SHA512 (plexus-pom.tar.xz) = 2f55ae0514e69cccc85bcd92becbad6c856cf6637e40d700867be849710a9bc9e8058ef4f3b0b30b5be089caeee19acef38d201bb91155858eec875448eb2db0 SHA512 (plexus-resources.tar.xz) = 7c1cd518b75ba2b5653d5ec7f134985780450728e3a1943734bbd2b8227c6ccc73a2e076034fd46487329bd88cb4d4dfe36411482f8e8ee28aff4b1cf9c4f396 SHA512 (plexus-sec-dispatcher.tar.xz) = 4c9be8c78ff3f6ab2ff1a5271602b66b61546294bdedc1e3cf5b92e8daa8365bcf721beaf12ba7ae16f2da24f506fbd04f3c9203b4627a930c359ca68f9ead4f -SHA512 (plexus-utils.tar.xz) = e13c4605d4268ec85fb10fa1c365455f8c8ac43db85760af68f079f78809c2c5d31df887d66f21fffa096c38c4f742d9c4b1eb7ae0de943c2c0734de89800d03 +SHA512 (plexus-utils.tar.xz) = 2d033a7d4c2b1a55831606261324e2c2b447908ee584d7aa187d33b431c97c5e58c1647d109d457bdacbb63f77b0f58311658de81d0384164aebbb9e0aa06730 SHA512 (qdox.tar.xz) = 48c904a6e4ec4dfd66b47238e4151fb0ca092751a9e6a89f1bd89d9b6cd4a33e9493f0b2ee5e06ea81d956c3eeb81fba8b8552053e49b3155cc42a00a8af9e11 SHA512 (servlet-api.tar.xz) = a255c21c248dcb6a72022146f58e09cef03e388e6a64d97f5dfbbcfffce57fe88ef4255c2c1c1195958c70a4495b9512d6c2fff588c5e7df66394a45e44262ab SHA512 (sisu-inject.tar.xz) = 419f2065f1acdce764ffcfcfb3716fb67a3b85cf596e047f66c5a6f1831dd5d96dd99583e6949d8b7ddee433f39a9a5731fa582f930ce6828e3a5139effcfa56 From df9a5d9fc67843709306bb2fc39e4c289a9a0d75 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 17 Aug 2023 13:53:13 +0200 Subject: [PATCH 58/77] Update to upstream version 1.11.0 --- .gitignore | 2 + javapackages-bootstrap.spec | 129 ++++++++++++++++++------------------ sources | 84 +++++++++++------------ 3 files changed, 110 insertions(+), 105 deletions(-) diff --git a/.gitignore b/.gitignore index 43fc098..2077070 100644 --- a/.gitignore +++ b/.gitignore @@ -145,3 +145,5 @@ /jctools.tar.xz /log4j.tar.xz /mail-api.tar.xz +/javapackages-bootstrap-1.11.0.tar.xz +/maven-apache-resources.tar.xz diff --git a/javapackages-bootstrap.spec b/javapackages-bootstrap.spec index 22dc34c..734f72f 100644 --- a/javapackages-bootstrap.spec +++ b/javapackages-bootstrap.spec @@ -18,8 +18,8 @@ #global git_short_hash %(echo %{git_hash} | cut -b -7) Name: javapackages-bootstrap -Version: 1.10.0 -Release: 1%{?dist} +Version: 1.11.0 +Release: 2%{?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 @@ -91,26 +91,26 @@ Source1047: junit5.tar.xz Source1048: log4j.tar.xz Source1049: mail-api.tar.xz Source1050: maven-antrun-plugin.tar.xz -Source1051: maven-archiver.tar.xz -Source1052: maven-artifact-transfer.tar.xz -Source1053: maven-assembly-plugin.tar.xz -Source1054: maven-bundle-plugin.tar.xz -Source1055: maven-common-artifact-filters.tar.xz -Source1056: maven-compiler-plugin.tar.xz -Source1057: maven-dependency-analyzer.tar.xz -Source1058: maven-dependency-plugin.tar.xz -Source1059: maven-dependency-tree.tar.xz -Source1060: maven-enforcer.tar.xz -Source1061: maven-file-management.tar.xz -Source1062: maven-filtering.tar.xz -Source1063: maven-jar-plugin.tar.xz -Source1064: maven-parent-pom.tar.xz -Source1065: maven-plugin-testing.tar.xz -Source1066: maven-plugin-tools.tar.xz -Source1067: maven-remote-resources-plugin.tar.xz -Source1068: maven-resolver.tar.xz -Source1069: maven-resources-plugin.tar.xz -Source1070: maven-resources.tar.xz +Source1051: maven-apache-resources.tar.xz +Source1052: maven-archiver.tar.xz +Source1053: maven-artifact-transfer.tar.xz +Source1054: maven-assembly-plugin.tar.xz +Source1055: maven-bundle-plugin.tar.xz +Source1056: maven-common-artifact-filters.tar.xz +Source1057: maven-compiler-plugin.tar.xz +Source1058: maven-dependency-analyzer.tar.xz +Source1059: maven-dependency-plugin.tar.xz +Source1060: maven-dependency-tree.tar.xz +Source1061: maven-enforcer.tar.xz +Source1062: maven-file-management.tar.xz +Source1063: maven-filtering.tar.xz +Source1064: maven-jar-plugin.tar.xz +Source1065: maven-parent-pom.tar.xz +Source1066: maven-plugin-testing.tar.xz +Source1067: maven-plugin-tools.tar.xz +Source1068: maven-remote-resources-plugin.tar.xz +Source1069: maven-resolver.tar.xz +Source1070: maven-resources-plugin.tar.xz Source1071: maven-shared-incremental.tar.xz Source1072: maven-shared-io.tar.xz Source1073: maven-shared-utils.tar.xz @@ -160,9 +160,9 @@ Source1116: xz-java.tar.xz Provides: bundled(ant) = 1.10.12 Provides: bundled(aopalliance) = 1.0 -Provides: bundled(apache-parent) = 26 +Provides: bundled(apache-parent) = 30 Provides: bundled(apiguardian) = 1.1.2 -Provides: bundled(objectweb-asm) = 9.4 +Provides: bundled(objectweb-asm) = 9.5 Provides: bundled(assertj-core) = 3.19.0 Provides: bundled(aqute-bnd) = 5.2.0 Provides: bundled(maven-plugin-build-helper) = 3.2.0 @@ -172,14 +172,14 @@ Provides: bundled(cglib) = 3.3.0 Provides: bundled(jakarta-annotations) = 1.3.5 Provides: bundled(apache-commons-beanutils) = 1.9.4 Provides: bundled(apache-commons-cli) = 1.5.0 -Provides: bundled(apache-commons-codec) = 1.15 +Provides: bundled(apache-commons-codec) = 1.16.0 Provides: bundled(apache-commons-collections) = 3.2.2 Provides: bundled(apache-commons-compress) = 1.23.0 -Provides: bundled(apache-commons-io) = 2.11.0 +Provides: bundled(apache-commons-io) = 2.13.0 Provides: bundled(apache-commons-jxpath) = 1.3 -Provides: bundled(apache-commons-lang3) = 3.12.0 +Provides: bundled(apache-commons-lang3) = 3.13.0 Provides: bundled(apache-commons-logging) = 1.2 -Provides: bundled(apache-commons-parent) = 53 +Provides: bundled(apache-commons-parent) = 59 Provides: bundled(java_cup) = 0.11b Provides: bundled(disruptor) = 3.4.4 Provides: bundled(easymock) = 4.3 @@ -207,70 +207,70 @@ Provides: bundled(junit) = 4.13.1 Provides: bundled(junit5) = 5.8.1 Provides: bundled(log4j) = 2.17.2 Provides: bundled(jakarta-mail) = 1.6.7 -Provides: bundled(maven-antrun-plugin) = 3.0.0 -Provides: bundled(maven-archiver) = 3.5.1 +Provides: bundled(maven-antrun-plugin) = 3.1.0 +Provides: bundled(maven-apache-resources) = 1.5 +Provides: bundled(maven-archiver) = 3.6.0 Provides: bundled(maven-artifact-transfer) = 0.13.1 -Provides: bundled(maven-assembly-plugin) = 3.3.0 -Provides: bundled(maven-plugin-bundle) = 5.1.1 -Provides: bundled(maven-common-artifact-filters) = 3.2.0 -Provides: bundled(maven-compiler-plugin) = 3.10.1 -Provides: bundled(maven-dependency-analyzer) = 1.12.0 -Provides: bundled(maven-dependency-plugin) = 3.3.0 -Provides: bundled(maven-dependency-tree) = 3.1.0 +Provides: bundled(maven-assembly-plugin) = 3.6.0 +Provides: bundled(maven-plugin-bundle) = 5.1.9 +Provides: bundled(maven-common-artifact-filters) = 3.3.2 +Provides: bundled(maven-compiler-plugin) = 3.11.0 +Provides: bundled(maven-dependency-analyzer) = 1.13.2 +Provides: bundled(maven-dependency-plugin) = 3.6.0 +Provides: bundled(maven-dependency-tree) = 3.2.1 Provides: bundled(maven-enforcer) = 3.3.0 Provides: bundled(maven-file-management) = 3.0.0 -Provides: bundled(maven-filtering) = 3.2.0 -Provides: bundled(maven-jar-plugin) = 3.2.0 -Provides: bundled(maven-parent) = 39 +Provides: bundled(maven-filtering) = 3.3.1 +Provides: bundled(maven-jar-plugin) = 3.3.0 +Provides: bundled(maven-parent) = 40 Provides: bundled(maven-plugin-testing) = 3.3.0 Provides: bundled(maven-plugin-tools) = 3.9.0 -Provides: bundled(maven-remote-resources-plugin) = 1.7.0 -Provides: bundled(maven-resolver) = 1.9.7 -Provides: bundled(maven-resources-plugin) = 3.2.0 -Provides: bundled(maven-resources) = 1.4 +Provides: bundled(maven-remote-resources-plugin) = 3.1.0 +Provides: bundled(maven-resolver) = 1.9.15 +Provides: bundled(maven-resources-plugin) = 3.3.1 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~M6 -Provides: bundled(maven-verifier) = 1.7.2 -Provides: bundled(maven-wagon) = 3.5.1 +Provides: bundled(maven-shared-utils) = 3.4.2 +Provides: bundled(maven-source-plugin) = 3.3.0 +Provides: bundled(maven-surefire) = 3.1.2 +Provides: bundled(maven-verifier) = 1.8.0 +Provides: bundled(maven-wagon) = 3.5.3 Provides: bundled(maven) = 3.9.1 Provides: bundled(mockito) = 3.7.13 Provides: bundled(modello) = 2.0.0 Provides: bundled(modulemaker-maven-plugin) = 1.9 Provides: bundled(mojo-parent) = 67 -Provides: bundled(objenesis) = 3.1 -Provides: bundled(opentest4j) = 1.2.0 -Provides: bundled(osgi-annotation) = 8.0.1 +Provides: bundled(objenesis) = 3.3 +Provides: bundled(opentest4j) = 1.3.0 +Provides: bundled(osgi-annotation) = 8.1.0 Provides: bundled(osgi-compendium) = 7.0.0 Provides: bundled(osgi-core) = 8.0.0 Provides: bundled(sonatype-oss-parent) = 7 -Provides: bundled(plexus-archiver) = 4.2.7 +Provides: bundled(plexus-archiver) = 4.8.0 Provides: bundled(plexus-build-api) = 0.0.7 Provides: bundled(plexus-cipher) = 2.0 -Provides: bundled(plexus-classworlds) = 2.6.0 -Provides: bundled(plexus-compiler) = 2.11.1 -Provides: bundled(plexus-components-pom) = 6.6 +Provides: bundled(plexus-classworlds) = 2.7.0 +Provides: bundled(plexus-compiler) = 2.13.0 +Provides: bundled(plexus-components-pom) = 14.1 Provides: bundled(plexus-containers) = 2.1.1 Provides: bundled(plexus-interpolation) = 1.26 -Provides: bundled(plexus-io) = 3.2.0 -Provides: bundled(plexus-languages) = 1.1.1 -Provides: bundled(plexus-pom) = 8 +Provides: bundled(plexus-io) = 3.4.1 +Provides: bundled(plexus-languages) = 1.1.2 +Provides: bundled(plexus-pom) = 14 Provides: bundled(plexus-resources) = 1.2.0 Provides: bundled(plexus-sec-dispatcher) = 2.0 Provides: bundled(plexus-utils) = 3.5.1 -Provides: bundled(qdox) = 2.0.0 +Provides: bundled(qdox) = 2.0.3 Provides: bundled(jakarta-servlet) = 4.0.3 Provides: bundled(sisu) = 0.3.5 Provides: bundled(sisu-mojos) = 0.3.5 Provides: bundled(sisu-plexus) = 0.3.5 Provides: bundled(slf4j) = 1.7.36 -Provides: bundled(testng) = 7.4.0 +Provides: bundled(testng) = 7.8.0 Provides: bundled(univocity-parsers) = 2.9.1 Provides: bundled(velocity) = 1.7 -Provides: bundled(xbean) = 4.18 -Provides: bundled(xmlunit) = 2.8.2 +Provides: bundled(xbean) = 4.23 +Provides: bundled(xmlunit) = 2.9.1 Provides: bundled(xmvn-generator) = 1.2.1 Provides: bundled(xmvn) = 4.2.0 Provides: bundled(xz-java) = 1.9 @@ -395,6 +395,9 @@ sed -i s/_xmvngen_/_jpbgen_/ %{buildroot}%{_fileattrsdir}/jpbgen.attr %doc AUTHORS %changelog +* Thu Aug 17 2023 Mikolaj Izdebski - 1.11.0-2 +- Update to upstream version 1.11.0 + * Thu Aug 10 2023 Mikolaj Izdebski - 1.10.0-1 - Update to upstream version 1.10.0 diff --git a/sources b/sources index 12f2349..1563084 100644 --- a/sources +++ b/sources @@ -1,9 +1,9 @@ -SHA512 (javapackages-bootstrap-1.10.0.tar.xz) = fa722ab4c0a1391df736635c0cc236d7622fd323b6ee3e09c46085f75483c0ff6f1f12d57b1919ca19d4c6d30e8c251fef6ad002647d53e7784be6be800b8ef3 +SHA512 (javapackages-bootstrap-1.11.0.tar.xz) = a6aeb8d76502b1423dee0f8ece45f37658d2b1a1491ca465ad5f3412f4953e26d6b5502921b183db04abdf4efd020372b4079a4d6fbbd361f7459484b5496767 SHA512 (ant.tar.xz) = d2a4babb7766fc2acf3e9377ffd5af790c7d0612d3e34a9642a9a2b85ffb0f15936ef2979389496dce8ea72ed941797cd1f7507beeb1853a46394019adde4152 SHA512 (aopalliance.tar.xz) = 1f9a8a63edb76a73a40dcb3edee72fad069d4b509cc4b702cb9af9aaf694dadeef01fa7d20c285c6c37f7cb030643d267e3a1b834567785399fc986da474e626 -SHA512 (apache-pom.tar.xz) = feebe0142114a6fb61dec26153bdef4314554d109bcf4910518ae9ecaf27e5dd9dc1f03d48271833f3497ab7045265900c5816708f513ae834643c533cd1291f +SHA512 (apache-pom.tar.xz) = b1e8a0d57bc98d9a84dd0c7c69e0f8522d353eacaeb8645c99c84a1041fed0c237710ebd0afe4e4d4726ff536e4c5b009c2d827386aadcdd675ec404841b313c SHA512 (apiguardian.tar.xz) = c3d75e88a983eb53c06007fd01f11c89083e119d2d4ed5d0e97644f45d5e451fd611bee493d720d011562ae29e7cdfd1d6fb4621d17c9db4b61430e62afea2bf -SHA512 (asm.tar.xz) = c5c753e84f70f8ab17369d94e93d4e3fdbc717fd5579ea476c79dd883a1723b85268549cda26cc3bf355339755c7cc3620329a4313d5ffe9294b4de7ad537c52 +SHA512 (asm.tar.xz) = 3a64da5b2dfcb2ef7fd9678307f06a82e2089b51ae5c28fd735f248bf7aea6220d4c5172c228cfb822e2f77dc1e98c51d463bd691b597335307e6aa8fec45e36 SHA512 (assertj-core.tar.xz) = 56c2f6a68cc7bbd5921640375656565a7854270b14f25f18df69d6ac39dfe8cc2625388ae13fa9747bf46d112782c5802b13b56b9f3e6b44be818a9e49f5fdc8 SHA512 (bnd.tar.xz) = bb163a650a6f92f88051a6d169d40a2b1b103d12f5e219be55eac16acdf23868ab8544610891c7b0bd58e79a7c8d7dd5fc238b2bc5195b4510f764593966ba2a SHA512 (build-helper-maven-plugin.tar.xz) = eb45f6d26d89f21d0b306660421425cf0c3f10819f0b2d89c8db334c1574e2bf3196eb4f4cda65e8179ae4822a933190fb2c5276510daf52b2c26020e75f298e @@ -13,14 +13,14 @@ SHA512 (cglib.tar.xz) = 2938c98ed74a95828a1353afae1e79b43725899e845a3e040c2fd970 SHA512 (common-annotations-api.tar.xz) = 2df37b149dd687bff64064ea393e8e93fe907079966c367963fe983ea6edd612f5208113e2432a515d68f2d3d6892a12582bfe1e304b8c71ebe2acbb35c3b2c4 SHA512 (commons-beanutils.tar.xz) = 8d88c5d46f0536dc952da85fe3554f4d682b03eba4adcd01d9726821d03193d236a5bb89c3b3469c86a767bf969628bdce6916b48a6a4aa0952ae36e1a8a0831 SHA512 (commons-cli.tar.xz) = 9d9ea6a2a44b9c25f594cd3d7a2b1babaf523680d9b5ff97e9d1f8babfc87c24c07061a9160eaad637630dcd2e7234b89069cbf116da11f01b30496a981bfddb -SHA512 (commons-codec.tar.xz) = 97a2204042029dec4bf92cfc53211510f156bbaaac35a6d58281acb34762ab4179dda5f4e3d806030548c780050753bf7356a80474a372c0fa82f62fff1d785a +SHA512 (commons-codec.tar.xz) = 48f031385e3e540d3ad8388d9c43db4f9c0cbdf86bd73d730e7dec79d4121c67cc9d13751acddf01ea194653033dbc37dbd2f6d5c1c0316d585c4fe0e56a61fa SHA512 (commons-collections.tar.xz) = 5033b96edd59c6eba0c6fcb2208755e0a317a66cc218df7e5ad05fa063055085ac0ed683728a979b54ddb10b71c7a0d7fbb2a3249bca361be7a428d84a049f56 SHA512 (commons-compress.tar.xz) = ffaa8cc7f16304994f4a8da47f4d6688ea7e0cfdf10a21cb226e3b7c2b2ea490e44a2fb4996fac132f7a98eaf429ff45d9034f7f64497ee44b362d8ec74d3e19 -SHA512 (commons-io.tar.xz) = db2b973f68240622a4d4b821704478e45bcba73227fe95119bae9a6263344f3d1d91dab11edfb70a70e479470196980e96ac2866f9b6206b37cfc3018ce36fef +SHA512 (commons-io.tar.xz) = 5cac83cb8157e12ead6fbaea2bacf0f41a6742ad35a73c937ab45a5143ae7343f4f2805dd2872b930d7c8a7dfaf93019d24b205a45c3c520054bd792dd3cc977 SHA512 (commons-jxpath.tar.xz) = 6ad0e7e2f5f3dd377d78af1a49f5b7fa41ad66b71b80f73ac822e49a006b79dd06ee872c508dc8eb7696ef71bea2ee89c186b6dfc2cdcc4cc2da778f6950d2f5 -SHA512 (commons-lang.tar.xz) = 8d5dd8cfa07792987fb17dfc5fbbf987f3812be9b7cd7473885b068f9a60bd5418dec9574fb122c060a82564b84b31901c8f0d7f2f610dd244806d66285a6c72 +SHA512 (commons-lang.tar.xz) = 9ec17d2cc8c8eb2f0ab26673dbc5ccb61be25e0f485c59ddeef24cb9467fc89a1567b2eacf191edfe3ed7b0f9d4218faf9df1aaec962e610c51341e898620389 SHA512 (commons-logging.tar.xz) = 78a6b9e0139bb2d365438fa74e88f55fbeccb2e4a526592869c1a23719bd6340e25ecbb04888f4f284cc4fe2e153122b56f56f4af479d45c8b77c7c0708e39f3 -SHA512 (commons-parent-pom.tar.xz) = 40db36c70a9c2128d8b678fbc7dc08d703dcfa140ac3bb4ebb471fa5b8eb19de0bea1504edda2a4f8507b8ab9f1a4012c19137fd247d2d0cc45e48a02d661ad3 +SHA512 (commons-parent-pom.tar.xz) = 92f69958a25928f76b53c8fc86136dd2661916a39b3354f65c8b17f916fa16d73913e666b120306d6b18c9c49ce5cb62aa3ceadb49e5336f20886677a22fef06 SHA512 (cup.tar.xz) = 8624696fed9ed0045873a48a75f55f248faa9b3cfc5573182b4c67469d43dfde55d4e676dad6636d31c1f3729456e29b2facc4754e5d4caaaf39dfe6e1fd6af5 SHA512 (disruptor.tar.xz) = 370c5e9829b92fd948064ed61f907407d42b22aff6fa75f943d7e51af796a18d98e93005a5ce2fc780031405b1732b9d869bd36c9d4b114c8fad411598e59275 SHA512 (easymock.tar.xz) = 48489da810750bd9351327584f78d58cf4965ac22341ad4d964edead04c2665a5ea003c245c644f52a04f75e3b046ed3562e483657355ad414ecfc5ed69f965a @@ -48,70 +48,70 @@ SHA512 (junit4.tar.xz) = 305f5e74d0c39e93211eac9e4da568a06e24305b6f87b970c8bf83d SHA512 (junit5.tar.xz) = d37b08df14edb763c6ddc81a67cbefe3b8bd2b384431f71b9bd5852182bf1cf7d9ca28c1c21758c2617b99880dc05cb830291b9925d671a83b3381302ba1d130 SHA512 (log4j.tar.xz) = d563d209a166ab1c536678e0958b4d1eccd8a7be1d12202e1d18b5e8e96f64f3992cf2337016d942e7d9d4ed7aa7eb670805cb94faf62d9e5e517e4d545989d0 SHA512 (mail-api.tar.xz) = fed45a4127c972d38ac3d03a8e70f05199f4e74ab18786eae92564892606a52917f150bae7b0ac6fdd2a619fe9be88a95151ee24a05a1cf3539cd72fbd9e52d8 -SHA512 (maven-antrun-plugin.tar.xz) = d99863b055d3881e91e7d1d48cd4a4d5816ca9bfb36c1ab5c4abdf0a8198fde643a75157c96ed3a966e53ba30271d6f3cf78fd05b52a2fade947dc0bf25d1b43 -SHA512 (maven-archiver.tar.xz) = ddcccd12e7c327c56125d944167f995a4de8a4bc1c4c9294cd8b6cceba28782782cb47e0b3c0f6491b519711131bb6e683be8c0081c1737cb286871805df298b +SHA512 (maven-antrun-plugin.tar.xz) = b66ca8409225bdf84143a0783a1ca607fed53bf7a15a04ff1200e7c63c9a9223e43625c7d955c8cf233ed0a271887faf5cc1ed9c87b39caffb9f0a389fcc37fc +SHA512 (maven-apache-resources.tar.xz) = 06583b9db006e45add380d76dab419dc91a9d52b8b7cb5c30be347fb412c2124f41789a440d7e1502a88bbdf125c46b6f2e6feb96b7a31e78998ce303c40d3d3 +SHA512 (maven-archiver.tar.xz) = a2b86e79b87226d6ce654644a322745ac50208d77d00f4ff2ded1254bafc046d8acb66f44e6fab231db62955e3d406bed346368619d2adfec5f73aea84c5e86d SHA512 (maven-artifact-transfer.tar.xz) = eb023b00573a10f2002b2b23b048ef3c0e59d33c20cefd8915227450923f6ba7850ac9d96b73fec9b2fd0127bcfdcd08deefd47803aa7a0e6c6ccc0d40dc2fc2 -SHA512 (maven-assembly-plugin.tar.xz) = a24c5a78933c191d01ad92f1040260c2cb270294cb1cf1f345f0430b8a0e630d2e90cee99769b5eef9eda68eb2a11adbdd611e94ce495db9d287cc9fb2fb7203 -SHA512 (maven-bundle-plugin.tar.xz) = e0837cee004b25f8a9e85c4cc27f31b3a05a7fba94728d6a9a769118dac34c20640285ae67eaef0a49376fe6f55afd819c7ee55f908207af6a3799594941ba78 -SHA512 (maven-common-artifact-filters.tar.xz) = 2e0e351fdb30b8817cbd29a973a55fed9afd5978d174b0bdf563489dbfe88e7b95c97360655bd8cfaa4a232d6567bb561ddf661d2da4f9626a28b649041b8b90 -SHA512 (maven-compiler-plugin.tar.xz) = 0259e739d1675b5b3905a93ad392f9abe772d9324580898aeae16c33e27885a518003caa7546d624b937557cbd05d087c923081e8d21e6b84f9e46c4fb2d1234 -SHA512 (maven-dependency-analyzer.tar.xz) = 60c7c17621dbfe726b66ad70ca294c7f1405d5528e6c894cc38da637eb046162a43edad21b97aaa731c1ff31016ced1073e3eae3e42e4a9cae50a9b88f7ed619 -SHA512 (maven-dependency-plugin.tar.xz) = 4092de8c04a74939c7b552bb102a040925930aeff8c7788f1ccb464dcf2eadc5fb2f8004055368ea0a128267d8b2fc674fa9cb536c1c7b13bfcf41b3630adc28 -SHA512 (maven-dependency-tree.tar.xz) = be1f8848cd39e55fa2c3c13be29e4c03d73a0bca6c3218bd269c183703c5aee88af0f46c6f2901a20868eea0cb4b8817a48d467043079c8a4043e1a16f2c7456 +SHA512 (maven-assembly-plugin.tar.xz) = 60d88bb9bc6b4a69e3002405d7d8e948d0623d0fabebacf7e7f16982f5ae02ac766d30a47ca8696607afedb9c815626e08dd45b00e5bac9d75d887e3398de4bf +SHA512 (maven-bundle-plugin.tar.xz) = 4ab2d852714c9b1fe1be563e0808757222804d740eb4ac2729e6a21da522e56b013d2da852d757c03adf34523bd6817c03687711be975a69f9d6a09cb97668ec +SHA512 (maven-common-artifact-filters.tar.xz) = a71240d76de7577c3dad5ea665ed1c6c605af5f2fde0eb541eba7776cf11715af48113982ae86db4f4475d274a6ea8f1789acb47d0ddf7b556fa8871a989603c +SHA512 (maven-compiler-plugin.tar.xz) = b669bdc39d131710d3bd6397245638cf1988a1f7b4025313532501e93cbbf82628759fd5655c1d6a0e9e632c39252c0b2328c80ab98386cf0376fc6710803d06 +SHA512 (maven-dependency-analyzer.tar.xz) = c9442c85aed2f882ed59e4cc4cffa67b480b3ee6c4835e561c973759f00d5da3b75bbdf21541202d262de4e78067be4ffd0eeacc76f8c1e1092b106f4fb451ff +SHA512 (maven-dependency-plugin.tar.xz) = 3f239dbd0cdcc3ff553884d03404eb1a3ab864e8d4da61ad9c56ec2ce3bcafe3876a2d38b1e6866ecc65a9233bdd17e52fa1597f9173408ef5016331d39b82d2 +SHA512 (maven-dependency-tree.tar.xz) = 6b510dc0096200f0309cbc7530f05e83b573f1017941f39ba5c916de2c0e8014b3a427d3fc647eeb3c53fb1a62ad1cc2f10ad37e3ec3693d304a4d107bf1550f SHA512 (maven-enforcer.tar.xz) = 377df2d2b784817ff5feb6b698098b32409d0f93a97869fce70fcafe5bf78561b8e4b9b4c94c8c7b283dc5b24cd93ccb8b9e20f4fa22a914113c1a60f975c6ad SHA512 (maven-file-management.tar.xz) = f8593f376d827be2eedbda2e10a8401072feba87748185aabf2aec87e965768567fa9795bc483ea47cc93cd7584f59077f78fdfe83f0f858aef7fdeb3f7c73e2 -SHA512 (maven-filtering.tar.xz) = 6095ece59d2ae4955cdb8e5b476d63c20f64bb81c3d8341edd916c5d155c47cdaaa994813a7807673ad9552b6f4254c5a67f803af55eb42f44ac23ea52e8a67b -SHA512 (maven-jar-plugin.tar.xz) = 990f83b1068d417613b061b5bb60b65717813c787e1e2ec77e11fc04ed27d2e436bbbf45abb52a5b168cc01efef3f08d5e5e0313a84974c081fdb11c63a8cc50 -SHA512 (maven-parent-pom.tar.xz) = d0fc398066e5f465f5861555bdbb01e7220642b89d03c3adce716d07caae0a577c086c0257085d2ed45c4af4acd5c8ff7c5b815e4e9a7e1038a11618344578df +SHA512 (maven-filtering.tar.xz) = df581006cd8ca5b7fe6c094e797a07d57ef3fb773dc34d41568a5dae2c020cf00d79f0fee15edf566dc30527a9533c9429215684e3ffa563545192797059d6a8 +SHA512 (maven-jar-plugin.tar.xz) = 9edf1c05d60307acc8eea505441bd625ea4859ccd8305ad353875b6d14cec2bd5dd2e3d3f8f0ff4f72ffed390251a1ffea22c3e0e90c4e71e583fb9f9a0c4724 +SHA512 (maven-parent-pom.tar.xz) = 839a3c66305aae256d1be7209bf49fdc339d7a2513e8e3f094896f4935dc56a0b6310e7b7081cda3bdd8cd906927834473652176de61d3fbbf9b133c1bd77c92 SHA512 (maven-plugin-testing.tar.xz) = e72fcab892a00b52af06a821b3c2cff676af2bfc77ccaa851cf55017623bf89bb376a16f933fa0853087c1e8161336d21e649745ba2659c87795c4d8fad026df SHA512 (maven-plugin-tools.tar.xz) = 044c982182ec94a2f60efebbe10307c093433219c8c8f98ca2d1f79f1695467d89ccff259cbbb3788a699f9cd435e1fcd2d06fbf7ab9e78d21ff5c5741fbefdd -SHA512 (maven-remote-resources-plugin.tar.xz) = e027b341e8b46f7663066442b9a14c32e1dd030b6cce06498037882331c0d0103a5370903f1b9605b6c76b391dbe0d51f34e1f007b83faa6012529e0aa5ee5a6 -SHA512 (maven-resolver.tar.xz) = 19af9ca443e706b2980a3d6d69fa0244bbae7c92f8c5fe7e5ceb02f5971e1c61ca3123c181a781023fe7b2e12fd4c90aac91bf907e924f5c7b328f08426c24df -SHA512 (maven-resources-plugin.tar.xz) = c68fdd88eb0ca1d88b97b76bcaf413591eaa69dd00c0e7e27398db80da57cd03b114331c51b7b2d87291764bd68e2ddef581d1ab58b0a0a3ecd8439c1297d1b0 -SHA512 (maven-resources.tar.xz) = e80f8798f79275bcaae529e11cddc52c4b2e09499caa9c5a8814008eff31a805b6288925afb790fa780f0e928638ab9a9541e6aea1dc5ec1549b846d49553678 +SHA512 (maven-remote-resources-plugin.tar.xz) = 64e055300c5995a192b627badacaa911c55c47cf0c9ab1ad2c189630d29e551624a2bb6794d4f6471a4aad075491ed2c3162f3ec4b0f6f43325b880af91de469 +SHA512 (maven-resolver.tar.xz) = 861a092ec638f1493c29e3f0a0bf7a44cb2065ee2c00b99aa90bfb18a20a42378539a5274dfe15ac76a8648091186fab93dfa01b52d46589f089676b4f73a3e3 +SHA512 (maven-resources-plugin.tar.xz) = 44941668dd3b59dd6e22bd622534ae23baaaf7f76ea074de17a7ec21607392301ef36efe5f2efdcd39f72ea733d2cb65bd10054e7a0c969626853ee2374bbdbc SHA512 (maven-shared-incremental.tar.xz) = 77ca067f25b396ccef4f4f911323a3b8bfae11c321628e32e012fb1a4dbfbba3a7a0451789b1513aa72ea408bed4a10782f5995eff8083a6af818a97a9842379 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) = 96b4f2457e78bc272d6054a17b3b27ec7204bcc5c16e83564fc2abeb17214e5810f91f25cf3b172a5e750dfa72b4c3bc0dac861d9751c8db73190480e3acaff7 -SHA512 (maven-verifier.tar.xz) = 74977699bf37a9c0929a9583c57128b6c58376953248c16b3aa40f836613e7f0caba0229f5a6d622f814b7d4a94fd201034be7c98d8f9568f93269beccb3ae95 -SHA512 (maven-wagon.tar.xz) = abac6ca4ec8b813a7829dea5b90c67938d0c23a03dd24b08b64df005cf5cf113ab0806501a61faa41331f2b399decb1f5259a01fe0ecc4aab4d349dcaa9b1553 +SHA512 (maven-shared-utils.tar.xz) = 6e8ddd06d6d537d7799de082430ef4ef9ef8238a83a65b0411d506a2bfcd5f0d3d4eba02cd27f831abb45bf67de8d3dfc4d86b980c8a73261f59fd4fcf50c487 +SHA512 (maven-source-plugin.tar.xz) = 93037d9af24e2e6034ee967efea2676ba29d7966789968956bf10a94093e4e0bb0c10829490d1cf15d9cdab81bdce219f248c2b3f89c3b90d683f9aab66b73b1 +SHA512 (maven-surefire.tar.xz) = db776538e06dc3378498f36a07f91c2c2e6f295817ea6a81f19c6dbe51d598e63b6290994f75ce39af32c2f7026a94ded9928ff19d7e343f9d44bb86096b6f6f +SHA512 (maven-verifier.tar.xz) = e095af13fc2fe7e08668725f204f1eeeb6acea8c0204f82149bf0d0a3dd6fd153d7c003f9f8455fc2837fd2ca597a56a4ab077fae651f62cf3a4989c8d78d6d2 +SHA512 (maven-wagon.tar.xz) = 8274ce5922016806359e67ce154b4a6649e6825486a1cf3d1870cefed7cf8e3ceb7132e41df4f63fe6ab3635f8a6aad0ea8da19fc8e9f6dd1fecac53c55f254b SHA512 (maven.tar.xz) = e9906a5ec2249ff11341e027bcabb641a8d0a1a9229a38e5473760f0d59f6bf373a2315bc39a699038608f461992b26ccaaec0e40cabdf122febbe39771313cc SHA512 (mockito.tar.xz) = 8fefdeae3e7bcb41c97080aa208bc9bb6fa787235cc572990ba376c9995f60fa7ab7534e88701da36b00b49eb7b5f2b1c479bbf0e9c86fc1923a7eddc68b4c77 SHA512 (modello.tar.xz) = 7bdd8fd70336f305404bf3e320aba4edcf84fbeb49a8f5d1d027df6a1953ed82ebfcf90896093899a3818c186292793fc7764093f20e5a5a74e2e8c1137a95a3 SHA512 (modulemaker-maven-plugin.tar.xz) = a9d93ddd47419f5de597babf648e509084e7dd4a5c18ef8aed646fbcff886d20f2a7b297463ebaa1cf70f7e26bf3690c7a9b60e5e47fae6b7392807a133302ac SHA512 (mojo-parent-pom.tar.xz) = a9b9da6b088eb7c78e12734d0ecb5787a738d5956766a70dc2db70f47c0706b27f382c505d07638c5aaba8740721ae985a4abf38c6909b817fe6358eb8a506c3 -SHA512 (objenesis.tar.xz) = 40395a14bcc6a01ee1c0d8c2c2476876cae905461119bcdeb748f42860cd0f5e945ddbc4e54eb26a53e639da71ff3f35f107c64666a54dc3aa1b774397448765 -SHA512 (opentest4j.tar.xz) = de1ed222741fe2c9b507946ce14a7039bb5d4b234982e55a763a1582e68fd3c56497c5f5d9345698522d2cf0a83079a6c53160820e725e9401872c2fe4364691 -SHA512 (osgi-annotation.tar.xz) = 50ace49682061546a20d6ef8772281fbf3c8965b6c294826f0699f048a1570e19fb146a0343f59724101166a28ff934ca319de5484d997264c6e3399f27d5666 +SHA512 (objenesis.tar.xz) = eb432f56318ed70aae56cb94b98818c92f30e7dd0d221eab1bfa15898b663da121c0ab4ffe283b4bf03ebadf411bc2ec742c31ca1a01f6e2c9da4a1b6798d912 +SHA512 (opentest4j.tar.xz) = 3a5a80d7c982a7f024f169048833c4aa989f7f57e5ddeb9bd907aefdff937260c893b5fda1eb3646de105f7c8db45455a7438babd8007c6dbb6fe197dc5e20b5 +SHA512 (osgi-annotation.tar.xz) = 96d0bc61978cc223100d447bb291d6b8ccf2a56356dbabcc7f31d4eccfb3dcdc9c86400867478676087feb0bd7767956c6819e63728c22c5f063399f38abe90c SHA512 (osgi-cmpn.tar.xz) = 1be16086c97a7375b89516d86c0381ed5c9f1c86b4b2c3f60e02d974de588f7de1b29f6b8c99b1392d449559588d64817f4de92e3a27ef6b544538881eb03831 SHA512 (osgi-core.tar.xz) = caf409302ff430f6b4d13155152a5b8524a828c88f6260a745c041fa37c44628894d3649620e381f8a407a49402b30877a37613a0bb129c236587210a9475759 SHA512 (oss-parent-pom.tar.xz) = 1b7559cf4ab9a5e4b86caab4247ccbba7136f893662475e08b3c989956a2d50fb44a18a98c9ab7595c3aa84415b94ff8f74f4255c1764006509120cb08e3e641 -SHA512 (plexus-archiver.tar.xz) = a16bbe67070552f3cda1099c626189d25898decd993563665cef3e9f9bb53e43e2819ff9457fb51d7318ca4f19a9b426588b40e1f519e04d3cfa0c9b85d708e8 +SHA512 (plexus-archiver.tar.xz) = 8aeae3d8aab640d55503fd41c27e5fba333dcc8bdac305821bf8ee5b362b41fb76d9c982c803f663b063e8b6958455792a3ef997ab7fb9fa87b59c4eabfcfe07 SHA512 (plexus-build-api.tar.xz) = 1908f360b9926a752dd3950d85e9aa6cbb0f5ebfd92198ed4d04372e5f47a3d5aa771b25b75f6f4dea50ef909b1c4b5084e7b8a40a260c3c5dbfc12b43bf05a7 SHA512 (plexus-cipher.tar.xz) = 28243457ee852513938fcff991dfa59098845145807bc0682a7ff815591a444bd89dd812f72b0fff8cfbb21b26d310c4653c05467bae3fb55d0995fe7bd1dfb9 -SHA512 (plexus-classworlds.tar.xz) = d7c22e1a34395f698a76aeffcd2cde23fd9077f07d186b91442d34b2a80a1745795b9cfc9d7370c44dbf2c4969d5f977321d1a2a25ddf6833a94baac1f6f6037 -SHA512 (plexus-compiler.tar.xz) = b4060ba77a058a21f01380eb4abd016708b7ad8d3b91aa2098868c093cc6e9d4e97f45bfd72b46c8c669271f40f9710e732f70186e484cf0e771f0d272e95c27 -SHA512 (plexus-components-pom.tar.xz) = d98db6011cc31c836f6c473f96413cf2260143ffe3395e8327230b808584111d6216c5780140452e109a74e98ad22dfabd1fa386521ac598979caf042d3347d9 +SHA512 (plexus-classworlds.tar.xz) = ee3a84a7a2d088754b00e6431613abc9eaa52d52678ea5ce4de6e91a577332a385b6fa8e618895080aec02834754d928a77e7e1b262d1be66866bc4d9b9f9019 +SHA512 (plexus-compiler.tar.xz) = bc5f92bf8f3a5f2c9e62bb6f75414b231687ce96037dca624b5c9ca9b58cfd7cbb86a028e22ef48570e9eaf839ff53ec5dfcd388d82e4109e8e66d8d319adf6b +SHA512 (plexus-components-pom.tar.xz) = e5aab7757ecf6dc741cbbf6b65038bc5dd21978816b9a85bff9bacf94c3828ef6eb32b639c67013a64b82606199d6433e49312b68688066e1bad6295e8b90be7 SHA512 (plexus-containers.tar.xz) = 32218f1337cc490aa4a51e918d368e36894e4952c1e1686849a23ebda92b0fe893052deea774790980e2d7271b22cd58aa83dcd7b12d07fff3bf034c86e46cc1 SHA512 (plexus-interpolation.tar.xz) = 1e200b309979e874546ba03b6ae7fe166e2f0dfb71c0b05399ee0a986de6be171456a545719671e502968a91b1af5cfcf046fd1d2f9d9cca51aa0081466dea21 -SHA512 (plexus-io.tar.xz) = 1582ddeb4486e1408421f50144352f352bec60b158473b16351f0ad02b114718a0f3a35e8c60bd21fb840c267e3fc08dc1ec48335a9fab1ef30ca3397d2238fc -SHA512 (plexus-languages.tar.xz) = 5fff40f43a21f5da1596ff8d17d48f21e8908b8baa6aa63c6c665a1058b05b651c32faabca9f765084c68d9d528129bdbb93cba69e540933fb005e260a56db2c -SHA512 (plexus-pom.tar.xz) = 2f55ae0514e69cccc85bcd92becbad6c856cf6637e40d700867be849710a9bc9e8058ef4f3b0b30b5be089caeee19acef38d201bb91155858eec875448eb2db0 +SHA512 (plexus-io.tar.xz) = a5867929ccf8d4a3ead68007cd8432d3cd74e5714351e72a63a362bb35696cc124d598628a2c1dd20d856ddfa6cd735d5a9f59865a9fef933b32276fbb3fa145 +SHA512 (plexus-languages.tar.xz) = 315733f625988a3283458811d56fb08743dcbddeefc014ff2f7dc70a734d9d91c911f9469feeda25510206e7870563a4ac88540db4f7fe1b674dd77f2e3bd2a1 +SHA512 (plexus-pom.tar.xz) = 79620a970ba337950f59f429326ffebe0bbdcd0cd8fe380f2adf78039c4d8be9e4029874f74ba54f1dce1468a444144cfe47e0af64e32a776951086281049fb8 SHA512 (plexus-resources.tar.xz) = 7c1cd518b75ba2b5653d5ec7f134985780450728e3a1943734bbd2b8227c6ccc73a2e076034fd46487329bd88cb4d4dfe36411482f8e8ee28aff4b1cf9c4f396 SHA512 (plexus-sec-dispatcher.tar.xz) = 4c9be8c78ff3f6ab2ff1a5271602b66b61546294bdedc1e3cf5b92e8daa8365bcf721beaf12ba7ae16f2da24f506fbd04f3c9203b4627a930c359ca68f9ead4f SHA512 (plexus-utils.tar.xz) = 2d033a7d4c2b1a55831606261324e2c2b447908ee584d7aa187d33b431c97c5e58c1647d109d457bdacbb63f77b0f58311658de81d0384164aebbb9e0aa06730 -SHA512 (qdox.tar.xz) = 48c904a6e4ec4dfd66b47238e4151fb0ca092751a9e6a89f1bd89d9b6cd4a33e9493f0b2ee5e06ea81d956c3eeb81fba8b8552053e49b3155cc42a00a8af9e11 +SHA512 (qdox.tar.xz) = e9498d99a5bb4211fc81fe1e3cecb1b4cc18db390670bc3318f8a18f042baa80a13c2438dd67b1c6d05f19dec84429850e0791802445208fe1ffc80f39755287 SHA512 (servlet-api.tar.xz) = a255c21c248dcb6a72022146f58e09cef03e388e6a64d97f5dfbbcfffce57fe88ef4255c2c1c1195958c70a4495b9512d6c2fff588c5e7df66394a45e44262ab SHA512 (sisu-inject.tar.xz) = 419f2065f1acdce764ffcfcfb3716fb67a3b85cf596e047f66c5a6f1831dd5d96dd99583e6949d8b7ddee433f39a9a5731fa582f930ce6828e3a5139effcfa56 SHA512 (sisu-mojos.tar.xz) = ed9462baa5f59561131d84b6ea8d114a16b99fec0c502e2698e38556f1247a3c3550172d551ad8f38107558a8c78890a09ceebfee7ca2fceffea334b3da13ded SHA512 (sisu-plexus.tar.xz) = 044d8738f5387cdecc9e2fdf78ff7b7c46e2240ea982aa09057aa6518c19b8537a115839e3a474ca271cbdf9f1225fc4610a28c875d0759a5af1e7c9f03711d1 SHA512 (slf4j.tar.xz) = 434da37f9efaa3faba2ccda7781290a92904c29a24be6234c4a681bd55d9e33e3e4242282a4995cd40cf72b507aa26d761c8d8de1781d1c4997b50323b9250a6 -SHA512 (testng.tar.xz) = 0990fe21441057f08beffad08feb0be62b5a207001bd05c122dd0356231f3ca3ac91ae7cbe974ef2192f1803cd889a389d039b1b9b4136795f279825e03dd6ed +SHA512 (testng.tar.xz) = 92d0bc00fce4956ce8cd59eaf243dec1924571ab4cfe6a6b2d191dcf296550eb133ed679d89e78304b121e747aa7ecb4911218220754a3ea91dcaeb197dce60b SHA512 (univocity-parsers.tar.xz) = 7daa3f54d26d7c64714990c7ad9d539bc7dd531917354b5b90970114e51c20aedac3e1fdd8b45e073d8c196b4ce2fa93c2f84a5498147de951ac147900ce51fa SHA512 (velocity-engine.tar.xz) = c8baa9e159acae579848c1dd33b488eb70f64280e2f806e0e2ccf3024d1bc4f588086cb523e0d8e6ea2f8802ff908ff5578e86e646131768356c6d6e9b7214d0 -SHA512 (xbean.tar.xz) = 78bd8f7ed95b04e23df68f89890b16d86e7328b00881ddaaedcde07456761992cf4a25f4e83ebf48637ccb09dd48ff8d6646f8e3062468eb4f2a5f100369a756 -SHA512 (xmlunit.tar.xz) = 2fa565f76c7e53283bf2aed9d0b092ec331352e5348b964de4ee9308e4094961b7509f5930575dc33ec623b7a074964019bfe247356507d7ec21dc18b2a8f58c +SHA512 (xbean.tar.xz) = a88078198743d328589150f4ed9817a305898cd09b78b18659c5e82447df47807d20981f19dc7fb67a7c296b7de987b5e16c0a984a5214958104a383820239ac +SHA512 (xmlunit.tar.xz) = 654c8624371b9e9879d72a46480f412f7452e7758e1586707655ebbfdee9cf24620fbf14392d8b93790dee0122cd5a9239c0bf95c4581223a658180db3273bce SHA512 (xmvn-generator.tar.xz) = 63b40f3d4c57f18ae2aee720f87f891cce3e37a3f485b158931e35a9b653201f3f241edc580cbc357103813924e314ff4029e96d1abed73f51dbb123d04c335a SHA512 (xmvn.tar.xz) = 3e75b3f9a2d33eac5f5b66e78d71b18a012320001dba7ef6c5c95ae3e24183d265a2d136ccf8886619ab63beeba6b7a95760247594b49df4d764c71c34dbdfb7 SHA512 (xz-java.tar.xz) = dc4314babc66bf33e2964b35552746e30ddae136d2b717c3e498f5109154198595bc42d0b266b9e9966298d53d2f5d0196823fae193776eae27047d225cd2137 From 2b152fb8d089a0d11aa771b67cb9e13cf9636ee5 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 17 Aug 2023 14:04:45 +0200 Subject: [PATCH 59/77] Drop legacy OpenJDK 8 toolchain package --- javapackages-bootstrap.spec | 19 +------------------ toolchains-openjdk8.xml | 11 ----------- 2 files changed, 1 insertion(+), 29 deletions(-) delete mode 100644 toolchains-openjdk8.xml diff --git a/javapackages-bootstrap.spec b/javapackages-bootstrap.spec index 734f72f..b140161 100644 --- a/javapackages-bootstrap.spec +++ b/javapackages-bootstrap.spec @@ -32,8 +32,6 @@ Source0: https://github.com/fedora-java/javapackages-bootstrap/releases/d # License breakdown Source1: javapackages-bootstrap-PACKAGE-LICENSING -Source101: toolchains-openjdk8.xml - # To obtain the following sources: # tar -xf ${name}-${version}.tar.xz # pushd ${name}-${version} @@ -306,20 +304,12 @@ depend on JPB for everything, without depending on any other Java packages. For example, JPB contains embedded version of XMvn, removing dependency of JPT on XMvn, allowing JPT to be used before one builds XMvn package. -%package openjdk8 -Summary: OpenJDK 8 toolchain for Java Packages Bootstrap -Requires: %{name} -Requires: java-1.8.0-openjdk-devel - -%description openjdk8 -OpenJDK 8 toolchain for Java Packages Bootstrap. - %prep %setup -q # leave out the first source as it has already been extracted # leave out licensing breakdown file -other_sources=$(echo %{sources} | cut -d' ' -f4-) +other_sources=$(echo %{sources} | cut -d' ' -f3-) for source in ${other_sources}; do tar -xf "${source}" @@ -351,9 +341,6 @@ JAVA_HOME=%{javaHomePath} ./mbi.sh dist \ -launchersPath=%{launchersPath} \ -licensesPath=%{_licensedir}/%{name} \ -# Use custom toolchains.xml -cp -p %{SOURCE101} %{buildroot}%{mavenHomePath}/conf/toolchains.xml - install -D -p -m 644 downstream/xmvn-generator/src/main/lua/xmvn-generator.lua %{buildroot}%{_rpmluadir}/%{name}-generator.lua install -D -p -m 644 downstream/xmvn-generator/src/main/rpm/macros.xmvngen %{buildroot}%{_rpmmacrodir}/macros.jpbgen install -D -p -m 644 downstream/xmvn-generator/src/main/rpm/macros.xmvngenhook %{buildroot}%{_sysconfdir}/rpm/macros.jpbgenhook @@ -378,7 +365,6 @@ sed -i s/_xmvngen_/_jpbgen_/ %{buildroot}%{_fileattrsdir}/jpbgen.attr %files %{mavenHomePath} -%exclude %{mavenHomePath}/conf/toolchains.xml %{metadataPath}/* %{artifactsPath}/* %{launchersPath}/* @@ -387,9 +373,6 @@ sed -i s/_xmvngen_/_jpbgen_/ %{buildroot}%{_fileattrsdir}/jpbgen.attr %{_fileattrsdir}/* %{_sysconfdir}/rpm/* -%files openjdk8 -%{mavenHomePath}/conf/toolchains.xml - %license %{_licensedir}/%{name} %doc README.md %doc AUTHORS diff --git a/toolchains-openjdk8.xml b/toolchains-openjdk8.xml deleted file mode 100644 index 25d130f..0000000 --- a/toolchains-openjdk8.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - jdk - - xmvn - - - /usr/lib/jvm/java-1.8.0-openjdk - - - From eda9452e4cdede4a99fefa8845013396d9322062 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 21 Aug 2023 10:05:30 +0200 Subject: [PATCH 60/77] Update to upstream version 1.12.0 Resolves: rhbz#2233033 --- .gitignore | 1 + generate-bundled-provides.sh | 1 - javapackages-bootstrap.spec | 15 +++++++++------ sources | 10 +++++----- 4 files changed, 15 insertions(+), 12 deletions(-) diff --git a/.gitignore b/.gitignore index 2077070..43cc85d 100644 --- a/.gitignore +++ b/.gitignore @@ -147,3 +147,4 @@ /mail-api.tar.xz /javapackages-bootstrap-1.11.0.tar.xz /maven-apache-resources.tar.xz +/javapackages-bootstrap-1.12.0.tar.xz diff --git a/generate-bundled-provides.sh b/generate-bundled-provides.sh index e1c248b..677000d 100755 --- a/generate-bundled-provides.sh +++ b/generate-bundled-provides.sh @@ -29,7 +29,6 @@ s/^cup /java_cup / s/^junit4 /junit / s/^mail-api /jakarta-mail / s/^maven-parent-pom /maven-parent / -s/^build-helper-maven-plugin /maven-plugin-build-helper / s/^maven-bundle-plugin /maven-plugin-bundle / s/^mojo-parent-pom /mojo-parent / s/^asm /objectweb-asm / diff --git a/javapackages-bootstrap.spec b/javapackages-bootstrap.spec index b140161..5db8919 100644 --- a/javapackages-bootstrap.spec +++ b/javapackages-bootstrap.spec @@ -18,8 +18,8 @@ #global git_short_hash %(echo %{git_hash} | cut -b -7) Name: javapackages-bootstrap -Version: 1.11.0 -Release: 2%{?dist} +Version: 1.12.0 +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 @@ -163,7 +163,7 @@ Provides: bundled(apiguardian) = 1.1.2 Provides: bundled(objectweb-asm) = 9.5 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(build-helper-maven-plugin) = 3.4.0 Provides: bundled(byte-buddy) = 1.11.22 Provides: bundled(cdi-api) = 2.0.2 Provides: bundled(cglib) = 3.3.0 @@ -217,7 +217,7 @@ Provides: bundled(maven-dependency-analyzer) = 1.13.2 Provides: bundled(maven-dependency-plugin) = 3.6.0 Provides: bundled(maven-dependency-tree) = 3.2.1 Provides: bundled(maven-enforcer) = 3.3.0 -Provides: bundled(maven-file-management) = 3.0.0 +Provides: bundled(maven-file-management) = 3.1.0 Provides: bundled(maven-filtering) = 3.3.1 Provides: bundled(maven-jar-plugin) = 3.3.0 Provides: bundled(maven-parent) = 40 @@ -233,11 +233,11 @@ Provides: bundled(maven-source-plugin) = 3.3.0 Provides: bundled(maven-surefire) = 3.1.2 Provides: bundled(maven-verifier) = 1.8.0 Provides: bundled(maven-wagon) = 3.5.3 -Provides: bundled(maven) = 3.9.1 +Provides: bundled(maven) = 3.9.4 Provides: bundled(mockito) = 3.7.13 Provides: bundled(modello) = 2.0.0 Provides: bundled(modulemaker-maven-plugin) = 1.9 -Provides: bundled(mojo-parent) = 67 +Provides: bundled(mojo-parent) = 76 Provides: bundled(objenesis) = 3.3 Provides: bundled(opentest4j) = 1.3.0 Provides: bundled(osgi-annotation) = 8.1.0 @@ -378,6 +378,9 @@ sed -i s/_xmvngen_/_jpbgen_/ %{buildroot}%{_fileattrsdir}/jpbgen.attr %doc AUTHORS %changelog +* Mon Aug 21 2023 Mikolaj Izdebski - 1.12.0-1 +- Update to upstream version 1.12.0 + * Thu Aug 17 2023 Mikolaj Izdebski - 1.11.0-2 - Update to upstream version 1.11.0 diff --git a/sources b/sources index 1563084..7e90f1e 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -SHA512 (javapackages-bootstrap-1.11.0.tar.xz) = a6aeb8d76502b1423dee0f8ece45f37658d2b1a1491ca465ad5f3412f4953e26d6b5502921b183db04abdf4efd020372b4079a4d6fbbd361f7459484b5496767 +SHA512 (javapackages-bootstrap-1.12.0.tar.xz) = b6bc2c9e517575857d24fc4457d596f4fb0b8d351e2095fa49da18378531a5807dc531a930d7c6d0728c99887a60f57baccf65935dc73a9625764103efb34268 SHA512 (ant.tar.xz) = d2a4babb7766fc2acf3e9377ffd5af790c7d0612d3e34a9642a9a2b85ffb0f15936ef2979389496dce8ea72ed941797cd1f7507beeb1853a46394019adde4152 SHA512 (aopalliance.tar.xz) = 1f9a8a63edb76a73a40dcb3edee72fad069d4b509cc4b702cb9af9aaf694dadeef01fa7d20c285c6c37f7cb030643d267e3a1b834567785399fc986da474e626 SHA512 (apache-pom.tar.xz) = b1e8a0d57bc98d9a84dd0c7c69e0f8522d353eacaeb8645c99c84a1041fed0c237710ebd0afe4e4d4726ff536e4c5b009c2d827386aadcdd675ec404841b313c @@ -6,7 +6,7 @@ SHA512 (apiguardian.tar.xz) = c3d75e88a983eb53c06007fd01f11c89083e119d2d4ed5d0e9 SHA512 (asm.tar.xz) = 3a64da5b2dfcb2ef7fd9678307f06a82e2089b51ae5c28fd735f248bf7aea6220d4c5172c228cfb822e2f77dc1e98c51d463bd691b597335307e6aa8fec45e36 SHA512 (assertj-core.tar.xz) = 56c2f6a68cc7bbd5921640375656565a7854270b14f25f18df69d6ac39dfe8cc2625388ae13fa9747bf46d112782c5802b13b56b9f3e6b44be818a9e49f5fdc8 SHA512 (bnd.tar.xz) = bb163a650a6f92f88051a6d169d40a2b1b103d12f5e219be55eac16acdf23868ab8544610891c7b0bd58e79a7c8d7dd5fc238b2bc5195b4510f764593966ba2a -SHA512 (build-helper-maven-plugin.tar.xz) = eb45f6d26d89f21d0b306660421425cf0c3f10819f0b2d89c8db334c1574e2bf3196eb4f4cda65e8179ae4822a933190fb2c5276510daf52b2c26020e75f298e +SHA512 (build-helper-maven-plugin.tar.xz) = e4e260587d5a3ef98064015b3dfc4f8be04a53513718bcfc1e57dba74b13be573d3766b23a9c00cc63f25e8300ff812c6560a28ad5bd537662d0ccb0d1c42925 SHA512 (byte-buddy.tar.xz) = dfcfffe72a47679ec8dbf152ad5dc3edb5c5614ad97a89e625dba94d44311d04cecf28256f0996652a6bbd413197eec1f90acc4128826865f1633d0b1e0f8f63 SHA512 (cdi.tar.xz) = 334ffd958aa8915eabeaf8c554cffc0e636e73538d2efa2ddb405903814f9c3a0be99fbb325f2bd6a0207d71dcac7f5d1b82efb962b1ac24db263379c7f759ac SHA512 (cglib.tar.xz) = 2938c98ed74a95828a1353afae1e79b43725899e845a3e040c2fd9705f87fd523bb9c04f36d8ad1beec21c725bd85d40eeebc30e161334da0469b854f263e9c9 @@ -60,7 +60,7 @@ SHA512 (maven-dependency-analyzer.tar.xz) = c9442c85aed2f882ed59e4cc4cffa67b480b SHA512 (maven-dependency-plugin.tar.xz) = 3f239dbd0cdcc3ff553884d03404eb1a3ab864e8d4da61ad9c56ec2ce3bcafe3876a2d38b1e6866ecc65a9233bdd17e52fa1597f9173408ef5016331d39b82d2 SHA512 (maven-dependency-tree.tar.xz) = 6b510dc0096200f0309cbc7530f05e83b573f1017941f39ba5c916de2c0e8014b3a427d3fc647eeb3c53fb1a62ad1cc2f10ad37e3ec3693d304a4d107bf1550f SHA512 (maven-enforcer.tar.xz) = 377df2d2b784817ff5feb6b698098b32409d0f93a97869fce70fcafe5bf78561b8e4b9b4c94c8c7b283dc5b24cd93ccb8b9e20f4fa22a914113c1a60f975c6ad -SHA512 (maven-file-management.tar.xz) = f8593f376d827be2eedbda2e10a8401072feba87748185aabf2aec87e965768567fa9795bc483ea47cc93cd7584f59077f78fdfe83f0f858aef7fdeb3f7c73e2 +SHA512 (maven-file-management.tar.xz) = 6c6595730e3f12aa872421b7cc9c914862472614d5ed8719a153505ba9db08124053610d31d2c1340ca0387e4310e01ee3a396a87b74c3be3b3e7e85168a8e91 SHA512 (maven-filtering.tar.xz) = df581006cd8ca5b7fe6c094e797a07d57ef3fb773dc34d41568a5dae2c020cf00d79f0fee15edf566dc30527a9533c9429215684e3ffa563545192797059d6a8 SHA512 (maven-jar-plugin.tar.xz) = 9edf1c05d60307acc8eea505441bd625ea4859ccd8305ad353875b6d14cec2bd5dd2e3d3f8f0ff4f72ffed390251a1ffea22c3e0e90c4e71e583fb9f9a0c4724 SHA512 (maven-parent-pom.tar.xz) = 839a3c66305aae256d1be7209bf49fdc339d7a2513e8e3f094896f4935dc56a0b6310e7b7081cda3bdd8cd906927834473652176de61d3fbbf9b133c1bd77c92 @@ -76,11 +76,11 @@ SHA512 (maven-source-plugin.tar.xz) = 93037d9af24e2e6034ee967efea2676ba29d796678 SHA512 (maven-surefire.tar.xz) = db776538e06dc3378498f36a07f91c2c2e6f295817ea6a81f19c6dbe51d598e63b6290994f75ce39af32c2f7026a94ded9928ff19d7e343f9d44bb86096b6f6f SHA512 (maven-verifier.tar.xz) = e095af13fc2fe7e08668725f204f1eeeb6acea8c0204f82149bf0d0a3dd6fd153d7c003f9f8455fc2837fd2ca597a56a4ab077fae651f62cf3a4989c8d78d6d2 SHA512 (maven-wagon.tar.xz) = 8274ce5922016806359e67ce154b4a6649e6825486a1cf3d1870cefed7cf8e3ceb7132e41df4f63fe6ab3635f8a6aad0ea8da19fc8e9f6dd1fecac53c55f254b -SHA512 (maven.tar.xz) = e9906a5ec2249ff11341e027bcabb641a8d0a1a9229a38e5473760f0d59f6bf373a2315bc39a699038608f461992b26ccaaec0e40cabdf122febbe39771313cc +SHA512 (maven.tar.xz) = ee98b4fdf245beef58c1f1583991d85e418055b3e28471ce77f4ce497cb365ce56630e83c74ad246b900fe1b6fd9079f423c6c05ff0d8789e7571967f69e2b71 SHA512 (mockito.tar.xz) = 8fefdeae3e7bcb41c97080aa208bc9bb6fa787235cc572990ba376c9995f60fa7ab7534e88701da36b00b49eb7b5f2b1c479bbf0e9c86fc1923a7eddc68b4c77 SHA512 (modello.tar.xz) = 7bdd8fd70336f305404bf3e320aba4edcf84fbeb49a8f5d1d027df6a1953ed82ebfcf90896093899a3818c186292793fc7764093f20e5a5a74e2e8c1137a95a3 SHA512 (modulemaker-maven-plugin.tar.xz) = a9d93ddd47419f5de597babf648e509084e7dd4a5c18ef8aed646fbcff886d20f2a7b297463ebaa1cf70f7e26bf3690c7a9b60e5e47fae6b7392807a133302ac -SHA512 (mojo-parent-pom.tar.xz) = a9b9da6b088eb7c78e12734d0ecb5787a738d5956766a70dc2db70f47c0706b27f382c505d07638c5aaba8740721ae985a4abf38c6909b817fe6358eb8a506c3 +SHA512 (mojo-parent-pom.tar.xz) = db43765de7cdb23ffb82a1f1b21b35af1faeccb3da9ef0d164395fa6cb08125d2ef626a652f9dc41a0d53fc76f1e1766f42fcf8a5748938a51a38174da781d24 SHA512 (objenesis.tar.xz) = eb432f56318ed70aae56cb94b98818c92f30e7dd0d221eab1bfa15898b663da121c0ab4ffe283b4bf03ebadf411bc2ec742c31ca1a01f6e2c9da4a1b6798d912 SHA512 (opentest4j.tar.xz) = 3a5a80d7c982a7f024f169048833c4aa989f7f57e5ddeb9bd907aefdff937260c893b5fda1eb3646de105f7c8db45455a7438babd8007c6dbb6fe197dc5e20b5 SHA512 (osgi-annotation.tar.xz) = 96d0bc61978cc223100d447bb291d6b8ccf2a56356dbabcc7f31d4eccfb3dcdc9c86400867478676087feb0bd7767956c6819e63728c22c5f063399f38abe90c From 34edfc7801792ec77cb08c3db15a5cc701086ecb Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 25 Aug 2023 15:03:29 +0200 Subject: [PATCH 61/77] Update to upstream version 1.13.0 --- .gitignore | 3 + javapackages-bootstrap.spec | 191 +++++++++++++++++++----------------- sources | 30 +++--- 3 files changed, 118 insertions(+), 106 deletions(-) diff --git a/.gitignore b/.gitignore index 43cc85d..6bd8a98 100644 --- a/.gitignore +++ b/.gitignore @@ -148,3 +148,6 @@ /javapackages-bootstrap-1.11.0.tar.xz /maven-apache-resources.tar.xz /javapackages-bootstrap-1.12.0.tar.xz +/javapackages-bootstrap-1.13.0.tar.xz +/javacc.tar.xz +/javacc-maven-plugin.tar.xz diff --git a/javapackages-bootstrap.spec b/javapackages-bootstrap.spec index 5db8919..bbb2a63 100644 --- a/javapackages-bootstrap.spec +++ b/javapackages-bootstrap.spec @@ -18,7 +18,7 @@ #global git_short_hash %(echo %{git_hash} | cut -b -7) Name: javapackages-bootstrap -Version: 1.12.0 +Version: 1.13.0 Release: 1%{?dist} Summary: A means of bootstrapping Java Packages Tools # For detailed info see the file javapackages-bootstrap-PACKAGE-LICENSING @@ -77,91 +77,93 @@ Source1035: httpcomponents-parent-pom.tar.xz Source1036: injection-api.tar.xz Source1037: jaf-api.tar.xz Source1038: jansi.tar.xz -Source1039: jcommander.tar.xz -Source1040: jctools.tar.xz -Source1041: jdom.tar.xz -Source1042: jdom2.tar.xz -Source1043: jflex.tar.xz -Source1044: jsoup.tar.xz -Source1045: jsr-305.tar.xz -Source1046: junit4.tar.xz -Source1047: junit5.tar.xz -Source1048: log4j.tar.xz -Source1049: mail-api.tar.xz -Source1050: maven-antrun-plugin.tar.xz -Source1051: maven-apache-resources.tar.xz -Source1052: maven-archiver.tar.xz -Source1053: maven-artifact-transfer.tar.xz -Source1054: maven-assembly-plugin.tar.xz -Source1055: maven-bundle-plugin.tar.xz -Source1056: maven-common-artifact-filters.tar.xz -Source1057: maven-compiler-plugin.tar.xz -Source1058: maven-dependency-analyzer.tar.xz -Source1059: maven-dependency-plugin.tar.xz -Source1060: maven-dependency-tree.tar.xz -Source1061: maven-enforcer.tar.xz -Source1062: maven-file-management.tar.xz -Source1063: maven-filtering.tar.xz -Source1064: maven-jar-plugin.tar.xz -Source1065: maven-parent-pom.tar.xz -Source1066: maven-plugin-testing.tar.xz -Source1067: maven-plugin-tools.tar.xz -Source1068: maven-remote-resources-plugin.tar.xz -Source1069: maven-resolver.tar.xz -Source1070: maven-resources-plugin.tar.xz -Source1071: maven-shared-incremental.tar.xz -Source1072: maven-shared-io.tar.xz -Source1073: maven-shared-utils.tar.xz -Source1074: maven-source-plugin.tar.xz -Source1075: maven-surefire.tar.xz -Source1076: maven-verifier.tar.xz -Source1077: maven-wagon.tar.xz -Source1078: maven.tar.xz -Source1079: mockito.tar.xz -Source1080: modello.tar.xz -Source1081: modulemaker-maven-plugin.tar.xz -Source1082: mojo-parent-pom.tar.xz -Source1083: objenesis.tar.xz -Source1084: opentest4j.tar.xz -Source1085: osgi-annotation.tar.xz -Source1086: osgi-cmpn.tar.xz -Source1087: osgi-core.tar.xz -Source1088: oss-parent-pom.tar.xz -Source1089: plexus-archiver.tar.xz -Source1090: plexus-build-api.tar.xz -Source1091: plexus-cipher.tar.xz -Source1092: plexus-classworlds.tar.xz -Source1093: plexus-compiler.tar.xz -Source1094: plexus-components-pom.tar.xz -Source1095: plexus-containers.tar.xz -Source1096: plexus-interpolation.tar.xz -Source1097: plexus-io.tar.xz -Source1098: plexus-languages.tar.xz -Source1099: plexus-pom.tar.xz -Source1100: plexus-resources.tar.xz -Source1101: plexus-sec-dispatcher.tar.xz -Source1102: plexus-utils.tar.xz -Source1103: qdox.tar.xz -Source1104: servlet-api.tar.xz -Source1105: sisu-inject.tar.xz -Source1106: sisu-mojos.tar.xz -Source1107: sisu-plexus.tar.xz -Source1108: slf4j.tar.xz -Source1109: testng.tar.xz -Source1110: univocity-parsers.tar.xz -Source1111: velocity-engine.tar.xz -Source1112: xbean.tar.xz -Source1113: xmlunit.tar.xz -Source1114: xmvn-generator.tar.xz -Source1115: xmvn.tar.xz -Source1116: xz-java.tar.xz +Source1039: javacc-maven-plugin.tar.xz +Source1040: javacc.tar.xz +Source1041: jcommander.tar.xz +Source1042: jctools.tar.xz +Source1043: jdom.tar.xz +Source1044: jdom2.tar.xz +Source1045: jflex.tar.xz +Source1046: jsoup.tar.xz +Source1047: jsr-305.tar.xz +Source1048: junit4.tar.xz +Source1049: junit5.tar.xz +Source1050: log4j.tar.xz +Source1051: mail-api.tar.xz +Source1052: maven-antrun-plugin.tar.xz +Source1053: maven-apache-resources.tar.xz +Source1054: maven-archiver.tar.xz +Source1055: maven-artifact-transfer.tar.xz +Source1056: maven-assembly-plugin.tar.xz +Source1057: maven-bundle-plugin.tar.xz +Source1058: maven-common-artifact-filters.tar.xz +Source1059: maven-compiler-plugin.tar.xz +Source1060: maven-dependency-analyzer.tar.xz +Source1061: maven-dependency-plugin.tar.xz +Source1062: maven-dependency-tree.tar.xz +Source1063: maven-enforcer.tar.xz +Source1064: maven-file-management.tar.xz +Source1065: maven-filtering.tar.xz +Source1066: maven-jar-plugin.tar.xz +Source1067: maven-parent-pom.tar.xz +Source1068: maven-plugin-testing.tar.xz +Source1069: maven-plugin-tools.tar.xz +Source1070: maven-remote-resources-plugin.tar.xz +Source1071: maven-resolver.tar.xz +Source1072: maven-resources-plugin.tar.xz +Source1073: maven-shared-incremental.tar.xz +Source1074: maven-shared-io.tar.xz +Source1075: maven-shared-utils.tar.xz +Source1076: maven-source-plugin.tar.xz +Source1077: maven-surefire.tar.xz +Source1078: maven-verifier.tar.xz +Source1079: maven-wagon.tar.xz +Source1080: maven.tar.xz +Source1081: mockito.tar.xz +Source1082: modello.tar.xz +Source1083: modulemaker-maven-plugin.tar.xz +Source1084: mojo-parent-pom.tar.xz +Source1085: objenesis.tar.xz +Source1086: opentest4j.tar.xz +Source1087: osgi-annotation.tar.xz +Source1088: osgi-cmpn.tar.xz +Source1089: osgi-core.tar.xz +Source1090: oss-parent-pom.tar.xz +Source1091: plexus-archiver.tar.xz +Source1092: plexus-build-api.tar.xz +Source1093: plexus-cipher.tar.xz +Source1094: plexus-classworlds.tar.xz +Source1095: plexus-compiler.tar.xz +Source1096: plexus-components-pom.tar.xz +Source1097: plexus-containers.tar.xz +Source1098: plexus-interpolation.tar.xz +Source1099: plexus-io.tar.xz +Source1100: plexus-languages.tar.xz +Source1101: plexus-pom.tar.xz +Source1102: plexus-resources.tar.xz +Source1103: plexus-sec-dispatcher.tar.xz +Source1104: plexus-utils.tar.xz +Source1105: qdox.tar.xz +Source1106: servlet-api.tar.xz +Source1107: sisu-inject.tar.xz +Source1108: sisu-mojos.tar.xz +Source1109: sisu-plexus.tar.xz +Source1110: slf4j.tar.xz +Source1111: testng.tar.xz +Source1112: univocity-parsers.tar.xz +Source1113: velocity-engine.tar.xz +Source1114: xbean.tar.xz +Source1115: xmlunit.tar.xz +Source1116: xmvn-generator.tar.xz +Source1117: xmvn.tar.xz +Source1118: xz-java.tar.xz -Provides: bundled(ant) = 1.10.12 +Provides: bundled(ant) = 1.10.14 Provides: bundled(aopalliance) = 1.0 Provides: bundled(apache-parent) = 30 Provides: bundled(apiguardian) = 1.1.2 Provides: bundled(objectweb-asm) = 9.5 -Provides: bundled(assertj-core) = 3.19.0 +Provides: bundled(assertj-core) = 3.24.2 Provides: bundled(aqute-bnd) = 5.2.0 Provides: bundled(build-helper-maven-plugin) = 3.4.0 Provides: bundled(byte-buddy) = 1.11.22 @@ -190,21 +192,23 @@ Provides: bundled(google-guice) = 5.1.0 Provides: bundled(hamcrest) = 2.2 Provides: bundled(httpcomponents-client) = 4.5.13 Provides: bundled(httpcomponents-core) = 4.4.13 -Provides: bundled(httpcomponents-project) = 12 +Provides: bundled(httpcomponents-project) = 13 Provides: bundled(atinject) = 1.0.5 -Provides: bundled(jakarta-activation1) = 1.2.2 +Provides: bundled(jakarta-activation1) = 2.1.2 Provides: bundled(jansi) = 2.4.0 -Provides: bundled(beust-jcommander) = 1.81 +Provides: bundled(javacc-maven-plugin) = 3.0.1 +Provides: bundled(javacc) = 7.0.12 +Provides: bundled(beust-jcommander) = 1.82 Provides: bundled(jctools) = 4.0.1 Provides: bundled(jdom) = 1.1.3 -Provides: bundled(jdom2) = 2.0.6 +Provides: bundled(jdom2) = 2.0.6.1 Provides: bundled(jflex) = 1.7.0 Provides: bundled(jsoup) = 1.16.1 Provides: bundled(jsr-305) = 3.0.2 -Provides: bundled(junit) = 4.13.1 -Provides: bundled(junit5) = 5.8.1 -Provides: bundled(log4j) = 2.17.2 -Provides: bundled(jakarta-mail) = 1.6.7 +Provides: bundled(junit) = 4.13.2 +Provides: bundled(junit5) = 5.10.0 +Provides: bundled(log4j) = 2.20.0 +Provides: bundled(jakarta-mail) = 2.1.2 Provides: bundled(maven-antrun-plugin) = 3.1.0 Provides: bundled(maven-apache-resources) = 1.5 Provides: bundled(maven-archiver) = 3.6.0 @@ -231,11 +235,11 @@ Provides: bundled(maven-shared-io) = 3.0.0 Provides: bundled(maven-shared-utils) = 3.4.2 Provides: bundled(maven-source-plugin) = 3.3.0 Provides: bundled(maven-surefire) = 3.1.2 -Provides: bundled(maven-verifier) = 1.8.0 +Provides: bundled(maven-verifier) = 2.0.0~M1 Provides: bundled(maven-wagon) = 3.5.3 Provides: bundled(maven) = 3.9.4 Provides: bundled(mockito) = 3.7.13 -Provides: bundled(modello) = 2.0.0 +Provides: bundled(modello) = 2.1.1 Provides: bundled(modulemaker-maven-plugin) = 1.9 Provides: bundled(mojo-parent) = 76 Provides: bundled(objenesis) = 3.3 @@ -266,7 +270,7 @@ Provides: bundled(sisu-plexus) = 0.3.5 Provides: bundled(slf4j) = 1.7.36 Provides: bundled(testng) = 7.8.0 Provides: bundled(univocity-parsers) = 2.9.1 -Provides: bundled(velocity) = 1.7 +Provides: bundled(velocity) = 2.3 Provides: bundled(xbean) = 4.23 Provides: bundled(xmlunit) = 2.9.1 Provides: bundled(xmvn-generator) = 1.2.1 @@ -378,6 +382,9 @@ sed -i s/_xmvngen_/_jpbgen_/ %{buildroot}%{_fileattrsdir}/jpbgen.attr %doc AUTHORS %changelog +* Fri Aug 25 2023 Mikolaj Izdebski - 1.13.0-1 +- Update to upstream version 1.13.0 + * Mon Aug 21 2023 Mikolaj Izdebski - 1.12.0-1 - Update to upstream version 1.12.0 diff --git a/sources b/sources index 7e90f1e..432573a 100644 --- a/sources +++ b/sources @@ -1,10 +1,10 @@ -SHA512 (javapackages-bootstrap-1.12.0.tar.xz) = b6bc2c9e517575857d24fc4457d596f4fb0b8d351e2095fa49da18378531a5807dc531a930d7c6d0728c99887a60f57baccf65935dc73a9625764103efb34268 -SHA512 (ant.tar.xz) = d2a4babb7766fc2acf3e9377ffd5af790c7d0612d3e34a9642a9a2b85ffb0f15936ef2979389496dce8ea72ed941797cd1f7507beeb1853a46394019adde4152 +SHA512 (javapackages-bootstrap-1.13.0.tar.xz) = 713be16980287ec1e35d70170b4cd5a01e63c7ce756cada485e9fa3ef1d766c4739e0aa419e075f375d84b0495ab01d5ce9b846fd0bf39e419862689dcd2771c +SHA512 (ant.tar.xz) = 30e4ef50010f04c64c60777f30079099c11a2e3dbdd71f2987dfec3912d2716a802979713d851c9a5f6f324431997a42b77f7739cd9e4fb5d3816cc614271ed4 SHA512 (aopalliance.tar.xz) = 1f9a8a63edb76a73a40dcb3edee72fad069d4b509cc4b702cb9af9aaf694dadeef01fa7d20c285c6c37f7cb030643d267e3a1b834567785399fc986da474e626 SHA512 (apache-pom.tar.xz) = b1e8a0d57bc98d9a84dd0c7c69e0f8522d353eacaeb8645c99c84a1041fed0c237710ebd0afe4e4d4726ff536e4c5b009c2d827386aadcdd675ec404841b313c SHA512 (apiguardian.tar.xz) = c3d75e88a983eb53c06007fd01f11c89083e119d2d4ed5d0e97644f45d5e451fd611bee493d720d011562ae29e7cdfd1d6fb4621d17c9db4b61430e62afea2bf SHA512 (asm.tar.xz) = 3a64da5b2dfcb2ef7fd9678307f06a82e2089b51ae5c28fd735f248bf7aea6220d4c5172c228cfb822e2f77dc1e98c51d463bd691b597335307e6aa8fec45e36 -SHA512 (assertj-core.tar.xz) = 56c2f6a68cc7bbd5921640375656565a7854270b14f25f18df69d6ac39dfe8cc2625388ae13fa9747bf46d112782c5802b13b56b9f3e6b44be818a9e49f5fdc8 +SHA512 (assertj-core.tar.xz) = ff74f1a24f074eeea93a2ed42852630fd813d7a78ecf90f818a1504eb054e113c48a81c32f715c2b7bf3eea745819f05b235f400cb4116e8d3c907f7d7cdca83 SHA512 (bnd.tar.xz) = bb163a650a6f92f88051a6d169d40a2b1b103d12f5e219be55eac16acdf23868ab8544610891c7b0bd58e79a7c8d7dd5fc238b2bc5195b4510f764593966ba2a SHA512 (build-helper-maven-plugin.tar.xz) = e4e260587d5a3ef98064015b3dfc4f8be04a53513718bcfc1e57dba74b13be573d3766b23a9c00cc63f25e8300ff812c6560a28ad5bd537662d0ccb0d1c42925 SHA512 (byte-buddy.tar.xz) = dfcfffe72a47679ec8dbf152ad5dc3edb5c5614ad97a89e625dba94d44311d04cecf28256f0996652a6bbd413197eec1f90acc4128826865f1633d0b1e0f8f63 @@ -33,21 +33,23 @@ SHA512 (guice.tar.xz) = ed7b98e8317c622dad0b6820a50ecc49d6153534250844fbde1dbcb6 SHA512 (hamcrest.tar.xz) = 2049a59774773c2369e4c561545067524402a420bace29dc8cffac0fca8b6aa870e3de1882cc4a35549b67269ecbfc54e335ffd0c599ddb4b56341948da777a2 SHA512 (httpcomponents-client.tar.xz) = 2d6ad230847a7b256760623c57d909aae4013a987bc7fde8da4bba13047c6062866bb027254564036ffaef8e6d1f8745ddd9fdc0016f0e7c3904c55f608d9849 SHA512 (httpcomponents-core.tar.xz) = 6b643a3808e966b3f1d2dcdc5539d1d547f6e7460eef2dab92aa5ff161db1f4c7e9ddfda6539c6d5efe8b15751461410d949780d7d6e4880eee7776ebbe3a976 -SHA512 (httpcomponents-parent-pom.tar.xz) = 587e23e2c6caff80b61e1c6fc8b2a591ffb1175c1e3a5a95d611d9fb3e2dab85ef317b3f982424b727070356240fd24a7cbcce20e2e5bd787cac2bc6d93e2a71 +SHA512 (httpcomponents-parent-pom.tar.xz) = 90a9ad4d484fa04f0ad0b1631a45133a97950b5a0cb22b46f4bd36bcf1d5811c38472b0c1c77a052301b1c502022ef21371e1f921bed104c900e2631127daea2 SHA512 (injection-api.tar.xz) = a0faaa4aa4a94d1cf01387b9d327da2be5d5c016b6fa6aca3aed0d75d4bec2c9a04df12fdc3c67f17b03918584ab5261f8dc20ab620f1289e34f8ad8ee23c9a6 -SHA512 (jaf-api.tar.xz) = fd99989fedbbecbc9d150910d635b1e19d6f7e879d4d14850c32dfbb403aef44ab405c41463eef7f87805a2db883235ddf0e040e1fd06f890215ad6bdb28fddf +SHA512 (jaf-api.tar.xz) = 8b3f729164dbaa8cfcba047d5fb1d4134301ecc525644f3d28f9196002fedcf81fb22797adf5b05cfe80a46793093b5e5f38104732e3d3384866f003da66cb0e SHA512 (jansi.tar.xz) = 374f5ba2f55abd9ff5e15f009f94e9878bc077a62e0bd3ae3b18c5089c754478eefa991d8a4331330e052f7a65e551995821308cdb14e260dd84d6236945010e -SHA512 (jcommander.tar.xz) = 9ff34b0e5dd391125c1f9a03175dffece39107ee133f5553323762ac10421161d693711934f10666b8177ab801a0dd03a63942b5635dae1aeb3432635cecb10e +SHA512 (javacc.tar.xz) = 0c5b6fe46831b003d22f4a273cea53be1c7f218c6f53315c2077ac1e55d84765c94f6b684962edc37545845ad06d8c56dec05c7617280afba56ae0293307653c +SHA512 (javacc-maven-plugin.tar.xz) = 3b50527e56e2bb1e709b5bc28bf79a0e28085bd0f72ab0f155d497b757986bcaa10a2a5af808e54aa6996521a25c26c5836f9b13d8f96684627a3dd32c9e31f9 +SHA512 (jcommander.tar.xz) = 3a9a20aa0b28581cd6cfd489a7121b62cbbd75f97feba2e20184a140e66ea34396aa6d0d640bdb75aca79346267a2b8615320ac3a2a98537b1a0caff91e072dd SHA512 (jctools.tar.xz) = f62c591f094c27dc59e6a4666377367f8ab6829540a5a7912c5007d5403be1db7d75b47c0636589c1df4ee252fdae89987d8c89e53d903347ec0862d39f3308c SHA512 (jdom.tar.xz) = 1a36168a0b8f2b9057855198e097fcb50992d9d79892cdeeb20eada43ad7a79acf4fda0a06496b8a36cb537577575504efc066774912a1c4d08288e716232579 -SHA512 (jdom2.tar.xz) = f05f9114c337a20111a88e6e045de57d034344246f568f09f75344160cd8243a6bb5cbf14429f09090a1e3c3dcd2b05e5441ee7686c4a222f433eade81c25384 +SHA512 (jdom2.tar.xz) = cba13bbb38b1f083ca0b498c9a8a22279174b2c6c51b89c7def662370fa6a3ff27feea350f2d9ebedcdaa520ffae82881e9e865e14bc011682fd2dd7aa38c1ac SHA512 (jflex.tar.xz) = 3e291540af7f4ac83c786f79d9500265d2f49d54d2a472f565f92233e536af6cd4b5d775ad0eb5990a14edf682512bdc48c7eb30bef7a243292a0165e331f393 SHA512 (jsoup.tar.xz) = db0ac8d4387d0d6e9ce7236f1e233b80e8c9543c5680b8fab48cc9c64f7e7a5c669606eb6acda6e83d841c70cbd7fb64271f57ae6073fccf34ca5e645207c683 SHA512 (jsr-305.tar.xz) = fb666ec0dd8d4fe13eb88a9ce3a7b912c66e53b152d3742133a1b81d0b9d22f4a98187e7f55bc3d3d20c47ae4b8576e03e5ed42b957d706cd951214f7216be6c -SHA512 (junit4.tar.xz) = 305f5e74d0c39e93211eac9e4da568a06e24305b6f87b970c8bf83df638223bc3c66a0acc01b191978fe6d3b08dc8b00f68613e0d06a9d5eb051de6a29e05ef1 -SHA512 (junit5.tar.xz) = d37b08df14edb763c6ddc81a67cbefe3b8bd2b384431f71b9bd5852182bf1cf7d9ca28c1c21758c2617b99880dc05cb830291b9925d671a83b3381302ba1d130 -SHA512 (log4j.tar.xz) = d563d209a166ab1c536678e0958b4d1eccd8a7be1d12202e1d18b5e8e96f64f3992cf2337016d942e7d9d4ed7aa7eb670805cb94faf62d9e5e517e4d545989d0 -SHA512 (mail-api.tar.xz) = fed45a4127c972d38ac3d03a8e70f05199f4e74ab18786eae92564892606a52917f150bae7b0ac6fdd2a619fe9be88a95151ee24a05a1cf3539cd72fbd9e52d8 +SHA512 (junit4.tar.xz) = 1cdcdaa8e5329239b396412d79707b7b2052154502725b5f0a93f17d0273c235f2e63380555b2e3328c40b5d421d586d07e392401b6bf8be35ed6c06345add84 +SHA512 (junit5.tar.xz) = 3a8f7a79c94ea14007a0a5952fe7fb405776c2e6e2bb7b0712c04ee68c14b284dc855f222f74aded34fac58e1f79353d5f3c01f74be0aa15341a53ce2c06b1f5 +SHA512 (log4j.tar.xz) = eb97efa3fd04944bd4f2fd29d7079e34a469f81c2b00a1f08226de962f59d5498ccd3b26b97c79992e0d60c8b75b796f789fefcfb72b2f1703ceb3a6d97577d4 +SHA512 (mail-api.tar.xz) = 01bd2cfea8307954d01a8fa0f3a6da409b3975ca624c98a06cfa2a5c1ea260e1d6d0a568f0ab5167a0ed063d51032372dfe0aba89b6ef063e1a7b75fc9e6756f SHA512 (maven-antrun-plugin.tar.xz) = b66ca8409225bdf84143a0783a1ca607fed53bf7a15a04ff1200e7c63c9a9223e43625c7d955c8cf233ed0a271887faf5cc1ed9c87b39caffb9f0a389fcc37fc SHA512 (maven-apache-resources.tar.xz) = 06583b9db006e45add380d76dab419dc91a9d52b8b7cb5c30be347fb412c2124f41789a440d7e1502a88bbdf125c46b6f2e6feb96b7a31e78998ce303c40d3d3 SHA512 (maven-archiver.tar.xz) = a2b86e79b87226d6ce654644a322745ac50208d77d00f4ff2ded1254bafc046d8acb66f44e6fab231db62955e3d406bed346368619d2adfec5f73aea84c5e86d @@ -74,11 +76,11 @@ SHA512 (maven-shared-io.tar.xz) = 0963cca6ff1acb9090d703d384f54f2b036be032f4ebdb SHA512 (maven-shared-utils.tar.xz) = 6e8ddd06d6d537d7799de082430ef4ef9ef8238a83a65b0411d506a2bfcd5f0d3d4eba02cd27f831abb45bf67de8d3dfc4d86b980c8a73261f59fd4fcf50c487 SHA512 (maven-source-plugin.tar.xz) = 93037d9af24e2e6034ee967efea2676ba29d7966789968956bf10a94093e4e0bb0c10829490d1cf15d9cdab81bdce219f248c2b3f89c3b90d683f9aab66b73b1 SHA512 (maven-surefire.tar.xz) = db776538e06dc3378498f36a07f91c2c2e6f295817ea6a81f19c6dbe51d598e63b6290994f75ce39af32c2f7026a94ded9928ff19d7e343f9d44bb86096b6f6f -SHA512 (maven-verifier.tar.xz) = e095af13fc2fe7e08668725f204f1eeeb6acea8c0204f82149bf0d0a3dd6fd153d7c003f9f8455fc2837fd2ca597a56a4ab077fae651f62cf3a4989c8d78d6d2 +SHA512 (maven-verifier.tar.xz) = 2634ea238f2e2ac174a5157c960f30352ea9f07f7f31136ee47d6c1d7451c28e0867a485d1e449f5fde2c27376488fc81dcb58afc8b5229a3114d72996da5d19 SHA512 (maven-wagon.tar.xz) = 8274ce5922016806359e67ce154b4a6649e6825486a1cf3d1870cefed7cf8e3ceb7132e41df4f63fe6ab3635f8a6aad0ea8da19fc8e9f6dd1fecac53c55f254b SHA512 (maven.tar.xz) = ee98b4fdf245beef58c1f1583991d85e418055b3e28471ce77f4ce497cb365ce56630e83c74ad246b900fe1b6fd9079f423c6c05ff0d8789e7571967f69e2b71 SHA512 (mockito.tar.xz) = 8fefdeae3e7bcb41c97080aa208bc9bb6fa787235cc572990ba376c9995f60fa7ab7534e88701da36b00b49eb7b5f2b1c479bbf0e9c86fc1923a7eddc68b4c77 -SHA512 (modello.tar.xz) = 7bdd8fd70336f305404bf3e320aba4edcf84fbeb49a8f5d1d027df6a1953ed82ebfcf90896093899a3818c186292793fc7764093f20e5a5a74e2e8c1137a95a3 +SHA512 (modello.tar.xz) = a371fe1369d5453fb3a928f6053c36f1f39df970f322804e1daeef2b0c5f87556e42ff22508a57104d16e6c81584c77b34f6bbba6c7cc0f7084402767998ae82 SHA512 (modulemaker-maven-plugin.tar.xz) = a9d93ddd47419f5de597babf648e509084e7dd4a5c18ef8aed646fbcff886d20f2a7b297463ebaa1cf70f7e26bf3690c7a9b60e5e47fae6b7392807a133302ac SHA512 (mojo-parent-pom.tar.xz) = db43765de7cdb23ffb82a1f1b21b35af1faeccb3da9ef0d164395fa6cb08125d2ef626a652f9dc41a0d53fc76f1e1766f42fcf8a5748938a51a38174da781d24 SHA512 (objenesis.tar.xz) = eb432f56318ed70aae56cb94b98818c92f30e7dd0d221eab1bfa15898b663da121c0ab4ffe283b4bf03ebadf411bc2ec742c31ca1a01f6e2c9da4a1b6798d912 @@ -109,7 +111,7 @@ SHA512 (sisu-plexus.tar.xz) = 044d8738f5387cdecc9e2fdf78ff7b7c46e2240ea982aa0905 SHA512 (slf4j.tar.xz) = 434da37f9efaa3faba2ccda7781290a92904c29a24be6234c4a681bd55d9e33e3e4242282a4995cd40cf72b507aa26d761c8d8de1781d1c4997b50323b9250a6 SHA512 (testng.tar.xz) = 92d0bc00fce4956ce8cd59eaf243dec1924571ab4cfe6a6b2d191dcf296550eb133ed679d89e78304b121e747aa7ecb4911218220754a3ea91dcaeb197dce60b SHA512 (univocity-parsers.tar.xz) = 7daa3f54d26d7c64714990c7ad9d539bc7dd531917354b5b90970114e51c20aedac3e1fdd8b45e073d8c196b4ce2fa93c2f84a5498147de951ac147900ce51fa -SHA512 (velocity-engine.tar.xz) = c8baa9e159acae579848c1dd33b488eb70f64280e2f806e0e2ccf3024d1bc4f588086cb523e0d8e6ea2f8802ff908ff5578e86e646131768356c6d6e9b7214d0 +SHA512 (velocity-engine.tar.xz) = 39b00a1be5779838de10bae0a4bda353c3746f2ee0ee209b234959731987f6d375dd08d52c69197f79ee0b5b93647b91eef308b4e893c671974ddc5b9243a75a SHA512 (xbean.tar.xz) = a88078198743d328589150f4ed9817a305898cd09b78b18659c5e82447df47807d20981f19dc7fb67a7c296b7de987b5e16c0a984a5214958104a383820239ac SHA512 (xmlunit.tar.xz) = 654c8624371b9e9879d72a46480f412f7452e7758e1586707655ebbfdee9cf24620fbf14392d8b93790dee0122cd5a9239c0bf95c4581223a658180db3273bce SHA512 (xmvn-generator.tar.xz) = 63b40f3d4c57f18ae2aee720f87f891cce3e37a3f485b158931e35a9b653201f3f241edc580cbc357103813924e314ff4029e96d1abed73f51dbb123d04c335a From 92d7948140b571d0d3ef20e16e01bfc6f151581c Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 1 Sep 2023 15:28:22 +0200 Subject: [PATCH 62/77] Convert License tag to SPDX format Related: https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_2 --- javapackages-bootstrap.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/javapackages-bootstrap.spec b/javapackages-bootstrap.spec index bbb2a63..1b80a25 100644 --- a/javapackages-bootstrap.spec +++ b/javapackages-bootstrap.spec @@ -19,10 +19,10 @@ Name: javapackages-bootstrap Version: 1.13.0 -Release: 1%{?dist} +Release: 2%{?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 +License: Apache-2.0 AND Apache-1.1 AND (Apache-2.0 OR EPL-2.0) AND (EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0) AND MIT AND BSD-3-Clause AND EPL-1.0 AND EPL-2.0 AND CDDL-1.0 AND xpp AND CC0-1.0 AND Plexus AND SMLNJ AND LicenseRef-Fedora-Public-Domain URL: https://github.com/fedora-java/javapackages-bootstrap ExclusiveArch: %{java_arches} @@ -382,6 +382,9 @@ sed -i s/_xmvngen_/_jpbgen_/ %{buildroot}%{_fileattrsdir}/jpbgen.attr %doc AUTHORS %changelog +* Fri Sep 01 2023 Mikolaj Izdebski - 1.13.0-2 +- Convert License tag to SPDX format + * Fri Aug 25 2023 Mikolaj Izdebski - 1.13.0-1 - Update to upstream version 1.13.0 From e25bb1b4e316b578bf8d94325b4c4f8934d83e44 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 25 Oct 2023 14:22:03 +0200 Subject: [PATCH 63/77] Dynamically generate bundled Provides --- generate-bundled-provides.sh | 12 ++-- javapackages-bootstrap.spec | 134 ++++------------------------------- 2 files changed, 20 insertions(+), 126 deletions(-) diff --git a/generate-bundled-provides.sh b/generate-bundled-provides.sh index 677000d..3fe380c 100755 --- a/generate-bundled-provides.sh +++ b/generate-bundled-provides.sh @@ -1,9 +1,11 @@ #!/bin/sh set -eu -./generate-sources-list.sh | sed -n ' -s/^.* \(.*\)\.tar\.xz$/\1 \1/ -T +for f in project/*.properties; do + b=${f##*/} + p=${b%%.properties} + echo "$p $f" +done | sed -n ' s/^commons-beanutils /apache-commons-beanutils / s/^commons-cli /apache-commons-cli / s/^commons-codec /apache-commons-codec / @@ -38,6 +40,6 @@ s/^oss-parent-pom /sonatype-oss-parent / s/^velocity-engine /velocity / p ' | while read fp mp; do -. ./javapackages-bootstrap-*/project/$mp.properties -echo "Provides: bundled($fp) = $version" + . $mp + echo "bundled($fp) = $version" done diff --git a/javapackages-bootstrap.spec b/javapackages-bootstrap.spec index 1b80a25..1d2021c 100644 --- a/javapackages-bootstrap.spec +++ b/javapackages-bootstrap.spec @@ -6,6 +6,10 @@ %global __requires_exclude_from \\.jar$ %global __provides_exclude_from \\.jar$ +# Generated list of bundled packages +%global __local_generator_provides cat %{_builddir}/%{buildsubdir}/bundled-provides.txt +%global __local_generator_path ^%{metadataPath}/.*$ + %global debug_package %{nil} %global javaHomePath %{_jvmdir}/java-17-openjdk @@ -19,7 +23,7 @@ Name: javapackages-bootstrap Version: 1.13.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A means of bootstrapping Java Packages Tools # For detailed info see the file javapackages-bootstrap-PACKAGE-LICENSING License: Apache-2.0 AND Apache-1.1 AND (Apache-2.0 OR EPL-2.0) AND (EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0) AND MIT AND BSD-3-Clause AND EPL-1.0 AND EPL-2.0 AND CDDL-1.0 AND xpp AND CC0-1.0 AND Plexus AND SMLNJ AND LicenseRef-Fedora-Public-Domain @@ -31,6 +35,7 @@ Source0: https://github.com/fedora-java/javapackages-bootstrap/releases/d # License breakdown Source1: javapackages-bootstrap-PACKAGE-LICENSING +Source2: generate-bundled-provides.sh # To obtain the following sources: # tar -xf ${name}-${version}.tar.xz @@ -158,130 +163,12 @@ Source1116: xmvn-generator.tar.xz Source1117: xmvn.tar.xz Source1118: xz-java.tar.xz -Provides: bundled(ant) = 1.10.14 -Provides: bundled(aopalliance) = 1.0 -Provides: bundled(apache-parent) = 30 -Provides: bundled(apiguardian) = 1.1.2 -Provides: bundled(objectweb-asm) = 9.5 -Provides: bundled(assertj-core) = 3.24.2 -Provides: bundled(aqute-bnd) = 5.2.0 -Provides: bundled(build-helper-maven-plugin) = 3.4.0 -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 -Provides: bundled(apache-commons-beanutils) = 1.9.4 -Provides: bundled(apache-commons-cli) = 1.5.0 -Provides: bundled(apache-commons-codec) = 1.16.0 -Provides: bundled(apache-commons-collections) = 3.2.2 -Provides: bundled(apache-commons-compress) = 1.23.0 -Provides: bundled(apache-commons-io) = 2.13.0 -Provides: bundled(apache-commons-jxpath) = 1.3 -Provides: bundled(apache-commons-lang3) = 3.13.0 -Provides: bundled(apache-commons-logging) = 1.2 -Provides: bundled(apache-commons-parent) = 59 -Provides: bundled(java_cup) = 0.11b -Provides: bundled(disruptor) = 3.4.4 -Provides: bundled(easymock) = 4.3 -Provides: bundled(extra-enforcer-rules) = 1.7.0 -Provides: bundled(felix-parent) = 7 -Provides: bundled(felix-utils) = 1.11.8 -Provides: bundled(fusesource-pom) = 1.12 -Provides: bundled(guava) = 31.1 -Provides: bundled(google-guice) = 5.1.0 -Provides: bundled(hamcrest) = 2.2 -Provides: bundled(httpcomponents-client) = 4.5.13 -Provides: bundled(httpcomponents-core) = 4.4.13 -Provides: bundled(httpcomponents-project) = 13 -Provides: bundled(atinject) = 1.0.5 -Provides: bundled(jakarta-activation1) = 2.1.2 -Provides: bundled(jansi) = 2.4.0 -Provides: bundled(javacc-maven-plugin) = 3.0.1 -Provides: bundled(javacc) = 7.0.12 -Provides: bundled(beust-jcommander) = 1.82 -Provides: bundled(jctools) = 4.0.1 -Provides: bundled(jdom) = 1.1.3 -Provides: bundled(jdom2) = 2.0.6.1 -Provides: bundled(jflex) = 1.7.0 -Provides: bundled(jsoup) = 1.16.1 -Provides: bundled(jsr-305) = 3.0.2 -Provides: bundled(junit) = 4.13.2 -Provides: bundled(junit5) = 5.10.0 -Provides: bundled(log4j) = 2.20.0 -Provides: bundled(jakarta-mail) = 2.1.2 -Provides: bundled(maven-antrun-plugin) = 3.1.0 -Provides: bundled(maven-apache-resources) = 1.5 -Provides: bundled(maven-archiver) = 3.6.0 -Provides: bundled(maven-artifact-transfer) = 0.13.1 -Provides: bundled(maven-assembly-plugin) = 3.6.0 -Provides: bundled(maven-plugin-bundle) = 5.1.9 -Provides: bundled(maven-common-artifact-filters) = 3.3.2 -Provides: bundled(maven-compiler-plugin) = 3.11.0 -Provides: bundled(maven-dependency-analyzer) = 1.13.2 -Provides: bundled(maven-dependency-plugin) = 3.6.0 -Provides: bundled(maven-dependency-tree) = 3.2.1 -Provides: bundled(maven-enforcer) = 3.3.0 -Provides: bundled(maven-file-management) = 3.1.0 -Provides: bundled(maven-filtering) = 3.3.1 -Provides: bundled(maven-jar-plugin) = 3.3.0 -Provides: bundled(maven-parent) = 40 -Provides: bundled(maven-plugin-testing) = 3.3.0 -Provides: bundled(maven-plugin-tools) = 3.9.0 -Provides: bundled(maven-remote-resources-plugin) = 3.1.0 -Provides: bundled(maven-resolver) = 1.9.15 -Provides: bundled(maven-resources-plugin) = 3.3.1 -Provides: bundled(maven-shared-incremental) = 1.1 -Provides: bundled(maven-shared-io) = 3.0.0 -Provides: bundled(maven-shared-utils) = 3.4.2 -Provides: bundled(maven-source-plugin) = 3.3.0 -Provides: bundled(maven-surefire) = 3.1.2 -Provides: bundled(maven-verifier) = 2.0.0~M1 -Provides: bundled(maven-wagon) = 3.5.3 -Provides: bundled(maven) = 3.9.4 -Provides: bundled(mockito) = 3.7.13 -Provides: bundled(modello) = 2.1.1 -Provides: bundled(modulemaker-maven-plugin) = 1.9 -Provides: bundled(mojo-parent) = 76 -Provides: bundled(objenesis) = 3.3 -Provides: bundled(opentest4j) = 1.3.0 -Provides: bundled(osgi-annotation) = 8.1.0 -Provides: bundled(osgi-compendium) = 7.0.0 -Provides: bundled(osgi-core) = 8.0.0 -Provides: bundled(sonatype-oss-parent) = 7 -Provides: bundled(plexus-archiver) = 4.8.0 -Provides: bundled(plexus-build-api) = 0.0.7 -Provides: bundled(plexus-cipher) = 2.0 -Provides: bundled(plexus-classworlds) = 2.7.0 -Provides: bundled(plexus-compiler) = 2.13.0 -Provides: bundled(plexus-components-pom) = 14.1 -Provides: bundled(plexus-containers) = 2.1.1 -Provides: bundled(plexus-interpolation) = 1.26 -Provides: bundled(plexus-io) = 3.4.1 -Provides: bundled(plexus-languages) = 1.1.2 -Provides: bundled(plexus-pom) = 14 -Provides: bundled(plexus-resources) = 1.2.0 -Provides: bundled(plexus-sec-dispatcher) = 2.0 -Provides: bundled(plexus-utils) = 3.5.1 -Provides: bundled(qdox) = 2.0.3 -Provides: bundled(jakarta-servlet) = 4.0.3 -Provides: bundled(sisu) = 0.3.5 -Provides: bundled(sisu-mojos) = 0.3.5 -Provides: bundled(sisu-plexus) = 0.3.5 -Provides: bundled(slf4j) = 1.7.36 -Provides: bundled(testng) = 7.8.0 -Provides: bundled(univocity-parsers) = 2.9.1 -Provides: bundled(velocity) = 2.3 -Provides: bundled(xbean) = 4.23 -Provides: bundled(xmlunit) = 2.9.1 -Provides: bundled(xmvn-generator) = 1.2.1 -Provides: bundled(xmvn) = 4.2.0 -Provides: bundled(xz-java) = 1.9 - BuildRequires: byaccj BuildRequires: gcc BuildRequires: java-17-openjdk-devel BuildRequires: jurand BuildRequires: rpm-devel +BuildRequires: rpm-local-generator-support Requires: bash Requires: coreutils @@ -310,10 +197,12 @@ XMvn, allowing JPT to be used before one builds XMvn package. %prep %setup -q +# Dynamically generate bundled Provides +%{SOURCE2} >bundled-provides.txt # leave out the first source as it has already been extracted # leave out licensing breakdown file -other_sources=$(echo %{sources} | cut -d' ' -f3-) +other_sources=$(echo %{sources} | cut -d' ' -f4-) for source in ${other_sources}; do tar -xf "${source}" @@ -382,6 +271,9 @@ sed -i s/_xmvngen_/_jpbgen_/ %{buildroot}%{_fileattrsdir}/jpbgen.attr %doc AUTHORS %changelog +* Wed Oct 25 2023 Mikolaj Izdebski - 1.13.0-3 +- Dynamically generate bundled Provides + * Fri Sep 01 2023 Mikolaj Izdebski - 1.13.0-2 - Convert License tag to SPDX format From 2ea40abb0884fe6ed1b8eaf2ba90c57a4a8fc72f Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 26 Oct 2023 07:33:08 +0200 Subject: [PATCH 64/77] Update javapackages test plan to f40 --- plans/javapackages.fmf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf index 0cbb629..a2cdaba 100644 --- a/plans/javapackages.fmf +++ b/plans/javapackages.fmf @@ -2,6 +2,6 @@ summary: Run javapackages-specific tests discover: how: fmf url: https://src.fedoraproject.org/tests/javapackages - ref: f39 + ref: f40 execute: how: tmt From 1b9d2b5319748484bea5bc071a0a0298906b5cbb Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 11 Dec 2023 15:02:22 +0100 Subject: [PATCH 65/77] Update to upstream version 1.14.0 --- .gitignore | 3 + javapackages-bootstrap-PACKAGE-LICENSING | 744 ++++------------------- javapackages-bootstrap.spec | 166 ++--- sources | 13 +- 4 files changed, 218 insertions(+), 708 deletions(-) diff --git a/.gitignore b/.gitignore index 6bd8a98..d351ff1 100644 --- a/.gitignore +++ b/.gitignore @@ -151,3 +151,6 @@ /javapackages-bootstrap-1.13.0.tar.xz /javacc.tar.xz /javacc-maven-plugin.tar.xz +/javapackages-bootstrap-1.14.0.tar.xz +/javaparser.tar.xz +/moditect.tar.xz diff --git a/javapackages-bootstrap-PACKAGE-LICENSING b/javapackages-bootstrap-PACKAGE-LICENSING index b9c9ed8..905784a 100644 --- a/javapackages-bootstrap-PACKAGE-LICENSING +++ b/javapackages-bootstrap-PACKAGE-LICENSING @@ -1,621 +1,123 @@ -# This is the license breakdown of each component - -downstream/ant: ASL 2.0 -downstream/apache-pom: ASL 2.0 -downstream/apiguardian: ASL 2.0 -downstream/asm: BSD -downstream/assertj-core: ASL 2.0 -downstream/bnd: ASL 2.0 or EPL-2.0 -downstream/build-helper-maven-plugin: MIT -downstream/byte-buddy: ASL 2.0 -downstream/cdi: ASL 2.0 -downstream/cglib: ASL 2.0 -downstream/common-annotations-api: EPL-2.0 or GPLv2 with exceptions -downstream/commons-beanutils: ASL 2.0 -downstream/commons-cli: ASL 2.0 -downstream/commons-codec: ASL 2.0 -downstream/commons-collections: ASL 2.0 -downstream/commons-compress: ASL 2.0 -downstream/commons-io: ASL 2.0 -downstream/commons-jxpath: ASL 2.0 -downstream/commons-lang: ASL 2.0 -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 -downstream/guava: ASL 2.0 and CC0 - com/google/common/hash/Striped64.java: CC0 - com/google/common/hash/LongAdder.java: CC0 - com/google/common/collect/Hashing.java: ASL 2.0 and CC0 - com/google/common/cache/Striped64.java: CC0 - com/google/common/cache/LongAdder.java: CC0 - com/google/common/util/concurrent/AtomicDoubleArray.java: CC0 - com/google/common/util/concurrent/Striped.java: ASL 2.0 and CC0 - com/google/common/util/concurrent/MoreExecutors.java: ASL 2.0 and CC0 - com/google/common/base/SmallCharMatcher.java: ASL 2.0 and CC0 - everything else is ASL 2.0 -downstream/guice: ASL 2.0 -downstream/hamcrest: BSD -downstream/httpcomponents-client: ASL 2.0 -downstream/httpcomponents-core: ASL 2.0 -downstream/httpcomponents-parent-pom: ASL 2.0 -downstream/injection-api: ASL 2.0 -downstream/jansi: ASL 2.0 -downstream/jcommander: ASL 2.0 -downstream/jdom: BSD with advertising -downstream/jdom2: BSD with advertising -downstream/jflex: BSD -downstream/jsr-305: BSD -downstream/junit4: EPL-1.0 -downstream/junit5: EPL-2.0 -downstream/maven: ASL 2.0 -downstream/maven-antrun-plugin: ASL 2.0 -downstream/maven-archiver: ASL 2.0 -downstream/maven-artifact-transfer: ASL 2.0 -downstream/maven-assembly-plugin: ASL 2.0 -downstream/maven-bundle-plugin: ASL 2.0 -downstream/maven-common-artifact-filters: ASL 2.0 -downstream/maven-compiler-plugin: ASL 2.0 -downstream/maven-dependency-analyzer: ASL 2.0 -downstream/maven-dependency-plugin: ASL 2.0 -downstream/maven-dependency-tree: ASL 2.0 -downstream/maven-enforcer: ASL 2.0 -downstream/maven-file-management: ASL 2.0 -downstream/maven-filtering: ASL 2.0 -downstream/maven-jar-plugin: ASL 2.0 -downstream/maven-parent-pom: ASL 2.0 -downstream/maven-plugin-testing: ASL 2.0 -downstream/maven-plugin-tools: ASL 2.0 -downstream/maven-remote-resources-plugin: ASL 2.0 -downstream/maven-resolver: ASL 2.0 -downstream/maven-resources: ASL 2.0 -downstream/maven-resources-plugin: ASL 2.0 -downstream/maven-shared-incremental: ASL 2.0 -downstream/maven-shared-io: ASL 2.0 -downstream/maven-shared-utils: ASL 2.0 -downstream/maven-source-plugin: ASL 2.0 -downstream/maven-surefire: ASL 2.0 -downstream/maven-verifier: ASL 2.0 -downstream/maven-wagon: ASL 2.0 -downstream/mockito: MIT -downstream/modello: MIT and ASL 2.0 - modello-plugins/modello-plugin-java/src/test/java/org/codehaus/modello/plugin/java/BiDirectionalOverrideJavaGeneratorTest.java: Apache License 2.0 - modello-plugins/modello-plugin-java/src/test/java/org/codehaus/modello/plugin/java/Permission.java: Apache License 2.0 - modello-plugins/modello-plugin-java/src/test/java/org/codehaus/modello/plugin/java/Role.java: Apache License 2.0 - modello-plugins/modello-plugin-java/src/main/java/org/codehaus/modello/plugin/java/javasource/JArrayType.java: Apache License 2.0 - modello-plugins/modello-plugin-java/src/main/java/org/codehaus/modello/plugin/java/javasource/JCollectionType.java: Apache License 2.0 - modello-plugins/modello-plugin-java/src/main/java/org/codehaus/modello/plugin/java/javasource/JComponentizedType.java: Apache License 2.0 - modello-plugins/modello-plugin-jdom/src/main/java/org/codehaus/modello/plugin/jdom/JDOMWriterGenerator.java: Apache License 2.0 - modello-plugins/modello-plugin-xsd/src/main/java/org/codehaus/modello/plugin/xsd/metadata/XsdAssociationMetadata.java: Apache License 2.0 - modello-plugins/modello-plugin-xsd/src/main/java/org/codehaus/modello/plugin/xsd/metadata/XsdClassMetadata.java: Apache License 2.0 - modello-plugins/modello-plugin-xsd/src/main/java/org/codehaus/modello/plugin/xsd/metadata/XsdFieldMetadata.java: Apache License 2.0 - modello-plugins/modello-plugin-xsd/src/main/java/org/codehaus/modello/plugin/xsd/metadata/XsdInterfaceMetadata.java: Apache License 2.0 - modello-plugins/modello-plugin-xsd/src/main/java/org/codehaus/modello/plugin/xsd/metadata/XsdMetadataPlugin.java: Apache License 2.0 - modello-plugins/modello-plugin-xsd/src/main/java/org/codehaus/modello/plugin/xsd/metadata/XsdModelMetadata.java: Apache License 2.0 - everything else is MIT -downstream/mojo-parent-pom: ASL 2.0 -downstream/munnge-maven-plugin: CDDL-1.0 -downstream/objenesis: ASL 2.0 -downstream/opentest4j: ASL 2.0 -downstream/osgi-annotation: ASL 2.0 -downstream/osgi-cmpn: ASL 2.0 -downstream/osgi-core: ASL 2.0 -downstream/oss-parent-pom: ASL 2.0 -downstream/plexus-archiver: ASL 2.0 -downstream/plexus-cipher: ASL 2.0 -downstream/plexus-classworlds: ASL 2.0 -downstream/plexus-compiler: MIT and ASL 2.0 - complete breakdown: - plexus-compiler-api/src/main/java/org/codehaus/plexus/compiler/CompilerMessage.java: MIT and ASL 2.0 - plexus-compilers/plexus-compiler-javac/src/main/java/org/codehaus/plexus/compiler/javac/JavacCompiler.java: MIT and ASL 2.0 - - plexus-compiler-api/src/main/java/org/codehaus/plexus/compiler/CompilerError.java: ASL 2.0 - plexus-compiler-api/src/main/java/org/codehaus/plexus/compiler/CompilerResult.java: ASL 2.0 - plexus-compiler-api/src/main/java/org/codehaus/plexus/compiler/util/scan/AbstractSourceInclusionScanner.java: ASL 2.0 - plexus-compiler-api/src/main/java/org/codehaus/plexus/compiler/util/scan/InclusionScanException.java: ASL 2.0 - plexus-compiler-api/src/main/java/org/codehaus/plexus/compiler/util/scan/SourceInclusionScanner.java: ASL 2.0 - plexus-compiler-api/src/main/java/org/codehaus/plexus/compiler/util/scan/StaleSourceScanner.java: ASL 2.0 - plexus-compiler-api/src/main/java/org/codehaus/plexus/compiler/util/scan/mapping/SourceMapping.java: ASL 2.0 - plexus-compiler-api/src/main/java/org/codehaus/plexus/compiler/util/scan/mapping/SuffixMapping.java: ASL 2.0 - plexus-compilers/plexus-compiler-javac/src/main/java/org/codehaus/plexus/compiler/javac/JavaxToolsCompiler.java: ASL 2.0 - - plexus-compiler-api/src/main/java/org/codehaus/plexus/compiler/AbstractCompiler.java: MIT - plexus-compiler-api/src/main/java/org/codehaus/plexus/compiler/Compiler.java: MIT - plexus-compiler-api/src/main/java/org/codehaus/plexus/compiler/CompilerConfiguration.java: MIT - plexus-compiler-api/src/main/java/org/codehaus/plexus/compiler/CompilerException.java: MIT - plexus-compiler-api/src/main/java/org/codehaus/plexus/compiler/CompilerNotImplementedException.java: MIT - plexus-compiler-api/src/main/java/org/codehaus/plexus/compiler/CompilerOutputStyle.java: MIT - plexus-compiler-api/src/main/java/org/codehaus/plexus/compiler/util/StreamPumper.java: MIT - plexus-compiler-api/src/main/java/org/codehaus/plexus/compiler/util/scan/SimpleSourceInclusionScanner.java: MIT - plexus-compiler-api/src/main/java/org/codehaus/plexus/compiler/util/scan/mapping/SingleTargetSourceMapping.java: MIT - plexus-compiler-manager/src/main/java/org/codehaus/plexus/compiler/manager/CompilerManager.java: MIT - plexus-compiler-manager/src/main/java/org/codehaus/plexus/compiler/manager/DefaultCompilerManager.java: MIT - plexus-compiler-manager/src/main/java/org/codehaus/plexus/compiler/manager/NoSuchCompilerException.java: MIT - plexus-compilers/plexus-compiler-javac/src/main/java/org/codehaus/plexus/compiler/javac/IsolatedClassLoader.java: MIT - - plexus-compilers/plexus-compiler-javac/src/main/java/org/codehaus/plexus/compiler/javac/InProcessCompiler.java: ASL 2.0 -downstream/plexus-components-pom: ASL 2.0 -downstream/plexus-containers: ASL 2.0 and MIT and xpp - complete breakdown: - plexus-component-metadata/src/main/java/org/codehaus/plexus/metadata/merge/Driver.java: xpp - plexus-component-metadata/src/main/java/org/codehaus/plexus/metadata/merge/MXParser.java: xpp - - plexus-container-default/src/main/java/org/codehaus/plexus/ClassRealmUtil.java: ASL 2.0 - plexus-container-default/src/main/java/org/codehaus/plexus/ComponentRegistry.java: ASL 2.0 - plexus-container-default/src/main/java/org/codehaus/plexus/ContainerConfiguration.java: ASL 2.0 - plexus-container-default/src/main/java/org/codehaus/plexus/DefaultComponentRegistry.java: ASL 2.0 - plexus-container-default/src/main/java/org/codehaus/plexus/DefaultContainerConfiguration.java: ASL 2.0 - plexus-container-default/src/main/java/org/codehaus/plexus/DefaultPlexusContainer.java: ASL 2.0 - plexus-container-default/src/main/java/org/codehaus/plexus/DuplicateChildContainerException.java: ASL 2.0 - plexus-container-default/src/main/java/org/codehaus/plexus/MutablePlexusContainer.java: ASL 2.0 - plexus-container-default/src/main/java/org/codehaus/plexus/PlexusConstants.java: ASL 2.0 - plexus-container-default/src/main/java/org/codehaus/plexus/PlexusContainer.java: ASL 2.0 - plexus-container-default/src/main/java/org/codehaus/plexus/PlexusContainerException.java: ASL 2.0 - plexus-container-default/src/main/java/org/codehaus/plexus/PlexusJUnit4TestCase.java: ASL 2.0 - plexus-container-default/src/main/java/org/codehaus/plexus/PlexusTestCase.java: ASL 2.0 - plexus-container-default/src/main/java/org/codehaus/plexus/component/CastUtils.java: ASL 2.0 - plexus-container-default/src/main/java/org/codehaus/plexus/component/MapOrientedComponent.java: ASL 2.0 - plexus-container-default/src/main/java/org/codehaus/plexus/configuration/DefaultPlexusConfiguration.java: ASL 2.0 - plexus-container-default/src/main/java/org/codehaus/plexus/configuration/PlexusComponentDescriptorMerger.java: ASL 2.0 - plexus-container-default/src/main/java/org/codehaus/plexus/configuration/PlexusConfiguration.java: ASL 2.0 - plexus-container-default/src/main/java/org/codehaus/plexus/configuration/PlexusConfigurationException.java: ASL 2.0 - plexus-container-default/src/main/java/org/codehaus/plexus/configuration/PlexusConfigurationMerger.java: ASL 2.0 - plexus-container-default/src/main/java/org/codehaus/plexus/configuration/PlexusConfigurationResourceException.java: ASL 2.0 - plexus-container-default/src/main/java/org/codehaus/plexus/context/Context.java: ASL 2.0 - plexus-container-default/src/main/java/org/codehaus/plexus/context/ContextException.java: ASL 2.0 - plexus-container-default/src/main/java/org/codehaus/plexus/context/ContextMapAdapter.java: ASL 2.0 - plexus-container-default/src/main/java/org/codehaus/plexus/context/DefaultContext.java: ASL 2.0 - plexus-container-default/src/main/java/org/codehaus/plexus/lifecycle/AbstractLifecycleHandler.java: ASL 2.0 - plexus-container-default/src/main/java/org/codehaus/plexus/lifecycle/BasicLifecycleHandler.java: ASL 2.0 - plexus-container-default/src/main/java/org/codehaus/plexus/lifecycle/DefaultLifecycleHandlerManager.java: ASL 2.0 - plexus-container-default/src/main/java/org/codehaus/plexus/lifecycle/LifecycleHandler.java: ASL 2.0 - plexus-container-default/src/main/java/org/codehaus/plexus/lifecycle/LifecycleHandlerManager.java: ASL 2.0 - plexus-container-default/src/main/java/org/codehaus/plexus/lifecycle/UndefinedLifecycleHandlerException.java: ASL 2.0 - plexus-container-default/src/main/java/org/codehaus/plexus/logging/AbstractLogEnabled.java: ASL 2.0 - plexus-container-default/src/main/java/org/codehaus/plexus/logging/AbstractLogger.java: ASL 2.0 - plexus-container-default/src/main/java/org/codehaus/plexus/logging/AbstractLoggerManager.java: ASL 2.0 - plexus-container-default/src/main/java/org/codehaus/plexus/logging/BaseLoggerManager.java: ASL 2.0 - plexus-container-default/src/main/java/org/codehaus/plexus/logging/LogEnabled.java: ASL 2.0 - plexus-container-default/src/main/java/org/codehaus/plexus/logging/Logger.java: ASL 2.0 - plexus-container-default/src/main/java/org/codehaus/plexus/logging/LoggerManager.java: ASL 2.0 - plexus-container-default/src/main/java/org/codehaus/plexus/component/builder/AbstractComponentBuildListener.java: ASL 2.0 - plexus-container-default/src/main/java/org/codehaus/plexus/component/builder/ComponentBuildListener.java: ASL 2.0 - plexus-container-default/src/main/java/org/codehaus/plexus/component/builder/ComponentBuilder.java: ASL 2.0 - plexus-container-default/src/main/java/org/codehaus/plexus/component/builder/XBeanComponentBuilder.java: ASL 2.0 - plexus-container-default/src/main/java/org/codehaus/plexus/component/collections/AbstractComponentCollection.java: ASL 2.0 - plexus-container-default/src/main/java/org/codehaus/plexus/component/collections/ComponentList.java: ASL 2.0 - plexus-container-default/src/main/java/org/codehaus/plexus/component/collections/ComponentMap.java: ASL 2.0 - plexus-container-default/src/main/java/org/codehaus/plexus/component/composition/CompositionResolver.java: ASL 2.0 - plexus-container-default/src/main/java/org/codehaus/plexus/component/composition/CycleDetectedInComponentGraphException.java: ASL 2.0 - plexus-container-default/src/main/java/org/codehaus/plexus/component/composition/DefaultCompositionResolver.java: ASL 2.0 - plexus-container-default/src/main/java/org/codehaus/plexus/component/composition/UndefinedComponentComposerException.java: ASL 2.0 - plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/AbstractComponentConfigurator.java: MIT - plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/BasicComponentConfigurator.java: MIT - plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/ComponentConfigurationException.java: ASL 2.0 - plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/ComponentConfigurator.java: MIT - plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/ConfigurationListener.java: MIT - plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/MapOrientedComponentConfigurator.java: ASL 2.0 - plexus-container-default/src/main/java/org/codehaus/plexus/component/discovery/AbstractResourceBasedComponentDiscoverer.java: ASL 2.0 - plexus-container-default/src/main/java/org/codehaus/plexus/component/discovery/AnnotationBasedComponentDiscoverer.java: ASL 2.0 - plexus-container-default/src/main/java/org/codehaus/plexus/component/discovery/ComponentDiscoverer.java: ASL 2.0 - plexus-container-default/src/main/java/org/codehaus/plexus/component/discovery/ComponentDiscovererManager.java: ASL 2.0 - plexus-container-default/src/main/java/org/codehaus/plexus/component/discovery/ComponentDiscoveryEvent.java: ASL 2.0 - plexus-container-default/src/main/java/org/codehaus/plexus/component/discovery/ComponentDiscoveryListener.java: ASL 2.0 - plexus-container-default/src/main/java/org/codehaus/plexus/component/discovery/DefaultComponentDiscoverer.java: ASL 2.0 - plexus-container-default/src/main/java/org/codehaus/plexus/component/discovery/DefaultComponentDiscovererManager.java: ASL 2.0 - plexus-container-default/src/main/java/org/codehaus/plexus/component/discovery/DiscoveryListenerDescriptor.java: ASL 2.0 - plexus-container-default/src/main/java/org/codehaus/plexus/component/discovery/PlexusXmlComponentDiscoverer.java: ASL 2.0 - plexus-container-default/src/main/java/org/codehaus/plexus/component/discovery/ResourceBasedComponentDiscoverer.java: ASL 2.0 - plexus-container-default/src/main/java/org/codehaus/plexus/component/factory/AbstractComponentFactory.java: ASL 2.0 - plexus-container-default/src/main/java/org/codehaus/plexus/component/factory/ComponentFactory.java: ASL 2.0 - plexus-container-default/src/main/java/org/codehaus/plexus/component/factory/ComponentFactoryManager.java: ASL 2.0 - plexus-container-default/src/main/java/org/codehaus/plexus/component/factory/ComponentInstantiationException.java: ASL 2.0 - plexus-container-default/src/main/java/org/codehaus/plexus/component/factory/DefaultComponentFactoryManager.java: ASL 2.0 - plexus-container-default/src/main/java/org/codehaus/plexus/component/factory/UndefinedComponentFactoryException.java: ASL 2.0 - plexus-container-default/src/main/java/org/codehaus/plexus/component/manager/AbstractComponentManager.java: ASL 2.0 - plexus-container-default/src/main/java/org/codehaus/plexus/component/manager/ComponentManager.java: ASL 2.0 - plexus-container-default/src/main/java/org/codehaus/plexus/component/manager/ComponentManagerFactory.java: ASL 2.0 - plexus-container-default/src/main/java/org/codehaus/plexus/component/manager/PerLookupComponentManager.java: ASL 2.0 - plexus-container-default/src/main/java/org/codehaus/plexus/component/manager/PerLookupComponentManagerFactory.java: ASL 2.0 - plexus-container-default/src/main/java/org/codehaus/plexus/component/manager/SingletonComponentManager.java: ASL 2.0 - plexus-container-default/src/main/java/org/codehaus/plexus/component/manager/SingletonComponentManagerFactory.java: ASL 2.0 - plexus-container-default/src/main/java/org/codehaus/plexus/component/manager/UndefinedComponentManagerException.java: ASL 2.0 - plexus-container-default/src/main/java/org/codehaus/plexus/component/repository/ComponentDependency.java: ASL 2.0 - plexus-container-default/src/main/java/org/codehaus/plexus/component/repository/ComponentDescriptor.java: ASL 2.0 - plexus-container-default/src/main/java/org/codehaus/plexus/component/repository/ComponentRepository.java: ASL 2.0 - plexus-container-default/src/main/java/org/codehaus/plexus/component/repository/ComponentRequirement.java: ASL 2.0 - plexus-container-default/src/main/java/org/codehaus/plexus/component/repository/ComponentRequirementList.java: ASL 2.0 - plexus-container-default/src/main/java/org/codehaus/plexus/component/repository/ComponentSetDescriptor.java: ASL 2.0 - plexus-container-default/src/main/java/org/codehaus/plexus/component/repository/DefaultComponentRepository.java: ASL 2.0 - plexus-container-default/src/main/java/org/codehaus/plexus/configuration/io/PlexusConfigurationReader.java: ASL 2.0 - plexus-container-default/src/main/java/org/codehaus/plexus/configuration/io/PlexusConfigurationWriter.java: ASL 2.0 - plexus-container-default/src/main/java/org/codehaus/plexus/configuration/io/XmlPlexusConfigurationReader.java: ASL 2.0 - plexus-container-default/src/main/java/org/codehaus/plexus/configuration/io/XmlPlexusConfigurationWriter.java: ASL 2.0 - plexus-container-default/src/main/java/org/codehaus/plexus/configuration/source/ChainedConfigurationSource.java: ASL 2.0 - plexus-container-default/src/main/java/org/codehaus/plexus/configuration/source/ConfigurationSource.java: ASL 2.0 - plexus-container-default/src/main/java/org/codehaus/plexus/configuration/source/ContainerConfigurationSource.java: ASL 2.0 - plexus-container-default/src/main/java/org/codehaus/plexus/configuration/xml/XmlPlexusConfiguration.java: ASL 2.0 - plexus-container-default/src/main/java/org/codehaus/plexus/container/initialization/AbstractContainerInitializationPhase.java: ASL 2.0 - plexus-container-default/src/main/java/org/codehaus/plexus/container/initialization/AbstractCoreComponentInitializationPhase.java: ASL 2.0 - plexus-container-default/src/main/java/org/codehaus/plexus/container/initialization/ContainerInitializationContext.java: ASL 2.0 - plexus-container-default/src/main/java/org/codehaus/plexus/container/initialization/ContainerInitializationException.java: ASL 2.0 - plexus-container-default/src/main/java/org/codehaus/plexus/container/initialization/ContainerInitializationPhase.java: ASL 2.0 - plexus-container-default/src/main/java/org/codehaus/plexus/container/initialization/InitializeComponentDiscovererManagerPhase.java: ASL 2.0 - plexus-container-default/src/main/java/org/codehaus/plexus/container/initialization/InitializeComponentFactoryManagerPhase.java: ASL 2.0 - plexus-container-default/src/main/java/org/codehaus/plexus/container/initialization/InitializeComponentRegistryPhase.java: ASL 2.0 - plexus-container-default/src/main/java/org/codehaus/plexus/container/initialization/InitializeContainerConfigurationSourcePhase.java: ASL 2.0 - plexus-container-default/src/main/java/org/codehaus/plexus/container/initialization/InitializeLoggerManagerPhase.java: ASL 2.0 - plexus-container-default/src/main/java/org/codehaus/plexus/container/initialization/InitializeSystemPropertiesPhase.java: ASL 2.0 - plexus-container-default/src/main/java/org/codehaus/plexus/container/initialization/InitializeUserConfigurationSourcePhase.java: ASL 2.0 - plexus-container-default/src/main/java/org/codehaus/plexus/lifecycle/phase/AbstractPhase.java: ASL 2.0 - plexus-container-default/src/main/java/org/codehaus/plexus/lifecycle/phase/Phase.java: ASL 2.0 - plexus-container-default/src/main/java/org/codehaus/plexus/logging/console/ConsoleLogger.java: ASL 2.0 - plexus-container-default/src/main/java/org/codehaus/plexus/logging/console/ConsoleLoggerManager.java: ASL 2.0 - plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/converters/AbstractConfigurationConverter.java: MIT - plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/converters/ComponentValueSetter.java: ASL 2.0 - plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/converters/ConfigurationConverter.java: MIT - plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/expression/DefaultExpressionEvaluator.java: ASL 2.0 - plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/expression/ExpressionEvaluationException.java: ASL 2.0 - plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/expression/ExpressionEvaluator.java: ASL 2.0 - plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/expression/TypeAwareExpressionEvaluator.java: ASL 2.0 - plexus-container-default/src/main/java/org/codehaus/plexus/component/factory/java/JavaComponentFactory.java: ASL 2.0 - plexus-container-default/src/main/java/org/codehaus/plexus/component/repository/exception/ComponentConfigurationException.java: ASL 2.0 - plexus-container-default/src/main/java/org/codehaus/plexus/component/repository/exception/ComponentDescriptorUnmarshallingException.java: ASL 2.0 - plexus-container-default/src/main/java/org/codehaus/plexus/component/repository/exception/ComponentImplementationNotFoundException.java: ASL 2.0 - plexus-container-default/src/main/java/org/codehaus/plexus/component/repository/exception/ComponentLifecycleException.java: ASL 2.0 - plexus-container-default/src/main/java/org/codehaus/plexus/component/repository/exception/ComponentLookupException.java: ASL 2.0 - plexus-container-default/src/main/java/org/codehaus/plexus/component/repository/exception/ComponentLookupRuntimeException.java: ASL 2.0 - plexus-container-default/src/main/java/org/codehaus/plexus/component/repository/exception/ComponentManagerImplementationNotFoundException.java: ASL 2.0 - plexus-container-default/src/main/java/org/codehaus/plexus/component/repository/exception/ComponentProfileException.java: ASL 2.0 - plexus-container-default/src/main/java/org/codehaus/plexus/component/repository/exception/ComponentRepositoryException.java: ASL 2.0 - plexus-container-default/src/main/java/org/codehaus/plexus/component/repository/io/PlexusTools.java: ASL 2.0 - plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/converters/basic/AbstractBasicConverter.java: MIT - plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/converters/basic/BooleanConverter.java: MIT - plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/converters/basic/ByteConverter.java: MIT - plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/converters/basic/CharConverter.java: MIT - plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/converters/basic/ClassConverter.java: ASL 2.0 - plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/converters/basic/Converter.java: MIT - plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/converters/basic/DateConverter.java: MIT - plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/converters/basic/DoubleConverter.java: MIT - plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/converters/basic/EnumConverter.java: MIT - plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/converters/basic/FileConverter.java: MIT - plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/converters/basic/FloatConverter.java: MIT - plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/converters/basic/IntConverter.java: MIT - plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/converters/basic/LongConverter.java: MIT - plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/converters/basic/ShortConverter.java: MIT - plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/converters/basic/StringBufferConverter.java: MIT - plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/converters/basic/StringConverter.java: MIT - plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/converters/basic/UriConverter.java: ASL 2.0 - plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/converters/basic/UrlConverter.java: MIT - plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/converters/composite/ArrayConverter.java: MIT - plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/converters/composite/CollectionConverter.java: MIT - plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/converters/composite/MapConverter.java: MIT - plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/converters/composite/ObjectWithFieldsConverter.java: MIT - plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/converters/composite/PlexusConfigurationConverter.java: MIT - plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/converters/composite/PropertiesConverter.java: MIT - plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/converters/lookup/ConverterLookup.java: MIT - plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/converters/lookup/DefaultConverterLookup.java: MIT - plexus-container-default/src/main/java/org/codehaus/plexus/component/configurator/converters/special/ClassRealmConverter.java: ASL 2.0 - plexus-container-default/src/main/java/org/codehaus/plexus/personality/plexus/lifecycle/phase/AutoConfigurePhase.java: ASL 2.0 - plexus-container-default/src/main/java/org/codehaus/plexus/personality/plexus/lifecycle/phase/Configurable.java: ASL 2.0 - plexus-container-default/src/main/java/org/codehaus/plexus/personality/plexus/lifecycle/phase/ConfigurablePhase.java: ASL 2.0 - plexus-container-default/src/main/java/org/codehaus/plexus/personality/plexus/lifecycle/phase/Contextualizable.java: ASL 2.0 - plexus-container-default/src/main/java/org/codehaus/plexus/personality/plexus/lifecycle/phase/ContextualizePhase.java: ASL 2.0 - plexus-container-default/src/main/java/org/codehaus/plexus/personality/plexus/lifecycle/phase/Disposable.java: ASL 2.0 - plexus-container-default/src/main/java/org/codehaus/plexus/personality/plexus/lifecycle/phase/DisposePhase.java: ASL 2.0 - plexus-container-default/src/main/java/org/codehaus/plexus/personality/plexus/lifecycle/phase/Initializable.java: ASL 2.0 - plexus-container-default/src/main/java/org/codehaus/plexus/personality/plexus/lifecycle/phase/InitializationException.java: ASL 2.0 - plexus-container-default/src/main/java/org/codehaus/plexus/personality/plexus/lifecycle/phase/InitializePhase.java: ASL 2.0 - plexus-container-default/src/main/java/org/codehaus/plexus/personality/plexus/lifecycle/phase/LogDisablePhase.java: ASL 2.0 - plexus-container-default/src/main/java/org/codehaus/plexus/personality/plexus/lifecycle/phase/LogEnablePhase.java: ASL 2.0 - plexus-container-default/src/main/java/org/codehaus/plexus/personality/plexus/lifecycle/phase/PhaseExecutionException.java: ASL 2.0 - plexus-container-default/src/main/java/org/codehaus/plexus/personality/plexus/lifecycle/phase/PlexusContainerLocator.java: ASL 2.0 - plexus-container-default/src/main/java/org/codehaus/plexus/personality/plexus/lifecycle/phase/ResumePhase.java: ASL 2.0 - plexus-container-default/src/main/java/org/codehaus/plexus/personality/plexus/lifecycle/phase/ServiceLocator.java: ASL 2.0 - plexus-container-default/src/main/java/org/codehaus/plexus/personality/plexus/lifecycle/phase/Serviceable.java: ASL 2.0 - plexus-container-default/src/main/java/org/codehaus/plexus/personality/plexus/lifecycle/phase/ServiceablePhase.java: ASL 2.0 - plexus-container-default/src/main/java/org/codehaus/plexus/personality/plexus/lifecycle/phase/StartPhase.java: ASL 2.0 - plexus-container-default/src/main/java/org/codehaus/plexus/personality/plexus/lifecycle/phase/Startable.java: ASL 2.0 - plexus-container-default/src/main/java/org/codehaus/plexus/personality/plexus/lifecycle/phase/StartingException.java: ASL 2.0 - plexus-container-default/src/main/java/org/codehaus/plexus/personality/plexus/lifecycle/phase/StopPhase.java: ASL 2.0 - plexus-container-default/src/main/java/org/codehaus/plexus/personality/plexus/lifecycle/phase/StoppingException.java: ASL 2.0 - plexus-container-default/src/main/java/org/codehaus/plexus/personality/plexus/lifecycle/phase/SuspendPhase.java: ASL 2.0 - plexus-container-default/src/main/java/org/codehaus/plexus/personality/plexus/lifecycle/phase/Suspendable.java: ASL 2.0 - - plexus-component-metadata/src/main/java/org/codehaus/plexus/metadata/ClassComponentDescriptorExtractor.java: ASL 2.0 - plexus-component-metadata/src/main/java/org/codehaus/plexus/metadata/ComponentDescriptorExtractor.java: ASL 2.0 - plexus-component-metadata/src/main/java/org/codehaus/plexus/metadata/ComponentDescriptorExtractorSupport.java: ASL 2.0 - plexus-component-metadata/src/main/java/org/codehaus/plexus/metadata/ComponentDescriptorWriteException.java: MIT - plexus-component-metadata/src/main/java/org/codehaus/plexus/metadata/ComponentDescriptorWriter.java: MIT - plexus-component-metadata/src/main/java/org/codehaus/plexus/metadata/DefaultComponentDescriptorWriter.java: MIT - plexus-component-metadata/src/main/java/org/codehaus/plexus/metadata/DefaultMetadataGenerator.java: MIT - plexus-component-metadata/src/main/java/org/codehaus/plexus/metadata/MetadataGenerationRequest.java: ASL 2.0 - plexus-component-metadata/src/main/java/org/codehaus/plexus/metadata/MetadataGenerator.java: ASL 2.0 - plexus-component-metadata/src/main/java/org/codehaus/plexus/metadata/SourceComponentDescriptorExtractor.java: ASL 2.0 - plexus-component-metadata/src/main/java/org/codehaus/plexus/component/repository/ComponentDescriptor.java: ASL 2.0 - plexus-component-metadata/src/main/java/org/codehaus/plexus/component/repository/ComponentRequirement.java: ASL 2.0 - plexus-component-metadata/src/main/java/org/codehaus/plexus/component/repository/ComponentRequirementList.java: ASL 2.0 - plexus-component-metadata/src/main/java/org/codehaus/plexus/component/repository/ComponentSetDescriptor.java: ASL 2.0 - plexus-component-metadata/src/main/java/org/codehaus/plexus/component/repository/README.txt: ASL 2.0 - plexus-component-metadata/src/main/java/org/codehaus/plexus/maven/plugin/AbstractDescriptorMojo.java: MIT - plexus-component-metadata/src/main/java/org/codehaus/plexus/maven/plugin/PlexusDescriptorMojo.java: MIT - plexus-component-metadata/src/main/java/org/codehaus/plexus/maven/plugin/PlexusMergeMojo.java: MIT - plexus-component-metadata/src/main/java/org/codehaus/plexus/maven/plugin/PlexusTestDescriptorMojo.java: MIT - plexus-component-metadata/src/main/java/org/codehaus/plexus/metadata/ann/Ann.java: ASL 2.0 - plexus-component-metadata/src/main/java/org/codehaus/plexus/metadata/ann/AnnClass.java: ASL 2.0 - plexus-component-metadata/src/main/java/org/codehaus/plexus/metadata/ann/AnnEnum.java: ASL 2.0 - plexus-component-metadata/src/main/java/org/codehaus/plexus/metadata/ann/AnnField.java: ASL 2.0 - plexus-component-metadata/src/main/java/org/codehaus/plexus/metadata/ann/AnnInvocationHandler.java: ASL 2.0 - plexus-component-metadata/src/main/java/org/codehaus/plexus/metadata/ann/AnnMethod.java: ASL 2.0 - plexus-component-metadata/src/main/java/org/codehaus/plexus/metadata/ann/AnnReader.java: ASL 2.0 - plexus-component-metadata/src/main/java/org/codehaus/plexus/metadata/gleaner/AnnotationComponentGleaner.java: ASL 2.0 - plexus-component-metadata/src/main/java/org/codehaus/plexus/metadata/gleaner/ClassComponentGleaner.java: ASL 2.0 - plexus-component-metadata/src/main/java/org/codehaus/plexus/metadata/gleaner/ComponentGleanerException.java: MIT - plexus-component-metadata/src/main/java/org/codehaus/plexus/metadata/gleaner/ComponentGleanerSupport.java: ASL 2.0 - plexus-component-metadata/src/main/java/org/codehaus/plexus/metadata/gleaner/QDoxComponentGleaner.java: MIT - plexus-component-metadata/src/main/java/org/codehaus/plexus/metadata/gleaner/SourceComponentGleaner.java: ASL 2.0 - plexus-component-metadata/src/main/java/org/codehaus/plexus/metadata/merge/AbstractMerger.java: MIT - plexus-component-metadata/src/main/java/org/codehaus/plexus/metadata/merge/ComponentsXmlMerger.java: MIT - plexus-component-metadata/src/main/java/org/codehaus/plexus/metadata/merge/MergeException.java: MIT - plexus-component-metadata/src/main/java/org/codehaus/plexus/metadata/merge/MergeStrategy.java: MIT - plexus-component-metadata/src/main/java/org/codehaus/plexus/metadata/merge/Merger.java: MIT - plexus-component-metadata/src/main/java/org/codehaus/plexus/metadata/merge/PlexusXmlMerger.java: MIT - plexus-component-metadata/src/main/java/org/codehaus/plexus/metadata/merge/support/AbstractMergeableElement.java: MIT - plexus-component-metadata/src/main/java/org/codehaus/plexus/metadata/merge/support/AbstractMergeableElementList.java: MIT - plexus-component-metadata/src/main/java/org/codehaus/plexus/metadata/merge/support/AbstractMergeableSupport.java: MIT - plexus-component-metadata/src/main/java/org/codehaus/plexus/metadata/merge/support/ComponentElement.java: MIT - plexus-component-metadata/src/main/java/org/codehaus/plexus/metadata/merge/support/ComponentSetElement.java: MIT - plexus-component-metadata/src/main/java/org/codehaus/plexus/metadata/merge/support/ComponentsElement.java: MIT - plexus-component-metadata/src/main/java/org/codehaus/plexus/metadata/merge/support/ConfigurationElement.java: MIT - plexus-component-metadata/src/main/java/org/codehaus/plexus/metadata/merge/support/DescriptorTag.java: ASL 2.0 - plexus-component-metadata/src/main/java/org/codehaus/plexus/metadata/merge/support/MergeStrategies.java: MIT - plexus-component-metadata/src/main/java/org/codehaus/plexus/metadata/merge/support/Mergeable.java: MIT - plexus-component-metadata/src/main/java/org/codehaus/plexus/metadata/merge/support/PlexusRootElement.java: MIT - plexus-component-metadata/src/main/java/org/codehaus/plexus/metadata/merge/support/PlexusXmlTag.java: ASL 2.0 - plexus-component-metadata/src/main/java/org/codehaus/plexus/metadata/merge/support/RequirementElement.java: MIT - plexus-component-metadata/src/main/java/org/codehaus/plexus/metadata/merge/support/RequirementsElement.java: MIT -downstream/plexus-interpolation: ASL 2.0 and ASL 1.1 and MIT - complete breakdown: - src/main/java/org/codehaus/plexus/interpolation/AbstractDelegatingValueSource.java: ASL 2.0 - src/main/java/org/codehaus/plexus/interpolation/AbstractFunctionValueSourceWrapper.java: ASL 2.0 - src/main/java/org/codehaus/plexus/interpolation/AbstractValueSource.java: ASL 2.0 - src/main/java/org/codehaus/plexus/interpolation/BasicInterpolator.java: ASL 2.0 - src/main/java/org/codehaus/plexus/interpolation/EnvarBasedValueSource.java: ASL 2.0 - src/main/java/org/codehaus/plexus/interpolation/FeedbackEnabledValueSource.java: ASL 2.0 - src/main/java/org/codehaus/plexus/interpolation/FixedInterpolatorValueSource.java: ASL 2.0 - src/main/java/org/codehaus/plexus/interpolation/InterpolationCycleException.java: ASL 2.0 - src/main/java/org/codehaus/plexus/interpolation/InterpolationException.java: ASL 2.0 - src/main/java/org/codehaus/plexus/interpolation/InterpolationPostProcessor.java: ASL 2.0 - src/main/java/org/codehaus/plexus/interpolation/Interpolator.java: ASL 2.0 - src/main/java/org/codehaus/plexus/interpolation/InterpolatorFilterReader.java: ASL 1.1 - src/main/java/org/codehaus/plexus/interpolation/MapBasedValueSource.java: ASL 2.0 - src/main/java/org/codehaus/plexus/interpolation/ObjectBasedValueSource.java: ASL 2.0 - src/main/java/org/codehaus/plexus/interpolation/PrefixAwareRecursionInterceptor.java: ASL 2.0 - src/main/java/org/codehaus/plexus/interpolation/PrefixedObjectValueSource.java: ASL 2.0 - src/main/java/org/codehaus/plexus/interpolation/PrefixedPropertiesValueSource.java: ASL 2.0 - src/main/java/org/codehaus/plexus/interpolation/PrefixedValueSourceWrapper.java: ASL 2.0 - src/main/java/org/codehaus/plexus/interpolation/PropertiesBasedValueSource.java: ASL 2.0 - src/main/java/org/codehaus/plexus/interpolation/QueryEnabledValueSource.java: ASL 2.0 - src/main/java/org/codehaus/plexus/interpolation/RecursionInterceptor.java: ASL 2.0 - src/main/java/org/codehaus/plexus/interpolation/RegexBasedInterpolator.java: ASL 2.0 - src/main/java/org/codehaus/plexus/interpolation/SimpleRecursionInterceptor.java: ASL 2.0 - src/main/java/org/codehaus/plexus/interpolation/SingleResponseValueSource.java: ASL 2.0 - src/main/java/org/codehaus/plexus/interpolation/StringSearchInterpolator.java: ASL 2.0 - src/main/java/org/codehaus/plexus/interpolation/ValueSource.java: ASL 2.0 - src/main/java/org/codehaus/plexus/interpolation/fixed/AbstractDelegatingValueSource.java: ASL 2.0 - src/main/java/org/codehaus/plexus/interpolation/fixed/EnvarBasedValueSource.java: ASL 2.0 - src/main/java/org/codehaus/plexus/interpolation/fixed/FixedStringSearchInterpolator.java: ASL 2.0 - src/main/java/org/codehaus/plexus/interpolation/fixed/FixedValueSource.java: ASL 2.0 - src/main/java/org/codehaus/plexus/interpolation/fixed/InterpolationCycleException.java: ASL 2.0 - src/main/java/org/codehaus/plexus/interpolation/fixed/InterpolationState.java: ASL 2.0 - src/main/java/org/codehaus/plexus/interpolation/fixed/MapBasedValueSource.java: ASL 2.0 - src/main/java/org/codehaus/plexus/interpolation/fixed/ObjectBasedValueSource.java: ASL 2.0 - src/main/java/org/codehaus/plexus/interpolation/fixed/PrefixedObjectValueSource.java: ASL 2.0 - src/main/java/org/codehaus/plexus/interpolation/fixed/PrefixedPropertiesValueSource.java: ASL 2.0 - src/main/java/org/codehaus/plexus/interpolation/fixed/PrefixedValueSourceWrapper.java: ASL 2.0 - src/main/java/org/codehaus/plexus/interpolation/fixed/PropertiesBasedValueSource.java: ASL 2.0 - src/main/java/org/codehaus/plexus/interpolation/multi/DelimiterSpecification.java: ASL 2.0 - src/main/java/org/codehaus/plexus/interpolation/multi/MultiDelimiterInterpolatorFilterReader.java: ASL 1.1 - src/main/java/org/codehaus/plexus/interpolation/multi/MultiDelimiterStringSearchInterpolator.java: ASL 2.0 - src/main/java/org/codehaus/plexus/interpolation/object/FieldBasedObjectInterpolator.java: ASL 2.0 - src/main/java/org/codehaus/plexus/interpolation/object/ObjectInterpolationWarning.java: ASL 2.0 - src/main/java/org/codehaus/plexus/interpolation/object/ObjectInterpolator.java: ASL 2.0 - src/main/java/org/codehaus/plexus/interpolation/os/OperatingSystemUtils.java: MIT - src/main/java/org/codehaus/plexus/interpolation/os/Os.java: ASL 1.1 - src/main/java/org/codehaus/plexus/interpolation/reflection/ClassMap.java: ASL 2.0 - src/main/java/org/codehaus/plexus/interpolation/reflection/MethodMap.java: ASL 2.0 - src/main/java/org/codehaus/plexus/interpolation/reflection/ReflectionValueExtractor.java: ASL 2.0 - src/main/java/org/codehaus/plexus/interpolation/util/StringUtils.java: ASL 1.1 - src/main/java/org/codehaus/plexus/interpolation/util/ValueSourceUtils.java: ASL 2.0 -downstream/plexus-io: ASL 2.0 -downstream/plexus-languages: ASL 2.0 -downstream/plexus-pom: ASL 2.0 -downstream/plexus-resources: MIT -downstream/plexus-sec-dispatcher: ASL 2.0 -downstream/plexus-utils: ASL 2.0 and ASL 1.1 and BSD and xpp and Public Domain - complete breakdown: - src/main/java/org/codehaus/plexus/util/AbstractScanner.java: ASL 2.0 - src/main/java/org/codehaus/plexus/util/Base64.java: ASL 2.0 - src/main/java/org/codehaus/plexus/util/CollectionUtils.java: ASL 2.0 - src/main/java/org/codehaus/plexus/util/DirectoryWalkListener.java: ASL 2.0 - src/main/java/org/codehaus/plexus/util/DirectoryWalker.java: ASL 2.0 - src/main/java/org/codehaus/plexus/util/Java7Detector.java: ASL 2.0 - src/main/java/org/codehaus/plexus/util/LineOrientedInterpolatingReader.java: ASL 2.0 - src/main/java/org/codehaus/plexus/util/MatchPattern.java: ASL 2.0 - src/main/java/org/codehaus/plexus/util/NioFiles.java: ASL 2.0 - src/main/java/org/codehaus/plexus/util/PathTool.java: ASL 2.0 - src/main/java/org/codehaus/plexus/util/PropertyUtils.java: ASL 2.0 - src/main/java/org/codehaus/plexus/util/ReaderFactory.java: ASL 2.0 - src/main/java/org/codehaus/plexus/util/ReflectionUtils.java: ASL 2.0 - src/main/java/org/codehaus/plexus/util/Scanner.java: ASL 2.0 - src/main/java/org/codehaus/plexus/util/StringOutputStream.java: ASL 2.0 - src/main/java/org/codehaus/plexus/util/SweeperPool.java: ASL 2.0 - src/main/java/org/codehaus/plexus/util/WriterFactory.java: ASL 2.0 - src/main/java/org/codehaus/plexus/util/cli/AbstractStreamHandler.java: ASL 2.0 - src/main/java/org/codehaus/plexus/util/cli/Arg.java: ASL 2.0 - src/main/java/org/codehaus/plexus/util/cli/CommandLineCallable.java: ASL 2.0 - src/main/java/org/codehaus/plexus/util/cli/CommandLineException.java: ASL 2.0 - src/main/java/org/codehaus/plexus/util/cli/CommandLineTimeOutException.java: ASL 2.0 - src/main/java/org/codehaus/plexus/util/cli/CommandLineUtils.java: ASL 2.0 - src/main/java/org/codehaus/plexus/util/cli/DefaultConsumer.java: ASL 2.0 - src/main/java/org/codehaus/plexus/util/cli/EnhancedStringTokenizer.java: ASL 2.0 - src/main/java/org/codehaus/plexus/util/cli/ShutdownHookUtils.java: ASL 2.0 - src/main/java/org/codehaus/plexus/util/cli/StreamFeeder.java: ASL 2.0 - src/main/java/org/codehaus/plexus/util/cli/WriterStreamConsumer.java: ASL 2.0 - src/main/java/org/codehaus/plexus/util/dag/CycleDetectedException.java: ASL 2.0 - src/main/java/org/codehaus/plexus/util/dag/CycleDetector.java: ASL 2.0 - src/main/java/org/codehaus/plexus/util/dag/DAG.java: ASL 2.0 - src/main/java/org/codehaus/plexus/util/dag/TopologicalSorter.java: ASL 2.0 - src/main/java/org/codehaus/plexus/util/dag/Vertex.java: ASL 2.0 - src/main/java/org/codehaus/plexus/util/introspection/ClassMap.java: ASL 2.0 - src/main/java/org/codehaus/plexus/util/introspection/MethodMap.java: ASL 2.0 - src/main/java/org/codehaus/plexus/util/introspection/ReflectionValueExtractor.java: ASL 2.0 - src/main/java/org/codehaus/plexus/util/io/InputStreamFacade.java: ASL 2.0 - src/main/java/org/codehaus/plexus/util/io/RawInputStreamFacade.java: ASL 2.0 - src/main/java/org/codehaus/plexus/util/io/URLInputStreamFacade.java: ASL 2.0 - src/main/java/org/codehaus/plexus/util/reflection/Reflector.java: ASL 2.0 - src/main/java/org/codehaus/plexus/util/reflection/ReflectorException.java: ASL 2.0 - src/main/java/org/codehaus/plexus/util/xml/CompactXMLWriter.java: ASL 2.0 - src/main/java/org/codehaus/plexus/util/xml/PrettyPrintXMLWriter.java: ASL 2.0 - src/main/java/org/codehaus/plexus/util/xml/SerializerXMLWriter.java: ASL 2.0 - src/main/java/org/codehaus/plexus/util/xml/XMLWriter.java: ASL 2.0 - src/main/java/org/codehaus/plexus/util/xml/XmlReader.java: ASL 2.0 - src/main/java/org/codehaus/plexus/util/xml/XmlReaderException.java: ASL 2.0 - src/main/java/org/codehaus/plexus/util/xml/XmlStreamReader.java: ASL 2.0 - src/main/java/org/codehaus/plexus/util/xml/XmlStreamReaderException.java: ASL 2.0 - src/main/java/org/codehaus/plexus/util/xml/XmlStreamWriter.java: ASL 2.0 - src/main/java/org/codehaus/plexus/util/xml/XmlUtil.java: ASL 2.0 - src/main/java/org/codehaus/plexus/util/xml/XmlWriterUtil.java: ASL 2.0 - src/main/java/org/codehaus/plexus/util/xml/Xpp3Dom.java: ASL 2.0 - src/main/java/org/codehaus/plexus/util/xml/Xpp3DomBuilder.java: ASL 2.0 - src/main/java/org/codehaus/plexus/util/xml/Xpp3DomUtils.java: ASL 2.0 - src/main/java/org/codehaus/plexus/util/xml/Xpp3DomWriter.java: ASL 2.0 - src/main/java/org/codehaus/plexus/util/cli/shell/BourneShell.java: ASL 2.0 - src/main/java/org/codehaus/plexus/util/cli/shell/CmdShell.java: ASL 2.0 - src/main/java/org/codehaus/plexus/util/cli/shell/CommandShell.java: ASL 2.0 - src/main/java/org/codehaus/plexus/util/cli/shell/Shell.java: ASL 2.0 - src/main/java/org/codehaus/plexus/util/xml/pull/EntityReplacementMap.java: ASL 2.0 - - src/main/java/org/codehaus/plexus/util/cli/Commandline.java: BSD and ASL 2.0 - src/main/java/org/codehaus/plexus/util/cli/StreamConsumer.java: BSD and ASL 2.0 - src/main/java/org/codehaus/plexus/util/cli/StreamPumper.java: BSD and ASL 2.0 - - src/main/java/org/codehaus/plexus/util/CachedMap.java: Public Domain - src/main/java/org/codehaus/plexus/util/FastMap.java: Public Domain - src/main/java/org/codehaus/plexus/util/TypeFormat.java: Public Domain - - src/main/java/org/codehaus/plexus/util/xml/pull/MXParser.java: xpp - src/main/java/org/codehaus/plexus/util/xml/pull/MXSerializer.java: xpp - src/main/java/org/codehaus/plexus/util/xml/pull/XmlPullParser.java: xpp - src/main/java/org/codehaus/plexus/util/xml/pull/XmlPullParserException.java: xpp - src/main/java/org/codehaus/plexus/util/xml/pull/XmlSerializer.java: xpp - - src/main/java/org/codehaus/plexus/util/DirectoryScanner.java: ASL 1.1 - src/main/java/org/codehaus/plexus/util/ExceptionUtils.java: ASL 1.1 - src/main/java/org/codehaus/plexus/util/Expand.java: ASL 1.1 - src/main/java/org/codehaus/plexus/util/FileUtils.java: ASL 1.1 - src/main/java/org/codehaus/plexus/util/IOUtil.java: ASL 1.1 - src/main/java/org/codehaus/plexus/util/InterpolationFilterReader.java: ASL 1.1 - src/main/java/org/codehaus/plexus/util/Os.java: ASL 1.1 - src/main/java/org/codehaus/plexus/util/SelectorUtils.java: ASL 1.1 - src/main/java/org/codehaus/plexus/util/StringInputStream.java: ASL 1.1 - src/main/java/org/codehaus/plexus/util/StringUtils.java: ASL 1.1 -downstream/qdox: ASL 2.0 -downstream/servlet-api: ASL 2.0 and (EPL-2.0 or GPLv2 with exceptions) - complete breakdown: - api/src/main/java/javax/servlet/RequestDispatcher.java: ASL 2.0 - api/src/main/java/javax/servlet/annotation/HttpMethodConstraint.java: EPL-2.0 or GPLv2 with exceptions - api/src/main/java/javax/servlet/annotation/HttpConstraint.java: EPL-2.0 or GPLv2 with exceptions - api/src/main/java/javax/servlet/annotation/HandlesTypes.java: EPL-2.0 or GPLv2 with exceptions - api/src/main/java/javax/servlet/annotation/WebServlet.java: EPL-2.0 or GPLv2 with exceptions - api/src/main/java/javax/servlet/annotation/WebInitParam.java: EPL-2.0 or GPLv2 with exceptions - api/src/main/java/javax/servlet/annotation/WebListener.java: EPL-2.0 or GPLv2 with exceptions - api/src/main/java/javax/servlet/annotation/WebFilter.java: EPL-2.0 or GPLv2 with exceptions - api/src/main/java/javax/servlet/annotation/ServletSecurity.java: EPL-2.0 or GPLv2 with exceptions - api/src/main/java/javax/servlet/annotation/MultipartConfig.java: EPL-2.0 or GPLv2 with exceptions - api/src/main/java/javax/servlet/ServletRequestAttributeEvent.java: ASL 2.0 - api/src/main/java/javax/servlet/ServletConfig.java: ASL 2.0 - api/src/main/java/javax/servlet/WriteListener.java: EPL-2.0 or GPLv2 with exceptions - api/src/main/java/javax/servlet/ServletSecurityElement.java: EPL-2.0 or GPLv2 with exceptions - api/src/main/java/javax/servlet/ServletRegistration.java: EPL-2.0 or GPLv2 with exceptions - api/src/main/java/javax/servlet/HttpMethodConstraintElement.java: EPL-2.0 or GPLv2 with exceptions - api/src/main/java/javax/servlet/SessionTrackingMode.java: EPL-2.0 or GPLv2 with exceptions - api/src/main/java/javax/servlet/ServletContextEvent.java: ASL 2.0 - api/src/main/java/javax/servlet/SingleThreadModel.java: ASL 2.0 - api/src/main/java/javax/servlet/ServletRequestAttributeListener.java: ASL 2.0 - api/src/main/java/javax/servlet/SessionCookieConfig.java: EPL-2.0 or GPLv2 with exceptions - api/src/main/java/javax/servlet/GenericServlet.java: ASL 2.0 - api/src/main/java/javax/servlet/ServletInputStream.java: ASL 2.0 - api/src/main/java/javax/servlet/ServletContextAttributeEvent.java: ASL 2.0 - api/src/main/java/javax/servlet/Servlet.java: ASL 2.0 - api/src/main/java/javax/servlet/ServletContextListener.java: ASL 2.0 - api/src/main/java/javax/servlet/HttpConstraintElement.java: EPL-2.0 or GPLv2 with exceptions - api/src/main/java/javax/servlet/AsyncContext.java: EPL-2.0 or GPLv2 with exceptions - api/src/main/java/javax/servlet/ServletResponse.java: ASL 2.0 - api/src/main/java/javax/servlet/ServletResponseWrapper.java: ASL 2.0 - api/src/main/java/javax/servlet/Registration.java: EPL-2.0 or GPLv2 with exceptions - api/src/main/java/javax/servlet/DispatcherType.java: EPL-2.0 or GPLv2 with exceptions - api/src/main/java/javax/servlet/ServletContainerInitializer.java: EPL-2.0 or GPLv2 with exceptions - api/src/main/java/javax/servlet/ServletException.java: ASL 2.0 - api/src/main/java/javax/servlet/MultipartConfigElement.java: EPL-2.0 or GPLv2 with exceptions - api/src/main/java/javax/servlet/descriptor/TaglibDescriptor.java: EPL-2.0 or GPLv2 with exceptions - api/src/main/java/javax/servlet/descriptor/JspPropertyGroupDescriptor.java: EPL-2.0 or GPLv2 with exceptions - api/src/main/java/javax/servlet/descriptor/JspConfigDescriptor.java: EPL-2.0 or GPLv2 with exceptions - api/src/main/java/javax/servlet/ServletContextAttributeListener.java: ASL 2.0 - api/src/main/java/javax/servlet/GenericFilter.java: EPL-2.0 or GPLv2 with exceptions - api/src/main/java/javax/servlet/ServletRequest.java: ASL 2.0 - api/src/main/java/javax/servlet/Filter.java: ASL 2.0 - api/src/main/java/javax/servlet/http/HttpServlet.java: ASL 2.0 - api/src/main/java/javax/servlet/http/HttpSessionAttributeListener.java: ASL 2.0 - api/src/main/java/javax/servlet/http/HttpServletRequest.java: ASL 2.0 - api/src/main/java/javax/servlet/http/HttpUpgradeHandler.java: EPL-2.0 or GPLv2 with exceptions - api/src/main/java/javax/servlet/http/HttpSessionBindingEvent.java: ASL 2.0 - api/src/main/java/javax/servlet/http/HttpSessionListener.java: ASL 2.0 - api/src/main/java/javax/servlet/http/WebConnection.java: EPL-2.0 or GPLv2 with exceptions - api/src/main/java/javax/servlet/http/HttpSessionIdListener.java: EPL-2.0 or GPLv2 with exceptions - api/src/main/java/javax/servlet/http/HttpSessionBindingListener.java: ASL 2.0 - api/src/main/java/javax/servlet/http/HttpServletRequestWrapper.java: ASL 2.0 - api/src/main/java/javax/servlet/http/HttpSession.java: ASL 2.0 - api/src/main/java/javax/servlet/http/MappingMatch.java: EPL-2.0 or GPLv2 with exceptions - api/src/main/java/javax/servlet/http/HttpSessionContext.java: ASL 2.0 - api/src/main/java/javax/servlet/http/HttpFilter.java: EPL-2.0 or GPLv2 with exceptions - api/src/main/java/javax/servlet/http/HttpSessionEvent.java: ASL 2.0 - api/src/main/java/javax/servlet/http/HttpSessionActivationListener.java: ASL 2.0 - api/src/main/java/javax/servlet/http/HttpServletResponseWrapper.java: ASL 2.0 - api/src/main/java/javax/servlet/http/Part.java: EPL-2.0 or GPLv2 with exceptions - api/src/main/java/javax/servlet/http/PushBuilder.java: EPL-2.0 or GPLv2 with exceptions - api/src/main/java/javax/servlet/http/HttpUtils.java: ASL 2.0 - api/src/main/java/javax/servlet/http/HttpServletResponse.java: ASL 2.0 - api/src/main/java/javax/servlet/http/HttpServletMapping.java: EPL-2.0 or GPLv2 with exceptions - api/src/main/java/javax/servlet/http/Cookie.java: ASL 2.0 - api/src/main/java/javax/servlet/UnavailableException.java: ASL 2.0 - api/src/main/java/javax/servlet/FilterRegistration.java: EPL-2.0 or GPLv2 with exceptions - api/src/main/java/javax/servlet/ServletRequestEvent.java: ASL 2.0 - api/src/main/java/javax/servlet/FilterChain.java: ASL 2.0 - api/src/main/java/javax/servlet/AsyncEvent.java: EPL-2.0 or GPLv2 with exceptions - api/src/main/java/javax/servlet/ServletContext.java: ASL 2.0 - api/src/main/java/javax/servlet/ServletOutputStream.java: ASL 2.0 - api/src/main/java/javax/servlet/ServletRequestWrapper.java: ASL 2.0 - api/src/main/java/javax/servlet/ServletRequestListener.java: ASL 2.0 - api/src/main/java/javax/servlet/FilterConfig.java: ASL 2.0 - api/src/main/java/javax/servlet/ReadListener.java: EPL-2.0 or GPLv2 with exceptions - api/src/main/java/javax/servlet/AsyncListener.java: EPL-2.0 or GPLv2 with exceptions -downstream/sisu-build-api: ASL 2.0 -downstream/sisu-inject: EPL-1.0 and BSD - org.eclipse.sisu.inject/src/org/eclipse/sisu/space/asm/*: BSD - everything else: EPL-1.0 -downstream/sisu-mojos: EPL-1.0 -downstream/sisu-plexus: EPL-1.0 -downstream/slf4j: MIT -downstream/testng: ASL 2.0 -downstream/univocity-parsers: ASL 2.0 -downstream/velocity-engine: ASL 2.0 -downstream/xbean: ASL 2.0 -downstream/xmlunit: ASL 2.0 -downstream/xmvn: ASL 2.0 -downstream/xz-java: Public Domain -mbi: ASL 2.0 +# Licensing breakdown: +# ant has license: Apache-2.0 +# aopalliance has license: LicenseRef-Fedora-Public-Domain +# apache-pom has license: Apache-2.0 +# apiguardian has license: Apache-2.0 +# asm has license: BSD-3-Clause +# assertj-core has license: Apache-2.0 +# bnd has license: Apache-2.0 OR EPL-2.0 +# build-helper-maven-plugin has license: MIT +# byte-buddy has license: Apache-2.0 +# cdi has license: Apache-2.0 +# cglib has license: Apache-2.0 AND BSD-3-Clause +# common-annotations-api has license: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 +# commons-beanutils has license: Apache-2.0 +# commons-cli has license: Apache-2.0 +# commons-codec has license: Apache-2.0 +# commons-collections has license: Apache-2.0 +# commons-compress has license: Apache-2.0 +# commons-io has license: Apache-2.0 +# commons-jxpath has license: Apache-2.0 +# commons-lang has license: Apache-2.0 +# commons-logging has license: Apache-2.0 +# commons-parent-pom has license: Apache-2.0 +# cup has license: SMLNJ +# disruptor has license: Apache-2.0 +# easymock has license: Apache-2.0 +# extra-enforcer-rules has license: Apache-2.0 +# felix-parent-pom has license: Apache-2.0 +# felix-utils has license: Apache-2.0 +# fusesource-pom has license: Apache-2.0 +# guava has license: Apache-2.0 AND CC0-1.0 +# guice has license: Apache-2.0 +# hamcrest has license: BSD-3-Clause +# httpcomponents-client has license: Apache-2.0 +# httpcomponents-core has license: Apache-2.0 +# httpcomponents-parent-pom has license: Apache-2.0 +# injection-api has license: Apache-2.0 +# jaf-api has license: BSD-3-Clause +# jansi has license: Apache-2.0 +# javacc has license: BSD-2-Clause AND BSD-3-Clause +# javacc-maven-plugin has license: Apache-2.0 +# javaparser has license: Apache-2.0 OR LGPL-2.0-or-later +# jcommander has license: Apache-2.0 +# jctools has license: Apache-2.0 +# jdom has license: Saxpath +# jdom2 has license: Saxpath +# jflex has license: BSD-3-Clause +# jsoup has license: MIT +# jsr-305 has license: BSD-3-Clause AND CC-BY-2.5 +# junit4 has license: EPL-1.0 +# junit5 has license: EPL-2.0 +# log4j has license: Apache-2.0 +# mail-api has license: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 +# maven has license: Apache-2.0 AND MIT +# maven-antrun-plugin has license: Apache-2.0 +# maven-apache-resources has license: Apache-2.0 +# maven-archiver has license: Apache-2.0 +# maven-artifact-transfer has license: Apache-2.0 +# maven-assembly-plugin has license: Apache-2.0 +# maven-bundle-plugin has license: Apache-2.0 +# maven-common-artifact-filters has license: Apache-2.0 +# maven-compiler-plugin has license: Apache-2.0 +# maven-dependency-analyzer has license: Apache-2.0 +# maven-dependency-plugin has license: Apache-2.0 +# maven-dependency-tree has license: Apache-2.0 +# maven-enforcer has license: Apache-2.0 +# maven-file-management has license: Apache-2.0 +# maven-filtering has license: Apache-2.0 +# maven-jar-plugin has license: Apache-2.0 +# maven-parent-pom has license: Apache-2.0 +# maven-plugin-testing has license: Apache-2.0 +# maven-plugin-tools has license: Apache-2.0 +# maven-remote-resources-plugin has license: Apache-2.0 +# maven-resolver has license: Apache-2.0 +# maven-resources-plugin has license: Apache-2.0 +# maven-shared-incremental has license: Apache-2.0 +# maven-shared-io has license: Apache-2.0 +# maven-shared-utils has license: Apache-2.0 +# maven-source-plugin has license: Apache-2.0 +# maven-surefire has license: Apache-2.0 AND CPL-1.0 +# maven-verifier has license: Apache-2.0 +# maven-wagon has license: Apache-2.0 +# mbi has license: Apache-2.0 +# mockito has license: MIT +# modello has license: Apache-2.0 AND MIT AND Plexus +# moditect has license: Apache-2.0 +# modulemaker-maven-plugin has license: Apache-2.0 +# mojo-parent-pom has license: Apache-2.0 +# objenesis has license: Apache-2.0 +# opentest4j has license: Apache-2.0 +# osgi-annotation has license: Apache-2.0 +# osgi-cmpn has license: Apache-2.0 +# osgi-core has license: Apache-2.0 +# plexus-archiver has license: Apache-2.0 +# plexus-build-api has license: Apache-2.0 +# plexus-cipher has license: Apache-2.0 +# plexus-classworlds has license: Apache-2.0 AND Plexus +# plexus-compiler has license: Apache-2.0 AND MIT +# plexus-components-pom has license: Apache-2.0 +# plexus-containers has license: Apache-2.0 AND MIT AND xpp +# plexus-interpolation has license: Apache-1.1 AND Apache-2.0 AND MIT +# plexus-io has license: Apache-2.0 +# plexus-languages has license: Apache-2.0 +# plexus-pom has license: Apache-2.0 +# plexus-resources has license: Apache-2.0 AND MIT +# plexus-sec-dispatcher has license: Apache-2.0 +# plexus-utils has license: Apache-1.1 AND Apache-2.0 AND BSD-3-Clause AND LicenseRef-Fedora-Public-Domain AND xpp +# qdox has license: Apache-2.0 +# servlet-api has license: Apache-2.0 AND (EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0) +# sisu-inject has license: BSD-3-Clause AND EPL-1.0 +# sisu-mojos has license: EPL-1.0 +# sisu-plexus has license: BSD-3-Clause AND EPL-1.0 +# slf4j has license: Apache-2.0 AND MIT +# testng has license: Apache-2.0 +# univocity-parsers has license: Apache-2.0 +# velocity-engine has license: Apache-2.0 +# xbean has license: Apache-2.0 +# xmlunit has license: Apache-2.0 +# xmvn has license: Apache-2.0 +# xmvn-generator has license: Apache-2.0 +# xz-java has license: LicenseRef-Fedora-Public-Domain +# Therefore combined license is: +License: Apache-1.1 AND Apache-2.0 AND (Apache-2.0 OR EPL-2.0) AND (Apache-2.0 OR LGPL-2.0-or-later) AND BSD-2-Clause AND BSD-3-Clause AND CC-BY-2.5 AND CC0-1.0 AND CPL-1.0 AND EPL-1.0 AND EPL-2.0 AND (EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0) AND LicenseRef-Fedora-Public-Domain AND MIT AND Plexus AND SMLNJ AND Saxpath AND xpp diff --git a/javapackages-bootstrap.spec b/javapackages-bootstrap.spec index 1d2021c..a0a5acd 100644 --- a/javapackages-bootstrap.spec +++ b/javapackages-bootstrap.spec @@ -22,11 +22,11 @@ #global git_short_hash %(echo %{git_hash} | cut -b -7) Name: javapackages-bootstrap -Version: 1.13.0 -Release: 3%{?dist} +Version: 1.14.0 +Release: 1%{?dist} Summary: A means of bootstrapping Java Packages Tools # For detailed info see the file javapackages-bootstrap-PACKAGE-LICENSING -License: Apache-2.0 AND Apache-1.1 AND (Apache-2.0 OR EPL-2.0) AND (EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0) AND MIT AND BSD-3-Clause AND EPL-1.0 AND EPL-2.0 AND CDDL-1.0 AND xpp AND CC0-1.0 AND Plexus AND SMLNJ AND LicenseRef-Fedora-Public-Domain +License: Apache-1.1 AND Apache-2.0 AND (Apache-2.0 OR EPL-2.0) AND (Apache-2.0 OR LGPL-2.0-or-later) AND BSD-2-Clause AND BSD-3-Clause AND CC-BY-2.5 AND CC0-1.0 AND CPL-1.0 AND EPL-1.0 AND EPL-2.0 AND (EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0) AND LicenseRef-Fedora-Public-Domain AND MIT AND Plexus AND SMLNJ AND Saxpath AND xpp URL: https://github.com/fedora-java/javapackages-bootstrap ExclusiveArch: %{java_arches} @@ -84,84 +84,85 @@ Source1037: jaf-api.tar.xz Source1038: jansi.tar.xz Source1039: javacc-maven-plugin.tar.xz Source1040: javacc.tar.xz -Source1041: jcommander.tar.xz -Source1042: jctools.tar.xz -Source1043: jdom.tar.xz -Source1044: jdom2.tar.xz -Source1045: jflex.tar.xz -Source1046: jsoup.tar.xz -Source1047: jsr-305.tar.xz -Source1048: junit4.tar.xz -Source1049: junit5.tar.xz -Source1050: log4j.tar.xz -Source1051: mail-api.tar.xz -Source1052: maven-antrun-plugin.tar.xz -Source1053: maven-apache-resources.tar.xz -Source1054: maven-archiver.tar.xz -Source1055: maven-artifact-transfer.tar.xz -Source1056: maven-assembly-plugin.tar.xz -Source1057: maven-bundle-plugin.tar.xz -Source1058: maven-common-artifact-filters.tar.xz -Source1059: maven-compiler-plugin.tar.xz -Source1060: maven-dependency-analyzer.tar.xz -Source1061: maven-dependency-plugin.tar.xz -Source1062: maven-dependency-tree.tar.xz -Source1063: maven-enforcer.tar.xz -Source1064: maven-file-management.tar.xz -Source1065: maven-filtering.tar.xz -Source1066: maven-jar-plugin.tar.xz -Source1067: maven-parent-pom.tar.xz -Source1068: maven-plugin-testing.tar.xz -Source1069: maven-plugin-tools.tar.xz -Source1070: maven-remote-resources-plugin.tar.xz -Source1071: maven-resolver.tar.xz -Source1072: maven-resources-plugin.tar.xz -Source1073: maven-shared-incremental.tar.xz -Source1074: maven-shared-io.tar.xz -Source1075: maven-shared-utils.tar.xz -Source1076: maven-source-plugin.tar.xz -Source1077: maven-surefire.tar.xz -Source1078: maven-verifier.tar.xz -Source1079: maven-wagon.tar.xz -Source1080: maven.tar.xz -Source1081: mockito.tar.xz -Source1082: modello.tar.xz -Source1083: modulemaker-maven-plugin.tar.xz -Source1084: mojo-parent-pom.tar.xz -Source1085: objenesis.tar.xz -Source1086: opentest4j.tar.xz -Source1087: osgi-annotation.tar.xz -Source1088: osgi-cmpn.tar.xz -Source1089: osgi-core.tar.xz -Source1090: oss-parent-pom.tar.xz -Source1091: plexus-archiver.tar.xz -Source1092: plexus-build-api.tar.xz -Source1093: plexus-cipher.tar.xz -Source1094: plexus-classworlds.tar.xz -Source1095: plexus-compiler.tar.xz -Source1096: plexus-components-pom.tar.xz -Source1097: plexus-containers.tar.xz -Source1098: plexus-interpolation.tar.xz -Source1099: plexus-io.tar.xz -Source1100: plexus-languages.tar.xz -Source1101: plexus-pom.tar.xz -Source1102: plexus-resources.tar.xz -Source1103: plexus-sec-dispatcher.tar.xz -Source1104: plexus-utils.tar.xz -Source1105: qdox.tar.xz -Source1106: servlet-api.tar.xz -Source1107: sisu-inject.tar.xz -Source1108: sisu-mojos.tar.xz -Source1109: sisu-plexus.tar.xz -Source1110: slf4j.tar.xz -Source1111: testng.tar.xz -Source1112: univocity-parsers.tar.xz -Source1113: velocity-engine.tar.xz -Source1114: xbean.tar.xz -Source1115: xmlunit.tar.xz -Source1116: xmvn-generator.tar.xz -Source1117: xmvn.tar.xz -Source1118: xz-java.tar.xz +Source1041: javaparser.tar.xz +Source1042: jcommander.tar.xz +Source1043: jctools.tar.xz +Source1044: jdom.tar.xz +Source1045: jdom2.tar.xz +Source1046: jflex.tar.xz +Source1047: jsoup.tar.xz +Source1048: jsr-305.tar.xz +Source1049: junit4.tar.xz +Source1050: junit5.tar.xz +Source1051: log4j.tar.xz +Source1052: mail-api.tar.xz +Source1053: maven-antrun-plugin.tar.xz +Source1054: maven-apache-resources.tar.xz +Source1055: maven-archiver.tar.xz +Source1056: maven-artifact-transfer.tar.xz +Source1057: maven-assembly-plugin.tar.xz +Source1058: maven-bundle-plugin.tar.xz +Source1059: maven-common-artifact-filters.tar.xz +Source1060: maven-compiler-plugin.tar.xz +Source1061: maven-dependency-analyzer.tar.xz +Source1062: maven-dependency-plugin.tar.xz +Source1063: maven-dependency-tree.tar.xz +Source1064: maven-enforcer.tar.xz +Source1065: maven-file-management.tar.xz +Source1066: maven-filtering.tar.xz +Source1067: maven-jar-plugin.tar.xz +Source1068: maven-parent-pom.tar.xz +Source1069: maven-plugin-testing.tar.xz +Source1070: maven-plugin-tools.tar.xz +Source1071: maven-remote-resources-plugin.tar.xz +Source1072: maven-resolver.tar.xz +Source1073: maven-resources-plugin.tar.xz +Source1074: maven-shared-incremental.tar.xz +Source1075: maven-shared-io.tar.xz +Source1076: maven-shared-utils.tar.xz +Source1077: maven-source-plugin.tar.xz +Source1078: maven-surefire.tar.xz +Source1079: maven-verifier.tar.xz +Source1080: maven-wagon.tar.xz +Source1081: maven.tar.xz +Source1082: mockito.tar.xz +Source1083: modello.tar.xz +Source1084: moditect.tar.xz +Source1085: modulemaker-maven-plugin.tar.xz +Source1086: mojo-parent-pom.tar.xz +Source1087: objenesis.tar.xz +Source1088: opentest4j.tar.xz +Source1089: osgi-annotation.tar.xz +Source1090: osgi-cmpn.tar.xz +Source1091: osgi-core.tar.xz +Source1092: plexus-archiver.tar.xz +Source1093: plexus-build-api.tar.xz +Source1094: plexus-cipher.tar.xz +Source1095: plexus-classworlds.tar.xz +Source1096: plexus-compiler.tar.xz +Source1097: plexus-components-pom.tar.xz +Source1098: plexus-containers.tar.xz +Source1099: plexus-interpolation.tar.xz +Source1100: plexus-io.tar.xz +Source1101: plexus-languages.tar.xz +Source1102: plexus-pom.tar.xz +Source1103: plexus-resources.tar.xz +Source1104: plexus-sec-dispatcher.tar.xz +Source1105: plexus-utils.tar.xz +Source1106: qdox.tar.xz +Source1107: servlet-api.tar.xz +Source1108: sisu-inject.tar.xz +Source1109: sisu-mojos.tar.xz +Source1110: sisu-plexus.tar.xz +Source1111: slf4j.tar.xz +Source1112: testng.tar.xz +Source1113: univocity-parsers.tar.xz +Source1114: velocity-engine.tar.xz +Source1115: xbean.tar.xz +Source1116: xmlunit.tar.xz +Source1117: xmvn-generator.tar.xz +Source1118: xmvn.tar.xz +Source1119: xz-java.tar.xz BuildRequires: byaccj BuildRequires: gcc @@ -271,6 +272,9 @@ sed -i s/_xmvngen_/_jpbgen_/ %{buildroot}%{_fileattrsdir}/jpbgen.attr %doc AUTHORS %changelog +* Mon Dec 11 2023 Mikolaj Izdebski - 1.14.0-1 +- Update to upstream version 1.14.0 + * Wed Oct 25 2023 Mikolaj Izdebski - 1.13.0-3 - Dynamically generate bundled Provides diff --git a/sources b/sources index 432573a..6d79dbe 100644 --- a/sources +++ b/sources @@ -1,13 +1,13 @@ -SHA512 (javapackages-bootstrap-1.13.0.tar.xz) = 713be16980287ec1e35d70170b4cd5a01e63c7ce756cada485e9fa3ef1d766c4739e0aa419e075f375d84b0495ab01d5ce9b846fd0bf39e419862689dcd2771c +SHA512 (javapackages-bootstrap-1.14.0.tar.xz) = 1b1c18ba9c10bacfbb85b03323050b085bd30e4d5b4bd1123ea7751b94ee0ee38c3736022e6ace55f1afff0f7d19547cf64d99f903605c65659e3db6dd4c6dbf SHA512 (ant.tar.xz) = 30e4ef50010f04c64c60777f30079099c11a2e3dbdd71f2987dfec3912d2716a802979713d851c9a5f6f324431997a42b77f7739cd9e4fb5d3816cc614271ed4 SHA512 (aopalliance.tar.xz) = 1f9a8a63edb76a73a40dcb3edee72fad069d4b509cc4b702cb9af9aaf694dadeef01fa7d20c285c6c37f7cb030643d267e3a1b834567785399fc986da474e626 SHA512 (apache-pom.tar.xz) = b1e8a0d57bc98d9a84dd0c7c69e0f8522d353eacaeb8645c99c84a1041fed0c237710ebd0afe4e4d4726ff536e4c5b009c2d827386aadcdd675ec404841b313c SHA512 (apiguardian.tar.xz) = c3d75e88a983eb53c06007fd01f11c89083e119d2d4ed5d0e97644f45d5e451fd611bee493d720d011562ae29e7cdfd1d6fb4621d17c9db4b61430e62afea2bf -SHA512 (asm.tar.xz) = 3a64da5b2dfcb2ef7fd9678307f06a82e2089b51ae5c28fd735f248bf7aea6220d4c5172c228cfb822e2f77dc1e98c51d463bd691b597335307e6aa8fec45e36 +SHA512 (asm.tar.xz) = 5503b1493a3beb60d6471d008d32563ae8d1dc2c77ec1c68645a8bc7b588e77725051c50fca2a045b7ceb9ad8ce4286249be06b32509ebc2e67e7d11eaacad4b SHA512 (assertj-core.tar.xz) = ff74f1a24f074eeea93a2ed42852630fd813d7a78ecf90f818a1504eb054e113c48a81c32f715c2b7bf3eea745819f05b235f400cb4116e8d3c907f7d7cdca83 SHA512 (bnd.tar.xz) = bb163a650a6f92f88051a6d169d40a2b1b103d12f5e219be55eac16acdf23868ab8544610891c7b0bd58e79a7c8d7dd5fc238b2bc5195b4510f764593966ba2a SHA512 (build-helper-maven-plugin.tar.xz) = e4e260587d5a3ef98064015b3dfc4f8be04a53513718bcfc1e57dba74b13be573d3766b23a9c00cc63f25e8300ff812c6560a28ad5bd537662d0ccb0d1c42925 -SHA512 (byte-buddy.tar.xz) = dfcfffe72a47679ec8dbf152ad5dc3edb5c5614ad97a89e625dba94d44311d04cecf28256f0996652a6bbd413197eec1f90acc4128826865f1633d0b1e0f8f63 +SHA512 (byte-buddy.tar.xz) = 2893213db78ec8c314edbc3588a94f1a2fc15a6ab760bab5495120299913272df743638d3d722bca80e1f59cabf6a74c61c9446a98c5931a429f1d9835226a40 SHA512 (cdi.tar.xz) = 334ffd958aa8915eabeaf8c554cffc0e636e73538d2efa2ddb405903814f9c3a0be99fbb325f2bd6a0207d71dcac7f5d1b82efb962b1ac24db263379c7f759ac SHA512 (cglib.tar.xz) = 2938c98ed74a95828a1353afae1e79b43725899e845a3e040c2fd9705f87fd523bb9c04f36d8ad1beec21c725bd85d40eeebc30e161334da0469b854f263e9c9 SHA512 (common-annotations-api.tar.xz) = 2df37b149dd687bff64064ea393e8e93fe907079966c367963fe983ea6edd612f5208113e2432a515d68f2d3d6892a12582bfe1e304b8c71ebe2acbb35c3b2c4 @@ -20,7 +20,7 @@ SHA512 (commons-io.tar.xz) = 5cac83cb8157e12ead6fbaea2bacf0f41a6742ad35a73c937ab SHA512 (commons-jxpath.tar.xz) = 6ad0e7e2f5f3dd377d78af1a49f5b7fa41ad66b71b80f73ac822e49a006b79dd06ee872c508dc8eb7696ef71bea2ee89c186b6dfc2cdcc4cc2da778f6950d2f5 SHA512 (commons-lang.tar.xz) = 9ec17d2cc8c8eb2f0ab26673dbc5ccb61be25e0f485c59ddeef24cb9467fc89a1567b2eacf191edfe3ed7b0f9d4218faf9df1aaec962e610c51341e898620389 SHA512 (commons-logging.tar.xz) = 78a6b9e0139bb2d365438fa74e88f55fbeccb2e4a526592869c1a23719bd6340e25ecbb04888f4f284cc4fe2e153122b56f56f4af479d45c8b77c7c0708e39f3 -SHA512 (commons-parent-pom.tar.xz) = 92f69958a25928f76b53c8fc86136dd2661916a39b3354f65c8b17f916fa16d73913e666b120306d6b18c9c49ce5cb62aa3ceadb49e5336f20886677a22fef06 +SHA512 (commons-parent-pom.tar.xz) = 406a6158bee666a69cc7283b183fc7fda954119ee40fb6982dcef6be27d3e5307c912daa5cc39a5588f3256ebad7cdd2abde34c95f4fbb968b7dcfb608304c34 SHA512 (cup.tar.xz) = 8624696fed9ed0045873a48a75f55f248faa9b3cfc5573182b4c67469d43dfde55d4e676dad6636d31c1f3729456e29b2facc4754e5d4caaaf39dfe6e1fd6af5 SHA512 (disruptor.tar.xz) = 370c5e9829b92fd948064ed61f907407d42b22aff6fa75f943d7e51af796a18d98e93005a5ce2fc780031405b1732b9d869bd36c9d4b114c8fad411598e59275 SHA512 (easymock.tar.xz) = 48489da810750bd9351327584f78d58cf4965ac22341ad4d964edead04c2665a5ea003c245c644f52a04f75e3b046ed3562e483657355ad414ecfc5ed69f965a @@ -37,8 +37,9 @@ SHA512 (httpcomponents-parent-pom.tar.xz) = 90a9ad4d484fa04f0ad0b1631a45133a9795 SHA512 (injection-api.tar.xz) = a0faaa4aa4a94d1cf01387b9d327da2be5d5c016b6fa6aca3aed0d75d4bec2c9a04df12fdc3c67f17b03918584ab5261f8dc20ab620f1289e34f8ad8ee23c9a6 SHA512 (jaf-api.tar.xz) = 8b3f729164dbaa8cfcba047d5fb1d4134301ecc525644f3d28f9196002fedcf81fb22797adf5b05cfe80a46793093b5e5f38104732e3d3384866f003da66cb0e SHA512 (jansi.tar.xz) = 374f5ba2f55abd9ff5e15f009f94e9878bc077a62e0bd3ae3b18c5089c754478eefa991d8a4331330e052f7a65e551995821308cdb14e260dd84d6236945010e -SHA512 (javacc.tar.xz) = 0c5b6fe46831b003d22f4a273cea53be1c7f218c6f53315c2077ac1e55d84765c94f6b684962edc37545845ad06d8c56dec05c7617280afba56ae0293307653c +SHA512 (javacc.tar.xz) = 130bbd063d6275f23affd74f289307bf4a65cc73928485b20b7fad9e1dc8a1202c4c84a85ec4716e9a8899dd01dbef6ebb92edf2f07252d2b41a5bedc60169dd SHA512 (javacc-maven-plugin.tar.xz) = 3b50527e56e2bb1e709b5bc28bf79a0e28085bd0f72ab0f155d497b757986bcaa10a2a5af808e54aa6996521a25c26c5836f9b13d8f96684627a3dd32c9e31f9 +SHA512 (javaparser.tar.xz) = d09f12844ee544ffacf059cda8e266618e98251f52bb1d31375522914bb1bd61f4713906b5d16921ff1f0e6f7379127321015a8000c2a4611aee2688833dd9b3 SHA512 (jcommander.tar.xz) = 3a9a20aa0b28581cd6cfd489a7121b62cbbd75f97feba2e20184a140e66ea34396aa6d0d640bdb75aca79346267a2b8615320ac3a2a98537b1a0caff91e072dd SHA512 (jctools.tar.xz) = f62c591f094c27dc59e6a4666377367f8ab6829540a5a7912c5007d5403be1db7d75b47c0636589c1df4ee252fdae89987d8c89e53d903347ec0862d39f3308c SHA512 (jdom.tar.xz) = 1a36168a0b8f2b9057855198e097fcb50992d9d79892cdeeb20eada43ad7a79acf4fda0a06496b8a36cb537577575504efc066774912a1c4d08288e716232579 @@ -81,6 +82,7 @@ SHA512 (maven-wagon.tar.xz) = 8274ce5922016806359e67ce154b4a6649e6825486a1cf3d18 SHA512 (maven.tar.xz) = ee98b4fdf245beef58c1f1583991d85e418055b3e28471ce77f4ce497cb365ce56630e83c74ad246b900fe1b6fd9079f423c6c05ff0d8789e7571967f69e2b71 SHA512 (mockito.tar.xz) = 8fefdeae3e7bcb41c97080aa208bc9bb6fa787235cc572990ba376c9995f60fa7ab7534e88701da36b00b49eb7b5f2b1c479bbf0e9c86fc1923a7eddc68b4c77 SHA512 (modello.tar.xz) = a371fe1369d5453fb3a928f6053c36f1f39df970f322804e1daeef2b0c5f87556e42ff22508a57104d16e6c81584c77b34f6bbba6c7cc0f7084402767998ae82 +SHA512 (moditect.tar.xz) = b17ea518671cfcfe52ec5a50253577b0d82281c3517a5dca93bbbb868438124f7e7c91eebde1d4816058d475d51606618bcb7040c97087844b001b1ded0c583d SHA512 (modulemaker-maven-plugin.tar.xz) = a9d93ddd47419f5de597babf648e509084e7dd4a5c18ef8aed646fbcff886d20f2a7b297463ebaa1cf70f7e26bf3690c7a9b60e5e47fae6b7392807a133302ac SHA512 (mojo-parent-pom.tar.xz) = db43765de7cdb23ffb82a1f1b21b35af1faeccb3da9ef0d164395fa6cb08125d2ef626a652f9dc41a0d53fc76f1e1766f42fcf8a5748938a51a38174da781d24 SHA512 (objenesis.tar.xz) = eb432f56318ed70aae56cb94b98818c92f30e7dd0d221eab1bfa15898b663da121c0ab4ffe283b4bf03ebadf411bc2ec742c31ca1a01f6e2c9da4a1b6798d912 @@ -88,7 +90,6 @@ SHA512 (opentest4j.tar.xz) = 3a5a80d7c982a7f024f169048833c4aa989f7f57e5ddeb9bd90 SHA512 (osgi-annotation.tar.xz) = 96d0bc61978cc223100d447bb291d6b8ccf2a56356dbabcc7f31d4eccfb3dcdc9c86400867478676087feb0bd7767956c6819e63728c22c5f063399f38abe90c SHA512 (osgi-cmpn.tar.xz) = 1be16086c97a7375b89516d86c0381ed5c9f1c86b4b2c3f60e02d974de588f7de1b29f6b8c99b1392d449559588d64817f4de92e3a27ef6b544538881eb03831 SHA512 (osgi-core.tar.xz) = caf409302ff430f6b4d13155152a5b8524a828c88f6260a745c041fa37c44628894d3649620e381f8a407a49402b30877a37613a0bb129c236587210a9475759 -SHA512 (oss-parent-pom.tar.xz) = 1b7559cf4ab9a5e4b86caab4247ccbba7136f893662475e08b3c989956a2d50fb44a18a98c9ab7595c3aa84415b94ff8f74f4255c1764006509120cb08e3e641 SHA512 (plexus-archiver.tar.xz) = 8aeae3d8aab640d55503fd41c27e5fba333dcc8bdac305821bf8ee5b362b41fb76d9c982c803f663b063e8b6958455792a3ef997ab7fb9fa87b59c4eabfcfe07 SHA512 (plexus-build-api.tar.xz) = 1908f360b9926a752dd3950d85e9aa6cbb0f5ebfd92198ed4d04372e5f47a3d5aa771b25b75f6f4dea50ef909b1c4b5084e7b8a40a260c3c5dbfc12b43bf05a7 SHA512 (plexus-cipher.tar.xz) = 28243457ee852513938fcff991dfa59098845145807bc0682a7ff815591a444bd89dd812f72b0fff8cfbb21b26d310c4653c05467bae3fb55d0995fe7bd1dfb9 From 51cd7cab0b1f019d8541ffa6a7eebcac53c8d879 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jan 2024 23:32:33 +0000 Subject: [PATCH 66/77] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- javapackages-bootstrap.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/javapackages-bootstrap.spec b/javapackages-bootstrap.spec index a0a5acd..5e30625 100644 --- a/javapackages-bootstrap.spec +++ b/javapackages-bootstrap.spec @@ -23,7 +23,7 @@ Name: javapackages-bootstrap Version: 1.14.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A means of bootstrapping Java Packages Tools # For detailed info see the file javapackages-bootstrap-PACKAGE-LICENSING License: Apache-1.1 AND Apache-2.0 AND (Apache-2.0 OR EPL-2.0) AND (Apache-2.0 OR LGPL-2.0-or-later) AND BSD-2-Clause AND BSD-3-Clause AND CC-BY-2.5 AND CC0-1.0 AND CPL-1.0 AND EPL-1.0 AND EPL-2.0 AND (EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0) AND LicenseRef-Fedora-Public-Domain AND MIT AND Plexus AND SMLNJ AND Saxpath AND xpp @@ -272,6 +272,9 @@ sed -i s/_xmvngen_/_jpbgen_/ %{buildroot}%{_fileattrsdir}/jpbgen.attr %doc AUTHORS %changelog +* Sat Jan 20 2024 Fedora Release Engineering - 1.14.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Mon Dec 11 2023 Mikolaj Izdebski - 1.14.0-1 - Update to upstream version 1.14.0 From c337bf1009996718223581e317b2b4831e117009 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 24 Jan 2024 23:12:23 +0000 Subject: [PATCH 67/77] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- javapackages-bootstrap.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/javapackages-bootstrap.spec b/javapackages-bootstrap.spec index 5e30625..63a68b2 100644 --- a/javapackages-bootstrap.spec +++ b/javapackages-bootstrap.spec @@ -23,7 +23,7 @@ Name: javapackages-bootstrap Version: 1.14.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A means of bootstrapping Java Packages Tools # For detailed info see the file javapackages-bootstrap-PACKAGE-LICENSING License: Apache-1.1 AND Apache-2.0 AND (Apache-2.0 OR EPL-2.0) AND (Apache-2.0 OR LGPL-2.0-or-later) AND BSD-2-Clause AND BSD-3-Clause AND CC-BY-2.5 AND CC0-1.0 AND CPL-1.0 AND EPL-1.0 AND EPL-2.0 AND (EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0) AND LicenseRef-Fedora-Public-Domain AND MIT AND Plexus AND SMLNJ AND Saxpath AND xpp @@ -272,6 +272,9 @@ sed -i s/_xmvngen_/_jpbgen_/ %{buildroot}%{_fileattrsdir}/jpbgen.attr %doc AUTHORS %changelog +* Wed Jan 24 2024 Fedora Release Engineering - 1.14.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sat Jan 20 2024 Fedora Release Engineering - 1.14.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 0dcb43a29828f7fb4653b092e62f41c95315af4a Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 7 Feb 2024 18:18:31 +0100 Subject: [PATCH 68/77] Update to upstream version 1.15.0 --- .gitignore | 3 + javapackages-bootstrap-PACKAGE-LICENSING | 3 +- javapackages-bootstrap.spec | 38 +++++++------ sources | 71 ++++++++++++------------ 4 files changed, 62 insertions(+), 53 deletions(-) diff --git a/.gitignore b/.gitignore index d351ff1..89a2883 100644 --- a/.gitignore +++ b/.gitignore @@ -154,3 +154,6 @@ /javapackages-bootstrap-1.14.0.tar.xz /javaparser.tar.xz /moditect.tar.xz +/javapackages-bootstrap-1.15.0.tar.xz +/plexus-testing.tar.xz +/plexus-xml.tar.xz diff --git a/javapackages-bootstrap-PACKAGE-LICENSING b/javapackages-bootstrap-PACKAGE-LICENSING index 905784a..8a47217 100644 --- a/javapackages-bootstrap-PACKAGE-LICENSING +++ b/javapackages-bootstrap-PACKAGE-LICENSING @@ -104,7 +104,9 @@ # plexus-pom has license: Apache-2.0 # plexus-resources has license: Apache-2.0 AND MIT # plexus-sec-dispatcher has license: Apache-2.0 +# plexus-testing has license: Apache-2.0 # plexus-utils has license: Apache-1.1 AND Apache-2.0 AND BSD-3-Clause AND LicenseRef-Fedora-Public-Domain AND xpp +# plexus-xml has license: Apache-1.1 AND Apache-2.0 AND xpp # qdox has license: Apache-2.0 # servlet-api has license: Apache-2.0 AND (EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0) # sisu-inject has license: BSD-3-Clause AND EPL-1.0 @@ -114,7 +116,6 @@ # testng has license: Apache-2.0 # univocity-parsers has license: Apache-2.0 # velocity-engine has license: Apache-2.0 -# xbean has license: Apache-2.0 # xmlunit has license: Apache-2.0 # xmvn has license: Apache-2.0 # xmvn-generator has license: Apache-2.0 diff --git a/javapackages-bootstrap.spec b/javapackages-bootstrap.spec index 63a68b2..3e369e7 100644 --- a/javapackages-bootstrap.spec +++ b/javapackages-bootstrap.spec @@ -22,8 +22,8 @@ #global git_short_hash %(echo %{git_hash} | cut -b -7) Name: javapackages-bootstrap -Version: 1.14.0 -Release: 3%{?dist} +Version: 1.15.0 +Release: 1%{?dist} Summary: A means of bootstrapping Java Packages Tools # For detailed info see the file javapackages-bootstrap-PACKAGE-LICENSING License: Apache-1.1 AND Apache-2.0 AND (Apache-2.0 OR EPL-2.0) AND (Apache-2.0 OR LGPL-2.0-or-later) AND BSD-2-Clause AND BSD-3-Clause AND CC-BY-2.5 AND CC0-1.0 AND CPL-1.0 AND EPL-1.0 AND EPL-2.0 AND (EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0) AND LicenseRef-Fedora-Public-Domain AND MIT AND Plexus AND SMLNJ AND Saxpath AND xpp @@ -148,21 +148,22 @@ Source1101: plexus-languages.tar.xz Source1102: plexus-pom.tar.xz Source1103: plexus-resources.tar.xz Source1104: plexus-sec-dispatcher.tar.xz -Source1105: plexus-utils.tar.xz -Source1106: qdox.tar.xz -Source1107: servlet-api.tar.xz -Source1108: sisu-inject.tar.xz -Source1109: sisu-mojos.tar.xz -Source1110: sisu-plexus.tar.xz -Source1111: slf4j.tar.xz -Source1112: testng.tar.xz -Source1113: univocity-parsers.tar.xz -Source1114: velocity-engine.tar.xz -Source1115: xbean.tar.xz -Source1116: xmlunit.tar.xz -Source1117: xmvn-generator.tar.xz -Source1118: xmvn.tar.xz -Source1119: xz-java.tar.xz +Source1105: plexus-testing.tar.xz +Source1106: plexus-utils.tar.xz +Source1107: plexus-xml.tar.xz +Source1108: qdox.tar.xz +Source1109: servlet-api.tar.xz +Source1110: sisu-inject.tar.xz +Source1111: sisu-mojos.tar.xz +Source1112: sisu-plexus.tar.xz +Source1113: slf4j.tar.xz +Source1114: testng.tar.xz +Source1115: univocity-parsers.tar.xz +Source1116: velocity-engine.tar.xz +Source1117: xmlunit.tar.xz +Source1118: xmvn-generator.tar.xz +Source1119: xmvn.tar.xz +Source1120: xz-java.tar.xz BuildRequires: byaccj BuildRequires: gcc @@ -272,6 +273,9 @@ sed -i s/_xmvngen_/_jpbgen_/ %{buildroot}%{_fileattrsdir}/jpbgen.attr %doc AUTHORS %changelog +* Wed Feb 07 2024 Mikolaj Izdebski - 1.15.0-1 +- Update to upstream version 1.15.0 + * Wed Jan 24 2024 Fedora Release Engineering - 1.14.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild diff --git a/sources b/sources index 6d79dbe..ab53210 100644 --- a/sources +++ b/sources @@ -1,38 +1,38 @@ -SHA512 (javapackages-bootstrap-1.14.0.tar.xz) = 1b1c18ba9c10bacfbb85b03323050b085bd30e4d5b4bd1123ea7751b94ee0ee38c3736022e6ace55f1afff0f7d19547cf64d99f903605c65659e3db6dd4c6dbf +SHA512 (javapackages-bootstrap-1.15.0.tar.xz) = 19a64926f6b9932cc623f96db7633a6f6b4f408fe155eeffee6ebaf8b8431fc8bda0ee702ce747c002ec581d364d0330700b2b208d051f2d67b1d4a937d729a1 SHA512 (ant.tar.xz) = 30e4ef50010f04c64c60777f30079099c11a2e3dbdd71f2987dfec3912d2716a802979713d851c9a5f6f324431997a42b77f7739cd9e4fb5d3816cc614271ed4 SHA512 (aopalliance.tar.xz) = 1f9a8a63edb76a73a40dcb3edee72fad069d4b509cc4b702cb9af9aaf694dadeef01fa7d20c285c6c37f7cb030643d267e3a1b834567785399fc986da474e626 -SHA512 (apache-pom.tar.xz) = b1e8a0d57bc98d9a84dd0c7c69e0f8522d353eacaeb8645c99c84a1041fed0c237710ebd0afe4e4d4726ff536e4c5b009c2d827386aadcdd675ec404841b313c +SHA512 (apache-pom.tar.xz) = 5aa6bcd3e39a0083e9ee714774734d4066fe571722e543ec08f9e2aac27653b37a9e0fb67d62bbce050d0f51661d842ecb4724208ed200068ea0128af7471a7a SHA512 (apiguardian.tar.xz) = c3d75e88a983eb53c06007fd01f11c89083e119d2d4ed5d0e97644f45d5e451fd611bee493d720d011562ae29e7cdfd1d6fb4621d17c9db4b61430e62afea2bf SHA512 (asm.tar.xz) = 5503b1493a3beb60d6471d008d32563ae8d1dc2c77ec1c68645a8bc7b588e77725051c50fca2a045b7ceb9ad8ce4286249be06b32509ebc2e67e7d11eaacad4b SHA512 (assertj-core.tar.xz) = ff74f1a24f074eeea93a2ed42852630fd813d7a78ecf90f818a1504eb054e113c48a81c32f715c2b7bf3eea745819f05b235f400cb4116e8d3c907f7d7cdca83 SHA512 (bnd.tar.xz) = bb163a650a6f92f88051a6d169d40a2b1b103d12f5e219be55eac16acdf23868ab8544610891c7b0bd58e79a7c8d7dd5fc238b2bc5195b4510f764593966ba2a -SHA512 (build-helper-maven-plugin.tar.xz) = e4e260587d5a3ef98064015b3dfc4f8be04a53513718bcfc1e57dba74b13be573d3766b23a9c00cc63f25e8300ff812c6560a28ad5bd537662d0ccb0d1c42925 +SHA512 (build-helper-maven-plugin.tar.xz) = a2e74a87fab996f9ff2b40ec90cd9ea434dd8ed72ac213b007a96ea0b3c5eddc29e42ed2fc0879d90532043e7dab00486311adadccda74dee195b0c4421aa00d SHA512 (byte-buddy.tar.xz) = 2893213db78ec8c314edbc3588a94f1a2fc15a6ab760bab5495120299913272df743638d3d722bca80e1f59cabf6a74c61c9446a98c5931a429f1d9835226a40 SHA512 (cdi.tar.xz) = 334ffd958aa8915eabeaf8c554cffc0e636e73538d2efa2ddb405903814f9c3a0be99fbb325f2bd6a0207d71dcac7f5d1b82efb962b1ac24db263379c7f759ac SHA512 (cglib.tar.xz) = 2938c98ed74a95828a1353afae1e79b43725899e845a3e040c2fd9705f87fd523bb9c04f36d8ad1beec21c725bd85d40eeebc30e161334da0469b854f263e9c9 SHA512 (common-annotations-api.tar.xz) = 2df37b149dd687bff64064ea393e8e93fe907079966c367963fe983ea6edd612f5208113e2432a515d68f2d3d6892a12582bfe1e304b8c71ebe2acbb35c3b2c4 SHA512 (commons-beanutils.tar.xz) = 8d88c5d46f0536dc952da85fe3554f4d682b03eba4adcd01d9726821d03193d236a5bb89c3b3469c86a767bf969628bdce6916b48a6a4aa0952ae36e1a8a0831 -SHA512 (commons-cli.tar.xz) = 9d9ea6a2a44b9c25f594cd3d7a2b1babaf523680d9b5ff97e9d1f8babfc87c24c07061a9160eaad637630dcd2e7234b89069cbf116da11f01b30496a981bfddb +SHA512 (commons-cli.tar.xz) = ab4f0a5f15e7c45ec012b0377c7980c63f9f596aa635993741abfc51ccda0b76129df6ed729acb22a37362a4fa1e8b212e00fe43720096d483204af6dc293647 SHA512 (commons-codec.tar.xz) = 48f031385e3e540d3ad8388d9c43db4f9c0cbdf86bd73d730e7dec79d4121c67cc9d13751acddf01ea194653033dbc37dbd2f6d5c1c0316d585c4fe0e56a61fa SHA512 (commons-collections.tar.xz) = 5033b96edd59c6eba0c6fcb2208755e0a317a66cc218df7e5ad05fa063055085ac0ed683728a979b54ddb10b71c7a0d7fbb2a3249bca361be7a428d84a049f56 SHA512 (commons-compress.tar.xz) = ffaa8cc7f16304994f4a8da47f4d6688ea7e0cfdf10a21cb226e3b7c2b2ea490e44a2fb4996fac132f7a98eaf429ff45d9034f7f64497ee44b362d8ec74d3e19 SHA512 (commons-io.tar.xz) = 5cac83cb8157e12ead6fbaea2bacf0f41a6742ad35a73c937ab45a5143ae7343f4f2805dd2872b930d7c8a7dfaf93019d24b205a45c3c520054bd792dd3cc977 SHA512 (commons-jxpath.tar.xz) = 6ad0e7e2f5f3dd377d78af1a49f5b7fa41ad66b71b80f73ac822e49a006b79dd06ee872c508dc8eb7696ef71bea2ee89c186b6dfc2cdcc4cc2da778f6950d2f5 -SHA512 (commons-lang.tar.xz) = 9ec17d2cc8c8eb2f0ab26673dbc5ccb61be25e0f485c59ddeef24cb9467fc89a1567b2eacf191edfe3ed7b0f9d4218faf9df1aaec962e610c51341e898620389 -SHA512 (commons-logging.tar.xz) = 78a6b9e0139bb2d365438fa74e88f55fbeccb2e4a526592869c1a23719bd6340e25ecbb04888f4f284cc4fe2e153122b56f56f4af479d45c8b77c7c0708e39f3 -SHA512 (commons-parent-pom.tar.xz) = 406a6158bee666a69cc7283b183fc7fda954119ee40fb6982dcef6be27d3e5307c912daa5cc39a5588f3256ebad7cdd2abde34c95f4fbb968b7dcfb608304c34 +SHA512 (commons-lang.tar.xz) = 0afa9c1c358804d820997bd066b8fe25b839eb73f0c20812ff5a0f3a3ab40ee27cd24b2ce732bd48190def8af6648ec22acc479f8bf49c8697dbd00e36398c41 +SHA512 (commons-logging.tar.xz) = 89cb6279d2b19852446532e5574c49218305527063a044f4d89af123e47b3b76ab43e93201bd35f59a58885101a69cc4d32f0e6e7e24800132c88678f30894d2 +SHA512 (commons-parent-pom.tar.xz) = 3f83842a7d19efb1d83de0108cefe79a299f86d87b6984e1885fd7c8d74d8f8211486bc9e6034939fc1227c89111dc245a5d042d2d9fbe1e3f2ecaaac55b87c5 SHA512 (cup.tar.xz) = 8624696fed9ed0045873a48a75f55f248faa9b3cfc5573182b4c67469d43dfde55d4e676dad6636d31c1f3729456e29b2facc4754e5d4caaaf39dfe6e1fd6af5 SHA512 (disruptor.tar.xz) = 370c5e9829b92fd948064ed61f907407d42b22aff6fa75f943d7e51af796a18d98e93005a5ce2fc780031405b1732b9d869bd36c9d4b114c8fad411598e59275 SHA512 (easymock.tar.xz) = 48489da810750bd9351327584f78d58cf4965ac22341ad4d964edead04c2665a5ea003c245c644f52a04f75e3b046ed3562e483657355ad414ecfc5ed69f965a SHA512 (extra-enforcer-rules.tar.xz) = 61598a329ffefc820ebf45ade558dcd89f7ef9a5501c932625404e93c84c16b96610d3d3e9f3ba96c2fc0fc65af765686b999ef07e7dbb076facd6b804ea06b0 -SHA512 (felix-parent-pom.tar.xz) = c8d5ec33af31d4fc51d24245576f4d081aafb073339739a2689dc221c42fbe0dc4411e8c97448a21ce8d517dea940281fcfd2b7c6acddff0e9b13d7d3630b87f +SHA512 (felix-parent-pom.tar.xz) = 3e9cd28d4c3757d2bf0f598bfd44e7faa7eee4545840ee3e9f6c7f70448b15b1282ecb1826648f29c60ea33bc894fb28a9ca8d49183cf27b082aa44573a087bf SHA512 (felix-utils.tar.xz) = 39b32a2bb3b527b040796c06632d916ed53feaf728eee8902bab712d889d6c9118d925f1b957bc5ee66a4cf6be58e43f4992c7636f61d0c3c385c23f2ffc4a9c SHA512 (fusesource-pom.tar.xz) = 1fe5d089eac6dbd2885d3ce1174e313d33e9b02ad24e700e033895bd73dace81ff8cccf7382f51ec8a3f0aa5cec515bb3018fa8a2f62cf7fcfc077991ba65f51 -SHA512 (guava.tar.xz) = b87dffe95e0775789435ca0541140922249dbd7ef73645fe3ff975cd29923df26b755cae1a9cbd11dbfd82ae1e540bff1e57a03fc041c1d852640a9510757d78 +SHA512 (guava.tar.xz) = 493e4c2b7b336499528d21d4cd832625c753dd136e4b8043ded2825abe25482a2bdea6b9e6da7f38bcce47c19cb844dccb03adf0c8f5ace3ec927fe2fa6a5435 SHA512 (guice.tar.xz) = ed7b98e8317c622dad0b6820a50ecc49d6153534250844fbde1dbcb60fc51d396267f5590c7a4fe06de020d86be7712f7d6edbd718c9590e406ff74b1e0ee71c SHA512 (hamcrest.tar.xz) = 2049a59774773c2369e4c561545067524402a420bace29dc8cffac0fca8b6aa870e3de1882cc4a35549b67269ecbfc54e335ffd0c599ddb4b56341948da777a2 -SHA512 (httpcomponents-client.tar.xz) = 2d6ad230847a7b256760623c57d909aae4013a987bc7fde8da4bba13047c6062866bb027254564036ffaef8e6d1f8745ddd9fdc0016f0e7c3904c55f608d9849 -SHA512 (httpcomponents-core.tar.xz) = 6b643a3808e966b3f1d2dcdc5539d1d547f6e7460eef2dab92aa5ff161db1f4c7e9ddfda6539c6d5efe8b15751461410d949780d7d6e4880eee7776ebbe3a976 +SHA512 (httpcomponents-client.tar.xz) = 710cc30df9f2cfb38ee4b6300e340e82a74cf351f7b8f169199891a231bdd477dbccc4ce96be985c8ef2d7afc78bb793d8e9ecfd86b2957cf673e80199509715 +SHA512 (httpcomponents-core.tar.xz) = 3a876e6966c6fb7ef7c071d0c65c541fa2c3fe164200c3ef86fe273ccaa6a982a9b1f400ec5f5146be01fca338c9b5d8b516441f9ea1b281997d5b36ebb1a2ab SHA512 (httpcomponents-parent-pom.tar.xz) = 90a9ad4d484fa04f0ad0b1631a45133a97950b5a0cb22b46f4bd36bcf1d5811c38472b0c1c77a052301b1c502022ef21371e1f921bed104c900e2631127daea2 SHA512 (injection-api.tar.xz) = a0faaa4aa4a94d1cf01387b9d327da2be5d5c016b6fa6aca3aed0d75d4bec2c9a04df12fdc3c67f17b03918584ab5261f8dc20ab620f1289e34f8ad8ee23c9a6 SHA512 (jaf-api.tar.xz) = 8b3f729164dbaa8cfcba047d5fb1d4134301ecc525644f3d28f9196002fedcf81fb22797adf5b05cfe80a46793093b5e5f38104732e3d3384866f003da66cb0e @@ -41,70 +41,72 @@ SHA512 (javacc.tar.xz) = 130bbd063d6275f23affd74f289307bf4a65cc73928485b20b7fad9 SHA512 (javacc-maven-plugin.tar.xz) = 3b50527e56e2bb1e709b5bc28bf79a0e28085bd0f72ab0f155d497b757986bcaa10a2a5af808e54aa6996521a25c26c5836f9b13d8f96684627a3dd32c9e31f9 SHA512 (javaparser.tar.xz) = d09f12844ee544ffacf059cda8e266618e98251f52bb1d31375522914bb1bd61f4713906b5d16921ff1f0e6f7379127321015a8000c2a4611aee2688833dd9b3 SHA512 (jcommander.tar.xz) = 3a9a20aa0b28581cd6cfd489a7121b62cbbd75f97feba2e20184a140e66ea34396aa6d0d640bdb75aca79346267a2b8615320ac3a2a98537b1a0caff91e072dd -SHA512 (jctools.tar.xz) = f62c591f094c27dc59e6a4666377367f8ab6829540a5a7912c5007d5403be1db7d75b47c0636589c1df4ee252fdae89987d8c89e53d903347ec0862d39f3308c +SHA512 (jctools.tar.xz) = 1e03bf5a6a6321b4fa824ce1eb75f2deb21e81422a5319b85d232845f29d2907f14655d3019add693712715bb4d30cb2b33d74609fe89981d049fd27786534c0 SHA512 (jdom.tar.xz) = 1a36168a0b8f2b9057855198e097fcb50992d9d79892cdeeb20eada43ad7a79acf4fda0a06496b8a36cb537577575504efc066774912a1c4d08288e716232579 SHA512 (jdom2.tar.xz) = cba13bbb38b1f083ca0b498c9a8a22279174b2c6c51b89c7def662370fa6a3ff27feea350f2d9ebedcdaa520ffae82881e9e865e14bc011682fd2dd7aa38c1ac SHA512 (jflex.tar.xz) = 3e291540af7f4ac83c786f79d9500265d2f49d54d2a472f565f92233e536af6cd4b5d775ad0eb5990a14edf682512bdc48c7eb30bef7a243292a0165e331f393 SHA512 (jsoup.tar.xz) = db0ac8d4387d0d6e9ce7236f1e233b80e8c9543c5680b8fab48cc9c64f7e7a5c669606eb6acda6e83d841c70cbd7fb64271f57ae6073fccf34ca5e645207c683 SHA512 (jsr-305.tar.xz) = fb666ec0dd8d4fe13eb88a9ce3a7b912c66e53b152d3742133a1b81d0b9d22f4a98187e7f55bc3d3d20c47ae4b8576e03e5ed42b957d706cd951214f7216be6c SHA512 (junit4.tar.xz) = 1cdcdaa8e5329239b396412d79707b7b2052154502725b5f0a93f17d0273c235f2e63380555b2e3328c40b5d421d586d07e392401b6bf8be35ed6c06345add84 -SHA512 (junit5.tar.xz) = 3a8f7a79c94ea14007a0a5952fe7fb405776c2e6e2bb7b0712c04ee68c14b284dc855f222f74aded34fac58e1f79353d5f3c01f74be0aa15341a53ce2c06b1f5 +SHA512 (junit5.tar.xz) = fa21bbb639ac9baf7aff8c517871750bde673533995d1a304dcd0faac09abf385fdb76f5d070fff3346b1dd914faf723c3380dab3c3967154516f82131c7b966 SHA512 (log4j.tar.xz) = eb97efa3fd04944bd4f2fd29d7079e34a469f81c2b00a1f08226de962f59d5498ccd3b26b97c79992e0d60c8b75b796f789fefcfb72b2f1703ceb3a6d97577d4 SHA512 (mail-api.tar.xz) = 01bd2cfea8307954d01a8fa0f3a6da409b3975ca624c98a06cfa2a5c1ea260e1d6d0a568f0ab5167a0ed063d51032372dfe0aba89b6ef063e1a7b75fc9e6756f SHA512 (maven-antrun-plugin.tar.xz) = b66ca8409225bdf84143a0783a1ca607fed53bf7a15a04ff1200e7c63c9a9223e43625c7d955c8cf233ed0a271887faf5cc1ed9c87b39caffb9f0a389fcc37fc SHA512 (maven-apache-resources.tar.xz) = 06583b9db006e45add380d76dab419dc91a9d52b8b7cb5c30be347fb412c2124f41789a440d7e1502a88bbdf125c46b6f2e6feb96b7a31e78998ce303c40d3d3 -SHA512 (maven-archiver.tar.xz) = a2b86e79b87226d6ce654644a322745ac50208d77d00f4ff2ded1254bafc046d8acb66f44e6fab231db62955e3d406bed346368619d2adfec5f73aea84c5e86d +SHA512 (maven-archiver.tar.xz) = 34b4d384eec420e30740c05ba8c1c01acf5c8a1d2830b2f3856bdc89b6d1601b56027f73be351c474b01006ff9df9513bbf24d3b6faeed1ec170df6caf892963 SHA512 (maven-artifact-transfer.tar.xz) = eb023b00573a10f2002b2b23b048ef3c0e59d33c20cefd8915227450923f6ba7850ac9d96b73fec9b2fd0127bcfdcd08deefd47803aa7a0e6c6ccc0d40dc2fc2 SHA512 (maven-assembly-plugin.tar.xz) = 60d88bb9bc6b4a69e3002405d7d8e948d0623d0fabebacf7e7f16982f5ae02ac766d30a47ca8696607afedb9c815626e08dd45b00e5bac9d75d887e3398de4bf SHA512 (maven-bundle-plugin.tar.xz) = 4ab2d852714c9b1fe1be563e0808757222804d740eb4ac2729e6a21da522e56b013d2da852d757c03adf34523bd6817c03687711be975a69f9d6a09cb97668ec SHA512 (maven-common-artifact-filters.tar.xz) = a71240d76de7577c3dad5ea665ed1c6c605af5f2fde0eb541eba7776cf11715af48113982ae86db4f4475d274a6ea8f1789acb47d0ddf7b556fa8871a989603c -SHA512 (maven-compiler-plugin.tar.xz) = b669bdc39d131710d3bd6397245638cf1988a1f7b4025313532501e93cbbf82628759fd5655c1d6a0e9e632c39252c0b2328c80ab98386cf0376fc6710803d06 +SHA512 (maven-compiler-plugin.tar.xz) = 8bb9d6d80d83234c7ce73cae948a2e070e5e44c4f1526f680d17bc019676080d0dc752234144d19438bd97ea613435c10e3021babe29cd2c612d751d708c6246 SHA512 (maven-dependency-analyzer.tar.xz) = c9442c85aed2f882ed59e4cc4cffa67b480b3ee6c4835e561c973759f00d5da3b75bbdf21541202d262de4e78067be4ffd0eeacc76f8c1e1092b106f4fb451ff -SHA512 (maven-dependency-plugin.tar.xz) = 3f239dbd0cdcc3ff553884d03404eb1a3ab864e8d4da61ad9c56ec2ce3bcafe3876a2d38b1e6866ecc65a9233bdd17e52fa1597f9173408ef5016331d39b82d2 +SHA512 (maven-dependency-plugin.tar.xz) = d9fa700ee94e8dadd896cb2486ce6d8d599d0d3d73d540ef5017e201c4115936b706761cff360cfee10efc62d288e6b084ab5270e010ec1195a43432860e2cc4 SHA512 (maven-dependency-tree.tar.xz) = 6b510dc0096200f0309cbc7530f05e83b573f1017941f39ba5c916de2c0e8014b3a427d3fc647eeb3c53fb1a62ad1cc2f10ad37e3ec3693d304a4d107bf1550f -SHA512 (maven-enforcer.tar.xz) = 377df2d2b784817ff5feb6b698098b32409d0f93a97869fce70fcafe5bf78561b8e4b9b4c94c8c7b283dc5b24cd93ccb8b9e20f4fa22a914113c1a60f975c6ad +SHA512 (maven-enforcer.tar.xz) = 14bc87d47e0cfafa4c1f1255b2cfa400e7bf382ccdb838063780b3791b637075d7d1d029c1b3fd6a0fa040d21d5bb7734dd827c2fb19dbe7ee036eeb8f63be56 SHA512 (maven-file-management.tar.xz) = 6c6595730e3f12aa872421b7cc9c914862472614d5ed8719a153505ba9db08124053610d31d2c1340ca0387e4310e01ee3a396a87b74c3be3b3e7e85168a8e91 SHA512 (maven-filtering.tar.xz) = df581006cd8ca5b7fe6c094e797a07d57ef3fb773dc34d41568a5dae2c020cf00d79f0fee15edf566dc30527a9533c9429215684e3ffa563545192797059d6a8 SHA512 (maven-jar-plugin.tar.xz) = 9edf1c05d60307acc8eea505441bd625ea4859ccd8305ad353875b6d14cec2bd5dd2e3d3f8f0ff4f72ffed390251a1ffea22c3e0e90c4e71e583fb9f9a0c4724 -SHA512 (maven-parent-pom.tar.xz) = 839a3c66305aae256d1be7209bf49fdc339d7a2513e8e3f094896f4935dc56a0b6310e7b7081cda3bdd8cd906927834473652176de61d3fbbf9b133c1bd77c92 +SHA512 (maven-parent-pom.tar.xz) = 181952afe766e80aab10a92ce0d44c5adbd7335599273b5791c8cb87fdee8c7b9ce59b6d933b2d3507a7bf396b08db9a848d315beb7c58019740d65b6c761e0e SHA512 (maven-plugin-testing.tar.xz) = e72fcab892a00b52af06a821b3c2cff676af2bfc77ccaa851cf55017623bf89bb376a16f933fa0853087c1e8161336d21e649745ba2659c87795c4d8fad026df SHA512 (maven-plugin-tools.tar.xz) = 044c982182ec94a2f60efebbe10307c093433219c8c8f98ca2d1f79f1695467d89ccff259cbbb3788a699f9cd435e1fcd2d06fbf7ab9e78d21ff5c5741fbefdd SHA512 (maven-remote-resources-plugin.tar.xz) = 64e055300c5995a192b627badacaa911c55c47cf0c9ab1ad2c189630d29e551624a2bb6794d4f6471a4aad075491ed2c3162f3ec4b0f6f43325b880af91de469 -SHA512 (maven-resolver.tar.xz) = 861a092ec638f1493c29e3f0a0bf7a44cb2065ee2c00b99aa90bfb18a20a42378539a5274dfe15ac76a8648091186fab93dfa01b52d46589f089676b4f73a3e3 +SHA512 (maven-resolver.tar.xz) = 32175742a35bcf5af5318e35b869e977d93203da0eef5046518acbed86cfa1fde5b0629dfee7c20a33f298687963dbaca2ff47959d992c080d6691bf006e87bb SHA512 (maven-resources-plugin.tar.xz) = 44941668dd3b59dd6e22bd622534ae23baaaf7f76ea074de17a7ec21607392301ef36efe5f2efdcd39f72ea733d2cb65bd10054e7a0c969626853ee2374bbdbc SHA512 (maven-shared-incremental.tar.xz) = 77ca067f25b396ccef4f4f911323a3b8bfae11c321628e32e012fb1a4dbfbba3a7a0451789b1513aa72ea408bed4a10782f5995eff8083a6af818a97a9842379 SHA512 (maven-shared-io.tar.xz) = 0963cca6ff1acb9090d703d384f54f2b036be032f4ebdbbc59fafff806c593a17afe25cedaa562d47dcc2e0ab2b66e4ed7f3b0c66e133ebdee8ede3c81a3d2dd SHA512 (maven-shared-utils.tar.xz) = 6e8ddd06d6d537d7799de082430ef4ef9ef8238a83a65b0411d506a2bfcd5f0d3d4eba02cd27f831abb45bf67de8d3dfc4d86b980c8a73261f59fd4fcf50c487 SHA512 (maven-source-plugin.tar.xz) = 93037d9af24e2e6034ee967efea2676ba29d7966789968956bf10a94093e4e0bb0c10829490d1cf15d9cdab81bdce219f248c2b3f89c3b90d683f9aab66b73b1 -SHA512 (maven-surefire.tar.xz) = db776538e06dc3378498f36a07f91c2c2e6f295817ea6a81f19c6dbe51d598e63b6290994f75ce39af32c2f7026a94ded9928ff19d7e343f9d44bb86096b6f6f +SHA512 (maven-surefire.tar.xz) = f4fab395f421077fc7df1f038d54d12f20aaa712c4fd7a03ea2e9f681ea46d323b464b31322093f15c2845dc8fecad3e8071df210e992382ca9883325d5f2ead SHA512 (maven-verifier.tar.xz) = 2634ea238f2e2ac174a5157c960f30352ea9f07f7f31136ee47d6c1d7451c28e0867a485d1e449f5fde2c27376488fc81dcb58afc8b5229a3114d72996da5d19 SHA512 (maven-wagon.tar.xz) = 8274ce5922016806359e67ce154b4a6649e6825486a1cf3d1870cefed7cf8e3ceb7132e41df4f63fe6ab3635f8a6aad0ea8da19fc8e9f6dd1fecac53c55f254b -SHA512 (maven.tar.xz) = ee98b4fdf245beef58c1f1583991d85e418055b3e28471ce77f4ce497cb365ce56630e83c74ad246b900fe1b6fd9079f423c6c05ff0d8789e7571967f69e2b71 +SHA512 (maven.tar.xz) = 418e378a4312eb4f511043d60b8c0d2b9632794cac3c3a315ad0e6ed238bd223e817aa4c8657f2d2c4ab74ba96274d416c8cb0dbb85cbd7d9e9aee47c9646b9a SHA512 (mockito.tar.xz) = 8fefdeae3e7bcb41c97080aa208bc9bb6fa787235cc572990ba376c9995f60fa7ab7534e88701da36b00b49eb7b5f2b1c479bbf0e9c86fc1923a7eddc68b4c77 SHA512 (modello.tar.xz) = a371fe1369d5453fb3a928f6053c36f1f39df970f322804e1daeef2b0c5f87556e42ff22508a57104d16e6c81584c77b34f6bbba6c7cc0f7084402767998ae82 SHA512 (moditect.tar.xz) = b17ea518671cfcfe52ec5a50253577b0d82281c3517a5dca93bbbb868438124f7e7c91eebde1d4816058d475d51606618bcb7040c97087844b001b1ded0c583d SHA512 (modulemaker-maven-plugin.tar.xz) = a9d93ddd47419f5de597babf648e509084e7dd4a5c18ef8aed646fbcff886d20f2a7b297463ebaa1cf70f7e26bf3690c7a9b60e5e47fae6b7392807a133302ac -SHA512 (mojo-parent-pom.tar.xz) = db43765de7cdb23ffb82a1f1b21b35af1faeccb3da9ef0d164395fa6cb08125d2ef626a652f9dc41a0d53fc76f1e1766f42fcf8a5748938a51a38174da781d24 +SHA512 (mojo-parent-pom.tar.xz) = 94567865c57e4d1a8b9a6c2aa8aa2beabec142ffcd464d89a8f553af194820fb4546524e3c0723bcd7ab169007faa0c9d0410b2c363a8552ff32c79b117a2cb0 SHA512 (objenesis.tar.xz) = eb432f56318ed70aae56cb94b98818c92f30e7dd0d221eab1bfa15898b663da121c0ab4ffe283b4bf03ebadf411bc2ec742c31ca1a01f6e2c9da4a1b6798d912 SHA512 (opentest4j.tar.xz) = 3a5a80d7c982a7f024f169048833c4aa989f7f57e5ddeb9bd907aefdff937260c893b5fda1eb3646de105f7c8db45455a7438babd8007c6dbb6fe197dc5e20b5 SHA512 (osgi-annotation.tar.xz) = 96d0bc61978cc223100d447bb291d6b8ccf2a56356dbabcc7f31d4eccfb3dcdc9c86400867478676087feb0bd7767956c6819e63728c22c5f063399f38abe90c SHA512 (osgi-cmpn.tar.xz) = 1be16086c97a7375b89516d86c0381ed5c9f1c86b4b2c3f60e02d974de588f7de1b29f6b8c99b1392d449559588d64817f4de92e3a27ef6b544538881eb03831 SHA512 (osgi-core.tar.xz) = caf409302ff430f6b4d13155152a5b8524a828c88f6260a745c041fa37c44628894d3649620e381f8a407a49402b30877a37613a0bb129c236587210a9475759 -SHA512 (plexus-archiver.tar.xz) = 8aeae3d8aab640d55503fd41c27e5fba333dcc8bdac305821bf8ee5b362b41fb76d9c982c803f663b063e8b6958455792a3ef997ab7fb9fa87b59c4eabfcfe07 +SHA512 (plexus-archiver.tar.xz) = 1c99cf1b6c5d7c09ca686f839e4662d9113e41343c7b1f37ce7f934e6ba82f609b3808bdcf8fbdbc9414a46e1230b180b3ea9dbe1082e52acf7a8d3a6e9c3ccd SHA512 (plexus-build-api.tar.xz) = 1908f360b9926a752dd3950d85e9aa6cbb0f5ebfd92198ed4d04372e5f47a3d5aa771b25b75f6f4dea50ef909b1c4b5084e7b8a40a260c3c5dbfc12b43bf05a7 SHA512 (plexus-cipher.tar.xz) = 28243457ee852513938fcff991dfa59098845145807bc0682a7ff815591a444bd89dd812f72b0fff8cfbb21b26d310c4653c05467bae3fb55d0995fe7bd1dfb9 -SHA512 (plexus-classworlds.tar.xz) = ee3a84a7a2d088754b00e6431613abc9eaa52d52678ea5ce4de6e91a577332a385b6fa8e618895080aec02834754d928a77e7e1b262d1be66866bc4d9b9f9019 -SHA512 (plexus-compiler.tar.xz) = bc5f92bf8f3a5f2c9e62bb6f75414b231687ce96037dca624b5c9ca9b58cfd7cbb86a028e22ef48570e9eaf839ff53ec5dfcd388d82e4109e8e66d8d319adf6b -SHA512 (plexus-components-pom.tar.xz) = e5aab7757ecf6dc741cbbf6b65038bc5dd21978816b9a85bff9bacf94c3828ef6eb32b639c67013a64b82606199d6433e49312b68688066e1bad6295e8b90be7 -SHA512 (plexus-containers.tar.xz) = 32218f1337cc490aa4a51e918d368e36894e4952c1e1686849a23ebda92b0fe893052deea774790980e2d7271b22cd58aa83dcd7b12d07fff3bf034c86e46cc1 -SHA512 (plexus-interpolation.tar.xz) = 1e200b309979e874546ba03b6ae7fe166e2f0dfb71c0b05399ee0a986de6be171456a545719671e502968a91b1af5cfcf046fd1d2f9d9cca51aa0081466dea21 -SHA512 (plexus-io.tar.xz) = a5867929ccf8d4a3ead68007cd8432d3cd74e5714351e72a63a362bb35696cc124d598628a2c1dd20d856ddfa6cd735d5a9f59865a9fef933b32276fbb3fa145 -SHA512 (plexus-languages.tar.xz) = 315733f625988a3283458811d56fb08743dcbddeefc014ff2f7dc70a734d9d91c911f9469feeda25510206e7870563a4ac88540db4f7fe1b674dd77f2e3bd2a1 -SHA512 (plexus-pom.tar.xz) = 79620a970ba337950f59f429326ffebe0bbdcd0cd8fe380f2adf78039c4d8be9e4029874f74ba54f1dce1468a444144cfe47e0af64e32a776951086281049fb8 -SHA512 (plexus-resources.tar.xz) = 7c1cd518b75ba2b5653d5ec7f134985780450728e3a1943734bbd2b8227c6ccc73a2e076034fd46487329bd88cb4d4dfe36411482f8e8ee28aff4b1cf9c4f396 +SHA512 (plexus-classworlds.tar.xz) = 5e6544ee938063e2cba904b26ba9102619c43591711db06875651085f01f594ede3ac4ca7d3fad13a49866d418d5114050a8e92fc64dcaa1dfab4ce87dc41815 +SHA512 (plexus-compiler.tar.xz) = 6361bb24986844ed3d767b9c73a1ec4d76bd2e71cb97ca361e375bd3010efe6255e836bf4c7cd2cdb435be0b3c9704e3813f01bea8a5e1558d03959e3ad210bd +SHA512 (plexus-components-pom.tar.xz) = 663f3f28d349b62dd08bee6bd0a29736a9b48551ea84a3cf9b2f59e4f2c20ec25b774c2fac0ef3c84ee62a9a01ad3fd6d684f7e71f8bec6596a2763cba504a75 +SHA512 (plexus-containers.tar.xz) = 7d5e839ca7396e08d65ff1adc858f9504ace906a056a9eced5e7e74b21fbe844dad697bdd1b4a7ca430e223888e12e3bb2aa4559fa3b0c6969dd5ec27843ba66 +SHA512 (plexus-interpolation.tar.xz) = 458856b1a8c22acf7ee6c81dd0fa06a544f5fcadf3482316155d9c5d1e14aef2f84e40fa079336554ac1be69d97ad7efbcd1e35efa3fb16be582103455adab7e +SHA512 (plexus-io.tar.xz) = 2889233e5ee547ab7cd24c547155f1c9d69427fc2f9605836fa11ff320a89a4603d22efe2a9fe5ac48c47badf57833d03b7cd7580bf2d94b416b96e8ec391fd0 +SHA512 (plexus-languages.tar.xz) = 8b189f7c769078afa25b9a2d701eca27fb3577150362b109fe08e4aef952696345cc84736c4e2cf654916572d347c42bd082219b0f96bf16fdfbbf284fb516fb +SHA512 (plexus-pom.tar.xz) = 1e0bd9514e541fe0eaf6848be3a2834538ccb9ccac3ad9af8eae592eb7233827be8025c101cd5a64ce6fa43a2ead69ddecdb7cdb77b9b624dc3cfab48bf196ae +SHA512 (plexus-resources.tar.xz) = 9b2c4b413a9a58e97a9780a8017d2f249ee65f1c0e836171547a6f9d2482f0d5461f7bdc50c90ad2af084af1ab348371718be4ddfabd69a8fe0ffadd41e281bb SHA512 (plexus-sec-dispatcher.tar.xz) = 4c9be8c78ff3f6ab2ff1a5271602b66b61546294bdedc1e3cf5b92e8daa8365bcf721beaf12ba7ae16f2da24f506fbd04f3c9203b4627a930c359ca68f9ead4f +SHA512 (plexus-testing.tar.xz) = a0b7f716e40b1cd0abddf8e00f793c697ad63c48ed6c009d12b60cd362ee07d1ba734bd5591bdebd61abe4fba09c5a3dd18d5abb814dc3f17dbf46245e233342 SHA512 (plexus-utils.tar.xz) = 2d033a7d4c2b1a55831606261324e2c2b447908ee584d7aa187d33b431c97c5e58c1647d109d457bdacbb63f77b0f58311658de81d0384164aebbb9e0aa06730 -SHA512 (qdox.tar.xz) = e9498d99a5bb4211fc81fe1e3cecb1b4cc18db390670bc3318f8a18f042baa80a13c2438dd67b1c6d05f19dec84429850e0791802445208fe1ffc80f39755287 +SHA512 (plexus-xml.tar.xz) = 73b9077969d1c20adf11d66213f842dfabb69f64394450f478a1c10e1a6e156630428a1e959ff940ecce454c382fc8d01b15ad699f93e86c502900b9e95a0816 +SHA512 (qdox.tar.xz) = 1d3a174fbc08638a2ed1c9599d1beeaef5c4f04faee962a16593db2bf56f26a7a459e14d583189f7767878c6a6c34359872e094e9c59e2db269529ce2c3663c4 SHA512 (servlet-api.tar.xz) = a255c21c248dcb6a72022146f58e09cef03e388e6a64d97f5dfbbcfffce57fe88ef4255c2c1c1195958c70a4495b9512d6c2fff588c5e7df66394a45e44262ab SHA512 (sisu-inject.tar.xz) = 419f2065f1acdce764ffcfcfb3716fb67a3b85cf596e047f66c5a6f1831dd5d96dd99583e6949d8b7ddee433f39a9a5731fa582f930ce6828e3a5139effcfa56 SHA512 (sisu-mojos.tar.xz) = ed9462baa5f59561131d84b6ea8d114a16b99fec0c502e2698e38556f1247a3c3550172d551ad8f38107558a8c78890a09ceebfee7ca2fceffea334b3da13ded @@ -113,8 +115,7 @@ SHA512 (slf4j.tar.xz) = 434da37f9efaa3faba2ccda7781290a92904c29a24be6234c4a681bd SHA512 (testng.tar.xz) = 92d0bc00fce4956ce8cd59eaf243dec1924571ab4cfe6a6b2d191dcf296550eb133ed679d89e78304b121e747aa7ecb4911218220754a3ea91dcaeb197dce60b SHA512 (univocity-parsers.tar.xz) = 7daa3f54d26d7c64714990c7ad9d539bc7dd531917354b5b90970114e51c20aedac3e1fdd8b45e073d8c196b4ce2fa93c2f84a5498147de951ac147900ce51fa SHA512 (velocity-engine.tar.xz) = 39b00a1be5779838de10bae0a4bda353c3746f2ee0ee209b234959731987f6d375dd08d52c69197f79ee0b5b93647b91eef308b4e893c671974ddc5b9243a75a -SHA512 (xbean.tar.xz) = a88078198743d328589150f4ed9817a305898cd09b78b18659c5e82447df47807d20981f19dc7fb67a7c296b7de987b5e16c0a984a5214958104a383820239ac SHA512 (xmlunit.tar.xz) = 654c8624371b9e9879d72a46480f412f7452e7758e1586707655ebbfdee9cf24620fbf14392d8b93790dee0122cd5a9239c0bf95c4581223a658180db3273bce -SHA512 (xmvn-generator.tar.xz) = 63b40f3d4c57f18ae2aee720f87f891cce3e37a3f485b158931e35a9b653201f3f241edc580cbc357103813924e314ff4029e96d1abed73f51dbb123d04c335a +SHA512 (xmvn-generator.tar.xz) = bb7de442671233b8ea4c5a8d79cfdb17c739ac885988b6bdf627721b29ff6327e9a3e99470fdd6cce9bbb3e738fcc8dd0e89124ae6aeffc7dbaba46c81466bc5 SHA512 (xmvn.tar.xz) = 3e75b3f9a2d33eac5f5b66e78d71b18a012320001dba7ef6c5c95ae3e24183d265a2d136ccf8886619ab63beeba6b7a95760247594b49df4d764c71c34dbdfb7 SHA512 (xz-java.tar.xz) = dc4314babc66bf33e2964b35552746e30ddae136d2b717c3e498f5109154198595bc42d0b266b9e9966298d53d2f5d0196823fae193776eae27047d225cd2137 From 575807271f5db5cdd6fd14d354aeed6ee2ec9b26 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 19 Feb 2024 18:12:23 +0100 Subject: [PATCH 69/77] Update to upstream version 1.16.0 --- .gitignore | 1 + javapackages-bootstrap.spec | 12 ++++++++---- sources | 2 +- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 89a2883..8c7dee3 100644 --- a/.gitignore +++ b/.gitignore @@ -157,3 +157,4 @@ /javapackages-bootstrap-1.15.0.tar.xz /plexus-testing.tar.xz /plexus-xml.tar.xz +/javapackages-bootstrap-1.16.0.tar.xz diff --git a/javapackages-bootstrap.spec b/javapackages-bootstrap.spec index 3e369e7..31dbb0d 100644 --- a/javapackages-bootstrap.spec +++ b/javapackages-bootstrap.spec @@ -12,7 +12,7 @@ %global debug_package %{nil} -%global javaHomePath %{_jvmdir}/java-17-openjdk +%global javaHomePath %{_jvmdir}/java-21-openjdk %global mavenHomePath %{_datadir}/%{name} %global metadataPath %{mavenHomePath}/maven-metadata %global artifactsPath %{_jnidir} @@ -22,7 +22,7 @@ #global git_short_hash %(echo %{git_hash} | cut -b -7) Name: javapackages-bootstrap -Version: 1.15.0 +Version: 1.16.0 Release: 1%{?dist} Summary: A means of bootstrapping Java Packages Tools # For detailed info see the file javapackages-bootstrap-PACKAGE-LICENSING @@ -167,14 +167,14 @@ Source1120: xz-java.tar.xz BuildRequires: byaccj BuildRequires: gcc -BuildRequires: java-17-openjdk-devel +BuildRequires: java-21-openjdk-devel BuildRequires: jurand BuildRequires: rpm-devel BuildRequires: rpm-local-generator-support Requires: bash Requires: coreutils -Requires: java-17-openjdk-devel +Requires: java-21-openjdk-devel Requires: procps-ng Requires: lujavrite%{?_isa} @@ -273,6 +273,10 @@ sed -i s/_xmvngen_/_jpbgen_/ %{buildroot}%{_fileattrsdir}/jpbgen.attr %doc AUTHORS %changelog +* Mon Feb 19 2024 Mikolaj Izdebski - 1.16.0-1 +- Update to upstream version 1.16.0 +- Switch from Java 17 to Java 21 + * Wed Feb 07 2024 Mikolaj Izdebski - 1.15.0-1 - Update to upstream version 1.15.0 diff --git a/sources b/sources index ab53210..030c83e 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -SHA512 (javapackages-bootstrap-1.15.0.tar.xz) = 19a64926f6b9932cc623f96db7633a6f6b4f408fe155eeffee6ebaf8b8431fc8bda0ee702ce747c002ec581d364d0330700b2b208d051f2d67b1d4a937d729a1 +SHA512 (javapackages-bootstrap-1.16.0.tar.xz) = b118ed671766365b09c8c484b9e944a54f7139c1bf93e86e50774243c955c8699c4c71bcc81534ab8574c503b5ef5341d03ca0089d14857bfc0b7b46cb0c49b8 SHA512 (ant.tar.xz) = 30e4ef50010f04c64c60777f30079099c11a2e3dbdd71f2987dfec3912d2716a802979713d851c9a5f6f324431997a42b77f7739cd9e4fb5d3816cc614271ed4 SHA512 (aopalliance.tar.xz) = 1f9a8a63edb76a73a40dcb3edee72fad069d4b509cc4b702cb9af9aaf694dadeef01fa7d20c285c6c37f7cb030643d267e3a1b834567785399fc986da474e626 SHA512 (apache-pom.tar.xz) = 5aa6bcd3e39a0083e9ee714774734d4066fe571722e543ec08f9e2aac27653b37a9e0fb67d62bbce050d0f51661d842ecb4724208ed200068ea0128af7471a7a From cd123abb9b5991df6b5e2ef41fb70273e25e53c7 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Sat, 24 Feb 2024 17:16:48 +0100 Subject: [PATCH 70/77] Update modulemaker-maven-plugin to 1.10 --- ...maven-plugin-version-1.10-for-bundle.patch | 22 +++++++++++++++++++ javapackages-bootstrap.spec | 3 +++ sources | 2 +- 3 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 0003-Use-modulemaker-maven-plugin-version-1.10-for-bundle.patch 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 From 115c33e618dd4e651892eca524188e6d835709af Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Sat, 24 Feb 2024 23:29:21 +0100 Subject: [PATCH 71/77] Update modulemaker-maven-plugin to 1.11 --- ...Use-modulemaker-maven-plugin-version-1.11-for-bundle.patch | 4 ++-- javapackages-bootstrap.spec | 2 +- sources | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) rename 0003-Use-modulemaker-maven-plugin-version-1.10-for-bundle.patch => 0003-Use-modulemaker-maven-plugin-version-1.11-for-bundle.patch (89%) diff --git a/0003-Use-modulemaker-maven-plugin-version-1.10-for-bundle.patch b/0003-Use-modulemaker-maven-plugin-version-1.11-for-bundle.patch similarity index 89% rename from 0003-Use-modulemaker-maven-plugin-version-1.10-for-bundle.patch rename to 0003-Use-modulemaker-maven-plugin-version-1.11-for-bundle.patch index a1d97ed..d351657 100644 --- a/0003-Use-modulemaker-maven-plugin-version-1.10-for-bundle.patch +++ b/0003-Use-modulemaker-maven-plugin-version-1.11-for-bundle.patch @@ -1,7 +1,7 @@ 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 +Subject: [PATCH] Use modulemaker-maven-plugin version 1.11 for bundled provides --- @@ -16,7 +16,7 @@ index c9542ce..2b61467 100644 url=https://github.com/raphw/modulemaker-maven-plugin.git ref=modulemaker-maven-plugin-@.@ -version=1.9 -+version=1.10 ++version=1.11 -- 2.43.0 diff --git a/javapackages-bootstrap.spec b/javapackages-bootstrap.spec index 895c8d4..2f4edab 100644 --- a/javapackages-bootstrap.spec +++ b/javapackages-bootstrap.spec @@ -165,7 +165,7 @@ 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 +Patch3: 0003-Use-modulemaker-maven-plugin-version-1.11-for-bundle.patch BuildRequires: byaccj BuildRequires: gcc diff --git a/sources b/sources index 940ffb6..6589e4b 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) = ad5e6b8c0cc6021e4f2f1d885cbd7dd89b3bcef2f530f4c0520ee699f27b48ab3b865e44103c509f764c70ab733e53915d167bdef2e4c02b6d73efe930532a8d +SHA512 (modulemaker-maven-plugin.tar.xz) = e450710d87eade42f2f563b0c268a6aa556d3deca6625fb2376b750f21a00bf73becccb2e401665c95daeb13ed92c43a13a9aca0b6253a7793b88c82ab666a5f SHA512 (mojo-parent-pom.tar.xz) = 94567865c57e4d1a8b9a6c2aa8aa2beabec142ffcd464d89a8f553af194820fb4546524e3c0723bcd7ab169007faa0c9d0410b2c363a8552ff32c79b117a2cb0 SHA512 (objenesis.tar.xz) = eb432f56318ed70aae56cb94b98818c92f30e7dd0d221eab1bfa15898b663da121c0ab4ffe283b4bf03ebadf411bc2ec742c31ca1a01f6e2c9da4a1b6798d912 SHA512 (opentest4j.tar.xz) = 3a5a80d7c982a7f024f169048833c4aa989f7f57e5ddeb9bd907aefdff937260c893b5fda1eb3646de105f7c8db45455a7438babd8007c6dbb6fe197dc5e20b5 From 4670cbf297fd0636041695797246786d16253a5f Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Tue, 27 Feb 2024 16:09:25 +0100 Subject: [PATCH 72/77] Rebuilt for java-21-openjdk as system jdk https://fedoraproject.org/wiki/Changes/Java21 --- javapackages-bootstrap.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/javapackages-bootstrap.spec b/javapackages-bootstrap.spec index 2f4edab..8983f55 100644 --- a/javapackages-bootstrap.spec +++ b/javapackages-bootstrap.spec @@ -23,7 +23,7 @@ Name: javapackages-bootstrap Version: 1.16.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A means of bootstrapping Java Packages Tools # For detailed info see the file javapackages-bootstrap-PACKAGE-LICENSING License: Apache-1.1 AND Apache-2.0 AND (Apache-2.0 OR EPL-2.0) AND (Apache-2.0 OR LGPL-2.0-or-later) AND BSD-2-Clause AND BSD-3-Clause AND CC-BY-2.5 AND CC0-1.0 AND CPL-1.0 AND EPL-1.0 AND EPL-2.0 AND (EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0) AND LicenseRef-Fedora-Public-Domain AND MIT AND Plexus AND SMLNJ AND Saxpath AND xpp @@ -276,6 +276,9 @@ sed -i s/_xmvngen_/_jpbgen_/ %{buildroot}%{_fileattrsdir}/jpbgen.attr %doc AUTHORS %changelog +* Tue Feb 27 2024 Jiri Vanek - 1.16.0-2 +- Rebuilt for java-21-openjdk as system jdk + * Mon Feb 19 2024 Mikolaj Izdebski - 1.16.0-1 - Update to upstream version 1.16.0 - Switch from Java 17 to Java 21 From 0afbc535b5216cba3b69677d13fc291b6da77b78 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 26 Jun 2024 13:45:39 +0200 Subject: [PATCH 73/77] Extract smoke tests out of test plan We want tests to be stored directly in the file system instead of being embedded into tests plans. --- plans/smoke.fmf | 21 +----------- tests/Sanity/smoke/main.fmf | 5 +++ tests/Sanity/smoke/runtest.sh | 64 +++++++++++++++++++++++++++++++++++ tests/main.fmf | 4 +++ 4 files changed, 74 insertions(+), 20 deletions(-) create mode 100644 tests/Sanity/smoke/main.fmf create mode 100755 tests/Sanity/smoke/runtest.sh create mode 100644 tests/main.fmf diff --git a/plans/smoke.fmf b/plans/smoke.fmf index fa03fc2..a1e7bfd 100644 --- a/plans/smoke.fmf +++ b/plans/smoke.fmf @@ -1,24 +1,5 @@ summary: Basic smoke test discover: - how: shell - tests: - - name: /smoke/maven-version - test: /usr/libexec/javapackages-bootstrap/mvn --version - - name: /smoke/maven-home-version - test: /usr/share/javapackages-bootstrap/bin/mvn --version - - name: /smoke/xmvn-version - test: /usr/libexec/javapackages-bootstrap/xmvn --version - - name: /smoke/xmvn-install-help - test: /usr/libexec/javapackages-bootstrap/xmvn-install --help - - name: /smoke/xmvn-resolve-help - test: /usr/libexec/javapackages-bootstrap/xmvn-resolve --help - - name: /smoke/xmvn-subst-help - test: /usr/libexec/javapackages-bootstrap/xmvn-subst --help - - name: /smoke/ant-version - test: /usr/libexec/javapackages-bootstrap/ant -version - - name: /smoke/cup - test: echo 'non terminal bar; bar::=;' | /usr/libexec/javapackages-bootstrap/cup - - name: /smoke/jflex-version - test: /usr/libexec/javapackages-bootstrap/jflex -version + how: fmf execute: how: tmt diff --git a/tests/Sanity/smoke/main.fmf b/tests/Sanity/smoke/main.fmf new file mode 100644 index 0000000..0a0133d --- /dev/null +++ b/tests/Sanity/smoke/main.fmf @@ -0,0 +1,5 @@ +summary: javapackages-bootstrap smoke test +description: | + Test basic functionality of javapackages-bootstrap. +require: + - javapackages-bootstrap diff --git a/tests/Sanity/smoke/runtest.sh b/tests/Sanity/smoke/runtest.sh new file mode 100755 index 0000000..a30050d --- /dev/null +++ b/tests/Sanity/smoke/runtest.sh @@ -0,0 +1,64 @@ +#!/bin/bash +# Author: Mikolaj Izdebski +. /usr/share/beakerlib/beakerlib.sh + +rlJournalStart + + PATH="/usr/libexec/javapackages-bootstrap:$PATH" + + rlPhaseStartTest "check for presence of libexec binaries" + rlAssertRpm javapackages-bootstrap + rlAssertBinaryOrigin mvn javapackages-bootstrap + rlAssertBinaryOrigin xmvn javapackages-bootstrap + rlAssertBinaryOrigin xmvn-install javapackages-bootstrap + rlAssertBinaryOrigin xmvn-resolve javapackages-bootstrap + rlAssertBinaryOrigin xmvn-subst javapackages-bootstrap + rlAssertBinaryOrigin ant javapackages-bootstrap + rlAssertBinaryOrigin cup javapackages-bootstrap + rlAssertBinaryOrigin jflex javapackages-bootstrap + rlPhaseEnd + + rlPhaseStartTest "display mvn version" + rlRun -s "mvn --version" + rlAssertGrep "Red Hat XMvn" $rlRun_LOG + rlAssertGrep "XMvn home: /usr/share/javapackages-bootstrap" $rlRun_LOG + rlPhaseEnd + + rlPhaseStartTest "display xmvn version" + rlRun -s "xmvn --version" + rlAssertGrep "Red Hat XMvn" $rlRun_LOG + rlAssertGrep "XMvn home: /usr/share/javapackages-bootstrap" $rlRun_LOG + rlPhaseEnd + + rlPhaseStartTest "display xmvn-install help" + rlRun -s "xmvn-install --help" + rlAssertGrep "Usage: xmvn-install" $rlRun_LOG + rlPhaseEnd + + rlPhaseStartTest "display xmvn-resolve help" + rlRun -s "xmvn-resolve --help" + rlAssertGrep "Usage: xmvn-resolve" $rlRun_LOG + rlPhaseEnd + + rlPhaseStartTest "display xmvn-subst help" + rlRun -s "xmvn-subst --help" + rlAssertGrep "Usage: xmvn-subst" $rlRun_LOG + rlPhaseEnd + + rlPhaseStartTest "display ant version" + rlRun -s "ant -version" + rlAssertGrep "Apache Ant(TM) version" $rlRun_LOG + rlPhaseEnd + + rlPhaseStartTest "display cup version" + rlRun -s "cup -version" 1 + rlAssertGrep "CUP v" $rlRun_LOG + rlPhaseEnd + + rlPhaseStartTest "display jflex version" + rlRun -s "jflex --version" + rlAssertGrep "This is JFlex" $rlRun_LOG + rlPhaseEnd + +rlJournalEnd +rlJournalPrintText diff --git a/tests/main.fmf b/tests/main.fmf new file mode 100644 index 0000000..99fd67e --- /dev/null +++ b/tests/main.fmf @@ -0,0 +1,4 @@ +contact: Mikolaj Izdebski +framework: beakerlib +test: ./runtest.sh +tier: 0 From d9b72d8f69df36d9d507db943c95d10bf5d818ba Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 18 Jul 2024 10:52:59 +0000 Subject: [PATCH 74/77] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- javapackages-bootstrap.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/javapackages-bootstrap.spec b/javapackages-bootstrap.spec index 8983f55..c02bc99 100644 --- a/javapackages-bootstrap.spec +++ b/javapackages-bootstrap.spec @@ -23,7 +23,7 @@ Name: javapackages-bootstrap Version: 1.16.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A means of bootstrapping Java Packages Tools # For detailed info see the file javapackages-bootstrap-PACKAGE-LICENSING License: Apache-1.1 AND Apache-2.0 AND (Apache-2.0 OR EPL-2.0) AND (Apache-2.0 OR LGPL-2.0-or-later) AND BSD-2-Clause AND BSD-3-Clause AND CC-BY-2.5 AND CC0-1.0 AND CPL-1.0 AND EPL-1.0 AND EPL-2.0 AND (EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0) AND LicenseRef-Fedora-Public-Domain AND MIT AND Plexus AND SMLNJ AND Saxpath AND xpp @@ -276,6 +276,9 @@ sed -i s/_xmvngen_/_jpbgen_/ %{buildroot}%{_fileattrsdir}/jpbgen.attr %doc AUTHORS %changelog +* Thu Jul 18 2024 Fedora Release Engineering - 1.16.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Tue Feb 27 2024 Jiri Vanek - 1.16.0-2 - Rebuilt for java-21-openjdk as system jdk From 8a442748731c3ab698ec0b43d05fe36e3a5f7eee Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 24 Jul 2024 13:45:44 +0200 Subject: [PATCH 75/77] Put private JAR files outsides of javadir/jnidir --- javapackages-bootstrap.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/javapackages-bootstrap.spec b/javapackages-bootstrap.spec index c02bc99..0e73cd0 100644 --- a/javapackages-bootstrap.spec +++ b/javapackages-bootstrap.spec @@ -15,7 +15,7 @@ %global javaHomePath %{_jvmdir}/java-21-openjdk %global mavenHomePath %{_datadir}/%{name} %global metadataPath %{mavenHomePath}/maven-metadata -%global artifactsPath %{_jnidir} +%global artifactsPath %{_prefix}/lib %global launchersPath %{_libexecdir}/%{name} #global git_hash ... @@ -23,7 +23,7 @@ Name: javapackages-bootstrap Version: 1.16.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A means of bootstrapping Java Packages Tools # For detailed info see the file javapackages-bootstrap-PACKAGE-LICENSING License: Apache-1.1 AND Apache-2.0 AND (Apache-2.0 OR EPL-2.0) AND (Apache-2.0 OR LGPL-2.0-or-later) AND BSD-2-Clause AND BSD-3-Clause AND CC-BY-2.5 AND CC0-1.0 AND CPL-1.0 AND EPL-1.0 AND EPL-2.0 AND (EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0) AND LicenseRef-Fedora-Public-Domain AND MIT AND Plexus AND SMLNJ AND Saxpath AND xpp @@ -276,6 +276,9 @@ sed -i s/_xmvngen_/_jpbgen_/ %{buildroot}%{_fileattrsdir}/jpbgen.attr %doc AUTHORS %changelog +* Wed Jul 24 2024 Mikolaj Izdebski - 1.16.0-4 +- Put private JAR files outsides of javadir/jnidir + * Thu Jul 18 2024 Fedora Release Engineering - 1.16.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 6ad63ba7faed95d316b9cf942a2284422e547198 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 31 Jul 2024 15:09:31 +0200 Subject: [PATCH 76/77] Update to upstream version 1.17.0 --- .gitignore | 1 + ...maven-plugin-version-1.11-for-bundle.patch | 22 ------------------- javapackages-bootstrap-PACKAGE-LICENSING | 4 ++-- javapackages-bootstrap.spec | 12 +++++----- sources | 4 ++-- 5 files changed, 11 insertions(+), 32 deletions(-) delete mode 100644 0003-Use-modulemaker-maven-plugin-version-1.11-for-bundle.patch diff --git a/.gitignore b/.gitignore index 8c7dee3..9d78033 100644 --- a/.gitignore +++ b/.gitignore @@ -158,3 +158,4 @@ /plexus-testing.tar.xz /plexus-xml.tar.xz /javapackages-bootstrap-1.16.0.tar.xz +/javapackages-bootstrap-1.17.0.tar.xz diff --git a/0003-Use-modulemaker-maven-plugin-version-1.11-for-bundle.patch b/0003-Use-modulemaker-maven-plugin-version-1.11-for-bundle.patch deleted file mode 100644 index d351657..0000000 --- a/0003-Use-modulemaker-maven-plugin-version-1.11-for-bundle.patch +++ /dev/null @@ -1,22 +0,0 @@ -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.11 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.11 --- -2.43.0 - diff --git a/javapackages-bootstrap-PACKAGE-LICENSING b/javapackages-bootstrap-PACKAGE-LICENSING index 8a47217..9f8625b 100644 --- a/javapackages-bootstrap-PACKAGE-LICENSING +++ b/javapackages-bootstrap-PACKAGE-LICENSING @@ -46,7 +46,7 @@ # jdom2 has license: Saxpath # jflex has license: BSD-3-Clause # jsoup has license: MIT -# jsr-305 has license: BSD-3-Clause AND CC-BY-2.5 +# jsr-305 has license: BSD-3-Clause # junit4 has license: EPL-1.0 # junit5 has license: EPL-2.0 # log4j has license: Apache-2.0 @@ -121,4 +121,4 @@ # xmvn-generator has license: Apache-2.0 # xz-java has license: LicenseRef-Fedora-Public-Domain # Therefore combined license is: -License: Apache-1.1 AND Apache-2.0 AND (Apache-2.0 OR EPL-2.0) AND (Apache-2.0 OR LGPL-2.0-or-later) AND BSD-2-Clause AND BSD-3-Clause AND CC-BY-2.5 AND CC0-1.0 AND CPL-1.0 AND EPL-1.0 AND EPL-2.0 AND (EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0) AND LicenseRef-Fedora-Public-Domain AND MIT AND Plexus AND SMLNJ AND Saxpath AND xpp +License: Apache-1.1 AND Apache-2.0 AND (Apache-2.0 OR EPL-2.0) AND (Apache-2.0 OR LGPL-2.0-or-later) AND BSD-2-Clause AND BSD-3-Clause AND CC0-1.0 AND CPL-1.0 AND EPL-1.0 AND EPL-2.0 AND (EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0) AND LicenseRef-Fedora-Public-Domain AND MIT AND Plexus AND SMLNJ AND Saxpath AND xpp diff --git a/javapackages-bootstrap.spec b/javapackages-bootstrap.spec index 0e73cd0..8baa16f 100644 --- a/javapackages-bootstrap.spec +++ b/javapackages-bootstrap.spec @@ -22,11 +22,11 @@ #global git_short_hash %(echo %{git_hash} | cut -b -7) Name: javapackages-bootstrap -Version: 1.16.0 -Release: 4%{?dist} +Version: 1.17.0 +Release: 1%{?dist} Summary: A means of bootstrapping Java Packages Tools # For detailed info see the file javapackages-bootstrap-PACKAGE-LICENSING -License: Apache-1.1 AND Apache-2.0 AND (Apache-2.0 OR EPL-2.0) AND (Apache-2.0 OR LGPL-2.0-or-later) AND BSD-2-Clause AND BSD-3-Clause AND CC-BY-2.5 AND CC0-1.0 AND CPL-1.0 AND EPL-1.0 AND EPL-2.0 AND (EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0) AND LicenseRef-Fedora-Public-Domain AND MIT AND Plexus AND SMLNJ AND Saxpath AND xpp +License: Apache-1.1 AND Apache-2.0 AND (Apache-2.0 OR EPL-2.0) AND (Apache-2.0 OR LGPL-2.0-or-later) AND BSD-2-Clause AND BSD-3-Clause AND CC0-1.0 AND CPL-1.0 AND EPL-1.0 AND EPL-2.0 AND (EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0) AND LicenseRef-Fedora-Public-Domain AND MIT AND Plexus AND SMLNJ AND Saxpath AND xpp URL: https://github.com/fedora-java/javapackages-bootstrap ExclusiveArch: %{java_arches} @@ -165,8 +165,6 @@ Source1118: xmvn-generator.tar.xz Source1119: xmvn.tar.xz Source1120: xz-java.tar.xz -Patch3: 0003-Use-modulemaker-maven-plugin-version-1.11-for-bundle.patch - BuildRequires: byaccj BuildRequires: gcc BuildRequires: java-21-openjdk-devel @@ -201,7 +199,6 @@ 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 @@ -276,6 +273,9 @@ sed -i s/_xmvngen_/_jpbgen_/ %{buildroot}%{_fileattrsdir}/jpbgen.attr %doc AUTHORS %changelog +* Wed Jul 31 2024 Mikolaj Izdebski - 1.17.0-1 +- Update to upstream version 1.17.0 + * Wed Jul 24 2024 Mikolaj Izdebski - 1.16.0-4 - Put private JAR files outsides of javadir/jnidir diff --git a/sources b/sources index 6589e4b..fe9010e 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -SHA512 (javapackages-bootstrap-1.16.0.tar.xz) = b118ed671766365b09c8c484b9e944a54f7139c1bf93e86e50774243c955c8699c4c71bcc81534ab8574c503b5ef5341d03ca0089d14857bfc0b7b46cb0c49b8 +SHA512 (javapackages-bootstrap-1.17.0.tar.xz) = a8363096cbcc91dd23996a0b433523a709af0f88f99eafb784d21545575d242e2f53a94cf5ae8b6fcdefde9ab17e15d3c780a119173623a19d4c2abe753e16b9 SHA512 (ant.tar.xz) = 30e4ef50010f04c64c60777f30079099c11a2e3dbdd71f2987dfec3912d2716a802979713d851c9a5f6f324431997a42b77f7739cd9e4fb5d3816cc614271ed4 SHA512 (aopalliance.tar.xz) = 1f9a8a63edb76a73a40dcb3edee72fad069d4b509cc4b702cb9af9aaf694dadeef01fa7d20c285c6c37f7cb030643d267e3a1b834567785399fc986da474e626 SHA512 (apache-pom.tar.xz) = 5aa6bcd3e39a0083e9ee714774734d4066fe571722e543ec08f9e2aac27653b37a9e0fb67d62bbce050d0f51661d842ecb4724208ed200068ea0128af7471a7a @@ -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) = e450710d87eade42f2f563b0c268a6aa556d3deca6625fb2376b750f21a00bf73becccb2e401665c95daeb13ed92c43a13a9aca0b6253a7793b88c82ab666a5f +SHA512 (modulemaker-maven-plugin.tar.xz) = c3b0b60a5315e0d25c6a6116e9536981eed001c75caa121a897be0a7c4e3fc308362128b6c4fd2e4b5e200e1f6b7c0876ae61d79f108d336ce0fad4c6ef7da30 SHA512 (mojo-parent-pom.tar.xz) = 94567865c57e4d1a8b9a6c2aa8aa2beabec142ffcd464d89a8f553af194820fb4546524e3c0723bcd7ab169007faa0c9d0410b2c363a8552ff32c79b117a2cb0 SHA512 (objenesis.tar.xz) = eb432f56318ed70aae56cb94b98818c92f30e7dd0d221eab1bfa15898b663da121c0ab4ffe283b4bf03ebadf411bc2ec742c31ca1a01f6e2c9da4a1b6798d912 SHA512 (opentest4j.tar.xz) = 3a5a80d7c982a7f024f169048833c4aa989f7f57e5ddeb9bd907aefdff937260c893b5fda1eb3646de105f7c8db45455a7438babd8007c6dbb6fe197dc5e20b5 From d0e8f7f4e8fd001f18cebb8e9bb1161ab3a96485 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 31 Jul 2024 20:53:29 +0200 Subject: [PATCH 77/77] Switch javapackages tests to f41 branch --- plans/javapackages.fmf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf index a2cdaba..17c6113 100644 --- a/plans/javapackages.fmf +++ b/plans/javapackages.fmf @@ -2,6 +2,6 @@ summary: Run javapackages-specific tests discover: how: fmf url: https://src.fedoraproject.org/tests/javapackages - ref: f40 + ref: f41 execute: how: tmt