diff --git a/disruptor-3.3.2-jmock.patch b/disruptor-3.3.2-jmock.patch deleted file mode 100644 index 2f4797e..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 4c87c5c..0000000 Binary files a/disruptor-3.3.6.tar.gz and /dev/null differ 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 a6f1928..64eea72 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..d55ec94 Binary files /dev/null and b/disruptor-3.4.4.tar.gz differ diff --git a/disruptor.spec b/disruptor.spec index 0f2e954..4a46011 100644 --- a/disruptor.spec +++ b/disruptor.spec @@ -1,12 +1,11 @@ Name: disruptor -Version: 3.3.6 +Version: 3.4.4 Release: 1 Summary: Concurrent Programming Framework License: ASL 2.0 URL: http://lmax-exchange.github.io/disruptor/ Source0: https://github.com/LMAX-Exchange/disruptor/archive/%{version}/disruptor-%{version}.tar.gz Source1: http://repo1.maven.org/maven2/com/lmax/disruptor/%{version}/disruptor-%{version}.pom -Patch0: disruptor-3.3.2-jmock.patch BuildRequires: maven-local mvn(junit:junit) mvn(org.apache.felix:maven-bundle-plugin) BuildRequires: mvn(org.hamcrest:hamcrest-library) mvn(org.jmock:jmock-junit4) BuildRequires: mvn(org.jmock:jmock-legacy) @@ -30,7 +29,6 @@ This package contains javadoc for %{name}. %setup -q find . -name "*.class" -print -delete find . -name "*.jar" -type f -print -delete -%patch0 -p1 cp -p %{SOURCE1} pom.xml %pom_xpath_inject "pom:project" "bundle" %pom_add_plugin org.apache.felix:maven-bundle-plugin:2.3.7 . ' @@ -57,7 +55,7 @@ rm -r src/test/java/com/lmax/disruptor/dsl/DisruptorTest.java %mvn_file :%{name} %{name} %build -%mvn_build -- -Dproject.build.sourceEncoding=UTF-8 +%mvn_build -- -Dproject.build.sourceEncoding=UTF-8 -Dmaven.compiler.source=1.8 -Dmaven.compiler.target=1.8 %install %mvn_install @@ -70,5 +68,8 @@ rm -r src/test/java/com/lmax/disruptor/dsl/DisruptorTest.java %license LICENCE.txt %changelog +* Wed Dec 22 2021 yaoxin - 3.4.4-1 +- Upgrade disruptor to 3.4.4 + * Fri Aug 14 2020 leiju - 3.3.6-1 - Package init