Skip to content

Commit

Permalink
Also download jtreg-7.4+1
Browse files Browse the repository at this point in the history
Signed-off-by: Keith W. Campbell <keithc@ca.ibm.com>
  • Loading branch information
keithc-ca committed Jun 20, 2024
1 parent 0a68df7 commit 3e3bc33
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 7 deletions.
7 changes: 7 additions & 0 deletions scripts/getDependencies.pl
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
20 changes: 13 additions & 7 deletions scripts/getDependencies.xml
Original file line number Diff line number Diff line change
@@ -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.
Expand All @@ -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>

Expand All @@ -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>
Expand Down Expand Up @@ -88,4 +94,4 @@
<arg line="${TEST_ROOT}/TKG/scripts/getDependencies.pl -path ${LIB_DIR} -task default -dependencyList ${LIB}"/>
</exec>
</target>
</project>
</project>

0 comments on commit 3e3bc33

Please sign in to comment.