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

Build with OpenJDK 17

Browse Source
This commit is contained in:
Mikolaj Izdebski 2021-11-02 15:23:59 +01:00
parent 6e01307ba1
commit 33885fb441
2 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
0001-Bind-to-OpenJDK-11-for-runtime.patch → 0001-Bind-to-OpenJDK-17-for-runtime.patch
View File

@ -1,7 +1,7 @@
From ad65f62443f23076dfc520d3f0589282da9530fa Mon Sep 17 00:00:00 2001 From ad65f62443f23076dfc520d3f0589282da9530fa Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com> From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Wed, 8 Jul 2020 09:04:57 +0200 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 +----------- apache-maven/src/bin/mvn | 12 +-----------
@ -26,7 +26,7 @@ index a554c6617..23b9dd902 100755
- fi - fi
- -
-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. # OS specific support. $var _must_ be set to either true or false.
cygwin=false; cygwin=false;

19
javapackages-bootstrap.spec
View File

@ -1,11 +1,12 @@
# Exclude automatically generated requires on java interpreter which is not # Exclude automatically generated requires on java interpreter which is not
# owned by any package # 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 # Don't run OSGi dependency generators on private (bundled) JARs
%global __requires_exclude_from \\.jar$ %global __requires_exclude_from \\.jar$
%global __provides_exclude_from \\.jar$ %global __provides_exclude_from \\.jar$
%global javaHomePath %{_jvmdir}/java-17-openjdk
%global mavenHomePath %{_datadir}/%{name} %global mavenHomePath %{_datadir}/%{name}
%global metadataPath %{mavenHomePath}/maven-metadata %global metadataPath %{mavenHomePath}/maven-metadata
%global artifactsPath %{_javadir} %global artifactsPath %{_javadir}
@ -16,7 +17,7 @@
Name: javapackages-bootstrap Name: javapackages-bootstrap
Version: 1.5.0^20211102.git%{git_short_hash} Version: 1.5.0^20211102.git%{git_short_hash}
Release: 1%{?dist} Release: 2%{?dist}
Summary: A means of bootstrapping Java Packages Tools Summary: A means of bootstrapping Java Packages Tools
# For detailed info see the file javapackages-bootstrap-PACKAGE-LICENSING # 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: 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 Source1107: xmvn.tar.xz
Source1108: xz-java.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(ant) = 1.10.11
Provides: bundled(apache-parent) = 23 Provides: bundled(apache-parent) = 23
@ -257,12 +258,12 @@ Provides: bundled(xmvn) = 4.0.0
Provides: bundled(xz-java) = 1.8 Provides: bundled(xz-java) = 1.8
BuildRequires: byaccj BuildRequires: byaccj
BuildRequires: java-11-openjdk-devel BuildRequires: java-17-openjdk-devel
BuildRequires: javapackages-generators BuildRequires: javapackages-generators
Requires: bash Requires: bash
Requires: coreutils Requires: coreutils
Requires: java-11-openjdk-devel Requires: java-17-openjdk-devel
Requires: procps-ng Requires: procps-ng
%description %description
@ -310,10 +311,11 @@ done
%build %build
export LC_ALL=C.utf8 export LC_ALL=C.utf8
JAVA_HOME=%{java_home} ./mbi.sh build -parallel JAVA_HOME=%{javaHomePath} ./mbi.sh build -parallel
%install %install
JAVA_HOME=%{java_home} ./mbi.sh dist \ JAVA_HOME=%{javaHomePath} ./mbi.sh dist \
-javaCmdPath=%{javaHomePath}/bin/java \
-basePackageName=%{name} \ -basePackageName=%{name} \
-installRoot=%{buildroot} \ -installRoot=%{buildroot} \
-mavenHomePath=%{mavenHomePath} \ -mavenHomePath=%{mavenHomePath} \
@ -349,6 +351,9 @@ echo '%%jpb_env PATH=/usr/libexec/javapackages-bootstrap:$PATH' >%{buildroot}%{_
%doc AUTHORS %doc AUTHORS
%changelog %changelog
* Wed Nov 03 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.5.0^20211102.gitd76c032-2
- Build with OpenJDK 17
* Tue Nov 02 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.5.0^20211102.gitd76c032-1 * Tue Nov 02 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.5.0^20211102.gitd76c032-1
- Update to latest upstream snapshot - Update to latest upstream snapshot