Commit graph

133 commits

Author SHA1 Message Date
Christian Dietrich
93e3e31da5
Merge pull request #855 from eclipse/cd_xtext216
updated versions to 2.16.0
2018-09-05 07:03:24 +02:00
Christian Dietrich
2f0f093fb5 updated versions to 2.16.0
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2018-09-03 11:11:51 +02:00
Christian Dietrich
eaa542d6c1 [#793] update to lsp4j 0.5.0 final
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2018-09-02 10:30:23 +02:00
Karsten Thoms
f76bebc29d [#849] Make CliProjectsCreator executable
- Added args4j as CLI framework
- Added CliProjectsCreatorMain and test
- Create WizardConfiguration from options
- Added args4j handlers for enum option
- Manage args4j version

Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
2018-08-30 17:33:10 +02:00
Holger Schill
416db12fe1
Merge pull request #815 from kittaakos/GH-812
GH-812: Implemented the semantic highlighting for the Xtext LS.
2018-08-29 17:23:09 +02:00
Christian Dietrich
1639c0a2b0
Merge pull request #839 from eclipse/cd_issue1266_asm62
[eclipse/xtext#1266] Update to ASM 6.2
2018-08-29 14:38:30 +02:00
Christian Dietrich
a2250de55e [eclipse/xtext#1266] Update to ASM 6.2
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2018-08-29 14:37:03 +02:00
Akos Kitta
136e66dd47 GH-812: Implemented the semantic highlighting for the Xtext LS.
Closes #812.

Signed-off-by: Akos Kitta <kittaakos@typefox.io>
2018-08-29 12:42:06 +02:00
Holger Schill
bdd7dc1af6 Broken Combination Maven Tycho + Gradle + JUnit5 #841 2018-08-28 17:13:29 +02:00
Christian Dietrich
c9cdfcc4fb
Merge pull request #830 from eclipse/cd_issue829
[eclipse/xtext-core#829] Update to Gradle Wrapper 4.9
2018-08-27 16:12:04 +02:00
Christian Dietrich
b11354c355 explicitely define type of getSourceFolders
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2018-08-24 22:32:56 +02:00
Christian Dietrich
78417bcd38
Merge pull request #833 from eclipse/cd_issue824
[eclipse/xtext-core#824] Don't generate xpand dependency if not needed
2018-08-24 10:05:54 +02:00
Christian Dietrich
a41d7aee07 [eclipse/xtext-core#824] Don't generate xpand dependency if not needed
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2018-08-24 09:49:40 +02:00
Tamas Miklossy
fcf4a71612 Fixing typo: 'corresponsing' -> 'corresponding'
Signed-off-by: Tamas Miklossy <miklossy@itemis.de>
2018-08-24 08:39:43 +02:00
Christian Dietrich
38f976c91f [eclipse/xtext-core#829] Update to Gradle Wrapper 4.9
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2018-08-23 21:43:50 +02:00
Holger Schill
417b8e6d7f
Merge pull request #826 from eclipse/hs/issue825
ConfigurableIssueCodesProvider generated #825
2018-08-23 11:47:56 +02:00
Holger Schill
f379c56a25 ConfigurableIssueCodesProvider generated even when no grammar annotations are used #825 2018-08-22 16:39:23 +02:00
Christian Dietrich
5a04ecff5c [eclipse/xtext-core#822] use 2018-09 in target platform
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2018-08-21 21:57:11 +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
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
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
69e9f07aca removed unused imports
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2018-06-08 09:47:35 +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
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
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
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
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
Karsten Thoms
0bef495014 [#666] JUnit 5 dependencies
- Use Tycho 1.2 for JUnit 5
- Removed adding of org.junit as imported package - test projects are
already created with a bundle dependency

Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
2018-05-16 21:44:37 +02:00
Karsten Thoms
64253740db [#732] Add Orbit to target definition
Conditionally add JUnit 5 libs

Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
2018-05-08 23:30:31 +02:00
Christian Dietrich
73dbf094e0 use tycho 1.2.0 in the wizard
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2018-05-08 11:36:30 +02:00
Christian Dietrich
aaf4037856 [eclipse/xtext-web#53] updated to a newer jetty version that works better with asm 6.1
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2018-05-04 16:14:54 +02:00
Christian Dietrich
205bafd544 [eclipse/xtext#1177] Switched Target Platform to Photon for Tycho Builds with Java 10
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2018-05-04 08:50:42 +02:00
Christian Dietrich
4e99055a9d [#714] consume lsp4j 0.4.0 final
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2018-04-26 08:36:01 +02:00
Christian Dietrich
f66c0128af use lsp4j 0.4.0-SNAPSHOT as workaround for #705
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2018-04-20 16:18:13 +02:00
Christian Dietrich
85f3a05f3d
Merge pull request #703 from eclipse/java-10-integration
Java 10 integration
2018-04-20 11:33:24 +02:00
Christian Dietrich
b097f9d159 set tycho version to 1.2.0-SNAPSHOT & added mechanism to handle snapshot and non snapshot versions in the wizard
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2018-04-18 19:35:40 +02:00
Karsten Thoms
875e62c901 [#666] JUnit 5 Support
- implemented review comments
- adding JUnitVersion.DEFAULT
- added missing copyright headers for JUnitFragment and Junit4Fragment2
- changed lower bound for org.junit.jupiter.api.extension to 5.1.0

Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
2018-04-17 12:49:57 +02:00
Christian Dietrich
f0ccaed480 updated asm to asm 6.1.1
updated jdt to Oxygen 3a
adjusted pipelines

Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2018-04-17 12:27:49 +02:00
Karsten Thoms
3999e54b89 [#666] Extend Xtext Generator for JUnit 5
- Added enum JUnitVersion
- Create JUnitFragment from Junit4Fragment2
  - provide setter for JUnit version
  - Deprecated Junit4Fragment2 and extend from JUnitFragment
  - changed StandardLanguage#junitSupport type to JUnitFragment
- Extended JUnitFragment to produce JUnit version specific code
- Added junitVersion property to WizardConfiguration
- generate JUnit 5 specific configuration to workflow when JUnit 5 is
configured
- TestProjectDescriptor: Configure JUnit 5 dependencies

Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
2018-04-16 13:27:43 +02:00
Arne Deutsch
179757480d [eclipse/xtext-core#686] Update new project wizard.
Remove IDEA from the new project wizard. IDE plugins are not well
maintained any more, no need to bother new users with not working stuff.

Set version of xtext-gradle-plugin to 1.0.21.

Update test projects according to removed IDEA support.

Signed-off-by: Arne Deutsch <Arne.Deutsch@itemis.de>
2018-04-09 15:19:01 +02:00
Titouan Vervack
127fa42d17 Removed redundant modifiers
Signed-off-by: Titouan Vervack <titouan.vervack@sigasi.com>
2018-03-28 17:41:41 +02:00
Christian Dietrich
2d8c00c5cc Updated to Gradle Wrapper Version 4.6
https://github.com/eclipse/xtext/issues/1177

Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2018-03-09 17:31:43 +01:00
Christian Dietrich
58113d0f41 Regenerated against lastest xbase-lib
https://github.com/eclipse/xtext/issues/1174

Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2018-02-26 15:07:09 +01:00