From a8c9a63ee900f2ff37ee16d667f2f7dbc0fe62aa Mon Sep 17 00:00:00 2001 From: Ioannis Rousochatzakis Date: Wed, 20 Dec 2023 23:50:31 +0100 Subject: [PATCH 1/9] Updated pom.xml after merging from main to develop. --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 497890f..f600c9c 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ eu.europa.ted.eforms eforms-notice-viewer - 0.10.0 + 0.11.0-SNAPSHOT eForms Notice Viewer eForms Notice Viewer sample application. @@ -54,8 +54,8 @@ ${java.version} - 2.0.0-alpha.2 - 1.3.0 + 2.0.0-SNAPSHOT + 1.4.0-SNAPSHOT 4.9.3 From f87021ebadd12bc0d941f8827a0e7c69e698ad3e Mon Sep 17 00:00:00 2001 From: Stathis Papachristou Date: Fri, 12 Apr 2024 11:52:23 +0200 Subject: [PATCH 2/9] [fix] add qualifier, update ANTLR dependency --- pom.xml | 6 +++--- .../java/eu/europa/ted/eforms/viewer/DependencyFactory.java | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pom.xml b/pom.xml index 3cac881..34fe63b 100644 --- a/pom.xml +++ b/pom.xml @@ -54,11 +54,11 @@ ${java.version} - 2.0.0-alpha.3 - 1.3.0 + 2.0.0-SNAPSHOT + 1.4.0-SNAPSHOT - 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..f2851d5 100644 --- a/src/main/java/eu/europa/ted/eforms/viewer/DependencyFactory.java +++ b/src/main/java/eu/europa/ted/eforms/viewer/DependencyFactory.java @@ -40,7 +40,7 @@ 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); @@ -51,7 +51,7 @@ public SymbolResolver createSymbolResolver(String sdkVersion) { } @Override - public ScriptGenerator createScriptGenerator(String sdkVersion, TranslatorOptions options) { + public ScriptGenerator createScriptGenerator(String sdkVersion, String qualifier, TranslatorOptions options) { try { return ComponentFactory.getScriptGenerator(sdkVersion, options); } catch (InstantiationException e) { @@ -60,7 +60,7 @@ public ScriptGenerator createScriptGenerator(String sdkVersion, TranslatorOption } @Override - public MarkupGenerator createMarkupGenerator(String sdkVersion, TranslatorOptions options) { + public MarkupGenerator createMarkupGenerator(String sdkVersion, String qualifier, TranslatorOptions options) { try { return ComponentFactory.getMarkupGenerator(sdkVersion, options); } catch (InstantiationException e) { From 4394f4773ef09a2c404aedcfc5fda28e26b0302a Mon Sep 17 00:00:00 2001 From: Stathis Papachristou Date: Wed, 17 Apr 2024 12:20:30 +0200 Subject: [PATCH 3/9] code review changes - passing qualifier when calling ComponentFactory to get generators --- .../java/eu/europa/ted/eforms/viewer/DependencyFactory.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 f2851d5..45434c8 100644 --- a/src/main/java/eu/europa/ted/eforms/viewer/DependencyFactory.java +++ b/src/main/java/eu/europa/ted/eforms/viewer/DependencyFactory.java @@ -44,7 +44,7 @@ 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); } @@ -53,7 +53,7 @@ public SymbolResolver createSymbolResolver(String sdkVersion, String qualifier) @Override 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); } @@ -62,7 +62,7 @@ public ScriptGenerator createScriptGenerator(String sdkVersion, String qualifier @Override 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); } From 61aaf91fa07ecca7fc3d9379820b2ccaf2fce416 Mon Sep 17 00:00:00 2001 From: Stathis Papachristou Date: Fri, 19 Apr 2024 09:35:14 +0200 Subject: [PATCH 4/9] [fix] update github actions to latest versions supporting nodejs 20 --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 95eb6e7..acde756 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.2.1 with: java-version: '11' distribution: 'adopt' From f12c9d0f4f8718a553f570f076e19aee7052c1db Mon Sep 17 00:00:00 2001 From: Stathis Papachristou Date: Fri, 19 Apr 2024 14:21:31 +0200 Subject: [PATCH 5/9] use major version of github actions for setup-java --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index acde756..4a8569b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -13,7 +13,7 @@ jobs: packages: write steps: - uses: actions/checkout@v4 - - uses: actions/setup-java@v4.2.1 + - uses: actions/setup-java@v4 with: java-version: '11' distribution: 'adopt' From 38eace55b05586a004895cfe4301fd1ef0e15090 Mon Sep 17 00:00:00 2001 From: Ioannis Rousochatzakis Date: Fri, 10 May 2024 17:44:19 +0200 Subject: [PATCH 6/9] Added variable declarations to fragment_invocation.ftl. --- .../resources/templates/xsl_markup/fragment_invocation.ftl | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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 From 82f5d43068ea46301324be95310f4ab654938455 Mon Sep 17 00:00:00 2001 From: Bertrand Lorentz Date: Fri, 2 Aug 2024 15:37:27 +0200 Subject: [PATCH 7/9] CHANGELOG: Update for version 0.11.0 --- CHANGELOG.md | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) 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. From 28d4cc3ac5c920c0c02ee40b81eb9632c3aae647 Mon Sep 17 00:00:00 2001 From: Bertrand Lorentz Date: Fri, 2 Aug 2024 15:38:05 +0200 Subject: [PATCH 8/9] pom: Update eforms-core and efx-toolkit dependencies to latest releases --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 34fe63b..6c3c675 100644 --- a/pom.xml +++ b/pom.xml @@ -54,8 +54,8 @@ ${java.version} - 2.0.0-SNAPSHOT - 1.4.0-SNAPSHOT + 2.0.0-alpha.4 + 1.4.0 4.13.1 From 76cc2b8c76ce4ba3bcf69c75a866f9fb0fd0e886 Mon Sep 17 00:00:00 2001 From: Bertrand Lorentz Date: Fri, 2 Aug 2024 15:40:20 +0200 Subject: [PATCH 9/9] pom: Set version to 0.11.0 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 6c3c675..bd36b5f 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ eu.europa.ted.eforms eforms-notice-viewer - 0.11.0-SNAPSHOT + 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