Emmanuel Bourg pushed to branch master at Debian Java Maintainers / java-allocation-instrumenter
Commits: df2366a4 by Emmanuel Bourg at 2018-11-12T18:20:34Z Fixed the build failure with Java 11 - - - - - 7e7b14b6 by Emmanuel Bourg at 2018-11-12T21:39:14Z Ignore the unused dependency on asm-xml (Closes: #913577) - - - - - 4a851693 by Emmanuel Bourg at 2018-11-12T21:40:55Z Fixed the Vcs-Git URL - - - - - 5027d79f by Emmanuel Bourg at 2018-11-12T21:41:07Z Upload to unstable - - - - - 5 changed files: - debian/changelog - debian/control - debian/maven.ignoreRules - + debian/patches/01-remove-generated-annotation.patch - + debian/patches/series Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,12 @@ +java-allocation-instrumenter (3.1.0-2) unstable; urgency=medium + + * Team upload. + * Ignore the unused dependency on asm-xml (Closes: #913577) + * Fixed the build failure with Java 11 + * Fixed the Vcs-Git URL + + -- Emmanuel Bourg <[email protected]> Mon, 12 Nov 2018 22:40:59 +0100 + java-allocation-instrumenter (3.1.0-1) unstable; urgency=medium * Team upload. ===================================== debian/control ===================================== @@ -21,7 +21,7 @@ Build-Depends: libreplacer-java, maven-debian-helper Standards-Version: 4.2.1 -Vcs-Git: https://://anonscm.debian.org/git/java-team/java-allocation-instrumenter.git +Vcs-Git: https://salsa.debian.org/java-team/java-allocation-instrumenter.git Vcs-Browser: https://salsa.debian.org/java-team/java-allocation-instrumenter Homepage: https://github.com/google/allocation-instrumenter ===================================== debian/maven.ignoreRules ===================================== @@ -1 +1,2 @@ -junit junit * * * * \ No newline at end of file +junit junit * * * * +org.ow2.asm asm-xml * * * * ===================================== debian/patches/01-remove-generated-annotation.patch ===================================== @@ -0,0 +1,21 @@ +Description: No longer use the @Generated annotation to build with Java 11 +Author: Emmanuel Bourg <[email protected]> +Forwarded: no +--- a/src/main/java/com/google/monitoring/runtime/instrumentation/Bootstrap.java.in ++++ b/src/main/java/com/google/monitoring/runtime/instrumentation/Bootstrap.java.in +@@ -4,7 +4,6 @@ + import java.lang.reflect.Method; + import java.net.JarURLConnection; + import java.util.jar.JarFile; +-import javax.annotation.Generated; + + /** + * Add the agent to the bootclasspath before invoking premain(). +@@ -30,7 +29,6 @@ + * <p>This file is pre-processed to include the correct name of the class being used as a premain + * before being compiled and integrated into the agent. + */ +-@Generated(value = "GENERATOR") + public class CLASS_NAMEBootstrap { + public static void premain(String agentArgs, Instrumentation inst) { + try { ===================================== debian/patches/series ===================================== @@ -0,0 +1 @@ +01-remove-generated-annotation.patch View it on GitLab: https://salsa.debian.org/java-team/java-allocation-instrumenter/compare/4a35f6360409f8a484b4a821a730e518f7284fdb...5027d79fdc9a8c337ec86d2fa373816e85448eef -- View it on GitLab: https://salsa.debian.org/java-team/java-allocation-instrumenter/compare/4a35f6360409f8a484b4a821a730e518f7284fdb...5027d79fdc9a8c337ec86d2fa373816e85448eef 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
