diff options
author | Matthias Sohn | 2018-06-02 20:27:14 +0000 |
---|---|---|
committer | Matthias Sohn | 2018-06-12 07:51:12 +0000 |
commit | f87f558795305c1209d9268ccf72bbe3c2ef9f03 (patch) | |
tree | f6bba3a17baacc19eb611b96f0d8f678fce95e1a /org.eclipse.egit.target | |
parent | a14bc0d9bd7475a2711cddeb6d4016efdfb9e9ae (diff) | |
download | egit-f87f558795305c1209d9268ccf72bbe3c2ef9f03.tar.gz egit-f87f558795305c1209d9268ccf72bbe3c2ef9f03.tar.xz egit-f87f558795305c1209d9268ccf72bbe3c2ef9f03.zip |
Fix target platform
This fixes the BundleExceptions which were logged when starting EGit in
debugger for the Photon target platform. There is one remaining warning
by org.eclipse.mylyn.trac which wants an older version of gson that
egit.
Bug: 535747
Change-Id: Ia3d4105b6bff0cd0ecc8ef0538c541174f92e528
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Diffstat (limited to 'org.eclipse.egit.target')
-rw-r--r-- | org.eclipse.egit.target/egit-4.8.target | 10 | ||||
-rw-r--r-- | org.eclipse.egit.target/orbit/R20180606145124-Photon.tpd | 3 | ||||
-rw-r--r-- | org.eclipse.egit.target/releasetrain/4.8-photon.tpd | 5 |
3 files changed, 15 insertions, 3 deletions
diff --git a/org.eclipse.egit.target/egit-4.8.target b/org.eclipse.egit.target/egit-4.8.target index 4c003f389a..5fad039b0a 100644 --- a/org.eclipse.egit.target/egit-4.8.target +++ b/org.eclipse.egit.target/egit-4.8.target @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <?pde?> <!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform --> -<target name="egit-4.8" sequenceNumber="1528373917"> +<target name="egit-4.8" sequenceNumber="1528663951"> <locations> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <unit id="org.eclipse.jetty.client" version="9.4.8.v20171121"/> @@ -35,8 +35,11 @@ <unit id="com.jcraft.jsch.source" version="0.1.54.v20170116-1932"/> <unit id="javaewah" version="1.1.6.v20160919-1400"/> <unit id="javaewah.source" version="1.1.6.v20160919-1400"/> + <unit id="javax.activation" version="1.1.0.v201211130549"/> <unit id="javax.servlet" version="3.1.0.v201410161800"/> <unit id="javax.servlet.source" version="3.1.0.v201410161800"/> + <unit id="javax.xml.bind" version="2.2.0.v201105210648"/> + <unit id="javax.xml.stream" version="1.0.1.v201004272200"/> <unit id="org.apache.ant" version="1.9.6.v201510161327"/> <unit id="org.apache.ant.source" version="1.9.6.v201510161327"/> <unit id="org.apache.commons.codec" version="1.9.0.v20170208-1614"/> @@ -82,11 +85,14 @@ </location> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <unit id="org.eclipse.sdk.ide" version="0.0.0"/> + <unit id="org.eclipse.ecf.console.feature.feature.group" version="0.0.0"/> + <unit id="org.eclipse.ecf.core.feature.feature.group" version="0.0.0"/> + <unit id="org.eclipse.ecf.filetransfer.feature.feature.group" version="0.0.0"/> <unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/> + <unit id="org.eclipse.equinox.concurrent" version="0.0.0"/> <unit id="org.eclipse.mylyn.commons.sdk.feature.group" version="0.0.0"/> <unit id="org.eclipse.mylyn.ide_feature.feature.group" version="0.0.0"/> <unit id="org.eclipse.mylyn.team_feature.feature.group" version="0.0.0"/> - <unit id="org.eclipse.mylyn.context.sdk.feature.group" version="0.0.0"/> <unit id="org.eclipse.mylyn_feature.feature.group" version="0.0.0"/> <unit id="org.eclipse.mylyn.context_feature.feature.group" version="0.0.0"/> <unit id="org.eclipse.mylyn.sdk_feature.feature.group" version="0.0.0"/> diff --git a/org.eclipse.egit.target/orbit/R20180606145124-Photon.tpd b/org.eclipse.egit.target/orbit/R20180606145124-Photon.tpd index b412f5d5b8..81a97e9636 100644 --- a/org.eclipse.egit.target/orbit/R20180606145124-Photon.tpd +++ b/org.eclipse.egit.target/orbit/R20180606145124-Photon.tpd @@ -8,8 +8,11 @@ location "http://download.eclipse.org/tools/orbit/downloads/drops/R2018060614512 com.jcraft.jsch.source [0.1.54.v20170116-1932,0.1.54.v20170116-1932] javaewah [1.1.6.v20160919-1400,1.1.6.v20160919-1400] javaewah.source [1.1.6.v20160919-1400,1.1.6.v20160919-1400] + javax.activation [1.1.0.v201211130549,1.1.0.v201211130549] javax.servlet [3.1.0.v201410161800,3.1.0.v201410161800] javax.servlet.source [3.1.0.v201410161800,3.1.0.v201410161800] + javax.xml.bind [2.2.0.v201105210648,2.2.0.v201105210648] + javax.xml.stream [1.0.1.v201004272200,1.0.1.v201004272200] org.apache.ant [1.9.6.v201510161327,1.9.6.v201510161327] org.apache.ant.source [1.9.6.v201510161327,1.9.6.v201510161327] org.apache.commons.codec [1.9.0.v20170208-1614,1.9.0.v20170208-1614] diff --git a/org.eclipse.egit.target/releasetrain/4.8-photon.tpd b/org.eclipse.egit.target/releasetrain/4.8-photon.tpd index f9f85807f0..4ca351fbf7 100644 --- a/org.eclipse.egit.target/releasetrain/4.8-photon.tpd +++ b/org.eclipse.egit.target/releasetrain/4.8-photon.tpd @@ -2,11 +2,14 @@ target "4.8-photon" with source configurePhase location "http://download.eclipse.org/releases/photon/" { org.eclipse.sdk.ide lazy + org.eclipse.ecf.console.feature.feature.group lazy + org.eclipse.ecf.core.feature.feature.group lazy + org.eclipse.ecf.filetransfer.feature.feature.group lazy org.eclipse.emf.sdk.feature.group lazy + org.eclipse.equinox.concurrent lazy org.eclipse.mylyn.commons.sdk.feature.group lazy org.eclipse.mylyn.ide_feature.feature.group lazy org.eclipse.mylyn.team_feature.feature.group lazy - org.eclipse.mylyn.context.sdk.feature.group lazy org.eclipse.mylyn_feature.feature.group lazy org.eclipse.mylyn.context_feature.feature.group lazy org.eclipse.mylyn.sdk_feature.feature.group lazy |