diff options
12 files changed, 54 insertions, 22 deletions
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml index 6bae2cb154..ccf68c4839 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml @@ -23,7 +23,7 @@ </url> <requires> - <import plugin="org.eclipse.jgit"/> + <import plugin="org.eclipse.jgit" version="5.4.0" match="equivalent"/> </requires> <plugin diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml index 0079970df8..bbd1ffe40d 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml @@ -24,6 +24,7 @@ <requires> <import plugin="com.jcraft.jsch"/> + <import plugin="org.eclipse.jgit" version="5.4.0" match="equivalent"/> </requires> <plugin diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml index 9af34c79bf..62be3c8f1a 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml @@ -23,7 +23,7 @@ </url> <requires> - <import plugin="org.eclipse.jgit"/> + <import feature="org.eclipse.jgit" version="5.4.0" match="equivalent"/> </requires> <plugin diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml index c6418c1bf4..92f0a2475c 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml @@ -30,6 +30,10 @@ id="org.eclipse.jgit.lfs" version="0.0.0"/> + <includes + id="org.eclipse.jgit.ssh.apache" + version="0.0.0"/> + <requires> <import feature="org.eclipse.jgit" version="5.4.0" match="equivalent"/> <import feature="org.eclipse.jgit.lfs" version="5.4.0" match="equivalent"/> diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.source.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.source.feature/feature.xml index 324b751c31..96576fae0a 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.source.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.source.feature/feature.xml @@ -22,6 +22,10 @@ <discovery label="%updateSiteName" url="http://download.eclipse.org/egit/updates"/> </url> + <requires> + <import feature="org.eclipse.jgit.pgm" version="5.4.0" match="equivalent"/> + </requires> + <plugin id="org.eclipse.jgit.pgm.source" download-size="0" diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.source.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.source.feature/pom.xml index 31ea4c4c60..405619bcc4 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.source.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.source.feature/pom.xml @@ -59,4 +59,12 @@ <name>JGit Command Line Interface Source Feature</name> + <dependencies> + <dependency> + <groupId>org.eclipse.jgit.feature</groupId> + <artifactId>org.eclipse.jgit.pgm</artifactId> + <version>5.4.0-SNAPSHOT</version> + </dependency> + </dependencies> + </project> diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml index 3f0cb1d651..d39d29c0ee 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml @@ -22,6 +22,10 @@ <discovery label="%updateSiteName" url="http://download.eclipse.org/egit/updates"/> </url> + <requires> + <import feature="org.eclipse.jgit" version="5.4.0" match="equivalent"/> + </requires> + <plugin id="org.eclipse.jgit.source" download-size="0" diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml index 802c9e4639..b1564870be 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml @@ -59,4 +59,12 @@ <name>JGit Source Feature</name> + <dependencies> + <dependency> + <groupId>org.eclipse.jgit.feature</groupId> + <artifactId>org.eclipse.jgit</artifactId> + <version>5.4.0-SNAPSHOT</version> + </dependency> + </dependencies> + </project> diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml index 356e5f0604..0e3966dbe3 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml @@ -23,7 +23,7 @@ </url> <requires> - <import plugin="org.eclipse.jgit"/> + <import feature="org.eclipse.jgit" version="5.4.0" match="equivalent"/> </requires> <plugin diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.source.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.source.feature/feature.xml index 4e8dc12502..e407c09ad6 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.source.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.source.feature/feature.xml @@ -6,15 +6,15 @@ provider-name="%providerName"> <description url="http://www.eclipse.org/jgit/"> - %description + %description </description> <copyright> - %copyright + %copyright </copyright> <license url="%licenseURL"> - %license + %license </license> <url> @@ -22,10 +22,15 @@ <discovery label="%updateSiteName" url="http://download.eclipse.org/egit/updates"/> </url> + <requires> + <import feature="org.eclipse.jgit.ssh.apache" version="5.4.0" match="equivalent"/> + </requires> + <plugin id="org.eclipse.jgit.ssh.apache.source" download-size="0" install-size="0" version="0.0.0" unpack="false"/> + </feature> diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.source.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.source.feature/pom.xml index 2e826c062b..8381ac8cc4 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.source.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.source.feature/pom.xml @@ -59,4 +59,12 @@ <name>JGit Apache MINA ssh Source Feature</name> + <dependencies> + <dependency> + <groupId>org.eclipse.jgit.feature</groupId> + <artifactId>org.eclipse.jgit.ssh.apache</artifactId> + <version>5.4.0-SNAPSHOT</version> + </dependency> + </dependencies> + </project> 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 |