Skip to content

Commit b02bc95

Browse files
natzeinatzei
committed
Update Xtext to version 2.33
- update Xsemantics - update Tomcat - build on Java 17
1 parent cf35910 commit b02bc95

File tree

15 files changed

+143
-95
lines changed

15 files changed

+143
-95
lines changed

Diff for: ‎Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM tomcat:9-jdk17
1+
FROM tomcat:10-jdk17
22

33
LABEL maintainer="[email protected]"
44

Diff for: ‎xyz.balzaclang.balzac.lib/.classpath

+13
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,18 @@
2323
<attribute name="maven.pomderived" value="true"/>
2424
</attributes>
2525
</classpathentry>
26+
<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
27+
<attributes>
28+
<attribute name="maven.pomderived" value="true"/>
29+
<attribute name="optional" value="true"/>
30+
</attributes>
31+
</classpathentry>
32+
<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
33+
<attributes>
34+
<attribute name="maven.pomderived" value="true"/>
35+
<attribute name="test" value="true"/>
36+
<attribute name="optional" value="true"/>
37+
</attributes>
38+
</classpathentry>
2639
<classpathentry kind="output" path="target/classes"/>
2740
</classpath>

Diff for: ‎xyz.balzaclang.balzac.parent/pom.xml

+61-18
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@
88
<packaging>pom</packaging>
99

1010
<properties>
11-
<mwe2Version>2.13.0</mwe2Version>
12-
<xtext-version>2.27.0</xtext-version>
13-
<tycho-version>2.6.0</tycho-version>
14-
<xsemantics-version>1.22.0-SNAPSHOT</xsemantics-version>
15-
<xsemantics-p2-url>http://download.eclipse.org/xsemantics/milestones/1.22</xsemantics-p2-url>
11+
<mwe2Version>2.16.0</mwe2Version>
12+
<xtext-version>2.33.0</xtext-version>
13+
<tycho-version>3.0.5</tycho-version>
14+
<xsemantics-version>1.24.0</xsemantics-version>
15+
<xsemantics-p2-url>http://download.eclipse.org/xsemantics/milestones/1.24</xsemantics-p2-url>
1616
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
17-
<maven.compiler.source>11</maven.compiler.source>
18-
<maven.compiler.target>11</maven.compiler.target>
17+
<maven.compiler.source>17</maven.compiler.source>
18+
<maven.compiler.target>17</maven.compiler.target>
1919
<maven.compiler.release>17</maven.compiler.release>
2020
<tycho.target.execution-environment>JavaSE-17</tycho.target.execution-environment>
2121
<lib.version>1.0.0-SNAPSHOT</lib.version>
@@ -67,28 +67,20 @@
6767
<plugin>
6868
<groupId>org.eclipse.tycho</groupId>
6969
<artifactId>tycho-source-plugin</artifactId>
70-
<version>${tycho-version}</version>
7170
<executions>
7271
<execution>
7372
<id>plugin-source</id>
7473
<goals>
7574
<goal>plugin-source</goal>
7675
</goals>
7776
</execution>
78-
</executions>
79-
</plugin>
80-
<plugin>
81-
<groupId>org.eclipse.tycho.extras</groupId>
82-
<artifactId>tycho-source-feature-plugin</artifactId>
83-
<version>${tycho-version}</version>
84-
<executions>
8577
<execution>
86-
<id>source-feature</id>
87-
<phase>package</phase>
78+
<id>feature-source</id>
8879
<goals>
89-
<goal>source-feature</goal>
80+
<goal>feature-source</goal>
9081
</goals>
9182
</execution>
83+
9284
</executions>
9385
</plugin>
9486
<plugin>
@@ -266,6 +258,9 @@
266258
</versionRange>
267259
<goals>
268260
<goal>compile</goal>
261+
<goal>
262+
validate-classpath
263+
</goal>
269264
</goals>
270265
</pluginExecutionFilter>
271266
<action>
@@ -352,6 +347,32 @@
352347
<enabled>false</enabled>
353348
</snapshots>
354349
</repository>
350+
<!-- This must be disabled explicitly, otherwise it is enabled by https://github.com/mojohaus/mojo-parent
351+
which is taken from exec-maven-plugin from at least version 1.6.0 -->
352+
<repository>
353+
<id>ossrh-snapshots</id>
354+
<name>ossrh-snapshots</name>
355+
<releases>
356+
<enabled>false</enabled>
357+
</releases>
358+
<snapshots>
359+
<enabled>false</enabled>
360+
</snapshots>
361+
<url>http://oss.sonatype.org/content/repositories/snapshots</url>
362+
</repository>
363+
<!-- This is enabled by /org/sonatype/oss/oss-parent/7 used as parent by
364+
org/xtext/antlr-generator/3.2.1 -->
365+
<repository>
366+
<id>sonatype-nexus-snapshots</id>
367+
<name>Sonatype Nexus Snapshots</name>
368+
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
369+
<releases>
370+
<enabled>false</enabled>
371+
</releases>
372+
<snapshots>
373+
<enabled>false</enabled>
374+
</snapshots>
375+
</repository>
355376
</repositories>
356377
<pluginRepositories>
357378
<pluginRepository>
@@ -365,6 +386,28 @@
365386
<enabled>false</enabled>
366387
</snapshots>
367388
</pluginRepository>
389+
<pluginRepository>
390+
<id>ossrh-snapshots</id>
391+
<name>ossrh-snapshots</name>
392+
<releases>
393+
<enabled>false</enabled>
394+
</releases>
395+
<snapshots>
396+
<enabled>false</enabled>
397+
</snapshots>
398+
<url>http://oss.sonatype.org/content/repositories/snapshots</url>
399+
</pluginRepository>
400+
<pluginRepository>
401+
<id>sonatype-nexus-snapshots</id>
402+
<name>Sonatype Nexus Snapshots</name>
403+
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
404+
<releases>
405+
<enabled>false</enabled>
406+
</releases>
407+
<snapshots>
408+
<enabled>false</enabled>
409+
</snapshots>
410+
</pluginRepository>
368411
</pluginRepositories>
369412
<profiles>
370413
<profile>

Diff for: ‎xyz.balzaclang.balzac.target/xyz.balzaclang.balzac.target.target

+10-10
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,19 @@
77
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20210223232630/repository"/>
88
<unit id="org.apache.commons.logging" version="1.2.0.v20180409-1502"/>
99
</location>
10-
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
11-
<repository location="http://download.eclipse.org/releases/2022-06"/>
12-
<unit id="org.eclipse.xtext.sdk.feature.group" version="2.27.0.v20220530-0508"/>
13-
</location>
1410
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
15-
<repository location="http://download.eclipse.org/xsemantics/milestones/1.22"/>
16-
<unit id="org.eclipse.xsemantics.feature.feature.group" version="1.22.0.v20220621-0842"/>
17-
<unit id="org.eclipse.xsemantics.runtime.feature.feature.group" version="1.22.0.v20220621-0842"/>
18-
<unit id="org.eclipse.xsemantics.sdk.feature.group" version="1.22.0.v20220621-0842"/>
11+
<repository location="http://download.eclipse.org/xsemantics/milestones/1.24"/>
12+
<unit id="org.eclipse.xsemantics.feature.feature.group" version="1.24.0.v20231130-1618"/>
13+
<unit id="org.eclipse.xsemantics.runtime.feature.feature.group" version="1.24.0.v20231130-1618"/>
14+
<unit id="org.eclipse.xsemantics.sdk.feature.group" version="1.24.0.v20231130-1618"/>
1915
</location>
2016
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
21-
<repository location="http://download.eclipse.org/releases/2022-06"/>
22-
<unit id="org.eclipse.emf.mwe2.runtime.sdk.feature.group" version="2.13.0.v20220519-1115"/>
17+
<repository location="http://download.eclipse.org/releases/2023-12"/>
18+
<unit id="org.eclipse.xtext.sdk.feature.group" version="2.33.0.v20231121-0955"/>
19+
</location>
20+
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
21+
<repository location="http://download.eclipse.org/releases/2023-12"/>
22+
<unit id="org.eclipse.emf.mwe2.runtime.sdk.feature.group" version="2.16.0.v20231117-0522"/>
2323
</location>
2424
</locations>
2525
<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>

Diff for: ‎xyz.balzaclang.balzac.ui.tests/META-INF/MANIFEST.MF

+2-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@ Require-Bundle: xyz.balzaclang.balzac.ui,
1414
org.eclipse.xtext.xbase.junit,
1515
org.eclipse.core.runtime,
1616
org.eclipse.ui.workbench;resolution:=optional,
17-
org.eclipse.xtext.ui.testing
17+
org.eclipse.xtext.ui.testing,
18+
org.eclipse.xtext.xbase.ui.testing
1819
Bundle-RequiredExecutionEnvironment: JavaSE-17
1920
Export-Package: xyz.balzaclang.ui.tests;x-internal=true
2021
Import-Package: org.hamcrest.core,

Diff for: ‎xyz.balzaclang.balzac.web/.classpath

+6-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,12 @@
88
</classpathentry>
99
<classpathentry kind="src" path="src-gen"/>
1010
<classpathentry kind="src" path="xtend-gen"/>
11-
<classpathentry kind="src" path="src-resources"/>
11+
<classpathentry excluding="**" kind="src" output="target/classes" path="src-resources">
12+
<attributes>
13+
<attribute name="maven.pomderived" value="true"/>
14+
<attribute name="optional" value="true"/>
15+
</attributes>
16+
</classpathentry>
1217
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
1318
<attributes>
1419
<attribute name="maven.pomderived" value="true"/>

Diff for: ‎xyz.balzaclang.balzac.web/WebRoot/index.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
<link rel="stylesheet" type="text/css" href="webjars/codemirror/5.49.0/lib/codemirror.css" />
1313
<link rel="stylesheet" type="text/css" href="webjars/codemirror/5.49.0/addon/hint/show-hint.css" />
14-
<link rel="stylesheet" type="text/css" href="xtext/2.25.0/xtext-codemirror.css"/>
14+
<link rel="stylesheet" type="text/css" href="xtext/2.33.0/xtext-codemirror.css"/>
1515

1616
<!-- Loading buttons -->
1717
<link rel="stylesheet" type="text/css" href="loading-btn/loading.css"/>
@@ -39,7 +39,7 @@
3939
paths: {
4040
"xtext/balzac": "xtext-resources/generated/mode-balzac",
4141
"jquery": "webjars/jquery/3.4.1/jquery.min",
42-
"xtext/xtext-codemirror": "xtext/2.27.0/xtext-codemirror",
42+
"xtext/xtext-codemirror": "xtext/2.33.0/xtext-codemirror",
4343
"bootstrap": "webjars/bootstrap/4.3.1/js/bootstrap.bundle.min",
4444
"bootstrap-toggle": "webjars/bootstrap-toggle/2.2.2/js/bootstrap-toggle.min"
4545
},

Diff for: ‎xyz.balzaclang.balzac.web/WebRoot/xtext-resources/generated/mode-balzac.js

+21-21
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
define(["codemirror", "codemirror/addon/mode/simple"], function(CodeMirror, SimpleMode) {
2-
var keywords = "AIAO|AINO|AISO|BTC|SIAO|SINO|SISO|_|absLock|address|assert|between|block|bool|boolean|checkBlock|checkBlockDelay|checkDate|checkTimeDelay|const|date|else|eval|false|fees|from|fun|hash|hash160|hash256|if|import|input|int|key|mainnet|max|min|network|of|output|package|participant|private|pubkey|relLock|ripemd160|sha1|sha256|sig|signature|size|string|testnet|then|this|toAddress|toPubkey|transaction|true|txid|value|versig|void";
3-
CodeMirror.defineSimpleMode("xtext/balzac", {
4-
start: [
5-
{token: "comment", regex: "\\/\\/.*$"},
6-
{token: "comment", regex: "\\/\\*", next : "comment"},
7-
{token: "string", regex: '["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'},
8-
{token: "string", regex: "['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"},
9-
{token: "constant.numeric", regex: "[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"},
10-
{token: "lparen", regex: "[\\[({]"},
11-
{token: "rparen", regex: "[\\])}]"},
12-
{token: "keyword", regex: "\\b(?:" + keywords + ")\\b"}
13-
],
14-
comment: [
15-
{token: "comment", regex: ".*?\\*\\/", next : "start"},
16-
{token: "comment", regex: ".+"}
17-
],
18-
meta: {
19-
dontIndentStates: ["comment"],
20-
lineComment: "//"
21-
}
22-
});
2+
var keywords = "AIAO|AINO|AISO|BTC|SIAO|SINO|SISO|_|absLock|address|assert|between|block|bool|boolean|checkBlock|checkBlockDelay|checkDate|checkTimeDelay|const|date|else|eval|false|fees|from|fun|hash|hash160|hash256|if|import|input|int|key|mainnet|max|min|network|of|output|package|participant|private|pubkey|relLock|ripemd160|sha1|sha256|sig|signature|size|string|testnet|then|this|toAddress|toPubkey|transaction|true|txid|value|versig|void";
3+
CodeMirror.defineSimpleMode("xtext/balzac", {
4+
start: [
5+
{token: "comment", regex: "\\/\\/.*$"},
6+
{token: "comment", regex: "\\/\\*", next : "comment"},
7+
{token: "string", regex: '["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'},
8+
{token: "string", regex: "['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"},
9+
{token: "constant.numeric", regex: "[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"},
10+
{token: "lparen", regex: "[\\[({]"},
11+
{token: "rparen", regex: "[\\])}]"},
12+
{token: "keyword", regex: "\\b(?:" + keywords + ")\\b"}
13+
],
14+
comment: [
15+
{token: "comment", regex: ".*?\\*\\/", next : "start"},
16+
{token: "comment", regex: ".+"}
17+
],
18+
meta: {
19+
dontIndentStates: ["comment"],
20+
lineComment: "//"
21+
}
22+
});
2323
});

Diff for: ‎xyz.balzaclang.balzac.web/pom.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -177,9 +177,9 @@
177177
<version>2.2.2</version>
178178
</dependency>
179179
<dependency>
180-
<groupId>javax.servlet</groupId>
181-
<artifactId>javax.servlet-api</artifactId>
182-
<version>4.0.1</version>
180+
<groupId>jakarta.servlet</groupId>
181+
<artifactId>jakarta.servlet-api</artifactId>
182+
<version>6.0.0</version>
183183
<scope>provided</scope>
184184
</dependency>
185185
<dependency>

Diff for: ‎xyz.balzaclang.balzac.web/src/xyz/balzaclang/web/BalzacServlet.xtend

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818
*/
1919
package xyz.balzaclang.web
2020

21-
import javax.servlet.annotation.WebServlet
2221
import org.eclipse.xtext.util.DisposableRegistry
2322
import org.eclipse.xtext.web.servlet.XtextServlet
23+
import jakarta.servlet.annotation.WebServlet
2424

2525
/**
2626
* Deploy this class into a servlet container to enable DSL-specific services.

Diff for: ‎xyz.balzaclang.balzac.web/src/xyz/balzaclang/web/VersionServlet.xtend

+5-5
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,17 @@
1616
package xyz.balzaclang.web
1717

1818
import com.google.gson.Gson
19+
import jakarta.servlet.ServletException
20+
import jakarta.servlet.annotation.WebServlet
21+
import jakarta.servlet.http.HttpServlet
22+
import jakarta.servlet.http.HttpServletRequest
23+
import jakarta.servlet.http.HttpServletResponse
1924
import java.io.IOException
2025
import java.time.Instant
2126
import java.time.LocalDateTime
2227
import java.time.ZoneOffset
2328
import java.time.format.DateTimeFormatter
2429
import java.util.Properties
25-
import javax.servlet.ServletException
26-
import javax.servlet.annotation.WebServlet
27-
import javax.servlet.http.HttpServlet
28-
import javax.servlet.http.HttpServletRequest
29-
import javax.servlet.http.HttpServletResponse
3030
import org.eclipse.xtend.lib.annotations.Accessors
3131
import org.slf4j.Logger
3232
import org.slf4j.LoggerFactory

Diff for: ‎xyz.balzaclang.balzac.web/src/xyz/balzaclang/web/WebUtilsServlet.xtend

+5-5
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@ package xyz.balzaclang.web
1717

1818
import com.google.gson.Gson
1919
import com.google.gson.JsonParseException
20+
import jakarta.servlet.ServletException
21+
import jakarta.servlet.annotation.WebServlet
22+
import jakarta.servlet.http.HttpServlet
23+
import jakarta.servlet.http.HttpServletRequest
24+
import jakarta.servlet.http.HttpServletResponse
2025
import java.io.IOException
21-
import javax.servlet.ServletException
22-
import javax.servlet.annotation.WebServlet
23-
import javax.servlet.http.HttpServlet
24-
import javax.servlet.http.HttpServletRequest
25-
import javax.servlet.http.HttpServletResponse
2626
import org.apache.commons.io.IOUtils
2727
import org.eclipse.xtend.lib.annotations.Accessors
2828
import xyz.balzaclang.lib.model.Address

Diff for: ‎xyz.balzaclang.balzac/META-INF/MANIFEST.MF

+6-6
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,16 @@ Bundle-Vendor: University of Cagliari
66
Bundle-Version: 1.0.0.qualifier
77
Bundle-SymbolicName: xyz.balzaclang.balzac; singleton:=true
88
Bundle-ActivationPolicy: lazy
9-
Require-Bundle: org.eclipse.xtext;bundle-version="2.27.0",
9+
Require-Bundle: org.eclipse.xtext;bundle-version="2.33.0",
1010
org.eclipse.xtext.xbase,
11-
org.eclipse.xsemantics.runtime;bundle-version="1.22.0",
12-
org.eclipse.equinox.security;bundle-version="1.3.900",
13-
org.eclipse.equinox.common;bundle-version="3.16.100",
11+
org.eclipse.xsemantics.runtime;bundle-version="1.24.0",
12+
org.eclipse.equinox.security;bundle-version="1.4.100",
13+
org.eclipse.equinox.common;bundle-version="3.18.200",
1414
org.eclipse.emf.ecore,
15-
org.eclipse.xtext.xbase.lib;bundle-version="2.27.0",
15+
org.eclipse.xtext.xbase.lib;bundle-version="2.33.0",
1616
org.eclipse.xtext.util,
1717
org.eclipse.emf.common,
18-
org.eclipse.xtend.lib;bundle-version="2.27.0",
18+
org.eclipse.xtend.lib;bundle-version="2.33.0",
1919
org.antlr.runtime;bundle-version="[3.2.0,3.2.1)"
2020
Bundle-RequiredExecutionEnvironment: JavaSE-17
2121
Export-Package: xyz.balzaclang,

Diff for: ‎xyz.balzaclang.balzac/pom.xml

+6-20
Original file line numberDiff line numberDiff line change
@@ -58,26 +58,6 @@
5858
see https://bugs.eclipse.org/bugs/show_bug.cgi?id=475098#c3 -->
5959
</configuration>
6060
<dependencies>
61-
<dependency>
62-
<groupId>org.eclipse.emf</groupId>
63-
<artifactId>org.eclipse.emf.mwe2.launch</artifactId>
64-
<version>${mwe2Version}</version>
65-
</dependency>
66-
<dependency>
67-
<groupId>org.eclipse.xtext</groupId>
68-
<artifactId>org.eclipse.xtext.common.types</artifactId>
69-
<version>${xtext-version}</version>
70-
</dependency>
71-
<dependency>
72-
<groupId>org.eclipse.xtext</groupId>
73-
<artifactId>org.eclipse.xtext.xtext.generator</artifactId>
74-
<version>${xtext-version}</version>
75-
</dependency>
76-
<dependency>
77-
<groupId>org.eclipse.xtext</groupId>
78-
<artifactId>org.eclipse.xtext.xbase</artifactId>
79-
<version>${xtext-version}</version>
80-
</dependency>
8161
<dependency>
8262
<groupId>org.eclipse.xtext</groupId>
8363
<artifactId>xtext-antlr-generator</artifactId>
@@ -123,6 +103,12 @@
123103
<plugin>
124104
<groupId>org.eclipse.xtend</groupId>
125105
<artifactId>xtend-maven-plugin</artifactId>
106+
<!-- <dependencies>-->
107+
<!-- <dependency>-->
108+
<!-- <groupId>javax.annotation</groupId>-->
109+
<!-- <artifactId>javax.annotation-api</artifactId>-->
110+
<!-- </dependency>-->
111+
<!-- </dependencies>-->
126112
</plugin>
127113

128114
<plugin>

0 commit comments

Comments
 (0)