[projectreactor] 02/11: Refreshed the patches

Emmanuel Bourg ebourg-guest at moszumanska.debian.org
Wed Aug 3 11:03:02 UTC 2016


This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository projectreactor.

commit 364154dcb1cebfd2604c82226266e9476b1fc82a
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed Aug 3 09:43:25 2016 +0200

    Refreshed the patches
---
 debian/changelog                                |   7 ++
 debian/patches/01-ignore-sonar-plugin.patch     |  56 ---------
 debian/patches/02-ignore-shadow-plugin.patch    |  38 +++---
 debian/patches/03-ignore-ide-settings.patch     |  13 ---
 debian/patches/04-ignore-jacoco.patch           |  20 ----
 debian/patches/05-kryo-compatibility.patch      |  99 ++++++++++++++--
 debian/patches/06-remove-jsr166e-backport.patch | 147 +++++++++++++++++-------
 debian/patches/07-disable-documentation.patch   |  13 +++
 debian/patches/series                           |   4 +-
 9 files changed, 235 insertions(+), 162 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9fef7d9..8381aea 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+projectreactor (2.0.8-1) UNRELEASED; urgency=medium
+
+  * New upstream release
+    - Refreshed the patches
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Tue, 31 May 2016 14:41:51 +0200
+
 projectreactor (1.1.6-1) unstable; urgency=medium
 
   * Initial release (Closes: #825125)
diff --git a/debian/patches/01-ignore-sonar-plugin.patch b/debian/patches/01-ignore-sonar-plugin.patch
deleted file mode 100644
index b062bf4..0000000
--- a/debian/patches/01-ignore-sonar-plugin.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-Description: Ignore the Sonar plugin
-Author: Emmanuel Bourg <ebourg at apache.org>
-Forwarded: not-needed
---- a/build.gradle
-+++ b/build.gradle
-@@ -280,12 +280,6 @@
- 	apply plugin: 'osgi'
- 	apply plugin: 'groovy'
- 
--	sonarRunner {
--		sonarProperties {
--			property "sonar.language", "grvy"
--		}
--	}
--
- 	dependencies {
- 		compile project(':reactor-core'),
- 						"org.codehaus.groovy:groovy-all:$groovyVersion"
-@@ -298,12 +292,6 @@
- 	apply plugin: 'osgi'
- 	apply plugin: 'groovy'
- 
--	sonarRunner {
--		sonarProperties {
--			property "sonar.language", "grvy"
--		}
--	}
--
- 	dependencies {
- 		compile project(':reactor-core'),
- 						project(':reactor-groovy-extensions'),
---- a/gradle/setup.gradle
-+++ b/gradle/setup.gradle
-@@ -14,22 +14,6 @@
-  * limitations under the License.
-  */
- apply plugin: 'groovy'
--apply plugin: 'sonar-runner'
--
--sonarRunner {
--	sonarProperties {
--		property "sonar.host.url", "$sonarHostUrl"
--		property "sonar.jdbc.url", "$sonarJdbcUrl"
--		property "sonar.jdbc.driverClassName", "$sonarJdbcDriver"
--		property "sonar.jdbc.username", "$sonarJdbcUsername"
--		property "sonar.jdbc.password", "$sonarJdbcPassword"
--		property "sonar.core.codeCoveragePlugin", "jacoco"
--		property "sonar.jacoco.reportPath", "${buildDir.name}/jacoco.exec"
--		property "sonar.links.ci", "https://build.springsource.org/browse/REACTOR-CORE"
--		property "sonar.links.issue", "https://github.com/reactor/reactor/issues"
--		property "sonar.links.scm", "https://github.com/reactor/reactor.git"
--	}
--}
- 
- task wrapper(type: Wrapper, description: "Create a Gradle self-download wrapper") {
- 	group = 'Project Setup'
diff --git a/debian/patches/02-ignore-shadow-plugin.patch b/debian/patches/02-ignore-shadow-plugin.patch
index 696fc99..33ed36d 100644
--- a/debian/patches/02-ignore-shadow-plugin.patch
+++ b/debian/patches/02-ignore-shadow-plugin.patch
@@ -4,28 +4,24 @@ Forwarded: not-needed
 
 --- a/build.gradle
 +++ b/build.gradle
-@@ -303,7 +303,6 @@
- 	description = 'Async Logback appender implementation'
+@@ -461,7 +461,6 @@
+   description = 'Async Logback appender implementation'
  
- 	apply plugin: 'application'
--	apply plugin: 'shadow'
+   apply plugin: 'application'
+-  apply plugin: 'com.github.johnrengelman.shadow'
  
- 	mainClassName = "reactor.logback.DurableLogUtility"
- 	ext.baseName = "${archivesBaseName}-${version}"
-@@ -314,16 +313,6 @@
- 						"net.openhft:chronicle:$openHftChronicleVersion",
- 						"commons-cli:commons-cli:1.2"
- 	}
+   mainClassName = "reactor.logback.DurableLogUtility"
+   ext.baseName = "${archivesBaseName}-${version}"
+@@ -474,12 +473,4 @@
+         "net.openhft:chronicle:$openHftChronicleVersion",
+         "commons-cli:commons-cli:1.2"
+   }
 -
--	shadow {
--		artifactSet {
--			exclude 'ch.qos.logback'
--			exclude 'org.slf4j'
--			exclude 'org.intellij'
--			exclude 'org.jetbrains'
--			exclude 'META-INF/maven/org.slf4j'
--		}
--	}
+-  shadowJar {
+-    dependencies {
+-      include(dependency("net.openhft:chronicle:$openHftChronicleVersion"))
+-      include(dependency("commons-cli:commons-cli:1.2"))
+-      //include(project(":reactor-core"))
+-    }
+-  }
  }
- 
- project('reactor-net') {
diff --git a/debian/patches/03-ignore-ide-settings.patch b/debian/patches/03-ignore-ide-settings.patch
deleted file mode 100644
index ad6b7e4..0000000
--- a/debian/patches/03-ignore-ide-settings.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Description: Ignore the IDE settings (the IDEA plugin breaks the build with Gradle 2.x)
-Author: Emmanuel Bourg <ebourg at apache.org>
-Forwarded: not-needed
---- a/build.gradle
-+++ b/build.gradle
-@@ -75,7 +75,6 @@
- 
- 	apply plugin: 'propdeps'
- 	apply plugin: 'java'
--	apply from: "${gradleScriptDir}/ide.gradle"
- 
- 	[compileJava, compileTestJava]*.options*.compilerArgs = [
- 			"-Xlint:varargs",
diff --git a/debian/patches/04-ignore-jacoco.patch b/debian/patches/04-ignore-jacoco.patch
deleted file mode 100644
index 0da6a9a..0000000
--- a/debian/patches/04-ignore-jacoco.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Description: Ignore the code coverage settings
-Author: Emmanuel Bourg <ebourg at apache.org>
-Forwarded: not-needed
---- a/build.gradle
-+++ b/build.gradle
-@@ -180,14 +180,6 @@
- 			springIoVersions "io.spring.platform:platform-versions:$platformVersion at properties"
- 		}
- 	}
--
--	test {
--		testLogging {
--			jvmArgs "-javaagent:${configurations.jacoco.asPath}=destfile=${buildDir}/jacoco.exec,includes=reactor.*"
--			events "failed"
--			exceptionFormat "full"
--		}
--	}
- }
- 
- configure(rootProject) {
diff --git a/debian/patches/05-kryo-compatibility.patch b/debian/patches/05-kryo-compatibility.patch
index 57c4615..fbe9af4 100644
--- a/debian/patches/05-kryo-compatibility.patch
+++ b/debian/patches/05-kryo-compatibility.patch
@@ -1,20 +1,20 @@
 Description: Make the code compatible with the version of Kryo in Debian
 Author: Emmanuel Bourg <ebourg at apache.org>
 Forwarded: not-needed
---- a/reactor-core/src/main/java/reactor/io/encoding/kryo/KryoCodec.java
-+++ b/reactor-core/src/main/java/reactor/io/encoding/kryo/KryoCodec.java
-@@ -1,8 +1,8 @@
- package reactor.io.encoding.kryo;
+--- a/reactor-core/src/main/java/reactor/io/codec/kryo/KryoCodec.java
++++ b/reactor-core/src/main/java/reactor/io/codec/kryo/KryoCodec.java
+@@ -17,8 +17,8 @@
+ package reactor.io.codec.kryo;
  
  import com.esotericsoftware.kryo.Kryo;
 -import com.esotericsoftware.kryo.io.UnsafeMemoryInput;
 -import com.esotericsoftware.kryo.io.UnsafeMemoryOutput;
 +import com.esotericsoftware.kryo.io.Input;
 +import com.esotericsoftware.kryo.io.Output;
- import reactor.function.Consumer;
- import reactor.function.Function;
- import reactor.io.Buffer;
-@@ -28,7 +28,7 @@
+ import reactor.fn.Consumer;
+ import reactor.fn.Function;
+ import reactor.io.buffer.Buffer;
+@@ -44,7 +44,7 @@
  		return new Function<byte[], IN>() {
  			@Override
  			public IN apply(byte[] bytes) {
@@ -23,7 +23,7 @@ Forwarded: not-needed
  				if(null != next) {
  					next.accept(obj);
  					return null;
-@@ -44,10 +44,11 @@
+@@ -60,10 +60,11 @@
  		return new Function<OUT, byte[]>() {
  			@Override
  			public byte[] apply(OUT o) {
@@ -37,3 +37,84 @@ Forwarded: not-needed
  			}
  		};
  	}
+--- a/reactor-core/src/main/java/reactor/io/codec/kryo/KryoPoolCodec.java
++++ b/reactor-core/src/main/java/reactor/io/codec/kryo/KryoPoolCodec.java
+@@ -17,10 +17,8 @@
+ package reactor.io.codec.kryo;
+ 
+ import com.esotericsoftware.kryo.Kryo;
+-import com.esotericsoftware.kryo.io.UnsafeMemoryInput;
+-import com.esotericsoftware.kryo.io.UnsafeMemoryOutput;
+-import com.esotericsoftware.kryo.pool.KryoFactory;
+-import com.esotericsoftware.kryo.pool.KryoPool;
++import com.esotericsoftware.kryo.io.Input;
++import com.esotericsoftware.kryo.io.Output;
+ import reactor.fn.Consumer;
+ import reactor.fn.Function;
+ import reactor.io.buffer.Buffer;
+@@ -30,62 +28,11 @@
+  * @author Jon Brisbin
+  * @author Khayretdinov Dmitriy
+  */
+-public class KryoPoolCodec<IN, OUT> extends SerializationCodec<KryoPool, IN, OUT> {
++public class KryoPoolCodec<IN, OUT> extends KryoCodec<IN, OUT> {
+     public KryoPoolCodec() {
+-        this(new KryoFactory() {
+-            @Override
+-            public Kryo create() {
+-                return new Kryo();
+-            }
+-        }, true);
+     }
+ 
+-    public KryoPoolCodec(KryoFactory kryoFactory, boolean lengthFieldFraming) {
+-        this(new KryoPool.Builder(kryoFactory).softReferences().build(), lengthFieldFraming);
+-    }
+-
+-    public KryoPoolCodec(KryoPool engine, boolean lengthFieldFraming) {
+-        super(engine, lengthFieldFraming);
+-    }
+-
+-    @Override
+-    protected Function<byte[], IN> deserializer(final KryoPool engine,
+-                                                final Class<IN> type,
+-                                                final Consumer<IN> next) {
+-        return new Function<byte[], IN>() {
+-            @Override
+-            public IN apply(byte[] bytes) {
+-                final Kryo kryo = engine.borrow();
+-                try {
+-                    IN obj = kryo.readObject(new UnsafeMemoryInput(bytes), type);
+-                    if (null != next) {
+-                        next.accept(obj);
+-                        return null;
+-                    } else {
+-                        return obj;
+-                    }
+-                } finally {
+-                    engine.release(kryo);
+-                }
+-            }
+-        };
+-    }
+-
+-    @Override
+-    protected Function<OUT, byte[]> serializer(final KryoPool engine) {
+-        return new Function<OUT, byte[]>() {
+-            @Override
+-            public byte[] apply(OUT o) {
+-                final Kryo kryo = engine.borrow();
+-                try {
+-                    UnsafeMemoryOutput out = new UnsafeMemoryOutput(Buffer.SMALL_BUFFER_SIZE, Buffer.MAX_BUFFER_SIZE);
+-                    kryo.writeObject(out, o);
+-                    out.flush();
+-                    return out.toBytes();
+-                } finally {
+-                    engine.release(kryo);
+-                }
+-            }
+-        };
++    public KryoPoolCodec(boolean lengthFieldFraming) {
++        super(new Kryo(), lengthFieldFraming);
+     }
+ }
diff --git a/debian/patches/06-remove-jsr166e-backport.patch b/debian/patches/06-remove-jsr166e-backport.patch
index 855609e..9f71084 100644
--- a/debian/patches/06-remove-jsr166e-backport.patch
+++ b/debian/patches/06-remove-jsr166e-backport.patch
@@ -1,62 +1,129 @@
 Description: Replace the JSR 166e backport with the Java 8 classes
 Author: Emmanuel Bourg <ebourg at apache.org>
 Forwarded: not-needed
---- a/reactor-core/src/main/java/reactor/event/registry/CachingRegistry.java
-+++ b/reactor-core/src/main/java/reactor/event/registry/CachingRegistry.java
-@@ -6,7 +6,7 @@
- import com.gs.collections.impl.list.mutable.FastList;
- import com.gs.collections.impl.list.mutable.MultiReaderFastList;
+--- a/reactor-bus/src/main/java/reactor/bus/registry/CachingRegistry.java
++++ b/reactor-bus/src/main/java/reactor/bus/registry/CachingRegistry.java
+@@ -23,11 +23,11 @@
  import com.gs.collections.impl.map.mutable.UnifiedMap;
--import jsr166e.ConcurrentHashMapV8;
+ import reactor.bus.selector.Selector;
+ import reactor.fn.Consumer;
+-import reactor.jarjar.jsr166e.ConcurrentHashMapV8;
+ 
+ import java.util.Iterator;
+ import java.util.List;
+ import java.util.concurrent.atomic.AtomicBoolean;
 +import java.util.concurrent.ConcurrentHashMap;
- import reactor.event.selector.Selector;
- import reactor.function.Consumer;
  
-@@ -28,7 +28,7 @@
+ /**
+  * Implementation of {@link Registry} that uses a partitioned cache that partitions on thread
+@@ -44,14 +44,14 @@
  	private final boolean                                                                        cacheNotFound;
- 	private final Consumer<Object>                                                               onNotFound;
- 	private final MultiReaderFastList<Registration<? extends T>>                                 registrations;
--	private final ConcurrentHashMapV8<Long, UnifiedMap<Object, List<Registration<? extends T>>>> threadLocalCache;
-+	private final ConcurrentHashMap<Long, UnifiedMap<Object, List<Registration<? extends T>>>> threadLocalCache;
- 
- 	public CachingRegistry() {
- 		this(true, true, null);
-@@ -39,7 +39,7 @@
- 		this.cacheNotFound=cacheNotFound;
+ 	private final Consumer<K>                                                               onNotFound;
+ 	private final MultiReaderFastList<Registration<K, ? extends V>>                                 registrations;
+-	private final ConcurrentHashMapV8<Long, UnifiedMap<Object, List<Registration<K, ? extends V>>>> threadLocalCache;
++	private final ConcurrentHashMap<Long, UnifiedMap<Object, List<Registration<K, ? extends V>>>> threadLocalCache;
+ 
+ 	 CachingRegistry(boolean useCache, boolean cacheNotFound, Consumer<K> onNotFound) {
+ 		this.useCache = useCache;
+ 		this.cacheNotFound = cacheNotFound;
  		this.onNotFound = onNotFound;
  		this.registrations = MultiReaderFastList.newList();
--		this.threadLocalCache = new ConcurrentHashMapV8<Long, UnifiedMap<Object, List<Registration<? extends T>>>>();
-+		this.threadLocalCache = new ConcurrentHashMap<Long, UnifiedMap<Object, List<Registration<? extends T>>>>();
+-		this.threadLocalCache = new ConcurrentHashMapV8<Long, UnifiedMap<Object, List<Registration<K, ? extends V>>>>();
++		this.threadLocalCache = new ConcurrentHashMap<Long, UnifiedMap<Object, List<Registration<K, ? extends V>>>>();
  	}
  
  	@Override
-@@ -154,7 +154,7 @@
+@@ -170,7 +170,7 @@
  	}
  
  	private final class NewThreadLocalRegsFn
--			implements ConcurrentHashMapV8.Fun<Long, UnifiedMap<Object, List<Registration<? extends T>>>> {
-+			implements java.util.function.Function<Long, UnifiedMap<Object, List<Registration<? extends T>>>> {
+-			implements ConcurrentHashMapV8.Fun<Long, UnifiedMap<Object, List<Registration<K, ? extends V>>>> {
++			implements java.util.function.Function<Long, UnifiedMap<Object, List<Registration<K, ? extends V>>>> {
  		@Override
- 		public UnifiedMap<Object, List<Registration<? extends T>>> apply(Long aLong) {
+ 		public UnifiedMap<Object, List<Registration<K, ? extends V>>> apply(Long aLong) {
  			return UnifiedMap.newMap();
---- a/reactor-core/src/main/java/reactor/alloc/PartitionedAllocator.java
-+++ b/reactor-core/src/main/java/reactor/alloc/PartitionedAllocator.java
-@@ -1,6 +1,6 @@
- package reactor.alloc;
+--- a/reactor-bus/src/main/java/reactor/bus/registry/SimpleCachingRegistry.java
++++ b/reactor-bus/src/main/java/reactor/bus/registry/SimpleCachingRegistry.java
+@@ -18,11 +18,11 @@
  
--import jsr166e.ConcurrentHashMapV8;
-+import java.util.concurrent.ConcurrentHashMap;
- import reactor.function.Supplier;
+ import reactor.bus.selector.Selector;
+ import reactor.fn.Consumer;
+-import reactor.jarjar.jsr166e.ConcurrentHashMapV8;
  
+ import java.util.ArrayList;
+ import java.util.Iterator;
  import java.util.List;
-@@ -13,8 +13,8 @@
++import java.util.concurrent.ConcurrentHashMap;
+ 
+ /**
+  * A naive caching Registry implementation for use in situations that the default {@code CachingRegistry} can't be used
+@@ -31,10 +31,10 @@
   */
- public abstract class PartitionedAllocator<T extends Recyclable> implements Allocator<T> {
+ public class SimpleCachingRegistry<K, V> implements Registry<K, V> {
+ 
+-	private final ConcurrentHashMapV8<Object, List<Registration<K, ? extends V>>>      cache         = new
+-			ConcurrentHashMapV8<>();
+-	private final ConcurrentHashMapV8<Selector<K>, List<Registration<K, ? extends V>>> registrations = new
+-			ConcurrentHashMapV8<>();
++	private final ConcurrentHashMap<Object, List<Registration<K, ? extends V>>>      cache         = new
++			ConcurrentHashMap<>();
++	private final ConcurrentHashMap<Selector<K>, List<Registration<K, ? extends V>>> registrations = new
++			ConcurrentHashMap<>();
+ 
+ 	private final boolean     useCache;
+ 	private final boolean     cacheNotFound;
+@@ -51,7 +51,7 @@
+ 		List<Registration<K, ? extends V>> regs;
+ 		if (null == (regs = registrations.get(sel))) {
+ 			regs = registrations.computeIfAbsent(sel,
+-					new ConcurrentHashMapV8.Fun<Selector<K>, List<Registration<K, ? extends V>>>() {
++					new java.util.function.Function<Selector<K>, List<Registration<K, ? extends V>>>() {
+ 						@Override
+ 						public List<Registration<K, ? extends V>> apply(Selector<K> selector) {
+ 							return new ArrayList<Registration<K, ? extends V>>();
+@@ -97,9 +97,9 @@
+ 		}
+ 
+ 		final List<Registration<K, ? extends V>> regs = new ArrayList<Registration<K, ? extends V>>();
+-		registrations.forEach(new ConcurrentHashMapV8.BiAction<Selector<K>, List<Registration<K, ? extends V>>>() {
++		registrations.forEach(new java.util.function.BiConsumer<Selector<K>, List<Registration<K, ? extends V>>>() {
+ 			@Override
+-			public void apply(Selector<K> selector, List<Registration<K, ? extends V>> registrations) {
++			public void accept(Selector<K> selector, List<Registration<K, ? extends V>> registrations) {
+ 				if (selector.matches(key)) {
+ 					regs.addAll(registrations);
+ 				}
+@@ -125,9 +125,9 @@
+ 	@Override
+ 	public synchronized Iterator<Registration<K, ? extends V>> iterator() {
+ 		final List<Registration<K, ? extends V>> regs = new ArrayList<Registration<K, ? extends V>>();
+-		registrations.forEach(new ConcurrentHashMapV8.BiAction<Selector<K>, List<Registration<K, ? extends V>>>() {
++		registrations.forEach(new java.util.function.BiConsumer<Selector<K>, List<Registration<K, ? extends V>>>() {
+ 			@Override
+-			public void apply(Selector<K> selector, List<Registration<K, ? extends V>> registrations) {
++			public void accept(Selector<K> selector, List<Registration<K, ? extends V>> registrations) {
+ 				regs.addAll(registrations);
+ 			}
+ 		});
+--- a/build.gradle
++++ b/build.gradle
+@@ -342,7 +342,6 @@
+     compile project(':reactor-core')
+ 
+     jsr166e "io.gatling:jsr166e:1.0 at jar"
+-    compile(files(jsr166eRepackJar))
+ 
+     // Rich Collections
+     compile "com.goldmansachs:gs-collections:$gsCollectionsVersion"
+@@ -356,11 +355,6 @@
+     manifest {
+       instruction 'Import-Package', bundleImportPackages.join(',')
+     }
+-
+-    dependsOn jsr166eRepackJar
+-    from(zipTree(jsr166eRepackJar.archivePath)) {
+-      include "reactor/jarjar/jsr166e/**"
+-    }
+   }
+ }
  
--	private final ConcurrentHashMapV8<Long, Reference<T>>     partitions = new ConcurrentHashMapV8<Long, Reference<T>>();
--	private final ConcurrentHashMapV8.Fun<Long, Reference<T>> newRefFn   = new ConcurrentHashMapV8.Fun<Long, Reference<T>>() {
-+	private final ConcurrentHashMap<Long, Reference<T>>     partitions = new ConcurrentHashMap<Long, Reference<T>>();
-+	private final java.util.function.Function<Long, Reference<T>> newRefFn   = new java.util.function.Function<Long, Reference<T>>() {
- 		@Override
- 		public Reference<T> apply(Long partId) {
- 			return new PartitionedReference<T>(factory.get(), partId);
diff --git a/debian/patches/07-disable-documentation.patch b/debian/patches/07-disable-documentation.patch
new file mode 100644
index 0000000..60b855b
--- /dev/null
+++ b/debian/patches/07-disable-documentation.patch
@@ -0,0 +1,13 @@
+Description: Disable the documentation
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: not-needed
+--- a/build.gradle
++++ b/build.gradle
+@@ -66,7 +66,6 @@
+   }
+ }
+ apply from: "$gradleScriptDir/setup.gradle"
+-apply from: "$gradleScriptDir/doc.gradle"
+ 
+ configure(allprojects) { project ->
+   group = 'io.projectreactor'
diff --git a/debian/patches/series b/debian/patches/series
index b446a6b..c8df4c8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,4 @@
-01-ignore-sonar-plugin.patch
 02-ignore-shadow-plugin.patch
-03-ignore-ide-settings.patch
-04-ignore-jacoco.patch
 05-kryo-compatibility.patch
 06-remove-jsr166e-backport.patch
+07-disable-documentation.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/projectreactor.git



More information about the pkg-java-commits mailing list