Branch out 4.1.x (#438)

* Refs #22815. Change mirror workflow. Signed-off-by: Miguel Company <[email protected]> * Refs #22815. Bump version to 4.1.0 Signed-off-by: Miguel Company <[email protected]> * Update to IDL parser 4.1. Signed-off-by: Miguel Company <[email protected]> * Refs #22815. Update PR template. Signed-off-by: Miguel Company <[email protected]> --------- Signed-off-by: Miguel Company <[email protected]>
eProsima · Feb 13, 2025 · dbe116a · dbe116a
1 parent 809195e
commit dbe116a
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git 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.
 -->
-<!-- @Mergifyio backport 3.3.x 2.5.x 2.1.x -->
+<!-- @Mergifyio backport 4.0.x 3.3.x 2.5.x 2.1.x -->
 
 <!-- If an issue is already opened, please uncomment next line with the corresponding issue number. -->
 <!-- Fixes #(issue) -->

diff --git 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
@@ -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
-Original file line number
+Diff line change
@@ Expand Up / @@ -13,7 +13,7 @@ jobs: @@
           fail-fast: false
           matrix:
             dest_branch:
-              - '4.0.x'
+              - '4.1.x'
               - '4.x'
         steps:
         - name: Mirror action step
@@ Expand Down @@
+1 −1		.github/workflows/mirror.yml
+1 −1		build.gradle
+1 −1		pom.xml
+14 −0		src/main/antlr/com/eprosima/idl/parser/grammar/IDL.g4
+22 −1		src/main/java/com/eprosima/idl/parser/tree/Param.java