Merge pull request #126 from OP-TED/release/2.0.0-alpha.5

Prepare release 2.0.0-alpha.5

Author: bertrand-lorentz

.github/workflows/build.yml

@@ -18,4 +18,4 @@ jobs:
           java-version: '11'
           distribution: 'adopt'
       - name: Build package
-        run: mvn --batch-mode clean install -s .github/workflows/settings.xml
+        run: mvn --batch-mode clean install

.github/workflows/publish.yml

@@ -30,8 +30,11 @@ jobs:
         with:
           java-version: '11'
           distribution: 'adopt'
+          server-id: central
+          server-username: MAVEN_USERNAME
+          server-password: MAVEN_PASSWORD
       - name: Publish to the Maven Central Repository
-        run: mvn --batch-mode deploy -Dgpg.passphrase='${{ secrets.GPG_PASSPHRASE }}' -Prelease -s .github/workflows/settings.xml
+        run: mvn --batch-mode deploy -Dgpg.passphrase='${{ secrets.GPG_PASSPHRASE }}' -Prelease
         env:
           MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }}
           MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }}

.github/workflows/settings.xml

@@ -1,16 +1,12 @@
-# EFX Toolkit 2.0.0-alpha.4 Release Notes
+# EFX Toolkit 2.0.0-alpha.5 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 fixes an a bug that caused variables and parameters to be in the wrong order in the generated XSL.
-
-A "qualifier" parameter was added in various methods, to allow the use of the corresponding new feature in the eForms Core Library 1.4.0.
-
-The dependency on ANTLR was updated to version 4.13.1.
+This release fixes an a bug that could result in incorrect context computation for EFX template lines when the same field or node was used as both the parent and child line's context using different predicates. The EFX template translator now correctly calculates the child context,  ignoring the predicate of the parent context.
 
 
 ## EFX-1 Support

CHANGELOG.md

@@ -1,20 +1,20 @@
 **[:memo: Latest Release Notes](CHANGELOG.md)** | **[:package: Latest Release Artifacts](https://central.sonatype.com/artifact/eu.europa.ted.eforms/efx-toolkit-java)**
 
 ---
+
 # Java toolkit for the eForms Expression Language (EFX)
 
 The **EFX Toolkit[^1] 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 provides an implementation for translating EFX expressions to XPath.
 
 The documentation is available at: https://docs.ted.europa.eu/eforms/latest/efx-toolkit
 
-
 ## Using the EFX toolkit[^1]
 
 The EFX toolkit requires Java 11 or later.
 
 It is available as a Maven package on Maven Central and can be used by adding the following to the project's `pom.xml`.
 
-```
+```XML
 <dependencies>
   ...
   <dependency>
@@ -36,40 +36,6 @@ You can build this project as usual using Maven.
 
 The build process uses the grammar files provided in the [eForms SDK](https://github.com/OP-TED/eForms-SDK/tree/develop/efx-grammar) to generate a parser, using [ANTLR4](https://www.antlr.org).
 
-In order to be able to use snapshot versions of dependencies, the following should be added to the "profiles" section of the Maven configuration file "settings.xml" (normally under ${HOME}/.m2):
-
-```
-<servers>
-  <server>
-    <id>ossrh</id>
-    <username>${env.MAVEN_USERNAME}</username>
-    <password>${env.MAVEN_PASSWORD}</password>
-  </server>
-</servers>
-
-<profile>
-  <id>repositories</id>
-  <activation>
-    <activeByDefault>true</activeByDefault>
-  </activation>
-  <repositories>
-    <repository>
-      <id>ossrh</id>
-      <name>OSSRH Snapshots</name>
-      <url>https://s01.oss.sonatype.org/content/repositories/snapshots</url>
-      <releases>
-        <enabled>false</enabled>
-      </releases>
-      <snapshots>
-        <enabled>true</enabled>
-      </snapshots>
-    </repository>
-  </repositories>
-</profile>
-```
-
-See ".github/workflows/settings.xml".
-
 ## Testing
 
 Unit tests are available under `src/test/java/`. They show in particular a variety of EFX expressions and the corresponding XPath expression.

README.md

@@ -3,7 +3,7 @@
 
   <groupId>eu.europa.ted.eforms</groupId>
   <artifactId>efx-toolkit-java</artifactId>
-  <version>2.0.0-alpha.4</version>
+  <version>2.0.0-alpha.5</version>
   <packaging>jar</packaging>
 
   <name>EFX Toolkit for Java</name>
@@ -36,30 +36,17 @@
     <url>https://github.com/OP-TED/efx-toolkit-java.git</url>
   </scm>
 
-  <distributionManagement>
-    <snapshotRepository>
-      <id>ossrh</id>
-      <url>https://${sonatype.server.url}/content/repositories/snapshots</url>
-    </snapshotRepository>
-    <repository>
-      <id>ossrh</id>
-      <url>https://${sonatype.server.url}/service/local/staging/deploy/maven2/</url>
-    </repository>
-  </distributionManagement>
-
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.build.outputTimestamp>2024-08-02T09:53:37Z</project.build.outputTimestamp>
 
-    <sonatype.server.url>s01.oss.sonatype.org</sonatype.server.url>
-
     <maven.compiler.source>11</maven.compiler.source>
     <maven.compiler.target>11</maven.compiler.target>
 
     <sdk.antlr4.dir>${project.build.directory}/eforms-sdk/antlr4</sdk.antlr4.dir>
 
     <!-- Versions - eForms -->
-    <version.eforms-core>1.4.0</version.eforms-core>
+    <version.eforms-core>1.5.0</version.eforms-core>
 
     <!-- Versions - Third-party libraries -->
     <version.antlr4>4.13.1</version.antlr4>
@@ -78,7 +65,7 @@
     <version.jar.plugin>3.2.0</version.jar.plugin>
     <version.javadoc.plugin>3.4.0</version.javadoc.plugin>
     <version.pgp.plugin>1.5</version.pgp.plugin>
-    <version.nexus-staging.plugin>1.6.7</version.nexus-staging.plugin>
+    <version.central-publishing.plugin>0.8.0</version.central-publishing.plugin>
     <version.source.plugin>3.2.1</version.source.plugin>
     <version.surefire.plugin>3.2.5</version.surefire.plugin>
   </properties>
@@ -180,6 +167,20 @@
     </dependency>
   </dependencies>
 
+  <repositories>
+    <repository>
+      <id>central-snapshots</id>
+      <name>OSS Snapshots repository</name>
+      <url>https://central.sonatype.com/repository/maven-snapshots</url>
+      <releases>
+        <enabled>false</enabled>
+      </releases>
+      <snapshots>
+        <enabled>true</enabled>
+      </snapshots>
+    </repository>
+  </repositories>
+
   <build>
     <pluginManagement>
       <plugins>
@@ -230,9 +231,9 @@
           <version>${version.source.plugin}</version>
         </plugin>
         <plugin>
-          <groupId>org.sonatype.plugins</groupId>
-          <artifactId>nexus-staging-maven-plugin</artifactId>
-          <version>${version.nexus-staging.plugin}</version>
+          <groupId>org.sonatype.central</groupId>
+          <artifactId>central-publishing-maven-plugin</artifactId>
+          <version>${version.central-publishing.plugin}</version>
         </plugin>
       </plugins>
     </pluginManagement>
@@ -404,13 +405,14 @@
             </configuration>
           </plugin>
           <plugin>
-            <groupId>org.sonatype.plugins</groupId>
-            <artifactId>nexus-staging-maven-plugin</artifactId>
+            <groupId>org.sonatype.central</groupId>
+            <artifactId>central-publishing-maven-plugin</artifactId>
             <extensions>true</extensions>
             <configuration>
-              <serverId>ossrh</serverId>
-              <nexusUrl>https://${sonatype.server.url}/</nexusUrl>
-              <autoReleaseAfterClose>true</autoReleaseAfterClose>
+              <publishingServerId>central</publishingServerId>
+              <autoPublish>true</autoPublish>
+              <!-- Name displayed on the Central Portal "Deployments" page -->
+              <deploymentName>${project.artifactId} ${project.version}</deploymentName>
             </configuration>
           </plugin>
         </plugins>