fix(deps): update to citrus v3.4.1

citrusframework · Aug 19, 2024 · 2985e32 · 2985e32
1 parent 8f5a714
commit 2985e32
Show file tree

Hide file tree

Showing 3 changed files with 65 additions and 21 deletions.
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
@@ -0,0 +1,47 @@
+# ---------------------------------------------------------------------------
+# Copyright the original author or authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ---------------------------------------------------------------------------
+
+name: nightly
+
+on:
+  workflow_dispatch:
+  schedule:
+    - cron: "0 0 * * *"
+
+jobs:
+  nightly:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Set up JDK
+        uses: actions/setup-java@v4
+        with:
+          java-version: '17'
+          distribution: 'temurin'
+      - name: Checkout code
+        uses: actions/checkout@v4
+      - name: Cache Maven cache
+        uses: actions/cache@v4
+        with:
+          path: ~/.m2
+          key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
+          restore-keys: ${{ runner.os }}-m2
+      - name: Info
+        run: |
+          java -version
+          ./mvnw -version
+      - name: Simulator Dependency Report
+        run: |
+          ./mvnw --no-transfer-progress versions:display-dependency-updates
diff --git a/pom.xml b/pom.xml
@@ -24,10 +24,10 @@
     <maven.nexus-staging.plugin.version>1.6.13</maven.nexus-staging.plugin.version>
 
     <lombok.version>1.18.30</lombok.version>
-    <citrus.version>4.2.1</citrus.version>
+    <citrus.version>4.3.1</citrus.version>
 
-    <spring-boot.version>3.3.0</spring-boot.version>
-    <spring.version>6.3.0</spring.version>
+    <spring-boot.version>3.3.2</spring-boot.version>
+    <spring.version>6.3.2</spring.version>
     <testng.version>7.10.2</testng.version>
     <wsdl4j.version>1.6.3</wsdl4j.version>
     <xerces.version>2.12.2</xerces.version>
@@ -38,8 +38,8 @@
     <!-- see https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-starter-logging/3.3.0 -->
     <logback.classic.version>1.5.6</logback.classic.version>
 
-    <node.version>v20.12.1</node.version>
-    <npm.version>10.5.0</npm.version>
+    <node.version>v22.4.1</node.version>
+    <npm.version>10.8.1</npm.version>
 
     <skip.gpg>false</skip.gpg>
     <reuseForks>true</reuseForks>
@@ -216,7 +216,7 @@
       <dependency>
         <groupId>org.apache.xmlbeans</groupId>
         <artifactId>xmlbeans</artifactId>
-        <version>3.1.0</version>
+        <version>5.2.0</version>
       </dependency>
 
       <dependency>

diff --git a/...spring-boot/src/test/java/org/citrusframework/simulator/ws/WsdlScenarioGeneratorTest.java b/...spring-boot/src/test/java/org/citrusframework/simulator/ws/WsdlScenarioGeneratorTest.java
@@ -31,9 +31,11 @@
 
 import java.util.stream.Stream;
 
+import static java.lang.String.format;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.params.provider.Arguments.arguments;
 import static org.mockito.Mockito.any;
 import static org.mockito.Mockito.doAnswer;
 import static org.mockito.Mockito.doReturn;
@@ -46,38 +48,33 @@
 @ExtendWith(MockitoExtension.class)
 class WsdlScenarioGeneratorTest {
 
-    private static final String SCENARIO_INPUT = String.format("<v1:TestRequest name=\"string\" id=\"100\" flag=\"false\" xmlns:v1=\"http://www.citrusframework.org/schema/samples/TestService/v1\">%n" +
+    private static final String SCENARIO_INPUT = format("<v1:TestRequest name=\"string\" id=\"100\" flag=\"false\" xmlns:v1=\"http://www.citrusframework.org/schema/samples/TestService/v1\">%n" +
         "  <v1:name>string</v1:name>%n" +
         "  <v1:id>100</v1:id>%n" +
         "  <v1:flag>true</v1:flag>%n" +
         "  <v1:restricted>stringstri</v1:restricted>%n" +
         "</v1:TestRequest>");
 
-    private static final String SCENARIO_OUTPUT = String.format("<v1:TestResponse name=\"string\" id=\"100\" flag=\"false\" xmlns:v1=\"http://www.citrusframework.org/schema/samples/TestService/v1\">%n" +
+    private static final String SCENARIO_OUTPUT = format("<v1:TestResponse name=\"string\" id=\"100\" flag=\"false\" xmlns:v1=\"http://www.citrusframework.org/schema/samples/TestService/v1\">%n" +
         "  <v1:name>string</v1:name>%n" +
         "  <v1:id>100</v1:id>%n" +
         "  <v1:flag>true</v1:flag>%n" +
         "  <v1:restricted>stringstri</v1:restricted>%n" +
         "</v1:TestResponse>");
+
     @Mock
     private ConfigurableListableBeanFactory beanFactoryMock;
+
     @Mock
     private DefaultListableBeanFactory beanRegistryMock;
-    private WsdlScenarioGenerator fixture;
 
-    static Stream<Arguments> testGenerateScenarios() {
-        return data();
-    }
-
-    static Stream<Arguments> testGenerateScenariosWithRegistry() {
-        return data();
-    }
+    private WsdlScenarioGenerator fixture;
 
     static Stream<Arguments> data() {
         return Stream.of(
-            Arguments.of("TestRequest", WsdlScenarioGenerator.WsdlScenarioNamingStrategy.INPUT, "/TestService/test", SCENARIO_INPUT, SCENARIO_OUTPUT),
-            Arguments.of("test", WsdlScenarioGenerator.WsdlScenarioNamingStrategy.OPERATION, "/TestService/test", SCENARIO_INPUT, SCENARIO_OUTPUT),
-            Arguments.of("/TestService/test", WsdlScenarioGenerator.WsdlScenarioNamingStrategy.SOAP_ACTION, "/TestService/test", SCENARIO_INPUT, SCENARIO_OUTPUT)
+            arguments("TestRequest", WsdlScenarioGenerator.WsdlScenarioNamingStrategy.INPUT, "/TestService/test", SCENARIO_INPUT, SCENARIO_OUTPUT),
+            arguments("test", WsdlScenarioGenerator.WsdlScenarioNamingStrategy.OPERATION, "/TestService/test", SCENARIO_INPUT, SCENARIO_OUTPUT),
+            arguments("/TestService/test", WsdlScenarioGenerator.WsdlScenarioNamingStrategy.SOAP_ACTION, "/TestService/test", SCENARIO_INPUT, SCENARIO_OUTPUT)
         );
     }
 
@@ -86,8 +83,8 @@ void beforeEachSetup() {
         fixture = new WsdlScenarioGenerator(new Resources.ClasspathResource("schema/TestService.wsdl"));
     }
 
-    @MethodSource
     @ParameterizedTest
+    @MethodSource("data")
     void testGenerateScenarios(String scenarioName, WsdlScenarioGenerator.WsdlScenarioNamingStrategy namingStrategy, String soapAction, String input, String output) {
         fixture.setNamingStrategy(namingStrategy);
 
@@ -106,8 +103,8 @@ void testGenerateScenarios(String scenarioName, WsdlScenarioGenerator.WsdlScenar
         verify(beanFactoryMock).registerSingleton(eq(scenarioName), any(WsdlOperationScenario.class));
     }
 
-    @MethodSource
     @ParameterizedTest
+    @MethodSource("data")
     void testGenerateScenariosWithRegistry(String scenarioName, WsdlScenarioGenerator.WsdlScenarioNamingStrategy namingStrategy, String soapAction, String input, String output) {
         fixture.setNamingStrategy(namingStrategy);