Skip to content

Commit

Permalink
Update jtreg version selection (#4853)
Browse files Browse the repository at this point in the history
Remove handling for jdk18 and jdk19 which are out of support.

Signed-off-by: Keith W. Campbell <[email protected]>
  • Loading branch information
keithc-ca authored Nov 3, 2023
1 parent e730d4f commit 3e6e521
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 26 deletions.
37 changes: 15 additions & 22 deletions functional/security/Crypto/build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -52,31 +52,25 @@
<mkdir dir="${DEST}" />
</target>
<if>
<or>
<matches pattern="^[89]{1}$" string="${JDK_VERSION}"/>
<matches pattern="^[1][023456]" string="${JDK_VERSION}"/>
</or>
<matches pattern="^([89]|1[02-6])$" string="${JDK_VERSION}"/>
<then>
<property name="jtregTar" value="jtreg_5_1_b01"/>
</then>
<elseif>
<matches pattern="^11$" string="${JDK_VERSION}"/>
<then>
<property name="jtregTar" value="jtreg_6_1"/>
</then>
</elseif>
<elseif>
<!-- versions 17, 21, 22 -->
<matches pattern="^(17|2[12])$" string="${JDK_VERSION}"/>
<then>
<property name="jtregTar" value="jtreg_7_3_1_1"/>
</then>
</elseif>
<else>
<if>
<matches pattern="^[1][17]" string="${JDK_VERSION}"/>
<then>
<property name="jtregTar" value="jtreg_6_1"/>
</then>
<else>
<if>
<matches pattern="^[1][89]" string="${JDK_VERSION}"/>
<then>
<property name="jtregTar" value="jtreg_6_1_1"/>
</then>
<else>
<property name="jtregTar" value="jtreg_7_1_1_1"/>
</else>
</if>
</else>
</if>
<fail message="Unsupported JDK version: ${JDK_VERSION}"/>
</else>
</if>
<if>
Expand Down Expand Up @@ -146,4 +140,3 @@
<antcall target="clean" inheritall="true" />
</target>
</project>

8 changes: 4 additions & 4 deletions openjdk/build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -48,15 +48,15 @@
<property name="jtregTar" value="jtreg_5_1_b01"/>
</then>
<elseif>
<!-- versions 11, 17 -->
<matches pattern="^1[17]$" string="${JDK_VERSION}"/>
<!-- version 11 -->
<matches pattern="^11$" string="${JDK_VERSION}"/>
<then>
<property name="jtregTar" value="jtreg_6_1"/>
</then>
</elseif>
<elseif>
<!-- version 21, 22 -->
<matches pattern="^2[12]$" string="${JDK_VERSION}"/>
<!-- versions 17, 21, 22 -->
<matches pattern="^(17|2[12])$" string="${JDK_VERSION}"/>
<then>
<property name="jtregTar" value="jtreg_7_3_1_1"/>
</then>
Expand Down

0 comments on commit 3e6e521

Please sign in to comment.