Skip to content

Commit 632627d

Browse files
committed
Update examples to JDK 17
1 parent e4d44cd commit 632627d

9 files changed

Lines changed: 35 additions & 20 deletions

File tree

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<classpath>
3-
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
3+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
4+
<attributes>
5+
<attribute name="module" value="true"/>
6+
</attributes>
7+
</classpathentry>
48
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
5-
<classpathentry kind="src" path="src/"/>
9+
<classpathentry kind="src" path="src"/>
610
<classpathentry kind="output" path="target/classes"/>
711
</classpath>

plugins/eclipse/examples/projects/org.atlanmod.neoemf.eclipse.examples.demo/.project

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333
</buildSpec>
3434
<natures>
3535
<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
36-
<nature>org.eclipse.m2e.core.maven2Nature</nature>
3736
<nature>org.eclipse.pde.PluginNature</nature>
3837
<nature>org.eclipse.jdt.core.javanature</nature>
3938
</natures>

plugins/eclipse/examples/projects/org.atlanmod.neoemf.eclipse.examples.tutorial/.project

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333
</buildSpec>
3434
<natures>
3535
<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
36-
<nature>org.eclipse.m2e.core.maven2Nature</nature>
3736
<nature>org.eclipse.pde.PluginNature</nature>
3837
<nature>org.eclipse.jdt.core.javanature</nature>
3938
</natures>

plugins/eclipse/examples/projects/org.atlanmod.neoemf.eclipse.examples.tutorial/build.properties

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
#
21
source..=src/,\
32
src-gen/
4-
output..=target/
3+
output.. = target/classes/
54
bin.includes=.,\
65
META-INF/,\
76
plugin.xml,\
Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<classpath>
3-
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
43
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
5-
<classpathentry kind="src" path="src-gen/"/>
4+
<classpathentry kind="src" path="src-gen"/>
5+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
6+
<attributes>
7+
<attribute name="module" value="true"/>
8+
</attributes>
9+
</classpathentry>
610
<classpathentry kind="output" path="target/classes"/>
711
</classpath>

plugins/eclipse/examples/projects/org.eclipse.gmt.modisco.java/.project

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,6 @@
55
<projects>
66
</projects>
77
<buildSpec>
8-
<buildCommand>
9-
<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
10-
<arguments>
11-
</arguments>
12-
</buildCommand>
138
<buildCommand>
149
<name>org.eclipse.jdt.core.javabuilder</name>
1510
<arguments>
@@ -32,8 +27,6 @@
3227
</buildCommand>
3328
</buildSpec>
3429
<natures>
35-
<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
36-
<nature>org.eclipse.m2e.core.maven2Nature</nature>
3730
<nature>org.eclipse.pde.PluginNature</nature>
3831
<nature>org.eclipse.jdt.core.javanature</nature>
3932
</natures>

plugins/eclipse/examples/projects/org.eclipse.gmt.modisco.java/build.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#
22
source..=src-gen/
3-
output..=target/
3+
output.. = target/classes/
44
bin.includes=.,\
55
META-INF/,\
66
plugin.xml,\

plugins/eclipse/releng/configuration/pom.xml

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,18 +23,20 @@
2323
<compare.url>https://download.eclipse.org/modeling/emf/compare/updates/releases/3.3/R202505141345/</compare.url>
2424
<eclipse.url>https://download.eclipse.org/releases/2025-09/</eclipse.url>
2525
<emf.url>https://download.eclipse.org/modeling/emf/emf/builds/release/2.39.0/</emf.url>
26-
26+
<jdk.version>17</jdk.version>
2727
<maven.test.skip>true</maven.test.skip>
2828
<maven.deploy.skip>true</maven.deploy.skip>
2929
<tycho-plugin.version>5.0.0</tycho-plugin.version>
3030
<apache.felix.version>2.2.12</apache.felix.version>
31-
<maven.compiler.source>17</maven.compiler.source>
32-
<maven.compiler.target>17</maven.compiler.target>
31+
<maven.compiler.source>${jdk.version}</maven.compiler.source>
32+
<maven.compiler.target>${jdk.version}</maven.compiler.target>
3333
<maven.compiler.debug>true</maven.compiler.debug>
34+
<maven.compiler.release>${jdk.version}</maven.compiler.release>
3435
<maven.compiler.showWarnings>true</maven.compiler.showWarnings>
3536
<maven.compiler.showDeprecation>true</maven.compiler.showDeprecation>
37+
<maven.compiler.release>17</maven.compiler.release>
3638
<maven.required.version>3.9.0</maven.required.version>
37-
<neoemf.version>2.1.0</neoemf.version>
39+
<neoemf.version>2.1.1-SNAPSHOT</neoemf.version>
3840
</properties>
3941

4042
<repositories>
@@ -154,6 +156,9 @@
154156
<configuration>
155157
<copyResources>false</copyResources>
156158
<useProjectSettings>false</useProjectSettings>
159+
<source>${maven.compiler.source}</source>
160+
<target>${maven.compiler.target}</target>
161+
<release>${maven.compiler.release}</release>
157162
</configuration>
158163
</plugin>
159164

pom.xml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -574,6 +574,18 @@
574574
<artifactId>maven-gpg-plugin</artifactId>
575575
<version>3.2.7</version>
576576
</plugin>
577+
578+
<plugin>
579+
<groupId>org.apache.maven.plugins</groupId>
580+
<artifactId>maven-clean-plugin</artifactId>
581+
<version>3.4.1</version>
582+
</plugin>
583+
584+
<plugin>
585+
<groupId>org.apache.maven.plugins</groupId>
586+
<artifactId>maven-source-plugin</artifactId>
587+
<version>3.3.1</version>
588+
</plugin>
577589
</plugins>
578590
</pluginManagement>
579591
</build>

0 commit comments

Comments
 (0)