Skip to content

Commit b4be963

Browse files
updated to Eclipse 2023-12, KLighD 3.0.1, and related. Enforce Java 17.
Fixed some generic warnings. Deactivated tests in Maven build.
1 parent 78d0840 commit b4be963

File tree

70 files changed

+313
-552
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

70 files changed

+313
-552
lines changed

build/de.cau.cs.kieler.spviz.repository/category.xml

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,8 @@
2020
<category name="spviz"/>
2121
</feature>
2222

23-
<repository-reference location="https://download.eclipse.org/releases/2022-06/" enabled="true" />
24-
<repository-reference location="https://download.eclipse.org/lsp4j/updates/releases/0.14.0/" enabled="true" />
25-
<repository-reference location="https://download.eclipse.org/tools/orbit/downloads/drops/R20220531185310/repository/" enabled="true" />
26-
<repository-reference location="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.27.0/" enabled="true" />
27-
<repository-reference location="https://download.eclipse.org/elk/updates/releases/0.8.1/" enabled="true" />
28-
<repository-reference location="https://kieler.github.io/KLighD/v2.2.0/" enabled="true" />
29-
<repository-reference location="https://rtsys.informatik.uni-kiel.de/~kieler/updatesite/sprotty/0.9.0/" enabled="true" />
30-
<repository-reference location="https://repo1.maven.org/maven2/.m2e/connectors/m2eclipse-tycho/0.8.1/N/0.8.1.201704211436/" enabled="true" />
23+
<repository-reference location="https://download.eclipse.org/releases/2023-12" enabled="true" />
24+
<repository-reference location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/release/4.30.0/" enabled="true" />
25+
<repository-reference location="https://download.eclipse.org/elk/updates/releases/0.9.1/" enabled="true" />
26+
<repository-reference location="https://kieler.github.io/KLighD/v3.0.1/" enabled="true" />
3127
</site>

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
44
<modelVersion>4.0.0</modelVersion>
55

6-
<version>0.2.1-SNAPSHOT</version>
76
<artifactId>de.cau.cs.kieler.spviz.repository</artifactId>
87
<packaging>eclipse-repository</packaging>
98
<name>Kieler Software Project Visualization Repository</name>

build/de.cau.cs.kieler.spviz.targetplatform/de.cau.cs.kieler.spviz.targetplatform.target

Lines changed: 6 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -10,41 +10,26 @@
1010
<unit id="org.eclipse.wildwebdeveloper.xml.feature.feature.group" version="0.0.0"/>
1111
<unit id="org.eclipse.m2e.feature.feature.group" version="0.0.0"/>
1212
<unit id="org.eclipse.m2e.sdk.feature.feature.group" version="0.0.0"/>
13-
<repository location="https://download.eclipse.org/releases/2022-06/"/>
14-
</location>
15-
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="false" type="InstallableUnit">
16-
<unit id="org.eclipse.lsp4j.sdk.feature.group" version="0.0.0"/>
17-
<repository location="https://download.eclipse.org/lsp4j/updates/releases/0.14.0/"/>
13+
<unit id="org.eclipse.xtext.sdk.feature.group" version="0.0.0"/>
14+
<repository location="https://download.eclipse.org/releases/2023-12"/>
1815
</location>
1916
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="false" type="InstallableUnit">
2017
<unit id="com.google.inject" version="0.0.0"/>
21-
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20220531185310/repository/"/>
22-
</location>
23-
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="false" type="InstallableUnit">
24-
<unit id="org.eclipse.xtext.sdk.feature.group" version="0.0.0"/>
25-
<repository location="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.27.0/"/>
18+
<unit id="junit-jupiter-api" version="0.0.0"/>
19+
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/release/4.30.0/"/>
2620
</location>
2721
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="false" type="InstallableUnit">
2822
<unit id="org.eclipse.elk.graph.json.feature.feature.group" version="0.0.0"/>
2923
<unit id="org.eclipse.elk.graphviz.feature.feature.group" version="0.0.0"/>
3024
<unit id="org.eclipse.elk.sdk.feature.feature.group" version="0.0.0"/>
3125
<unit id="org.eclipse.elk.ui.feature.feature.group" version="0.0.0"/>
32-
<repository location="https://download.eclipse.org/elk/updates/releases/0.8.1/"/>
26+
<repository location="https://download.eclipse.org/elk/updates/releases/0.9.1/"/>
3327
</location>
3428
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="false" type="InstallableUnit">
3529
<unit id="de.cau.cs.kieler.klighd.freehep.feature.feature.group" version="0.0.0"/>
36-
<unit id="de.cau.cs.kieler.klighd.lsp" version="0.0.0"/>
3730
<unit id="de.cau.cs.kieler.kgraph.text.ide" version="0.0.0"/>
3831
<unit id="de.cau.cs.kieler.klighd.view.feature.feature.group" version="0.0.0"/>
39-
<repository location="http://kieler.github.io/KLighD/v2.2.0/"/>
40-
</location>
41-
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="false" type="InstallableUnit">
42-
<unit id="org.eclipse.sprotty" version="0.0.0"/>
43-
<repository location="https://rtsys.informatik.uni-kiel.de/~kieler/updatesite/sprotty/0.9.0/"/>
44-
</location>
45-
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="false" type="InstallableUnit">
46-
<repository location="https://repo1.maven.org/maven2/.m2e/connectors/m2eclipse-tycho/0.8.1/N/0.8.1.201704211436/"/>
47-
<unit id="org.sonatype.tycho.m2e.feature.feature.group" version="0.8.1.201704211436"/>
32+
<repository location="http://kieler.github.io/KLighD/v3.0.1/"/>
4833
</location>
4934
</locations>
5035
</target>

build/de.cau.cs.kieler.spviz.targetplatform/pom.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
44
<modelVersion>4.0.0</modelVersion>
55

6-
<version>0.2.1-SNAPSHOT</version>
76
<artifactId>de.cau.cs.kieler.spviz.targetplatform</artifactId>
87
<packaging>eclipse-target-definition</packaging>
98
<name>Software Project Visualization Target Platform</name>

build/pom.xml

Lines changed: 75 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
<!-- Define a few properties used throughout all build profiles. -->
1212
<properties>
1313
<tycho-version>2.7.3</tycho-version>
14-
<xtext-version>2.27.0</xtext-version>
15-
<targetJdk>11</targetJdk>
14+
<xtext-version>2.33.0</xtext-version>
15+
<targetJdk>17</targetJdk>
1616

1717
<!-- Non-breakable space, as normal spaces are trimmed. -->
1818
<sourceFeatureLabelSuffix>&#xA0;(Sources)</sourceFeatureLabelSuffix>
@@ -41,9 +41,9 @@
4141
<module>../plugins/de.cau.cs.kieler.spviz.spvizmodel.ui</module>
4242
<module>../features/de.cau.cs.kieler.spviz.feature</module>
4343
<module>../features/de.cau.cs.kieler.spviz.ui.feature</module>
44-
<module>../plugins/de.cau.cs.kieler.spviz.spviz.tests</module>
44+
<!-- <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 -->
4545
<!-- <module>../plugins/de.cau.cs.kieler.spviz.spviz.ui.tests</module> -->
46-
<module>../plugins/de.cau.cs.kieler.spviz.spvizmodel.tests</module>
46+
<!-- <module>../plugins/de.cau.cs.kieler.spviz.spvizmodel.tests</module> -->
4747
<!-- <module>../plugins/de.cau.cs.kieler.spviz.spvizmodel.ui.tests</module> -->
4848
<module>de.cau.cs.kieler.spviz.repository</module>
4949
</modules>
@@ -170,6 +170,77 @@
170170
</configuration>
171171
</plugin>
172172

173+
<!-- Configure Eclipse m2e to ignore certain plugin goals when integrating Maven build
174+
settings into Eclipse. -->
175+
<plugin>
176+
<groupId>org.eclipse.m2e</groupId>
177+
<artifactId>lifecycle-mapping</artifactId>
178+
<version>1.0.0</version>
179+
<configuration>
180+
<lifecycleMappingMetadata>
181+
<pluginExecutions>
182+
<pluginExecution>
183+
<pluginExecutionFilter>
184+
<groupId>org.eclipse.tycho</groupId>
185+
<artifactId>tycho-compiler-plugin</artifactId>
186+
<versionRange>${tycho-version}</versionRange>
187+
<goals>
188+
<goal>compile</goal>
189+
<goal>testCompile</goal>
190+
<goal>validate-classpath</goal>
191+
</goals>
192+
</pluginExecutionFilter>
193+
<action>
194+
<ignore/>
195+
</action>
196+
</pluginExecution>
197+
<pluginExecution>
198+
<pluginExecutionFilter>
199+
<groupId>org.eclipse.tycho</groupId>
200+
<artifactId>tycho-packaging-plugin</artifactId>
201+
<versionRange>${tycho-version}</versionRange>
202+
<goals>
203+
<goal>build-qualifier</goal>
204+
<goal>build-qualifier-aggregator</goal>
205+
<goal>validate-id</goal>
206+
<goal>validate-version</goal>
207+
</goals>
208+
</pluginExecutionFilter>
209+
<action>
210+
<ignore/>
211+
</action>
212+
</pluginExecution>
213+
<pluginExecution>
214+
<pluginExecutionFilter>
215+
<groupId>org.apache.maven.plugins</groupId>
216+
<artifactId>maven-clean-plugin</artifactId>
217+
<versionRange>[3.0.0,)</versionRange>
218+
<goals>
219+
<goal>clean</goal>
220+
</goals>
221+
</pluginExecutionFilter>
222+
<action>
223+
<ignore/>
224+
</action>
225+
</pluginExecution>
226+
<pluginExecution>
227+
<pluginExecutionFilter>
228+
<groupId>org.eclipse.tycho</groupId>
229+
<artifactId>target-platform-configuration</artifactId>
230+
<versionRange>[2.7.3,)</versionRange>
231+
<goals>
232+
<goal>target-platform</goal>
233+
</goals>
234+
</pluginExecutionFilter>
235+
<action>
236+
<ignore></ignore>
237+
</action>
238+
</pluginExecution>
239+
</pluginExecutions>
240+
</lifecycleMappingMetadata>
241+
</configuration>
242+
</plugin>
243+
173244
</plugins>
174245
</pluginManagement>
175246
</build>
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
eclipse.preferences.version=1
2+
encoding/<project>=UTF-8

features/de.cau.cs.kieler.spviz.feature/pom.xml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@
99
<relativePath>../../build/pom.xml</relativePath>
1010
</parent>
1111

12-
<groupId>de.cau.cs.kieler.spviz</groupId>
1312
<artifactId>de.cau.cs.kieler.spviz.feature</artifactId>
14-
<version>0.2.1-SNAPSHOT</version>
1513
<packaging>eclipse-feature</packaging>
1614
</project>
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
eclipse.preferences.version=1
2+
encoding/<project>=UTF-8

0 commit comments

Comments
 (0)