diff --git a/.gitignore b/.gitignore index a598ebe..b4a3e98 100644 --- a/.gitignore +++ b/.gitignore @@ -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 diff --git a/.jmc.metadata b/.jmc.metadata index fb4c520..ecc1f15 100644 --- a/.jmc.metadata +++ b/.jmc.metadata @@ -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 diff --git a/SOURCES/3-bump-lz4-version.patch b/SOURCES/3-bump-lz4-version.patch new file mode 100644 index 0000000..589b66e --- /dev/null +++ b/SOURCES/3-bump-lz4-version.patch @@ -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 @@ + 1.2.3 + + +- org.lz4 ++ at.yawk.lz4 + lz4-java +- 1.8.0 ++ 1.10.2 + + + +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 @@ + + + +- ++ + + + +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 @@ + + + +- ++ + + + +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 @@ + + + +- ++ + + + +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 @@ + 10.0.7 + 2.0.0 + 9.4.43.v20210629 +- 1.8.0 ++ 1.10.2 + 3.0.0 + 1.2.3 +- 1.5.0 ++ 2.1.0 + 1.3.4 + + +@@ -86,7 +86,7 @@ + org.owasp.encoder:encoder:${owasp.encoder.version} + + +- org.lz4:lz4-java:${lz4.version} ++ at.yawk.lz4:lz4-java:${lz4.version} + + + org.hdrhistogram:HdrHistogram:${hdrhistogram.version} diff --git a/SPECS/jmc.spec b/SPECS/jmc.spec index ecf0f79..5c07f33 100644 --- a/SPECS/jmc.spec +++ b/SPECS/jmc.spec @@ -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 < + repository-%{version} + true + +EOF + +# Apply the fix directly to the core pom +sed -i 's||org.apache.maven.pluginsmaven-clean-plugin2.5|' 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 - 8.2.0-4 +- Bump LZ4 Version to 1.10.2. Related: RHEL-135478 + * Mon Dec 5 2022 Joshua Matsuoka - 8.2.0-3 - Fix provides and requires exclusions. Related: rhbz#2122401