From fe50b1f197babe1ff67f64646dfd5f810e3da47a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jelin=20Gie=C3=9Felmann?= Date: Thu, 6 Apr 2023 11:36:35 +0200 Subject: [PATCH 01/14] change releasefinish --- .../gitflow/GitFlowReleaseFinishMojo.java | 68 ++++++++++++------- 1 file changed, 44 insertions(+), 24 deletions(-) diff --git a/src/main/java/com/amashchenko/maven/plugin/gitflow/GitFlowReleaseFinishMojo.java b/src/main/java/com/amashchenko/maven/plugin/gitflow/GitFlowReleaseFinishMojo.java index 7b16fbeb..32f80201 100644 --- a/src/main/java/com/amashchenko/maven/plugin/gitflow/GitFlowReleaseFinishMojo.java +++ b/src/main/java/com/amashchenko/maven/plugin/gitflow/GitFlowReleaseFinishMojo.java @@ -179,7 +179,16 @@ public class GitFlowReleaseFinishMojo extends AbstractGitFlowMojo { @Parameter(property = "noBackMerge", defaultValue = "false") private boolean noBackMerge = false; - /** {@inheritDoc} */ + /** Release branch to use in non-interactive mode. Must start with releasae branch + * prefix. The releaseBranchName parameter will be used if there are multiple release Branches in the Repository */ + @Parameter(property = "releaseBranchName") + private String releaseBranchName; + + /** + * Whether to make a GPG-signed tag. + * + * + */ @Override public void execute() throws MojoExecutionException, MojoFailureException { validateConfiguration(preReleaseGoals, postReleaseGoals); @@ -188,31 +197,42 @@ public void execute() throws MojoExecutionException, MojoFailureException { // check uncommitted changes checkUncommittedChanges(); - String releaseBranch = gitFindBranches(gitFlowConfig.getReleaseBranchPrefix(), false); - - if (StringUtils.isBlank(releaseBranch)) { - if (fetchRemote) { - releaseBranch = gitFetchAndFindRemoteBranches(gitFlowConfig.getReleaseBranchPrefix(), false); - if (StringUtils.isBlank(releaseBranch)) { - throw new MojoFailureException("There is no remote or local release branch."); - } - - // remove remote name with slash from branch name - releaseBranch = releaseBranch.substring(gitFlowConfig.getOrigin().length() + 1); - - if (StringUtils.countMatches(releaseBranch, gitFlowConfig.getReleaseBranchPrefix()) > 1) { - throw new MojoFailureException("More than one remote release branch exists. Cannot finish release."); + if StringUtils.isNotBlank(releaseBranchName){ + if (!releaseBranchName.startsWith(gitFlowConfig.getReleaseBranchPrefix())) { + throw new MojoFailureException("The releaseBranchName parameter doesn't start with release branch prefix."); + } + if (!gitCheckBranchExists(releaseBranchName)) { + throw new MojoFailureException("Release branch with name '" + releaseBranchName + "' doesn't exist. Cannot finish release."); + } + releaseBranch = releaseBranchName; + }else { + + String releaseBranch = gitFindBranches(gitFlowConfig.getReleaseBranchPrefix(), false); + + if (StringUtils.isBlank(releaseBranch)) { + if (fetchRemote) { + releaseBranch = gitFetchAndFindRemoteBranches(gitFlowConfig.getReleaseBranchPrefix(), false); + if (StringUtils.isBlank(releaseBranch)) { + throw new MojoFailureException("There is no remote or local release branch."); + } + + // remove remote name with slash from branch name + releaseBranch = releaseBranch.substring(gitFlowConfig.getOrigin().length() + 1); + + if (StringUtils.countMatches(releaseBranch, gitFlowConfig.getReleaseBranchPrefix()) > 1) { + throw new MojoFailureException("More than one remote release branch exists. And the parameter releaseBranchName is not set. Cannot finish release."); + } + + gitCreateAndCheckout(releaseBranch, gitFlowConfig.getOrigin() + "/" + releaseBranch); + } else { + throw new MojoFailureException("There is no release branch."); } - - gitCreateAndCheckout(releaseBranch, gitFlowConfig.getOrigin() + "/" + releaseBranch); - } else { - throw new MojoFailureException("There is no release branch."); } - } - if (StringUtils.countMatches(releaseBranch, gitFlowConfig.getReleaseBranchPrefix()) > 1) { - throw new MojoFailureException("More than one release branch exists. Cannot finish release."); - } - + if (StringUtils.countMatches(releaseBranch, gitFlowConfig.getReleaseBranchPrefix()) > 1) { + + throw new MojoFailureException("More than one release branch exists. Cannot finish release."); + } + } // check snapshots dependencies if (!allowSnapshots) { gitCheckout(releaseBranch); From 1eec90815362e89f4ce185deb37063efabc86d36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jelin=20Gie=C3=9Felmann?= Date: Thu, 6 Apr 2023 11:42:41 +0200 Subject: [PATCH 02/14] add application properties --- Jenkinsfile.properties | 74 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 74 insertions(+) create mode 100644 Jenkinsfile.properties diff --git a/Jenkinsfile.properties b/Jenkinsfile.properties new file mode 100644 index 00000000..364f0ce7 --- /dev/null +++ b/Jenkinsfile.properties @@ -0,0 +1,74 @@ +# Projekt-Typ [application, configuration] +projectType=application + +#Location der pom (optinal, nur wenn Dateien nicht im Hauptverzeichnis) +#pomLocation=app/pom.xml + +#E-Mail Versand aktivieren. Mögliche Werte [true, false] +sendEmailJN=true +#Liste der E-Mail-Empfänger (mehrere mit Leerzeichen getrennt) +mailVerteiler=E71428@vhv.de + +#Zu verwendende JDK-Version. Mögliche Werte [JDK_1.8_51, JDK_1.7_21, JDK_1.6_45, OPEN_JDK_8] +#jdkTool=OPEN_JDK_11 + +#Zu verwendende Maven-Version. Mögliche Werte [MAVEN_3.5, MAVEN_3.3.9] +#mavenTool=Maven_3_8_2 + +#Zusätzliche optionale Goals für den jeweiligen Maven-Step +#additionalMavenGoalsCompile=-X +#additionalMavenGoalsTest=-X +#additionalMavenGoalsInstall=source:jar + +#Soll eine Sonar-Analyse durchgeführt werden. Mögliche Werte [true, false] +startSonarAnalyseJN=false + +#Optional-Sonar - nur nach Absprache mit Sebastian Meyer ändern +#sonarScannerPars=-Dsonar.language=java + +#Soll eine Analyse mit Sonatype Nexus IQ erfolgen +startNexusIqAnalyseJN=false + +#Soll ein Tag im SCM erstellt werden. Mögliche Werte [true, false] +#in der neuen git-Pipeline nicht mehr vorgesehen +#taggingJN=false + +#Pom-Version wird um die Build-ID ergänzt +incrementPomVersionJN=false + +#Sollen Nachfolgejobs gestartet werden. Mögliche Werte [true, false] +startNextJobJN=false +#Liste der Nachfolgejobs mit Semikolon getrennt +nextJob=Vorlesungsverwaltung_Post_Build_Job;Vorlesungsverwaltung_Post_Build_Job2 + +#Soll ein Deployment-Job ausgeführt werden. Mögliche Werte [true, false] +startDeploymentJobJN=false +#Name des Deployment-Jobs. Freitext. +deploymentJobname= mrpink-Deploy-UCD +#Name der Deployment-Ebene. Freitext. Dieser Wert übersteuert einen eventuellen Job-Parameter "EBENE" (siehe oben) +deploymentEbene=Dummy + +#Bereich UCD-Deployment + +#Deployment-Verfahren. Mögliche Werte [ucd , classic] +deploymentMode=ucd + +#UCD-Server (Beim Betrieb erfragen) +ucdServer=UCD_IAK01 + +#UCD-Komponentenname (Beim Betrieb erfragen) +ucdComponentName=Dummy-Component + +#UCD-Applikationsname (Beim Betrieb erfragen) +ucdAppName=Dummy-Application + +#UCD-Deploymentprozess-Name (Beim Betrieb erfragen) +ucdProcess=SteveRogers + +#Verzeichnis der zu pushenden Artefakte relativ zu ${WORKSPACE}/ +ucdTargetFolder=ucd-target + +#Pattern, welche Dateien inkludiert werden sollen. +ucdIncludeFiles=*.jar + +#bugfix Änderung hotfix !!hotfix2Änderung!! \ No newline at end of file From 0fde3702fb0477f601ad65f2d5beaca99aac168b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jelin=20Gie=C3=9Felmann?= Date: Thu, 6 Apr 2023 11:43:03 +0200 Subject: [PATCH 03/14] change releasefinish --- Jenkinsfile.properties | 1 - 1 file changed, 1 deletion(-) diff --git a/Jenkinsfile.properties b/Jenkinsfile.properties index 364f0ce7..0237e9c9 100644 --- a/Jenkinsfile.properties +++ b/Jenkinsfile.properties @@ -71,4 +71,3 @@ ucdTargetFolder=ucd-target #Pattern, welche Dateien inkludiert werden sollen. ucdIncludeFiles=*.jar -#bugfix Änderung hotfix !!hotfix2Änderung!! \ No newline at end of file From 80921d7cfd06d81adbfc25ec7387a72c7e60a8c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jelin=20Gie=C3=9Felmann?= Date: Thu, 6 Apr 2023 11:50:54 +0200 Subject: [PATCH 04/14] add application properties --- Jenkinsfile.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile.properties b/Jenkinsfile.properties index 0237e9c9..f077ead9 100644 --- a/Jenkinsfile.properties +++ b/Jenkinsfile.properties @@ -10,10 +10,10 @@ sendEmailJN=true mailVerteiler=E71428@vhv.de #Zu verwendende JDK-Version. Mögliche Werte [JDK_1.8_51, JDK_1.7_21, JDK_1.6_45, OPEN_JDK_8] -#jdkTool=OPEN_JDK_11 +jdkTool=OPEN_JDK_11 #Zu verwendende Maven-Version. Mögliche Werte [MAVEN_3.5, MAVEN_3.3.9] -#mavenTool=Maven_3_8_2 +mavenTool=Maven_3_8_2 #Zusätzliche optionale Goals für den jeweiligen Maven-Step #additionalMavenGoalsCompile=-X From 0fad77f22355cf25205db9b486106c17185df7e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jelin=20Gie=C3=9Felmann?= Date: Thu, 6 Apr 2023 15:51:08 +0200 Subject: [PATCH 05/14] add application properties --- .factorypath | 84 +++++++++++++++++++ .../gitflow/GitFlowReleaseFinishMojo.java | 14 ++-- 2 files changed, 91 insertions(+), 7 deletions(-) create mode 100644 .factorypath diff --git a/.factorypath b/.factorypath new file mode 100644 index 00000000..3ca9c6e3 --- /dev/null +++ b/.factorypath @@ -0,0 +1,84 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/java/com/amashchenko/maven/plugin/gitflow/GitFlowReleaseFinishMojo.java b/src/main/java/com/amashchenko/maven/plugin/gitflow/GitFlowReleaseFinishMojo.java index 32f80201..ecc301ba 100644 --- a/src/main/java/com/amashchenko/maven/plugin/gitflow/GitFlowReleaseFinishMojo.java +++ b/src/main/java/com/amashchenko/maven/plugin/gitflow/GitFlowReleaseFinishMojo.java @@ -192,12 +192,12 @@ public class GitFlowReleaseFinishMojo extends AbstractGitFlowMojo { @Override public void execute() throws MojoExecutionException, MojoFailureException { validateConfiguration(preReleaseGoals, postReleaseGoals); - + String releaseBranch = null; try { // check uncommitted changes checkUncommittedChanges(); - if StringUtils.isNotBlank(releaseBranchName){ + if (StringUtils.isNotBlank(releaseBranchName)) { if (!releaseBranchName.startsWith(gitFlowConfig.getReleaseBranchPrefix())) { throw new MojoFailureException("The releaseBranchName parameter doesn't start with release branch prefix."); } @@ -205,9 +205,9 @@ public void execute() throws MojoExecutionException, MojoFailureException { throw new MojoFailureException("Release branch with name '" + releaseBranchName + "' doesn't exist. Cannot finish release."); } releaseBranch = releaseBranchName; - }else { - - String releaseBranch = gitFindBranches(gitFlowConfig.getReleaseBranchPrefix(), false); + } else { + + releaseBranch = gitFindBranches(gitFlowConfig.getReleaseBranchPrefix(), false); if (StringUtils.isBlank(releaseBranch)) { if (fetchRemote) { @@ -229,10 +229,10 @@ public void execute() throws MojoExecutionException, MojoFailureException { } } if (StringUtils.countMatches(releaseBranch, gitFlowConfig.getReleaseBranchPrefix()) > 1) { - + throw new MojoFailureException("More than one release branch exists. Cannot finish release."); } - } + } // check snapshots dependencies if (!allowSnapshots) { gitCheckout(releaseBranch); From 6b2df91ebf99d05c391177c4857a6bcdfe444d28 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jelin=20Gie=C3=9Felmann?= Date: Fri, 14 Apr 2023 13:54:33 +0200 Subject: [PATCH 06/14] Jenkinsfile.properties edited online with Bitbucket --- Jenkinsfile.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile.properties b/Jenkinsfile.properties index f077ead9..61e20cc4 100644 --- a/Jenkinsfile.properties +++ b/Jenkinsfile.properties @@ -1,5 +1,5 @@ # Projekt-Typ [application, configuration] -projectType=application +projectType=configuration #Location der pom (optinal, nur wenn Dateien nicht im Hauptverzeichnis) #pomLocation=app/pom.xml From 5d5b8fc0298bc404218afa72d10c8c0442616232 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jelin=20Gie=C3=9Felmann?= Date: Fri, 14 Apr 2023 14:09:29 +0200 Subject: [PATCH 07/14] Jenkinsfile.properties edited online with Bitbucket --- Jenkinsfile.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile.properties b/Jenkinsfile.properties index 61e20cc4..47c41c24 100644 --- a/Jenkinsfile.properties +++ b/Jenkinsfile.properties @@ -1,5 +1,5 @@ # Projekt-Typ [application, configuration] -projectType=configuration +projectType=libary #Location der pom (optinal, nur wenn Dateien nicht im Hauptverzeichnis) #pomLocation=app/pom.xml From 589a269278b2be41a4cc5740ea1fdf787d9f8e09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jelin=20Gie=C3=9Felmann?= Date: Fri, 14 Apr 2023 14:11:07 +0200 Subject: [PATCH 08/14] Jenkinsfile.properties edited online with Bitbucket --- Jenkinsfile.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile.properties b/Jenkinsfile.properties index 47c41c24..2a715bc2 100644 --- a/Jenkinsfile.properties +++ b/Jenkinsfile.properties @@ -1,5 +1,5 @@ # Projekt-Typ [application, configuration] -projectType=libary +projectType=lib #Location der pom (optinal, nur wenn Dateien nicht im Hauptverzeichnis) #pomLocation=app/pom.xml From f91f28ee86d419e9fb6b1a625f7f981ba4ef6337 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jelin=20Gie=C3=9Felmann?= Date: Tue, 18 Apr 2023 09:35:03 +0200 Subject: [PATCH 09/14] change git show ref from local to remote# --- .../maven/plugin/gitflow/AbstractGitFlowMojo.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/amashchenko/maven/plugin/gitflow/AbstractGitFlowMojo.java b/src/main/java/com/amashchenko/maven/plugin/gitflow/AbstractGitFlowMojo.java index 22e3a4dd..0346f8d2 100644 --- a/src/main/java/com/amashchenko/maven/plugin/gitflow/AbstractGitFlowMojo.java +++ b/src/main/java/com/amashchenko/maven/plugin/gitflow/AbstractGitFlowMojo.java @@ -560,14 +560,14 @@ private void gitSetConfig(final String name, String value) throws MojoFailureExc * Branch name to find. * @param firstMatch * Return first match. - * @return Branch names which matches refs/heads/{branchName}*. + * @return Branch names which matches refs/heads/{branchName}*. * @throws MojoFailureException * If command line execution returns false code. * @throws CommandLineException * If command line execution fails. */ protected String gitFindBranches(final String branchName, final boolean firstMatch) throws MojoFailureException, CommandLineException { - return gitFindBranches("refs/heads/", branchName, firstMatch); + return gitFindBranches("refs/remotes/origin/", branchName, firstMatch); } /** @@ -683,7 +683,7 @@ protected String gitCurrentBranch() throws MojoFailureException, CommandLineExce * If command line execution fails. */ protected boolean gitCheckBranchExists(final String branchName) throws MojoFailureException, CommandLineException { - CommandResult commandResult = executeGitCommandExitCode("show-ref", "--verify", "--quiet", "refs/heads/" + branchName); + CommandResult commandResult = executeGitCommandExitCode("show-ref", "--verify", "--quiet", "refs/remotes/origin/" + branchName); return commandResult.getExitCode() == SUCCESS_EXIT_CODE; } From a25dca86b3d15203f43e41d989388b712b526ab0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jelin=20Gie=C3=9Felmann?= Date: Tue, 18 Apr 2023 09:42:09 +0200 Subject: [PATCH 10/14] parameter for allowing multiple release branches --- .../maven/plugin/gitflow/GitFlowReleaseStartMojo.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/amashchenko/maven/plugin/gitflow/GitFlowReleaseStartMojo.java b/src/main/java/com/amashchenko/maven/plugin/gitflow/GitFlowReleaseStartMojo.java index f3717adc..6c55b776 100644 --- a/src/main/java/com/amashchenko/maven/plugin/gitflow/GitFlowReleaseStartMojo.java +++ b/src/main/java/com/amashchenko/maven/plugin/gitflow/GitFlowReleaseStartMojo.java @@ -139,6 +139,13 @@ public class GitFlowReleaseStartMojo extends AbstractGitFlowMojo { @Parameter(property = "branchName") private String branchName; + /** + * Whether to allow multiple release branches. + * + */ + @Parameter(property = "allowMultipleReleaseBranches", defaultValue = "true") + private boolean allowMultipleReleaseBranches; + /** {@inheritDoc} */ @Override public void execute() throws MojoExecutionException, MojoFailureException { @@ -153,7 +160,7 @@ public void execute() throws MojoExecutionException, MojoFailureException { final String releaseBranch = gitFindBranches(gitFlowConfig.getReleaseBranchPrefix(), true); - if (StringUtils.isNotBlank(releaseBranch)) { + if (StringUtils.isNotBlank(releaseBranch) && !allowMultipleReleaseBranches ) { throw new MojoFailureException("Release branch already exists. Cannot start release."); } From 5d647e60099a46c84c66eb16e07623c2a20853ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jelin=20Gie=C3=9Felmann?= Date: Tue, 18 Apr 2023 09:45:45 +0200 Subject: [PATCH 11/14] add check if remote release branch already exist --- .../maven/plugin/gitflow/GitFlowReleaseFinishMojo.java | 8 ++------ .../maven/plugin/gitflow/GitFlowReleaseStartMojo.java | 4 ++++ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/amashchenko/maven/plugin/gitflow/GitFlowReleaseFinishMojo.java b/src/main/java/com/amashchenko/maven/plugin/gitflow/GitFlowReleaseFinishMojo.java index ecc301ba..6c4f3728 100644 --- a/src/main/java/com/amashchenko/maven/plugin/gitflow/GitFlowReleaseFinishMojo.java +++ b/src/main/java/com/amashchenko/maven/plugin/gitflow/GitFlowReleaseFinishMojo.java @@ -180,15 +180,11 @@ public class GitFlowReleaseFinishMojo extends AbstractGitFlowMojo { private boolean noBackMerge = false; /** Release branch to use in non-interactive mode. Must start with releasae branch - * prefix. The releaseBranchName parameter will be used if there are multiple release Branches in the Repository */ + * prefix. The releaseBranchName parameter will be used if there are multiple release Branches in the Repository + * */ @Parameter(property = "releaseBranchName") private String releaseBranchName; - /** - * Whether to make a GPG-signed tag. - * - * - */ @Override public void execute() throws MojoExecutionException, MojoFailureException { validateConfiguration(preReleaseGoals, postReleaseGoals); diff --git a/src/main/java/com/amashchenko/maven/plugin/gitflow/GitFlowReleaseStartMojo.java b/src/main/java/com/amashchenko/maven/plugin/gitflow/GitFlowReleaseStartMojo.java index 6c55b776..c06c90ab 100644 --- a/src/main/java/com/amashchenko/maven/plugin/gitflow/GitFlowReleaseStartMojo.java +++ b/src/main/java/com/amashchenko/maven/plugin/gitflow/GitFlowReleaseStartMojo.java @@ -201,6 +201,10 @@ public void execute() throws MojoExecutionException, MojoFailureException { fullBranchName += releaseVersion; } + if (gitCheckBranchExists(fullBranchName)) { + throw new MojoFailureException("Release branch" + fullBranchName + "already exists. Cannot start release."); + } + String projectVersion = releaseVersion; if (useSnapshotInRelease && !ArtifactUtils.isSnapshot(projectVersion)) { projectVersion = projectVersion + "-" + Artifact.SNAPSHOT_VERSION; From 955e11a138a47933fe05052dc5ec8f059e0faa66 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jelin=20Gie=C3=9Felmann?= Date: Wed, 14 Jun 2023 11:21:32 +0200 Subject: [PATCH 12/14] release finish --- .../maven/plugin/gitflow/AbstractGitFlowMojo.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/amashchenko/maven/plugin/gitflow/AbstractGitFlowMojo.java b/src/main/java/com/amashchenko/maven/plugin/gitflow/AbstractGitFlowMojo.java index 0346f8d2..22e3a4dd 100644 --- a/src/main/java/com/amashchenko/maven/plugin/gitflow/AbstractGitFlowMojo.java +++ b/src/main/java/com/amashchenko/maven/plugin/gitflow/AbstractGitFlowMojo.java @@ -560,14 +560,14 @@ private void gitSetConfig(final String name, String value) throws MojoFailureExc * Branch name to find. * @param firstMatch * Return first match. - * @return Branch names which matches refs/heads/{branchName}*. + * @return Branch names which matches refs/heads/{branchName}*. * @throws MojoFailureException * If command line execution returns false code. * @throws CommandLineException * If command line execution fails. */ protected String gitFindBranches(final String branchName, final boolean firstMatch) throws MojoFailureException, CommandLineException { - return gitFindBranches("refs/remotes/origin/", branchName, firstMatch); + return gitFindBranches("refs/heads/", branchName, firstMatch); } /** @@ -683,7 +683,7 @@ protected String gitCurrentBranch() throws MojoFailureException, CommandLineExce * If command line execution fails. */ protected boolean gitCheckBranchExists(final String branchName) throws MojoFailureException, CommandLineException { - CommandResult commandResult = executeGitCommandExitCode("show-ref", "--verify", "--quiet", "refs/remotes/origin/" + branchName); + CommandResult commandResult = executeGitCommandExitCode("show-ref", "--verify", "--quiet", "refs/heads/" + branchName); return commandResult.getExitCode() == SUCCESS_EXIT_CODE; } From b3c76c114d288459dab3b005a52cf56cce1cae62 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jelin=20Gie=C3=9Felmann?= Date: Wed, 14 Jun 2023 11:27:00 +0200 Subject: [PATCH 13/14] pom.xml edited online with Bitbucket --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 621391cf..92b86f17 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ gitflow-maven-plugin maven-plugin gitflow-maven-plugin - 1.19.1-SNAPSHOT + 1.20.2-SNAPSHOT The Git-Flow Maven Plugin supports various Git workflows, including Vincent Driessen's successful Git branching model and GitHub Flow. This plugin runs Git and Maven commands from the command line. Supports Eclipse Plugins build with Tycho. From 5d7516baeeb7e39ed556a75ff0102e4abcbb4db6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jelin=20Gie=C3=9Felmann?= Date: Tue, 12 Dec 2023 15:19:05 +0100 Subject: [PATCH 14/14] remove Jenkinsfiles --- Jenkinsfile.properties | 73 ------------------------------------------ 1 file changed, 73 deletions(-) delete mode 100644 Jenkinsfile.properties diff --git a/Jenkinsfile.properties b/Jenkinsfile.properties deleted file mode 100644 index 2a715bc2..00000000 --- a/Jenkinsfile.properties +++ /dev/null @@ -1,73 +0,0 @@ -# Projekt-Typ [application, configuration] -projectType=lib - -#Location der pom (optinal, nur wenn Dateien nicht im Hauptverzeichnis) -#pomLocation=app/pom.xml - -#E-Mail Versand aktivieren. Mögliche Werte [true, false] -sendEmailJN=true -#Liste der E-Mail-Empfänger (mehrere mit Leerzeichen getrennt) -mailVerteiler=E71428@vhv.de - -#Zu verwendende JDK-Version. Mögliche Werte [JDK_1.8_51, JDK_1.7_21, JDK_1.6_45, OPEN_JDK_8] -jdkTool=OPEN_JDK_11 - -#Zu verwendende Maven-Version. Mögliche Werte [MAVEN_3.5, MAVEN_3.3.9] -mavenTool=Maven_3_8_2 - -#Zusätzliche optionale Goals für den jeweiligen Maven-Step -#additionalMavenGoalsCompile=-X -#additionalMavenGoalsTest=-X -#additionalMavenGoalsInstall=source:jar - -#Soll eine Sonar-Analyse durchgeführt werden. Mögliche Werte [true, false] -startSonarAnalyseJN=false - -#Optional-Sonar - nur nach Absprache mit Sebastian Meyer ändern -#sonarScannerPars=-Dsonar.language=java - -#Soll eine Analyse mit Sonatype Nexus IQ erfolgen -startNexusIqAnalyseJN=false - -#Soll ein Tag im SCM erstellt werden. Mögliche Werte [true, false] -#in der neuen git-Pipeline nicht mehr vorgesehen -#taggingJN=false - -#Pom-Version wird um die Build-ID ergänzt -incrementPomVersionJN=false - -#Sollen Nachfolgejobs gestartet werden. Mögliche Werte [true, false] -startNextJobJN=false -#Liste der Nachfolgejobs mit Semikolon getrennt -nextJob=Vorlesungsverwaltung_Post_Build_Job;Vorlesungsverwaltung_Post_Build_Job2 - -#Soll ein Deployment-Job ausgeführt werden. Mögliche Werte [true, false] -startDeploymentJobJN=false -#Name des Deployment-Jobs. Freitext. -deploymentJobname= mrpink-Deploy-UCD -#Name der Deployment-Ebene. Freitext. Dieser Wert übersteuert einen eventuellen Job-Parameter "EBENE" (siehe oben) -deploymentEbene=Dummy - -#Bereich UCD-Deployment - -#Deployment-Verfahren. Mögliche Werte [ucd , classic] -deploymentMode=ucd - -#UCD-Server (Beim Betrieb erfragen) -ucdServer=UCD_IAK01 - -#UCD-Komponentenname (Beim Betrieb erfragen) -ucdComponentName=Dummy-Component - -#UCD-Applikationsname (Beim Betrieb erfragen) -ucdAppName=Dummy-Application - -#UCD-Deploymentprozess-Name (Beim Betrieb erfragen) -ucdProcess=SteveRogers - -#Verzeichnis der zu pushenden Artefakte relativ zu ${WORKSPACE}/ -ucdTargetFolder=ucd-target - -#Pattern, welche Dateien inkludiert werden sollen. -ucdIncludeFiles=*.jar -