Skip to content

Commit 752aff7

Browse files
committed
Find real path to JDK 8
1 parent 1302547 commit 752aff7

File tree

3 files changed

+16
-4
lines changed

3 files changed

+16
-4
lines changed

.github/workflows/build.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,12 @@ jobs:
6060
architecture: x64
6161
cache: maven
6262

63+
- name: Find real JDK 8 path
64+
run: |
65+
JAVA_HOME_8=$(realpath $JAVA_HOME_8_X64)
66+
echo $JAVA_HOME_8
67+
echo "JAVA_HOME_8=$JAVA_HOME_8" >> $GITHUB_ENV
68+
6369
# We could have used `verify`, but `clean install` is required for the following:
6470
# 1. The build reproducibility report
6571
# For details, see: https://maven.apache.org/guides/mini/guide-reproducible-builds.html#how-to-test-my-maven-build-reproducibility

.github/workflows/codeql-analysis.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,12 @@ jobs:
7272
17
7373
cache: maven
7474

75+
- name: Find real JDK 8 path
76+
run: |
77+
JAVA_HOME_8=$(realpath $JAVA_HOME_8_X64)
78+
echo $JAVA_HOME_8
79+
echo "JAVA_HOME_8=$JAVA_HOME_8" >> $GITHUB_ENV
80+
7581
- name: Build with Maven
7682
timeout-minutes: 60
7783
shell: bash

log4j-jmx-gui/pom.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -81,9 +81,9 @@
8181
<files>
8282
<file>${java.home}/../lib/jconsole.jar</file>
8383
<file>${java.home}/../Classes/jconsole.jar</file>
84-
<file>${env.JAVA_HOME_8_X64}/lib/jconsole.jar</file>
84+
<file>${env.JAVA_HOME_8}/lib/jconsole.jar</file>
8585
</files>
86-
<message>Set the JAVA_HOME_8_X64 environment variable to the location of a JDK 8 installation.</message>
86+
<message>Set the JAVA_HOME_8 environment variable to the location of a JDK 8 installation.</message>
8787
<satisfyAny>true</satisfyAny>
8888
</requireFilesExist>
8989
</rules>
@@ -133,15 +133,15 @@
133133
<id>github-profile</id>
134134
<activation>
135135
<file>
136-
<exists>${env.JAVA_HOME_8_X64}/lib/jconsole.jar</exists>
136+
<exists>${env.JAVA_HOME_8}/lib/jconsole.jar</exists>
137137
</file>
138138
</activation>
139139
<dependencies>
140140
<dependency>
141141
<groupId>com.sun</groupId>
142142
<artifactId>jconsole</artifactId>
143143
<scope>system</scope>
144-
<systemPath>${env.JAVA_HOME_8_X64}/lib/jconsole.jar</systemPath>
144+
<systemPath>${env.JAVA_HOME_8}/lib/jconsole.jar</systemPath>
145145
<optional>true</optional>
146146
</dependency>
147147
</dependencies>

0 commit comments

Comments
 (0)