chore(deps): Update to Citrus 4.0

- Java 17 - Apache Camel 4.1.0 - ActiveMQ Artemis 2.31.0 - ActiveMQ 5.18.2 - Cucumber 7.14.0 - Knative Client 6.9.0 - Kubernetes Client 6.9.0 - Netty 4.1.100.Final - SLF4J 2.0.9 - SnakeYAML 2.2 - Spring Framework 6.0.13 - Testcontainers 1.19.1 - PostrgeSQL 42.6.0
citrusframework · Oct 25, 2023 · b41be6e · b41be6e
1 parent 4b8855a
commit b41be6e
Show file tree

Hide file tree

Showing 226 changed files with 1,210 additions and 1,070 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -42,7 +42,7 @@ jobs:
     - name: Set up JDK
       uses: actions/setup-java@v3
       with:
-        java-version: '11'
+        java-version: '17'
         distribution: 'temurin'
     - name: Install Go
       uses: actions/setup-go@v4
@@ -78,7 +78,7 @@ jobs:
     - name: Set up JDK
       uses: actions/setup-java@v3
       with:
-        java-version: '11'
+        java-version: '17'
         distribution: 'temurin'
     - name: Install Go
       uses: actions/setup-go@v4

diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
@@ -31,7 +31,7 @@ jobs:
     - name: Set up JDK
       uses: actions/setup-java@v3
       with:
-        java-version: '11'
+        java-version: '17'
         distribution: 'temurin'
     - name: Install Go
       uses: actions/setup-go@v4

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -34,7 +34,7 @@ jobs:
     - name: Set up JDK
       uses: actions/setup-java@v3
       with:
-        java-version: '11'
+        java-version: '17'
         distribution: 'temurin'
     - name: Install Go
       uses: actions/setup-go@v4

diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml
@@ -32,7 +32,7 @@ jobs:
     - name: Set up JDK
       uses: actions/setup-java@v3
       with:
-        java-version: '11'
+        java-version: '17'
         distribution: 'temurin'
     - name: Install Go
       uses: actions/setup-go@v4

diff --git a/examples/extension/steps/pom.xml b/examples/extension/steps/pom.xml
@@ -24,8 +24,8 @@
     <version>1.0.0-SNAPSHOT</version>
 
     <properties>
-        <citrus.version>3.4.0</citrus.version>
-        <cucumber.version>7.11.0</cucumber.version>
+        <citrus.version>4.0.0</citrus.version>
+        <cucumber.version>7.14.0</cucumber.version>
     </properties>
     <dependencies>
 
@@ -36,12 +36,12 @@
         </dependency>
 
         <dependency>
-            <groupId>com.consol.citrus</groupId>
+            <groupId>org.citrusframework</groupId>
             <artifactId>citrus-core</artifactId>
             <version>${citrus.version}</version>
         </dependency>
         <dependency>
-            <groupId>com.consol.citrus</groupId>
+            <groupId>org.citrusframework</groupId>
             <artifactId>citrus-cucumber</artifactId>
             <version>${citrus.version}</version>
         </dependency>

diff --git a/examples/extension/steps/src/main/java/com/company/steps/custom/CustomSteps.java b/examples/extension/steps/src/main/java/com/company/steps/custom/CustomSteps.java
@@ -17,11 +17,11 @@
 
 package com.company.steps.custom;
 
-import com.consol.citrus.TestCaseRunner;
-import com.consol.citrus.annotations.CitrusResource;
+import org.citrusframework.TestCaseRunner;
+import org.citrusframework.annotations.CitrusResource;
 import io.cucumber.java.en.Then;
 
-import static com.consol.citrus.actions.EchoAction.Builder.echo;
+import static org.citrusframework.actions.EchoAction.Builder.echo;
 
 public class CustomSteps {
 

diff --git a/examples/logging/yaks-config.yaml b/examples/logging/yaks-config.yaml
@@ -23,7 +23,7 @@ config:
           level: INFO
         - name: org.citrusframework.yaks
           level: DEBUG
-        - name: com.consol.citrus
+        - name: org.citrusframework
           level: INFO
         - name: Logger.Message_IN
           level: DEBUG

diff --git a/examples/logging/yaks.properties b/examples/logging/yaks.properties
@@ -15,4 +15,4 @@
 # limitations under the License.
 #
 logging.level.org.citrusframework.yaks=DEBUG
-logging.level.com.consol.citrus=DEBUG
+logging.level.org.citrusframework=DEBUG
diff --git a/examples/openapi/fruitstore-server.groovy b/examples/openapi/fruitstore-server.groovy
@@ -15,15 +15,15 @@
  * limitations under the License.
  */
 
-import com.consol.citrus.endpoint.EndpointAdapter
-import com.consol.citrus.endpoint.adapter.RequestDispatchingEndpointAdapter
-import com.consol.citrus.endpoint.adapter.StaticEndpointAdapter
-import com.consol.citrus.endpoint.adapter.mapping.HeaderMappingKeyExtractor
-import com.consol.citrus.endpoint.adapter.mapping.SimpleMappingStrategy
-import com.consol.citrus.http.message.HttpMessage
-import com.consol.citrus.http.message.HttpMessageHeaders
-import com.consol.citrus.message.Message
-import com.consol.citrus.util.FileUtils
+import org.citrusframework.endpoint.EndpointAdapter
+import org.citrusframework.endpoint.adapter.RequestDispatchingEndpointAdapter
+import org.citrusframework.endpoint.adapter.StaticEndpointAdapter
+import org.citrusframework.endpoint.adapter.mapping.HeaderMappingKeyExtractor
+import org.citrusframework.endpoint.adapter.mapping.SimpleMappingStrategy
+import org.citrusframework.http.message.HttpMessage
+import org.citrusframework.http.message.HttpMessageHeaders
+import org.citrusframework.message.Message
+import org.citrusframework.util.FileUtils
 import org.springframework.http.HttpMethod
 import org.springframework.http.HttpStatus
 

diff --git a/examples/selenium/web-server.groovy b/examples/selenium/web-server.groovy
@@ -16,15 +16,15 @@
  */
 
 
-import com.consol.citrus.endpoint.EndpointAdapter
-import com.consol.citrus.endpoint.adapter.RequestDispatchingEndpointAdapter
-import com.consol.citrus.endpoint.adapter.StaticEndpointAdapter
-import com.consol.citrus.endpoint.adapter.mapping.HeaderMappingKeyExtractor
-import com.consol.citrus.endpoint.adapter.mapping.SimpleMappingStrategy
-import com.consol.citrus.http.message.HttpMessage
-import com.consol.citrus.http.message.HttpMessageHeaders
-import com.consol.citrus.message.Message
-import com.consol.citrus.util.FileUtils
+import org.citrusframework.endpoint.EndpointAdapter
+import org.citrusframework.endpoint.adapter.RequestDispatchingEndpointAdapter
+import org.citrusframework.endpoint.adapter.StaticEndpointAdapter
+import org.citrusframework.endpoint.adapter.mapping.HeaderMappingKeyExtractor
+import org.citrusframework.endpoint.adapter.mapping.SimpleMappingStrategy
+import org.citrusframework.http.message.HttpMessage
+import org.citrusframework.http.message.HttpMessageHeaders
+import org.citrusframework.message.Message
+import org.citrusframework.util.FileUtils
 import org.springframework.http.HttpStatus
 import org.springframework.http.MediaType
 import org.springframework.core.io.ClassPathResource

diff --git a/java/docs/steps-jdbc.adoc b/java/docs/steps-jdbc.adoc
@@ -147,7 +147,7 @@ The data table is able to verify a matrix of rows and columns. Each column can h
 Given SQL query: SELECT ID, TASK, COMPLETED FROM todo ORDER BY id
 Then verify columns
 | ID        | 1                  | 2             | 3          | 4            | @ignore@               |
-| TASK      | Learn some CamelK! | Get some milk | Do laundry | Wash the dog | Test CamelK with YAKS! |
+| TASK      | Learn some Camel K! | Get some milk | Do laundry | Wash the dog | Test CamelK with YAKS! |
 | COMPLETED | 0                  | 0             | 0          |            0 | 0                      |
 ----
 
@@ -172,6 +172,6 @@ Given SQL query: SELECT TASK FROM todo
 Then verify result set
 """
 assert rows.size == 1
-assert rows[0].TASK == 'Learn some CamelK!'
+assert rows[0].TASK == 'Learn some Camel K!'
 """
 ----
diff --git a/java/docs/steps-jms.adoc b/java/docs/steps-jms.adoc
@@ -25,7 +25,7 @@ The configuration step receives a data table that defines the connection setting
 [source,gherkin]
 ----
 Given JMS connection factory
-| type       | org.apache.activemq.ActiveMQConnectionFactory |
+| type       | org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory |
 | brokerUrl  | tcp://localhost:61616 |
 | username   | ${activemq.user}      |
 | password  | ${activemq.password}  |