Skip to content

Disable ant download from the old authentication, security and faces tcks #250

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
TomasHofman wants to merge 1 commit into
base: jakarta-ee-10
Choose a base branch
from
Open

Disable ant download from the old authentication, security and faces tcks #250

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions authentication/run-tck.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,12 +153,13 @@ OLD_TCK_HOME=authentication-tck
if [[ -n $TCK_PORTING_KIT ]]
then
echo "Hold on tight!"


ANT_VERSION="1.9.16"
ANT_URL="https://dlcdn.apache.org//ant/binaries/apache-ant-${ANT_VERSION}-bin.zip"
if [[ ! "$ANT_HOME" ]];
then
ANT_URL=https://dlcdn.apache.org//ant/binaries/apache-ant-1.9.16-bin.zip
ANT_ZIP=apache-ant-1.9.16-bin.zip
ANT_HOME=apache-ant-1.9.16
ANT_ZIP="apache-ant-${ANT_VERSION}-bin.zip"
ANT_HOME="apache-ant-${ANT_VERSION}"
echo "Installing Ant."
curl $ANT_URL -o $ANT_ZIP
unzip ${UNZIP_ARGS} $ANT_ZIP
Expand Down Expand Up @@ -200,7 +201,7 @@ then
then
echo "Preparing Old TCK."
pushd $TCK_ROOT/old-tck/build
mvn ${MVN_ARGS} install
mvn ${MVN_ARGS} install "-Dant.zip.url=${ANT_URL}" "-Dant.version=${ANT_VERSION}"
popd
unzip ${UNZIP_ARGS} $TCK_ROOT/old-tck/source/release/JASPIC_BUILD/latest/authentication-tck.zip
echo "Fix the build.xml in the old TCK."
Expand Down
11 changes: 6 additions & 5 deletions faces/bin/run-tck.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,12 +237,13 @@ pushd "${WORK_DIR}"
if [[ -n $TCK_PORTING_KIT ]]
then
echo "Hold on tight!"

ANT_URL=https://dlcdn.apache.org//ant/binaries/apache-ant-1.9.16-bin.zip

ANT_VERSION="1.9.16"
ANT_URL="https://dlcdn.apache.org//ant/binaries/apache-ant-${ANT_VERSION}-bin.zip"
ANT_CONTRIB_URL=https://sourceforge.net/projects/ant-contrib/files/ant-contrib/1.0b3/ant-contrib-1.0b3-bin.zip/download
ANT_ZIP=apache-ant-1.9.16-bin.zip
ANT_ZIP="apache-ant-${ANT_VERSION}-bin.zip"
ANT_CONTRIB_ZIP=ant-contrib-1.0b3-bin.zip
export ANT_HOME="${WORK_DIR}"/apache-ant-1.9.16
export ANT_HOME="${WORK_DIR}/apache-ant-${ANT_VERSION}"
export PATH=$ANT_HOME/bin:$PATH
if ! test -d $ANT_HOME
then
Expand Down Expand Up @@ -294,7 +295,7 @@ then
then
echo "Preparing Old TCK."
pushd $TCK_ROOT/old-tck/build
mvn ${MVN_ARGS} install -Dtck.mode=platform
mvn ${MVN_ARGS} install -Dtck.mode=platform "-Dant.zip.url=${ANT_URL}" "-Dant.version=${ANT_VERSION}"
popd

pushd $TCK_ROOT/old-tck/source/release/JSF_BUILD/latest/
Expand Down
11 changes: 6 additions & 5 deletions security/run-tck.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,10 +177,11 @@ OLD_TCK_HOME=security-tck
if [[ -n $TCK_PORTING_KIT ]]
then
echo "Hold on tight!"

ANT_URL=https://dlcdn.apache.org//ant/binaries/apache-ant-1.9.16-bin.zip
ANT_ZIP=apache-ant-1.9.16-bin.zip
ANT_HOME=apache-ant-1.9.16

ANT_VERSION="1.9.16"
ANT_URL="https://dlcdn.apache.org//ant/binaries/apache-ant-${ANT_VERSION}bin.zip"
ANT_ZIP="apache-ant-${ANT_VERSION}-bin.zip"
ANT_HOME="apache-ant-${ANT_VERSION}"
if ! test -d $ANT_HOME
then
echo "Installing Ant."
Expand Down Expand Up @@ -226,7 +227,7 @@ then
then
echo "Preparing Old TCK."
pushd $TCK_ROOT/old-tck/build
mvn ${MVN_ARGS} install -Ddownload.plugin.skip=true
mvn ${MVN_ARGS} install "-Dant.zip.url=${ANT_URL}" "-Dant.version=${ANT_VERSION}"
popd
unzip ${UNZIP_ARGS} $TCK_ROOT/old-tck/source/release/SECURITYAPI_BUILD/latest/security-tck.zip
pushd $JEETCK_MODS
Expand Down