From 1adba4f3e7c9731235b5ce3863d0e4b7d87fa36c Mon Sep 17 00:00:00 2001 From: Mizux Seiha Date: Tue, 2 Dec 2025 12:38:37 +0100 Subject: [PATCH] cmake: fix java pre release support --- cmake/java.cmake | 6 ++++++ ortools/java/pom-full.xml.in | 12 ++++++------ ortools/java/pom-local.xml.in | 4 ++-- ortools/java/pom-native.xml.in | 2 +- ortools/java/pom-sample.xml.in | 4 ++-- ortools/java/pom-test.xml.in | 4 ++-- 6 files changed, 19 insertions(+), 13 deletions(-) diff --git a/cmake/java.cmake b/cmake/java.cmake index a8152ac70c..be3c4eeea4 100644 --- a/cmake/java.cmake +++ b/cmake/java.cmake @@ -86,6 +86,12 @@ message(STATUS "Java project: ${JAVA_PROJECT}") set(JAVA_PROJECT_DIR ${PROJECT_BINARY_DIR}/java/${JAVA_PROJECT}) message(STATUS "Java project build path: ${JAVA_PROJECT_DIR}") +if(RELEASE) + set(JAVA_RELEASE "") +else() + set(JAVA_RELEASE "-RC1") +endif() + ################## ## PROTO FILE ## ################## diff --git a/ortools/java/pom-full.xml.in b/ortools/java/pom-full.xml.in index 17b9b72db4..4022cb3e20 100644 --- a/ortools/java/pom-full.xml.in +++ b/ortools/java/pom-full.xml.in @@ -7,7 +7,7 @@ @JAVA_PACKAGE@ @JAVA_PROJECT@ -@PROJECT_VERSION@ +@PROJECT_VERSION@@JAVA_RELEASE@ jar ${project.groupId}:${project.artifactId} @@ -69,35 +69,35 @@ @JAVA_PACKAGE@ ortools-linux-x86-64 - @PROJECT_VERSION@ + @PROJECT_VERSION@@JAVA_RELEASE@ jar runtime @JAVA_PACKAGE@ ortools-darwin-x86-64 - @PROJECT_VERSION@ + @PROJECT_VERSION@@JAVA_RELEASE@ jar runtime @JAVA_PACKAGE@ ortools-win32-x86-64 - @PROJECT_VERSION@ + @PROJECT_VERSION@@JAVA_RELEASE@ jar runtime @JAVA_PACKAGE@ ortools-linux-aarch64 - @PROJECT_VERSION@ + @PROJECT_VERSION@@JAVA_RELEASE@ jar runtime @JAVA_PACKAGE@ ortools-darwin-aarch64 - @PROJECT_VERSION@ + @PROJECT_VERSION@@JAVA_RELEASE@ jar runtime diff --git a/ortools/java/pom-local.xml.in b/ortools/java/pom-local.xml.in index af5a2d415f..c1c4b74e4a 100644 --- a/ortools/java/pom-local.xml.in +++ b/ortools/java/pom-local.xml.in @@ -7,7 +7,7 @@ @JAVA_PACKAGE@ @JAVA_PROJECT@ -@PROJECT_VERSION@ +@PROJECT_VERSION@@JAVA_RELEASE@ jar ${project.groupId}:${project.artifactId} @@ -69,7 +69,7 @@ @JAVA_PACKAGE@ @JAVA_NATIVE_PROJECT@ - @PROJECT_VERSION@ + @PROJECT_VERSION@@JAVA_RELEASE@ jar runtime diff --git a/ortools/java/pom-native.xml.in b/ortools/java/pom-native.xml.in index ef7fb72eb8..a09a4ccb7f 100644 --- a/ortools/java/pom-native.xml.in +++ b/ortools/java/pom-native.xml.in @@ -7,7 +7,7 @@ @JAVA_PACKAGE@ @JAVA_NATIVE_PROJECT@ -@PROJECT_VERSION@ +@PROJECT_VERSION@@JAVA_RELEASE@ jar ${project.groupId}:${project.artifactId} diff --git a/ortools/java/pom-sample.xml.in b/ortools/java/pom-sample.xml.in index 5949096b4f..ace8914be6 100644 --- a/ortools/java/pom-sample.xml.in +++ b/ortools/java/pom-sample.xml.in @@ -7,7 +7,7 @@ @JAVA_PACKAGE@ @JAVA_SAMPLE_PROJECT@ -@PROJECT_VERSION@ +@PROJECT_VERSION@@JAVA_RELEASE@ jar ${project.groupId}:${project.artifactId} @@ -70,7 +70,7 @@ @JAVA_PACKAGE@ @JAVA_PROJECT@ - [@PROJECT_VERSION_MAJOR@.@PROJECT_VERSION_MINOR@.@PROJECT_VERSION_PATCH@,) + [@PROJECT_VERSION_MAJOR@.@PROJECT_VERSION_MINOR@.@PROJECT_VERSION_PATCH@@JAVA_RELEASE@,) jar compile diff --git a/ortools/java/pom-test.xml.in b/ortools/java/pom-test.xml.in index 6e1c9047be..acd4cd6e4d 100644 --- a/ortools/java/pom-test.xml.in +++ b/ortools/java/pom-test.xml.in @@ -7,7 +7,7 @@ @JAVA_PACKAGE@ @JAVA_TEST_PROJECT@ -@PROJECT_VERSION@ +@PROJECT_VERSION@@JAVA_RELEASE@ jar ${project.groupId}:${project.artifactId} @@ -69,7 +69,7 @@ @JAVA_PACKAGE@ @JAVA_PROJECT@ - [@PROJECT_VERSION_MAJOR@.@PROJECT_VERSION_MINOR@.@PROJECT_VERSION_PATCH@,) + [@PROJECT_VERSION_MAJOR@.@PROJECT_VERSION_MINOR@.@PROJECT_VERSION_PATCH@@JAVA_RELEASE@,) jar compile