Merge pull request #95 from OP-TED/release/0.11.0

Release 0.11.0

.github/workflows/build.yml

@@ -12,8 +12,8 @@ jobs:
       contents: read
       packages: write
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-java@v3
+      - uses: actions/checkout@v4
+      - uses: actions/setup-java@v4
         with:
           java-version: '11'
           distribution: 'adopt'

CHANGELOG.md

@@ -1,18 +1,20 @@
-# eForms Notice Viewer 0.10.1 - Release Notes
+# eForms Notice Viewer 0.11.0 - Release Notes
 
 _The eForms Notice Viewer is a sample command line application that demonstrates how you can use the [eForms SDK](https://github.com/OP-TED/eForms-SDK) in a metadata driven application that visualises eForms notices._
 
 ---
 
 ## In this release
 
-This release updates the dependencies of eForms Notice Viewer to use the latest EFX Toolkit 2.0.0-alpha.3. This fixes the reported [issue #88](https://github.com/OP-TED/eforms-notice-viewer/issues/88), which caused an exception to be thrown by XSLT processors when trying to format sequences of dates or times.   
+This release fixes an issue with EFX variable, which prevented a variable to reference another variable declared previously.
+
+This release updates the dependencies of eForms Notice Viewer to use the latest EFX Toolkit 2.0.0-alpha.4, and ANTLR 4.13.1.
 
 ---
 
 Documentation for this sample application is available at: https://docs.ted.europa.eu/eforms/latest/notice-viewer
 
 This version depends on:
 
-- [EFX toolkit for Java](https://github.com/OP-TED/efx-toolkit-java) version 2.0.0-alpha.3.
-- [eForms Core for Java](https://github.com/OP-TED/eforms-core-java) library version 1.3.0.
+- [EFX toolkit for Java](https://github.com/OP-TED/efx-toolkit-java) version 2.0.0-alpha.4.
+- [eForms Core for Java](https://github.com/OP-TED/eforms-core-java) library version 1.4.0.

pom.xml

@@ -3,7 +3,7 @@
 
   <groupId>eu.europa.ted.eforms</groupId>
   <artifactId>eforms-notice-viewer</artifactId>
-  <version>0.10.1</version>
+  <version>0.11.0</version>
 
   <name>eForms Notice Viewer</name>
   <description>eForms Notice Viewer sample application.</description>
@@ -44,7 +44,7 @@
   </distributionManagement>
 
   <properties>
-    <project.build.outputTimestamp>2023-07-31T09:34:21Z</project.build.outputTimestamp>
+    <project.build.outputTimestamp>2024-08-02T13:11:16Z</project.build.outputTimestamp>
 
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
@@ -54,11 +54,11 @@
     <maven.compiler.target>${java.version}</maven.compiler.target>
 
     <!-- Versions - eForms -->
-    <version.efx-toolkit>2.0.0-alpha.3</version.efx-toolkit>
-    <version.eforms-core>1.3.0</version.eforms-core>
+    <version.efx-toolkit>2.0.0-alpha.4</version.efx-toolkit>
+    <version.eforms-core>1.4.0</version.eforms-core>
 
     <!-- Versions - Third-party libraries -->
-    <version.antlr4>4.9.3</version.antlr4>
+    <version.antlr4>4.13.1</version.antlr4>
     <version.commons-lang3>3.12.0</version.commons-lang3>
     <version.commons-jcs3>3.1</version.commons-jcs3>
     <version.dom4j>2.1.3</version.dom4j>

src/main/java/eu/europa/ted/eforms/viewer/DependencyFactory.java

@@ -40,29 +40,29 @@ protected DependencyFactory(Path sdkRoot, boolean resolveSnapshots) {
   }
 
   @Override
-  public SymbolResolver createSymbolResolver(String sdkVersion) {
+  public SymbolResolver createSymbolResolver(String sdkVersion, String qualifier) {
     try {
       SdkDownloader.downloadSdk(sdkVersion, sdkRoot, this.sdkSnapshotsAllowed);
 
-      return ComponentFactory.getSymbolResolver(sdkVersion, sdkRoot);
+      return ComponentFactory.getSymbolResolver(sdkVersion, qualifier, sdkRoot);
     } catch (InstantiationException | IOException e) {
       throw new RuntimeException(e.getMessage(), e);
     }
   }
 
   @Override
-  public ScriptGenerator createScriptGenerator(String sdkVersion, TranslatorOptions options) {
+  public ScriptGenerator createScriptGenerator(String sdkVersion, String qualifier, TranslatorOptions options) {
     try {
-      return ComponentFactory.getScriptGenerator(sdkVersion, options);
+      return ComponentFactory.getScriptGenerator(sdkVersion, qualifier, options);
     } catch (InstantiationException e) {
       throw new RuntimeException(e.getMessage(), e);
     }
   }
 
   @Override
-  public MarkupGenerator createMarkupGenerator(String sdkVersion, TranslatorOptions options) {
+  public MarkupGenerator createMarkupGenerator(String sdkVersion, String qualifier, TranslatorOptions options) {
     try {
-      return ComponentFactory.getMarkupGenerator(sdkVersion, options);
+      return ComponentFactory.getMarkupGenerator(sdkVersion, qualifier, options);
     } catch (InstantiationException e) {
       throw new RuntimeException(e.getMessage(), e);
     }

src/main/resources/templates/xsl_markup/fragment_invocation.ftl

@@ -6,9 +6,12 @@
 -->
 
 <xsl:for-each select="${context}">
+    <#list variables as variable>
+        <xsl:variable name="${variable[0]}" select = "${variable[1]}" />
+    </#list>
 	<xsl:call-template name="${name}">
         <#list variables as variable>
-            <xsl:with-param name="${variable[0]}" select = "${variable[1]}" />
+            <xsl:with-param name="${variable[0]}" select = "$${variable[0]}" />
         </#list>
     </xsl:call-template>
 </xsl:for-each>