Tobias Ilte pushed to branch master at Debian Java Maintainers / stegosuite
Commits: d88093eb by Tobias Ilte at 2026-10-04T22:38:33-04:00 Drop fix-pom-for-debian.patch; upstream now supports the Debian build via a distro profile and maven.properties - - - - - 227b1a75 by Tobias Ilte at 2026-10-04T22:40:03-04:00 drop liblogback,libslf4j dependencies (removed upstream); switch to java21 - - - - - 1c424c18 by Tobias Ilte at 2026-10-04T22:40:36-04:00 update links to new version - - - - - 4149c30d by Tobias Ilte at 2026-10-04T22:41:30-04:00 add junit.jupiter to ignoreRules - - - - - fd802804 by Tobias Ilte at 2026-10-04T22:42:15-04:00 add maven properties to build for debian - - - - - 6 changed files: - debian/control - debian/maven.ignoreRules - debian/maven.properties - − debian/patches/fix-pom-for-debian.patch - debian/patches/series - debian/stegosuite.links Changes: ===================================== debian/control ===================================== @@ -3,14 +3,12 @@ Section: graphics Priority: optional Maintainer: Debian Java Maintainers <[email protected]> Uploaders: - Tobias Ilte <[email protected]> + Tobias Ilte <[email protected]> Build-Depends: debhelper-compat (= 13), default-jdk, - liblogback-java, libmaven-compiler-plugin-java, libmaven-jar-plugin-java, - libslf4j-java, libswt-gtk-4-java, libpicocli-java, maven-debian-helper (>= 1.5) @@ -23,7 +21,7 @@ Rules-Requires-Root: no Package: stegosuite Architecture: all Depends: - default-jre | java11-runtime, + default-jre | java21-runtime, libswt-cairo-gtk-4-jni, libswt-gtk-4-jni, libpicocli-java (>= 4.6.2), ===================================== debian/maven.ignoreRules ===================================== @@ -2,3 +2,4 @@ org.apache.maven.plugins maven-assembly-plugin * * * * org.codehaus.mojo exec-maven-plugin * * * * org.asciidoctor asciidoctor-maven-plugin * * * * junit junit * * * * +org.junit.jupiter junit-jupiter * * * * ===================================== debian/maven.properties ===================================== @@ -3,3 +3,7 @@ # maven.test.skip=true maven.test.skip=true +stegosuite.distro=true +maven.compiler.release=21 +swt.version=debian +picocli.version=debian ===================================== debian/patches/fix-pom-for-debian.patch deleted ===================================== @@ -1,54 +0,0 @@ -adjusted swt dependency and maven-jar-plugin for debian ---- a/pom.xml -+++ b/pom.xml -@@ -36,16 +36,6 @@ - <configuration> - <source>11</source> - <target>11</target> -- <annotationProcessorPaths> -- <path> -- <groupId>info.picocli</groupId> -- <artifactId>picocli-codegen</artifactId> -- <version>4.6.3</version> -- </path> -- </annotationProcessorPaths> -- <compilerArgs> -- <arg>-Aproject=${project.groupId}/${project.artifactId}</arg> -- </compilerArgs> - </configuration> - </plugin> - <plugin> -@@ -130,12 +120,16 @@ - <plugin> - <artifactId>maven-jar-plugin</artifactId> - <version>3.1.2</version> -- <executions> -- <execution> -- <id>default-jar</id> -- <phase>none</phase> -- </execution> -- </executions> -+ <configuration> -+ <archive> -+ <manifest> -+ <addClasspath>true</addClasspath> -+ <mainClass>org.stegosuite.Stegosuite</mainClass> -+ <classpathLayoutType>custom</classpathLayoutType> -+ <customClasspathLayout>/usr/share/java/$${artifact.artifactId}$${dashClassifier?}.jar</customClasspathLayout> -+ </manifest> -+ </archive> -+ </configuration> - </plugin> - <plugin> - <groupId>org.asciidoctor</groupId> -@@ -163,8 +157,8 @@ - - <dependencies> - <dependency> -- <groupId>${swt.groupId}</groupId> -- <artifactId>${swt.artifactId}</artifactId> -+ <groupId>org.eclipse.swt</groupId> -+ <artifactId>org.eclipse.swt</artifactId> - <version>3.121.0</version> - </dependency> - <dependency> ===================================== debian/patches/series ===================================== @@ -1 +0,0 @@ -fix-pom-for-debian.patch ===================================== debian/stegosuite.links ===================================== @@ -1 +1 @@ -/usr/share/maven-repo/org/stegosuite/stegosuite/debian/stegosuite-debian.jar /usr/share/stegosuite/stegosuite-0.9.0.jar +/usr/share/maven-repo/org/stegosuite/stegosuite/debian/stegosuite-debian.jar /usr/share/stegosuite/stegosuite-0.9.1.jar View it on GitLab: https://salsa.debian.org/java-team/stegosuite/-/compare/e41d08a15eef4ff65e9d9db97be07463c24dfe7a...fd802804616a11e7aff451967bb43b2d28328355 -- View it on GitLab: https://salsa.debian.org/java-team/stegosuite/-/compare/e41d08a15eef4ff65e9d9db97be07463c24dfe7a...fd802804616a11e7aff451967bb43b2d28328355 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
_______________________________________________ pkg-java-commits mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-java-commits
