diff options
| author | Thomas Wolf <thomas.wolf@paranor.ch> | 2019-03-28 22:28:47 +0100 |
|---|---|---|
| committer | Matthias Sohn <matthias.sohn@sap.com> | 2019-03-31 01:13:53 +0100 |
| commit | eeab375796bd7611dd0fc0c28040f2d7594b69f8 (patch) | |
| tree | 1c4e3b67df9ed85d0891eed8b5b8fc4dae8041c0 /tools/version.sh | |
| parent | a2901cf9dcd6145f3e2aa4c17b8bff67aed5639e (diff) | |
| download | jgit-eeab375796bd7611dd0fc0c28040f2d7594b69f8.tar.gz jgit-eeab375796bd7611dd0fc0c28040f2d7594b69f8.zip | |
[releng] Fix dependencies between features
Add dependencies from source to binary features and enforce the same
version. Restrict the dependencies between binary features by version,
too.
Adapt the version.sh script to properly replace these version numbers.
Bug: 545906
Change-Id: I953616e58d27accdf61b49f6435a54895bcbf6da
Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Diffstat (limited to 'tools/version.sh')
| -rwxr-xr-x | tools/version.sh | 22 |
1 files changed, 6 insertions, 16 deletions
diff --git a/tools/version.sh b/tools/version.sh index 8b8095db42..80693cdbdb 100755 --- a/tools/version.sh +++ b/tools/version.sh @@ -131,7 +131,8 @@ perl -pi~ -e ' $seen_version = 1 if (!/<\?xml/ && s/(version=")[^"]*(")/${1}'"$OSGI_V"'${2}/); } - s/(import feature="org\.eclipse\.jgit.*" version=")[^"]*(")/${1}'"$API_V"'${2}/; + s/(import feature="org\.eclipse\.jgit[^"]*" version=")[^"]*(")/${1}'"$API_V"'${2}/; + s/(import plugin="org\.eclipse\.jgit[^"]*" version=")[^"]*(")/${1}'"$API_V"'${2}/; ' org.eclipse.jgit.packaging/org.*.feature/feature.xml perl -pi~ -e ' @@ -139,22 +140,11 @@ perl -pi~ -e ' $seen_version = 0; $old_argv = $ARGV; } - if (!$seen_version) { - $seen_version = 1 if - s{<(version)>.*</\1>}{<${1}>'"$POM_V"'</${1}>}; - } - ' org.eclipse.jgit.packaging/org.*.feature/pom.xml - -perl -pi~ -e ' - if ($ARGV ne $old_argv) { - $seen_version = 0; - $old_argv = $ARGV; - } - if (!$seen_version) { - $seen_version = 1 if + if ($seen_version < 2) { + $seen_version++ if s{<(version)>.*</\1>}{<${1}>'"$POM_V"'</${1}>}; } - ' org.eclipse.jgit.packaging/pom.xml + ' org.eclipse.jgit.packaging/org.*.source.feature/pom.xml perl -pi~ -e ' if ($ARGV ne $old_argv) { @@ -162,7 +152,7 @@ perl -pi~ -e ' $old_argv = $ARGV; } if ($seen_version < 18) { - $seen_version++ if + $seen_version++ if s{<(version)>.*</\1>}{<${1}>'"$POM_V"'</${1}>}; } ' org.eclipse.jgit.coverage/pom.xml |