updated to Eclipse 2023-12, KLighD 3.0.1, and related. Enforce Java 17.

Fixed some generic warnings. Deactivated tests in Maven build.
kieler · Apr 18, 2024 · b4be963 · b4be963
1 parent 78d0840
commit b4be963
Show file tree

Hide file tree

Showing 70 changed files with 313 additions and 552 deletions.
diff --git a/...settings/org.eclipse.core.resources.prefs → .settings/org.eclipse.core.resources.prefs b/...settings/org.eclipse.core.resources.prefs → .settings/org.eclipse.core.resources.prefs
diff --git a/...settings/org.eclipse.core.resources.prefs → ...settings/org.eclipse.core.resources.prefs b/...settings/org.eclipse.core.resources.prefs → ...settings/org.eclipse.core.resources.prefs
diff --git a/build/de.cau.cs.kieler.spviz.repository/category.xml b/build/de.cau.cs.kieler.spviz.repository/category.xml
@@ -20,12 +20,8 @@
       <category name="spviz"/>
    </feature>
 
-   <repository-reference location="https://download.eclipse.org/releases/2022-06/" enabled="true" />
-   <repository-reference location="https://download.eclipse.org/lsp4j/updates/releases/0.14.0/" enabled="true" />
-   <repository-reference location="https://download.eclipse.org/tools/orbit/downloads/drops/R20220531185310/repository/" enabled="true" />
-   <repository-reference location="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.27.0/" enabled="true" />
-   <repository-reference location="https://download.eclipse.org/elk/updates/releases/0.8.1/" enabled="true" />
-   <repository-reference location="https://kieler.github.io/KLighD/v2.2.0/" enabled="true" />
-   <repository-reference location="https://rtsys.informatik.uni-kiel.de/~kieler/updatesite/sprotty/0.9.0/" enabled="true" />
-   <repository-reference location="https://repo1.maven.org/maven2/.m2e/connectors/m2eclipse-tycho/0.8.1/N/0.8.1.201704211436/" enabled="true" />
+   <repository-reference location="https://download.eclipse.org/releases/2023-12" enabled="true" />
+   <repository-reference location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/release/4.30.0/" enabled="true" />
+   <repository-reference location="https://download.eclipse.org/elk/updates/releases/0.9.1/" enabled="true" />
+   <repository-reference location="https://kieler.github.io/KLighD/v3.0.1/" enabled="true" />
 </site>
diff --git a/build/de.cau.cs.kieler.spviz.repository/pom.xml b/build/de.cau.cs.kieler.spviz.repository/pom.xml
@@ -3,7 +3,6 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
-  <version>0.2.1-SNAPSHOT</version>
   <artifactId>de.cau.cs.kieler.spviz.repository</artifactId>
   <packaging>eclipse-repository</packaging>
   <name>Kieler Software Project Visualization Repository</name>

diff --git a/build/de.cau.cs.kieler.spviz.targetplatform/de.cau.cs.kieler.spviz.targetplatform.target b/build/de.cau.cs.kieler.spviz.targetplatform/de.cau.cs.kieler.spviz.targetplatform.target
@@ -10,41 +10,26 @@
       <unit id="org.eclipse.wildwebdeveloper.xml.feature.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.m2e.feature.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.m2e.sdk.feature.feature.group" version="0.0.0"/>
-      <repository location="https://download.eclipse.org/releases/2022-06/"/>
-    </location>
-    <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="false" type="InstallableUnit">
-      <unit id="org.eclipse.lsp4j.sdk.feature.group" version="0.0.0"/>
-      <repository location="https://download.eclipse.org/lsp4j/updates/releases/0.14.0/"/>
+      <unit id="org.eclipse.xtext.sdk.feature.group" version="0.0.0"/>
+      <repository location="https://download.eclipse.org/releases/2023-12"/>
     </location>
     <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="false" type="InstallableUnit">
       <unit id="com.google.inject" version="0.0.0"/>
-      <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20220531185310/repository/"/>
-    </location>
-    <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="false" type="InstallableUnit">
-      <unit id="org.eclipse.xtext.sdk.feature.group" version="0.0.0"/>
-      <repository location="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.27.0/"/>
+      <unit id="junit-jupiter-api" version="0.0.0"/>
+      <repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/release/4.30.0/"/>
     </location>
     <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="false" type="InstallableUnit">
       <unit id="org.eclipse.elk.graph.json.feature.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.elk.graphviz.feature.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.elk.sdk.feature.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.elk.ui.feature.feature.group" version="0.0.0"/>
-      <repository location="https://download.eclipse.org/elk/updates/releases/0.8.1/"/>
+      <repository location="https://download.eclipse.org/elk/updates/releases/0.9.1/"/>
     </location>
     <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="false" type="InstallableUnit">
       <unit id="de.cau.cs.kieler.klighd.freehep.feature.feature.group" version="0.0.0"/>
-      <unit id="de.cau.cs.kieler.klighd.lsp" version="0.0.0"/>
       <unit id="de.cau.cs.kieler.kgraph.text.ide" version="0.0.0"/>
       <unit id="de.cau.cs.kieler.klighd.view.feature.feature.group" version="0.0.0"/>
-      <repository location="http://kieler.github.io/KLighD/v2.2.0/"/>
-    </location>
-    <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="false" type="InstallableUnit">
-      <unit id="org.eclipse.sprotty" version="0.0.0"/>
-      <repository location="https://rtsys.informatik.uni-kiel.de/~kieler/updatesite/sprotty/0.9.0/"/>
-    </location>
-    <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="false" type="InstallableUnit">
-      <repository location="https://repo1.maven.org/maven2/.m2e/connectors/m2eclipse-tycho/0.8.1/N/0.8.1.201704211436/"/>
-      <unit id="org.sonatype.tycho.m2e.feature.feature.group" version="0.8.1.201704211436"/>
+      <repository location="http://kieler.github.io/KLighD/v3.0.1/"/>
     </location>
   </locations>
 </target>
diff --git a/build/de.cau.cs.kieler.spviz.targetplatform/pom.xml b/build/de.cau.cs.kieler.spviz.targetplatform/pom.xml
@@ -3,7 +3,6 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
-  <version>0.2.1-SNAPSHOT</version>
   <artifactId>de.cau.cs.kieler.spviz.targetplatform</artifactId>
   <packaging>eclipse-target-definition</packaging>
   <name>Software Project Visualization Target Platform</name>

diff --git a/build/pom.xml b/build/pom.xml
@@ -11,8 +11,8 @@
   <!-- Define a few properties used throughout all build profiles. -->
   <properties>
     <tycho-version>2.7.3</tycho-version>
-    <xtext-version>2.27.0</xtext-version>
-    <targetJdk>11</targetJdk>
+    <xtext-version>2.33.0</xtext-version>
+    <targetJdk>17</targetJdk>
 
     <!-- Non-breakable space, as normal spaces are trimmed. -->
     <sourceFeatureLabelSuffix>&#xA0;(Sources)</sourceFeatureLabelSuffix>
@@ -41,9 +41,9 @@
         <module>../plugins/de.cau.cs.kieler.spviz.spvizmodel.ui</module>
         <module>../features/de.cau.cs.kieler.spviz.feature</module>
         <module>../features/de.cau.cs.kieler.spviz.ui.feature</module>
-        <module>../plugins/de.cau.cs.kieler.spviz.spviz.tests</module>
+        <!-- <module>../plugins/de.cau.cs.kieler.spviz.spviz.tests</module> --> <!-- You requested to install 'org.eclipse.equinox.p2.iu; org.junit.jupiter.api [5.0.0,6.0.0)' but it could not be found -->
         <!-- <module>../plugins/de.cau.cs.kieler.spviz.spviz.ui.tests</module> -->
-        <module>../plugins/de.cau.cs.kieler.spviz.spvizmodel.tests</module>
+        <!-- <module>../plugins/de.cau.cs.kieler.spviz.spvizmodel.tests</module> -->
         <!-- <module>../plugins/de.cau.cs.kieler.spviz.spvizmodel.ui.tests</module> -->
         <module>de.cau.cs.kieler.spviz.repository</module>
       </modules>
@@ -170,6 +170,77 @@
           </configuration>
         </plugin>
 
+        <!-- Configure Eclipse m2e to ignore certain plugin goals when integrating Maven build
+          settings into Eclipse. -->
+        <plugin>
+          <groupId>org.eclipse.m2e</groupId>
+          <artifactId>lifecycle-mapping</artifactId>
+          <version>1.0.0</version>
+          <configuration>
+            <lifecycleMappingMetadata>
+              <pluginExecutions>
+                <pluginExecution>
+                  <pluginExecutionFilter>
+                    <groupId>org.eclipse.tycho</groupId>
+                    <artifactId>tycho-compiler-plugin</artifactId>
+                    <versionRange>${tycho-version}</versionRange>
+                    <goals>
+                      <goal>compile</goal>
+                      <goal>testCompile</goal>
+                      <goal>validate-classpath</goal>
+                    </goals>
+                  </pluginExecutionFilter>
+                  <action>
+                    <ignore/>
+                  </action>
+                </pluginExecution>
+                <pluginExecution>
+                  <pluginExecutionFilter>
+                    <groupId>org.eclipse.tycho</groupId>
+                    <artifactId>tycho-packaging-plugin</artifactId>
+                    <versionRange>${tycho-version}</versionRange>
+                    <goals>
+                      <goal>build-qualifier</goal>
+                      <goal>build-qualifier-aggregator</goal>
+                      <goal>validate-id</goal>
+                      <goal>validate-version</goal>
+                    </goals>
+                  </pluginExecutionFilter>
+                  <action>
+                    <ignore/>
+                  </action>
+                </pluginExecution>
+                <pluginExecution>
+                  <pluginExecutionFilter>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-clean-plugin</artifactId>
+                    <versionRange>[3.0.0,)</versionRange>
+                    <goals>
+                      <goal>clean</goal>
+                    </goals>
+                  </pluginExecutionFilter>
+                  <action>
+                    <ignore/>
+                  </action>
+                </pluginExecution>
+                <pluginExecution>
+                  <pluginExecutionFilter>
+                    <groupId>org.eclipse.tycho</groupId>
+                    <artifactId>target-platform-configuration</artifactId>
+                    <versionRange>[2.7.3,)</versionRange>
+                    <goals>
+                      <goal>target-platform</goal>
+                    </goals>
+                  </pluginExecutionFilter>
+                  <action>
+                    <ignore></ignore>
+                  </action>
+                </pluginExecution>
+              </pluginExecutions>
+            </lifecycleMappingMetadata>
+          </configuration>
+        </plugin>
+
       </plugins>
     </pluginManagement>
   </build>

diff --git a/features/de.cau.cs.kieler.spviz.feature/.settings/org.eclipse.core.resources.prefs b/features/de.cau.cs.kieler.spviz.feature/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/features/de.cau.cs.kieler.spviz.feature/pom.xml b/features/de.cau.cs.kieler.spviz.feature/pom.xml
@@ -9,8 +9,6 @@
     <relativePath>../../build/pom.xml</relativePath>
   </parent>
 
-  <groupId>de.cau.cs.kieler.spviz</groupId>
   <artifactId>de.cau.cs.kieler.spviz.feature</artifactId>
-  <version>0.2.1-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/de.cau.cs.kieler.spviz.ui.feature/.settings/org.eclipse.core.resources.prefs b/features/de.cau.cs.kieler.spviz.ui.feature/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		eclipse.preferences.version=1
		encoding/<project>=UTF-8