Emmanuel Bourg pushed to branch master at Debian Java Maintainers / libcofoja-java
Commits: 31935452 by Emmanuel Bourg at 2018-11-29T21:19:24Z Fixed the build failure with Java 11 (Closes: #911142) - - - - - 9486d1c9 by Emmanuel Bourg at 2018-11-29T21:20:28Z Wrap and sort - - - - - 56e7b2ef by Emmanuel Bourg at 2018-11-29T21:21:03Z Upload to unstable - - - - - 4 changed files: - debian/changelog - debian/control - + debian/patches/02-java11-compatibility.patch - debian/patches/series Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,10 @@ +cofoja (1.3-4) unstable; urgency=medium + + * Team upload. + * Fixed the build failure with Java 11 (Closes: #911142) + + -- Emmanuel Bourg <[email protected]> Thu, 29 Nov 2018 22:20:57 +0100 + cofoja (1.3-3) unstable; urgency=medium * debhelper 11 ===================================== debian/control ===================================== @@ -1,17 +1,19 @@ Source: cofoja -Maintainer: Debian Java Maintainers <[email protected]> -Uploaders: Olivier Sallou <[email protected]>, - Andreas Tille <[email protected]>, - Diane Trout <[email protected]> Section: java Priority: optional -Build-Depends: ant, - ant-optional, - debhelper (>= 11~), - default-jdk, - javahelper, - junit4, - libasm-java (>= 5.0) +Maintainer: Debian Java Maintainers <[email protected]> +Uploaders: + Olivier Sallou <[email protected]>, + Andreas Tille <[email protected]>, + Diane Trout <[email protected]> +Build-Depends: + ant, + ant-optional, + debhelper (>= 11~), + default-jdk, + javahelper, + junit4, + libasm-java (>= 7.0) Standards-Version: 4.2.1 Vcs-Browser: https://salsa.debian.org/java-team/cofoja Vcs-Git: https://salsa.debian.org/java-team/cofoja.git @@ -19,8 +21,7 @@ Homepage: https://github.com/nhatminhle/cofoja Package: libcofoja-java Architecture: all -Depends: ${misc:Depends}, - libasm-java (>= 5.0) +Depends: ${misc:Depends}, libasm-java (>= 7.0) Description: Java API for annotating code with contracts Contracts for Java is a contract programming framework for Java, which uses annotation processing and bytecode instrumentation to provide ===================================== debian/patches/02-java11-compatibility.patch ===================================== @@ -0,0 +1,108 @@ +Description: Fixes the compatibility with Java 11 +Origin: upstream, https://github.com/nhatminhle/cofoja/pull/54 +--- a/src/com/google/java/contract/core/agent/ContractAnalyzer.java ++++ b/src/com/google/java/contract/core/agent/ContractAnalyzer.java +@@ -72,7 +72,7 @@ + * intended to be filled through its visitor interface. + */ + ContractAnalyzer() { +- super(Opcodes.ASM5); ++ super(Opcodes.ASM7); + classHandles = new ArrayList<ClassContractHandle>(); + methodHandles = new HashMap<String, ArrayList<MethodContractHandle>>(); + } +--- a/src/com/google/java/contract/core/agent/ContractClassFileTransformer.java ++++ b/src/com/google/java/contract/core/agent/ContractClassFileTransformer.java +@@ -65,7 +65,7 @@ + */ + private class SuperInfoFinder extends ClassVisitor { + private SuperInfoFinder() { +- super(Opcodes.ASM5); ++ super(Opcodes.ASM7); + } + + @Override +--- a/src/com/google/java/contract/core/agent/ContractFixingClassAdapter.java ++++ b/src/com/google/java/contract/core/agent/ContractFixingClassAdapter.java +@@ -53,7 +53,7 @@ + */ + @Requires("mv != null") + public AccessMethodAdapter(MethodVisitor mv) { +- super(Opcodes.ASM5, mv); ++ super(Opcodes.ASM7, mv); + } + + /** +@@ -101,7 +101,7 @@ + */ + @Requires("cv != null") + public ContractFixingClassAdapter(ClassVisitor cv) { +- super(Opcodes.ASM5, cv); ++ super(Opcodes.ASM7, cv); + } + + /** +--- a/src/com/google/java/contract/core/agent/HelperClassAdapter.java ++++ b/src/com/google/java/contract/core/agent/HelperClassAdapter.java +@@ -56,7 +56,7 @@ + public AnnotationVisitor visitAnnotation(String desc, boolean visible) { + if (Type.getType(desc).getInternalName().equals( + "com/google/java/contract/core/agent/ContractMethodSignature")) { +- return new AnnotationVisitor(Opcodes.ASM5) { ++ return new AnnotationVisitor(Opcodes.ASM7) { + @Override + public void visit(String name, Object value) { + if (name.equals("lines")) { +@@ -71,7 +71,7 @@ + + @Requires("cv != null") + public HelperClassAdapter(ClassVisitor cv) { +- super(Opcodes.ASM5, cv); ++ super(Opcodes.ASM7, cv); + } + + @Override +--- a/src/com/google/java/contract/core/agent/LineNumberingClassAdapter.java ++++ b/src/com/google/java/contract/core/agent/LineNumberingClassAdapter.java +@@ -45,7 +45,7 @@ + "ContractMethodSignatures.isLineNumberList(lineNumbers)" + }) + public LineNumberingClassAdapter(ClassVisitor cv, List<Long> lineNumbers) { +- super(Opcodes.ASM5, cv); ++ super(Opcodes.ASM7, cv); + this.lineNumbers = lineNumbers; + } + +--- a/src/com/google/java/contract/core/agent/LineNumberingMethodAdapter.java ++++ b/src/com/google/java/contract/core/agent/LineNumberingMethodAdapter.java +@@ -61,7 +61,7 @@ + }) + public LineNumberingMethodAdapter(MethodVisitor mv, int access, + String name, String desc) { +- super(Opcodes.ASM5, mv, access, name, desc); ++ super(Opcodes.ASM7, mv, access, name, desc); + lineNumbers = null; + } + +--- a/src/com/google/java/contract/core/agent/SpecificationClassAdapter.java ++++ b/src/com/google/java/contract/core/agent/SpecificationClassAdapter.java +@@ -49,7 +49,7 @@ + + public SpecificationClassAdapter(ClassVisitor cv, + ContractAnalyzer contracts) { +- super(Opcodes.ASM5, cv); ++ super(Opcodes.ASM7, cv); + this.contracts = contracts; + } + +--- a/src/com/google/java/contract/core/agent/SpecificationMethodAdapter.java ++++ b/src/com/google/java/contract/core/agent/SpecificationMethodAdapter.java +@@ -134,7 +134,7 @@ + MethodVisitor mv, + int access, String methodName, + String methodDesc) { +- super(Opcodes.ASM5, mv, access, methodName, methodDesc); ++ super(Opcodes.ASM7, mv, access, methodName, methodDesc); + + methodStart = new Label(); + methodEnd = new Label(); ===================================== debian/patches/series ===================================== @@ -1 +1,2 @@ 01-java9-compatibility.patch +02-java11-compatibility.patch View it on GitLab: https://salsa.debian.org/java-team/libcofoja-java/compare/d069707feceeef08c95c0e38eb3eb4c0263a7983...56e7b2ef0559eeea2fd75cc34fd9b64bb12b29b3 -- View it on GitLab: https://salsa.debian.org/java-team/libcofoja-java/compare/d069707feceeef08c95c0e38eb3eb4c0263a7983...56e7b2ef0559eeea2fd75cc34fd9b64bb12b29b3 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
