diff -Nru zeroc-ice-3.7.0/debian/changelog zeroc-ice-3.7.0/debian/changelog
--- zeroc-ice-3.7.0/debian/changelog	2018-04-02 15:05:04.000000000 +0000
+++ zeroc-ice-3.7.0/debian/changelog	2019-02-26 17:18:59.000000000 +0000
@@ -1,3 +1,9 @@
+zeroc-ice (3.7.0-5ubuntu0.2) bionic; urgency=medium
+
+  * Fix build with OpenJDK 11. LP: #1814133.
+
+ -- Matthias Klose <doko@ubuntu.com>  Tue, 26 Feb 2019 18:18:59 +0100
+
 zeroc-ice (3.7.0-5) unstable; urgency=medium
 
   * Add python-passlib package required to run test
diff -Nru zeroc-ice-3.7.0/debian/control zeroc-ice-3.7.0/debian/control
--- zeroc-ice-3.7.0/debian/control	2018-04-02 15:03:44.000000000 +0000
+++ zeroc-ice-3.7.0/debian/control	2019-02-26 17:18:59.000000000 +0000
@@ -1,7 +1,8 @@
 Source: zeroc-ice
 Section: devel
 Priority: optional
-Maintainer: José Gutiérrez de la Concha <jose@zeroc.com>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: José Gutiérrez de la Concha <jose@zeroc.com>
 Uploaders: Ondřej Surý <ondrej@debian.org>
 Build-Depends-Indep: default-jdk,
                      gradle (>= 2),
diff -Nru zeroc-ice-3.7.0/debian/patches/java-jdk11-build-fixes.patch zeroc-ice-3.7.0/debian/patches/java-jdk11-build-fixes.patch
--- zeroc-ice-3.7.0/debian/patches/java-jdk11-build-fixes.patch	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.0/debian/patches/java-jdk11-build-fixes.patch	2019-02-26 17:18:59.000000000 +0000
@@ -0,0 +1,54 @@
+Index: ice-debian-packaging/java/test/build.gradle
+===================================================================
+--- ice-debian-packaging.orig/java/test/build.gradle
++++ ice-debian-packaging/java/test/build.gradle
+@@ -14,6 +14,8 @@ sourceSets {
+     main {
+         java {
+             exclude 'plugins'
++            sourceCompatibility = "1.8"
++            targetCompatibility = "1.8"
+         }
+     }
+ }
+Index: ice-debian-packaging/java/test/plugins/build.gradle
+===================================================================
+--- ice-debian-packaging.orig/java/test/plugins/build.gradle
++++ ice-debian-packaging/java/test/plugins/build.gradle
+@@ -14,6 +14,8 @@ sourceSets {
+     main {
+         java {
+             srcDirs "$rootProject.projectDir/test/plugins"
++            sourceCompatibility = "1.8"
++            targetCompatibility = "1.8"
+         }
+     }
+ }
+Index: ice-debian-packaging/java-compat/test/build.gradle
+===================================================================
+--- ice-debian-packaging.orig/java-compat/test/build.gradle
++++ ice-debian-packaging/java-compat/test/build.gradle
+@@ -20,6 +20,9 @@ sourceSets {
+             }
+             exclude 'plugins'
+             exclude 'ejb'
++
++            sourceCompatibility = "1.8"
++            targetCompatibility = "1.8"
+         }
+     }
+ }
+Index: ice-debian-packaging/java-compat/test/plugins/build.gradle
+===================================================================
+--- ice-debian-packaging.orig/java-compat/test/plugins/build.gradle
++++ ice-debian-packaging/java-compat/test/plugins/build.gradle
+@@ -11,6 +11,9 @@ sourceSets {
+     main {
+         java {
+             srcDirs "$rootProject.projectDir/test/plugins"
++
++            sourceCompatibility = "1.8"
++            targetCompatibility = "1.8"
+         }
+     }
+ }
diff -Nru zeroc-ice-3.7.0/debian/patches/series zeroc-ice-3.7.0/debian/patches/series
--- zeroc-ice-3.7.0/debian/patches/series	2018-04-02 13:40:05.000000000 +0000
+++ zeroc-ice-3.7.0/debian/patches/series	2019-02-26 17:18:59.000000000 +0000
@@ -2,3 +2,4 @@
 classpath-contains-relative-path.diff
 python2.7-install
 java9-build
+java-jdk11-build-fixes.patch