Skip to content

Commit

Permalink
Merge master HEAD into openj9-staging
Browse files Browse the repository at this point in the history
Signed-off-by: J9 Build <j9build@ca.ibm.com>
  • Loading branch information
j9build committed Nov 6, 2024
2 parents d655244 + 16ba0ee commit 5a723c0
Show file tree
Hide file tree
Showing 179 changed files with 6,252 additions and 1,469 deletions.
2 changes: 1 addition & 1 deletion make/modules/java.sql.rowset/Java.gmk
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
# questions.
#

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

DOCLINT += -Xdoclint:all/protected \
'-Xdoclint/package:java.*,javax.*'
Expand Down
2 changes: 1 addition & 1 deletion make/modules/jdk.httpserver/Java.gmk
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,6 @@
# questions.
#

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

COPY += .ico
3 changes: 1 addition & 2 deletions make/modules/jdk.jartool/Java.gmk
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
# Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
Expand All @@ -23,5 +23,4 @@
# questions.
#

DISABLED_WARNINGS_java += missing-explicit-ctor
JAVAC_FLAGS += -XDstringConcat=inline
2 changes: 1 addition & 1 deletion make/modules/jdk.jdi/Java.gmk
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
# questions.
#

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

EXCLUDES += \
com/sun/tools/example/debug/bdi \
Expand Down
26 changes: 0 additions & 26 deletions make/modules/jdk.jlink/Java.gmk

This file was deleted.

26 changes: 0 additions & 26 deletions make/modules/jdk.jstatd/Java.gmk

This file was deleted.

26 changes: 0 additions & 26 deletions make/modules/jdk.unsupported/Java.gmk

This file was deleted.

27 changes: 0 additions & 27 deletions make/modules/jdk.zipfs/Java.gmk

This file was deleted.

Loading

0 comments on commit 5a723c0

Please sign in to comment.