Skip to content

Commit 0babaa6

Browse files
committed
version set to 1.3 and added hints
1 parent d96cc16 commit 0babaa6

2 files changed

Lines changed: 14 additions & 3 deletions

File tree

README.md

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,8 +130,6 @@ Basically you define the rules which should be used by adding the implementation
130130
followed by the configuration. If you want to write your own rule, have a look at the implemented ones and perhaps send
131131
a pull request to merge it ;-)
132132
133-
Currently im working on a third rule where version conflicts in dependencies can be resolved.
134-
135133
After you wrote your ruleset configuration file, add it to your git project *somewhere* and change the `driver` entry in your `.git/config`, e.g.:
136134
137135
```
@@ -145,3 +143,16 @@ After you wrote your ruleset configuration file, add it to your git project *som
145143
This command is used to set the parent/project version of a single pom.xml file. The version-maven-plugin always adjust the child's too, sometimes you don't want that.
146144
147145
`java -jar <pathToJar>/pomutils-X.X.jar replace --pom=<pathToPomFile> --version=<newVersion>`
146+
147+
148+
HINTS
149+
------------
150+
In my project's I ship the pomutils.jar within the project. My .git/config entry looks like:
151+
152+
```
153+
[merge "pom"]
154+
driver = java -jar ./buildmgr/pomutils.jar merge --base=%O --our=%A --their=%B --ruleset=./buildmgr/ruleset
155+
```
156+
157+
Now all developers can use the merge driver without downloading first the jar. They only have to add the .git/config entry.
158+

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<modelVersion>4.0.0</modelVersion>
33
<groupId>de.oppermann.pomutils</groupId>
44
<artifactId>pomutils</artifactId>
5-
<version>develop</version>
5+
<version>1.3</version>
66

77
<licenses>
88
<license>

0 commit comments

Comments
 (0)