Commit graph

4919 commits

Author SHA1 Message Date
Dennis Huebner
9c32a97299 [releng] Back to 2.9.1-SNAPSHOT 2015-12-18 15:33:26 +01:00
Dennis Huebner
6311203ece [releng] Prepare for 2.9.1 release 2015-12-18 13:38:38 +01:00
Dennis Huebner
c7b370956b [gradle] Updated xtext gradle plugin version
Signed-off-by: Dennis Huebner <dennis.huebner@gmail.com>
2015-12-18 13:25:31 +01:00
Sebastian Zarnekow
48d7f9d1d0 [grammar][linking] Fixed bogusly installed proxy with fragments 2015-12-17 13:21:43 +01:00
Dennis Huebner
530b86007c Merge pull request #881 from eclipse/mwe2.8.3
[releng] MWE2 dependency Update
2015-12-17 09:34:13 +01:00
Dennis Huebner
45f66b7462 Merge pull request #880 from eclipse/so_new_gradle_plugin
Use latest Xtext Gradle plugin
2015-12-17 09:33:50 +01:00
Dennis Huebner
82f63c4fb2 [tests] Changed line endings for the .bat file 2015-12-16 15:45:00 +01:00
Dennis Huebner
3ac20c2787 [tests] Updated wizard test expectations 2015-12-16 15:37:11 +01:00
Dennis Huebner
f3342679ee [releng] MWE2 dependency Update 2015-12-16 15:30:08 +01:00
Moritz Eysholdt
2ff921b01e Merge pull request #875 from eclipse/me/gcp_testcase
[serializer] added another test case for grammar constraint provider
2015-12-16 14:59:04 +01:00
Stefan Oehme
6e5bfd8a77 Use latest Xtext Gradle plugin 2015-12-16 13:44:10 +01:00
Sven Efftinge
a77bb1096e Merge pull request #876 from eclipse/se/fix_hasResourceDescription
Fixed ResourceDescritpionsBasedContainer to give a proper answer to hasResourceDescription(URI)
2015-12-16 11:50:27 +01:00
Sven Efftinge
1ac9870b80 [483088] allow nested types in implementationClass in ecore models. 2015-12-16 11:44:21 +01:00
Sven Efftinge
55ffa8a62a Fixed ResourceDescritpionsBasedContainer to give a proper answer to hasResourceDescription(URI) 2015-12-15 16:12:13 +01:00
Moritz Eysholdt
6ccaab1a3f [serializer] added another test case for grammar constraint provider
Signed-off-by: Moritz Eysholdt <moritz.eysholdt@itemis.de>
2015-12-15 16:07:11 +01:00
Miro Spönemann
d90edd1402 Merge branch 'maintenance'
* maintenance:
  [documentation] Updated TOC generator, updated Eclipse help content with current website documentation
  Homeautomation example - minor changes
  [docs] updated special language descriptions to match the new code generator
  [examples] migrated homeautomation example to 2.9
  [generator] split parser when synthetic terminal rules are used
  Docs for parameters of Check
  [484315] allow to suppressing generation of example test
  [484201] don't try to load synthetic classes with Java source language
  [478394] Handle possible exception when traversing deleted VirtualFile trees.
  [484176] Don’t raise unnecessary issue on thrown errors
  [web] Small improvements: - Simplified sorting code in ContentAssistService - Handled case of empty classes array in hover HTML - Added check for invalid paths in ResourceBaseProviderImpl

Signed-off-by: Miro Spönemann <miro.spoenemann@itemis.de>

# Conflicts:
#	examples/org.eclipse.xtext.xtext.ui.examples/contents/org.eclipse.xtext.example.homeautomation.tests/META-INF/MANIFEST.MF
#	examples/org.eclipse.xtext.xtext.ui.examples/contents/org.eclipse.xtext.example.homeautomation.ui/META-INF/MANIFEST.MF
#	examples/org.eclipse.xtext.xtext.ui.examples/contents/org.eclipse.xtext.example.homeautomation/META-INF/MANIFEST.MF
2015-12-15 14:16:41 +01:00
Sven Efftinge
54309f3655 [generator] split parser when synthetic terminal rules are used 2015-12-15 09:36:27 +01:00
Sven Efftinge
ef7329ab22 [484315] allow to suppressing generation of example test 2015-12-14 15:48:11 +01:00
Dennis Huebner
e5e45719d6 Merge pull request #866 from eclipse/maintenance
[idea] Fixed test failures
2015-12-11 15:18:29 +01:00
Sven Efftinge
bb4c77a5ec Merge pull request #863 from eclipse/se/bug483088
[483088] Fixes for ecore-based wizard
2015-12-11 12:59:05 +01:00
Dennis Huebner
db0e1aebfe [idea] Fixed test failures 2015-12-11 11:24:35 +01:00
Dennis Huebner
38b3b8a991 Merge pull request #864 from eclipse/maintenance
Merge PR maintenance -> master
2015-12-11 10:48:34 +01:00
Dennis Huebner
40da842fcd [api] Mark method as @noreference - internal use only 2015-12-10 17:04:38 +01:00
Sven Efftinge
18ee7c0b98 [483088] Fixes for ecore-based wizard 2015-12-10 16:56:09 +01:00
Sven Efftinge
9ba99bb611 [484018] Removed unnecessary dependencies to org.eclipse.emf.codegen 2015-12-10 14:31:47 +01:00
Sven Efftinge
87c8621841 Merge pull request #859 from eclipse/se/bug483667
[483667] Wizard, pom.xml - exec plugin needs compile scope of project
2015-12-10 14:04:56 +01:00
Sven Efftinge
9159ca9047 [483667] Wizard, pom.xml - exec plugin needs compile scope of project 2015-12-10 14:02:45 +01:00
Dennis Huebner
8c783fb419 [wizard] Use Mwe 2.8.2 when generating build scripts 2015-12-10 14:00:42 +01:00
Sebastian Zarnekow
23a321b017 Merge pull request #858 from eclipse/maintenance
Merge fixes from maintenance into master
2015-12-10 09:05:23 +01:00
Dennis Huebner
093d4853b0 [releng] Exclude resource/ from source jar: take 2 2015-12-09 14:24:10 +01:00
Dennis Huebner
1171323d70 [releng] Exclude o.e.x.x.wizard/resources from the source jar 2015-12-09 13:37:20 +01:00
Sven Efftinge
78a7482218 Merge pull request #856 from eclipse/se/bug83872
[83872] generate TokenSource stubs to src
2015-12-08 14:14:14 +01:00
Sven Efftinge
f81238f48d [83872] generate TokenSource stubs to src 2015-12-08 12:11:35 +01:00
Stefan Oehme
398900aa4d [483886] incremental builder should honor index only flag 2015-12-08 12:07:09 +01:00
Sebastian Zarnekow
493a94515e Merge pull request #850 from eclipse/maintenance
Merge fixes from maintenance into master
2015-12-07 10:48:32 +01:00
Sebastian Zarnekow
8baadd102e Minor: Fixed comment 2015-12-07 10:21:38 +01:00
Sven Efftinge
6f24304505 [483675] fix for NPE 2015-12-04 15:35:22 +01:00
Dennis Huebner
34ec1bf6e6 Merge branch 'maintenance' 2015-12-02 17:04:03 +01:00
Dennis Huebner
0817ec079d [api] Adjusted API filter
Signed-off-by: Dennis Huebner <dennis.huebner@itemis.de>
2015-12-02 16:19:21 +01:00
Dennis Huebner
11fc0660ac [releng] Changed version to 2.9.1. Deploy to nightly/maintenance 2015-12-02 15:34:19 +01:00
Dennis Huebner
f1bda7da3a [api] Removed unused api filter warning
Signed-off-by: Dennis Huebner <dennis.huebner@itemis.de>
2015-12-02 14:47:37 +01:00
Dennis Huebner
e27181a4bc [releng] Increase version to 2.10
Signed-off-by: Dennis Huebner <dennis.huebner@itemis.de>
2015-12-02 13:05:59 +01:00
Stefan Oehme
5acccde3ae Merge pull request #773 from eclipse/simplify_gradle_build
Simplify gradle build
2015-12-01 16:17:02 +01:00
Dennis Huebner
5a3336d1ef [releng] Switch back to SNAPSHOT. Added category to idea plugins
Signed-off-by: Dennis Huebner <dennis.huebner@itemis.de>
2015-12-01 15:15:05 +01:00
Stefan Oehme
af43cebfc0 Merge remote-tracking branch 'origin/master' into simplify_gradle_build
Conflicts:
	maven/org.eclipse.xtext.xtext/pom.xml
	plugins/org.eclipse.xtext.xtext.generator/pom.xml
2015-12-01 13:33:25 +01:00
Dennis Huebner
6836236fe4 [releng] Prepare for 2.9.0 release
Signed-off-by: Dennis Huebner <dennis.huebner@itemis.de>
2015-12-01 11:17:57 +01:00
Sven Efftinge
0ca0d763cd Merge pull request #840 from eclipse/se/bug483162
[483162] removed type name guard
2015-12-01 10:49:01 +01:00
Sven Efftinge
11296fb8c8 [483162] removed type name guard 2015-12-01 10:46:23 +01:00
Dennis Huebner
07a3625eb3 Bug 483338 - Different versions of equinox.common dependency
Signed-off-by: Dennis Huebner <dennis.huebner@itemis.de>
2015-12-01 10:02:08 +01:00
Moritz Eysholdt
78891a651d Merge pull request #837 from eclipse/me/bug482033
[serializer#482033] NPE at SerializationContext.forChild(...)
2015-11-30 22:23:46 +01:00