Skip to content

Commit 6161389

Browse files
committed
updating scripts to handle JDK 17
1 parent 25e0fef commit 6161389

2 files changed

Lines changed: 26 additions & 0 deletions

File tree

scripts/dist.py

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929

3030
JAVA_HOME_8 = os.environ.get('JAVA_HOME_8', '')
3131
JAVA_HOME_11 = os.environ.get('JAVA_HOME_11', '')
32+
JAVA_HOME_17 = os.environ.get('JAVA_HOME_17', '')
3233

3334
SHELL = platform.system() == 'Windows'
3435

@@ -45,6 +46,10 @@ def checkJavaVersions():
4546
print("\nERROR: JAVA_HOME_11 environment variable is not defined")
4647
exit(1)
4748

49+
if JAVA_HOME_17 == '':
50+
print("\nERROR: JAVA_HOME_17 environment variable is not defined")
51+
exit(1)
52+
4853

4954

5055
######################################
@@ -158,6 +163,17 @@ def build_jdk_11_maven() :
158163
copy(ind1, os.path.join(DIST, "ind1-sut.jar"))
159164
copy(folder +"/em/external/rest/ind1/target/ind1-evomaster-runner.jar", DIST)
160165

166+
167+
####################
168+
def build_jdk_17_maven() :
169+
170+
folder = "jdk_17_maven"
171+
callMaven(folder, JAVA_HOME_17)
172+
173+
copy(folder +"/cs/web/spring-petclinic/target/spring-petclinic-sut.jar", DIST)
174+
copy(folder +"/em/external/web/spring-petclinic/target/spring-petclinic-evomaster-runner.jar", DIST)
175+
176+
161177
####################
162178
def build_jdk_11_gradle() :
163179

@@ -278,6 +294,7 @@ def makeZip():
278294

279295
build_jdk_8_maven()
280296
build_jdk_11_maven()
297+
build_jdk_17_maven()
281298
build_jdk_11_gradle()
282299

283300
## Those are disabled for now... might support back in the future

scripts/version.py

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,13 @@
3232
print("\nERROR: JAVA_HOME_11 environment variable is not defined")
3333
exit(1)
3434

35+
JAVA_HOME_17 = os.environ.get('JAVA_HOME_17', '')
36+
if JAVA_HOME_11 == '':
37+
print("\nERROR: JAVA_HOME_17 environment variable is not defined")
38+
exit(1)
39+
40+
41+
3542
SHELL = platform.system() == 'Windows'
3643

3744
def replaceInPom(file):
@@ -115,6 +122,7 @@ def replaceInCS():
115122

116123
replaceInPom("jdk_8_maven/pom.xml")
117124
replaceInPom("jdk_11_maven/pom.xml")
125+
replaceInPom("jdk_17_maven/pom.xml")
118126

119127
# is there any easier way for Gradle?
120128
replaceInKotlinGradle("jdk_11_gradle/em/embedded/graphql/patio-api/build.gradle.kts")
@@ -124,6 +132,7 @@ def replaceInCS():
124132

125133
versionSetMaven("/jdk_8_maven",JAVA_HOME_8)
126134
versionSetMaven("/jdk_11_maven",JAVA_HOME_11)
135+
versionSetMaven("/jdk_17_maven",JAVA_HOME_17)
127136

128137
# We no longer support those in EMB... not enough resouces. although might change in future
129138
#replaceAllJs()

0 commit comments

Comments
 (0)