diff options
| author | Matthias Sohn <matthias.sohn@sap.com> | 2018-08-25 08:56:45 +0200 |
|---|---|---|
| committer | Matthias Sohn <matthias.sohn@sap.com> | 2018-08-25 08:56:45 +0200 |
| commit | cde0e313819c0209eb692820fb32f85e5b034e16 (patch) | |
| tree | d2501639233921231dd3ce0aab960676120b8808 /org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit | |
| parent | 78d7d9916cb84142f0ca03fbeb3a176c4223255e (diff) | |
| parent | 2dfc9ed6d21567a04a8ec3f98ab21ed04fc8c531 (diff) | |
| download | jgit-cde0e313819c0209eb692820fb32f85e5b034e16.tar.gz jgit-cde0e313819c0209eb692820fb32f85e5b034e16.zip | |
Merge branch 'stable-4.11' into stable-5.0
* stable-4.11:
Silence API warning for new ObjectIdSerializer introduced in 4.11.1
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: I2497f99b7d0686a0e0f773c39c8725e813ce9d4a
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Diffstat (limited to 'org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit')
| -rw-r--r-- | org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/R20180606145124-Photon.tpd | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/R20180606145124-Photon.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/R20180606145124-Photon.tpd index 808b9d6944..ecec41d8c6 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/R20180606145124-Photon.tpd +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/R20180606145124-Photon.tpd @@ -12,6 +12,8 @@ location "http://download.eclipse.org/tools/orbit/downloads/drops/R2018060614512 org.apache.commons.logging.source [1.1.1.v201101211721,1.1.1.v201101211721] org.apache.httpcomponents.httpcore [4.4.6.v20170210-0925,4.4.6.v20170210-0925] org.apache.httpcomponents.httpcore.source [4.4.6.v20170210-0925,4.4.6.v20170210-0925] + org.apache.httpcomponents.httpclient [4.5.2.v20180410-1551,4.5.2.v20180410-1551] + org.apache.httpcomponents.httpclient.source [4.5.2.v20180410-1551,4.5.2.v20180410-1551] org.apache.log4j [1.2.15.v201012070815,1.2.15.v201012070815] org.apache.log4j.source [1.2.15.v201012070815,1.2.15.v201012070815] org.kohsuke.args4j [2.33.0.v20160323-2218,2.33.0.v20160323-2218] @@ -44,9 +46,3 @@ location "http://download.eclipse.org/tools/orbit/downloads/drops/R2018060614512 com.jcraft.jzlib [1.1.1.v201205102305,1.1.1.v201205102305] com.jcraft.jzlib.source [1.1.1.v201205102305,1.1.1.v201205102305] } - -location "http://download.eclipse.org/tools/orbit/downloads/drops/R20170919201930/repository/" { - // platform uses this outdated version of httpclient in Photon - org.apache.httpcomponents.httpclient [4.5.2.v20170210-0925,4.5.2.v20170210-0925] - org.apache.httpcomponents.httpclient.source [4.5.2.v20170210-0925,4.5.2.v20170210-0925] -}
\ No newline at end of file |