This is an automated email from the ASF dual-hosted git repository. spmallette pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
The following commit(s) were added to refs/heads/master by this push: new bcb840884f TINKERPOP-2761: fix version key race in Manifest new 9e41f4388c Merge pull request #1716 from lionelfleury/fix/version bcb840884f is described below commit bcb840884f6c6966bd37cb6ab616603d9e8459f0 Author: Lionel Fleury <lionel_fle...@hotmail.com> AuthorDate: Fri Jun 17 18:54:34 2022 +0200 TINKERPOP-2761: fix version key race in Manifest - use a more specific key `tinkerpop-version` to avoid race on `version` - see: https://github.com/JanusGraph/janusgraph/discussions/3004 Signed-off-by: Lionel Fleury <lionel_fle...@hotmail.com> --- .../src/main/java/org/apache/tinkerpop/gremlin/util/Gremlin.java | 4 ++-- pom.xml | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/util/Gremlin.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/util/Gremlin.java index 2d4a720551..58394ab16a 100644 --- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/util/Gremlin.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/util/Gremlin.java @@ -26,10 +26,10 @@ import java.io.IOException; * @author Stephen Mallette (http://stephen.genoprime.com) */ public final class Gremlin { - private static String version; + private static final String version; static { - version = Manifests.read("version"); + version = Manifests.read("tinkerpop-version"); } private Gremlin() { diff --git a/pom.xml b/pom.xml index 096e00624a..e6b64278a4 100644 --- a/pom.xml +++ b/pom.xml @@ -368,6 +368,7 @@ limitations under the License. <manifestEntries> <version>${project.version}</version> <hash>${buildNumber}</hash> + <tinkerpop-version>${project.version}</tinkerpop-version> </manifestEntries> </archive> </configuration>