build: increased target platform to eclipse release 2021-06, as that brings support for platform 'macosx.aarch_64' #150

sailingKieler · 2022-12-20T12:08:00Z

increased Xtext version to 2.25 as also brought by eclipse 2021-06
updated the various target platform definitions: switched to orbit release R20210223232630, since R20210602031627 brings 'com.google.inject:5.0.1' that I wanna exclude for now
updated the update site p2 repo setup definitions
switched to JDK 11 for the build container, as eclipse 2021-06 requires JavaSE-11 at runtime, and running the tycho surefire tests requires the launch of an equinox container
increased Tycho version to 2.5, as the 'aarch64' platform is not handled or broken in earlier versions, had to increase the version of 'org.jboss.tools.tycho-plugins:repository-utils' consistently because of an internal failure of v1.0.0 with Tycho v2.5
klighd.piccolo.batik: trimmed compile classpath to those jars being actually required by our code to avoid compile errors with Java 9+
fixed/refined test failures of 'FreeHEPSVGOffscreenRenderingTest' and 'ViewChangedNotificationTest'

sailingKieler · 2022-12-21T22:59:15Z

addresses #97, #132 and #100 to some extent, as well as #134

NiklasRentzCAU

LGTM! Just have two questions added in the review below.

NiklasRentzCAU · 2022-12-23T09:46:29Z

build/de.cau.cs.kieler.klighd.repository/pom.xml

+      <!-- Update: With https://github.com/eclipse-tycho/tycho/pull/145 (Tycho v2.4.0) the aforementioned issue is fixed.
+            However, just dropping the <associateSites>...</associateSites> argument and keeping the web content
+            generation doesn't work here, as this mojo _always_ clears the existing repository references,
+            or crashes if 'content.jar' doesn't exist. Hence, just binding it to an early build phase doesn't work.
+            Therefore I submitted PR https://github.com/jbosstools/jbosstools-maven-plugins/pull/88
+            to fix that, let's see how the committers assess it. -->
      <plugin>
        <groupId>org.jboss.tools.tycho-plugins</groupId>
        <artifactId>repository-utils</artifactId>
-        <version>1.0.0</version>
+        <version>2.5.0</version>


What speaks against using the eclipse.tycho tycho-p2-repository-plugin here with the newer tycho release used in the build? From what I tested that should work as well without the need for the duplication of the associate sites here in the pom.xml

I tried to skip that, but ... see

KLighD/build/de.cau.cs.kieler.klighd.repository/pom.xml

Lines 35 to 40 in 3d54c4b

NiklasRentzCAU · 2022-12-23T09:47:21Z

build/de.cau.cs.kieler.klighd.repository/pom.xml

+                <associateSite>https://download.eclipse.org/releases/2021-06/</associateSite>
                <!-- UML2 Tools (Meta Model Implemenetation, ...) -->
                <associateSite>https://download.eclipse.org/modeling/mdt/uml2/updates/5.4/</associateSite>
                <!-- Eclipse Layout Kernel -->
                <!-- associateSite>http://build.eclipse.org/modeling/elk/updates/nightly/</associateSite -->
                <associateSite>https://download.eclipse.org/elk/updates/releases/0.8.1/</associateSite>>
                <!-- Xtext -->
-                <associateSite>https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.22.0/</associateSite>>
+                <associateSite>https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.25.0/</associateSite>>
                <associateSite>https://xtext.github.io/download/updates/releases/2.1.1/</associateSite>>
                <!-- Eclipse Orbit for Google Guave, Apache Batik, ... -->
                <associateSite>https://download.eclipse.org/tools/orbit/downloads/drops/R20200529191137/repository/</associateSite>


Why does this update the Eclipse release, but not its associate orbit release? There might appear inconsistencies because of this.

Right, I overlooked that.

switched to orbit release R20210223232630 instead of R20210602031627, since R20210602031627 brings 'com.google.inject:5.0.1' that I wanna exclude for now

sailingKieler · 2023-01-02T15:40:30Z

I updated the referenced orbit repository in the target platform and repository defs.

@NiklasRentzCAU, @soerendomroes, @a-sr Do you guys wanna do some internal testing before merging and give me a final 'go'?

soerendomroes · 2023-01-05T07:19:12Z

Yes, I think it would be better if we could do that.

sailingKieler · 2023-01-05T13:24:59Z

Yes, I think it would be better if we could do that.

@soerendomroes Can you give me a hint on when?

soerendomroes · 2023-01-06T08:20:51Z

Yes, I think it would be better if we could do that.

@soerendomroes Can you give me a hint on when?

I guess we will have a look next week when everyone is in the office again.

soerendomroes · 2023-01-09T13:18:59Z

I tested the target platform by building the KIELER and the LS and both seem to work on Ubuntu. @a-sr @NiklasRentzCAU do you want to test something else?

a-sr

The changes look good to me.
@soerendomroes No, I don't think we need further testing. I trust your assessment.

NiklasRentzCAU · 2023-01-09T13:57:20Z

On new review after your changes, still looks good. As the build and our KIELER tooling still works with this I see no problems.
Regarding your comment about Java 8 compatibility: I would like to drop the Java 8 support in an upcoming release altogether because of its EoL last year. Do you think this may cause problems for other users when I commit that change in an upcoming PR?

sailingKieler · 2023-01-09T14:06:28Z

Regarding your comment about Java 8 compatibility: I would like to drop the Java 8 support in an upcoming release altogether because of its EoL last year. Do you think this may cause problems for other users when I commit that change in an upcoming PR?

The question ist: What would be benefit for KLighD? KLighD's SWT-related parts don't need anything else (as of now).
For test code we can easily increase it, and similarly for the LSP stuff you can increase the target compatibility (via B-REE and/or the maven property) locally, too.

…ctually required by our code, fixes #97 This avoids the 'The package org.w3c.dom is accessible from more than one module: <unnamed>, java.xml' error that is due to fact that classes of the 'org.w3c.dom' package are part of the JDK since Java9 (in module 'java.xml'), and also part of the packaged batik 1.7 distribution. At runtime classes of the JDK/JRE will take precedence (root class loader is asked first), so their counterparts in the provided jar won't be loaded.

…ings support for platform 'macosx.aarch_64‘, contributes to #100 * increased Xtext version to 2.25 as also brought by eclipse 2021-06 * updated the various target platform definitions: switched to orbit release R20210223232630, since R20210602031627 brings 'com.google.inject:5.0.1' that I wanna exclude for now * updated the update site p2 repo setup definitions * switched to JDK 11 for the build container, as eclipse 2021-06 requires JavaSE-11 at runtime, and running the tycho surefire tests requires the launch of an equinox container * increased Tycho version to 2.5, as the 'aarch64' platform is not handled or broken in earlier versions, had to increase the version of 'org.jboss.tools.tycho-plugins:repository-utils' consistently because of an internal failure of v1.0.0 with Tycho v2.5 fixup targetplatform

…tionTest' to pass on linux again (font size diffs :-/ ), made 'FreeHEPSVGOffscreenRenderingTest' more robust wrt. non-determinisms caused by hash maps and the like, fixes #132 * dropped dependency to Xbase from 'kieler.kgraph.text' & '.ide', added JDT-free binding of 'IAllContainersState' in KGraphUiModule in 'kieler.kgraph.text.ui'

NiklasRentzCAU · 2023-01-09T18:29:42Z

The question ist: What would be benefit for KLighD? KLighD's SWT-related parts don't need anything else (as of now). For test code we can easily increase it, and similarly for the LSP stuff you can increase the target compatibility (via B-REE and/or the maven property) locally, too.

The benefit ist having new releases not be dependent on an EoL Java Version and not having to face further complications with more projects and dependencies requiring Java 11+ themselves, see the test project for example. If someone wants to continue using KLighD with Java 8 they then need to use an older release or update their Java version (which is advisable anyways imo).

Feel free to merge this though, we can continue this discussion on Java11+ later

sailingKieler requested review from a-sr and NiklasRentzCAU December 20, 2022 12:08

sailingKieler force-pushed the cs-targetPlatformUpdate branch 6 times, most recently from 921e8b9 to caa1df6 Compare December 21, 2022 21:48

sailingKieler force-pushed the cs-targetPlatformUpdate branch 2 times, most recently from 6a29479 to 3d54c4b Compare December 22, 2022 15:29

NiklasRentzCAU approved these changes Dec 23, 2022

View reviewed changes

sailingKieler force-pushed the cs-targetPlatformUpdate branch from 3d54c4b to 54493c0 Compare January 2, 2023 15:22

sailingKieler force-pushed the cs-targetPlatformUpdate branch from 54493c0 to 8a2f060 Compare January 5, 2023 13:23

sailingKieler force-pushed the cs-targetPlatformUpdate branch 2 times, most recently from 4191513 to 90978e7 Compare January 5, 2023 16:46

sailingKieler mentioned this pull request Jan 6, 2023

Replace deprecated WidgetProperties and simplify klighd.ui.printing.dialog #148

Merged

sailingKieler force-pushed the cs-targetPlatformUpdate branch from 90978e7 to fdb1252 Compare January 9, 2023 11:47

a-sr approved these changes Jan 9, 2023

View reviewed changes

sailingKieler force-pushed the cs-targetPlatformUpdate branch from fdb1252 to 5e3679f Compare January 9, 2023 14:15

sailingKieler added 3 commits January 9, 2023 19:20

sailingKieler force-pushed the cs-targetPlatformUpdate branch from 5e3679f to 3c5c884 Compare January 9, 2023 18:30

sailingKieler merged commit 7be8d36 into master Jan 9, 2023

sailingKieler deleted the cs-targetPlatformUpdate branch January 9, 2023 20:00

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

build: increased target platform to eclipse release 2021-06, as that brings support for platform 'macosx.aarch_64' #150

build: increased target platform to eclipse release 2021-06, as that brings support for platform 'macosx.aarch_64' #150

sailingKieler commented Dec 20, 2022 •

edited

Loading

sailingKieler commented Dec 21, 2022 •

edited

Loading

NiklasRentzCAU left a comment

NiklasRentzCAU Dec 23, 2022

sailingKieler Dec 23, 2022 •

edited

Loading

NiklasRentzCAU Dec 23, 2022

sailingKieler Dec 23, 2022

sailingKieler Jan 2, 2023

sailingKieler commented Jan 2, 2023

soerendomroes commented Jan 5, 2023

sailingKieler commented Jan 5, 2023

soerendomroes commented Jan 6, 2023

soerendomroes commented Jan 9, 2023

a-sr left a comment

NiklasRentzCAU commented Jan 9, 2023

sailingKieler commented Jan 9, 2023

NiklasRentzCAU commented Jan 9, 2023

	<!-- Update: With https://github.com/eclipse-tycho/tycho/pull/145 (Tycho v2.4.0) the aforementioned issue is fixed.
	However, just dropping the <associateSites>...</associateSites> argument and keeping the web content
	generation doesn't work here, as this mojo _always_ clears the existing repository references,
	or crashes if 'content.jar' doesn't exist. Hence, just binding it to an early build phase doesn't work.
	Therefore I submitted PR https://github.com/jbosstools/jbosstools-maven-plugins/pull/88
	to fix that, let's see how the committers assess it. -->

build: increased target platform to eclipse release 2021-06, as that brings support for platform 'macosx.aarch_64' #150

build: increased target platform to eclipse release 2021-06, as that brings support for platform 'macosx.aarch_64' #150

Conversation

sailingKieler commented Dec 20, 2022 • edited Loading

sailingKieler commented Dec 21, 2022 • edited Loading

NiklasRentzCAU left a comment

Choose a reason for hiding this comment

NiklasRentzCAU Dec 23, 2022

Choose a reason for hiding this comment

sailingKieler Dec 23, 2022 • edited Loading

Choose a reason for hiding this comment

NiklasRentzCAU Dec 23, 2022

Choose a reason for hiding this comment

sailingKieler Dec 23, 2022

Choose a reason for hiding this comment

sailingKieler Jan 2, 2023

Choose a reason for hiding this comment

sailingKieler commented Jan 2, 2023

soerendomroes commented Jan 5, 2023

sailingKieler commented Jan 5, 2023

soerendomroes commented Jan 6, 2023

soerendomroes commented Jan 9, 2023

a-sr left a comment

Choose a reason for hiding this comment

NiklasRentzCAU commented Jan 9, 2023

sailingKieler commented Jan 9, 2023

NiklasRentzCAU commented Jan 9, 2023

sailingKieler commented Dec 20, 2022 •

edited

Loading

sailingKieler commented Dec 21, 2022 •

edited

Loading

sailingKieler Dec 23, 2022 •

edited

Loading