Skip to content

Commit

Permalink
Merge pull request #856 from yathamravali/reorderhcjars11
Browse files Browse the repository at this point in the history
Reorder the way contents of healthcenter jars are extracted
  • Loading branch information
pshipton authored Dec 17, 2024
2 parents f3e8946 + 0182099 commit 3a34521
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions closed/make/copy/Copy-ibm.healthcenter.gmk
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# ===========================================================================
# (c) Copyright IBM Corp. 2021, 2021 All Rights Reserved
# (c) Copyright IBM Corp. 2021, 2024 All Rights Reserved
# ===========================================================================
# This code is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License version 2 only, as
Expand Down Expand Up @@ -47,9 +47,13 @@ TRANSPORT_PROPERTY_SED_SCRIPT := -e 's|$(TRANSPORT_PROPERTY_REGEX)\s*=.*|$(TRANS

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

# The order in which the jars are extracted needs to remain intact,
# as both jars contain copies of some of the same classes,
# to avoid a HealthCenterNotSupportedException.

HEALTHCENTER_JARS := \
$(HEALTHCENTER_HOME)/healthcenter.jar \
$(HEALTHCENTER_HOME)/monitoring-api.jar \
$(HEALTHCENTER_HOME)/healthcenter.jar \
#

HEALTHCENTER_EXCLUDED_PACKAGES := \
Expand Down

0 comments on commit 3a34521

Please sign in to comment.