Commit graph

124 commits

Author SHA1 Message Date
Arne Deutsch
f4ae741588 [eclipse/xtext-extras#406] Fix missing newline, add test.
Signed-off-by: Arne Deutsch <Arne.Deutsch@itemis.de>
2019-04-04 17:08:28 +02:00
Holger Schill
fe96a20cf9 Remove IDEA since the support has been dropped.
Signed-off-by: Holger Schill <Holger.Schill@itemis.de>
2019-04-02 08:48:56 +02: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
4982e56d33 [#1053] Wizard: Bump Xtext-Gradle-Plugin to latest (2.0.4)
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2019-03-02 10:36:47 +01:00
Arne Deutsch
415beaeb80 [#1038] Filter bad entries when read in MANIFEST.
Filter all entries from "Require-Bundle", "Export-Package" and
"Import-Package" entries that are empty to fix manifest files that are
invalid in this regard.

Signed-off-by: Arne Deutsch <Arne.Deutsch@itemis.de>
2019-02-18 12:37:36 +01:00
Karsten Thoms
7823e915a9
Merge pull request #1028 from eclipse/cd_mwe210wizard
[eclipse/xtext#1283] switched to MWE 2.10 in wizard
2019-02-13 15:05:30 +01:00
Arne Deutsch
86f6342354
Merge pull request #1027 from eclipse/ade-mergable-manifest-xtend
#1018 Maintain existing formatting.
2019-02-12 09:46:32 +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
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
8d34e55e11 #1018 Maintain existing formatting.
To avoid reformatting we maintain the separators (e.g. line breaks) with
the entries (e.g. inside the required bundles entry).

Signed-off-by: Arne Deutsch <Arne.Deutsch@itemis.de>
2019-02-07 12:23:49 +01:00
Christian Dietrich
640e11f60c [eclipse/xtext#1391] pin guava version to 21
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2019-02-04 11:48:42 +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
Sebastian Zarnekow
ecc7ae0bc3
[eclipse/xtext#1249] use bom for version management (#988) 2019-01-11 16:41:50 +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
Titouan Vervack
818e1c00d4 Fixed typos in javadoc
Signed-off-by: Titouan Vervack <titouan.vervack@sigasi.com>
2018-11-26 20:01:30 +01:00
Titouan Vervack
51df51946f Wrap CancelableUnitOfWork in a CancelableUnitOfWork instead of a lambda
Signed-off-by: Titouan Vervack <titouan.vervack@sigasi.com>
2018-11-21 15:29:59 +01:00
Arne Deutsch
66fd1cabbc #953: Support setting of entries with attributes.
- Added test cases to cover setting of entries that have other
attributes then version alone.
- Fix MergeableManifest to support given test cases.
- Refactor existing test cases a bit to avoid uneccessary
"Collections.singleton"

Signed-off-by: Arne Deutsch <Arne.Deutsch@itemis.de>
2018-11-19 11:38:29 +01:00
Sebastian Zarnekow
87d26da6e8 Incorporate review feedback 2018-11-09 16:51:07 +01:00
Sebastian Zarnekow
e8850a77ec Cleanup some warnings 2018-11-09 15:59:28 +01:00
Sebastian Zarnekow
65371722ba Minor improvements to isHex 2018-11-09 11:14:32 +01:00
Sebastian Zarnekow
5ddfcadce9 Improved JavaStringConverter after heavy benchmark session 2018-11-09 11:14:32 +01:00
Sebastian Zarnekow
fa00a330ac Base the STRINGValueConverter on the reusable new JavaStringConverter 2018-11-09 11:14:32 +01:00
Sebastian Zarnekow
09ee0502c4 Make JavaStringConverter even easier to reuse 2018-11-09 11:14:32 +01:00
Sebastian Zarnekow
868447b18b Fix regression 2018-11-09 11:14:31 +01:00
Sebastian Zarnekow
965e055537 Made implementation easier to reuse 2018-11-09 11:14:31 +01:00
Christian Dietrich
fb271c39a0 Updated xtext-gradle-plugin to 2.0.2
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2018-10-30 13:59:29 +01:00
Arne Deutsch
4c983ade43 #918: Fix MergeableManifest2 and add missing unit tests
Signed-off-by: Arne Deutsch <Arne.Deutsch@itemis.de>
2018-10-19 14:02:39 +02:00
Arne Deutsch
5e5dc014eb #864: Rewrite MergeableManifest to MergeableManifest2 to avoid refl.
Adding extensive unit tests to ensure behavior does not change.
Use only MergeableManifest2 internally.

Signed-off-by: Arne Deutsch <Arne.Deutsch@itemis.de>
2018-10-17 16:48:32 +02:00
Christian Dietrich
ac598a676d fixed javadoc
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2018-10-12 21:44:12 +02:00
Karsten Thoms
bb85fe78c5 [539677] getValue should return null for null arg
Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
2018-10-01 10:34:24 +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
Sebastian Zarnekow
ac40983dc2 Removed copied code from Strings.java 2018-09-15 21:28:31 +02:00
Christian Dietrich
cc2c4fbc54 restored old state for MergableManifest
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2018-09-11 10:27:01 +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
543560cfa6 [eclipse/xtext-core#828] Use the newest version of xtext-gradle-plugin: 2.0.1
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2018-08-23 21:49:19 +02:00
Christian Dietrich
05a9483b3c fixed broken javadoc
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2018-07-23 13:30:58 +02:00
Titouan Vervack
528de63088 Added an extra api call that omits the default result
Signed-off-by: Titouan Vervack <titouan.vervack@sigasi.com>
2018-06-11 11:08:40 +02:00
Titouan Vervack
63c4439ad4 Reduced "potential null pointer access" errors
Signed-off-by: Titouan Vervack <titouan.vervack@sigasi.com>
2018-06-05 18:11:37 +02:00
Karsten Thoms
24ce555b09
Merge pull request #751 from ArneDeutsch/xtext-core-506
[#506] Removed reflection call.
2018-05-28 12:56:52 +02:00
Arne Deutsch
8e93dbbda4 [#506] Removed reflection call.
Do not inherit and modify (by reflection) the original
java.util.jar.Manifest but instead C&P and modify the code. Adapt
ManifestMergerTest by importing the new classes.

Signed-off-by: Arne Deutsch <Arne.Deutsch@itemis.de>
2018-05-28 10:54:21 +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
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
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
Karsten Thoms
17616407db
Merge pull request #670 from eclipse/kth_issue666_junit5
[#666] JUnit 5 support
2018-04-17 17:05:31 +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
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
Titouan Vervack
b8c37767d5 Added wildcard extends
Signed-off-by: Titouan Vervack <titouan.vervack@sigasi.com>
2018-04-16 11:05:31 +02:00