Commit Graph

41 Commits

Author SHA1 Message Date
Matthias Sohn e8323e3932 Update Orbit 2018-09 to R20180905201904
Change-Id: I15e79024b89e45a5ba60c7aba909d899733bcb2f
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2018-09-10 00:12:09 +02:00
Matthias Sohn c9e4359c7c Update Orbit to S20180829155938 for 2018-09 RC1
Change-Id: I48d5a2e06e2833c9745cb71c53600da3ed5f8501
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2018-09-01 08:22:52 +02:00
Matthias Sohn e0b24c62e8 Update Orbit to S20180820175350 for 2018-09 M3
Change-Id: Ifecbe9a7f36e65a191f007f0216633e9038ebff9
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2018-08-28 21:02:41 +02:00
Matthias Sohn 851f239951 Merge branch 'stable-5.0'
* stable-5.0:
  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: I9e7fa37b100a7ea3cbe4104802d36c6f38df9e08
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2018-08-25 16:14:22 +02:00
Matthias Sohn cde0e31381 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>
2018-08-25 08:56:45 +02:00
Matthias Sohn 6670ff1663 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>
2018-08-25 07:55:55 +02:00
Matthias Sohn db6c2c2aa5 Merge branch 'stable-4.9' into stable-4.10
* stable-4.9:
  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: I2a83c059b7014c2a9e6267c963422c7785b23f17
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2018-08-24 17:39:07 +02:00
Matthias Sohn c0c2dea8b0 Update Photon orbit repository to R20180606145124
The S-repository doesn't exist anymore and we should have updated to the
final Photon orbit repository already.

Change-Id: I6d1757833be4abd3643677d6e7814363533e88b2
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2018-08-23 11:29:15 +02:00
Matthias Sohn fb327145f0 Update org.apache.commons.codec and org.apache.commons.logging
Update
- org.apache.commons.codec to 1.10.0.v20180409-1845
- org.apache.commons.logging to 1.2.0.v20180409-1502

According to [1] this is required for the update of httpcore and
httpclient we did in 63a3e415.

[1] https://dev.eclipse.org/mhonarc/lists/cross-project-issues-dev/msg15823.html

CQ: 16962
CQ: 16963
Change-Id: I1d40ffc90d17fe2c29ad704013535f20af4b231b
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2018-08-18 11:29:35 +02:00
Matthias Sohn 63a3e415e7 Update apache httpcore and httpclient
Update
- org.apache.httpcomponents.httpclient to 4.5.5.v20180409-1525
- org.apache.httpcomponents.httpcore to 4.4.9.v20180409-1525

CQ: 16959
CQ: 16960
Change-Id: I11f2979e1c39fe26421693a7c694e51c471326a0
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2018-08-17 00:26:00 +02:00
Matthias Sohn 2d276161a2 Downgrade Apache httpclient to 4.5.2.v20170210-0925
Eclipse platform uses this version from the Oxygen Orbit release for
Photon. In order to avoid that we end up with two slightly different
versions in the same p2 repository of the simultaneous release we
downgrade temporarily from the version 4.5.2.v20180410-1551 in the
Photon Orbit release.

See
https://dev.eclipse.org/mhonarc/lists/cross-project-issues-dev/msg15659.html

Change-Id: Id46a840aa4b1010af7fe311498f17f1f2e5b81e0
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2018-06-13 13:18:12 +02:00
Matthias Sohn 5f46661cae Update to latest Photon Orbit R20180606145124
also add missing bundle org.hamcrest

Change-Id: I88ad7769b8fda491fe3641ddaf0964ca55ffc0f6
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2018-06-07 14:45:12 +02:00
Matthias Sohn bbf7ca3eda Update target platforms to Orbit R20180531190352-Photon
Use the final Photon Orbit release

Change-Id: Ie07eb3dedb5ccb6a2a7b0ad2c90593a07fdd240e
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2018-06-01 14:18:29 +02:00
Matthias Sohn 9b414ffd3c Update orbit to S20180302171354 (photon) and R20180206163158 (oxygen)
Change-Id: I5b5e59581bfa00bb16e3b8e0af6e154ad6583bb9
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2018-03-04 00:53:19 +01:00
David Pursehouse f3bb0e268c Upgrade gson to version 2.8.2
CQ: 15286
CQ: 15287 (Orbit)
Change-Id: I43312d5276b64d871f7fa253a43a090f9b163724
Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2018-01-20 01:17:29 +01:00
David Pursehouse 13ba592fff Upgrade commons-compress to 1.15
Also update xz to 1.6 as this is the version commons-compress 1.15
wants. Since xz 1.6 is an optional dependency for commons-compress we
need to add a non-optional dependency to xz for
org.eclipse.jgit.pgm.test since one of the tests explicitly requires xz.

Related change adding commons-compress to Orbit:
https://git.eclipse.org/r/#/c/115366/

CQ: 15356
CQ: 15360
Change-Id: I0d61c71bc541cc30464a0fff93775b079dd3ba88
Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2018-01-19 23:43:43 +01:00
Matthias Sohn cdc88247b9 Add com.jcraft.jzlib 1.1.1
com.jcraft.jsch requires com.jcraft.jzlib to provide optional zlib
packet compression support. Add this library so that jgit can handle
packet compression.

CQ: 15292
Bug: 529129
Change-Id: I0297bd0488753547a5f5d47dbf0db508a79dd265
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2018-01-04 13:53:29 -05:00
Matthias Sohn c9b4903ae3 Updpate oxygen orbit to R20170919201930 and remove old orbit repos
Change-Id: I2bf09cc3b08ebc762390e2892b966b11027e2e89
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2017-12-13 01:08:24 +01:00
Matthias Sohn e1fb47bd55 Update Apache httpclient to 4.5.2 and httpcore to 4.4.6
CQ: 15051
CQ: 15052
Change-Id: I532cd73253601ce1d2926850af2519aae6744a9c
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2017-12-13 01:08:23 +01:00
Matthias Sohn a2ec6ccf0a Add photon target platform jgit-4.8.target
Change-Id: I87f52f512db4c89fa4e3e550ff97fdec843b8469
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2017-10-05 17:58:02 -04:00
Matthias Sohn 0b75d0f0f1 Add org.apache.commons.codec 1.9.0 to target platform
This is needed to run tests in org.eclipse.jgit.http.test from Eclipse.
The change 7ac1bfc8 which added this dependency to
org.eclipse.jgit.http.test was already merged.

Restrict dependency to org.apache.commons.codec to the
version range [1.6.0,2.0.0).

CQ: 14048
Change-Id: I461a5f6bfc114757061d68992f9bc7ab38622328
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2017-09-01 11:03:18 +09:00
Matthias Sohn 3af57b52a3 Update args4j to 2.33
CQ: 11068
Change-Id: I7d52cddacff05477f646fda5f7b9f2de844922f6
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
2017-08-30 03:07:35 +02:00
Matthias Sohn 5bfeec4fdb Update Orbit to the Oxygen version R20170516192513
Change-Id: I13575c77540149d383747a34754ac338ed60fb52
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2017-05-30 15:26:31 +02:00
Matthias Sohn 3df4e37276 Update orbit to S20170306214312 (Oxygen M6)
Change-Id: I44d2483c045c126e01751fed9365d4889a30ab2e
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2017-03-22 22:20:49 +01:00
Matthias Sohn efbecb9764 Update Orbit to S20170120205402 and com.jcraft.jsch to 0.1.54
CQ: 12553
Change-Id: Ie72b48d00f363e3dc05b9733018a6ddca32c3e6e
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2017-01-23 20:29:43 +01:00
Dave Borowitz 5bb434e01f Update JavaEWAH to 1.1.6
Use Oxygen M3 Orbit repository which provides the bundles built using
the new orbit-recipe based build.

CQ: 11658
Change-Id: I7f3dcc966732b32830c75d5daa55383bd028d182
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2016-11-17 00:26:44 +01:00
Matthias Sohn a418c2eb4d Update Neon orbit repository to final release R20160520211859
Change-Id: I7c439ab7679472217426453bd0a7c443ebd4b009
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2016-06-10 12:20:24 +02:00
Matthias Sohn bf15a72ea0 Update Orbit repository to S20160518051658 for Neon RC2
Change-Id: If1bc2001108091770bccee7fa59b0e7f5e3974d7
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2016-05-19 00:55:24 +02:00
Matthias Sohn e8705a6e27 Prepare Neon target platform
also use the Neon target platform as the default target platform.

Neon Eclipse platform requires BREE 8 so we have to use Java 8 at least
for the JGit packaging build (for the compiler settings we still stick
to source and target 1.7 since we want to still support Java 7)
otherwise unpacking platform pack200 archives will fail since they are
built using Java 8 and hence cannot be unpacked using Java 7's
unpack200.

Update org.junit from 4.11 to 4.11 and org.apache.ant from from 1.9.2 to
1.9.6 since the older versions are not available in Neon orbit version

Ignore a couple of tests in ResourceUtilTest which now fail [1] since
bug 476585 was fixed in Neon M6.

CQ: 10694
CQ: 11308
Change-Id: I1a99a3ac2148693e21c57df5aeb848035b52b97b
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2016-05-02 22:46:51 +02:00
Matthias Sohn e1b7e4eec7 Update Mars orbit repository to R20160221192158
This version fixes signing of Apache httplclient.

Change-Id: I81d7a643233386442bd31ee602669d2c88b68576
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2016-02-26 22:58:06 +01:00
Matthias Sohn 8bb1b5a7ba Add Neon target platform
Change-Id: I24cceef84a9351b84ca46635a3898de113f1046c
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2016-02-18 23:43:20 +01:00
Matthias Sohn 377616aca7 Add com.google.gson 2.2.4.v201311231704 to target platform
We will use gson to implement the LFS REST API.

CQ: 9966
Change-Id: I7feb6b2b8f7b736888370aad94e4c436ae6014bb
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2016-02-04 17:49:42 +01:00
Matthias Sohn 3332998e59 Update build to final R20150821153341 Orbit repository for Mars.1
Change-Id: I32d4c21f7cdd0c1a24f797012f98daa9a7f48acf
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-09-04 01:05:51 +02:00
Matthias Sohn 510c865bad Update org.apache.httpcomponents
- update org.apache.httpcomponents.httpcore to 4.3.3
- update org.apache.httpcomponents.httpclient to 4.3.6, 4.3.5 and later
  are reported to fix vulnerability CVE-2014-3577

CQ: 9220
CQ: 9221
Bug: 470523
Change-Id: I024448c941e81f7c1dc1cc2394329df90e9b3048
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-09-04 01:02:45 +02:00
Matthias Sohn 8bad6ef584 Update com.jcraft.jsch to 0.1.53
Update target platform to Orbit M20150818205559 for Mars in order to
update com.jcraft.jsch to 0.1.53. Also update pom.xml to use Mars target
platform profile by default.

CQ: 10045
Bug: 463580
Change-Id: I1bf151fbee7b00c7bd38cf1236c9bad50e3c64bd
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-08-19 16:43:34 +02:00
Matthias Sohn 174c8c5d39 Update 4.5 target platform to use final Mars Orbit repository
Change-Id: Ie8ff09e6b054e5fae0786557b8fe831eb9e82dd2
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-06-01 16:07:52 +02:00
Matthias Sohn 39a29fba50 Update Mars target platforms to use Mars RC2 orbit
Change-Id: Idda321d5026329ec194d53ad635973465bcccd49
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-05-25 23:53:39 +02:00
Matthias Sohn 3bc4401010 Update javax.servlet to 3.1
Change-Id: Ifad154ed2f52f0102d297ac7fd4943ff1f309b9e
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-05-10 23:36:49 +02:00
Matthias Sohn a8743df19c Add log4j and slf4j-log4j bridge to jgit feature
CQ: 9207
CQ: 9241
Change-Id: Ic06a06da0a74f8fa494c0753cbe9ed2356c21ab3
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-02-17 01:06:45 +01:00
Matthias Sohn c18694e0d1 Use slf4j to log instead of printing to System.err
CQ: 9206
Bug: 458445
Change-Id: Ic68fb7dbe0fb46bf30f157db45bf18d8f3a704c0
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-02-17 01:06:17 +01:00
Matthias Sohn af4bde1ed2 Use Target Platform Definition DSL to generate target platforms
The "Target Platform Definition DSL and Generator" [1] heavily
simplifies maintenance of target platforms. It allows to modularize
target platform definitions which eliminates code duplication. The
.target files understood by P2 and Tycho are generated from .tpd files
which are written in the target platform definition DSL.

In order to edit .tpd files and generate .target files install the
"Target Platform Definition DSL and Generator" 2.0 or later [2]  (Note:
on Kepler you also need to add [3] to get Xtext 2.5 which is not
available by default on Kepler). This tools is needed only if you need
to change the Target Platform definition files (*.targetplatform and
*.tpd) and re-generate the *.target files. In normal development you do
not need this and can simply use the generated *.target themselves.

In addition
- update Orbit repository for 4.5 to Mars M5
- use latest released Orbit p2 repository for platform version Luna
  and earlier

[1] https://github.com/mbarbero/fr.obeo.releng.targetplatform
[2] http://mbarbero.github.io/fr.obeo.releng.targetplatform/p2/latest/
[3] http://download.eclipse.org/modeling/tmf/xtext/updates/releases/

Change-Id: Ia701972785c3e88aba66a7f15a2b3cf638727eea
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-02-17 00:12:01 +01:00