Emmanuel Bourg pushed to branch master at Debian Java Maintainers / plexus-cipher
Commits: 03b6f1b0 by Emmanuel Bourg at 2021-02-10T22:37:56+01:00 Depend on sisu-inject+guice instead of sisu-inject-bean - - - - - 33e0e9e5 by Emmanuel Bourg at 2021-02-10T22:57:00+01:00 Install a symlink to the jar at the old sonatype coordinates to help Gradle - - - - - 3cb4408d by Emmanuel Bourg at 2021-02-10T22:57:12+01:00 Upload to unstable - - - - - 4 changed files: - debian/changelog - + debian/libplexus-cipher-java.links - + debian/patches/eclipse-sisu.patch - debian/patches/series Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,11 @@ +plexus-cipher (1.8-2) unstable; urgency=medium + + * Team upload. + * Depend on sisu-inject+guice instead of sisu-inject-bean + * Install a symlink to the jar at the old sonatype coordinates to help Gradle + + -- Emmanuel Bourg <[email protected]> Wed, 10 Feb 2021 22:57:04 +0100 + plexus-cipher (1.8-1) unstable; urgency=medium * Team upload. ===================================== debian/libplexus-cipher-java.links ===================================== @@ -0,0 +1 @@ +/usr/share/maven-repo/org/codehaus/plexus/plexus-cipher/debian/plexus-cipher-debian.jar /usr/share/maven-repo/org/sonatype/plexus/plexus-cipher/debian/plexus-cipher-debian.jar ===================================== debian/patches/eclipse-sisu.patch ===================================== @@ -0,0 +1,46 @@ +Description: Use eclipse-sisu instead of sonatype-sisu +Author: Emmanuel Bourg <[email protected]> +Forwarded: no +--- a/src/test/java/org/sonatype/plexus/components/cipher/DefaultPlexusCipherTest.java ++++ b/src/test/java/org/sonatype/plexus/components/cipher/DefaultPlexusCipherTest.java +@@ -12,7 +12,7 @@ + */ + package org.sonatype.plexus.components.cipher; + +-import org.sonatype.guice.bean.containers.InjectedTestCase; ++import org.eclipse.sisu.launch.InjectedTestCase; + + /** + * Test the Plexus Cipher container +--- a/src/test/java/org/sonatype/plexus/components/cipher/PBECipherTest.java ++++ b/src/test/java/org/sonatype/plexus/components/cipher/PBECipherTest.java +@@ -19,7 +19,7 @@ + + package org.sonatype.plexus.components.cipher; + +-import org.sonatype.guice.bean.containers.InjectedTestCase; ++import org.eclipse.sisu.launch.InjectedTestCase; + + /** + * @author Oleg Gusakov +--- a/pom.xml ++++ b/pom.xml +@@ -119,9 +119,15 @@ + + <dependencies> + <dependency> +- <groupId>org.sonatype.sisu</groupId> +- <artifactId>sisu-inject-bean</artifactId> +- <version>2.6.0</version> ++ <groupId>org.eclipse.sisu</groupId> ++ <artifactId>org.eclipse.sisu.inject</artifactId> ++ <version>debian</version> ++ <scope>provided</scope> ++ </dependency> ++ <dependency> ++ <groupId>com.google.inject</groupId> ++ <artifactId>guice</artifactId> ++ <version>debian</version> + <scope>provided</scope> + </dependency> + <dependency> ===================================== debian/patches/series ===================================== @@ -1 +1,2 @@ sisu-maven-plugin.patch +eclipse-sisu.patch View it on GitLab: https://salsa.debian.org/java-team/plexus-cipher/-/compare/3ad40f3a14805571d7be17992cca72fbacb68d78...3cb4408dcb65d67a7a6ce30bfb5c8165c065da64 -- View it on GitLab: https://salsa.debian.org/java-team/plexus-cipher/-/compare/3ad40f3a14805571d7be17992cca72fbacb68d78...3cb4408dcb65d67a7a6ce30bfb5c8165c065da64 You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ pkg-java-commits mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-java-commits
