From b49f201cd6ef89cb5c6298db53b8bcd8e2e33511 Mon Sep 17 00:00:00 2001
From: dgelessus <dgelessus@users.noreply.github.com>
Date: Wed, 17 May 2023 14:27:12 +0200
Subject: [PATCH] Add prepareMaven task to do everything needed before calling
Maven
---
.gitlab-ci.yml | 2 +-
build.gradle | 2 +-
tycho_build.gradle | 4 +++-
3 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0ff552b8..30c06c78 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 7f25f447..a7a867c5 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 f790de02..06be9360 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'
}
--
GitLab