diff --git a/Dockerfile b/Dockerfile index 91e8d015..7910fdac 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM tomcat:9-jdk17 +FROM tomcat:10-jdk17 LABEL maintainer="atzeinicola@gmail.com" diff --git a/xyz.balzaclang.balzac.lib/.classpath b/xyz.balzaclang.balzac.lib/.classpath index 9ee69199..16151437 100644 --- a/xyz.balzaclang.balzac.lib/.classpath +++ b/xyz.balzaclang.balzac.lib/.classpath @@ -23,5 +23,18 @@ + + + + + + + + + + + + + diff --git a/xyz.balzaclang.balzac.parent/pom.xml b/xyz.balzaclang.balzac.parent/pom.xml index 8b475bb3..45be14da 100644 --- a/xyz.balzaclang.balzac.parent/pom.xml +++ b/xyz.balzaclang.balzac.parent/pom.xml @@ -8,14 +8,14 @@ pom - 2.13.0 - 2.27.0 - 2.6.0 - 1.22.0-SNAPSHOT - http://download.eclipse.org/xsemantics/milestones/1.22 + 2.16.0 + 2.33.0 + 3.0.5 + 1.24.0 + http://download.eclipse.org/xsemantics/milestones/1.24 UTF-8 - 11 - 11 + 17 + 17 17 JavaSE-17 1.0.0-SNAPSHOT @@ -67,7 +67,6 @@ org.eclipse.tycho tycho-source-plugin - ${tycho-version} plugin-source @@ -75,20 +74,13 @@ plugin-source - - - - org.eclipse.tycho.extras - tycho-source-feature-plugin - ${tycho-version} - - source-feature - package + feature-source - source-feature + feature-source + @@ -266,6 +258,9 @@ compile + + validate-classpath + @@ -352,6 +347,32 @@ false + + + ossrh-snapshots + ossrh-snapshots + + false + + + false + + http://oss.sonatype.org/content/repositories/snapshots + + + + sonatype-nexus-snapshots + Sonatype Nexus Snapshots + https://oss.sonatype.org/content/repositories/snapshots + + false + + + false + + @@ -365,6 +386,28 @@ false + + ossrh-snapshots + ossrh-snapshots + + false + + + false + + http://oss.sonatype.org/content/repositories/snapshots + + + sonatype-nexus-snapshots + Sonatype Nexus Snapshots + https://oss.sonatype.org/content/repositories/snapshots + + false + + + false + + diff --git a/xyz.balzaclang.balzac.target/xyz.balzaclang.balzac.target.target b/xyz.balzaclang.balzac.target/xyz.balzaclang.balzac.target.target index aa87495c..c2b02733 100644 --- a/xyz.balzaclang.balzac.target/xyz.balzaclang.balzac.target.target +++ b/xyz.balzaclang.balzac.target/xyz.balzaclang.balzac.target.target @@ -7,19 +7,19 @@ - - - - - - - - + + + + - - + + + + + + diff --git a/xyz.balzaclang.balzac.ui.tests/META-INF/MANIFEST.MF b/xyz.balzaclang.balzac.ui.tests/META-INF/MANIFEST.MF index 9d308e24..c161b02d 100644 --- a/xyz.balzaclang.balzac.ui.tests/META-INF/MANIFEST.MF +++ b/xyz.balzaclang.balzac.ui.tests/META-INF/MANIFEST.MF @@ -14,7 +14,8 @@ Require-Bundle: xyz.balzaclang.balzac.ui, org.eclipse.xtext.xbase.junit, org.eclipse.core.runtime, org.eclipse.ui.workbench;resolution:=optional, - org.eclipse.xtext.ui.testing + org.eclipse.xtext.ui.testing, + org.eclipse.xtext.xbase.ui.testing Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: xyz.balzaclang.ui.tests;x-internal=true Import-Package: org.hamcrest.core, diff --git a/xyz.balzaclang.balzac.web/.classpath b/xyz.balzaclang.balzac.web/.classpath index 3d118749..e3650697 100644 --- a/xyz.balzaclang.balzac.web/.classpath +++ b/xyz.balzaclang.balzac.web/.classpath @@ -8,7 +8,12 @@ - + + + + + + diff --git a/xyz.balzaclang.balzac.web/WebRoot/index.html b/xyz.balzaclang.balzac.web/WebRoot/index.html index 234d15dc..1b4f4759 100644 --- a/xyz.balzaclang.balzac.web/WebRoot/index.html +++ b/xyz.balzaclang.balzac.web/WebRoot/index.html @@ -11,7 +11,7 @@ - + @@ -39,7 +39,7 @@ paths: { "xtext/balzac": "xtext-resources/generated/mode-balzac", "jquery": "webjars/jquery/3.4.1/jquery.min", - "xtext/xtext-codemirror": "xtext/2.27.0/xtext-codemirror", + "xtext/xtext-codemirror": "xtext/2.33.0/xtext-codemirror", "bootstrap": "webjars/bootstrap/4.3.1/js/bootstrap.bundle.min", "bootstrap-toggle": "webjars/bootstrap-toggle/2.2.2/js/bootstrap-toggle.min" }, diff --git a/xyz.balzaclang.balzac.web/WebRoot/xtext-resources/generated/mode-balzac.js b/xyz.balzaclang.balzac.web/WebRoot/xtext-resources/generated/mode-balzac.js index 45b69163..0f3a9f1d 100644 --- a/xyz.balzaclang.balzac.web/WebRoot/xtext-resources/generated/mode-balzac.js +++ b/xyz.balzaclang.balzac.web/WebRoot/xtext-resources/generated/mode-balzac.js @@ -1,23 +1,23 @@ define(["codemirror", "codemirror/addon/mode/simple"], function(CodeMirror, SimpleMode) { - 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"; - CodeMirror.defineSimpleMode("xtext/balzac", { - start: [ - {token: "comment", regex: "\\/\\/.*$"}, - {token: "comment", regex: "\\/\\*", next : "comment"}, - {token: "string", regex: '["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'}, - {token: "string", regex: "['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"}, - {token: "constant.numeric", regex: "[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"}, - {token: "lparen", regex: "[\\[({]"}, - {token: "rparen", regex: "[\\])}]"}, - {token: "keyword", regex: "\\b(?:" + keywords + ")\\b"} - ], - comment: [ - {token: "comment", regex: ".*?\\*\\/", next : "start"}, - {token: "comment", regex: ".+"} - ], - meta: { - dontIndentStates: ["comment"], - lineComment: "//" - } - }); + 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"; + CodeMirror.defineSimpleMode("xtext/balzac", { + start: [ + {token: "comment", regex: "\\/\\/.*$"}, + {token: "comment", regex: "\\/\\*", next : "comment"}, + {token: "string", regex: '["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'}, + {token: "string", regex: "['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"}, + {token: "constant.numeric", regex: "[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"}, + {token: "lparen", regex: "[\\[({]"}, + {token: "rparen", regex: "[\\])}]"}, + {token: "keyword", regex: "\\b(?:" + keywords + ")\\b"} + ], + comment: [ + {token: "comment", regex: ".*?\\*\\/", next : "start"}, + {token: "comment", regex: ".+"} + ], + meta: { + dontIndentStates: ["comment"], + lineComment: "//" + } + }); }); diff --git a/xyz.balzaclang.balzac.web/pom.xml b/xyz.balzaclang.balzac.web/pom.xml index 0d5fa986..593ff6be 100644 --- a/xyz.balzaclang.balzac.web/pom.xml +++ b/xyz.balzaclang.balzac.web/pom.xml @@ -177,9 +177,9 @@ 2.2.2 - javax.servlet - javax.servlet-api - 4.0.1 + jakarta.servlet + jakarta.servlet-api + 6.0.0 provided diff --git a/xyz.balzaclang.balzac.web/src/xyz/balzaclang/web/BalzacServlet.xtend b/xyz.balzaclang.balzac.web/src/xyz/balzaclang/web/BalzacServlet.xtend index 51d55ca6..a481106d 100644 --- a/xyz.balzaclang.balzac.web/src/xyz/balzaclang/web/BalzacServlet.xtend +++ b/xyz.balzaclang.balzac.web/src/xyz/balzaclang/web/BalzacServlet.xtend @@ -18,9 +18,9 @@ */ package xyz.balzaclang.web -import javax.servlet.annotation.WebServlet import org.eclipse.xtext.util.DisposableRegistry import org.eclipse.xtext.web.servlet.XtextServlet +import jakarta.servlet.annotation.WebServlet /** * Deploy this class into a servlet container to enable DSL-specific services. diff --git a/xyz.balzaclang.balzac.web/src/xyz/balzaclang/web/VersionServlet.xtend b/xyz.balzaclang.balzac.web/src/xyz/balzaclang/web/VersionServlet.xtend index ec3ed7e9..dda268ac 100644 --- a/xyz.balzaclang.balzac.web/src/xyz/balzaclang/web/VersionServlet.xtend +++ b/xyz.balzaclang.balzac.web/src/xyz/balzaclang/web/VersionServlet.xtend @@ -16,17 +16,17 @@ package xyz.balzaclang.web import com.google.gson.Gson +import jakarta.servlet.ServletException +import jakarta.servlet.annotation.WebServlet +import jakarta.servlet.http.HttpServlet +import jakarta.servlet.http.HttpServletRequest +import jakarta.servlet.http.HttpServletResponse import java.io.IOException import java.time.Instant import java.time.LocalDateTime import java.time.ZoneOffset import java.time.format.DateTimeFormatter import java.util.Properties -import javax.servlet.ServletException -import javax.servlet.annotation.WebServlet -import javax.servlet.http.HttpServlet -import javax.servlet.http.HttpServletRequest -import javax.servlet.http.HttpServletResponse import org.eclipse.xtend.lib.annotations.Accessors import org.slf4j.Logger import org.slf4j.LoggerFactory diff --git a/xyz.balzaclang.balzac.web/src/xyz/balzaclang/web/WebUtilsServlet.xtend b/xyz.balzaclang.balzac.web/src/xyz/balzaclang/web/WebUtilsServlet.xtend index 60a9cac9..8de98061 100644 --- a/xyz.balzaclang.balzac.web/src/xyz/balzaclang/web/WebUtilsServlet.xtend +++ b/xyz.balzaclang.balzac.web/src/xyz/balzaclang/web/WebUtilsServlet.xtend @@ -17,12 +17,12 @@ package xyz.balzaclang.web import com.google.gson.Gson import com.google.gson.JsonParseException +import jakarta.servlet.ServletException +import jakarta.servlet.annotation.WebServlet +import jakarta.servlet.http.HttpServlet +import jakarta.servlet.http.HttpServletRequest +import jakarta.servlet.http.HttpServletResponse import java.io.IOException -import javax.servlet.ServletException -import javax.servlet.annotation.WebServlet -import javax.servlet.http.HttpServlet -import javax.servlet.http.HttpServletRequest -import javax.servlet.http.HttpServletResponse import org.apache.commons.io.IOUtils import org.eclipse.xtend.lib.annotations.Accessors import xyz.balzaclang.lib.model.Address diff --git a/xyz.balzaclang.balzac/META-INF/MANIFEST.MF b/xyz.balzaclang.balzac/META-INF/MANIFEST.MF index 1833f710..2ce71b01 100644 --- a/xyz.balzaclang.balzac/META-INF/MANIFEST.MF +++ b/xyz.balzaclang.balzac/META-INF/MANIFEST.MF @@ -6,16 +6,16 @@ Bundle-Vendor: University of Cagliari Bundle-Version: 1.0.0.qualifier Bundle-SymbolicName: xyz.balzaclang.balzac; singleton:=true Bundle-ActivationPolicy: lazy -Require-Bundle: org.eclipse.xtext;bundle-version="2.27.0", +Require-Bundle: org.eclipse.xtext;bundle-version="2.33.0", org.eclipse.xtext.xbase, - org.eclipse.xsemantics.runtime;bundle-version="1.22.0", - org.eclipse.equinox.security;bundle-version="1.3.900", - org.eclipse.equinox.common;bundle-version="3.16.100", + org.eclipse.xsemantics.runtime;bundle-version="1.24.0", + org.eclipse.equinox.security;bundle-version="1.4.100", + org.eclipse.equinox.common;bundle-version="3.18.200", org.eclipse.emf.ecore, - org.eclipse.xtext.xbase.lib;bundle-version="2.27.0", + org.eclipse.xtext.xbase.lib;bundle-version="2.33.0", org.eclipse.xtext.util, org.eclipse.emf.common, - org.eclipse.xtend.lib;bundle-version="2.27.0", + org.eclipse.xtend.lib;bundle-version="2.33.0", org.antlr.runtime;bundle-version="[3.2.0,3.2.1)" Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: xyz.balzaclang, diff --git a/xyz.balzaclang.balzac/pom.xml b/xyz.balzaclang.balzac/pom.xml index e8a5c755..d0dcee85 100644 --- a/xyz.balzaclang.balzac/pom.xml +++ b/xyz.balzaclang.balzac/pom.xml @@ -58,26 +58,6 @@ see https://bugs.eclipse.org/bugs/show_bug.cgi?id=475098#c3 --> - - org.eclipse.emf - org.eclipse.emf.mwe2.launch - ${mwe2Version} - - - org.eclipse.xtext - org.eclipse.xtext.common.types - ${xtext-version} - - - org.eclipse.xtext - org.eclipse.xtext.xtext.generator - ${xtext-version} - - - org.eclipse.xtext - org.eclipse.xtext.xbase - ${xtext-version} - org.eclipse.xtext xtext-antlr-generator @@ -123,6 +103,12 @@ org.eclipse.xtend xtend-maven-plugin + + + + + + diff --git a/xyz.balzaclang.balzac/src/xyz/balzaclang/compiler/ScriptCompiler.xtend b/xyz.balzaclang.balzac/src/xyz/balzaclang/compiler/ScriptCompiler.xtend index e68adf50..aa333118 100644 --- a/xyz.balzaclang.balzac/src/xyz/balzaclang/compiler/ScriptCompiler.xtend +++ b/xyz.balzaclang.balzac/src/xyz/balzaclang/compiler/ScriptCompiler.xtend @@ -17,7 +17,6 @@ package xyz.balzaclang.compiler import com.google.inject.Inject -import javax.inject.Singleton import org.eclipse.xtext.EcoreUtil2 import xyz.balzaclang.balzac.AndExpression import xyz.balzaclang.balzac.ArithmeticSigned @@ -82,6 +81,7 @@ import static xyz.balzaclang.lib.model.script.ScriptOpCodes.* import static extension xyz.balzaclang.utils.ASTExtensions.* import xyz.balzaclang.lib.PrivateKeysStore +import jakarta.inject.Singleton /* * EXPRESSIONS