Commit graph

6349 commits

Author SHA1 Message Date
Karsten Thoms
1aeabbae0b [eclipse/xtext#1241] Use ${project.version} variable instead of hard-coded version
Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
2018-07-13 01:39:29 +02:00
Karsten Thoms
62442aa5a9
Merge pull request #787 from eclipse/kth_issue1238
[#1238] Restrict org.antlr.runtime version to 3.2.0
2018-07-12 23:15:29 +02:00
Karsten Thoms
5e7abcabcd [#1238] Restrict org.antlr.runtime version to 3.2.0
Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
2018-07-12 14:52:50 +02:00
Christian Dietrich
c4579d918e
Merge pull request #786 from eclipse/cd_xtext_issue1168
[eclipse/xtext#1168] set minimal target to oxygen
2018-07-10 15:15:32 +02:00
Christian Dietrich
703ad3aafb [eclipse/xtext#1168] set minimal target to oxygen
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2018-07-10 11:31:38 +02:00
Arne Deutsch
748c4cea7a
Merge pull request #781 from eclipse/xtext-eclipse-729-wired-output-folders
[eclipse/xtext-eclipse#729] Adapt output folder layout.
2018-07-09 16:27:01 +02:00
Christian Dietrich
4646921269
Merge pull request #784 from eclipse/cd_moreJunit5Support
added support for junit 4 and junit 5 in testing api
2018-07-09 13:39:33 +02:00
Christian Dietrich
801ba1d5f7 [eclipse/xtext#1236]
added support for junit 4 and junit 5 in testing api

Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2018-07-09 07:28:15 +02:00
Sebastian Zarnekow
d25e6c7e30
Merge pull request #777 from eclipse/sz_issue474
[xtend#474] Allow to skip generation of validator ui contributions
2018-07-04 19:59:19 +02:00
Arne Deutsch
76a85f514b [eclipse/xtext-eclipse#729] Adapt output folder layout.
Investigated how previous Xtext versions handled the output folders and
what values m2e expects. Adapted output folders accordingly. "Maven ->
Update Project..." does not change the output folders any more.

Simplify the code to save some switch-case statements.

Signed-off-by: Arne Deutsch <Arne.Deutsch@itemis.de>
2018-07-04 16:04:53 +02:00
Christian Dietrich
f89c1e4e18
Merge pull request #780 from eclipse/cd_issue1231
[eclipse/xtext#1231] fixed jdt and platform versions
2018-07-03 19:24:32 +02:00
Christian Dietrich
0277b89235 [eclipse/xtext#1231] fixed jdt and platform versions
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2018-07-03 19:24:04 +02:00
Christian Dietrich
d43c5b15df
Merge pull request #779 from eclipse/cd_core_issue778
[474468][eclipse/xtext-core#778] Fix bogus validation in MaxLineWidthDocument
2018-06-28 07:06:29 +02:00
Christian Dietrich
58b683d085 [474468][eclipse/xtext-core#778] Fix bogus validation in MaxLineWidthDocument
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2018-06-27 20:32:06 +02:00
Sebastian Zarnekow
e228edfd44 [xtend#474] Allow to skip generation of validator ui contributions 2018-06-27 19:19:29 +02:00
Arne Deutsch
d3099cbede
Merge pull request #774 from eclipse/personal-data-to-build-files
Add contact data in parent pom and gradle files.
2018-06-27 09:32:25 +02:00
Arne Deutsch
c2b20283fb
Merge pull request #775 from eclipse/xtext-eclipse-677-test-source-folders
[eclipse/xtext-eclipse#677] Additional source folder support.
2018-06-27 09:09:53 +02:00
Arne Deutsch
d8ab5d2b4c Merge branch 'master' of git@github.com:eclipse/xtext-core.git into xtext-eclipse-677-test-source-folders 2018-06-25 11:52:25 +02:00
Arne Deutsch
99745c0af6 [eclipse/xtext-eclipse#677] Additional source folder support.
- Support output folders per source fodler
- Support test source folder

Signed-off-by: Arne Deutsch <Arne.Deutsch@itemis.de>
2018-06-25 11:48:04 +02:00
Arne Deutsch
c708bc89a2 Add contact data in parent pom and gradle files.
Signed-off-by: Arne Deutsch <Arne.Deutsch@itemis.de>
2018-06-25 10:59:38 +02:00
Christian Dietrich
7351821315
Merge pull request #770 from eclipse/cd_orbit-update
updated orbit to photon release
2018-06-25 08:57:20 +02:00
Lorenzo Bettini
955090ef36
Merge pull request #772 from eclipse/lb_mydata
Just updated my email and organization in developers.gradle
2018-06-22 11:38:59 +02:00
Lorenzo Bettini
8ba7a45b5a Just updated my email and organization in developers.gradle
Signed-off-by: Lorenzo Bettini <lorenzo.bettini@gmail.com>
2018-06-22 11:25:21 +02:00
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