diff --git a/.gitmodules b/.gitmodules index 85f55eecb..39e2c76ea 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ [submodule "libs/common-ui"] path = libs/common-ui - url = ssh://git.iqser.com/scm/sl/common-ui.git + url = https://git.iqser.com/scm/sl/common-ui.git diff --git a/bamboo-specs/src/main/java/buildjob/PlanSpec.java b/bamboo-specs/src/main/java/buildjob/PlanSpec.java index 3ec23bca6..427f0626d 100644 --- a/bamboo-specs/src/main/java/buildjob/PlanSpec.java +++ b/bamboo-specs/src/main/java/buildjob/PlanSpec.java @@ -70,12 +70,10 @@ public class PlanSpec { .tasks( new CleanWorkingDirectoryTask().description("My clean working directory task"), // Checkout - new VcsCheckoutTask().description("Checkout UI Shared Lib") - .checkoutItems(new CheckoutItem().repository("Shared Libraries / common-ui")), new VcsCheckoutTask().description("Checkout Default Repository") .checkoutItems(new CheckoutItem().defaultRepository().path("redaction-ui")), new VcsCheckoutTask().description("Checkout UI Shared Lib") - .checkoutItems(new CheckoutItem().repository("Shared Libraries / common-ui").path("redaction-ui/libs/common-ui")), + .checkoutItems(new CheckoutItem().repository("Shared Libraries / common-ui").path("common-ui")), // Build new ScriptTask().description("Build") diff --git a/bamboo-specs/src/main/resources/scripts/build.sh b/bamboo-specs/src/main/resources/scripts/build.sh index 3e4a1bf3b..c68c8efee 100755 --- a/bamboo-specs/src/main/resources/scripts/build.sh +++ b/bamboo-specs/src/main/resources/scripts/build.sh @@ -6,8 +6,7 @@ imageName="nexus.iqser.com:5001/red/$PROJECT" dockerfileLocation="docker/$PROJECT/Dockerfile" # Copy Git submodule data -pwd -ls -la +mv ../common-ui/* ./libs/ echo "On branch $bamboo_planRepository_branchName building project $PROJECT" # shellcheck disable=SC2154