Merge ~vpa1977/ubuntu/+source/asm:asm-upgrade into ubuntu/+source/asm:ubuntu/devel

[Vladimir Petko]

Changes:
 - new upstream release, refresh patches.

PPA: ppa:vpa1977/gettext [1]

Testing:
 - piuparts install/purge test[2]
 - rebuild reverse build dependenices in ppa[3]
   Note: there are existing build failures in asm-java reverse build dependencies:
    - android-platform-tools-base: FTBFS: SignatureExtension.java:32: error: DEROutputStream is not public in org.bouncycastle.asn1; cannot be accessed from outside package[4]
    - tika: FTBFS cannot find symbols[5]

[1] https://launchpad.net/~vpa1977/+archive/ubuntu/gettext
[2] https://bugs.launchpad.net/ubuntu/+source/asm/+bug/2051746/comments/2
[3] https://launchpad.net/~vpa1977/+archive/ubuntu/reverse-depends
[4] https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1058331
[5] https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1011492

[Dan Bungert (dbungert)]

Looks like this was already uploaded

diff --git a/debian/changelog b/debian/changelog
index 403f5ce..0e67ad3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+asm (9.6~us1-0ubuntu1) noble; urgency=medium
+
+  * New upstream release (LP: #2051746):
+    - Refreshed the patches
+
+ -- Vladimir Petko <[e-mail]>  Thu, 04 Jan 2024 10:46:07 +1300
+
 asm (9.5-1) unstable; urgency=medium
 
   * New upstream release
diff --git a/debian/control b/debian/control
index 69977ee..8e3542b 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: asm
 Section: java
 Priority: optional
-Maintainer: Debian Java Maintainers <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian Java Maintainers <[e-mail]>
 Uploaders:
  Aditya Vaidya <[e-mail]>,
  Emmanuel Bourg <[e-mail]>
diff --git a/debian/patches/02-ignore-google-java-format-plugin.patch b/debian/patches/02-ignore-google-java-format-plugin.patch
index fd9f1b5..ba8ffb8 100644
--- a/debian/patches/02-ignore-google-java-format-plugin.patch
+++ b/debian/patches/02-ignore-google-java-format-plugin.patch
@@ -9,16 +9,15 @@ Forwarded: not-needed
  
 -plugins { id 'com.github.sherter.google-java-format' version '0.9' apply false }
  plugins { id 'me.champeau.jmh' version '0.6.8' apply false }
- plugins { id 'org.sonarqube' version '3.5.0.2730' apply false }
+ plugins { id 'org.sonarqube' version '4.3.1.3277' apply false }
  
-@@ -181,10 +180,6 @@
+@@ -181,9 +180,6 @@
  // All projects are checked with googleJavaFormat, Checkstyle and PMD, 
  // and tested with :asm-test and JUnit.
  subprojects {
 -  apply plugin: 'com.github.sherter.google-java-format'
 -  googleJavaFormat.toolVersion = '1.15.0'
 -  googleJavaFormat.exclude 'src/resources/java/**/*'
--  
+   
    // Check the coding style with Checkstyle. Fail in case of error or warning.
    apply plugin: 'checkstyle'
-   checkstyle.configFile = file("${rootDir}/tools/checkstyle.xml")
diff --git a/debian/patches/03-ignore-jmh-plugin.patch b/debian/patches/03-ignore-jmh-plugin.patch
index 3ead24f..9358352 100644
--- a/debian/patches/03-ignore-jmh-plugin.patch
+++ b/debian/patches/03-ignore-jmh-plugin.patch
@@ -8,7 +8,7 @@ Forwarded: not-needed
  }
  
 -plugins { id 'me.champeau.jmh' version '0.6.8' apply false }
- plugins { id 'org.sonarqube' version '3.5.0.2730' apply false }
+ plugins { id 'org.sonarqube' version '4.3.1.3277' apply false }
  
  description = 'ASM, a very small and fast Java bytecode manipulation framework'
 @@ -118,10 +117,8 @@
diff --git a/debian/patches/04-ignore-sonarqube-plugin.patch b/debian/patches/04-ignore-sonarqube-plugin.patch
index a1dc7f7..6a0cb0e 100644
--- a/debian/patches/04-ignore-sonarqube-plugin.patch
+++ b/debian/patches/04-ignore-sonarqube-plugin.patch
@@ -3,22 +3,23 @@ Author: Emmanuel Bourg <[e-mail]>
 Forwarded: not-needed
 --- a/build.gradle
 +++ b/build.gradle
-@@ -31,7 +31,6 @@
+@@ -31,8 +31,6 @@
    dependencies { classpath 'org.netbeans.tools:sigtest-maven-plugin:1.5' }
  }
  
--plugins { id 'org.sonarqube' version '3.5.0.2730' apply false }
- 
+-plugins { id 'org.sonarqube' version '4.3.1.3277' apply false }
+-
  description = 'ASM, a very small and fast Java bytecode manipulation framework'
  
-@@ -305,13 +304,6 @@
+ apply plugin: 'java-platform'
+@@ -311,13 +309,6 @@
      }
    }
  
 -  // Apply the SonarQube plugin to monitor the code quality of the project.
--  // Use with 'gradlew sonarqube -Dsonar.host.url=https://sonarqube.ow2.org'.
+-  // Use with 'gradlew sonar -Dsonar.host.url=https://sonarqube.ow2.org'.
 -  apply plugin: 'org.sonarqube'
--  sonarqube {
+-  sonar {
 -    properties { property 'sonar.projectKey', "ASM:${project.name}" }
 -  }
 -
diff --git a/debian/patches/05-junit-compatibility.patch b/debian/patches/05-junit-compatibility.patch
index 7895071..45705b0 100644
--- a/debian/patches/05-junit-compatibility.patch
+++ b/debian/patches/05-junit-compatibility.patch
@@ -3,7 +3,7 @@ Author: Emmanuel Bourg <[e-mail]>
 Forwarded: not-needed
 --- a/build.gradle
 +++ b/build.gradle
-@@ -53,7 +53,6 @@
+@@ -52,7 +52,6 @@
    apply plugin: 'jacoco'
    sourceCompatibility = '1.8'
    targetCompatibility = '1.8'
diff --git a/debian/patches/06-disable-retrofitter.patch b/debian/patches/06-disable-retrofitter.patch
index 603e608..9b1fff5 100644
--- a/debian/patches/06-disable-retrofitter.patch
+++ b/debian/patches/06-disable-retrofitter.patch
@@ -3,7 +3,7 @@ Author: Emmanuel Bourg <[e-mail]>
 Forwarded: not-needed
 --- a/build.gradle
 +++ b/build.gradle
-@@ -222,22 +222,6 @@
+@@ -227,22 +227,6 @@
    }
    check.dependsOn jacocoTestCoverageVerification
  
diff --git a/debian/patches/07-restore-asm-all.patch b/debian/patches/07-restore-asm-all.patch
index 4206b75..f6c9f30 100644
--- a/debian/patches/07-restore-asm-all.patch
+++ b/debian/patches/07-restore-asm-all.patch
@@ -3,7 +3,7 @@ Author: Emmanuel Bourg <[e-mail]>
 Forwarded: not-needed
 --- a/build.gradle
 +++ b/build.gradle
-@@ -74,6 +74,10 @@
+@@ -73,6 +73,10 @@
  // Project descriptions
  // -----------------------------------------------------------------------------
  
diff --git a/debian/patches/08-ignore-sigtest-maven-plugin.patch b/debian/patches/08-ignore-sigtest-maven-plugin.patch
index 8a5d363..30b9d89 100644
--- a/debian/patches/08-ignore-sigtest-maven-plugin.patch
+++ b/debian/patches/08-ignore-sigtest-maven-plugin.patch
@@ -3,7 +3,7 @@ Author: Emmanuel Bourg <[e-mail]>
 Forwarded: not-needed
 --- a/build.gradle
 +++ b/build.gradle
-@@ -233,17 +233,6 @@
+@@ -238,35 +238,9 @@
        task "${f.name}"(dependsOn: 'classes') {
          inputs.files(f, sourceSets.main.java)
          outputs.file("${buildDir}/${f.name}")
@@ -21,10 +21,10 @@ Forwarded: not-needed
        }
        check.dependsOn f.name
      }
-@@ -251,16 +240,6 @@
-     task "buildSigtest"(dependsOn: 'classes') {
-       inputs.files(sourceSets.main.java)
-       outputs.file("src/test/resources/sigtest-${version}.txt")
+-    // Define a task to create a sigtest file for the current version.
+-    task "buildSigtest"(dependsOn: 'classes') {
+-      inputs.files(sourceSets.main.java)
+-      outputs.file("src/test/resources/sigtest-${version}.txt")
 -      doLast {
 -        def setup = new com.sun.tdk.signaturetest.Setup()
 -        def args = ['-ApiVersion', version, '-FileName', outputs.getFiles()[0],
@@ -35,6 +35,7 @@ Forwarded: not-needed
 -        setup.run(args as String[], new PrintWriter(System.err, true), null)
 -        if (!setup.isPassed()) throw new GradleException()
 -      }
-     }
+-    }
    }
  
+   jar.manifest.attributes(
diff --git a/debian/patches/09-ignore-test-coverage.patch b/debian/patches/09-ignore-test-coverage.patch
index bd66086..79cf2d2 100644
--- a/debian/patches/09-ignore-test-coverage.patch
+++ b/debian/patches/09-ignore-test-coverage.patch
@@ -3,12 +3,12 @@ Author: Emmanuel Bourg <[e-mail]>
 Forwarded: not-needed
 --- a/build.gradle
 +++ b/build.gradle
-@@ -214,18 +214,6 @@
+@@ -215,20 +215,6 @@
  // checked for code coverage and backward compatibility, retrofited to Java 1.5,
  // and packaged with generated module-info classes.
  configure(subprojects.findAll{it.provides}) {
 -  // Code coverage configuration.
--  jacoco.toolVersion = '0.8.8'
+-  jacoco.toolVersion = '0.8.10'
 -  jacocoTestReport {
 -    reports { xml.required = true }
 -    classDirectories.setFrom(sourceSets.main.output.classesDirs)
@@ -16,9 +16,11 @@ Forwarded: not-needed
 -  jacocoTestCoverageVerification {
 -    classDirectories.setFrom(sourceSets.main.output.classesDirs)
 -    violationRules.rule { limit { minimum = 0.95; counter = 'INSTRUCTION' } }
+-    dependsOn ':asm:jar'
+-    dependsOn ':asm-tree:jar'
+-    dependsOn ':asm-commons:jar'
 -  }
 -  check.dependsOn jacocoTestCoverageVerification
--
+
    // Create one backward compatibility checking task for each 'sigtest-*' file
    // in test/resources, and make the 'check' task depend on all these tasks.
-   if (file('src/test/resources/').exists()) {
diff --git a/debian/patches/11-gradle-compatibility.patch b/debian/patches/11-gradle-compatibility.patch
index aa2d7d3..195cd7e 100644
--- a/debian/patches/11-gradle-compatibility.patch
+++ b/debian/patches/11-gradle-compatibility.patch
@@ -3,27 +3,32 @@ Author: Emmanuel Bourg <[e-mail]>
 Forwarded: not-needed
 --- a/build.gradle
 +++ b/build.gradle
-@@ -202,7 +202,7 @@
+@@ -203,7 +203,7 @@
    }
- 
+
    // Produce byte-for-byte reproducible archives.
 -  tasks.withType(AbstractArchiveTask).configureEach {
 +  tasks.withType(AbstractArchiveTask) {
      preserveFileTimestamps = false
      reproducibleFileOrder = true
      dirMode = 0775
-@@ -279,10 +279,6 @@
-     from sourceSets.main.allSource
-     classifier 'sources'
+@@ -270,15 +270,9 @@
+   // together with the main jar (containing the compiled code).
+   task javadocJar(type: Jar, dependsOn: 'javadoc') {
+     from javadoc.destinationDir
+-    archiveClassifier = 'javadoc'
    }
+   task sourcesJar(type: Jar, dependsOn: 'classes') {
+     from sourceSets.main.allSource
+-    archiveClassifier = 'sources'
+-  }
 -  java {
 -    withJavadocJar()
 -    withSourcesJar()
--  }
+   }
  }
- 
- // Configure the root project, and those with a non-empty 'provides' property,
-@@ -290,6 +286,7 @@
+
+@@ -287,6 +281,7 @@
  configure([rootProject] + subprojects.findAll { it.provides }) {
    apply plugin: 'maven-publish'
    apply plugin: 'signing'
@@ -31,7 +36,7 @@ Forwarded: not-needed
    publishing {
      repositories {
        maven {
-@@ -382,4 +379,5 @@
+@@ -379,4 +374,5 @@
      sign publishing.publications.maven
    }
    tasks.withType(GenerateModuleMetadata) { enabled = false }
diff --git a/debian/patches/12-ignore-java-platform-plugin.patch b/debian/patches/12-ignore-java-platform-plugin.patch
index fb82387..3fbeeee 100644
--- a/debian/patches/12-ignore-java-platform-plugin.patch
+++ b/debian/patches/12-ignore-java-platform-plugin.patch
@@ -3,10 +3,10 @@ Author: Emmanuel Bourg <[e-mail]>
 Forwarded: not-needed
 --- a/build.gradle
 +++ b/build.gradle
-@@ -34,14 +34,6 @@
- 
+@@ -33,14 +33,6 @@
+
  description = 'ASM, a very small and fast Java bytecode manipulation framework'
- 
+
 -apply plugin: 'java-platform'
 -dependencies {
 -  constraints {
@@ -17,4 +17,4 @@ Forwarded: not-needed
 -
  allprojects {
    group = 'org.ow2.asm'
-   version = '9.5' + (rootProject.hasProperty('release') ? '' : '-SNAPSHOT')
+   version = '9.6' + (rootProject.hasProperty('release') ? '' : '-SNAPSHOT')