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

Update to upstream version 1.17.0

Browse Source
This commit is contained in:
Mikolaj Izdebski 2024-07-31 15:09:31 +02:00
parent 8a44274873
commit 6ad63ba7fa
5 changed files with 11 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

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

22
0003-Use-modulemaker-maven-plugin-version-1.11-for-bundle.patch
View File

@ -1,22 +0,0 @@
From 806ef0cb110cbb306303f44089899e12cb5a33b4 Mon Sep 17 00:00:00 2001
From: Marian Koncek <mkoncek@redhat.com>
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

4
javapackages-bootstrap-PACKAGE-LICENSING
View File

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

12
javapackages-bootstrap.spec
View File

@ -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 <mizdebsk@redhat.com> - 1.17.0-1
- Update to upstream version 1.17.0
* Wed Jul 24 2024 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.16.0-4
- Put private JAR files outsides of javadir/jnidir

4
sources
View File

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