Skip to content

Commit 5a723c0

Browse files
committed
Merge master HEAD into openj9-staging
Signed-off-by: J9 Build <[email protected]>
2 parents d655244 + 16ba0ee commit 5a723c0

File tree

179 files changed

+6252
-1469
lines changed

Some content is hidden

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

179 files changed

+6252
-1469
lines changed

make/modules/java.sql.rowset/Java.gmk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
# questions.
2424
#
2525

26-
DISABLED_WARNINGS_java += dangling-doc-comments this-escape
26+
DISABLED_WARNINGS_java += dangling-doc-comments
2727

2828
DOCLINT += -Xdoclint:all/protected \
2929
'-Xdoclint/package:java.*,javax.*'

make/modules/jdk.httpserver/Java.gmk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,6 @@
2323
# questions.
2424
#
2525

26-
DISABLED_WARNINGS_java += missing-explicit-ctor this-escape
26+
DISABLED_WARNINGS_java += this-escape
2727

2828
COPY += .ico

make/modules/jdk.jartool/Java.gmk

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
2+
# Copyright (c) 2020, 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
@@ -23,5 +23,4 @@
2323
# questions.
2424
#
2525

26-
DISABLED_WARNINGS_java += missing-explicit-ctor
2726
JAVAC_FLAGS += -XDstringConcat=inline

make/modules/jdk.jdi/Java.gmk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
# questions.
2424
#
2525

26-
DISABLED_WARNINGS_java += dangling-doc-comments this-escape
26+
DISABLED_WARNINGS_java += dangling-doc-comments
2727

2828
EXCLUDES += \
2929
com/sun/tools/example/debug/bdi \

make/modules/jdk.jlink/Java.gmk

Lines changed: 0 additions & 26 deletions
This file was deleted.

make/modules/jdk.jstatd/Java.gmk

Lines changed: 0 additions & 26 deletions
This file was deleted.

make/modules/jdk.unsupported/Java.gmk

Lines changed: 0 additions & 26 deletions
This file was deleted.

make/modules/jdk.zipfs/Java.gmk

Lines changed: 0 additions & 27 deletions
This file was deleted.

0 commit comments

Comments
 (0)