diff options
| -rw-r--r-- | org.eclipse.egit.ui.test/pom.xml | 14 | ||||
| -rwxr-xr-x | tools/version.sh | 39 |
2 files changed, 45 insertions, 8 deletions
diff --git a/org.eclipse.egit.ui.test/pom.xml b/org.eclipse.egit.ui.test/pom.xml index 16f0daca41..f2bab5e4fc 100644 --- a/org.eclipse.egit.ui.test/pom.xml +++ b/org.eclipse.egit.ui.test/pom.xml @@ -91,23 +91,23 @@ <dependencies> <dependency> <type>p2-installable-unit</type> - <artifactId>org.eclipse.pde.feature.group</artifactId> - <version>${platform-version}</version> + <artifactId>org.eclipse.egit.feature.group</artifactId> + <version>[0.11.0,0.12.0)</version> </dependency> <dependency> <type>p2-installable-unit</type> - <artifactId>org.eclipse.egit.feature.group</artifactId> + <artifactId>org.eclipse.jgit.feature.group</artifactId> <version>[0.11.0,0.12.0)</version> </dependency> <dependency> <type>p2-installable-unit</type> - <artifactId>org.eclipse.cvs.feature.group</artifactId> - <version>[1.1.2,2.0.0)</version> + <artifactId>org.eclipse.pde.feature.group</artifactId> + <version>${platform-version}</version> </dependency> <dependency> <type>p2-installable-unit</type> - <artifactId>org.eclipse.jgit.feature.group</artifactId> - <version>[0.11.0,0.12.0)</version> + <artifactId>org.eclipse.cvs.feature.group</artifactId> + <version>[1.1.2,2.0.0)</version> </dependency> </dependencies> </configuration> diff --git a/tools/version.sh b/tools/version.sh index e97a2b7472..e373d72615 100755 --- a/tools/version.sh +++ b/tools/version.sh @@ -113,12 +113,26 @@ perl -pi~ -e ' $seen_version = 0; $old_argv = $ARGV; } + if ($seen_version < 4) { + $seen_version++ if (!/<\?xml/ && + s/(version=")[^"]*(")/${1}'"$OSGI_V"'${2}/); + } + s/(feature="org.eclipse.egit.core" version=")[^"]*(")/${1}'"$EGIT_V"'${2}/; + s/(feature="org.eclipse.egit.ui" version=")[^"]*(")/${1}'"$EGIT_V"'${2}/; + s/(feature="org.eclipse.jgit" version=")[^"]*(")/${1}'"$JGIT_V"'${2}/; + ' org.eclipse.egit.mylyn-feature/feature.xml + +perl -pi~ -e ' + if ($ARGV ne $old_argv) { + $seen_version = 0; + $old_argv = $ARGV; + } if (!$seen_version) { $seen_version = 1 if (!/<\?xml/ && s/(version=")[^"]*(")/${1}'"$OSGI_V"'${2}/); } s/(feature="org.eclipse.jgit" version=")[^"]*(")/${1}'"$JGIT_V"'${2}/; - ' org.eclipse.egit-feature/feature.xml + ' $(git ls-files | grep feature.xml) perl -pi~ -e ' s{<(version)>[^<\$]*</\1>}{<${1}>'"$POM_V"'</${1}>}; @@ -129,6 +143,18 @@ perl -pi~ -e ' $seen_version = 0; $old_argv = $ARGV; } + if (!$seen_version) { + $seen_version = 1 if + s{<(version)>[^<\$]*</\1>}{<${1}>'"$POM_V"'</${1}>}; + } + s{<(egit-version)>[^<\$]*</\1>}{<${1}>'"$POM_V"'</${1}>}; + ' pom.xml + +perl -pi~ -e ' + if ($ARGV ne $old_argv) { + $seen_version = 0; + $old_argv = $ARGV; + } if ($seen_version < 2) { $seen_version++ if s{<(version)>[^<\$]*</\1>}{<${1}>'"$POM_V"'</${1}>}; @@ -140,6 +166,17 @@ perl -pi~ -e ' $seen_version = 0; $old_argv = $ARGV; } + if ($seen_version < 3) { + $seen_version++ if + s{<(version)>[^<\$]*</\1>}{<${1}>'"$POM_V"'</${1}>}; + } + ' org.eclipse.egit.ui.test/pom.xml + +perl -pi~ -e ' + if ($ARGV ne $old_argv) { + $seen_version = 0; + $old_argv = $ARGV; + } if (!$seen_version) { $seen_version = 1 if s{<(version)>[^<\$]*</\1>}{<${1}>'"$POM_V"'</${1}>}; |