Merge ~vpa1977/ubuntu/+source/opencensus-java:ubuntu/devel into ubuntu/+source/opencensus-java:ubuntu/devel

[Vladimir Petko]

This MP resolves Java 21 ftbfs.

PPA: ppa:vpa1977/gettext [1]

Changes:
 - Use java_compat_level variable provided by java-common to adjust -source/-target level to the minimum required by the default Java

Testing:
 - rebuild in default Java 21 ppa[2]
 - piuparts test [3]

[1] https://launchpad.net/~vpa1977/+archive/ubuntu/gettext
[2] https://launchpad.net/~vpa1977/+archive/ubuntu/gettext-21/+sourcepub/15792336/+listing-archive-extra
[3] https://bugs.launchpad.net/ubuntu/+source/opencensus-java/+bug/2053295/comments/1

diff --git a/debian/changelog b/debian/changelog
index 6bd2a9a..cb15500 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+opencensus-java (0.24.0+ds-1ubuntu1) noble; urgency=medium
+
+  [ Pushkar Kulkarni ]
+  * d/rules, d/patches: Use java_compat_level to adjust -source/-target
+    levels (LP: #2053295).
+
+ -- Vladimir Petko <[e-mail]>  Fri, 16 Feb 2024 15:32:43 +1300
+
 opencensus-java (0.24.0+ds-1) unstable; urgency=high
 
   * Refresh packaging
diff --git a/debian/control b/debian/control
index e9bd2d1..bd27fbf 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: opencensus-java
 Section: java
 Priority: optional
-Maintainer: Debian Java Maintainers <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian Java Maintainers <[e-mail]>
 Uploaders:
  Olek Wojnar <[e-mail]>,
  Andreas Tille <[e-mail]>
diff --git a/debian/patches/fix-gradle-build.patch b/debian/patches/fix-gradle-build.patch
index ead70c2..184491c 100644
--- a/debian/patches/fix-gradle-build.patch
+++ b/debian/patches/fix-gradle-build.patch
@@ -32,7 +32,7 @@ Last-Update: 2020-06-15
  
      apply plugin: "checkstyle"
      apply plugin: 'maven'
-@@ -38,17 +36,8 @@
+@@ -38,24 +36,13 @@
      apply plugin: 'java'
      apply plugin: "signing"
      apply plugin: "jacoco"
@@ -50,7 +50,16 @@ Last-Update: 2020-06-15
  
      group = "io.opencensus"
      version = "0.24.0" // CURRENT_OPENCENSUS_VERSION
-@@ -72,7 +61,7 @@
+-
+-    sourceCompatibility = 1.7
+-    targetCompatibility = 1.7
+-
++    sourceCompatibility = "$System.env.JAVA_SOURCE_VERSION"
++    targetCompatibility = "$System.env.JAVA_TARGET_VERSION"
+     repositories {
+         mavenCentral()
+         mavenLocal()
+@@ -72,7 +59,7 @@
          }
      }
  
@@ -59,7 +68,31 @@ Last-Update: 2020-06-15
          // We suppress the "try" warning because it disallows managing an auto-closeable with
          // try-with-resources without referencing the auto-closeable within the try block.
          // We suppress the "processing" warning as suggested in
-@@ -155,7 +144,6 @@
+@@ -123,14 +110,15 @@
+             // TODO(sebright): Enable -Werror for Java 9 once we upgrade AutoValue (issue #1017).
+             it.options.compilerArgs += ["-Werror"]
+         }
+-        if (JavaVersion.current().isJava9()) {
+-            // TODO(sebright): Currently, building with Java 9 produces the following "options" warnings:
+-            //
+-            // :opencensus-api:compileJavawarning: [options] bootstrap class path not set in conjunction with -source 1.6
+-            // warning: [options] source value 1.6 is obsolete and will be removed in a future release
+-            // warning: [options] target value 1.6 is obsolete and will be removed in a future release
+-            it.options.compilerArgs += ["-Xlint:-options"]
+-        }
++        // TODO(sebright): Currently, building with Java 9 produces the following "options" warnings:
++        //
++        // :opencensus-api:compileJavawarning: [options] bootstrap class path not set in conjunction with -source 1.6
++        // warning: [options] source value 1.6 is obsolete and will be removed in a future release
++        // warning: [options] target value 1.6 is obsolete and will be removed in a future release
++        //
++        // Using java-common's java_compat_level, we have the source/target values set to the current minimum
++        // This results in deprecation warnings, which we might want to supress because -Werror
++        it.options.compilerArgs += ["-Xlint:-options"]
+     }
+ 
+     compileTestJava {
+@@ -155,7 +143,6 @@
      }
  
      ext {
@@ -67,7 +100,7 @@ Last-Update: 2020-06-15
          aspectjVersion = '1.8.11'
          autoValueVersion = '1.4'
          findBugsAnnotationsVersion = '3.0.1'
-@@ -185,9 +173,9 @@
+@@ -185,9 +172,9 @@
          httpcomponentsVersion = "4.5.8"
  
          libraries = [
@@ -78,7 +111,7 @@ Last-Update: 2020-06-15
                  auto_service: 'com.google.auto.service:auto-service:1.0-rc3',
                  byte_buddy: 'net.bytebuddy:byte-buddy:1.8.22',
                  config: 'com.typesafe:config:1.2.1',
-@@ -304,12 +292,6 @@
+@@ -304,12 +291,6 @@
              html.enabled = true
          }
      }
@@ -91,7 +124,7 @@ Last-Update: 2020-06-15
  
      checkstyle {
          configFile = file("$rootDir/buildscripts/checkstyle.xml")
-@@ -321,22 +303,6 @@
+@@ -321,22 +302,6 @@
          configProperties["rootDir"] = rootDir
      }
  
@@ -114,7 +147,7 @@ Last-Update: 2020-06-15
      signing {
          required false
          sign configurations.archives
-@@ -356,29 +322,6 @@
+@@ -356,29 +321,6 @@
          archives javadocJar, sourcesJar
      }
  
@@ -144,7 +177,7 @@ Last-Update: 2020-06-15
      uploadArchives {
          repositories {
              mavenDeployer {
-@@ -433,7 +376,6 @@
+@@ -433,7 +375,6 @@
      uploadArchives.onlyIf {
          name in ['opencensus-api',
                   'opencensus-contrib-agent',
@@ -258,8 +291,8 @@ Last-Update: 2020-06-15
  description = 'OpenCensus API'
  
 +[compileJava, compileTestJava].each() {
-+    it.sourceCompatibility = 1.8
-+    it.targetCompatibility = 1.8
++    it.sourceCompatibility = "$System.env.JAVA_SOURCE_VERSION"
++    it.targetCompatibility = "$System.env.JAVA_TARGET_VERSION"
 +}
 +
  dependencies {
@@ -281,8 +314,8 @@ Last-Update: 2020-06-15
  [compileJava, compileTestJava].each() {
 -    it.sourceCompatibility = 1.6
 -    it.targetCompatibility = 1.6
-+    it.sourceCompatibility = 1.8
-+    it.targetCompatibility = 1.8
++    it.sourceCompatibility = "$System.env.JAVA_SOURCE_VERSION"
++    it.targetCompatibility = "$System.env.JAVA_TARGET_VERSION"
  }
  
  dependencies {
@@ -300,8 +333,8 @@ Last-Update: 2020-06-15
  [compileJava, compileTestJava].each() {
 -    it.sourceCompatibility = 1.6
 -    it.targetCompatibility = 1.6
-+    it.sourceCompatibility = 1.8
-+    it.targetCompatibility = 1.8
++    it.sourceCompatibility = "$System.env.JAVA_SOURCE_VERSION"
++    it.targetCompatibility = "$System.env.JAVA_TARGET_VERSION"
  }
  
  dependencies {
diff --git a/debian/rules b/debian/rules
index 6a861bc..56533f3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,9 @@
 #!/usr/bin/make -f
 
+include /usr/share/java/java_defaults.mk
+export JAVA_SOURCE_VERSION = $(java_compat_level)
+export JAVA_TARGET_VERSION = $(java_compat_level)
+
 # Ensure packages build with no Internet access
 export http_proxy=127.0.0.1:9
 export https_proxy=127.0.0.1:9