From dbe116a5d5be0aef1b30bc3fe4ecab69430da0de Mon Sep 17 00:00:00 2001 From: Miguel Company Date: Thu, 13 Feb 2025 12:56:30 +0100 Subject: [PATCH] Branch out 4.1.x (#438) * Refs #22815. Change mirror workflow. Signed-off-by: Miguel Company * Refs #22815. Bump version to 4.1.0 Signed-off-by: Miguel Company * Update to IDL parser 4.1. Signed-off-by: Miguel Company * Refs #22815. Update PR template. Signed-off-by: Miguel Company --------- Signed-off-by: Miguel Company --- .github/pull_request_template.md | 2 +- .github/workflows/mirror.yml | 2 +- build.gradle | 4 ++-- thirdparty/idl-parser | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index ac3c39e5..d211e9a9 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -17,7 +17,7 @@ In case of bug fixes, please provide the list of supported branches where this fix should be also merged. Please uncomment following line, adjusting the corresponding target branches for the backport. --> - + diff --git a/.github/workflows/mirror.yml b/.github/workflows/mirror.yml index 7d399f25..fbe47d87 100644 --- a/.github/workflows/mirror.yml +++ b/.github/workflows/mirror.yml @@ -13,7 +13,7 @@ jobs: fail-fast: false matrix: dest_branch: - - '4.0.x' + - '4.1.x' - '4.x' steps: - name: Mirror action step diff --git a/build.gradle b/build.gradle index 069a957a..30b8a880 100644 --- a/build.gradle +++ b/build.gradle @@ -17,7 +17,7 @@ apply plugin: 'java-library' apply plugin: 'eclipse' // Eclipse integration description = """""" -def version_str = "4.0.3" +def version_str = "4.1.0" import org.apache.tools.ant.taskdefs.condition.Os; import org.gradle.api.tasks.options.Option; @@ -91,7 +91,7 @@ repositories { } dependencies { - implementation files('thirdparty/idl-parser/build/libs/idlparser-4.0.3.jar') + implementation files('thirdparty/idl-parser/build/libs/idlparser-4.1.0.jar') testImplementation('org.junit.jupiter:junit-jupiter-api:5.5.2') testRuntimeOnly('org.junit.jupiter:junit-jupiter-engine:5.5.2') } diff --git a/thirdparty/idl-parser b/thirdparty/idl-parser index 4176a515..55722223 160000 --- a/thirdparty/idl-parser +++ b/thirdparty/idl-parser @@ -1 +1 @@ -Subproject commit 4176a5159d2646b17fd4dff014277c580239edb4 +Subproject commit 5572222313500f16f725bede8fe37ef29b329a36