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 /org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.source.feature | |
| 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 'org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.source.feature')
| -rw-r--r-- | org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.source.feature/feature.xml | 11 | ||||
| -rw-r--r-- | org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.source.feature/pom.xml | 8 |
2 files changed, 16 insertions, 3 deletions
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> |