Commit graph

7779 commits

Author SHA1 Message Date
Christian Dietrich
d8e43498f7
Merge pull request #1776 from eclipse/cd_xtext_issue2004
[eclipse/xtext#2004] update to gradle 7.3
2021-11-10 10:18:31 +01:00
Christian Dietrich
269d639790 [eclipse/xtext#2004] update to gradle 7.3
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2021-11-10 06:40:19 +01:00
Christian Dietrich
220c4ccd30
Merge pull request #1775 from eclipse/cd_issue1774
[#1774] fixed test language generation cleanup
2021-11-04 14:57:26 +01:00
Christian Dietrich
76fa0bb6e8 [#1774] fixed test language generation cleanup
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2021-11-04 14:46:04 +01:00
Christian Dietrich
da0cd0bbaa
Merge pull request #1768 from eclipse/x2j_cd
ported xtend code 2 java
2021-10-28 14:53:31 +02:00
Christian Dietrich
d7e912a081
Merge pull request #1773 from eclipse/cd_junit58x
manage transitive apiguardian dep
2021-10-28 11:34:19 +02:00
Christian Dietrich
3755bd3988 manage transitive apiguardian dep
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2021-10-27 14:40:04 +02:00
Christian Dietrich
8bc8627e19 ported xtend code 2 java
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2021-10-25 13:24:00 +02:00
Christian Dietrich
eb8f764f77
Merge pull request #1772 from eclipse/cd_suppDepr
suppress junit5 deprecation warnings in junit5->junit4 bridges
2021-10-25 11:22:09 +02:00
Christian Dietrich
8f4900aae9 suppress junit5 deprecation warnings in junit5->junit4 bridges
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2021-10-25 11:14:56 +02:00
Christian Dietrich
f42dd7f317
Merge pull request #1771 from eclipse/cd_fixSomeJunitDepr
fixed some junit 4.13 deprecations
2021-10-25 11:11:59 +02:00
Christian Dietrich
443a3fce34 fixed some junit 4.13 deprecations
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2021-10-25 10:57:01 +02:00
Christian Dietrich
d2fd60c0cb
Merge pull request #1770 from eclipse/cd_junit4132
[eclipse/xtext#1645] update to JUnit 4.13.2
2021-10-25 06:52:51 +02:00
Christian Dietrich
5805e3fa25 [eclipse/xtext#1645] update to JUnit 4.13.2
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2021-10-25 06:47:29 +02:00
Christian Dietrich
c7a0919646
Merge pull request #1769 from eclipse/cd_202112platform
[eclipse/xtext#1997] update to Platform 2021-12 in wizard
2021-10-22 09:47:50 +02:00
Christian Dietrich
094877e7fb [eclipse/xtext#1997] update to Platform 2021-12 in wizard
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2021-10-22 09:26:14 +02:00
Christian Dietrich
96be6c158c
Merge pull request #1767 from eclipse/cd_orbit202112
[eclipse/xtext#1996] Update to Orbit 2021-12
2021-10-22 08:43:56 +02:00
Christian Dietrich
d064558484 [eclipse/xtext#1996] Update to Orbit 2021-12
[eclipse/xtext#2001] Update to Junit 5.8.1
[eclipse/xtext#1992] Update to Classgraph 4.8.117

Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2021-10-22 07:36:29 +02:00
Christian Dietrich
d525544c8c
Merge pull request #1751 from eclipse/oehme/wizard-update
Update Wizard to deal with upcoming Gradle plugin changes
2021-10-21 17:44:47 +02:00
Christian Dietrich
058dd40d4e
Merge pull request #1752 from eclipse/cd_gradlePlugin300
Update to xtext-gradle-plugin 3.0.0
2021-10-21 17:29:28 +02:00
Christian Dietrich
b018abb747 adjusted test expectations
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2021-10-21 17:05:19 +02:00
Stefan Oehme
0b2a6a1686 Update Wizard to deal with upcoming Gradle plugin changes 2021-10-21 17:05:19 +02:00
Christian Dietrich
b640cb17ac Fix build to work with Xtext plugin 3.0.0
The new plugin adds its output directories to the original java.srcDirs
(instead of waiting until later with `afterEvaluate`). If we overwrite
that collection with our own, we need to add the Xtend output dir ourselves.
2021-10-21 16:56:36 +02:00
Christian Dietrich
3a9bec3f1d
Merge pull request #1766 from eclipse/cd_issue1739
[#1739] warn when gradle + flat project layout is used
2021-10-11 09:35:39 +02:00
Christian Dietrich
85b993566a [#1739] warn when gradle + flat project layout is used
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2021-10-11 08:50:04 +02:00
Christian Dietrich
5d7ec785ad
Merge pull request #1764 from eclipse/cd_maven383
[eclipse/xtext#2005] update to maven 3.8.3
2021-10-06 19:02:55 +02:00
Christian Dietrich
e73d69ebc4 [eclipse/xtext#2005] update to maven 3.8.3
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2021-10-06 18:36:54 +02:00
Christian Dietrich
803ef9306c
Merge pull request #1762 from eclipse/cd_bootstrap2260M2
[eclipse/xtext#2002] bootstrap against Xtext 2.26.0.M2
2021-10-01 09:14:45 +02:00
Christian Dietrich
1fb8e8abcc [eclipse/xtext#2002] bootstrap against Xtext 2.26.0.M2
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2021-10-01 08:44:21 +02:00
Christian Dietrich
83ae598a64
Merge pull request #1760 from eclipse/cd_tycho25update
[eclipse/xtext#1994] update to tycho 2.5.0
2021-09-29 15:00:43 +02:00
Christian Dietrich
92eb8cb24c
Merge pull request #1761 from eclipse/cd_deprDownloadUrl
deprecate setDownloadUrl
2021-09-27 15:27:25 +02:00
Christian Dietrich
312e2ff17d deprecate setDownloadUrl
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2021-09-27 14:16:55 +02:00
Christian Dietrich
2470d4006f
Merge pull request #1756 from eclipse/cd_issue1522
[#1522] download via https first and try http on error only in AntlrToolFacade
2021-09-27 12:58:05 +02:00
Christian Dietrich
6e3d5ff195 [#1522] download via https first and try http on error only in AntlrToolFacade
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2021-09-24 12:28:53 +02:00
Christian Dietrich
58c4230f5c [eclipse/xtext#1994] update to tycho 2.5.0
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2021-09-24 10:24:41 +02:00
Christian Dietrich
55a3393493
Merge pull request #1759 from eclipse/cd_bumpJetty
bump slf4j and jetty
2021-09-23 16:00:26 +02:00
Christian Dietrich
bf298839b4 bump slf4j and jetty
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2021-09-23 15:19:29 +02:00
Christian Dietrich
fde0c88c33
Merge pull request #1758 from eclipse/cd_xtext_issue1995
[eclipse/xtext#1995] switch from adoptopenjdk to termurin and provide java 17 jdk
2021-09-22 20:54:00 +02:00
Christian Dietrich
fc8ae5f685 [eclipse/xtext#1995] switch from adoptopenjdk to termurin and provide java 17 jdk
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2021-09-22 18:54:23 +02:00
Christian Dietrich
0b6c4cf9e2
Merge pull request #1755 from eclipse/cd_fixJavadoc
fix javadoc
2021-09-16 12:59:24 +02:00
Christian Dietrich
6a9b8782a1 fix javadoc
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2021-09-16 12:26:42 +02:00
Christian Dietrich
a9a0c29434
Merge pull request #1750 from eclipse/cd_issue1749
Fix port parsing in SocketServerLauncher
2021-08-30 16:36:12 +02:00
Christian Dietrich
a37a8bc2d5 Fix port parsing in SocketServerLauncher
Fixes #1749

Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2021-08-30 10:56:24 +02:00
Christian Dietrich
c84a013c1d
Merge pull request #1748 from eclipse/cd_gradlePlugin210
update xtext-gradle-plugin to 2.1.0
2021-08-29 13:28:36 +02:00
Christian Dietrich
c3ccb22964 update xtext-gradle-plugin to 2.1.0 in wizard
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2021-08-29 12:20:49 +02:00
Christian Dietrich
2d36ed6886 update xtext-gradle-plugin to 2.1.0
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2021-08-29 12:17:19 +02:00
Christian Dietrich
b2ae3c4a15
Merge pull request #1747 from eclipse/cd_xtextGradlePlugin209
update to xtext-gradle-plugin 2.0.9
2021-08-29 12:07:22 +02:00
Christian Dietrich
81cfb9b6f7 update to xtext-gradle-plugin 2.0.9
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2021-08-28 21:14:24 +02:00
Christian Dietrich
07460d636d
Merge pull request #1746 from eclipse/cd_xtext_issue1452
[eclipse/xtext#1452] add common JavaRuntimeVersion utility to avoid code duplication between modules
2021-08-26 15:25:24 +02:00
Christian Dietrich
c3dc3d2d4a [eclipse/xtext#1452] add common JavaRuntimeVersion utility to avoid code duplication between modules
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2021-08-26 10:49:46 +02:00