sigmasternchen/xtext-core
1
0
Fork 0
mirror of https://github.com/sigmasternchen/xtext-core synced 2025-03-15 16:28:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
7734 commits 41 branches 98 tags 41 MiB
Commit graph

326 commits

Author SHA1 Message Date
Christian Dietrich
9b38d565e0 [eclipse/xtext-core#1059] updated to lsp4j 0.7.0 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2019-03-05 20:09:10 +01:00
Christian Dietrich
f8708cefd5 [eclipse/xtext#1414] prepared master for version 2.18.0 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2019-03-05 16:47:14 +01:00
Christian Dietrich
09b17ee033 [#1054] fixed broken target platform for junit 5 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2019-02-27 19:24:03 +01:00
Christian Dietrich
2e9195b994
Merge pull request #1025 from eclipse/cd_gradle521 
[eclipse/xtext#1393] update to gradle 5.2.1
 2019-02-14 19:18:20 +01:00
Christian Dietrich
1587bcb542 [eclipse/xtext#1283] switched to MWE 2.10 in wizard 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2019-02-11 09:17:58 +01:00
Sebastian Zarnekow
09c3ceac85 Make bin/main also the default output directory to avoid buildship confusion 2019-02-10 14:55:03 +01:00
Christian Dietrich
cef06991c2 [eclipse/xtext#1393][Wizard] update to gradle 5.2.1 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2019-02-09 11:47:11 +01:00
Karsten Thoms
98a17c35da [eclipse/xtext#1274] Updated .classpath by Gradle 
Changes done by Buildship 3.0.1.v20181217-1554

Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
 2019-02-07 17:03:45 +01:00
Arne Deutsch
cad1c87268 itemis/xtext-reference-projects#36: Fix version constraint. 
Signed-off-by: Arne Deutsch <Arne.Deutsch@itemis.de>
 2019-02-04 09:54:19 +01:00
Arne Deutsch
1a888f1923 Revert "itemis/xtext-reference-projects#36: Fix version constraint." 
This reverts commit 311068fe82.
 2019-02-04 09:52:20 +01:00
Arne Deutsch
311068fe82 itemis/xtext-reference-projects#36: Fix version constraint. 
Signed-off-by: Arne Deutsch <Arne.Deutsch@itemis.de>
 2019-02-04 09:48:32 +01:00
Christian Dietrich
63e99b9e11 [eclipse/xtext#1283] update to MWE 2.10 M2 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2019-01-30 07:07:46 +01:00
Karsten Thoms
3017efb3f6 [#1009] Remove managed dependencies from build descriptors 
- removed managed versions of
  - org.eclipse.emf.mwe2.launch
  - xtext-antlr-generator
  - org.junit:junit
  - org.junit.jupiter.api
  - xtext-dev-bom
- updated test expectation
- GradleBuildFile: Use single quoted dependencies for managed
dependencies (where version is null)
- added xtext-antlr-generator as optional dependency to Maven runtime
module. This avoids download of antlr-generator-3.2.0-patch.jar from
itemis server.
- XtextVersion: pin xtext-antlr-version to 2.1.1. Still needed for Tycho
based build for configuration of exec-maven-plugin.

Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
 2019-01-29 15:33:09 +01:00
Christian Dietrich
e654364f73 [eclipse/xtext#1182] added support for java 11 as target 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2019-01-22 21:55:07 +01:00
Christian Dietrich
d649ead3c8 fixed guava deprecations 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2019-01-20 12:20:42 +01:00
Christian Dietrich
a9ffe46cd6
Merge pull request #987 from eclipse/cd_xtext_issue1372 
[eclipse/xtext#1372] Use 2019-03 in target platforms
 2019-01-18 17:16:26 +01:00
Holger Schill
771eb06607 Update WebFragment, Wizard and tests to use latest versions of web frameworks 2019-01-17 11:03:38 +01:00
Karsten Thoms
2ad19ab6cd
Merge pull request #994 from eclipse/issue1249_native_bom 
Native Gradle BOM & drop of maven-deployment.gradle
 2019-01-16 15:10:30 +01:00
Karsten Thoms
501571bd3c [eclipse/xtext-core#991, eclipse/xtext#1249] Update test expectation 
Native usage of Maven BOM
Drop generation of maven-deployment.gradle

Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
 2019-01-16 15:09:18 +01:00
Karsten Thoms
c5687f17bb [eclipse/xtext-core#991] Dropped generation of maven-deployment.gradle 
Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
 2019-01-16 13:59:12 +01:00
Christian Dietrich
8a2d7a12bb made args4j non optional 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2019-01-16 12:24:21 +01:00
Karsten Thoms
da04cb6c4b [eclipse/xtext#1249] Native Gradle BOM management 
Remove usage of io.spring.gradle:dependency-management-plugin
Using Gradle standard BOM dependency management

Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
 2019-01-16 12:05:33 +01:00
Christian Dietrich
393b63928a [eclipse/xtext#1372] Use 2019-03 in target platforms 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2019-01-13 10:54:04 +01:00
Sebastian Zarnekow
ecc7ae0bc3
[eclipse/xtext#1249] use bom for version management (#988) 2019-01-11 16:41:50 +01:00
Christian Dietrich
f21f2dcf63
Merge pull request #972 from eclipse/cd_gradle50 
[eclipse/xtext#1350] Update to Gradle 5
 2018-12-07 09:23:31 +01:00
Christian Dietrich
daeb98019b [eclipse/xtext#1350][Wizard] update to gradle 5.0 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2018-12-06 15:43:08 +01:00
Christian Dietrich
658fb9683d switched to orbit 2019-03 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2018-12-06 15:11:28 +01:00
Christian Dietrich
1b4f6c78a4 change version 2.16.0 -> 2.17.0 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2018-12-05 09:48:47 +01:00
Christian Dietrich
61144af965 switched to tycho 1.3 in wizard 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2018-11-30 12:00:43 +01:00
Christian Dietrich
3aca7cb1fa [#893] switch to lsp4j 0.6.0 final 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2018-11-29 11:04:39 +01:00
Christian Dietrich
90b39ffb81 [#867] switched to junit 5.3.1 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2018-11-13 15:07:52 +01:00
Christian Dietrich
85385aa97a [#893] build against LSP4J 0.6.0-SNAPSHOT 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2018-11-10 12:16:05 +01:00
Christian Dietrich
de22eee3d9
Merge pull request #934 from eclipse/cdTestJava11 
[eclipse/xtext#1182] fixed tests with java 11 agains java 8 target
 2018-11-06 19:41:28 +01:00
Christian Dietrich
5c8901019c [#935] workaround for surefirebug on latest ubuntu/debian/mint 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2018-11-06 15:35:22 +01:00
Christian Dietrich
0e88e15442 [eclipse/xtext#1182] fixed tests with java 11 agains java 8 target 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2018-11-06 13:41:19 +01:00
Christian Dietrich
8cb8ec4af2 [eclipse/xtext#1318] fixed broken mvn clean plugin configuration 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2018-11-05 11:46:51 +01:00
Christian Dietrich
9515372b39 [eclipse/xtext#1325] switch to ASM 7 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2018-10-31 12:51:25 +01:00
Christian Dietrich
89a71531b8 [eclipse/xtext-core#903] build against 2018-12 in wizard 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2018-10-26 10:21:54 +02:00
Christian Dietrich
b5bc979dfc [eclipse/xtext#1280] updated version of shadow jar plugin to prepare move to gradle 5.0 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2018-10-11 19:55:47 +02:00
Christian Dietrich
7b7161e608 updated to orbit 2018-12-M1 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2018-10-11 11:27:34 +02:00
Christian Dietrich
11572cb5a8 [eclipse/xtext#1300][Wizard] Update to Gradle Wrapper 4.10.2 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2018-10-06 17:53:26 +02:00
Karsten Thoms
2b7e2b4609 [eclipse/xtext#1272] Compile with Xtend 2.15 
Order of static & final modifiers changed
(eclipse/xtext-xtend#554)

Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
 2018-09-21 17:45:41 +02:00
Christian Dietrich
1648a02a24 [eclipse/xtext#1297] update to gradle 4.10 in wizard 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2018-09-11 11:33:14 +02:00
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
Christian Dietrich
7ab31042c8 maintained x-friends https://github.com/eclipse/xtext/issues/1173 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2018-02-23 15:57:53 +01:00
Christian Dietrich
f66e355058 [#596] updated tycho version to 1.1.0 to support java 9 in tycho builds as well 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2018-01-30 16:13:54 +01:00
Karsten Thoms
984aedd25d [#623] Define tycho-surefire-plugin args by profiles 
The tycho-surefire-plugin is managed in the parent pom.xml and
configures argLine by a set of properties. The properties are declared
empty and will be redfined by profiles or overriding by system
properties.
Profiles 'macos' and 'jdk9-or-newer' are declared. Profile 'macos' will
add the required '-XstartOnFirstThread' arg and 'jdk9-or-newer' defines
the '--add-modules=ALL-SYSTEM' setting.

Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
 2018-01-30 10:36:14 +01:00
Karsten Thoms
8d0268e386
Merge pull request #619 from eclipse/kth_issue1160 
[eclipse/xtext#1160] Update copyright date range
 2018-01-16 11:00:31 +01:00
Lorenzo Bettini
1514fd8f43
Merge pull request #612 from eclipse/lb/generated-maven-pom 
Lb/generated maven pom
 2018-01-16 09:52:00 +01:00
Karsten Thoms
90cef27ab4 [eclipse/xtext#1160] Update copyright date range 
Recompiled Xtend files

Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
 2018-01-16 09:11:22 +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
Lorenzo Bettini
4207887921 avoid duplicate dirs in maven-clean-plugin 
Signed-off-by: Lorenzo Bettini <lorenzo.bettini@gmail.com>
 2018-01-15 11:49:03 +01:00
Christian Dietrich
6339d10b54 Review Feedback 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2018-01-10 11:21:12 +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
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
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
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
Christian Dietrich
2ec798bcb7 use asm 6 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2017-12-13 22:12:46 +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
8518cfd546 update to gradle 4.4 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2017-12-11 21:23:17 +01:00
Christian Dietrich
9b28ee1960 dont exclude required xtextbin and tokens files from fat jars #533 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2017-11-08 22:11:50 +01:00
Christian Dietrich
4960af9c0a set version to 2.14 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2017-10-27 09:03:34 +02:00
Karsten Thoms
c7b439923d [#512] Maven AppAssembler - Reduce length of classpath 
On windows the generated classpath in start scripts might become too
long. This can be avoided by additional configuration of the
appassembler-maven-plugin plugin:
- added option repositoryLayout=flat
- added option useWildcardClassPath=true

Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
 2017-10-19 14:31:17 +02:00
Karsten Thoms
5b7f5ecf90 [525746] Set Xbase/Xtend lib lower version constraint 
Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
 2017-10-09 21:39:12 +02:00
Karsten Thoms
1ecb623d5f [525746] Set lower bound for org.eclipse.xtext.xbase.lib 
Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
 2017-10-09 12:29:55 +02:00
Karsten Thoms
3512bacf62 [#355] Update repository URLs 
- MWE 2.9.1
- Oxygen.1

Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
 2017-09-28 11:03:57 +02:00
Karsten Thoms
715bcb249b [eclipse/xtext-eclipse#299] Added support for Language Server Jar 
The IDE project's build can be extended to create an executable Language
Server. The Language Server can be configured to be built either as a
distribution with seperate jars or as a fat jar.
Due to a limitation of the maven-shade-plugin in a Maven/Tycho
environment the build must be tweaked a bit to materialize dependencies
with the maven-dependencies-plugin and attached for inclusion with the
addjars-maven-plugin.

Extended the test suite for the different configurations with language
server support:
- plain Maven
- Maven/Tycho
- Gradle

Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
 2017-08-03 17:31:40 +02:00
Karsten Thoms
ba4bd8afea [eclipse/xtext-eclipse#299] Added support for Language Server Jar 
The IDE project's build can be extended to create an executable Language
Server. The Language Server can be configured to be built either as a
distribution with seperate jars or as a fat jar.
Due to a limitation of the maven-shade-plugin in a Maven/Tycho
environment the build must be tweaked a bit to materialize dependencies
with the maven-dependencies-plugin and attached for inclusion with the
addjars-maven-plugin.

Extended the test suite for the different configurations with language
server support:
- plain Maven
- Maven/Tycho
- Gradle

Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
 2017-08-03 14:33:21 +02:00
Karsten Thoms
4a5f5e5e15 [eclipse/xtext-eclipse#299] Added support for Language Server Jar 
The IDE project's build can be extended to create an executable Language
Server. The Language Server can be configured to be built either as a
distribution with seperate jars or as a fat jar.
Due to a limitation of the maven-shade-plugin in a Maven/Tycho
environment the build must be tweaked a bit to materialize dependencies
with the maven-dependencies-plugin and attached for inclusion with the
addjars-maven-plugin.

Extended the test suite for the different configurations with language
server support:
- plain Maven
- Maven/Tycho
- Gradle

Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
 2017-07-31 10:05:33 +02:00
Karsten Thoms
f46a269fdd gradleprojectbuilder added by Buildship project import 
Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
 2017-07-01 23:09:36 +02:00
Christian Dietrich
197ad484d7 updated target platform to oxygen. fixes https://github.com/eclipse/xtext-eclipse/issues/242 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2017-06-29 12:55:55 +02:00
Christian Dietrich
1466ed1675 use gradle 3.5 in new project wizard 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2017-06-09 09:08:19 +02:00
Christian Dietrich
7168c3a175 Fixed problem with the initial build after project creation in maven 
tycho
https://github.com/eclipse/xtext-eclipse/issues/272

Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2017-05-29 14:06:58 +02:00
Miro Spönemann
a75bac8287 Increased version number to 2.13.0-SNAPSHOT 2017-05-24 13:41:16 +02:00
Miro Spönemann
f60ead2a56 Remvoed Gradle wrapper from source bundle 2017-05-18 08:54:05 +02:00
Christian Dietrich
a08820b6af update to tycho 1.0.0 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2017-03-27 13:34:32 +02:00
Christian Dietrich
a061aa6fb1 Merge remote-tracking branch 'origin/maintenance_2.11' 2017-02-27 15:57:13 +01:00
Christian Dietrich
fcce289084 [Wizard] Include .xtext file in jar created by gradle #284 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2017-02-22 20:16:08 +01:00
Christian Dietrich
db782ad5bd [Wizard] Use Current Gradle Version in Wizard. #222 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2017-02-15 13:22:22 +01:00
Christian Dietrich
a31ea419d2 Fixed Broken Launch Config. Resolves #273 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2017-02-06 09:11:01 +01:00
Miro Spönemann
eaa0a66288 [build] Increased version number to 2.11.1-SNAPSHOT 2017-02-01 11:20:39 +01:00
Miro Spönemann
0bc4eb7975 Merge branch 'release_2.11.0' 2017-01-31 13:16:13 +01:00
Moritz Eysholdt
8cbddaa4d8 fixed #265: Create pom.xml that installs Xtend Debug Info 
Signed-off-by: Moritz Eysholdt <moritz.eysholdt@typefox.io>
 2017-01-28 15:14:07 +01:00
Miro Spönemann
ba911b4790 Lifted version number to 2.12.0-SNAPSHOT 2017-01-18 11:47:03 +01:00
Lorenzo Bettini
98c0aa4c94 244: .xtext.junit4 .xbase.junit added to ui.tests by the project wizard 
Task-Url: https://github.com/eclipse/xtext-core/issues/244
Signed-off-by: Lorenzo Bettini <lorenzo.bettini@gmail.com>
 2017-01-16 11:08:39 +01:00
Miro Spönemann
0515d22685 Refreshed projects with Buildship 2.0 2017-01-12 10:32:06 +01:00
Lorenzo Bettini
9eb9ad3345 479196: get antlr-generator version using a method 
Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=479196
Signed-off-by: Lorenzo Bettini <lorenzo.bettini@gmail.com>
 2017-01-11 15:24:46 +01:00
Lorenzo Bettini
8fca65f7ee 479196: added xtext-antlr-generator also in the build.gradle 
Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=479196
Signed-off-by: Lorenzo Bettini <lorenzo.bettini@gmail.com>
 2017-01-11 15:22:16 +01:00
Lorenzo Bettini
7d2675ba40 479196: AntlrToolFacade always downloads antlr-generator in Maven build 
Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=479196
Signed-off-by: Lorenzo Bettini <lorenzo.bettini@gmail.com>
 2017-01-11 14:11:56 +01:00
Karsten Thoms
c11fc9bb46 Change by Xtend compiler update 
Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
 2017-01-04 13:14:13 +01:00
Miro Spönemann
0e312a85c8 Fixed #215: Wrong version dependency to org.eclipse.emf.mwe2.launch generated by wizard 2017-01-03 16:52:52 +01:00
Karsten Thoms
56f1d1079e [492072] Regenerated Xtend code 
Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
 2017-01-02 14:33:55 +01:00
Karsten Thoms
55b7531d74 Merge pull request #210 from eclipse/kth_bug492072 
[492072] Minimized usage of local variables
 2016-12-22 14:20:40 +01:00
Christian Schneider
290b698f95 [xtext.testing + xtext.wizard] fix/improvement of build config of test projects in 'TestProjectDescriptor' 
* consolidated version of 'org.junit' with our reference in 'gradle/versions.gradle' (currently 4.12)
* added dependency to 'junit:junit:4.12' with scope 'testCompile' to templates of 'pom.xml' + 'build.gradle'

Signed-off-by: Christian Schneider <christian.schneider@typefox.io>
 2016-12-22 10:44:42 +01:00
Karsten Thoms
c9b7bf5af2 [492072] Minimized usage of local variables 
The Xtend compiler was optimized to minimize the usage of synthetic variables for member feature calls and right-hand assignments

Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
 2016-12-22 00:54:25 +01:00
Christian Schneider
8846f34734 [xtext.wizard] added 'org.eclipse.xtext.common.types' to dependencies of MWE executions in 'RuntimeProjectDescriptor's build file templates. 
Signed-off-by: Christian Schneider <christian.schneider@typefox.io>
 2016-12-20 17:48:09 +01:00
Miro Spönemann
7bceda03da Switched test project dependency created by wizard from xbase.junit to xbase.testing 2016-12-20 10:31:18 +01:00
Karsten Thoms
f2b5cdfe39 [507077] Do not emit empty concatenation 
Changes to generated Xtend code due to compiler optimization

Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
 2016-12-19 15:47:59 +01:00
Karsten Thoms
396f8e3ce3 [eclipse/xtext#1089] Replace (not)equal operators by triple (not)equals 
For comparison with null the triple (not) equal operator should be used.
Resolved compiler warnings


Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
 2016-12-05 16:03:22 +01:00
Karsten Thoms
b4d74f732b [eclipse/xtext#1089] Regenerated xtend-gen code 
Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
 2016-12-02 16:47:33 +01:00
Karsten Thoms
08194ce996 [eclipse/xtext#1089] Replace (not)equal operators by triple (not)equals 
For comparison with null the triple (not) equal operator should be used. Resolved compiler warnings

Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
 2016-12-02 16:46:25 +01:00
Karsten Thoms
79c3eab77c [#5] Changes to .classpath generated by Buildship import 
Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
 2016-11-30 10:00:21 +01:00
Karsten Thoms
13ba597bc4 Merge branch 'master' of git@github.com:eclipse/xtext-core 2016-11-29 15:33:08 +01:00
Karsten Thoms
c4ba710623 Classpath inclusion/exclusion rules changed by buildship import 
Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
 2016-11-29 15:32:57 +01:00
Karsten Thoms
8c381f8d59 Gradle composite 
see https://github.com/eclipse/xtext-umbrella/issues/3

Remove org.eclipse.buildship.core.prefs
Files are generated on Gradle project import or by Oomph setup

Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
 2016-11-28 14:41:08 +01:00
Karsten Thoms
c637df9451 Gradle composite 
connection.project.dir changed to composite build location in new
umbrella project
value 'containers' added by Buildship

Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
 2016-11-25 08:49:49 +01:00
Sven Efftinge
baebe053cd [LSP] migrated to lsp4j 0.1.0 2016-11-05 20:52:35 +01:00
Miro Spönemann
b92f63bc54 eclipse/xtext#1080: Add name and description to generated poms 
Signed-off-by: Miro Spönemann <miro.spoenemann@typefox.io>
 2016-10-23 13:36:04 +02:00
Miro Spönemann
2a449c744e Merge pull request #157 from eclipse/cd_issue156 
[WEB][Wizard][Generator] Update JS Libary Versions. Fixed #156
 2016-10-20 15:32:16 +02:00
Christian Dietrich
fd6afda9bf [WEB][Wizard][Generator] Update JS Libary Versions. Fixed #156 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
 2016-10-20 13:04:49 +02:00
Sven Efftinge
89733c8ab9 updated wizard to currently used gradle version 2016-10-20 09:15:37 +02:00
Karsten Thoms
9697786f3d [#101] Configure lineDelimiter in workflows 
Add 'lineDelimiter' to project configuration and generate it to the
'code' configuration in the workflow.
Adjusted test expectations.


Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
 2016-10-07 15:07:30 +02:00
Karsten Thoms
eba4be8428 [#108] Ecore2Xtext use new formatter fragment 
Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
 2016-09-26 08:11:50 +02:00
Karsten Thoms
4b1737a6a7 [#112] Generate launch configs for Xtext workflow and Runtime Eclipse 
- Launch config for Runtime Eclipse is only generated when the runtime
project is a plugin project.
- Launch config for Xtext workflow is dependent on the build system. For
plain Maven projects the launch config uses the m2e launcher, for Gradle
builds buildship is launched.

Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
 2016-09-23 14:03:06 +02:00
Moritz Eysholdt
467ee9cf51 Merge pull request #83 from kthoms/kth/bug484500 
Kth/bug484500
 2016-08-12 13:38:03 +02:00
Karsten Thoms
735ea5d929 [484500] Add bin.excludes to build.properties 
- the runtime project excludes .mwe2 and .xtend files
- the feature sdk project excludes nothing
- all other Eclipse projects exclude .xtend
- add test case WizardConfigurationTest#binExcludes

Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
 2016-08-12 11:04:13 +02:00
Karsten Thoms
ae123abe38 [#79] Upgrade Eclipse & MWE p2 repository URLs 
Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
 2016-08-12 08:30:48 +02:00
Karsten Thoms
337e4371e4 [#76] Upgrade to Tycho 0.25.0 
Covered by test CliWizardIntegrationTest

Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
 2016-08-11 23:07:08 +02:00
Lorenzo Bettini
316b42e334 Merge pull request #29 from LorenzoBettini/lb/bug494176 
494176: Warning: The file "plugin.xml" does not exist in the workspace
 2016-07-18 11:06:33 +02:00
Lorenzo Bettini
fb8f005e06 30: ui.tests depends on the new testing bundle 
Task-Url: https://github.com/eclipse/xtext-core/issues/30
Signed-off-by: Lorenzo Bettini <lorenzo.bettini@gmail.com>
 2016-07-11 11:25:26 +02:00
Lorenzo Bettini
df2293746f 494176: Warning: The file "plugin.xml" does not exist in the workspace 
Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=494176
Signed-off-by: Lorenzo Bettini <lorenzo.bettini@gmail.com>
 2016-07-11 10:48:22 +02:00
Miro Spönemann
950eb8ae74 Removed old Gradle integration prefs 2016-07-07 11:22:13 +02:00
Miro Spönemann
decf9b22aa Checked in project metadata based on Buildship 2016-07-07 10:19:04 +02:00
Moritz Eysholdt
ffa109f37f Smaller changes 2016-06-17 18:31:26 +02:00
Miro Spönemann
e1a4782403 Generated code 2016-06-14 09:45:31 +02:00
Miro Spönemann
96edcf48ae Removed buildship.core.prefs 2016-06-14 09:44:34 +02:00
Miro Spönemann
4270986cba Moved projects to root of repository 2016-06-14 08:30:25 +02:00