Ubuntu
asm package

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

  1. Git
  2. lp:~vpa1977/ubuntu/+source/asm
  3. asm-upgrade
  4. Merge into ubuntu/devel
Proposed by Vladimir Petko
Status: Merged
Merge reported by: Vladimir Petko
Merged at revision: 27a7adbe71e3e52a610b2f1f2960170cff20cb42
Proposed branch: ~vpa1977/ubuntu/+source/asm:asm-upgrade
Merge into: ubuntu/+source/asm:ubuntu/devel
Prerequisite: ~vpa1977/ubuntu/+source/asm:new_upstream_9.6
Diff against target: 288 lines (+55/-39)
12 files modified
debian/changelog (+7/-0)
debian/control (+2/-1)
debian/patches/02-ignore-google-java-format-plugin.patch (+3/-4)
debian/patches/03-ignore-jmh-plugin.patch (+1/-1)
debian/patches/04-ignore-sonarqube-plugin.patch (+7/-6)
debian/patches/05-junit-compatibility.patch (+1/-1)
debian/patches/06-disable-retrofitter.patch (+1/-1)
debian/patches/07-restore-asm-all.patch (+1/-1)
debian/patches/08-ignore-sigtest-maven-plugin.patch (+7/-6)
debian/patches/09-ignore-test-coverage.patch (+6/-4)
debian/patches/11-gradle-compatibility.patch (+15/-10)
debian/patches/12-ignore-java-platform-plugin.patch (+4/-4)
Reviewer Review Type Date Requested Status
Dan Bungert Pending
git-ubuntu import Pending
Review via email: mp+459679@code.launchpad.net

Description of the change

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

To post a comment you must log in.
Revision history for this message
Dan Bungert (dbungert) wrote :

Looks like this was already uploaded

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
diff --git a/debian/changelog b/debian/changelog
index 403f5ce..0e67ad3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
1asm (9.6~us1-0ubuntu1) noble; urgency=medium
2
3 * New upstream release (LP: #2051746):
4 - Refreshed the patches
5
6 -- Vladimir Petko <vladimir.petko@canonical.com> Thu, 04 Jan 2024 10:46:07 +1300
7
1asm (9.5-1) unstable; urgency=medium8asm (9.5-1) unstable; urgency=medium
29
3 * New upstream release10 * 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 @@
1Source: asm1Source: asm
2Section: java2Section: java
3Priority: optional3Priority: optional
4Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>4Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
5XSBC-Original-Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
5Uploaders:6Uploaders:
6 Aditya Vaidya <kroq.gar78@gmail.com>,7 Aditya Vaidya <kroq.gar78@gmail.com>,
7 Emmanuel Bourg <ebourg@apache.org>8 Emmanuel Bourg <ebourg@apache.org>
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
9 9
10-plugins { id 'com.github.sherter.google-java-format' version '0.9' apply false }10-plugins { id 'com.github.sherter.google-java-format' version '0.9' apply false }
11 plugins { id 'me.champeau.jmh' version '0.6.8' apply false }11 plugins { id 'me.champeau.jmh' version '0.6.8' apply false }
12 plugins { id 'org.sonarqube' version '3.5.0.2730' apply false }12 plugins { id 'org.sonarqube' version '4.3.1.3277' apply false }
13 13
14@@ -181,10 +180,6 @@14@@ -181,9 +180,6 @@
15 // All projects are checked with googleJavaFormat, Checkstyle and PMD, 15 // All projects are checked with googleJavaFormat, Checkstyle and PMD,
16 // and tested with :asm-test and JUnit.16 // and tested with :asm-test and JUnit.
17 subprojects {17 subprojects {
18- apply plugin: 'com.github.sherter.google-java-format'18- apply plugin: 'com.github.sherter.google-java-format'
19- googleJavaFormat.toolVersion = '1.15.0'19- googleJavaFormat.toolVersion = '1.15.0'
20- googleJavaFormat.exclude 'src/resources/java/**/*'20- googleJavaFormat.exclude 'src/resources/java/**/*'
21- 21
22 // Check the coding style with Checkstyle. Fail in case of error or warning.22 // Check the coding style with Checkstyle. Fail in case of error or warning.
23 apply plugin: 'checkstyle'23 apply plugin: 'checkstyle'
24 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
8 }8 }
9 9
10-plugins { id 'me.champeau.jmh' version '0.6.8' apply false }10-plugins { id 'me.champeau.jmh' version '0.6.8' apply false }
11 plugins { id 'org.sonarqube' version '3.5.0.2730' apply false }11 plugins { id 'org.sonarqube' version '4.3.1.3277' apply false }
12 12
13 description = 'ASM, a very small and fast Java bytecode manipulation framework'13 description = 'ASM, a very small and fast Java bytecode manipulation framework'
14@@ -118,10 +117,8 @@14@@ -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 <ebourg@apache.org>
3Forwarded: not-needed3Forwarded: not-needed
4--- a/build.gradle4--- a/build.gradle
5+++ b/build.gradle5+++ b/build.gradle
6@@ -31,7 +31,6 @@6@@ -31,8 +31,6 @@
7 dependencies { classpath 'org.netbeans.tools:sigtest-maven-plugin:1.5' }7 dependencies { classpath 'org.netbeans.tools:sigtest-maven-plugin:1.5' }
8 }8 }
9 9
10-plugins { id 'org.sonarqube' version '3.5.0.2730' apply false }10-plugins { id 'org.sonarqube' version '4.3.1.3277' apply false }
11 11-
12 description = 'ASM, a very small and fast Java bytecode manipulation framework'12 description = 'ASM, a very small and fast Java bytecode manipulation framework'
13 13
14@@ -305,13 +304,6 @@14 apply plugin: 'java-platform'
15@@ -311,13 +309,6 @@
15 }16 }
16 }17 }
17 18
18- // Apply the SonarQube plugin to monitor the code quality of the project.19- // Apply the SonarQube plugin to monitor the code quality of the project.
19- // Use with 'gradlew sonarqube -Dsonar.host.url=https://sonarqube.ow2.org'.20- // Use with 'gradlew sonar -Dsonar.host.url=https://sonarqube.ow2.org'.
20- apply plugin: 'org.sonarqube'21- apply plugin: 'org.sonarqube'
21- sonarqube {22- sonar {
22- properties { property 'sonar.projectKey', "ASM:${project.name}" }23- properties { property 'sonar.projectKey', "ASM:${project.name}" }
23- }24- }
24-25-
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 <ebourg@apache.org>
3Forwarded: not-needed3Forwarded: not-needed
4--- a/build.gradle4--- a/build.gradle
5+++ b/build.gradle5+++ b/build.gradle
6@@ -53,7 +53,6 @@6@@ -52,7 +52,6 @@
7 apply plugin: 'jacoco'7 apply plugin: 'jacoco'
8 sourceCompatibility = '1.8'8 sourceCompatibility = '1.8'
9 targetCompatibility = '1.8'9 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 <ebourg@apache.org>
3Forwarded: not-needed3Forwarded: not-needed
4--- a/build.gradle4--- a/build.gradle
5+++ b/build.gradle5+++ b/build.gradle
6@@ -222,22 +222,6 @@6@@ -227,22 +227,6 @@
7 }7 }
8 check.dependsOn jacocoTestCoverageVerification8 check.dependsOn jacocoTestCoverageVerification
9 9
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 <ebourg@apache.org>
3Forwarded: not-needed3Forwarded: not-needed
4--- a/build.gradle4--- a/build.gradle
5+++ b/build.gradle5+++ b/build.gradle
6@@ -74,6 +74,10 @@6@@ -73,6 +73,10 @@
7 // Project descriptions7 // Project descriptions
8 // -----------------------------------------------------------------------------8 // -----------------------------------------------------------------------------
9 9
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 <ebourg@apache.org>
3Forwarded: not-needed3Forwarded: not-needed
4--- a/build.gradle4--- a/build.gradle
5+++ b/build.gradle5+++ b/build.gradle
6@@ -233,17 +233,6 @@6@@ -238,35 +238,9 @@
7 task "${f.name}"(dependsOn: 'classes') {7 task "${f.name}"(dependsOn: 'classes') {
8 inputs.files(f, sourceSets.main.java)8 inputs.files(f, sourceSets.main.java)
9 outputs.file("${buildDir}/${f.name}")9 outputs.file("${buildDir}/${f.name}")
@@ -21,10 +21,10 @@ Forwarded: not-needed
21 }21 }
22 check.dependsOn f.name22 check.dependsOn f.name
23 }23 }
24@@ -251,16 +240,6 @@24- // Define a task to create a sigtest file for the current version.
25 task "buildSigtest"(dependsOn: 'classes') {25- task "buildSigtest"(dependsOn: 'classes') {
26 inputs.files(sourceSets.main.java)26- inputs.files(sourceSets.main.java)
27 outputs.file("src/test/resources/sigtest-${version}.txt")27- outputs.file("src/test/resources/sigtest-${version}.txt")
28- doLast {28- doLast {
29- def setup = new com.sun.tdk.signaturetest.Setup()29- def setup = new com.sun.tdk.signaturetest.Setup()
30- def args = ['-ApiVersion', version, '-FileName', outputs.getFiles()[0],30- def args = ['-ApiVersion', version, '-FileName', outputs.getFiles()[0],
@@ -35,6 +35,7 @@ Forwarded: not-needed
35- setup.run(args as String[], new PrintWriter(System.err, true), null)35- setup.run(args as String[], new PrintWriter(System.err, true), null)
36- if (!setup.isPassed()) throw new GradleException()36- if (!setup.isPassed()) throw new GradleException()
37- }37- }
38 }38- }
39 }39 }
40 40
41 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 <ebourg@apache.org>
3Forwarded: not-needed3Forwarded: not-needed
4--- a/build.gradle4--- a/build.gradle
5+++ b/build.gradle5+++ b/build.gradle
6@@ -214,18 +214,6 @@6@@ -215,20 +215,6 @@
7 // checked for code coverage and backward compatibility, retrofited to Java 1.5,7 // checked for code coverage and backward compatibility, retrofited to Java 1.5,
8 // and packaged with generated module-info classes.8 // and packaged with generated module-info classes.
9 configure(subprojects.findAll{it.provides}) {9 configure(subprojects.findAll{it.provides}) {
10- // Code coverage configuration.10- // Code coverage configuration.
11- jacoco.toolVersion = '0.8.8'11- jacoco.toolVersion = '0.8.10'
12- jacocoTestReport {12- jacocoTestReport {
13- reports { xml.required = true }13- reports { xml.required = true }
14- classDirectories.setFrom(sourceSets.main.output.classesDirs)14- classDirectories.setFrom(sourceSets.main.output.classesDirs)
@@ -16,9 +16,11 @@ Forwarded: not-needed
16- jacocoTestCoverageVerification {16- jacocoTestCoverageVerification {
17- classDirectories.setFrom(sourceSets.main.output.classesDirs)17- classDirectories.setFrom(sourceSets.main.output.classesDirs)
18- violationRules.rule { limit { minimum = 0.95; counter = 'INSTRUCTION' } }18- violationRules.rule { limit { minimum = 0.95; counter = 'INSTRUCTION' } }
19- dependsOn ':asm:jar'
20- dependsOn ':asm-tree:jar'
21- dependsOn ':asm-commons:jar'
19- }22- }
20- check.dependsOn jacocoTestCoverageVerification23- check.dependsOn jacocoTestCoverageVerification
21-24
22 // Create one backward compatibility checking task for each 'sigtest-*' file25 // Create one backward compatibility checking task for each 'sigtest-*' file
23 // in test/resources, and make the 'check' task depend on all these tasks.26 // in test/resources, and make the 'check' task depend on all these tasks.
24 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 <ebourg@apache.org>
3Forwarded: not-needed3Forwarded: not-needed
4--- a/build.gradle4--- a/build.gradle
5+++ b/build.gradle5+++ b/build.gradle
6@@ -202,7 +202,7 @@6@@ -203,7 +203,7 @@
7 }7 }
8 8
9 // Produce byte-for-byte reproducible archives.9 // Produce byte-for-byte reproducible archives.
10- tasks.withType(AbstractArchiveTask).configureEach {10- tasks.withType(AbstractArchiveTask).configureEach {
11+ tasks.withType(AbstractArchiveTask) {11+ tasks.withType(AbstractArchiveTask) {
12 preserveFileTimestamps = false12 preserveFileTimestamps = false
13 reproducibleFileOrder = true13 reproducibleFileOrder = true
14 dirMode = 077514 dirMode = 0775
15@@ -279,10 +279,6 @@15@@ -270,15 +270,9 @@
16 from sourceSets.main.allSource16 // together with the main jar (containing the compiled code).
17 classifier 'sources'17 task javadocJar(type: Jar, dependsOn: 'javadoc') {
18 from javadoc.destinationDir
19- archiveClassifier = 'javadoc'
18 }20 }
21 task sourcesJar(type: Jar, dependsOn: 'classes') {
22 from sourceSets.main.allSource
23- archiveClassifier = 'sources'
24- }
19- java {25- java {
20- withJavadocJar()26- withJavadocJar()
21- withSourcesJar()27- withSourcesJar()
22- }28 }
23 }29 }
24 30
25 // Configure the root project, and those with a non-empty 'provides' property,31@@ -287,6 +281,7 @@
26@@ -290,6 +286,7 @@
27 configure([rootProject] + subprojects.findAll { it.provides }) {32 configure([rootProject] + subprojects.findAll { it.provides }) {
28 apply plugin: 'maven-publish'33 apply plugin: 'maven-publish'
29 apply plugin: 'signing'34 apply plugin: 'signing'
@@ -31,7 +36,7 @@ Forwarded: not-needed
31 publishing {36 publishing {
32 repositories {37 repositories {
33 maven {38 maven {
34@@ -382,4 +379,5 @@39@@ -379,4 +374,5 @@
35 sign publishing.publications.maven40 sign publishing.publications.maven
36 }41 }
37 tasks.withType(GenerateModuleMetadata) { enabled = false }42 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 <ebourg@apache.org>
3Forwarded: not-needed3Forwarded: not-needed
4--- a/build.gradle4--- a/build.gradle
5+++ b/build.gradle5+++ b/build.gradle
6@@ -34,14 +34,6 @@6@@ -33,14 +33,6 @@
7 7
8 description = 'ASM, a very small and fast Java bytecode manipulation framework'8 description = 'ASM, a very small and fast Java bytecode manipulation framework'
9 9
10-apply plugin: 'java-platform'10-apply plugin: 'java-platform'
11-dependencies {11-dependencies {
12- constraints {12- constraints {
@@ -17,4 +17,4 @@ Forwarded: not-needed
17-17-
18 allprojects {18 allprojects {
19 group = 'org.ow2.asm'19 group = 'org.ow2.asm'
20 version = '9.5' + (rootProject.hasProperty('release') ? '' : '-SNAPSHOT')20 version = '9.6' + (rootProject.hasProperty('release') ? '' : '-SNAPSHOT')

Subscribers

People subscribed via source and target branches