Skip to content

Commit 93cca2e

Browse files
OracleLabsAutomationOracleLabsAutomation
committed
Merge tag 'jdk-25+2' into labsjdk/adopt-jdk-25+2-master
Added tag jdk-25+2 for changeset ceb4366
2 parents 32d7ded + ceb4366 commit 93cca2e

File tree

2,539 files changed

+11943
-6637
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

2,539 files changed

+11943
-6637
lines changed

‎.github/actions/config/action.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
2+
# Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
33
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
#
55
# This code is free software; you can redistribute it and/or modify it

‎.github/actions/do-build/action.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
2+
# Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
33
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
#
55
# This code is free software; you can redistribute it and/or modify it

‎.github/actions/get-bootjdk/action.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
2+
# Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
33
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
#
55
# This code is free software; you can redistribute it and/or modify it

‎.github/actions/get-bundles/action.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
2+
# Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
33
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
#
55
# This code is free software; you can redistribute it and/or modify it

‎.github/actions/get-msys2/action.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
2+
# Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
33
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
#
55
# This code is free software; you can redistribute it and/or modify it

‎.github/scripts/gen-build-failure-report.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash
22
#
3-
# Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
3+
# Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
44
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
55
#
66
# This code is free software; you can redistribute it and/or modify it

‎.github/scripts/gen-test-summary.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash
22
#
3-
# Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
3+
# Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
44
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
55
#
66
# This code is free software; you can redistribute it and/or modify it

‎.github/workflows/build-cross-compile.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
2+
# Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
33
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
#
55
# This code is free software; you can redistribute it and/or modify it

‎.github/workflows/test.yml‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
2+
# Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
33
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
#
55
# This code is free software; you can redistribute it and/or modify it
@@ -66,7 +66,6 @@ jobs:
6666
- 'hs/tier1 compiler part 1'
6767
- 'hs/tier1 compiler part 2'
6868
- 'hs/tier1 compiler part 3'
69-
- 'hs/tier1 compiler not-xcomp'
7069
- 'hs/tier1 gc'
7170
- 'hs/tier1 runtime'
7271
- 'hs/tier1 serviceability'
@@ -101,10 +100,6 @@ jobs:
101100
test-suite: 'test/hotspot/jtreg/:tier1_compiler_3'
102101
debug-suffix: -debug
103102

104-
- test-name: 'hs/tier1 compiler not-xcomp'
105-
test-suite: 'test/hotspot/jtreg/:tier1_compiler_not_xcomp'
106-
debug-suffix: -debug
107-
108103
- test-name: 'hs/tier1 gc'
109104
test-suite: 'test/hotspot/jtreg/:tier1_gc'
110105
debug-suffix: -debug

‎doc/building.html‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -863,12 +863,12 @@ <h3 id="gnu-bash">GNU Bash</h3>
863863
are supported.</p>
864864
<p>At least version 3.2 of GNU Bash must be used.</p>
865865
<h3 id="graphviz-and-pandoc">Graphviz and Pandoc</h3>
866-
<p>In order to build the full docs (see the
866+
<p>In order to build man pages and the full docs (see the
867867
<code>--enable-full-docs</code> configure option) <a
868-
href="https://www.graphviz.org">Graphviz</a> and <a
869-
href="https://pandoc.org">Pandoc</a> are required. Any recent versions
870-
should work. For reference, and subject to change, Oracle builds use
871-
Graphviz 9.0.0 and Pandoc 2.19.2.</p>
868+
href="https://pandoc.org">Pandoc</a> is required. For full docs also <a
869+
href="https://www.graphviz.org">Graphviz</a> is required. Any recent
870+
versions should work. For reference, and subject to change, Oracle
871+
builds use Graphviz 9.0.0 and Pandoc 2.19.2.</p>
872872
<h2 id="running-configure">Running Configure</h2>
873873
<p>To build the JDK, you need a "configuration", which consists of a
874874
directory where to store the build output, coupled with information

0 commit comments

Comments
 (0)