motiejus
/
jgit
1
Fork 0
Code Releases Activity

[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>
This commit is contained in:
Thomas Wolf 2019-03-28 22:28:47 +01:00 committed by Matthias Sohn
parent a2901cf9dc
commit eeab375796
12 changed files with 54 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml
View File

@ -23,7 +23,7 @@
</url>
<requires>
<import plugin="org.eclipse.jgit"/>
<import plugin="org.eclipse.jgit" version="5.4.0" match="equivalent"/>
</requires>
<plugin

1
org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml
View File

@ -24,6 +24,7 @@
<requires>
<import plugin="com.jcraft.jsch"/>
<import plugin="org.eclipse.jgit" version="5.4.0" match="equivalent"/>
</requires>
<plugin

2
org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml
View File

@ -23,7 +23,7 @@
</url>
<requires>
<import plugin="org.eclipse.jgit"/>
<import feature="org.eclipse.jgit" version="5.4.0" match="equivalent"/>
</requires>
<plugin

4
org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml
View File

@ -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"/>

4
org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.source.feature/feature.xml
View File

@ -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"

8
org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.source.feature/pom.xml
View File

@ -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>

4
org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml
View File

@ -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"

8
org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml
View File

@ -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>

2
org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml
View File

@ -23,7 +23,7 @@
</url>
<requires>
<import plugin="org.eclipse.jgit"/>
<import feature="org.eclipse.jgit" version="5.4.0" match="equivalent"/>
</requires>
<plugin

11
org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.source.feature/feature.xml
View File

@ -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>

8
org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.source.feature/pom.xml
View File

@ -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>

22
tools/version.sh
View File

@ -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
if ($seen_version < 2) {
$seen_version++ 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
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