Skip to content

Commit 9694206

Browse files
authored
Merge pull request ibmruntimes#424 from yathamravali/reorderhcjars17
Reorder the way contents of healthcenter jars are extracted
2 parents f2d3af9 + 00d2ef9 commit 9694206

File tree

1 file changed

+6
-2
lines changed
  • closed/make/modules/ibm.healthcenter

1 file changed

+6
-2
lines changed

closed/make/modules/ibm.healthcenter/Copy.gmk

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# ===========================================================================
2-
# (c) Copyright IBM Corp. 2021, 2021 All Rights Reserved
2+
# (c) Copyright IBM Corp. 2021, 2024 All Rights Reserved
33
# ===========================================================================
44
# This code is free software; you can redistribute it and/or modify it
55
# under the terms of the GNU General Public License version 2 only, as
@@ -47,9 +47,13 @@ TRANSPORT_PROPERTY_SED_SCRIPT := -e 's|$(TRANSPORT_PROPERTY_REGEX)\s*=.*|$(TRANS
4747

4848
HEALTHCENTER_COPY := $(JDK_OUTPUTDIR)/modules/$(MODULE)/_the.$(MODULE)_copy_marker
4949

50+
# The order in which the jars are extracted needs to remain intact,
51+
# as both jars contain copies of some of the same classes,
52+
# to avoid a HealthCenterNotSupportedException.
53+
5054
HEALTHCENTER_JARS := \
51-
$(HEALTHCENTER_HOME)/healthcenter.jar \
5255
$(HEALTHCENTER_HOME)/monitoring-api.jar \
56+
$(HEALTHCENTER_HOME)/healthcenter.jar \
5357
#
5458

5559
HEALTHCENTER_EXCLUDED_PACKAGES := \

0 commit comments

Comments
 (0)