Merge ~vpa1977/ubuntu/+source/byte-buddy:update-to-1.14.11 into ubuntu/+source/byte-buddy:ubuntu/devel

Proposed by Vladimir Petko
Status: Merged
Merge reported by: Vladimir Petko
Merged at revision: 056c6d919b9286f999aba988b6938c03b51d5af3
Proposed branch: ~vpa1977/ubuntu/+source/byte-buddy:update-to-1.14.11
Merge into: ubuntu/+source/byte-buddy:ubuntu/devel
Prerequisite: ~vpa1977/ubuntu/+source/byte-buddy:1.14.11
Diff against target: 117 lines (+20/-9)
4 files modified
debian/changelog (+9/-0)
debian/control (+4/-3)
debian/copyright (+1/-0)
debian/patches/plugin-dependency.patch (+6/-6)
Reviewer Review Type Date Requested Status
Dan Bungert Pending
git-ubuntu import Pending
Review via email: mp+459686@code.launchpad.net

Description of the change

Changes:
  - new upstream release
  - update repack rules to exclude .so file
  - require asm-java that supports Java 21

PPA: ppa:vpa1977/gettext[1]

Testing:
 - piuparts install/upgrade/purge test (ok) [2]
 - rebuild reverse build depends in a ppa against updated version [3]

[1] https://launchpad.net/~vpa1977/+archive/ubuntu/gettext
[2] https://bugs.launchpad.net/ubuntu/+source/byte-buddy/+bug/2051752/comments/1
[3] https://launchpad.net/~vpa1977/+archive/ubuntu/byte-buddy-rdep/+packages

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

Already uploaded

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/debian/changelog b/debian/changelog
2index 6e4fc0f..b07ff04 100644
3--- a/debian/changelog
4+++ b/debian/changelog
5@@ -1,3 +1,12 @@
6+byte-buddy (1.14.11~us1-0ubuntu1) noble; urgency=medium
7+
8+ * New upstream release (LP: #2051752):
9+ - Refreshed the patches.
10+ - d/control: depend on asm (>= 9.6~).
11+ - d/copyright: exclude .so files.
12+
13+ -- Vladimir Petko <vladimir.petko@canonical.com> Thu, 04 Jan 2024 10:39:14 +1300
14+
15 byte-buddy (1.12.23-1) unstable; urgency=medium
16
17 * Team upload.
18diff --git a/debian/control b/debian/control
19index 9f80819..edf3805 100644
20--- a/debian/control
21+++ b/debian/control
22@@ -1,7 +1,8 @@
23 Source: byte-buddy
24 Section: java
25 Priority: optional
26-Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
27+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
28+XSBC-Original-Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
29 Uploaders:
30 Ying-Chun Liu (PaulLiu) <paulliu@debian.org>,
31 Felix Natter <fnatter@gmx.net>
32@@ -9,7 +10,7 @@ Build-Depends:
33 debhelper-compat (= 13),
34 default-jdk,
35 junit4,
36- libasm-java (>= 7.1),
37+ libasm-java (>= 9.6~),
38 libbuild-helper-maven-plugin-java,
39 libbyte-buddy-java (>= 1.11.22),
40 libfindbugs-annotations-java,
41@@ -32,7 +33,7 @@ Rules-Requires-Root: no
42 Package: libbyte-buddy-java
43 Architecture: all
44 Depends:
45- libasm-java (>= 7.0),
46+ libasm-java (>= 9.6~),
47 libmaven3-core-java (>= 3.5.0),
48 ${misc:Depends}
49 Suggests: ${maven:OptionalDepends}
50diff --git a/debian/copyright b/debian/copyright
51index e47214a..8e705ca 100644
52--- a/debian/copyright
53+++ b/debian/copyright
54@@ -7,6 +7,7 @@ Files-Excluded: .mvn/*
55 byte-buddy-gradle-plugin/gradle/*/gradle-*.zip
56 *.class
57 *.dll
58+ *.so
59
60 Files: *
61 Copyright: 2014-2017 Rafael Winterhalter <rafael.wth@gmail.com>
62diff --git a/debian/patches/plugin-dependency.patch b/debian/patches/plugin-dependency.patch
63index 8e4c023..e44da75 100644
64--- a/debian/patches/plugin-dependency.patch
65+++ b/debian/patches/plugin-dependency.patch
66@@ -8,7 +8,7 @@ Forwarded: not-needed
67 <plugin>
68 <groupId>net.bytebuddy</groupId>
69 - <artifactId>byte-buddy-maven-plugin</artifactId>
70-- <version>1.12.22</version>
71+- <version>1.14.10</version>
72 + <artifactId>byte-buddy-previous-maven-plugin</artifactId>
73 + <version>previous</version>
74 <executions>
75@@ -18,7 +18,7 @@ Forwarded: not-needed
76 <transformation>
77 <groupId>net.bytebuddy</groupId>
78 <artifactId>byte-buddy</artifactId>
79-- <version>1.12.22</version>
80+- <version>1.14.10</version>
81 + <version>debian</version>
82 <plugin>net.bytebuddy.build.HashCodeAndEqualsPlugin$WithNonNullableFields</plugin>
83 <arguments>
84@@ -27,14 +27,14 @@ Forwarded: not-needed
85 <transformation>
86 <groupId>net.bytebuddy</groupId>
87 <artifactId>byte-buddy</artifactId>
88-- <version>1.12.22</version>
89+- <version>1.14.10</version>
90 + <version>debian</version>
91 <plugin>net.bytebuddy.build.CachedReturnPlugin</plugin>
92 </transformation>
93 <transformation>
94 <groupId>net.bytebuddy</groupId>
95 <artifactId>byte-buddy</artifactId>
96-- <version>1.12.22</version>
97+- <version>1.14.10</version>
98 + <version>debian</version>
99 <plugin>net.bytebuddy.build.AccessControllerPlugin</plugin>
100 <arguments>
101@@ -43,14 +43,14 @@ Forwarded: not-needed
102 <transformation>
103 <groupId>net.bytebuddy</groupId>
104 <artifactId>byte-buddy</artifactId>
105-- <version>1.12.22</version>
106+- <version>1.14.10</version>
107 + <version>debian</version>
108 <plugin>net.bytebuddy.build.DispatcherAnnotationPlugin</plugin>
109 </transformation>
110 <transformation>
111 <groupId>net.bytebuddy</groupId>
112 <artifactId>byte-buddy</artifactId>
113-- <version>1.12.22</version>
114+- <version>1.14.10</version>
115 + <version>debian</version>
116 <plugin>net.bytebuddy.build.RepeatedAnnotationPlugin</plugin>
117 </transformation>

Subscribers

People subscribed via source and target branches