From f3c7ee2e98f77a6d748222508c5c9292fc387ecf Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 23 Feb 2022 08:46:06 +0100 Subject: [PATCH] Build and test with OpenJDK 8 Related: rhbz#2054991 --- disruptor.spec | 7 +++++-- plans/smoke.fmf | 6 +++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/disruptor.spec b/disruptor.spec index a78022e..0a33137 100644 --- a/disruptor.spec +++ b/disruptor.spec @@ -1,6 +1,6 @@ Name: disruptor Version: 3.4.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Concurrent Programming Framework License: ASL 2.0 URL: https://lmax-exchange.github.io/disruptor/ @@ -9,7 +9,7 @@ BuildArch: noarch Source0: https://github.com/LMAX-Exchange/disruptor/archive/%{version}/%{name}-%{version}.tar.gz Source1: https://repo1.maven.org/maven2/com/lmax/%{name}/%{version}/%{name}-%{version}.pom -BuildRequires: maven-local +BuildRequires: maven-local-openjdk8 BuildRequires: mvn(junit:junit) BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) @@ -76,6 +76,9 @@ rm -r src/test/java/com/lmax/disruptor/dsl/DisruptorTest.java %license LICENCE.txt %changelog +* Wed Feb 23 2022 Mikolaj Izdebski - 3.4.4-2 +- Build with OpenJDK 8 + * Mon Dec 13 2021 Sérgio Basto - 3.4.4-1 - Update disruptor to 3.4.4 (#1953941) diff --git a/plans/smoke.fmf b/plans/smoke.fmf index 92ede0f..6b39f3b 100644 --- a/plans/smoke.fmf +++ b/plans/smoke.fmf @@ -1,8 +1,8 @@ summary: Basic smoke test prepare: how: install - package: java-devel + package: java-1.8.0-openjdk-devel execute: script: - - javac -cp /usr/share/java/disruptor.jar plans/Smoke.java - - java -cp /usr/share/java/disruptor.jar:plans Smoke + - /usr/lib/jvm/java-1.8.0-openjdk/bin/javac -cp /usr/share/java/disruptor.jar plans/Smoke.java + - /usr/lib/jvm/java-1.8.0-openjdk/bin/java -cp /usr/share/java/disruptor.jar:plans Smoke