debian/changelog

+bridge-method-injector (1.18-2) unstable; urgency=medium
+
+  * Team upload.
+  * Fixed the build failure with Java 9 (Closes: #893101)
+  * Standards-Version updated to 4.1.4
+  * Switch to debhelper level 11
+  * Use salsa.debian.org Vcs-* URLs
+
+ -- Emmanuel Bourg <ebourg@apache.org>  Wed, 06 Jun 2018 15:30:34 +0200
+
 bridge-method-injector (1.18-1) unstable; urgency=medium
 
   * Team upload.

debian/compat

-10
+11

debian/control

@@ -4,20 +4,20 @@ Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
 Uploaders: James Page <james.page@ubuntu.com>
 Build-Depends:
- debhelper (>= 10),
+ debhelper (>= 11),
  default-jdk,
  default-jdk-doc,
  junit (>= 3.8.1),
- libannotation-indexer-java (>= 1.3),
+ libannotation-indexer-java (>= 1.12),
  libasm-java (>= 5.0),
  libmaven-antrun-plugin-java,
  libmaven-javadoc-plugin-java,
  libmaven-plugin-tools-java,
  libmaven3-core-java,
  maven-debian-helper (>= 2.0)
-Standards-Version: 4.1.3
-Vcs-Git: https://anonscm.debian.org/git/pkg-java/bridge-method-injector.git
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/bridge-method-injector.git
+Standards-Version: 4.1.4
+Vcs-Git: https://salsa.debian.org/java-team/bridge-method-injector.git
+Vcs-Browser: https://salsa.debian.org/java-team/bridge-method-injector
 Homepage: http://bridge-method-injector.infradna.com/
 
 Package: libbridge-method-injector-java

debian/maven.cleanIgnoreRules

-# Maven ignore rules - ignore some Maven dependencies and plugins
-# Format of this file is:
-# [group] [artifact] [type] [version] [classifier] [scope]
-# where each element can be either
-# - the exact string, for example org.apache for the group, or 3.1
-#   for the version. In this case, the element is simply matched
-#   and left as it is
-# - * (the star character, alone). In this case, anything will
-#   match and be left as it is. For example, using * on the
-#  position of the artifact field will match any artifact id
-# All elements much match before a rule can be applied
-# Example rule: match jar with groupid= junit, artifactid= junit
-# and version starting with 3., this dependency is then removed
-# from the POM
-#   junit junit jar s/3\\..*/3.x/
-
-com.sun tools * * * *
-org.apache.maven.plugins maven-antrun-plugin * * * *
-org.apache.maven.plugins maven-release-plugin * * * *
-org.jvnet.hudson annotation-indexer * * * *
-org.jvnet.wagon-svn wagon-svn * * * *

debian/maven.publishedRules

-# Maven published rules - additional rules to publish, to help
-# the packaging work of Debian maintainers using mh_make
-# Format of this file is:
-# [group] [artifact] [type] [version] [classifier] [scope]
-# where each element can be either
-# - the exact string, for example org.apache for the group, or 3.1
-#   for the version. In this case, the element is simply matched
-#   and left as it is
-# - * (the star character, alone). In this case, anything will
-#   match and be left as it is. For example, using * on the
-#  position of the artifact field will match any artifact id
-# - a regular expression of the form s/match/replace/
-#   in this case, elements that match are transformed using
-#   the regex rule.
-# All elements much match before a rule can be applied
-# Example rule: match jar with groupid= junit, artifactid= junit
-# and version starting with 3., replacing the version with 3.x
-#   junit junit jar s/3\\..*/3.x/
-

debian/patches/01-java9-compatibility.patch

+Description: Fixes the build failure with Java 9
+Author: Emmanuel Bourg <ebourg@apache.org>
+Forwarded: no
+--- a/injector/src/main/java/com/infradna/tool/bridge_method_injector/MethodInjector.java
++++ b/injector/src/main/java/com/infradna/tool/bridge_method_injector/MethodInjector.java
+@@ -97,7 +97,7 @@
+             ClassWriter cw = new ClassWriter(/*cr,*/COMPUTE_MAXS);
+             cr.accept(new Transformer(new ClassAnnotationInjectorImpl(cw)),0);
+             image = cw.toByteArray();
+-        } catch (AlreadyUpToDate _) {
++        } catch (AlreadyUpToDate e) {
+             // no need to process this class. it's already up-to-date.
+             return;
+         } catch (IOException e) {
+--- a/injector/src/main/java/com/infradna/tool/bridge_method_injector/ProcessMojo.java
++++ b/injector/src/main/java/com/infradna/tool/bridge_method_injector/ProcessMojo.java
+@@ -69,7 +69,7 @@
+         } finally {
+             try {
+                 if (r!=null)    r.close();
+-            } catch (IOException _) {
++            } catch (IOException e) {
+             }
+         }
+     }

debian/patches/series

+01-java9-compatibility.patch

debian/rules

@@ -2,6 +2,3 @@
 
 %:
 	dh $@
-
-get-orig-source:
-	uscan --download-current-version --force-download --rename