Merge ~vpa1977/ubuntu/+source/openjdk-23:ea-26 into ubuntu/+source/openjdk-23:ubuntu/devel

Proposed by Vladimir Petko
Status: Work in progress
Proposed branch: ~vpa1977/ubuntu/+source/openjdk-23:ea-26
Merge into: ubuntu/+source/openjdk-23:ubuntu/devel
Prerequisite: ~vpa1977/ubuntu/+source/openjdk-23:ea-26-orig
Diff against target: 188 lines (+19/-44)
7 files modified
debian/changelog (+11/-0)
debian/control (+3/-2)
debian/control.in (+2/-1)
debian/rules (+3/-2)
debian/tests/control (+0/-4)
debian/tests/control.in (+0/-4)
dev/null (+0/-31)
Reviewer Review Type Date Requested Status
git-ubuntu import Pending
Review via email: mp+467155@code.launchpad.net

Description of the change

Update openjdk-23 to the latest snapshot.

Changes:
 -

PPA: ppa:vpa1977/october-21-2 [1]

[1] https://launchpad.net/~vpa1977/+archive/ubuntu/october-21-2

To post a comment you must log in.
6059be7... by Vladimir Petko

d/rules: add missing file

fcbe3d3... by Vladimir Petko

changelog: new config file

Unmerged commits

fcbe3d3... by Vladimir Petko

changelog: new config file

6059be7... by Vladimir Petko

d/rules: add missing file

2e2141f... by Vladimir Petko

update-maintainer

be3b51b... by Vladimir Petko

changelog

4e3443f... by Vladimir Petko

bump git tag for 23~26ea

1627352... by Vladimir Petko

- d/t/jni-link.{in,sh}: drop obsolete test. After JDK-8331541 the build will fail if JVM contains undefined symbols.

cd30199... by Vladimir Petko

regenerate control

8ff31b1... by Vladimir Petko

enable jtreg

1b43e20... by Vladimir Petko

New upstream release 23+26

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 328549e..5224cf1 100644
3--- a/debian/changelog
4+++ b/debian/changelog
5@@ -1,3 +1,14 @@
6+openjdk-23 (23~26ea~us1-0ubuntu1) oracular; urgency=medium
7+
8+ * OpenJDK 23 snapshot, Build 26 (LP: #2068861).
9+ * d/t/jni-link.{in,sh}: drop obsolete test. After JDK-8331541 the build
10+ will fail if JVM contains undefined symbols.
11+ * d/rules: enable jtreg tests.
12+ * d/rules: add conf/jaxp-strict.properties.template to jre-headless config
13+ files.
14+
15+ -- Vladimir Petko <vladimir.petko@canonical.com> Mon, 10 Jun 2024 11:14:07 +1200
16+
17 openjdk-23 (23~20ea-1) unstable; urgency=medium
18
19 * OpenJDK 23 snapshot, Build 20.
20diff --git a/debian/control b/debian/control
21index bfbcfa4..50d3559 100644
22--- a/debian/control
23+++ b/debian/control
24@@ -1,13 +1,14 @@
25 Source: openjdk-23
26 Section: java
27 Priority: optional
28-Maintainer: OpenJDK Team <openjdk-23@packages.debian.org>
29+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
30+XSBC-Original-Maintainer: OpenJDK Team <openjdk-23@packages.debian.org>
31 Uploaders: Matthias Klose <doko@ubuntu.com>
32 Build-Depends: debhelper (>= 11),
33 m4, lsb-release, zip, unzip,
34 sharutils, gawk, cpio, pkg-config, procps, wdiff, fastjar (>= 2:0.96-0ubuntu2),
35 time, strip-nondeterminism, debugedit (>= 4.16),
36- file,
37+ jtreg7 (>= 7.3.1+1~) <!nocheck>, libtestng7-java <!nocheck>, xvfb <!nocheck>, xauth <!nocheck>, xfonts-base <!nocheck>, libgl1-mesa-dri [!x32] <!nocheck>, xfwm4 <!nocheck>, x11-xkb-utils <!nocheck>, dbus-x11 <!nocheck>, libasmtools-java <!nocheck>, xvfb <!nocheck>,
38 autoconf, automake, autotools-dev, ant, ant-optional,
39 g++-13 <!cross>,
40 openjdk-22-jdk-headless:native | openjdk-23-jdk-headless:native,
41diff --git a/debian/control.in b/debian/control.in
42index 98b6642..b3ea9f2 100644
43--- a/debian/control.in
44+++ b/debian/control.in
45@@ -1,7 +1,8 @@
46 Source: @basename@
47 Section: java
48 Priority: optional
49-Maintainer: OpenJDK Team <@basename@@packages.debian.org>
50+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
51+XSBC-Original-Maintainer: OpenJDK Team <@basename@@packages.debian.org>
52 Uploaders: Matthias Klose <doko@ubuntu.com>
53 Build-Depends: @bd_debhelper@
54 m4, lsb-release, zip, unzip,
55diff --git a/debian/rules b/debian/rules
56index 4f2ae3a..a270a11 100755
57--- a/debian/rules
58+++ b/debian/rules
59@@ -184,7 +184,7 @@ with_docs = $(if $(findstring nodoc, $(DEB_BUILD_OPTIONS)),,yes)
60 ifneq (,$(filter $(distrel), precise trusty))
61 with_docs =
62 endif
63-with_check = disabled for this upload
64+#with_check = disabled for this upload
65
66 with_wqy_zenhai = $(if $(filter $(distrel),lenny),,yes)
67
68@@ -1387,6 +1387,7 @@ endif
69 lib/psfont.properties.ja \
70 lib/jfr/default.jfc \
71 lib/jfr/profile.jfc \
72+ conf/jaxp-strict.properties.template \
73 conf/swing.properties \
74 conf/management/jmxremote.access \
75 conf/management/management.properties \
76@@ -1962,7 +1963,7 @@ endif
77 dh_builddeb -a $(nodemo) $(nojrez) #$(bd_options)
78
79 git_project = jdk
80-git_tag = jdk-23+20
81+git_tag = jdk-23+26
82 package_version = $(shell echo $(PKGVERSION) | sed 's/-[^-][^-]*$$//')
83 ifneq ($(is_upstream_release),yes)
84 package_version := $(subst +,~,$(package_version))
85diff --git a/debian/tests/control b/debian/tests/control
86index 6e3d7ef..a120707 100644
87--- a/debian/tests/control
88+++ b/debian/tests/control
89@@ -14,10 +14,6 @@ Tests: jdk-autopkgtest.sh
90 Depends: @, jtreg7 (>= 7.3.1+1~), libtestng7-java, build-essential, bash, lsb-release, xfwm4, xvfb, xauth, dbus-x11, libatk-wrapper-java, libatk-wrapper-java-jni
91 Restrictions: allow-stderr, skippable, flaky, rw-build-tree
92
93-Tests: jni-link.sh
94-Depends: @, build-essential, bash
95-Restrictions: allow-stderr
96-
97 Tests: dependencies.sh
98 Depends: @, build-essential, bash
99 Restrictions: allow-stderr, skippable, flaky
100diff --git a/debian/tests/control.in b/debian/tests/control.in
101index 2287cfa..3c7ddd0 100644
102--- a/debian/tests/control.in
103+++ b/debian/tests/control.in
104@@ -14,10 +14,6 @@ Tests: jdk-autopkgtest.sh
105 Depends: @, @jtreg_dep@, @testng_dep@, build-essential, bash, lsb-release, xfwm4, xvfb, xauth, dbus-x11, libatk-wrapper-java, libatk-wrapper-java-jni
106 Restrictions: allow-stderr, skippable, flaky, rw-build-tree
107
108-Tests: jni-link.sh
109-Depends: @, build-essential, bash
110-Restrictions: allow-stderr
111-
112 Tests: dependencies.sh
113 Depends: @, build-essential, bash
114 Restrictions: allow-stderr, skippable, flaky
115diff --git a/debian/tests/jni-link.in b/debian/tests/jni-link.in
116deleted file mode 100755
117index a0d8080..0000000
118--- a/debian/tests/jni-link.in
119+++ /dev/null
120@@ -1,31 +0,0 @@
121-#!/bin/bash
122-set -o errexit
123-set -o errtrace
124-set -o pipefail
125-set -o nounset
126-
127-host_arch="${DEB_HOST_ARCH:-$(dpkg --print-architecture)}"
128-jdk_path=$(echo @JDK_DIR@ | sed "s/-[^-]*$/-$host_arch/")
129-
130-cat <<EOF > ${AUTOPKGTEST_TMP}/test.cpp
131-#include <jni.h>
132-
133-int main(){
134- JavaVM *jvm;
135- JNIEnv *env;
136- JavaVMInitArgs vm_args;
137- vm_args.version = JNI_VERSION_1_8;
138- vm_args.nOptions = 0;
139- vm_args.ignoreUnrecognized = false;
140- JNI_CreateJavaVM(&jvm, (void**)&env, &vm_args);
141-}
142-EOF
143-
144-find ${jdk_path}/lib -name libjvm.so | while read -r x; do
145- jvmdir="$(dirname ${x})"
146- echo ${jvmdir}
147- g++ ${AUTOPKGTEST_TMP}/test.cpp \
148- -I${jdk_path}/include -I${jdk_path}/include/linux \
149- -L${jvmdir} -ljvm
150- LD_LIBRARY_PATH=${jvmdir} ./a.out && echo "${jvmdir} - vm created"
151-done
152diff --git a/debian/tests/jni-link.sh b/debian/tests/jni-link.sh
153deleted file mode 100755
154index 485272f..0000000
155--- a/debian/tests/jni-link.sh
156+++ /dev/null
157@@ -1,31 +0,0 @@
158-#!/bin/bash
159-set -o errexit
160-set -o errtrace
161-set -o pipefail
162-set -o nounset
163-
164-host_arch="${DEB_HOST_ARCH:-$(dpkg --print-architecture)}"
165-jdk_path=$(echo /usr/lib/jvm/java-23-openjdk-amd64 | sed "s/-[^-]*$/-$host_arch/")
166-
167-cat <<EOF > ${AUTOPKGTEST_TMP}/test.cpp
168-#include <jni.h>
169-
170-int main(){
171- JavaVM *jvm;
172- JNIEnv *env;
173- JavaVMInitArgs vm_args;
174- vm_args.version = JNI_VERSION_1_8;
175- vm_args.nOptions = 0;
176- vm_args.ignoreUnrecognized = false;
177- JNI_CreateJavaVM(&jvm, (void**)&env, &vm_args);
178-}
179-EOF
180-
181-find ${jdk_path}/lib -name libjvm.so | while read -r x; do
182- jvmdir="$(dirname ${x})"
183- echo ${jvmdir}
184- g++ ${AUTOPKGTEST_TMP}/test.cpp \
185- -I${jdk_path}/include -I${jdk_path}/include/linux \
186- -L${jvmdir} -ljvm
187- LD_LIBRARY_PATH=${jvmdir} ./a.out && echo "${jvmdir} - vm created"
188-done

Subscribers

People subscribed via source and target branches