From 0c877ead29b996435a6cc45a4dff01a59276e577 Mon Sep 17 00:00:00 2001 From: Roberto Cirillo Date: Fri, 28 Apr 2023 11:33:58 +0200 Subject: [PATCH 1/4] add default goal --- .idea/.gitignore | 3 +++ .idea/gCubeBuild-AlternateJdk.iml | 9 +++++++++ .idea/misc.xml | 9 +++++++++ .idea/modules.xml | 8 ++++++++ .idea/vcs.xml | 6 ++++++ Jenkinsfile | 7 +++++-- 6 files changed, 40 insertions(+), 2 deletions(-) create mode 100644 .idea/.gitignore create mode 100644 .idea/gCubeBuild-AlternateJdk.iml create mode 100644 .idea/misc.xml create mode 100644 .idea/modules.xml create mode 100644 .idea/vcs.xml diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 0000000..26d3352 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,3 @@ +# Default ignored files +/shelf/ +/workspace.xml diff --git a/.idea/gCubeBuild-AlternateJdk.iml b/.idea/gCubeBuild-AlternateJdk.iml new file mode 100644 index 0000000..d6ebd48 --- /dev/null +++ b/.idea/gCubeBuild-AlternateJdk.iml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..d79bd4e --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,9 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..f91bc26 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..35eb1dd --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/Jenkinsfile b/Jenkinsfile index 6932d2c..f072ccc 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -39,7 +39,10 @@ pipeline { description: 'Run on all nodes matching the label') string(name: 'build_options', defaultValue: '', - description: 'Additional options for Maven.') + description: 'Additional options for Maven.') + string(name: 'maven_goal', + defaultValue: 'clean deploy', + description: 'maven goal. Useful if deploy is not needed') } agent { @@ -62,7 +65,7 @@ pipeline { } stage('Build the job') { steps { - sh 'mvn --settings $MAVEN_CONFIG_FOLDER/$gcube_settings -Dmaven.repo.local=$MAVEN_CONFIG_FOLDER/$local_repo $build_options dependency:tree clean deploy' + sh 'mvn --settings $MAVEN_CONFIG_FOLDER/$gcube_settings -Dmaven.repo.local=$MAVEN_CONFIG_FOLDER/$local_repo $build_options dependency:tree $maven_goal' } } From 2f7a5268d790b379adbcf7a34894ae26f91231cb Mon Sep 17 00:00:00 2001 From: Roberto Cirillo Date: Fri, 28 Apr 2023 11:48:00 +0200 Subject: [PATCH 2/4] add gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..08e18e6 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.idea/*.xml \ No newline at end of file From c3669692001baa3d6b1147bbf6afbee3850bc45e Mon Sep 17 00:00:00 2001 From: Roberto Cirillo Date: Fri, 28 Apr 2023 11:49:04 +0200 Subject: [PATCH 3/4] add gitignore --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 08e18e6..9f11b75 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -.idea/*.xml \ No newline at end of file +.idea/ From 61b759c28115d1a5e19be818d9c7298b1782a7ff Mon Sep 17 00:00:00 2001 From: Roberto Cirillo Date: Fri, 28 Apr 2023 11:50:36 +0200 Subject: [PATCH 4/4] removed idea folder --- .idea/.gitignore | 3 --- .idea/gCubeBuild-AlternateJdk.iml | 9 --------- .idea/misc.xml | 9 --------- .idea/modules.xml | 8 -------- .idea/vcs.xml | 6 ------ 5 files changed, 35 deletions(-) delete mode 100644 .idea/.gitignore delete mode 100644 .idea/gCubeBuild-AlternateJdk.iml delete mode 100644 .idea/misc.xml delete mode 100644 .idea/modules.xml delete mode 100644 .idea/vcs.xml diff --git a/.idea/.gitignore b/.idea/.gitignore deleted file mode 100644 index 26d3352..0000000 --- a/.idea/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -# Default ignored files -/shelf/ -/workspace.xml diff --git a/.idea/gCubeBuild-AlternateJdk.iml b/.idea/gCubeBuild-AlternateJdk.iml deleted file mode 100644 index d6ebd48..0000000 --- a/.idea/gCubeBuild-AlternateJdk.iml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index d79bd4e..0000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml deleted file mode 100644 index f91bc26..0000000 --- a/.idea/modules.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 35eb1dd..0000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file