Emmanuel Bourg pushed to branch master at Debian Java Maintainers / sisu-inject
Commits: 36320cf8 by Emmanuel Bourg at 2021-01-19T11:16:06+01:00 Standards-Version updated to 4.5.1 - - - - - 6bdf0188 by Emmanuel Bourg at 2021-01-19T11:16:13+01:00 Switch to debhelper level 13 - - - - - 4c930c00 by Emmanuel Bourg at 2021-01-19T11:23:26+01:00 New upstream version 0.3.4 - - - - - 61deead4 by Emmanuel Bourg at 2021-01-19T11:23:26+01:00 Update upstream source from tag 'upstream/0.3.4' Update to upstream version '0.3.4' with Debian dir 89fa41a133090d2d82983e721a111a241de7a87c - - - - - d1d24081 by Emmanuel Bourg at 2021-01-19T11:33:00+01:00 New upstream release (0.3.4) - - - - - 13 changed files: - debian/changelog - − debian/compat - debian/control - org.eclipse.sisu.inject.extender/META-INF/MANIFEST.MF - org.eclipse.sisu.inject.extender/pom.xml - org.eclipse.sisu.inject.site/pom.xml - org.eclipse.sisu.inject.tests/pom.xml - org.eclipse.sisu.inject/META-INF/MANIFEST.MF - org.eclipse.sisu.inject/pom.xml - org.eclipse.sisu.inject/src/org/eclipse/sisu/space/AbstractSisuIndex.java - org.eclipse.sisu.inject/src/org/eclipse/sisu/space/asm/ClassReader.java - org.eclipse.sisu.inject/src/org/eclipse/sisu/space/asm/Opcodes.java - pom.xml Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,11 @@ +sisu-inject (0.3.4-1) unstable; urgency=medium + + * New upstream release + * Standards-Version updated to 4.5.1 + * Switch to debhelper level 13 + + -- Emmanuel Bourg <[email protected]> Tue, 19 Jan 2021 11:25:14 +0100 + sisu-inject (0.3.3-1) unstable; urgency=medium * New upstream release ===================================== debian/compat deleted ===================================== @@ -1 +0,0 @@ -11 ===================================== debian/control ===================================== @@ -4,7 +4,7 @@ Priority: optional Maintainer: Debian Java Maintainers <[email protected]> Uploaders: Emmanuel Bourg <[email protected]> Build-Depends: - debhelper (>= 11), + debhelper-compat (= 13), default-jdk, junit4, libbuild-helper-maven-plugin-java, @@ -17,7 +17,7 @@ Build-Depends: libslf4j-java, maven-debian-helper (>= 1.5), testng -Standards-Version: 4.3.0 +Standards-Version: 4.5.1 Vcs-Git: https://salsa.debian.org/java-team/sisu-inject.git Vcs-Browser: https://salsa.debian.org/java-team/sisu-inject Homepage: http://www.eclipse.org/sisu/ ===================================== org.eclipse.sisu.inject.extender/META-INF/MANIFEST.MF ===================================== @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.sisu.inject.extender;singleton:=true -Bundle-Version: 0.3.3 +Bundle-Version: 0.3.4 Bundle-Name: Sisu-Inject Extender (Incubation) Bundle-Activator: org.eclipse.sisu.launch.SisuExtender Bundle-RequiredExecutionEnvironment: JavaSE-1.6 ===================================== org.eclipse.sisu.inject.extender/pom.xml ===================================== @@ -17,7 +17,7 @@ <parent> <groupId>org.eclipse.sisu</groupId> <artifactId>sisu-inject</artifactId> - <version>0.3.3</version> + <version>0.3.4</version> </parent> <artifactId>org.eclipse.sisu.inject.extender</artifactId> ===================================== org.eclipse.sisu.inject.site/pom.xml ===================================== @@ -17,7 +17,7 @@ <parent> <groupId>org.eclipse.sisu</groupId> <artifactId>sisu-inject</artifactId> - <version>0.3.3</version> + <version>0.3.4</version> </parent> <artifactId>org.eclipse.sisu.inject.site</artifactId> ===================================== org.eclipse.sisu.inject.tests/pom.xml ===================================== @@ -17,7 +17,7 @@ <parent> <groupId>org.eclipse.sisu</groupId> <artifactId>sisu-inject</artifactId> - <version>0.3.3</version> + <version>0.3.4</version> </parent> <artifactId>org.eclipse.sisu.inject.tests</artifactId> ===================================== org.eclipse.sisu.inject/META-INF/MANIFEST.MF ===================================== @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Main-Class: org.eclipse.sisu.launch.Main Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.sisu.inject;singleton:=true -Bundle-Version: 0.3.3 +Bundle-Version: 0.3.4 Bundle-Name: Sisu-Inject (Incubation) Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-Vendor: Eclipse Sisu ===================================== org.eclipse.sisu.inject/pom.xml ===================================== @@ -17,7 +17,7 @@ <parent> <groupId>org.eclipse.sisu</groupId> <artifactId>sisu-inject</artifactId> - <version>0.3.3</version> + <version>0.3.4</version> </parent> <artifactId>org.eclipse.sisu.inject</artifactId> ===================================== org.eclipse.sisu.inject/src/org/eclipse/sisu/space/AbstractSisuIndex.java ===================================== @@ -16,10 +16,10 @@ import java.io.IOException; import java.io.Reader; import java.io.Writer; import java.util.LinkedHashMap; -import java.util.LinkedHashSet; import java.util.Map; import java.util.Map.Entry; import java.util.Set; +import java.util.TreeSet; /** * Skeleton class that generates a qualified class index. @@ -122,7 +122,7 @@ abstract class AbstractSisuIndex */ private Set<String> readTable( final Object name ) { - final Set<String> table = new LinkedHashSet<String>(); + final Set<String> table = new TreeSet<String>(); try { final BufferedReader reader = new BufferedReader( getReader( INDEX_FOLDER + name ) ); ===================================== org.eclipse.sisu.inject/src/org/eclipse/sisu/space/asm/ClassReader.java ===================================== @@ -166,7 +166,7 @@ public final class ClassReader { public ClassReader(final byte[] b, final int off, final int len) { this.b = b; // checks the class version - if (readShort(off + 6) > Opcodes.V1_8) { + if (readShort(off + 6) > Opcodes.V14) { // patch: relax scanning to work with Java14 throw new IllegalArgumentException(); } // parses the constant pool ===================================== org.eclipse.sisu.inject/src/org/eclipse/sisu/space/asm/Opcodes.java ===================================== @@ -59,6 +59,8 @@ public interface Opcodes { int V1_7 = 0 << 16 | 51; int V1_8 = 0 << 16 | 52; + int V14 = 0 << 16 | 58; // patch: relax scanning to work with Java14 + // access flags int ACC_PUBLIC = 0x0001; // class, field, method ===================================== pom.xml ===================================== @@ -22,7 +22,7 @@ <groupId>org.eclipse.sisu</groupId> <artifactId>sisu-inject</artifactId> - <version>0.3.3</version> + <version>0.3.4</version> <packaging>pom</packaging> <name>Sisu Inject</name> View it on GitLab: https://salsa.debian.org/java-team/sisu-inject/-/compare/f1bb1866c5bc1f3543076f89045247f522b29fa8...d1d24081463b845eece4e56c49c8e317a8a03409 -- View it on GitLab: https://salsa.debian.org/java-team/sisu-inject/-/compare/f1bb1866c5bc1f3543076f89045247f522b29fa8...d1d24081463b845eece4e56c49c8e317a8a03409 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
