Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Wolf2019-04-04 15:12:44 -0400
committerThomas Wolf2019-04-04 15:12:44 -0400
commit2f114e85906318d1ae383e1ff6610eb104c184bf (patch)
treedc1ff06f847ee69dfd33d7e74cb67f5d81adebc3
parent11c9fe61ced878541ed3459d5396ecf4181197f6 (diff)
parentdf89d305591dff97f77adfbc9f47e0b48b5417c6 (diff)
downloadegit-github-2f114e85906318d1ae383e1ff6610eb104c184bf.tar.gz
egit-github-2f114e85906318d1ae383e1ff6610eb104c184bf.tar.xz
egit-github-2f114e85906318d1ae383e1ff6610eb104c184bf.zip
Merge branch 'stable-5.3'
* stable-5.3: Correct version increase for egit-github Change-Id: I13bcc902211fa29024c4eccf0aa20a967111ee34 Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
-rw-r--r--pom.xml3
-rwxr-xr-xtools/version.sh2
2 files changed, 3 insertions, 2 deletions
diff --git a/pom.xml b/pom.xml
index 18843725..89e2c903 100644
--- a/pom.xml
+++ b/pom.xml
@@ -55,6 +55,7 @@
</licenses>
<properties>
+ <egit-github-version>5.4.0-SNAPSHOT</egit-github-version>
<tycho-version>1.3.0</tycho-version>
<tycho-extras-version>${tycho-version}</tycho-extras-version>
<spotbugs-maven-plugin-version>3.1.11</spotbugs-maven-plugin-version>
@@ -343,7 +344,7 @@
<artifact>
<groupId>org.eclipse.mylyn.github</groupId>
<artifactId>org.eclipse.mylyn.github.target</artifactId>
- <version>5.4.0-SNAPSHOT</version>
+ <version>${egit-github-version}</version>
<classifier>github</classifier>
</artifact>
</target>
diff --git a/tools/version.sh b/tools/version.sh
index 4111e5a4..1ded1e6d 100755
--- a/tools/version.sh
+++ b/tools/version.sh
@@ -133,7 +133,7 @@ perl -pi~ -e '
$seen_version = 1 if
s{<(version)>[^<\$]*</\1>}{<${1}>'"$POM_V"'</${1}>};
}
- s{<(egit-version)>[^<\$]*</\1>}{<${1}>'"$POM_V"'</${1}>};
+ s{<(egit-github-version)>[^<\$]*</\1>}{<${1}>'"$POM_V"'</${1}>};
' pom.xml
perl -pi~ -e '

Back to the top