diff --git a/ci/build.sh b/ci/build.sh index bdcc0990d..4596a25f9 100755 --- a/ci/build.sh +++ b/ci/build.sh @@ -4,11 +4,11 @@ set -euo pipefail [[ -d $PWD/maven && ! -d $HOME/.m2 ]] && ln -s $PWD/maven $HOME/.m2 -spring_commons_artifactory=$(pwd)/spring-commons-artifactory +spring_data_commons_artifactory=$(pwd)/spring-data-commons-artifactory -rm -rf $HOME/.m2/repository/org/springframework/commons 2> /dev/null || : +rm -rf $HOME/.m2/repository/org/springframework/data/commons 2> /dev/null || : -cd spring-commons-github +cd spring-data-commons-github ./mvnw -Pdistribute -Dmaven.test.skip=true clean deploy \ - -DaltDeploymentRepository=distribution::default::file://${spring_commons_artifactory} + -DaltDeploymentRepository=distribution::default::file://${spring_data_commons_artifactory} diff --git a/ci/build.yml b/ci/build.yml index 385d8d812..6960465e6 100644 --- a/ci/build.yml +++ b/ci/build.yml @@ -8,13 +8,13 @@ image_resource: tag: 8-jdk inputs: -- name: spring-commons-github +- name: spring-data-commons-github outputs: -- name: spring-commons-artifactory +- name: spring-data-commons-artifactory caches: - path: maven run: - path: spring-commons-github/ci/build.sh + path: spring-data-commons-github/ci/build.sh diff --git a/ci/test.sh b/ci/test.sh index 3d73f11da..34174bd6e 100755 --- a/ci/test.sh +++ b/ci/test.sh @@ -4,8 +4,8 @@ set -euo pipefail [[ -d $PWD/maven && ! -d $HOME/.m2 ]] && ln -s $PWD/maven $HOME/.m2 -rm -rf $HOME/.m2/repository/org/springframework/commons 2> /dev/null || : +rm -rf $HOME/.m2/repository/org/springframework/data/commons 2> /dev/null || : -cd spring-commons-github +cd spring-data-commons-github ./mvnw clean dependency:list test -P${PROFILE} -Dsort diff --git a/ci/test.yml b/ci/test.yml index 60ff753c3..b8f105a33 100644 --- a/ci/test.yml +++ b/ci/test.yml @@ -8,10 +8,10 @@ image_resource: tag: 8-jdk inputs: -- name: spring-commons-github +- name: spring-data-commons-github caches: - path: maven run: - path: spring-commons-github/ci/test.sh + path: spring-data-commons-github/ci/test.sh