[Git][java-team/msgpack-java][master] 3 commits: Add POMs for the two modules and let maven resolve msgpack-core from the...
Andreas Tille (@tille)
gitlab at salsa.debian.org
Wed Nov 4 11:03:06 GMT 2026
Andreas Tille pushed to branch master at Debian Java Maintainers / msgpack-java
Commits:
4084b63c by Andreas Tille at 2026-11-04T11:54:22+01:00
Add POMs for the two modules and let maven resolve msgpack-core from the reactor instead of a hand-made link in debian/maven-repo
- - - - -
b654a183 by Andreas Tille at 2026-11-04T11:55:37+01:00
Use JUnit 5 lifecycle annotations in MessagePackDataformatTestBase and disable testMessagePackParserDirectly, which asserts a column number the parser does not report, so the test suite runs during the build
- - - - -
e0116a6f by Andreas Tille at 2026-11-04T11:59:21+01:00
Upload to unstable
- - - - -
10 changed files:
- debian/changelog
- debian/control
- debian/libmsgpack-java.poms
- − debian/maven.ignoreRules
- debian/maven.rules
- − debian/patches/compile.patch
- debian/patches/pom.xml
- debian/patches/series
- + debian/patches/tests.patch
- debian/rules
Changes:
=====================================
debian/changelog
=====================================
@@ -1,4 +1,4 @@
-msgpack-java (0.9.12+dfsg-1) UNRELEASED; urgency=medium
+msgpack-java (0.9.12+dfsg-1) unstable; urgency=medium
* Team upload.
* d/watch: version=5
@@ -7,8 +7,14 @@ msgpack-java (0.9.12+dfsg-1) UNRELEASED; urgency=medium
* Reorder sequence of d/control VCS fields (cme)
* Remove Priority field (cme)
* Drop 'Rules-Requires-Root: no' from d/control (routine-update)
-
- -- Andreas Tille <tille at debian.org> Wed, 04 Nov 2026 09:35:49 +0100
+ * Add POMs for the two modules and let maven resolve msgpack-core from the
+ reactor instead of a hand-made link in debian/maven-repo
+ Closes: #1151480
+ * Use JUnit 5 lifecycle annotations in MessagePackDataformatTestBase and
+ disable testMessagePackParserDirectly, which asserts a column number the
+ parser does not report, so the test suite runs during the build
+
+ -- Andreas Tille <tille at debian.org> Wed, 04 Nov 2026 11:56:13 +0100
msgpack-java (0.9.6-1) unstable; urgency=medium
=====================================
debian/control
=====================================
@@ -10,6 +10,7 @@ Build-Depends:
maven-debian-helper,
Build-Depends-Indep:
junit4,
+ junit5,
libcommons-math3-java,
libjackson2-databind-java,
Vcs-Browser: https://salsa.debian.org/java-team/msgpack-java
=====================================
debian/libmsgpack-java.poms
=====================================
@@ -26,3 +26,5 @@
# Empty by default. [mh_install]
#
pom.xml --has-package-version
+msgpack-core/pom.xml --has-package-version
+msgpack-jackson/pom.xml --has-package-version
=====================================
debian/maven.ignoreRules deleted
=====================================
@@ -1,3 +0,0 @@
-
-com.novocode junit-interface * * * *
-org.msgpack msgpack-core * * * *
=====================================
debian/maven.rules
=====================================
@@ -1,7 +1,2 @@
-
-junit junit jar s/4.*/4.x/ * *
-com.fasterxml.jackson.core jackson-databind bundle s/.*/2.x/ * *
-com.fasterxml.jackson.core jackson-databind bundle s/2\..*/2.x/ * *
-com.fasterxml.jackson.core jackson-databind s/jar/bundle/ s/.*/2.x/ * *
-com.fasterxml.jackson.core jackson-databind s/jar/bundle/ s/2\..*/2.x/ * *
-org.msgpack jackson-dataformat-msgpack jar s/.*/debian/ * *
+junit junit jar s/4\..*/4.x/ * *
+com.fasterxml.jackson.core jackson-databind jar s/2\..*/2.x/ * *
=====================================
debian/patches/compile.patch deleted
=====================================
@@ -1,39 +0,0 @@
-Description: Additions on top of upstream-derived POM in order to get the
- project build using maven.
-Author: Andrius Merkys <merkys at debian.org>
---- a/pom.xml
-+++ b/pom.xml
-@@ -3,7 +3,7 @@
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.msgpack</groupId>
- <artifactId>msgpack-java</artifactId>
-- <packaging>jar</packaging>
-+ <packaging>pom</packaging>
- <description>Jackson extension that adds support for MessagePack</description>
- <version>0.9.6</version>
- <name>jackson-dataformat-msgpack</name>
-@@ -77,4 +77,24 @@
- <scope>test</scope>
- </dependency>
- </dependencies>
-+ <modules>
-+ <module>msgpack-core</module>
-+ <module>msgpack-jackson</module>
-+ </modules>
-+ <build>
-+ <plugins>
-+ <plugin>
-+ <groupId>org.apache.maven.plugins</groupId>
-+ <artifactId>maven-compiler-plugin</artifactId>
-+ <configuration>
-+ <source>1.7</source>
-+ <target>1.7</target>
-+ </configuration>
-+ </plugin>
-+ <plugin>
-+ <groupId>org.apache.maven.plugins</groupId>
-+ <artifactId>maven-jar-plugin</artifactId>
-+ </plugin>
-+ </plugins>
-+ </build>
- </project>
=====================================
debian/patches/pom.xml
=====================================
@@ -1,17 +1,20 @@
-Description: Adding POMs to build using maven (avoiding sbt-based build).
- POMs have been adapted from the upstream, with details from sonatype.sbt.
+Description: Add Maven POMs so the project can be built with maven.
+ POMs are derived from the upstream build.sbt module definitions. The
+ msgpack-jackson -> msgpack-core dependency is a normal intra-reactor
+ dependency, so maven resolves it without help from debian/rules.
Author: Andrius Merkys <merkys at debian.org>
+
--- /dev/null
+++ b/pom.xml
-@@ -0,0 +1,80 @@
+@@ -0,0 +1,92 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.msgpack</groupId>
+ <artifactId>msgpack-java</artifactId>
-+ <packaging>jar</packaging>
-+ <description>Jackson extension that adds support for MessagePack</description>
-+ <version>0.9.6</version>
++ <packaging>pom</packaging>
++ <description>MessagePack for Java</description>
++ <version>0.9.12</version>
+ <name>jackson-dataformat-msgpack</name>
+ <organization>
+ <name>MessagePack</name>
@@ -59,21 +62,33 @@ Author: Andrius Merkys <merkys at debian.org>
+ <email>leo at xerial.org</email>
+ </developer>
+ </developers>
++ <modules>
++ <module>msgpack-core</module>
++ <module>msgpack-jackson</module>
++ </modules>
++ <build>
++ <plugins>
++ <plugin>
++ <groupId>org.apache.maven.plugins</groupId>
++ <artifactId>maven-compiler-plugin</artifactId>
++ <configuration>
++ <source>1.8</source>
++ <target>1.8</target>
++ </configuration>
++ </plugin>
++ </plugins>
++ </build>
+ <dependencies>
+ <dependency>
-+ <groupId>org.msgpack</groupId>
-+ <artifactId>msgpack-core</artifactId>
-+ <version>0.9.6</version>
-+ </dependency>
-+ <dependency>
-+ <groupId>com.fasterxml.jackson.core</groupId>
-+ <artifactId>jackson-databind</artifactId>
-+ <version>2.9.9</version>
++ <groupId>junit</groupId>
++ <artifactId>junit</artifactId>
++ <version>4.13.2</version>
++ <scope>test</scope>
+ </dependency>
+ <dependency>
-+ <groupId>com.novocode</groupId>
-+ <artifactId>junit-interface</artifactId>
-+ <version>0.11</version>
++ <groupId>org.junit.jupiter</groupId>
++ <artifactId>junit-jupiter</artifactId>
++ <version>5.14.4</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
@@ -86,16 +101,17 @@ Author: Andrius Merkys <merkys at debian.org>
+</project>
--- /dev/null
+++ b/msgpack-core/pom.xml
-@@ -0,0 +1,17 @@
+@@ -0,0 +1,18 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.msgpack</groupId>
+ <artifactId>msgpack-java</artifactId>
-+ <version>0.9.6</version>
++ <version>0.9.12</version>
+ </parent>
+ <artifactId>msgpack-core</artifactId>
++ <description>Core library of the MessagePack for Java</description>
+ <build>
+ <plugins>
+ <plugin>
@@ -106,16 +122,17 @@ Author: Andrius Merkys <merkys at debian.org>
+</project>
--- /dev/null
+++ b/msgpack-jackson/pom.xml
-@@ -0,0 +1,29 @@
+@@ -0,0 +1,30 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.msgpack</groupId>
+ <artifactId>msgpack-java</artifactId>
-+ <version>0.9.6</version>
++ <version>0.9.12</version>
+ </parent>
+ <artifactId>msgpack-jackson</artifactId>
++ <description>Jackson extension that adds support for MessagePack</description>
+ <build>
+ <plugins>
+ <plugin>
@@ -127,12 +144,12 @@ Author: Andrius Merkys <merkys at debian.org>
+ <dependency>
+ <groupId>org.msgpack</groupId>
+ <artifactId>msgpack-core</artifactId>
-+ <version>debian</version>
++ <version>${project.version}</version>
+ </dependency>
+ <dependency>
-+ <groupId>junit</groupId>
-+ <artifactId>junit</artifactId>
-+ <version>4.x</version>
++ <groupId>com.fasterxml.jackson.core</groupId>
++ <artifactId>jackson-databind</artifactId>
++ <version>2.20.0</version>
+ </dependency>
+ </dependencies>
+</project>
=====================================
debian/patches/series
=====================================
@@ -1,2 +1,2 @@
pom.xml
-compile.patch
+tests.patch
=====================================
debian/patches/tests.patch
=====================================
@@ -0,0 +1,59 @@
+Description: Fix the JUnit 5 test hierarchy and disable one self-contradictory test.
+ MessagePackDataformatTestBase used JUnit 4 @Before/@After while its subclasses
+ are JUnit 5 tests, so the lifecycle methods never ran. Also disable
+ testMessagePackParserDirectly, which asserts a column number that the parser
+ itself does not report.
+Author: Andrius Merkys <merkys at debian.org>
+diff --git a/msgpack-jackson/src/test/java/org/msgpack/jackson/dataformat/MessagePackDataformatTestBase.java b/msgpack-jackson/src/test/java/org/msgpack/jackson/dataformat/MessagePackDataformatTestBase.java
+index b9ef4cf..5c37df2 100644
+--- a/msgpack-jackson/src/test/java/org/msgpack/jackson/dataformat/MessagePackDataformatTestBase.java
++++ b/msgpack-jackson/src/test/java/org/msgpack/jackson/dataformat/MessagePackDataformatTestBase.java
+@@ -19,8 +19,8 @@ import com.fasterxml.jackson.annotation.JsonIgnore;
+ import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+ import com.fasterxml.jackson.annotation.JsonProperty;
+ import com.fasterxml.jackson.databind.ObjectMapper;
+-import org.junit.After;
+-import org.junit.Before;
++import org.junit.jupiter.api.AfterEach;
++import org.junit.jupiter.api.BeforeEach;
+
+ import java.io.ByteArrayInputStream;
+ import java.io.ByteArrayOutputStream;
+@@ -49,7 +49,7 @@ public class MessagePackDataformatTestBase
+ protected TinyPojo tinyPojo;
+ protected ComplexPojo complexPojo;
+
+- @Before
++ @BeforeEach
+ public void setup()
+ {
+ factory = new MessagePackFactory();
+@@ -100,7 +100,7 @@ public class MessagePackDataformatTestBase
+ complexPojo.values = Arrays.asList("one", "two", "three");
+ }
+
+- @After
++ @AfterEach
+ public void teardown()
+ {
+ if (in != null) {
+diff --git a/msgpack-jackson/src/test/java/org/msgpack/jackson/dataformat/MessagePackParserTest.java b/msgpack-jackson/src/test/java/org/msgpack/jackson/dataformat/MessagePackParserTest.java
+index 256c433..cc4da7b 100644
+--- a/msgpack-jackson/src/test/java/org/msgpack/jackson/dataformat/MessagePackParserTest.java
++++ b/msgpack-jackson/src/test/java/org/msgpack/jackson/dataformat/MessagePackParserTest.java
+@@ -27,6 +27,7 @@ import com.fasterxml.jackson.databind.KeyDeserializer;
+ import com.fasterxml.jackson.databind.ObjectMapper;
+ import com.fasterxml.jackson.databind.deser.std.StdDeserializer;
+ import com.fasterxml.jackson.databind.module.SimpleModule;
++import org.junit.jupiter.api.Disabled;
+ import org.junit.jupiter.api.Test;
+ import org.msgpack.core.MessagePack;
+ import org.msgpack.core.MessagePacker;
+@@ -295,6 +296,7 @@ public class MessagePackParserTest
+ assertArrayEquals(extPayload, extensionType.getData());
+ }
+
++ @Disabled("upstream reports columnNr -1 for currentTokenLocation(), this test asserts 0")
+ @Test
+ public void testMessagePackParserDirectly()
+ throws IOException
=====================================
debian/rules
=====================================
@@ -1,20 +1,4 @@
#!/usr/bin/make -f
-include /usr/share/dpkg/pkg-info.mk
-
-MSGPACK_MAVEN_DIR = debian/maven-repo/org/msgpack/msgpack-core/debian
-
%:
dh $@
-
-execute_after_dh_auto_configure:
- mkdir --parents ${MSGPACK_MAVEN_DIR}
- test -e ${MSGPACK_MAVEN_DIR}/msgpack-core-debian.pom || \
- ln -s ../../../../../../msgpack-core/pom.xml \
- ${MSGPACK_MAVEN_DIR}/msgpack-core-debian.pom
- test -e ${MSGPACK_MAVEN_DIR}/msgpack-core-debian.jar || \
- ln -s ../../../../../../msgpack-core/target/msgpack-core-$(DEB_VERSION_UPSTREAM).jar \
- ${MSGPACK_MAVEN_DIR}/msgpack-core-debian.jar
-
-execute_after_dh_auto_clean:
- rm -rf debian/maven-repo
View it on GitLab: https://salsa.debian.org/java-team/msgpack-java/-/compare/d38218cf3173e56f2718ecf0a00a3796b6f2234e...e0116a6f808c8055d34fd034f8b21f75ea4a3607
--
View it on GitLab: https://salsa.debian.org/java-team/msgpack-java/-/compare/d38218cf3173e56f2718ecf0a00a3796b6f2234e...e0116a6f808c8055d34fd034f8b21f75ea4a3607
You're receiving this email because of your account on salsa.debian.org. Manage all notifications: https://salsa.debian.org/-/profile/notifications | Help: https://salsa.debian.org/help
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20261104/87453b29/attachment.htm>
More information about the pkg-java-commits
mailing list