Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
S
sample-jee9-1
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Emmanuel Bruno
sample-jee9-1
Commits
b36fae43
Commit
b36fae43
authored
3 years ago
by
Emmanuel Bruno
Browse files
Options
Downloads
Patches
Plain Diff
adds jgitflow support.
parent
74aa02eb
No related branches found
No related tags found
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
pom.xml
+80
-0
80 additions, 0 deletions
pom.xml
with
80 additions
and
0 deletions
pom.xml
+
80
−
0
View file @
b36fae43
...
@@ -291,6 +291,86 @@
...
@@ -291,6 +291,86 @@
<version>
1.1.0
</version>
<version>
1.1.0
</version>
</plugin>
</plugin>
<!-- This plugins implements the gitflow branching model (http://nvie.com/git-model,
https://www.atlassian.com/git/tutorials/comparing-workflows/#!workflow-gitflow )
for maven. It gives an automatic way to manage versions and branches.
https://bitbucket.org/atlassian/jgit-flow/wiki/Home
mvn jgitflow:feature-start:
creates a new feature branch; pushes the branch to origin automatically (can be shared and
used by jenkins).
mvn jgitflow:feature-finish:
merges the feature branch back into the development branch and pushes to origin.
The good way :
git fetch : make sure your local repo copy is up-to-date
git checkout development : go to development
git merge origin/development : make sure your local develop is up-to-date (origin being the remote's name here)
git checkout <feature-branch> : go to you feature branch again
git merge develop : Merge and solve conflicts, if any (on you feature branch)
mvn jgitflow:feature-finish you already solved the conflicts
mvn jgitflow:release-start:
creates a release branch (freeze to prepare a release, only bugfix, documentation
and translation) and pushes it to origin.
mvn jgitflow:release-finish:
builds, tags and merges the release branch back into master and development;
updates versions in master and development branches
mvn jgitflow:hotfix-start: like mvn jgitflow:release-start but branches off of master
mvn jgitflow:hotfix-finish: like mvn jgitflow:release-finish
We forbid deploy from the workstations, it has to be done by the C.I. server.
-->
<plugin>
<groupId>
external.atlassian.jgitflow
</groupId>
<artifactId>
jgitflow-maven-plugin
</artifactId>
<version>
1.0-m5.1
</version>
<dependencies>
<dependency>
<groupId>
com.jcraft
</groupId>
<artifactId>
jsch
</artifactId>
<version>
0.1.55
</version>
</dependency>
</dependencies>
<configuration>
<!-- Enable this to push to origin using SSH keys -->
<enableSshAgent>
true
</enableSshAgent>
<!-- Keep your maven submodules at the same version as the parent POM -->
<autoVersionSubmodules>
true
</autoVersionSubmodules>
<!-- Pushing in-development features to origin allows all devs to see what each other
are working on -->
<!--pushFeatures>true</pushFeatures-->
<!-- This allows the CI server (e.g. Jenkins) to automatically push new releases to
origin; you can then either manually deploy them or, if you are doing Continuous
Deployments, auto-deploy them to prod -->
<!--pushReleases>true</pushReleases-->
<!--pushHotfixes>true</pushHotfixes-->
<!-- append the feature name to the version on the feature branch. -->
<enableFeatureVersions>
true
</enableFeatureVersions>
<!-- Prevents deployments from dev workstations so that they can be done by a CI
server -->
<noDeploy>
true
</noDeploy>
<!-- Whether to squash commits into a single commit before merging. -->
<squash>
false
</squash>
<scmCommentPrefix>
[gitflow]
</scmCommentPrefix>
<!-- A VOIR -->
<featureRebase>
true
</featureRebase>
<!--pullDevelop>true</pullDevelop>
<pullMaster>true</pullMaster-->
<flowInitContext>
<masterBranchName>
master
</masterBranchName>
<developBranchName>
develop
</developBranchName>
<featureBranchPrefix>
feature/
</featureBranchPrefix>
<releaseBranchPrefix>
release/
</releaseBranchPrefix>
<hotfixBranchPrefix>
hotfix/
</hotfixBranchPrefix>
<versionTagPrefix
/>
</flowInitContext>
</configuration>
</plugin>
</plugins>
</plugins>
</pluginManagement>
</pluginManagement>
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment