rpms/jmc
7
0
Fork 0
Code Issues Pull Requests Releases Activity

import OL jmc-8.2.0-18.el9_7.2

Browse Source
This commit is contained in:
eabdullin 2026-01-20 08:39:52 +00:00
parent 07bef65cac
commit 26cdea83a7
4 changed files with 111 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -1,2 +1,2 @@
SOURCES/8.2.0-ga.tar.gz
SOURCES/repository-8.2.0-20220203.tar.gz
SOURCES/repository-8.2.0.tar.gz

2
.jmc.metadata
View File

@ -1,2 +1,2 @@
686f6d6b9bcab052a6a815e59e55bebb272a03fe SOURCES/8.2.0-ga.tar.gz
37eac4d47ec01624be56dcc7c102d00826026bf7 SOURCES/repository-8.2.0-20220203.tar.gz
5a570644593d9f5da81a86e8722be4f8a5748d77 SOURCES/repository-8.2.0.tar.gz

81
SOURCES/3-bump-lz4-version.patch Normal file
View File

@ -0,0 +1,81 @@
diff --git a/core/org.openjdk.jmc.common/pom.xml b/core/org.openjdk.jmc.common/pom.xml
index 7e849bff..6ee9e7e6 100644
--- a/core/org.openjdk.jmc.common/pom.xml
+++ b/core/org.openjdk.jmc.common/pom.xml
@@ -46,9 +46,9 @@
<version>1.2.3</version>
</dependency>
<dependency>
- <groupId>org.lz4</groupId>
+ <groupId>at.yawk.lz4</groupId>
<artifactId>lz4-java</artifactId>
- <version>1.8.0</version>
+ <version>1.10.2</version>
</dependency>
</dependencies>
<properties>
diff --git a/releng/platform-definitions/platform-definition-2021-06/platform-definition-2021-06.target b/releng/platform-definitions/platform-definition-2021-06/platform-definition-2021-06.target
index 70d29746..5f45c551 100644
--- a/releng/platform-definitions/platform-definition-2021-06/platform-definition-2021-06.target
+++ b/releng/platform-definitions/platform-definition-2021-06/platform-definition-2021-06.target
@@ -39,7 +39,7 @@
<unit id="com.sun.mail.jakarta.mail" version="2.0.1"/>
<unit id="com.sun.activation.jakarta.activation" version="2.0.1"/>
<unit id="org.owasp.encoder" version="1.2.3"/>
- <unit id="lz4-java" version="1.8.0"/>
+ <unit id="lz4-java" version="0.0.0"/>
<unit id="org.hdrhistogram.HdrHistogram" version="2.1.12"/>
<unit id="org.adoptopenjdk.jemmy-awt-input" version="2.0.0"/>
<unit id="org.adoptopenjdk.jemmy-browser" version="2.0.0"/>
diff --git a/releng/platform-definitions/platform-definition-2021-09/platform-definition-2021-09.target b/releng/platform-definitions/platform-definition-2021-09/platform-definition-2021-09.target
index 22faa57f..34813034 100644
--- a/releng/platform-definitions/platform-definition-2021-09/platform-definition-2021-09.target
+++ b/releng/platform-definitions/platform-definition-2021-09/platform-definition-2021-09.target
@@ -39,7 +39,7 @@
<unit id="com.sun.mail.jakarta.mail" version="2.0.1"/>
<unit id="com.sun.activation.jakarta.activation" version="2.0.1"/>
<unit id="org.owasp.encoder" version="1.2.3"/>
- <unit id="lz4-java" version="1.8.0"/>
+ <unit id="lz4-java" version="0.0.0"/>
<unit id="org.hdrhistogram.HdrHistogram" version="2.1.12"/>
<unit id="org.adoptopenjdk.jemmy-awt-input" version="2.0.0"/>
<unit id="org.adoptopenjdk.jemmy-browser" version="2.0.0"/>
diff --git a/releng/platform-definitions/platform-definition-2021-12/platform-definition-2021-12.target b/releng/platform-definitions/platform-definition-2021-12/platform-definition-2021-12.target
index ebfc34eb..c78f207c 100644
--- a/releng/platform-definitions/platform-definition-2021-12/platform-definition-2021-12.target
+++ b/releng/platform-definitions/platform-definition-2021-12/platform-definition-2021-12.target
@@ -39,7 +39,7 @@
<unit id="com.sun.mail.jakarta.mail" version="2.0.1"/>
<unit id="com.sun.activation.jakarta.activation" version="2.0.1"/>
<unit id="org.owasp.encoder" version="1.2.3"/>
- <unit id="lz4-java" version="1.8.0"/>
+ <unit id="lz4-java" version="0.0.0"/>
<unit id="org.hdrhistogram.HdrHistogram" version="2.1.12"/>
<unit id="org.adoptopenjdk.jemmy-awt-input" version="2.0.0"/>
<unit id="org.adoptopenjdk.jemmy-browser" version="2.0.0"/>
diff --git a/releng/third-party/pom.xml b/releng/third-party/pom.xml
index 35dd8c88..4a58c682 100644
--- a/releng/third-party/pom.xml
+++ b/releng/third-party/pom.xml
@@ -49,10 +49,10 @@
<jetty.version>10.0.7</jetty.version>
<jemmy.version>2.0.0</jemmy.version>
<jetty-maven-plugin.version>9.4.43.v20210629</jetty-maven-plugin.version>
- <lz4.version>1.8.0</lz4.version>
+ <lz4.version>1.10.2</lz4.version>
<maven-enforcer-plugin.version>3.0.0</maven-enforcer-plugin.version>
<owasp.encoder.version>1.2.3</owasp.encoder.version>
- <p2-maven-plugin.version>1.5.0</p2-maven-plugin.version>
+ <p2-maven-plugin.version>2.1.0</p2-maven-plugin.version>
<spifly.version>1.3.4</spifly.version>
</properties>
@@ -86,7 +86,7 @@
<id>org.owasp.encoder:encoder:${owasp.encoder.version}</id>
</artifact>
<artifact>
- <id>org.lz4:lz4-java:${lz4.version}</id>
+ <id>at.yawk.lz4:lz4-java:${lz4.version}</id>
</artifact>
<artifact>
<id>org.hdrhistogram:HdrHistogram:${hdrhistogram.version}</id>

36
SPECS/jmc.spec
View File

@ -4,13 +4,13 @@
%global patchlevel 0
# Revision
%global revnum 13
%global revnum 18
# set to 1 for snapshots, 0 for release
%global usesnapshot 1
# SNAPSHOT version
%global revhash 7f42e4a10291d7e9316711edd81a183951cdae57
%global revdate 20220203
%global revdate 20260111
%global tarball_name %{major}.%{minor}.%{patchlevel}-ga.tar.gz
@ -21,8 +21,8 @@
%global debug_package %{nil}
%if %{usesnapshot}
%global releasestr %{revnum}.%{revdate}
%global repositorystr repository-%{major}.%{minor}.%{patchlevel}-%{revdate}.tar.gz
%global releasestr %{revnum}
%global repositorystr repository-%{major}.%{minor}.%{patchlevel}.tar.gz
%else
%global releasestr %{revnum}
%global repositorystr repository-%{major}.%{minor}.%{patchlevel}.tar.gz
@ -79,7 +79,8 @@ Patch1: 1-remove-non-linux-environments.patch
# core artifacts to install properly.
# Note: this can be fixed upstream by updating mockito to at least v3.10.0
Patch2: 2-skip-writer-tests.patch
# Bump the lz4 version up to 1.10.2, as well as the p2 plugin version to resolve an osgi issue
Patch3: 3-bump-lz4-version.patch
# Dependencies are bundled into a tar.gz and passed as a local maven repository for the build
ExclusiveArch: x86_64
@ -104,7 +105,7 @@ Provides: bundled(osgi(javax.annotation)) = 1.3.5
Provides: bundled(osgi(javax.el)) = 2.2.0
Provides: bundled(osgi(javax.inject)) = 1.0.0
Provides: bundled(osgi(javax.servlet.jsp)) = 2.2.0
Provides: bundled(osgi(lz4-java)) = 1.8.0
Provides: bundled(osgi(lz4-java)) = 1.10.2
Provides: bundled(osgi(org.apache.aries.spifly.dynamic.bundle)) = 1.3.4
Provides: bundled(osgi(org.apache.batik.constants)) = 1.14.0
Provides: bundled(osgi(org.apache.batik.css)) = 1.14.0
@ -548,10 +549,26 @@ applications running locally or deployed in production environments.
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
# explicitly use maven-clean-plugin at v2.5
cat > settings-offline.xml <<EOF
<settings>
<localRepository>repository-%{version}</localRepository>
<offline>true</offline>
</settings>
EOF
# Apply the fix directly to the core pom
sed -i 's|<plugins>|<plugins><plugin><groupId>org.apache.maven.plugins</groupId><artifactId>maven-clean-plugin</artifactId><version>2.5</version></plugin>|' core/pom.xml
cat core/pom.xml
ls -l ./
ls -l repository-%{version}/org/apache/maven/plugins/maven-clean-plugin/2.5
# Build & install jmc core libraries
# Skip the JDP Multicast Tests that don't work offline/under a VPN
mvn -Dmaven.repo.local=repository-%{version}-%{revdate} -o clean install -f core/pom.xml -DskipJDPMulticastTests=true
mvn -Dmaven.repo.local=repository-%{version} -s settings-offline.xml -o clean install -f core/pom.xml -DskipJDPMulticastTests=true
%pom_remove_plugin org.codehaus.mojo:flatten-maven-plugin
%pom_remove_plugin com.github.spotbugs:spotbugs-maven-plugin
@ -569,7 +586,7 @@ mvn -Dmaven.repo.local=repository-%{version}-%{revdate} -o clean install -f core
%build
# some tests require large heap and fail with OOM
# depending on the builder resources
mvn -Dmaven.repo.local=repository-%{version}-%{revdate} verify -o -Dmaven.test.failure.ignore=true -DskipJDPMulticastTests=true -DbuildId=rhel -DbuildNumber=%{revhash} -Dbuild.date=%{revdate}
mvn -Dmaven.repo.local=repository-%{version} verify -o -Dmaven.test.failure.ignore=true -DskipJDPMulticastTests=true -DbuildId=rhel -DbuildNumber=%{revhash} -Dbuild.date=%{revdate}
%install
@ -624,6 +641,9 @@ sed -i "/.SH FILES/a .I %{_sysconfdir}/%{name}.ini" %{buildroot}%{_mandir}/man1/
%{_datadir}/applications/%{name}.desktop
%changelog
* Wed Jan 7 2026 Joshua Matsuoka <jmatsuok@redhat.com> - 8.2.0-4
- Bump LZ4 Version to 1.10.2. Related: RHEL-135478
* Mon Dec 5 2022 Joshua Matsuoka <jmatsuok@redhat.com> - 8.2.0-3
- Fix provides and requires exclusions. Related: rhbz#2122401