Upgrade disruptor to 3.4.4
(cherry picked from commit 3efb8a2b14ae82a7e6426ba5963472abeeb8f719)
This commit is contained in:
parent
844c992a8e
commit
dfb7e7d88f
@ -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);
|
||||
|
||||
Binary file not shown.
@ -4,7 +4,7 @@
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<groupId>com.lmax</groupId>
|
||||
<artifactId>disruptor</artifactId>
|
||||
<version>3.3.6</version>
|
||||
<version>3.4.4</version>
|
||||
<name>Disruptor Framework</name>
|
||||
<description>Disruptor - Concurrent Programming Framework</description>
|
||||
<url>http://lmax-exchange.github.com/disruptor</url>
|
||||
@ -27,22 +27,10 @@
|
||||
<url>scm:git@github.com:LMAX-Exchange/disruptor.git</url>
|
||||
</scm>
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>org.jmock</groupId>
|
||||
<artifactId>jmock-junit4</artifactId>
|
||||
<version>2.5.1</version>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>junit</groupId>
|
||||
<artifactId>junit</artifactId>
|
||||
<version>4.5</version>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.jmock</groupId>
|
||||
<artifactId>jmock-legacy</artifactId>
|
||||
<version>2.5.1</version>
|
||||
<version>4.12</version>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
BIN
disruptor-3.4.4.tar.gz
Normal file
BIN
disruptor-3.4.4.tar.gz
Normal file
Binary file not shown.
@ -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" "<packaging>bundle</packaging>"
|
||||
%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 <yaoxin30@huawei.com> - 3.4.4-1
|
||||
- Upgrade disruptor to 3.4.4
|
||||
|
||||
* Fri Aug 14 2020 leiju <leiju4@huawei.com> - 3.3.6-1
|
||||
- Package init
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user