Skip to content

Commit 5ade64e

Browse files
authored
Bump to eclipse 2023 06 (#232)
* use xtend 2.27 in order to compile with java 17 * use tycho 3.0.4 * adapt pom form tycho 3.0.4 * enforce java 17 * pomfirst use xtend 2.31 * add ToStringBuilder required by lsp4j 0.21 cf. eclipse-lsp4j/lsp4j#742 * use lsp4j 0.21 * use newer version of the MergeableManifest from xtext
1 parent f889fb5 commit 5ade64e

File tree

13 files changed

+470
-67
lines changed

13 files changed

+470
-67
lines changed

.mvn/extensions.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@
33
<extension>
44
<groupId>org.eclipse.tycho</groupId>
55
<artifactId>tycho-build</artifactId>
6-
<version>2.7.3</version>
6+
<version>3.0.4</version>
77
</extension>
88
</extensions>

framework/framework_commons/pomfirst/org.eclipse.gemoc.xdsmlframework.api/pom.xml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
<plugin>
2828
<groupId>org.codehaus.mojo</groupId>
2929
<artifactId>build-helper-maven-plugin</artifactId>
30-
<version>3.2.0</version>
3130
<executions>
3231
<execution>
3332
<phase>generate-sources</phase>
@@ -44,7 +43,6 @@
4443
</plugin>
4544
<plugin>
4645
<artifactId>maven-resources-plugin</artifactId>
47-
<version>3.0.2</version>
4846
<executions>
4947
<execution>
5048
<id>copy-resource-src</id>

pom.xml

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@
4242
<tycho.scmUrl>scm:git:https://github.com/eclipse/gemoc-studio-modeldebugging.git</tycho.scmUrl>
4343
<!-- <sonar.projectKey>gemoc:${project.groupId}:${project.artifactId}</sonar.projectKey>-->
4444

45-
<maven.compiler.source>11</maven.compiler.source>
46-
<maven.compiler.target>11</maven.compiler.target>
45+
<maven.compiler.source>17</maven.compiler.source>
46+
<maven.compiler.target>17</maven.compiler.target>
4747
<org.mapstruct.version>1.4.2.Final</org.mapstruct.version>
4848
<maven.deploy.skip>false</maven.deploy.skip>
4949
</properties>
@@ -95,23 +95,20 @@
9595
<goal>plugin-source</goal>
9696
</goals>
9797
</execution>
98+
<execution>
99+
<id>feature-source</id>
100+
<goals>
101+
<goal>feature-source</goal>
102+
</goals>
103+
<configuration>
104+
<excludes>
105+
<!-- provide plug-ins not containing any source code -->
106+
<!-- also possible to exclude feature-->
107+
</excludes>
108+
</configuration>
109+
</execution>
98110
</executions>
99111
</plugin>
100-
<!-- enable source feature generation -->
101-
<plugin>
102-
<groupId>org.eclipse.tycho.extras</groupId>
103-
<artifactId>tycho-source-feature-plugin</artifactId>
104-
<version>${tycho-version}</version>
105-
<executions>
106-
<execution>
107-
<id>source-feature</id>
108-
<phase>package</phase>
109-
<goals>
110-
<goal>source-feature</goal>
111-
</goals>
112-
</execution>
113-
</executions>
114-
</plugin>
115112
<plugin>
116113
<groupId>org.eclipse.tycho</groupId>
117114
<artifactId>tycho-p2-plugin</artifactId>
@@ -149,6 +146,8 @@
149146
<artifactId>target-platform-configuration</artifactId>
150147
<version>${tycho-version}</version>
151148
<configuration>
149+
<!-- Optional set the Java version you are using-->
150+
<executionEnvironment>JavaSE-17</executionEnvironment>
152151
<target>
153152
<artifact>
154153
<groupId>org.eclipse.gemoc.gemoc-studio.bundle</groupId>

pomfirst/pom.xml

Lines changed: 22 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,14 +33,13 @@
3333

3434
<properties>
3535
<tycho.version>1.5.1</tycho.version>
36-
<xtend.version>2.18.0</xtend.version>
36+
<xtend.version>2.31.0</xtend.version>
3737
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
3838
<eclipse-repo.url>http://download.eclipse.org/releases/photon</eclipse-repo.url>
3939
<gemoc-repo.url>https://download.eclipse.org/gemoc/updates/nightly</gemoc-repo.url>
40-
<maven.compiler.source>1.8</maven.compiler.source>
41-
<maven.compiler.target>1.8</maven.compiler.target>
40+
<maven.compiler.source>17</maven.compiler.source>
41+
<maven.compiler.target>17</maven.compiler.target>
4242
<tycho.scmUrl>scm:git:https://github.com/eclipse/gemoc-studio-modeldebugging.git</tycho.scmUrl>
43-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
4443
</properties>
4544

4645

@@ -106,8 +105,26 @@
106105
</dependency>
107106
</dependencies> -->
108107
</plugin>
109-
110108
</plugins>
109+
110+
<pluginManagement>
111+
<plugins>
112+
<plugin>
113+
<groupId>org.codehaus.mojo</groupId>
114+
<artifactId>build-helper-maven-plugin</artifactId>
115+
<version>3.2.0</version>
116+
</plugin>
117+
<plugin>
118+
<artifactId>maven-resources-plugin</artifactId>
119+
<version>3.0.2</version>
120+
</plugin>
121+
<plugin>
122+
<groupId>org.apache.maven.plugins</groupId>
123+
<artifactId>maven-compiler-plugin</artifactId>
124+
<version>3.8.1</version>
125+
</plugin>
126+
</plugins>
127+
</pluginManagement>
111128
</build>
112129

113130

0 commit comments

Comments
 (0)