diff options
| author | Matthias Sohn <matthias.sohn@sap.com> | 2020-12-03 00:51:23 +0100 |
|---|---|---|
| committer | Matthias Sohn <matthias.sohn@sap.com> | 2020-12-03 00:51:23 +0100 |
| commit | 99d612db2bf8b09b800745da5bfdcc0e5c14c2f2 (patch) | |
| tree | 72db8df343d8892e84b320e8eff318d95eeb1329 /org.eclipse.jgit.packaging | |
| parent | 9034c7d42349dc995c6215dfb55dcafb65d9e951 (diff) | |
| parent | ad7806f4efe0bfeb256d6572f302de34e23859c4 (diff) | |
| download | jgit-99d612db2bf8b09b800745da5bfdcc0e5c14c2f2.tar.gz jgit-99d612db2bf8b09b800745da5bfdcc0e5c14c2f2.zip | |
Merge branch 'stable-5.10'
* stable-5.10:
Prepare 5.10.0-SNAPSHOT builds
JGit v5.10.0.202012021225-rc1
Don't install 3rd party dependency bundles via features
Change-Id: Ia901830d1057667dc8e78d235c63f84373f8887b
Diffstat (limited to 'org.eclipse.jgit.packaging')
8 files changed, 133 insertions, 126 deletions
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml index 403f3382ef..e2ba814f42 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml @@ -36,25 +36,4 @@ version="0.0.0" unpack="false"/> - <plugin - id="javaewah" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.apache.commons.compress" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.slf4j.api" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - </feature> diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml index 7e6e7c5ffb..7751955c0c 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml @@ -34,25 +34,4 @@ fragment="true" unpack="false"/> - <plugin - id="org.bouncycastle.bcpg" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.bouncycastle.bcpkix" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.bouncycastle.bcprov" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - </feature> 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 1969b9e928..2c0ab365f4 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 @@ -33,25 +33,4 @@ version="0.0.0" unpack="false"/> - <plugin - id="org.apache.httpcomponents.httpcore" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.apache.httpcomponents.httpclient" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.apache.commons.codec" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - </feature> 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 8351da3494..148a365e12 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 @@ -40,11 +40,4 @@ version="0.0.0" unpack="false"/> - <plugin - id="com.google.gson" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - </feature> 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 a42b6a419b..a758e39421 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 @@ -54,25 +54,4 @@ version="0.0.0" unpack="false"/> - <plugin - id="org.apache.commons.compress" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.kohsuke.args4j" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="javaewah" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - </feature> diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/category.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/category.xml index abda695639..a56cf0a1f2 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/category.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/category.xml @@ -39,6 +39,138 @@ <bundle id="org.eclipse.jgit.ui" version="0.0.0"> <category name="JGit-additional-bundles"/> </bundle> + <bundle id="com.google.gson"> + <category name="JGit-dependency-bundles"/> + </bundle> + <bundle id="com.google.gson.source"> + <category name="JGit-dependency-bundles"/> + </bundle> + <bundle id="com.jcraft.jsch"> + <category name="JGit-dependency-bundles"/> + </bundle> + <bundle id="com.jcraft.jsch.source"> + <category name="JGit-dependency-bundles"/> + </bundle> + <bundle id="com.jcraft.jzlib"> + <category name="JGit-dependency-bundles"/> + </bundle> + <bundle id="com.jcraft.jzlib.source"> + <category name="JGit-dependency-bundles"/> + </bundle> + <bundle id="javaewah"> + <category name="JGit-dependency-bundles"/> + </bundle> + <bundle id="javaewah.source"> + <category name="JGit-dependency-bundles"/> + </bundle> + <bundle id="javax.servlet"> + <category name="JGit-dependency-bundles"/> + </bundle> + <bundle id="javax.servlet.source"> + <category name="JGit-dependency-bundles"/> + </bundle> + <bundle id="net.i2p.crypto.eddsa"> + <category name="JGit-dependency-bundles"/> + </bundle> + <bundle id="net.i2p.crypto.eddsa.source"> + <category name="JGit-dependency-bundles"/> + </bundle> + <bundle id="org.apache.ant"> + <category name="JGit-dependency-bundles"/> + </bundle> + <bundle id="org.apache.ant.source"> + <category name="JGit-dependency-bundles"/> + </bundle> + <bundle id="org.apache.commons.codec"> + <category name="JGit-dependency-bundles"/> + </bundle> + <bundle id="org.apache.commons.codec.source"> + <category name="JGit-dependency-bundles"/> + </bundle> + <bundle id="org.apache.commons.compress"> + <category name="JGit-dependency-bundles"/> + </bundle> + <bundle id="org.apache.commons.compress.source"> + <category name="JGit-dependency-bundles"/> + </bundle> + <bundle id="org.apache.commons.logging"> + <category name="JGit-dependency-bundles"/> + </bundle> + <bundle id="org.apache.commons.logging.source"> + <category name="JGit-dependency-bundles"/> + </bundle> + <bundle id="org.apache.httpcomponents.httpclient"> + <category name="JGit-dependency-bundles"/> + </bundle> + <bundle id="org.apache.httpcomponents.httpclient.source"> + <category name="JGit-dependency-bundles"/> + </bundle> + <bundle id="org.apache.httpcomponents.httpcore"> + <category name="JGit-dependency-bundles"/> + </bundle> + <bundle id="org.apache.httpcomponents.httpcore.source"> + <category name="JGit-dependency-bundles"/> + </bundle> + <bundle id="org.apache.log4j"> + <category name="JGit-dependency-bundles"/> + </bundle> + <bundle id="org.apache.log4j.source"> + <category name="JGit-dependency-bundles"/> + </bundle> + <bundle id="org.apache.sshd.osgi"> + <category name="JGit-dependency-bundles"/> + </bundle> + <bundle id="org.apache.sshd.osgi.source"> + <category name="JGit-dependency-bundles"/> + </bundle> + <bundle id="org.apache.sshd.sftp"> + <category name="JGit-dependency-bundles"/> + </bundle> + <bundle id="org.apache.sshd.sftp.source"> + <category name="JGit-dependency-bundles"/> + </bundle> + <bundle id="org.bouncycastle.bcpg"> + <category name="JGit-dependency-bundles"/> + </bundle> + <bundle id="org.bouncycastle.bcpg.source"> + <category name="JGit-dependency-bundles"/> + </bundle> + <bundle id="org.bouncycastle.bcpkix"> + <category name="JGit-dependency-bundles"/> + </bundle> + <bundle id="org.bouncycastle.bcpkix.source"> + <category name="JGit-dependency-bundles"/> + </bundle> + <bundle id="org.bouncycastle.bcprov"> + <category name="JGit-dependency-bundles"/> + </bundle> + <bundle id="org.bouncycastle.bcprov.source"> + <category name="JGit-dependency-bundles"/> + </bundle> + <bundle id="org.kohsuke.args4j"> + <category name="JGit-dependency-bundles"/> + </bundle> + <bundle id="org.kohsuke.args4j.source"> + <category name="JGit-dependency-bundles"/> + </bundle> + <bundle id="org.slf4j.api"> + <category name="JGit-dependency-bundles"/> + </bundle> + <bundle id="org.slf4j.api.source"> + <category name="JGit-dependency-bundles"/> + </bundle> + <bundle id="org.slf4j.binding.log4j12"> + <category name="JGit-dependency-bundles"/> + </bundle> + <bundle id="org.slf4j.binding.log4j12.source"> + <category name="JGit-dependency-bundles"/> + </bundle> + <bundle id="org.tukaani.xz"> + <category name="JGit-dependency-bundles"/> + </bundle> + <bundle id="org.tukaani.xz.source"> + <category name="JGit-dependency-bundles"/> + </bundle> <category-def name="JGit" label="Java implementation of Git"> <description> Java implementation of Git @@ -49,4 +181,5 @@ Java implementation of Git - additional bundles </description> </category-def> + <category-def name="JGit-dependency-bundles" label="JGit dependency bundles"/> </site> 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 4cd98445cf..2cab8eeab8 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 @@ -33,25 +33,4 @@ version="0.0.0" unpack="false"/> - <plugin - id="org.apache.sshd.osgi" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.apache.sshd.sftp" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="net.i2p.crypto.eddsa" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - </feature> diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml index c9a146d531..8e6b8bb73a 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml @@ -34,18 +34,4 @@ fragment="true" unpack="false"/> - <plugin - id="com.jcraft.jsch" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="com.jcraft.jzlib" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - </feature> |