diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0ff552b85321db28aa96fabbbb2f3fac6766b250..30c06c78b2257021d2a69c51820fd62940f59114 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -9,7 +9,7 @@ build: - apt-get install --assume-yes maven - mvn --version script: - - ./gradlew createPoms downloadCli collectDependencies + - ./gradlew prepareMaven - mvn -Dmaven.repo.local="$CI_PROJECT_DIR/maven_repo_local" -f de.prob.parent/pom.xml install - cp index.html de.prob.repository/target/repository/ cache: diff --git a/build.gradle b/build.gradle index 7f25f44753e1ab205e00668c899fa639559dc137..a7a867c5f22d7075d7e152533ff451d4a5994e20 100644 --- a/build.gradle +++ b/build.gradle @@ -87,4 +87,4 @@ task downloadCli { } -completeInstall.dependsOn downloadCli +prepareMaven.dependsOn downloadCli diff --git a/tycho_build.gradle b/tycho_build.gradle index f790de02366e9dfec65c1ab1f706c023275a2941..06be93605e1014decb9f6a2464afa5ce441495f9 100644 --- a/tycho_build.gradle +++ b/tycho_build.gradle @@ -516,7 +516,9 @@ task install(dependsOn: [createPoms], type: Exec) { commandLine 'mvn', 'install', '-f', workspacePath + parentID + '/pom.xml' } -task completeInstall(dependsOn: [subprojects.collectDependencies, createPoms], type:Exec){ +task prepareMaven(dependsOn: [subprojects.collectDependencies, createPoms]) + +task completeInstall(dependsOn: [prepareMaven], type: Exec) { description = "\tCopies dependencies into dependencyFolder of each subproject and executes a 'mvn install' of the parent pom.xml and auto-generates Tycho Poms" commandLine 'mvn', 'install', '-f', workspacePath + parentID + '/pom.xml' }