Commit graph

6335 commits

Author SHA1 Message Date
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
Moritz Eysholdt
42be5d030d fixes #739: Potential NPE during ChangeSerialization
Signed-off-by: Moritz Eysholdt <moritz.eysholdt@typefox.io>
2018-05-17 16:39:37 +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
dda480aab6
Merge pull request #738 from eclipse/kth_junit5_plain_maven2
[#666] Manage surefire plugin for JUnit 5
2018-05-17 00:25:53 +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
0049750108
Merge pull request #735 from eclipse/junit5_dependencies
[#666] JUnit 5 dependencies
2018-05-16 23:19:00 +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
50257e9982
Merge pull request #734 from eclipse/about_copyright
Update copyright
2018-05-15 08:26:40 +02:00
Karsten Thoms
81ceecd9ff Update copyright
Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
2018-05-15 06:10:10 +02:00
Christian Dietrich
f54be52d97 fixed some warnings
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2018-05-12 10:58:14 +02:00
Karsten Thoms
6d7610562f
Merge pull request #733 from eclipse/kth_issue732
Include Orbit repo & bundles in target definition
2018-05-09 00:07:25 +02:00
Karsten Thoms
96e1631e6f [#732] Updated test expectation
Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
2018-05-08 23:31:18 +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
a9f0a96ba4
Merge pull request #731 from eclipse/tycho120final
use tycho 1.2.0 in the wizard
2018-05-08 12:05:30 +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
1f18cfc2bb
Merge pull request #729 from eclipse/cd_web_issue53
[eclipse/xtext-web#53] updated to a newer jetty version that works better with asm 6.1
2018-05-07 09:56:37 +02:00
Christian Dietrich
ec706ceb8c
Merge pull request #730 from eclipse/cd_unusedImports
removed unused imports
2018-05-06 17:57:58 +02:00
Christian Dietrich
b051e84aed removed unused imports
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2018-05-06 10:07:59 +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
3977f82b61
Merge pull request #726 from eclipse/cd_photonTarget
[eclipse/xtext#1177] Switched Target Platform to Photon for Tycho Builds with Java 10
2018-05-04 14:01:00 +02:00
Holger Schill
bd263193f5
Merge pull request #728 from eclipse/cd_xdepr
[#664] fixed generation of val prefs/issue codes when deprecation disabled
2018-05-04 10:47:29 +02:00
Christian Dietrich
f2a738ae3e [#664] fixed generation of val prefs/issue codes when deprecation disabled
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2018-05-04 10:16:46 +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
5c1f19b4c6
Merge pull request #725 from eclipse/cd_issue724
[#724] fixed compile errors with non xbase languages
2018-05-03 07:12:58 +02:00
Christian Dietrich
d2134214a6 [#724] fixed compile errors with non xbase languages
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2018-05-03 06:49:22 +02:00
Holger Schill
bba7a1c248
Merge pull request #723 from eclipse/issue/722_validation2Fragment
Issue/722 validation2 fragment
2018-05-02 15:24:55 +02:00
Holger Schill
12008dfed5 Finding from CodeReview in https://github.com/eclipse/xtext-core/pull/723 2018-05-02 14:53:32 +02:00
Holger Schill
eb2b0f77b2 Tests for https://github.com/eclipse/xtext-core/issues/722 2018-05-02 14:22:14 +02:00
Holger Schill
dbca734a58 Fix for https://github.com/eclipse/xtext-core/issues/722 2018-05-02 13:40:54 +02:00
Christian Dietrich
3dbf100102
Merge pull request #718 from eclipse/cd_issue716
[#716] [LSP] Problems for a deleted file are shown after deletion
2018-04-26 16:08:39 +02:00
Christian Dietrich
64be133f9d
Merge pull request #719 from eclipse/cd_issue714
[#714] consume lsp4j 0.4.0 final
2018-04-26 09:52:38 +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
be7a958127 [#716] [LSP] Problems for a deleted file are shown after deletion
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2018-04-25 14:29:38 +02:00
Karsten Thoms
4978547f59
Merge pull request #633 from eclipse/kth_refactor_Files
[refactoring] Deprecate methods with correspondence in Guava
2018-04-23 16:49:43 +02:00
Jan Koehnlein
8809e2f8fd
Merge pull request #713 from eclipse/jk/gh712
GH-712 adapt to breaking changes in lsp4j
2018-04-23 16:32:21 +02:00
Karsten Thoms
e1ff4dc910 [refactoring] Deprecate methods with correspondence in Guava
Also refactored methods to use Guava

Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
2018-04-23 14:52:31 +02:00
Jan Koehnlein
3c2bb77e89 GH-712 adapt to breaking changes in lsp4j 2018-04-23 14:47:08 +02:00
Karsten Thoms
5e7c2a0902
Merge pull request #711 from eclipse/cd_xtext_issue1190
[eclipse/xtext#1190] Narrowed the version range for asm to [6.1.1,6.2.0)
2018-04-23 14:34:20 +02:00
Christian Dietrich
de25d13970 [eclipse/xtext#1190] Narrowed the version range for asm to [6.1.1,6.2.0)
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2018-04-23 13:01:11 +02:00
Christian Dietrich
497b70425c added missing since
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2018-04-20 18:52:22 +02:00
Christian Dietrich
ef9817b9a8
Merge pull request #696 from ArneDeutsch/xtext-eclipse-599
[eclipse/xtext-eclipse#599] Support waiting operation.
2018-04-20 18:49:24 +02:00
Christian Dietrich
5f8a5465d1
Merge pull request #707 from eclipse/cd_lsp4j_wizard_workaround
use lsp4j 0.4.0-SNAPSHOT as workaround for #705
2018-04-20 16:34:43 +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
2d69f5c34e
Merge pull request #682 from tivervac/nullSafeReadOnlyAndModify2
Added null- and exception-safe variants of (priority)readOnly and modify
2018-04-20 15:55:16 +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
dfc8861cd7 readjusted pipelines
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2018-04-20 09:56:53 +02:00