resolved conflicts

Author: devhl-labs

.github/workflows/gradle-test.yaml

@@ -29,6 +29,8 @@ jobs:
           - samples/client/petstore/java/okhttp-gson
           - samples/client/petstore/java/okhttp-gson-group-parameter
           - samples/client/petstore/java/webclient-swagger2
+          - samples/client/petstore/java/native
+          - samples/client/petstore/java/native-jakarta
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-java@v4

.github/workflows/samples-dotnet-standard.yaml

@@ -28,7 +28,7 @@ jobs:
           # - samples/client/petstore/csharp/unityWebRequest/standard2.0/Petstore/
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-dotnet@v4.0.1
+      - uses: actions/setup-dotnet@v4.1.0
         with:
           dotnet-version: 3.1.*
       - name: Build

.github/workflows/samples-dotnet.yaml

@@ -37,7 +37,7 @@ jobs:
           - samples/client/petstore/csharp/generichost/net8/UseDateTimeForDate
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-dotnet@v4.0.1
+      - uses: actions/setup-dotnet@v4.1.0
         with:
           dotnet-version: '8.0.x'
       - name: Build

.github/workflows/samples-dotnet6-client-echo-api.yaml

@@ -19,7 +19,7 @@ jobs:
           - samples/client/echo_api/csharp-restsharp/
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-dotnet@v4.0.1
+      - uses: actions/setup-dotnet@v4.1.0
         with:
           dotnet-version: '6.0.x'
       - name: Run echo server

.github/workflows/samples-dotnet6-client.yaml

@@ -18,7 +18,7 @@ jobs:
           - samples/client/petstore/csharp/restsharp/net6/ParameterMappings/
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-dotnet@v4.0.1
+      - uses: actions/setup-dotnet@v4.1.0
         with:
           dotnet-version: '6.0.x'
       - name: Build

.github/workflows/samples-dotnet6-server.yaml

@@ -25,7 +25,7 @@ jobs:
           - samples/server/petstore/aspnetcore-6.0-useSwashBuckle
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-dotnet@v4.0.1
+      - uses: actions/setup-dotnet@v4.1.0
         with:
           dotnet-version: '6.0.x'
       - name: Build

.github/workflows/samples-dotnet8-server.yaml

@@ -25,7 +25,7 @@ jobs:
           - samples/server/petstore/aspnetcore-8.0-useSwashBuckle
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-dotnet@v4.0.1
+      - uses: actions/setup-dotnet@v4.1.0
         with:
           dotnet-version: '8.0.x'
       - name: Build

bin/configs/java-helidon-client-mp_3.yaml

@@ -2,6 +2,7 @@ generatorName: java-helidon-client
 library: mp
 outputDir: samples/client/petstore/java-helidon-client/v3/mp
 inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml
+templateDir: modules/openapi-generator/src/main/resources/java-helidon/client
 additionalProperties:
   helidonVersion: 3.2.7
   artifactId: petstore-helidon-client-mp

bin/configs/java-helidon-client-mp_4.yaml

@@ -2,6 +2,7 @@ generatorName: java-helidon-client
 library: mp
 outputDir: samples/client/petstore/java-helidon-client/v4/mp
 inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml
+templateDir: modules/openapi-generator/src/main/resources/java-helidon/client
 additionalProperties:
   helidonVersion: 4.0.11
   artifactId: petstore-helidon-client-mp

bin/configs/java-helidon-client-se_3.yaml

@@ -2,6 +2,7 @@ generatorName: java-helidon-client
 library: se
 outputDir: samples/client/petstore/java-helidon-client/v3/se
 inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml
+templateDir: modules/openapi-generator/src/main/resources/java-helidon/client
 additionalProperties:
   helidonVersion: 3.2.7
   artifactId: petstore-helidon-client-se