Merge pull request #673 from keithc-ca/jtreg

Also download jtreg-7.5+1 and use for Java 25+
adoptium · Feb 21, 2025 · afaad98 · afaad98
2 parents 22c848c + 088c407
commit afaad98
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/scripts/getDependencies.pl b/scripts/getDependencies.pl
@@ -181,6 +181,13 @@
 		shafn => 'jtreg_7_4_1.tar.gz.sha256sum.txt',
 		shaalg => '256'
 	},
+	jtreg_7_5_1 => {
+		url => 'https://ci.adoptium.net/job/dependency_pipeline/lastSuccessfulBuild/artifact/jtreg/jtreg-7.5+1.tar.gz',
+		fname => 'jtreg_7_5_1.tar.gz',
+		shaurl => 'https://ci.adoptium.net/job/dependency_pipeline/lastSuccessfulBuild/artifact/jtreg/jtreg-7.5+1.tar.gz.sha256sum.txt',
+		shafn => 'jtreg_7_5_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
@@ -50,9 +50,16 @@
 					<property name="jtregTar" value="jtreg_7_3_1_1"/>
 				</then>
 			</elseif>
+			<elseif>
+				<!-- version 24 -->
+				<matches pattern="^24$" string="${JDK_VERSION}"/>
+				<then>
+					<property name="jtregTar" value="jtreg_7_4_1"/>
+				</then>
+			</elseif>
 			<else>
-				<!-- versions 24+ -->
-				<property name="jtregTar" value="jtreg_7_4_1"/>
+				<!-- versions 25+ -->
+				<property name="jtregTar" value="jtreg_7_5_1"/>
 			</else>
 		</if>
 		<echo message="jtreg version used is : ${jtregTar}"/>