Merge release/2.0.0 alpha.2 into main

CHANGELOG.md

@@ -1,22 +1,28 @@
-# EFX Toolkit 2.0.0-alpha.1 Release Notes
+# EFX Toolkit 2.0.0-alpha.2 Release Notes
 
 _The EFX Toolkit for Java developers is a library that enables the transpilation of [EFX](https://docs.ted.europa.eu/eforms/latest/efx) expressions and templates to different target languages. It also includes an implementation of an EFX-to-XPath transpiler._
 
 ---
 
 ## In this release
 
-This release:
+This release improves translation of EFX-1 templates as follows:
+
+- Renders sequences of labels when a sequence expression is used to provide asset-ids.
+- Renders distinct labels from sequences.
+- Improves date and time formatting.
+
+This release also includes a refactoring that moved XPath processing classes to the eForms Core Library 1.2.0 to improve reusability.
+
+There are no changes in EFX-2 translation included in this release.
 
-- Improves translation of EFX-1.
-- Adds support for translating EFX-2 expressions and templates.
-- Removes support of the obsolete EFX versions included in pre-release versions of the SDK (SDK 0.x.x).
-- Introduces some breaking changes in the interfaces that need to be implemented by new translators (SymbolResolver, ScriptGenerator, MarkupGenerator).
 
 ## EFX-1 Support
 
-Although this is a pre-release version of the EFX Toolkit, it provides production-level support for EFX-1 transpilation.
-EFX-1 is the current version of EFX released with SDK 1. Transpilation of EFX-1 to XPath is on par with the EFX Toolkit 1.3.0.
+Although this is a pre-release version of the EFX Toolkit, it provides production-level support for EFX-1 transpilation. EFX-1 is the current version of EFX released with SDK 1.
+
+NOTE: Transpilation of EFX-1 to XPath and XSL in this version of the EFX Toolkit is **better than** what is provided by **EFX Toolkit 1.3.0**.
+
 
 ## EFX-2 Support
 
@@ -35,7 +41,7 @@ Users of the Toolkit that only use the included EFX-to-XPath transpiler will not
 
 ## Future development
 
-Further alpha and beta releases of SDK 2 and EFX Toolkit 2 will be issued. While in "alpha" development stage, further braking changes may be introduced. SDK 2 and EFX 2 are expected to continue to be under development util late 2023.
+Further alpha and beta releases of SDK 2 and EFX Toolkit 2 will be issued. While in "alpha" development stage, further braking changes may be introduced. SDK 2 and EFX 2 are expected to continue to be under development through the first quarter of 2024.
 
 ---
 
@@ -51,4 +57,4 @@ This version of the EFX Toolkit has a compile-time dependency on the following v
 - eForms SDK 1.x.x
 - eForms SDK 2.0.0-alpha.1
 
-It also depends on the [eForms Core Java library](https://github.com/OP-TED/eforms-core-java) version 1.0.5.
+It also depends on the [eForms Core Java library](https://github.com/OP-TED/eforms-core-java) version 1.3.0.

README.md

@@ -74,7 +74,7 @@ See ".github/workflows/settings.xml".
 
 Unit tests are available under `src/test/java/`. They show in particular a variety of EFX expressions and the corresponding XPath expression.
 
-After running the unit tests with `mvn test`, you can generate a coverage report with`mvn jacoco:report`.
+After running the unit tests with `mvn test`, you can generate a coverage report with `mvn jacoco:report`.
 The report is available under `target/site/jacoco/`, in HTML, CSV, and XML format.
 
 ## Download

pom.xml

@@ -3,7 +3,7 @@
 
   <groupId>eu.europa.ted.eforms</groupId>
   <artifactId>efx-toolkit-java</artifactId>
-  <version>2.0.0-alpha.1</version>
+  <version>2.0.0-alpha.2</version>
   <packaging>jar</packaging>
 
   <name>EFX Toolkit for Java</name>
@@ -49,7 +49,7 @@
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <project.build.outputTimestamp>2023-05-30T06:25:09Z</project.build.outputTimestamp>
+    <project.build.outputTimestamp>2023-07-28T16:03:53Z</project.build.outputTimestamp>
 
     <sonatype.server.url>s01.oss.sonatype.org</sonatype.server.url>
 
@@ -59,7 +59,7 @@
     <sdk.antlr4.dir>${project.build.directory}/eforms-sdk/antlr4</sdk.antlr4.dir>
 
     <!-- Versions - eForms -->
-    <version.eforms-core>1.0.5</version.eforms-core>
+    <version.eforms-core>1.3.0</version.eforms-core>
 
     <!-- Versions - Third-party libraries -->
     <version.antlr4>4.9.3</version.antlr4>
@@ -330,7 +330,6 @@
             <exclude>**/EfxBaseListener.class</exclude>
             <exclude>**/EfxLexer.class</exclude>
             <exclude>**/EfxParser*.class</exclude>
-            <exclude>**/XPath20*.class</exclude>
           </excludes>
         </configuration>
         <executions>