diff options
author | Matthias Sohn <matthias.sohn@sap.com> | 2018-08-24 18:25:28 +0200 |
---|---|---|
committer | Matthias Sohn <matthias.sohn@sap.com> | 2018-08-25 07:55:55 +0200 |
commit | 6670ff16636f960b1e7c3ad9a1611c81727a974c (patch) | |
tree | 6a764f0f89143a26cd511a9d2e8626a052505713 /org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.8.target | |
parent | c415e93e8a476e62a71f46b25467c97820f0e38c (diff) | |
parent | db6c2c2aa58f574383b51b3802e6817ac4cf8963 (diff) | |
download | jgit-6670ff16636f960b1e7c3ad9a1611c81727a974c.tar.gz jgit-6670ff16636f960b1e7c3ad9a1611c81727a974c.zip |
Merge branch 'stable-4.10' into stable-4.11
* stable-4.10:
Ignore API warnings
Fix photon target platform to use photon version of org.eclipse.osgi
Update Photon orbit repository to R20180606145124
Suppress warning for trying to delete non-empty directory
Fix fetching with duplicate ref updates
Fetch(Process): should tolerate duplicate refspecs
FetchCommandTest: test add/update/delete fetch
Change-Id: I47671108574fcd10fe016a58e38c038af54a6748
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Diffstat (limited to 'org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.8.target')
-rw-r--r-- | org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.8.target | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.8.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.8.target index dddd0da81e..b84fc208f7 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.8.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-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="jgit-4.8" sequenceNumber="1520121050"> +<target name="jgit-4.8" sequenceNumber="1535176301"> <locations> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <unit id="org.eclipse.jetty.client" version="9.4.8.v20171121"/> @@ -33,16 +33,16 @@ <unit id="org.apache.commons.logging.source" version="1.1.1.v201101211721"/> <unit id="org.apache.httpcomponents.httpcore" version="4.4.6.v20170210-0925"/> <unit id="org.apache.httpcomponents.httpcore.source" version="4.4.6.v20170210-0925"/> - <unit id="org.apache.httpcomponents.httpclient" version="4.5.2.v20170210-0925"/> - <unit id="org.apache.httpcomponents.httpclient.source" version="4.5.2.v20170210-0925"/> + <unit id="org.apache.httpcomponents.httpclient" version="4.5.2.v20180410-1551"/> + <unit id="org.apache.httpcomponents.httpclient.source" version="4.5.2.v20180410-1551"/> <unit id="org.apache.log4j" version="1.2.15.v201012070815"/> <unit id="org.apache.log4j.source" version="1.2.15.v201012070815"/> <unit id="org.kohsuke.args4j" version="2.33.0.v20160323-2218"/> <unit id="org.kohsuke.args4j.source" version="2.33.0.v20160323-2218"/> - <unit id="org.hamcrest.core" version="1.3.0.v20180227-1814"/> - <unit id="org.hamcrest.core.source" version="1.3.0.v20180227-1814"/> - <unit id="org.hamcrest.library" version="1.3.0.v201505072020"/> - <unit id="org.hamcrest.library.source" version="1.3.0.v201505072020"/> + <unit id="org.hamcrest.core" version="1.3.0.v20180420-1519"/> + <unit id="org.hamcrest.core.source" version="1.3.0.v20180420-1519"/> + <unit id="org.hamcrest.library" version="1.3.0.v20180524-2246"/> + <unit id="org.hamcrest.library.source" version="1.3.0.v20180524-2246"/> <unit id="javaewah" version="1.1.6.v20160919-1400"/> <unit id="javaewah.source" version="1.1.6.v20160919-1400"/> <unit id="org.objenesis" version="1.0.0.v201505121915"/> @@ -65,11 +65,11 @@ <unit id="org.slf4j.impl.log4j12.source" version="1.7.2.v20131105-2200"/> <unit id="com.jcraft.jzlib" version="1.1.1.v201205102305"/> <unit id="com.jcraft.jzlib.source" version="1.1.1.v201205102305"/> - <repository location="http://download.eclipse.org/tools/orbit/downloads/drops/S20180302171354/repository"/> + <repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20180606145124/repository"/> </location> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <unit id="org.eclipse.osgi" version="0.0.0"/> - <repository location="http://download.eclipse.org/releases/oxygen/"/> + <repository location="http://download.eclipse.org/releases/photon/"/> </location> </locations> </target> |