Commit graph

6326 commits

Author SHA1 Message Date
Christian Dietrich
88f04cf991 updated orbit to photon release
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2018-06-19 11:50:26 +02:00
Christian Dietrich
54ec08b19e added missing since annotations
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2018-06-15 19:15:40 +02:00
Christian Dietrich
4023a25c84
Merge pull request #768 from tivervac/dontPrintSourceCodeOnError
Allow to not print source code in LSP
2018-06-15 19:12:22 +02:00
Titouan Vervack
f103de5392 Allow to not print source code in LSP
Signed-off-by: Titouan Vervack <titouan.vervack@sigasi.com>
2018-06-15 11:27:38 +02:00
Christian Dietrich
1cb6bb09ac
Merge pull request #767 from tivervac/defaultDocumentHighlightServiceTypos
Fixed typos in DefaultDocumentHighlightService
2018-06-13 16:02:37 +02:00
Titouan Vervack
69a7473245 Fixed typos in DefaultDocumentHighlightService
Signed-off-by: Titouan Vervack <titouan.vervack@sigasi.com>
2018-06-13 13:47:31 +02:00
Christian Dietrich
5cf1e02e2b
Merge pull request #766 from tivervac/readOnlyApiCall
Added an extra api call that omits the default result
2018-06-12 07:59:44 +02:00
Titouan Vervack
528de63088 Added an extra api call that omits the default result
Signed-off-by: Titouan Vervack <titouan.vervack@sigasi.com>
2018-06-11 11:08:40 +02:00
Christian Dietrich
69e9f07aca removed unused imports
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2018-06-08 09:47:35 +02:00
Christian Dietrich
19aab86a2c
Merge pull request #765 from tivervac/potentialNullPointerAccessError
Reduced "potential null pointer access" errors
2018-06-08 09:15:34 +02:00
Titouan Vervack
63c4439ad4 Reduced "potential null pointer access" errors
Signed-off-by: Titouan Vervack <titouan.vervack@sigasi.com>
2018-06-05 18:11:37 +02:00
Christian Dietrich
3a4cf05981
Merge pull request #761 from arshad1990/Issue#758
Switched to Tycho 1.2.0 in the wizard project. Fixed test cases.
2018-06-05 17:57:55 +02:00
Christian Dietrich
567b5a7b81
Merge pull request #764 from tivervac/taskCompileErrors
Fixed compile errors for #763
2018-06-05 17:56:35 +02:00
Titouan Vervack
a61a7b3a19 Fixed compile errors for #763
Signed-off-by: Titouan Vervack <titouan.vervack@sigasi.com>
2018-06-05 17:54:53 +02:00
Christian Dietrich
a3d6588be6
Merge pull request #763 from tivervac/taskEquals
Added equals to Task and TaskTag making TaskAssert useless
2018-06-05 16:20:41 +02:00
Karsten Thoms
0c0cdb4a2b
Merge pull request #762 from eclipse/kth_issue715
[#715] Remove test_getCurrent
2018-06-05 11:04:46 +02:00
Christian Dietrich
68eb09dbae
Merge pull request #760 from eclipse/cd_xtext_issue1225
[eclipse/xtext#1225] Update to Tycho 1.2.0
2018-06-05 10:45:50 +02:00
Arshad
75835e5295 Switched to Tycho 1.2.0 in the wizard project. Fixed test cases.
Signed-off-by: Arshad <a.adavani@itemis.com>
2018-06-05 10:42:54 +02:00
Christian Dietrich
e21455c1a9 [eclipse/xtext#1225] Update to Tycho 1.2.0
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2018-06-05 09:38:29 +02:00
Titouan Vervack
08d59c6e4d Added equals to Task and TaskTag making TaskAssert useless
Signed-off-by: Titouan Vervack <titouan.vervack@sigasi.com>
2018-06-04 18:46:03 +02:00
Karsten Thoms
aaa184f1da [#715] Remove test_getCurrent
This test case was removed since it failed for non-snapshot versions
within a Gradle build. This is typically the case when doing a release.
It was decided to remove this test case.

Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
2018-05-29 09:05:52 +02:00
Karsten Thoms
24ce555b09
Merge pull request #751 from ArneDeutsch/xtext-core-506
[#506] Removed reflection call.
2018-05-28 12:56:52 +02:00
Arne Deutsch
8e93dbbda4 [#506] Removed reflection call.
Do not inherit and modify (by reflection) the original
java.util.jar.Manifest but instead C&P and modify the code. Adapt
ManifestMergerTest by importing the new classes.

Signed-off-by: Arne Deutsch <Arne.Deutsch@itemis.de>
2018-05-28 10:54:21 +02:00
Christian Dietrich
daec1c4d0b fixed bootstrap version
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2018-05-27 16:54:59 +02:00
Karsten Thoms
7d9c791352
Merge pull request #755 from eclipse/cd_xtext_issue1178
[eclipse/xtext#1178]  bootstrap against 2.14
2018-05-26 15:04:24 +02:00
Christian Dietrich
bfe26052dd [eclipse/xtext#1178] bootstrap against 2.14
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2018-05-26 13:36:19 +02:00
Christian Dietrich
2ebb77e48c fixed p2 build
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2018-05-26 10:58:51 +02:00
Karsten Thoms
d627e9aad4
Merge pull request #754 from eclipse/develop_2.15.0
[release] Increment version to 2.15.0
2018-05-26 10:37:56 +02:00
Christian Dietrich
adc0f04377 rev. Jenkinsfile changes
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2018-05-25 14:33:26 +02:00
Christian Dietrich
7b55d9b0d0
Merge pull request #752 from tivervac/taskTagsDuplicateKeys
Fixed duplicate key insertion with task tags
2018-05-24 21:25:50 +02:00
Christian Dietrich
5a33c955fc
Merge pull request #753 from tivervac/EObjectDiagnosticImplTypo
Fixed typo in EObjectDiagnosticImpl
2018-05-24 21:20:38 +02:00
Titouan Vervack
b3717cc478 Fixed typo in EObjectDiagnosticImpl
Signed-off-by: Titouan Vervack <titouan.vervack@sigasi.com>
2018-05-24 18:41:15 +02:00
Titouan Vervack
e91be2aee3 Fixed duplicate key insertion with task tags
Signed-off-by: Titouan Vervack <titouan.vervack@sigasi.com>
2018-05-24 18:29:38 +02:00
Karsten Thoms
9bc7e9b54e Set upstreamBranch
Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
2018-05-24 11:32:47 +02:00
Karsten Thoms
7dcc65bb2e [release] Increment version to 2.15.0
Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
2018-05-22 23:53:44 +02:00
Karsten Thoms
bd2d5e5a00
Merge pull request #743 from eclipse/kth_issue741
Manage tycho-surefire-plugin in parent pom
2018-05-22 18:24:21 +02:00
Jan Koehnlein
8a3a7a89b8
Merge pull request #747 from eclipse/jk/serializer
[serializer] relax API
2018-05-22 15:08:26 +02:00
Jan Koehnlein
42dda5e9d3 [serializer] relax API
Signed-off-by: Jan Koehnlein <jan.koehnlein@typefox.io>
2018-05-22 14:45:09 +02:00
Karsten Thoms
0d89588412 [#741] Update test expectation
Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
2018-05-18 09:42:21 +02:00
Karsten Thoms
1b8d74a8a7
Merge pull request #744 from eclipse/kth_issue743
[#743] Relax lower bound for JUnit 5 bundles to 5.0.0
2018-05-17 22:24:04 +02:00
Karsten Thoms
c8d00ded18 [#743] Relax lower bound for JUnit 5 bundles to 5.0.0
Makes bundles work on Oxygen.

Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
2018-05-17 22:19:38 +02:00
Karsten Thoms
e526dd4c33 [#741] Manage tycho-surefire-plugin in parent pom
- Configure version and property 'failIfNoTests' in parent pom and
removing from test project poms
- Makes tycho-surefire-plugin configuration in runtime test project
obsolete.
- Also suppress plugin management for maven-surefire-plugin when in a
Tycho build.

Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
2018-05-17 21:41:14 +02:00
Moritz Eysholdt
42be5d030d fixes #739: Potential NPE during ChangeSerialization
Signed-off-by: Moritz Eysholdt <moritz.eysholdt@typefox.io>
2018-05-17 16:39:37 +02:00
Karsten Thoms
cfc0900159 [#666] Fix test regression
Suppress additional empty line

Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
2018-05-17 14:22:20 +02:00
Karsten Thoms
241c1a86ec
Merge pull request #737 from eclipse/kth_junit5_gradle
[#666] Extended Gradle build for JUnit 5 test execution
2018-05-17 11:06:37 +02:00
Karsten Thoms
7c3f028825 [#666] Extended Gradle build for JUnit 5 test execution
Adds a dependency on org.junit.jupiter:junit-jupiter-engine:5.1.0 with
scope testRuntime.
Enum Scope extended by TESTRUNTIME literal.
Inline additional gradle code in runtime project for inlined tests.

Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
2018-05-17 10:32:09 +02:00
Karsten Thoms
dda480aab6
Merge pull request #738 from eclipse/kth_junit5_plain_maven2
[#666] Manage surefire plugin for JUnit 5
2018-05-17 00:25:53 +02:00
Karsten Thoms
97a9671fc3 [#666] Manage surefire plugin for JUnit 5
Moved surefire configuration from build config of the test project to
pluginManagement of the parent pom. Previous did not work with Maven
source layout, where no separate test module is created.

Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
2018-05-17 00:23:17 +02:00
Karsten Thoms
7eeb6457d8
Merge pull request #736 from eclipse/kth_junit5_plain_maven
[#666] Configure surefire plugin for plain Maven
2018-05-16 23:31:12 +02:00
Karsten Thoms
d6e33968e0 [#666] Configure surefire plugin for plain Maven
The surefire plugin needs additional dependencies to execute JUnit 5
tests.

Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
2018-05-16 23:20:31 +02:00