[Git][java-team/projectreactor][master] 7 commits: Wrap and sort

Emmanuel Bourg (@ebourg) gitlab at salsa.debian.org
Sun Oct 6 09:54:10 BST 2024



Emmanuel Bourg pushed to branch master at Debian Java Maintainers / projectreactor


Commits:
b73d7a1e by Emmanuel Bourg at 2019-01-05T21:57:59+01:00
Wrap and sort

- - - - -
cbcf0ad6 by Emmanuel Bourg at 2024-10-06T10:42:28+02:00
Standards-Version updated to 4.7.0

- - - - -
737a9404 by Emmanuel Bourg at 2024-10-06T10:46:18+02:00
Switch to debhelper level 13

- - - - -
c5b3c4bd by Emmanuel Bourg at 2024-10-06T10:46:18+02:00
Use salsa.debian.org Vcs-* URLs

- - - - -
25fb2443 by Emmanuel Bourg at 2024-10-06T10:46:24+02:00
Fixed the watch file

- - - - -
94d49ced by Emmanuel Bourg at 2024-10-06T10:53:04+02:00
Depend on eclipse-collections instead of gs-collections

- - - - -
a7268bc6 by Emmanuel Bourg at 2024-10-06T10:53:17+02:00
Upload to unstable

- - - - -


8 changed files:

- debian/changelog
- − debian/compat
- debian/control
- debian/maven.rules
- + debian/patches/08-eclipse-collections.patch
- debian/patches/series
- debian/rules
- debian/watch


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,13 @@
+projectreactor (2.0.8-2) unstable; urgency=medium
+
+  * Depend on eclipse-collections instead of gs-collections
+  * Standards-Version updated to 4.7.0
+  * Switch to debhelper level 13
+  * Use salsa.debian.org Vcs-* URLs
+  * Fixed the watch file
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Sun, 06 Oct 2024 10:53:09 +0200
+
 projectreactor (2.0.8-1) unstable; urgency=medium
 
   * New upstream release


=====================================
debian/compat deleted
=====================================
@@ -1 +0,0 @@
-9


=====================================
debian/control
=====================================
@@ -3,42 +3,45 @@ 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 (>= 1.3~),
-               gradle-propdeps-plugin,
-               libdisruptor-java,
-               libgs-collections-java,
-               libjackson2-databind-java,
-               libjeromq-java,
-               libjsonpath-java (>= 2.0),
-               libkryo-java,
-               libnetty-java (>= 1:4.0.40),
-               libopenhft-chronicle-queue-java (>= 3.6.0),
-               libprotobuf-java,
-               libreactive-streams-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
+Build-Depends:
+ debhelper-compat (= 13),
+ default-jdk,
+ gradle-debian-helper (>= 1.3~),
+ gradle-propdeps-plugin,
+ libdisruptor-java,
+ libeclipse-collections-java,
+ libjackson2-databind-java,
+ libjeromq-java,
+ libjsonpath-java (>= 2.0),
+ libkryo-java,
+ libnetty-java (>= 1:4.0.40),
+ libopenhft-chronicle-queue-java (>= 3.6.0),
+ libprotobuf-java,
+ libreactive-streams-java,
+ libsnappy-java,
+ maven-repo-helper
+Standards-Version: 4.7.0
+Vcs-Git: https://salsa.debian.org/java-team/projectreactor.git
+Vcs-Browser: https://salsa.debian.org/java-team/projectreactor
 Homepage: http://projectreactor.io
 
 Package: libreactor-core-java
 Architecture: all
-Depends: libdisruptor-java,
-         libgs-collections-java,
-         libnetty-java (>= 1:4.0.40),
-         libreactive-streams-java,
-         libslf4j-java,
-         ${misc:Depends}
-Suggests: libjackson2-databind-java,
-          libjeromq-java,
-          libjsonpath-java,
-          libkryo-java,
-          libopenhft-chronicle-queue-java (>= 3.6.0),
-          libprotobuf-java,
-          libsnappy-java
+Depends:
+ libdisruptor-java,
+ libeclipse-collections-java,
+ libnetty-java (>= 1:4.0.40),
+ libreactive-streams-java,
+ libslf4j-java,
+ ${misc:Depends}
+Suggests:
+ libjackson2-databind-java,
+ libjeromq-java,
+ libjsonpath-java,
+ libkryo-java,
+ libopenhft-chronicle-queue-java (>= 3.6.0),
+ 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


=====================================
debian/maven.rules
=====================================
@@ -1,3 +1,4 @@
 com.google.code.findbugs jsr305 * s/.*/0.x/ * *
 com.fasterxml.jackson.core jackson-databind * s/.*/2.x/ * *
 s/com.esotericsoftware/com.esotericsoftware.kryo/ kryo * s/.*/debian/ * *
+s/com.goldmansachs/org.eclipse.collections/ s/gs-collections/eclipse-collections/ * s/.*/debian/ * *


=====================================
debian/patches/08-eclipse-collections.patch
=====================================
@@ -0,0 +1,33 @@
+Description: Depend on eclipse-collections instead of gs-collections
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: not-needed
+--- a/reactor-bus/src/main/java/reactor/bus/registry/CachingRegistry.java
++++ b/reactor-bus/src/main/java/reactor/bus/registry/CachingRegistry.java
+@@ -16,11 +16,11 @@
+ 
+ package reactor.bus.registry;
+ 
+-import com.gs.collections.api.block.procedure.Procedure;
+-import com.gs.collections.api.list.MutableList;
+-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 org.eclipse.collections.api.block.procedure.Procedure;
++import org.eclipse.collections.api.list.MutableList;
++import org.eclipse.collections.impl.list.mutable.FastList;
++import org.eclipse.collections.impl.list.mutable.MultiReaderFastList;
++import org.eclipse.collections.impl.map.mutable.UnifiedMap;
+ import reactor.bus.selector.Selector;
+ import reactor.fn.Consumer;
+ 
+--- a/reactor-bus/src/main/java/reactor/bus/registry/Registries.java
++++ b/reactor-bus/src/main/java/reactor/bus/registry/Registries.java
+@@ -28,7 +28,7 @@
+ 
+ 	static {
+ 		try {
+-			GS_COLLECTIONS_AVAILABLE = (null != Class.forName("com.gs.collections.api.list.MutableList"));
++			GS_COLLECTIONS_AVAILABLE = (null != Class.forName("org.eclipse.collections.api.list.MutableList"));
+ 		} catch (ClassNotFoundException e) {
+ 		}
+ 	}


=====================================
debian/patches/series
=====================================
@@ -2,3 +2,4 @@
 05-kryo-compatibility.patch
 06-remove-jsr166e-backport.patch
 07-disable-documentation.patch
+08-eclipse-collections.patch


=====================================
debian/rules
=====================================
@@ -6,5 +6,4 @@
 override_dh_auto_build:
 	dh_auto_build -- :reactor-core:install :reactor-net:install :reactor-bus:install :reactor-stream:install -x javadoc
 
-get-orig-source:
-	uscan --download-current-version --rename --force-download
+override_dh_auto_test:


=====================================
debian/watch
=====================================
@@ -1,2 +1,3 @@
-version=3
-https://github.com/reactor/reactor/tags .*/v?([\d\.]+).RELEASE.tar.gz
+version=4
+opts="mode=git,repack,compression=xz" \
+https://github.com/reactor/reactor refs/tags/v?([\d\.]+).RELEASE



View it on GitLab: https://salsa.debian.org/java-team/projectreactor/-/compare/0cb1a64a6bfdac9c9af8d0ec9aa6aeb5e595a71f...a7268bc6484b06a876e50de06d3d4cc6bebd69fc

-- 
View it on GitLab: https://salsa.debian.org/java-team/projectreactor/-/compare/0cb1a64a6bfdac9c9af8d0ec9aa6aeb5e595a71f...a7268bc6484b06a876e50de06d3d4cc6bebd69fc
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20241006/41101f36/attachment.htm>


More information about the pkg-java-commits mailing list