From dc27ce6816f27cced51b1a0d6011db34ccc933e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Charaoui?= Date: Wed, 14 Oct 2026 23:25:50 -0400 Subject: [PATCH] Fix FTBFS with slf4j 2.x Closes: #1149452 --- debian/control | 2 +- debian/libmina-sshd-java.classpath | 12 ++++++------ debian/maven.rules | 1 + 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/debian/control b/debian/control index 826ef06..28be1e3 100644 --- a/debian/control +++ b/debian/control @@ -37,7 +37,7 @@ Build-Depends-Indep: groovy, libmockito-java, libmina2-java, libnetty-java, - libslf4j-java, + libslf4j2-java, libspring-context-java, libspring-core-java, libtomcat9-java diff --git a/debian/libmina-sshd-java.classpath b/debian/libmina-sshd-java.classpath index 62a42be..921111e 100644 --- a/debian/libmina-sshd-java.classpath +++ b/debian/libmina-sshd-java.classpath @@ -1,10 +1,10 @@ -usr/share/java/sshd-cli.jar /usr/share/java/slf4j-api.jar /usr/share/java/sshd-common.jar /usr/share/java/sshd-core.jar /usr/share/java/sshd-scp.jar /usr/share/java/sshd-sftp.jar +usr/share/java/sshd-cli.jar /usr/share/maven-repo/org/slf4j/slf4j-api/2.x/slf4j-api-2.x.jar /usr/share/java/sshd-common.jar /usr/share/java/sshd-core.jar /usr/share/java/sshd-scp.jar /usr/share/java/sshd-sftp.jar -usr/share/java/sshd-common.jar /usr/share/java/bcpkix.jar /usr/share/java/bcprov.jar /usr/share/java/eddsa.jar /usr/share/java/slf4j-api.jar /usr/share/java/sshd-contrib.jar +usr/share/java/sshd-common.jar /usr/share/java/bcpkix.jar /usr/share/java/bcprov.jar /usr/share/java/eddsa.jar /usr/share/maven-repo/org/slf4j/slf4j-api/2.x/slf4j-api-2.x.jar /usr/share/java/sshd-contrib.jar -usr/share/java/sshd-contrib.jar /usr/share/java/slf4j-api.jar /usr/share/java/sshd-common.jar /usr/share/java/sshd-core.jar /usr/share/java/sshd-scp.jar /usr/share/java/sshd-sftp.jar +usr/share/java/sshd-contrib.jar /usr/share/maven-repo/org/slf4j/slf4j-api/2.x/slf4j-api-2.x.jar /usr/share/java/sshd-common.jar /usr/share/java/sshd-core.jar /usr/share/java/sshd-scp.jar /usr/share/java/sshd-sftp.jar -usr/share/java/sshd-core.jar /usr/share/java/slf4j-api.jar /usr/share/java/sshd-common.jar /usr/share/java/tomcat9-jni.jar +usr/share/java/sshd-core.jar /usr/share/maven-repo/org/slf4j/slf4j-api/2.x/slf4j-api-2.x.jar /usr/share/java/sshd-common.jar /usr/share/java/tomcat9-jni.jar usr/share/java/sshd-ldap.jar /usr/share/java/sshd-common.jar /usr/share/java/sshd-core.jar @@ -14,6 +14,6 @@ usr/share/java/sshd-netty.jar /usr/share/java/netty-buffer.jar /usr/share/java/n usr/share/java/sshd-putty.jar /usr/share/java/bcprov.jar /usr/share/java/eddsa.jar /usr/share/java/sshd-common.jar -usr/share/java/sshd-scp.jar /usr/share/java/slf4j-api.jar /usr/share/java/sshd-common.jar /usr/share/java/sshd-core.jar +usr/share/java/sshd-scp.jar /usr/share/maven-repo/org/slf4j/slf4j-api/2.x/slf4j-api-2.x.jar /usr/share/java/sshd-common.jar /usr/share/java/sshd-core.jar -usr/share/java/sshd-sftp.jar /usr/share/java/slf4j-api.jar /usr/share/java/sshd-common.jar /usr/share/java/sshd-core.jar +usr/share/java/sshd-sftp.jar /usr/share/maven-repo/org/slf4j/slf4j-api/2.x/slf4j-api-2.x.jar /usr/share/java/sshd-common.jar /usr/share/java/sshd-core.jar diff --git a/debian/maven.rules b/debian/maven.rules index c584ec6..22bee05 100644 --- a/debian/maven.rules +++ b/debian/maven.rules @@ -29,3 +29,4 @@ org.bouncycastle s/bcprov-jdk18on/bcprov/ * s/.*/debian/ * * org.bouncycastle s/bcutil-jdk18on/bcutil/ * s/.*/debian/ * * org.mockito mockito-core * s/.*/debian/ * s/.*/test/ s/tomcat/org.apache.tomcat/ s/tomcat-apr/tomcat-jni/ * s/.*/9.x/ * * +org.slf4j * * s/.*/2.x/ * * -- 2.47.3