Commit graph

6069 commits

Author SHA1 Message Date
Karsten Thoms
2184d4de50
Merge pull request #615 from eclipse/kth_issue1160
[eclipse/xtext#1160] Update copyright date range
2018-01-16 06:14:56 +01:00
Karsten Thoms
134c788006 [eclipse/xtext#1160] Update copyright date range
Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
2018-01-15 16:28:39 +01:00
Christian Dietrich
4519cb8ff3
Merge pull request #614 from eclipse/cd_issue517
[#517] Move More Code to JavaVersion
2018-01-15 16:07:42 +01:00
Christian Dietrich
09cb0c1a90 [#517] Move More Code to JavaVersion
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2018-01-15 15:50:07 +01:00
Karsten Thoms
28c9bf27fe [eclipse/xtext#1160] Fixed license name
Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
2018-01-15 11:44:29 +01:00
Christian Dietrich
94e99370a6
Merge pull request #607 from eclipse/cd_cd_issue605WithTests
[#605][J9][Wizard] Surefire UI Tests dont run
2018-01-11 12:23:59 +01:00
Karsten Thoms
1eb72658f9
Merge pull request #599 from ArneDeutsch/feature-145
[xtext-eclipse#145] Create new implementations in core.
2018-01-11 09:57:40 +01:00
Arne Deutsch
7b1bb9d188 [eclipse/xtext-eclipse#145] Create new implementations in core.
Move implementation from CopyQualifiedNameService and
DefaultCopyQualifiedNameService to xtext core plugin.

Rename CopyQualifiedNameService to ICopyQualifiedNameService.

Document the interface.

Move to public API package "org.eclipse.xtext.naming".

Change-Id: I3ffdbbcda641cc4f70396f4274e42934e4248278
Signed-off-by: Arne Deutsch <Arne.Deutsch@itemis.de>
2018-01-11 09:56:49 +01:00
Karsten Thoms
06743350b5
Merge pull request #603 from eclipse/bug529291
[529291] Replace @build@ token in about.mappings
2018-01-10 11:55:55 +01:00
Christian Dietrich
6339d10b54 Review Feedback
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2018-01-10 11:21:12 +01:00
Karsten Thoms
f498bf8e8f [529291] Replace @build@ token in about.mappings
Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
2018-01-10 10:21:15 +01:00
Christian Dietrich
5b3cc90ec6 [#605] Added Test for J9
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2018-01-09 19:29:26 +01:00
Christian Dietrich
e7290067f2 [#605][J9][Wizard] Surefire UI Tests dont run
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2018-01-09 17:58:01 +01:00
Karsten Thoms
19ae6c555c
Merge pull request #604 from eclipse/cd_issue602
[#602] [J9][Wizard] Use latest Oxygen Release in Target
2018-01-09 16:12:20 +01:00
Christian Dietrich
fd0a80a0cb [#602] [J9][Wizard] Use latest Oxygen Release in Target
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2018-01-09 15:59:42 +01:00
Karsten Thoms
64f18c82b0 [minor] Remove 'unspecified' version comment
Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
2018-01-08 13:45:30 +01:00
Sebastian Zarnekow
f257fe720b
Merge pull request #598 from eclipse/sz_bug529361
Bug 529361: Preserve forward backwards compatibility in edge cases
2018-01-04 10:41:00 +01:00
Sebastian Zarnekow
c3c736b566 Bug 529361: Preserve forward backwards compatibility in edge cases 2018-01-04 10:12:06 +01:00
Christian Dietrich
4419101282 fixed broken for loop
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2017-12-21 16:37:23 +01:00
Christian Dietrich
2771f6dee0
Merge pull request #581 from eclipse/cd_extras_issue211
[J9] consume jdt version in maven/gradle that does support Java 9
2017-12-21 15:22:47 +01:00
Sebastian Zarnekow
fe10480c63 Support 1.9 and 9 notation for the JavaVersion 2017-12-21 14:48:18 +01:00
Karsten Thoms
89bcbd0762
Merge pull request #595 from FStolte/issue463
[eclipse/xtext-eclipse#463] Fixed faulty editor binding
2017-12-21 11:50:53 +01:00
Florian Stolte
9751c004c1 [eclipse/xtext-eclipse#463] Fixed faulty editor binding
- for xbase languages, the language specific editor is now correctly
bound to XtextEditor instead of XbaseEditor

Signed-off-by: Florian Stolte <fstolte@itemis.de>
2017-12-21 11:05:31 +01:00
Christian Dietrich
30bf17d0e6 [J9] consume jdt version in maven/gradle that does support Java 9 https://github.com/eclipse/xtext-extras/issues/211
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2017-12-21 09:10:29 +01:00
Karsten Thoms
da0388a2a2
Merge pull request #594 from FStolte/issue1155
[eclipse/xtext#1155] Cleaned up javadoc to remove some warnings.
2017-12-19 13:32:24 +01:00
Florian Stolte
3a740a437e [eclipse/xtext#1155] Cleaned up javadoc to remove some warnings.
Signed-off-by: Florian Stolte <fstolte@itemis.de>
2017-12-19 12:04:05 +01:00
Karsten Thoms
b981118825 [eclipse/xtext#1152] Fixed Manifest format error
Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
2017-12-18 11:57:43 +01:00
Sebastian Zarnekow
5940623fac
Merge pull request #591 from eclipse/sz_regenerateAllLanguages
Regenerate all languages
2017-12-18 11:08:29 +01:00
Sebastian Zarnekow
a28d340bd9 Build against master 2017-12-18 11:02:40 +01:00
Karsten Thoms
d5e6578a6d
Merge pull request #588 from FStolte/issue1152
[eclipse/xtext#1152] Java 9 - Added Automatic-Module-Name header
2017-12-18 10:04:26 +01:00
Sebastian Zarnekow
1a50155b32
Merge pull request #590 from eclipse/sz_fixBackwardsCompatibility
Fixed backwards compatibility issue
2017-12-18 09:51:55 +01:00
Sebastian Zarnekow
bcaf864fac Fixed backwards compatibility issue 2017-12-15 13:52:53 +01:00
Sebastian Zarnekow
384d395c61 Build against the equivalent branch 2017-12-15 13:43:19 +01:00
Christian Dietrich
f0abce8ada
Merge pull request #587 from eclipse/cd_xtext_issue1153
Duplicate @Named ids in AbstractMultiLineCommentProvider
2017-12-15 13:24:06 +01:00
Florian Stolte
1bc930b5b6 [eclipse/xtext#1152] Java 9 - Added Automatic-Module-Name header
- added header to existing manifest files
- added header to manifest generation in xtext generator and wizard

Signed-off-by: Florian Stolte <fstolte@itemis.de>
2017-12-14 14:16:20 +01:00
Christian Dietrich
c1f78be257
Merge pull request #584 from FStolte/issue582
[#582] Updated version of xtext-gradle-plugin
2017-12-14 13:44:12 +01:00
Christian Dietrich
c3893bc200 Duplicate @Named ids in AbstractMultiLineCommentProvider https://github.com/eclipse/xtext/issues/1153
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2017-12-14 13:34:46 +01:00
Christian Dietrich
94a90a486c
Merge pull request #583 from FStolte/issue580
[#580] Updated maven assembly/war plugins to latest versions
2017-12-14 10:50:10 +01:00
Florian Stolte
bc1f236450 [#582] Updated version of xtext-gradle-plugin
- updated from 1.0.19 to 1.0.20
- updated the version in the gradle file
- updated the version used by the wizard
- updated the version in examples

Signed-off-by: Florian Stolte <fstolte@itemis.de>
2017-12-14 09:33:53 +01:00
Christian Dietrich
ea159e0958
Merge pull request #586 from eclipse/cd_wizAsm6
use asm 6
2017-12-13 22:26:13 +01:00
Christian Dietrich
2ec798bcb7 use asm 6
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2017-12-13 22:12:46 +01:00
Christian Dietrich
e62caad9f3
Merge pull request #577 from eclipse/cd_extras_issue208
increased maven/gradle asm version to 6.0
2017-12-13 21:21:05 +01:00
Florian Stolte
95225c9545 [#580] Updated maven assembly/war plugins to latest versions
- updated the wizard to use maven-assembly-plugin version 3.1.0
- updated the assembly descriptors to version 2.0.0
- updated the wizard to use maven-war-plugin version 3.2.0
- updated the tests to these versions, as well

Signed-off-by: Florian Stolte <fstolte@itemis.de>
2017-12-13 17:19:04 +01:00
Christian Dietrich
c7ab2c7b32
Merge pull request #578 from FStolte/issue570
[#570] Added error message for invalid override
2017-12-13 12:39:30 +01:00
Florian Stolte
6b9d505b07 [#570] Added error message for invalid override.
- rules with an @Override annotation in a grammar without super grammar
now correctly display an error

Signed-off-by: Florian Stolte <fstolte@itemis.de>
2017-12-13 12:23:06 +01:00
Christian Dietrich
58077a7022
Merge pull request #579 from FStolte/typo
Fixed a typo in XtextValidator
2017-12-13 11:00:05 +01:00
Florian Stolte
9d6f9434a1 Fixed a typo in XtextValidator.
Signed-off-by: Florian Stolte <fstolte@itemis.de>
2017-12-13 10:53:40 +01:00
Christian Dietrich
8411fcc8d7 increased maven/gradle asm version to 6.0 https://github.com/eclipse/xtext-extras/issues/208
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2017-12-13 09:00:48 +01:00
Christian Dietrich
5fc81ba327
Merge pull request #576 from eclipse/cd_rsf
made code of resource storage facade more consistent
2017-12-12 20:11:36 +01:00
Christian Dietrich
5b1d375c24
Merge pull request #575 from eclipse/cd_gradle44
update to gradle 4.4
2017-12-12 19:00:52 +01:00