[projectreactor] 02/04: Initial packaging

Emmanuel Bourg ebourg-guest at moszumanska.debian.org
Fri May 27 07:01:50 UTC 2016


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

ebourg-guest pushed a commit to annotated tag debian/1.1.6-1
in repository projectreactor.

commit 50c6aa8a445f1838ea16c1bfcbda13360177669e
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Tue May 24 10:06:32 2016 +0200

    Initial packaging
---
 debian/changelog                                |  5 ++
 debian/compat                                   |  1 +
 debian/control                                  | 46 ++++++++++++++++++
 debian/copyright                                | 17 +++++++
 debian/libreactor-core-java.poms                | 29 ++++++++++++
 debian/maven.ignoreRules                        |  4 ++
 debian/maven.rules                              |  2 +
 debian/patches/01-ignore-sonar-plugin.patch     | 56 ++++++++++++++++++++++
 debian/patches/02-ignore-shadow-plugin.patch    | 31 +++++++++++++
 debian/patches/03-ignore-ide-settings.patch     | 13 ++++++
 debian/patches/04-ignore-jacoco.patch           | 20 ++++++++
 debian/patches/05-kryo-compatibility.patch      | 39 ++++++++++++++++
 debian/patches/06-remove-jsr166e-backport.patch | 62 +++++++++++++++++++++++++
 debian/patches/series                           |  6 +++
 debian/rules                                    | 14 ++++++
 debian/source/format                            |  1 +
 debian/watch                                    |  2 +
 17 files changed, 348 insertions(+)

diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 0000000..9fef7d9
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,5 @@
+projectreactor (1.1.6-1) unstable; urgency=medium
+
+  * Initial release (Closes: #825125)
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Tue, 24 May 2016 09:05:58 +0200
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 0000000..ec63514
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+9
diff --git a/debian/control b/debian/control
new file mode 100644
index 0000000..38c04dc
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,46 @@
+Source: projectreactor
+Section: java
+Priority: optional
+Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+Uploaders: Emmanuel Bourg <ebourg at apache.org>
+Build-Depends: debhelper (>= 9),
+               default-jdk,
+               gradle-debian-helper,
+               gradle-propdeps-plugin,
+               libdisruptor-java,
+               libgs-collections-java,
+               libjackson2-databind-java,
+               libjeromq-java,
+               libjsonpath-java,
+               libkryo-java,
+               libnetty-java (>= 1:4.0.36-2~),
+               libopenhft-chronicle-queue-java,
+               libprotobuf-java,
+               libsnappy-java,
+               maven-repo-helper
+Standards-Version: 3.9.8
+Vcs-Git: https://anonscm.debian.org/git/pkg-java/projectreactor.git
+Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/projectreactor.git
+Homepage: http://projectreactor.io
+
+Package: libreactor-core-java
+Architecture: all
+Depends: libdisruptor-java,
+         libgs-collections-java,
+         libnetty-java (>= 1:4.0.36-2~),
+         libslf4j-java,
+         ${misc:Depends}
+Suggests: libjackson2-databind-java,
+          libjeromq-java,
+          libjsonpath-java,
+          libkryo-java,
+          libopenhft-chronicle-queue-java,
+          libprotobuf-java,
+          libsnappy-java
+Description: Reactive Streams Specification Implementation
+ Reactor is a foundational library building for reactive fast data applications
+ on the JVM. It provides abstractions for Java, Groovy and other JVM languages
+ to make building event and data-driven applications easier. Various dispatchers
+ are available to provide the developer with a range of choices from thread-pool
+ style, long-running task execution to non-blocking, high-volume task
+ dispatching.
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 0000000..513c8f5
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,17 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: Project Reactor
+Source: https://github.com/reactor/reactor
+Files-Excluded: gradle/wrapper
+                gradlew*
+
+Files: *
+Copyright: 2011-2013, GoPivotal, Inc.
+License: Apache-2.0
+
+Files: debian/*
+Copyright: 2016, Emmanuel Bourg <ebourg at apache.org>
+License: Apache-2.0
+
+License: Apache-2.0
+ On Debian systems, the full text of the Apache-2.0 license
+ can be found in the file '/usr/share/common-licenses/Apache-2.0'
diff --git a/debian/libreactor-core-java.poms b/debian/libreactor-core-java.poms
new file mode 100644
index 0000000..5a35fb4
--- /dev/null
+++ b/debian/libreactor-core-java.poms
@@ -0,0 +1,29 @@
+# List of POM files for the package
+# Format of this file is:
+# <path to pom file> [option]*
+# where option can be:
+#   --ignore: ignore this POM and its artifact if any
+#   --ignore-pom: don't install the POM. To use on POM files that are created
+#     temporarily for certain artifacts such as Javadoc jars. [mh_install, mh_installpoms]
+#   --no-parent: remove the <parent> tag from the POM
+#   --package=<package>: an alternative package to use when installing this POM
+#      and its artifact
+#   --has-package-version: to indicate that the original version of the POM is the same as the upstream part
+#      of the version for the package.
+#   --keep-elements=<elem1,elem2>: a list of XML elements to keep in the POM
+#      during a clean operation with mh_cleanpom or mh_installpom
+#   --artifact=<path>: path to the build artifact associated with this POM,
+#      it will be installed when using the command mh_install. [mh_install]
+#   --java-lib: install the jar into /usr/share/java to comply with Debian
+#      packaging guidelines
+#   --usj-name=<name>: name to use when installing the library in /usr/share/java
+#   --usj-version=<version>: version to use when installing the library in /usr/share/java
+#   --no-usj-versionless: don't install the versionless link in /usr/share/java
+#   --dest-jar=<path>: the destination for the real jar.
+#     It will be installed with mh_install. [mh_install]
+#   --classifier=<classifier>: Optional, the classifier for the jar. Empty by default.
+#   --site-xml=<location>: Optional, the location for site.xml if it needs to be installed.
+#     Empty by default. [mh_install]
+#
+reactor-core/build/poms/pom-default.xml --java-lib --artifact=reactor-core/build/libs/reactor-core-*.RELEASE.jar
+reactor-net/build/poms/pom-default.xml  --java-lib --artifact=reactor-net/build/libs/reactor-net-*.RELEASE.jar
diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules
new file mode 100644
index 0000000..63760a0
--- /dev/null
+++ b/debian/maven.ignoreRules
@@ -0,0 +1,4 @@
+com.github.jengelman.gradle.plugins shadow * * * *
+org.jacoco org.jacoco.agent * * * *
+org.springframework.build.gradle spring-io-plugin * * * *
+io.gatling jsr166e * * * *
diff --git a/debian/maven.rules b/debian/maven.rules
new file mode 100644
index 0000000..e40cb2d
--- /dev/null
+++ b/debian/maven.rules
@@ -0,0 +1,2 @@
+com.google.code.findbugs jsr305 * s/.*/0.x/ * *
+com.fasterxml.jackson.core jackson-databind * s/.*/2.x/ * *
diff --git a/debian/patches/01-ignore-sonar-plugin.patch b/debian/patches/01-ignore-sonar-plugin.patch
new file mode 100644
index 0000000..b062bf4
--- /dev/null
+++ b/debian/patches/01-ignore-sonar-plugin.patch
@@ -0,0 +1,56 @@
+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
new file mode 100644
index 0000000..696fc99
--- /dev/null
+++ b/debian/patches/02-ignore-shadow-plugin.patch
@@ -0,0 +1,31 @@
+Description: Ignore the Shadow plugin
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: not-needed
+
+--- a/build.gradle
++++ b/build.gradle
+@@ -303,7 +303,6 @@
+ 	description = 'Async Logback appender implementation'
+ 
+ 	apply plugin: 'application'
+-	apply plugin: 'shadow'
+ 
+ 	mainClassName = "reactor.logback.DurableLogUtility"
+ 	ext.baseName = "${archivesBaseName}-${version}"
+@@ -314,16 +313,6 @@
+ 						"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'
+-		}
+-	}
+ }
+ 
+ project('reactor-net') {
diff --git a/debian/patches/03-ignore-ide-settings.patch b/debian/patches/03-ignore-ide-settings.patch
new file mode 100644
index 0000000..ad6b7e4
--- /dev/null
+++ b/debian/patches/03-ignore-ide-settings.patch
@@ -0,0 +1,13 @@
+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
new file mode 100644
index 0000000..0da6a9a
--- /dev/null
+++ b/debian/patches/04-ignore-jacoco.patch
@@ -0,0 +1,20 @@
+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
new file mode 100644
index 0000000..57c4615
--- /dev/null
+++ b/debian/patches/05-kryo-compatibility.patch
@@ -0,0 +1,39 @@
+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;
+ 
+ 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 @@
+ 		return new Function<byte[], IN>() {
+ 			@Override
+ 			public IN apply(byte[] bytes) {
+-				IN obj = engine.readObject(new UnsafeMemoryInput(bytes), type);
++				IN obj = engine.readObject(new Input(bytes), type);
+ 				if(null != next) {
+ 					next.accept(obj);
+ 					return null;
+@@ -44,10 +44,11 @@
+ 		return new Function<OUT, byte[]>() {
+ 			@Override
+ 			public byte[] apply(OUT o) {
+-				UnsafeMemoryOutput out = new UnsafeMemoryOutput(Buffer.SMALL_BUFFER_SIZE, Buffer.MAX_BUFFER_SIZE);
++				java.io.ByteArrayOutputStream bout = new java.io.ByteArrayOutputStream();
++				Output out = new Output(bout);
+ 				engine.writeObject(out, o);
+ 				out.flush();
+-				return out.toBytes();
++				return bout.toByteArray();
+ 			}
+ 		};
+ 	}
diff --git a/debian/patches/06-remove-jsr166e-backport.patch b/debian/patches/06-remove-jsr166e-backport.patch
new file mode 100644
index 0000000..855609e
--- /dev/null
+++ b/debian/patches/06-remove-jsr166e-backport.patch
@@ -0,0 +1,62 @@
+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;
+ import com.gs.collections.impl.map.mutable.UnifiedMap;
+-import jsr166e.ConcurrentHashMapV8;
++import java.util.concurrent.ConcurrentHashMap;
+ import reactor.event.selector.Selector;
+ import reactor.function.Consumer;
+ 
+@@ -28,7 +28,7 @@
+ 	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;
+ 		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>>>>();
+ 	}
+ 
+ 	@Override
+@@ -154,7 +154,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>>>> {
+ 		@Override
+ 		public UnifiedMap<Object, List<Registration<? extends T>>> 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;
+ 
+-import jsr166e.ConcurrentHashMapV8;
++import java.util.concurrent.ConcurrentHashMap;
+ import reactor.function.Supplier;
+ 
+ import java.util.List;
+@@ -13,8 +13,8 @@
+  */
+ public abstract class PartitionedAllocator<T extends Recyclable> implements Allocator<T> {
+ 
+-	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/series b/debian/patches/series
new file mode 100644
index 0000000..b446a6b
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,6 @@
+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
diff --git a/debian/rules b/debian/rules
new file mode 100755
index 0000000..e13bd6b
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,14 @@
+#!/usr/bin/make -f
+
+%:
+	dh $@ --buildsystem=gradle --with maven_repo_helper
+
+override_dh_auto_build:
+	dh_auto_build -- :reactor-core:install :reactor-net:install -Duser.home=.
+
+override_dh_auto_clean:
+	dh_auto_clean
+	rm -Rf .m2
+
+get-orig-source:
+	uscan --download-current-version --rename --force-download
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 0000000..0796acb
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,2 @@
+version=3
+https://github.com/reactor/reactor/tags .*/v?([\d\.]+).RELEASE.tar.gz

-- 
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