From 8c0a9cafe01a5f9a97c029c042b6647182cf48ac Mon Sep 17 00:00:00 2001
From: Radek Felcman <radek.felcman@oracle.com>
Date: Tue, 2 Jul 2024 14:19:14 +0200
Subject: [PATCH] Maven build - MANIFEST.MF Implementation-Version fix (#2202)

Signed-off-by: Radek Felcman <radek.felcman@oracle.com>
---
 bundles/eclipselink/pom.xml                                   | 4 ++--
 .../src/main/java/org/eclipse/persistence/Version.java        | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/bundles/eclipselink/pom.xml b/bundles/eclipselink/pom.xml
index 490bb77f0ac..51c16a0ca34 100644
--- a/bundles/eclipselink/pom.xml
+++ b/bundles/eclipselink/pom.xml
@@ -558,7 +558,7 @@
                             <Specification-Version>${release.version}</Specification-Version>
                             <Implementation-Title>${manifest.implementation.title}</Implementation-Title>
                             <Implementation-Vendor>${manifest.implementation.vendor}</Implementation-Vendor>
-                            <Implementation-Version>${project.version}</Implementation-Version>
+                            <Implementation-Version>${release.version}.${build.qualifier}-${buildNumber}</Implementation-Version>
                             <Premain-Class>${manifest.premain.class}</Premain-Class>
                             <Multi-Release>true</Multi-Release>
                         </manifestEntries>
@@ -599,7 +599,7 @@
                             <Specification-Version>${release.version}</Specification-Version>
                             <Implementation-Title>${manifest.implementation.title}</Implementation-Title>
                             <Implementation-Vendor>${manifest.implementation.vendor}</Implementation-Vendor>
-                            <Implementation-Version>${project.version}</Implementation-Version>
+                            <Implementation-Version>${release.version}.${build.qualifier}-${buildNumber}</Implementation-Version>
                         </manifestEntries>
                     </archive>
                 </configuration>
diff --git a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/Version.java b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/Version.java
index 1f067dacfec..1a3f716df34 100644
--- a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/Version.java
+++ b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/Version.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2024 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -64,6 +64,8 @@ public static String getVersionString() {
         sb.append(getVersion());
         sb.append(SEPARATOR);
         sb.append(getQualifier());
+        sb.append('-');
+        sb.append(getBuildRevision());
         return sb.toString();
     }