Merge pull request #573 from keithc-ca/jtreg_7.4+1

Also download jtreg-7.4+1
adoptium · Jun 20, 2024 · dd67f19 · dd67f19
2 parents 0a68df7 + 3e3bc33
commit dd67f19
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 7 deletions.
diff --git a/scripts/getDependencies.pl b/scripts/getDependencies.pl
@@ -167,6 +167,13 @@
 		shafn => 'jtreg_7_3_1_1.tar.gz.sha256sum.txt',
 		shaalg => '256'
 	},
+	jtreg_7_4_1 => {
+		url => 'https://ci.adoptium.net/job/dependency_pipeline/lastSuccessfulBuild/artifact/jtreg/jtreg-7.4.1.tar.gz',
+		fname => 'jtreg_7_4_1.tar.gz',
+		shaurl => 'https://ci.adoptium.net/job/dependency_pipeline/lastSuccessfulBuild/artifact/jtreg/jtreg-7.4.1.tar.gz.sha256sum.txt',
+		shafn => 'jtreg_7_4_1.tar.gz.sha256sum.txt',
+		shaalg => '256'
+	},
 	jython => {
 		url => 'https://repo1.maven.org/maven2/org/python/jython-standalone/2.7.2/jython-standalone-2.7.2.jar',
 		fname => 'jython-standalone.jar',

diff --git a/scripts/getDependencies.xml b/scripts/getDependencies.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0"?>
-
 <!--
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -13,24 +12,31 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 -->
-
 <project name="getDependency" default="getDependentLibs" basedir=".">
-	<taskdef resource="net/sf/antcontrib/antlib.xml" />
+	<taskdef resource="net/sf/antcontrib/antlib.xml"/>
 	<description>
 		Get Third Party Dependencies
 	</description>
 
 	<!-- set default LIB property to all -->
-	<property name="LIB" value="all" />
+	<property name="LIB" value="all"/>
 	<target name="getJtregVersion">
 		<if>
 			<!-- versions 8-10, 12-16 -->
 			<matches pattern="^([89]|1[02-6])$" string="${JDK_VERSION}"/>
 			<then>
 				<property name="jtregTar" value="jtreg_5_1_b01"/>
 			</then>
+			<elseif>
+				<!-- versions 11, 17-23 -->
+				<matches pattern="^(11|1[7-9]|2[0-3])$" string="${JDK_VERSION}"/>
+				<then>
+					<property name="jtregTar" value="jtreg_7_3_1_1"/>
+				</then>
+			</elseif>
 			<else>
-				<property name="jtregTar" value="jtreg_7_3_1_1"/>
+				<!-- versions 24+ -->
+				<property name="jtregTar" value="jtreg_7_4_1"/>
 			</else>
 		</if>
 
@@ -49,7 +55,7 @@
 		<var name="LIB" unset="true"/>
 		<property name="LIB" value="${jtregTar}${openj9jtregtimeouthandler}"/>
 	</target>
-	
+
 	<target name="getJtreg" depends="getJtregVersion,getDependentLibs">
 		<mkdir dir="${DEST}"/>
 		<if>
@@ -88,4 +94,4 @@
 			<arg line="${TEST_ROOT}/TKG/scripts/getDependencies.pl -path ${LIB_DIR} -task default -dependencyList ${LIB}"/>
 		</exec>
 	</target>
-</project>
+</project>