[Git][java-team/bridge-method-injector][master] 5 commits: Fixed the build failure with Java 9 (Closes: #893101)

Emmanuel Bourg gitlab at salsa.debian.org
Wed Jun 6 15:53:44 BST 2018 

Emmanuel Bourg pushed to branch master at Debian Java Maintainers / bridge-method-injector


Commits:
cdc15a50 by Emmanuel Bourg at 2018-06-06T15:12:48+02:00
Fixed the build failure with Java 9 (Closes: #893101)

- - - - -
7073b4bb by Emmanuel Bourg at 2018-06-06T15:13:02+02:00
Standards-Version updated to 4.1.4

- - - - -
0d8c087c by Emmanuel Bourg at 2018-06-06T15:13:07+02:00
Switch to debhelper level 11

- - - - -
dd1c7ab6 by Emmanuel Bourg at 2018-06-06T15:13:11+02:00
Use salsa.debian.org Vcs-* URLs

- - - - -
2e6ba2ff by Emmanuel Bourg at 2018-06-06T15:31:09+02:00
Upload to unstable

- - - - -


8 changed files:

- debian/changelog
- debian/compat
- debian/control
- − debian/maven.cleanIgnoreRules
- − debian/maven.publishedRules
- + debian/patches/01-java9-compatibility.patch
- + debian/patches/series
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+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 at apache.org>  Wed, 06 Jun 2018 15:30:34 +0200
+
 bridge-method-injector (1.18-1) unstable; urgency=medium
 
   * Team upload.
@@ -44,7 +54,7 @@ bridge-method-injector (1.13-1) unstable; urgency=medium
 
 bridge-method-injector (1.8-1) unstable; urgency=medium
 
-  * New upstream release. 
+  * New upstream release.
   * d/control: Bumped Standard-Version, no changes.
   * d/control: Drop DM-Upload-Allowed field.
 


=====================================
debian/compat
=====================================
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-10
+11


=====================================
debian/control
=====================================
--- a/debian/control
+++ b/debian/control
@@ -4,20 +4,20 @@ Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: James Page <james.page at 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 deleted
=====================================
--- a/debian/maven.cleanIgnoreRules
+++ /dev/null
@@ -1,21 +0,0 @@
-# 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 deleted
=====================================
--- a/debian/maven.publishedRules
+++ /dev/null
@@ -1,19 +0,0 @@
-# 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
=====================================
--- /dev/null
+++ b/debian/patches/01-java9-compatibility.patch
@@ -0,0 +1,25 @@
+Description: Fixes the build failure with Java 9
+Author: Emmanuel Bourg <ebourg at 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
=====================================
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+01-java9-compatibility.patch


=====================================
debian/rules
=====================================
--- a/debian/rules
+++ b/debian/rules
@@ -2,6 +2,3 @@
 
 %:
 	dh $@
-
-get-orig-source:
-	uscan --download-current-version --force-download --rename



View it on GitLab: https://salsa.debian.org/java-team/bridge-method-injector/compare/a3ea674ba725907852cbcd6374d7e59b094ca60d...2e6ba2ff9bb96d4960651feadb3179f1ba92d675

-- 
View it on GitLab: https://salsa.debian.org/java-team/bridge-method-injector/compare/a3ea674ba725907852cbcd6374d7e59b094ca60d...2e6ba2ff9bb96d4960651feadb3179f1ba92d675
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20180606/90d0a29b/attachment.html>

More information about the pkg-java-commits mailing list