bug5694: don't use ${extra} with -Dp2-local so that remote target platform is used for AWS SDK build

This commit is contained in:
Axel Uhl
2022-04-12 16:55:36 +02:00
parent a54f6fd5b9
commit aa37ac2490
2 changed files with 5 additions and 3 deletions
@@ -86,8 +86,9 @@ done
echo >>${WRAPPER_BUNDLE}/${BUILD_PROPERTIES_FILE}
echo "Building the wrapper bundle..."
cd ..
echo "In folder $(pwd) using: mvn ${extra} clean install"
mvn ${extra} clean install
echo "NOT USING ${extra} arguments for Maven to avoid using local target definition already for building local repo"
echo "In folder $(pwd) using: mvn clean install"
mvn clean install
mkdir -p ${UPDATE_SITE_PROJECT}/plugins/aws-sdk
rm -rf ${UPDATE_SITE_PROJECT}/plugins/aws-sdk/*
mv bin/com.amazon.aws.aws-java-api-${VERSION}.jar ${UPDATE_SITE_PROJECT}/plugins/aws-sdk/
@@ -4,7 +4,8 @@ source ./../../../configuration/correctFilePathInRelationToCurrentOs.sh
base="../definitions/race-analysis-p2"
remote_repo="https://p2.sapsailing.com/p2/sailing/"
remote_repo_aws_sdk="https://p2.sapsailing.com/p2/aws-sdk/"
#reading the filepath and editing it, so it fits for eclipse #currently save works for cygwin, gitbash and linux
# reading the filepath and editing it, so it fits for eclipse
# currently safely works for cygwin, gitbash and linux
local_repo=$(correct_file_path "`readlink -f ../../com.sap.sailing.targetplatform.base/target/repository/`")
local_repo="file://$local_repo"
local_repo_aws_sdk=$(correct_file_path "`readlink -f ../../com.amazon.aws.aws-java-api.updatesite/target/repository/`")