rpms/javapackages-bootstrap
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Update to upstream version 1.8.0

Browse Source
This commit is contained in:
Mikolaj Izdebski 2023-03-06 13:31:50 +01:00
parent 7b51c19867
commit 518cfa0983
3 changed files with 84 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@ -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

127
javapackages-bootstrap.spec
View File

@ -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 <mizdebsk@redhat.com> - 1.8.0-1
- Update to upstream version 1.8.0
* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild

8
sources
View File

@ -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