From b3a47114f90fcd30a0dae420fa8228363ea5b743c74155f2c0b639ba1583731e Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Fri, 10 Dec 2021 20:07:55 +0000 Subject: [PATCH] Accepting request 939148 from home:pmonrealgonzalez:branches:Java:packages - Update to 3.4.4: * 3.4.4 Lazy-loading of Logger instances - See #370 & #376 * 3.4.3 Add Automatic-Module-Name to MANIFEST.MF * 3.4.2 Fix race condition in BatchEventProcessor with 3 or more starting/halting concurrently. * 3.4.1 Fix race between run() and halt() on BatchEventProcessor. * 3.4.0 Drop support for JDK6, support JDK7 and above only. Add ThreadHints.onSpinWait to all busy spins within Disruptor. Increase default sleep time for LockSupport.parkNanos to prevent busy spinning. * 3.3.8 Revert belt and braces WaitStrategy signalling. * 3.3.7 Add batch size to BatchStartAware.onBatchStart() Upgrade to newer versions of gradle, checkstyle and JUnit Deprecate classes & methods for later release Remove JMock and rewrite tests accordingly - Remove disruptor-3.3.2-jmock.patch OBS-URL: https://build.opensuse.org/request/show/939148 OBS-URL: https://build.opensuse.org/package/show/Java:packages/disruptor?expand=0&rev=4 --- disruptor-3.3.2-jmock.patch | 21 --------------------- disruptor-3.3.6.tar.gz | 3 --- disruptor-3.3.6.pom => disruptor-3.4.4.pom | 16 ++-------------- disruptor-3.4.4.tar.gz | 3 +++ disruptor.changes | 20 ++++++++++++++++++++ disruptor.spec | 15 ++++++--------- 6 files changed, 31 insertions(+), 47 deletions(-) delete mode 100644 disruptor-3.3.2-jmock.patch delete mode 100644 disruptor-3.3.6.tar.gz rename disruptor-3.3.6.pom => disruptor-3.4.4.pom (75%) create mode 100644 disruptor-3.4.4.tar.gz diff --git a/disruptor-3.3.2-jmock.patch b/disruptor-3.3.2-jmock.patch deleted file mode 100644 index 2a3a1eb..0000000 --- a/disruptor-3.3.2-jmock.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- disruptor-3.3.2/src/test/java/com/lmax/disruptor/BatchEventProcessorTest.java 2015-02-25 10:09:57.000000000 +0100 -+++ disruptor-3.3.2/src/test/java/com/lmax/disruptor/BatchEventProcessorTest.java.jmock 2015-06-03 15:52:43.997446568 +0200 -@@ -23,6 +23,7 @@ - import org.jmock.api.Action; - import org.jmock.api.Invocation; - import org.jmock.integration.junit4.JMock; -+import org.jmock.lib.concurrent.Synchroniser; - import org.junit.Test; - import org.junit.runner.RunWith; - -@@ -35,7 +36,9 @@ - @RunWith(JMock.class) - public final class BatchEventProcessorTest - { -- private final Mockery context = new Mockery(); -+ private final Mockery context = new Mockery() {{ -+ setThreadingPolicy(new Synchroniser()); -+ }}; - private final Sequence lifecycleSequence = context.sequence("lifecycleSequence"); - private final CountDownLatch latch = new CountDownLatch(1); - diff --git a/disruptor-3.3.6.tar.gz b/disruptor-3.3.6.tar.gz deleted file mode 100644 index 26fac03..0000000 --- a/disruptor-3.3.6.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c7b46371ab115ca1b0663e376d55d8aa6240826d808a6c850ff38420265f16a7 -size 260170 diff --git a/disruptor-3.3.6.pom b/disruptor-3.4.4.pom similarity index 75% rename from disruptor-3.3.6.pom rename to disruptor-3.4.4.pom index ad3e887..4bd6051 100644 --- a/disruptor-3.3.6.pom +++ b/disruptor-3.4.4.pom @@ -4,7 +4,7 @@ 4.0.0 com.lmax disruptor - 3.3.6 + 3.4.4 Disruptor Framework Disruptor - Concurrent Programming Framework http://lmax-exchange.github.com/disruptor @@ -27,22 +27,10 @@ scm:git@github.com:LMAX-Exchange/disruptor.git - - org.jmock - jmock-junit4 - 2.5.1 - test - junit junit - 4.5 - test - - - org.jmock - jmock-legacy - 2.5.1 + 4.12 test diff --git a/disruptor-3.4.4.tar.gz b/disruptor-3.4.4.tar.gz new file mode 100644 index 0000000..d520bb4 --- /dev/null +++ b/disruptor-3.4.4.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7fe7df10ea6d0f0b87442aafe2420a28250835e975a542b8c490a72a0e205b5c +size 237165 diff --git a/disruptor.changes b/disruptor.changes index 1d8c6d6..1f38a7f 100644 --- a/disruptor.changes +++ b/disruptor.changes @@ -1,3 +1,23 @@ +------------------------------------------------------------------- +Fri Dec 10 13:48:27 UTC 2021 - Pedro Monreal + +- Update to 3.4.4: + * 3.4.4 Lazy-loading of Logger instances - See #370 & #376 + * 3.4.3 Add Automatic-Module-Name to MANIFEST.MF + * 3.4.2 Fix race condition in BatchEventProcessor with 3 or more + starting/halting concurrently. + * 3.4.1 Fix race between run() and halt() on BatchEventProcessor. + * 3.4.0 Drop support for JDK6, support JDK7 and above only. + Add ThreadHints.onSpinWait to all busy spins within Disruptor. + Increase default sleep time for LockSupport.parkNanos to + prevent busy spinning. + * 3.3.8 Revert belt and braces WaitStrategy signalling. + * 3.3.7 Add batch size to BatchStartAware.onBatchStart() + Upgrade to newer versions of gradle, checkstyle and JUnit + Deprecate classes & methods for later release + Remove JMock and rewrite tests accordingly +- Remove disruptor-3.3.2-jmock.patch + ------------------------------------------------------------------- Tue Oct 1 15:23:56 UTC 2019 - Fridrich Strba diff --git a/disruptor.spec b/disruptor.spec index c24b18f..73733bc 100644 --- a/disruptor.spec +++ b/disruptor.spec @@ -1,7 +1,7 @@ # # spec file for package disruptor # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,16 +17,15 @@ Name: disruptor -Version: 3.3.6 +Version: 3.4.4 Release: 0 Summary: Concurrent Programming Framework License: Apache-2.0 URL: https://lmax-exchange.github.io/disruptor/ Source0: https://github.com/LMAX-Exchange/disruptor/archive/%{version}/%{name}-%{version}.tar.gz -Source1: http://repo1.maven.org/maven2/com/lmax/%{name}/%{version}/%{name}-%{version}.pom -# see http://www.jmock.org/threading-synchroniser.html -Patch0: disruptor-3.3.2-jmock.patch -BuildRequires: maven-local fdupes +Source1: https://repo1.maven.org/maven2/com/lmax/%{name}/%{version}/%{name}-%{version}.pom +BuildRequires: fdupes +BuildRequires: maven-local BuildRequires: mvn(junit:junit) BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) BuildRequires: mvn(org.hamcrest:hamcrest-library) @@ -47,8 +46,6 @@ This package contains javadoc for %{name}. find . -name "*.class" -print -delete find . -name "*.jar" -type f -print -delete -%patch0 -p1 - cp -p %{SOURCE1} pom.xml # Add OSGi support @@ -76,7 +73,7 @@ cp -p %{SOURCE1} pom.xml %build -%{mvn_build} -f -- -Dproject.build.sourceEncoding=UTF-8 +%{mvn_build} -f -- -Dproject.build.sourceEncoding=UTF-8 -Dmaven.compiler.source=1.8 -Dmaven.compiler.target=1.8 %install %mvn_install