diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 95eb6e7..4a8569b 100644 --- a/.github/workflows/build.yml +++ b/.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' diff --git a/CHANGELOG.md b/CHANGELOG.md index b968944..7469fd5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -# 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._ @@ -6,7 +6,9 @@ _The eForms Notice Viewer is a sample command line application that demonstrates ## 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. --- @@ -14,5 +16,5 @@ Documentation for this sample application is available at: https://docs.ted.euro 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. diff --git a/pom.xml b/pom.xml index 16c04f0..bd36b5f 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ eu.europa.ted.eforms eforms-notice-viewer - 0.10.1 + 0.11.0 eForms Notice Viewer eForms Notice Viewer sample application. @@ -44,7 +44,7 @@ - 2023-07-31T09:34:21Z + 2024-08-02T13:11:16Z UTF-8 @@ -54,11 +54,11 @@ ${java.version} - 2.0.0-alpha.3 - 1.3.0 + 2.0.0-alpha.4 + 1.4.0 - 4.9.3 + 4.13.1 3.12.0 3.1 2.1.3 diff --git a/src/main/java/eu/europa/ted/eforms/viewer/DependencyFactory.java b/src/main/java/eu/europa/ted/eforms/viewer/DependencyFactory.java index 910477a..45434c8 100644 --- a/src/main/java/eu/europa/ted/eforms/viewer/DependencyFactory.java +++ b/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); } diff --git a/src/main/resources/templates/xsl_markup/fragment_invocation.ftl b/src/main/resources/templates/xsl_markup/fragment_invocation.ftl index 86056a6..28e1793 100644 --- a/src/main/resources/templates/xsl_markup/fragment_invocation.ftl +++ b/src/main/resources/templates/xsl_markup/fragment_invocation.ftl @@ -6,9 +6,12 @@ --> + <#list variables as variable> + + <#list variables as variable> - + \ No newline at end of file