feat(#162)!: migrate to [email protected]

upgrade citrus core from `com.consol.citrus` to `org.citrusframework` dependency. that includes some transitive dependency updates/migrations, also in order to support a jdk17 build minimum: * `javax` to `jakarta` * `org.springframework` * `org.springframework.boot` BREAKING CHANGE: contains breaking dependency updates!
citrusframework · May 14, 2023 · 1ca2ea1 · 1ca2ea1
1 parent 891be35
commit 1ca2ea1
Show file tree

Hide file tree

Showing 193 changed files with 548 additions and 542 deletions.
diff --git a/.github/project.yml b/.github/project.yml
@@ -1,4 +1,4 @@
 name: Citrus Simulator
 release:
-  current-version: 2.1.1
-  next-version: 2.2.0-SNAPSHOT
+  current-version: 3.0.0-M1
+  next-version: 3.0.0-SNAPSHOT
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -41,10 +41,10 @@ jobs:
     env:
       BUILD_OPTS: '--no-transfer-progress'
     steps:
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: AdoptOpenJDK/install-jdk@v1
         with:
-          version: "11"
+          version: "17"
       - name: Checkout code
         uses: actions/checkout@v2
       - name: Cache Maven packages
@@ -62,4 +62,4 @@ jobs:
           ./mvnw --batch-mode install ${BUILD_OPTS}
       - name: Verify Samples
         run: |
-          ./mvnw --batch-mode -f simulator-samples/pom.xml verify ${BUILD_OPTS}
+          ./mvnw --batch-mode -f simulator-samples/pom.xml verify
diff --git a/.github/workflows/lts.yml b/.github/workflows/lts.yml
@@ -37,15 +37,18 @@ on:
       - 'NOTICE'
 jobs:
   build:
-    runs-on: ubuntu-20.04
-    env:
-      BUILD_OPTS: '--no-transfer-progress -Djava.version=17'
+    strategy:
+      fail-fast: false
+      matrix:
+        version: [ 18, 19 ]
+        os: [ ubuntu-20.04 ]
+    runs-on: ${{ matrix.os }}
     steps:
       - name: Set up JDK 17
         uses: actions/setup-java@v2
         with:
           distribution: 'temurin'
-          java-version: '17'
+          java-version: ${{ matrix.version }}
       - name: Checkout code
         uses: actions/checkout@v2
       - name: Cache Maven packages
@@ -60,7 +63,7 @@ jobs:
           ./mvnw -version
       - name: Build Citrus-Simulator
         run: |
-          ./mvnw --batch-mode install ${BUILD_OPTS}
+          ./mvnw --batch-mode -Djava.version=${{ matrix.version }} install
       - name: Verify Samples
         run: |
-          ./mvnw --batch-mode -f simulator-samples/pom.xml verify ${BUILD_OPTS}
+          ./mvnw --batch-mode -Djava.version=${{ matrix.version }} -f simulator-samples/pom.xml verify
diff --git a/README.md b/README.md
@@ -73,7 +73,7 @@ targetCompatibility = 1.8
 
 dependencies {
     implementation("org.springframework.boot:spring-boot-starter-web")
-    implementation("com.consol.citrus:citrus-simulator-starter:1.2-SNAPSHOT")
+    implementation("org.citrusframework:citrus-simulator-starter:1.2-SNAPSHOT")
     testImplementation("junit:junit")
 }
 ```
@@ -90,17 +90,17 @@ When choosing Maven as build tool the pom file is a normal Spring Boot project w
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
-  <groupId>com.consol.citrus</groupId>
+  <groupId>org.citrusframework</groupId>
   <artifactId>citrus-simulator-sample</artifactId>
   <name>${project.artifactId}</name>
   <version>1.0.0</version>
 
   <properties>
-    <java.version>11</java.version>
+    <java.version>17</java.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    <citrus.simulator.version>1.2-SNAPSHOT</citrus.simulator.version>
-    <spring.boot.version>2.0.9.RELEASE</spring.boot.version>
+    <citrus.simulator.version>3.0.0-M1</citrus.simulator.version>
+    <spring.boot.version>6.0.9</spring.boot.version>
   </properties>
 
   <dependencyManagement>
@@ -124,7 +124,7 @@ When choosing Maven as build tool the pom file is a normal Spring Boot project w
     <!-- Citrus Simulator -->
 
     <dependency>
-      <groupId>com.consol.citrus</groupId>
+      <groupId>org.citrusframework</groupId>
       <artifactId>citrus-simulator-starter</artifactId>
       <version>${citrus.simulator.version}</version>
     </dependency>
@@ -190,7 +190,7 @@ In addition to that we should define one to many simulator scenarios that execut
 ```java
 package org.citrusframework.simulator;
 
-import com.consol.citrus.http.message.HttpMessage;
+import org.citrusframework.http.message.HttpMessage;
 import org.citrusframework.simulator.scenario.*;
 import org.springframework.http.HttpStatus;
 
@@ -246,7 +246,7 @@ In Maven we simply add the following dependency:
 
 ```xml
 <dependency>
-  <groupId>com.consol.citrus</groupId>
+  <groupId>org.citrusframework</groupId>
   <artifactId>citrus-simulator-ui</artifactId>
   <version>${citrus.simulator.version}</version>
 </dependency>

diff --git a/pom.xml b/pom.xml
@@ -7,14 +7,14 @@
   <groupId>org.citrusframework</groupId>
   <artifactId>citrus-simulator</artifactId>
   <name>${project.artifactId}</name>
-  <version>2.2.0-SNAPSHOT</version>
+  <version>3.0.0-M1</version>
   <packaging>pom</packaging>
   <description>Citrus Simulator</description>
   <url>https://citrusframework.org</url>
   <inceptionYear>2017</inceptionYear>
 
   <properties>
-    <java.version>11</java.version>
+    <java.version>17</java.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
@@ -23,10 +23,10 @@
     <log4j2.version>2.17.2</log4j2.version>
     <logback.classic.version>1.2.10</logback.classic.version>
     <lombok.version>1.18.20</lombok.version>
-    <citrus.version>3.2.1</citrus.version>
+    <citrus.version>4.0.0-M1</citrus.version>
     <slf4j.version>1.7.36</slf4j.version>
-    <spring.boot.version>2.6.7</spring.boot.version>
-    <spring.version>5.3.19</spring.version>
+    <spring.boot.version>3.0.6</spring.boot.version>
+    <spring.version>6.0.9</spring.version>
     <spring.ws.version>3.1.3</spring.ws.version>
     <testng.version>7.5.1</testng.version>
     <wsdl4j.version>1.6.3</wsdl4j.version>
@@ -176,27 +176,27 @@
 
       <!-- Citrus -->
       <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-http</artifactId>
         <version>${citrus.version}</version>
       </dependency>
       <dependency>
-        <groupId>com.consol.citrus</groupId>
+        <groupId>org.citrusframework</groupId>
         <artifactId>citrus-ws</artifactId>
         <version>${citrus.version}</version>
       </dependency>
       <dependency>
-        <groupId>com.consol.citrus</groupId>
+        <groupId>org.citrusframework</groupId>
         <artifactId>citrus-jms</artifactId>
         <version>${citrus.version}</version>
       </dependency>
       <dependency>
-        <groupId>com.consol.citrus</groupId>
+        <groupId>org.citrusframework</groupId>
         <artifactId>citrus-java-dsl</artifactId>
         <version>${citrus.version}</version>
       </dependency>
@@ -219,12 +219,12 @@
       <dependency>
         <groupId>jakarta.interceptor</groupId>
         <artifactId>jakarta.interceptor-api</artifactId>
-        <version>1.2.4</version>
+        <version>2.1.0</version>
       </dependency>
       <dependency>
         <groupId>jakarta.transaction</groupId>
         <artifactId>jakarta.transaction-api</artifactId>
-        <version>1.3.2</version>
+        <version>2.0.1</version>
       </dependency>
 
       <dependency>

diff --git a/simulator-archetypes/archetype-jms/pom.xml b/simulator-archetypes/archetype-jms/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.citrusframework.archetypes</groupId>
     <artifactId>citrus-simulator-archetypes</artifactId>
-    <version>2.2.0-SNAPSHOT</version>
+    <version>3.0.0-M1</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/simulator-archetypes/archetype-jms/src/main/resources/archetype-resources/pom.xml b/simulator-archetypes/archetype-jms/src/main/resources/archetype-resources/pom.xml
@@ -53,7 +53,7 @@
 
     <!-- Citrus -->
     <dependency>
-      <groupId>com.consol.citrus</groupId>
+      <groupId>org.citrusframework</groupId>
       <artifactId>citrus-jms</artifactId>
       <version>${citrus.version}</version>
     </dependency>

diff --git a/...hetypes/archetype-jms/src/main/resources/archetype-resources/src/main/java/Simulator.java b/...hetypes/archetype-jms/src/main/resources/archetype-resources/src/main/java/Simulator.java
@@ -22,7 +22,7 @@
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
-import javax.jms.ConnectionFactory;
+import jakarta.jms.ConnectionFactory;
 
 @SpringBootApplication
 public class Simulator extends SimulatorJmsAdapter {

diff --git a/...type-jms/src/main/resources/archetype-resources/src/main/resources/application.properties b/...type-jms/src/main/resources/archetype-resources/src/main/resources/application.properties
@@ -1,5 +1,5 @@
 info.simulator.name=JMS Simulator
-logging.level.com.consol.citrus=INFO
+logging.level.org.citrusframework=INFO
 logging.level.org.citrusframework=INFO
 
 # Enable JMS support

diff --git a/...es/archetype-jms/src/main/resources/archetype-resources/src/test/java/SimulatorJmsIT.java b/...es/archetype-jms/src/main/resources/archetype-resources/src/test/java/SimulatorJmsIT.java
@@ -16,9 +16,9 @@
 
 package ${package};
 
-import com.consol.citrus.annotations.CitrusTest;
-import com.consol.citrus.dsl.testng.TestNGCitrusTestDesigner;
-import com.consol.citrus.jms.endpoint.JmsSyncEndpoint;
+import org.citrusframework.annotations.CitrusTest;
+import org.citrusframework.dsl.testng.TestNGCitrusTestDesigner;
+import org.citrusframework.jms.endpoint.JmsSyncEndpoint;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.testng.annotations.Test;
 

diff --git a/.../archetype-jms/src/main/resources/archetype-resources/src/test/resources/logback-test.xml b/.../archetype-jms/src/main/resources/archetype-resources/src/test/resources/logback-test.xml
@@ -22,7 +22,7 @@
     </encoder>
   </appender>
 
-  <logger name="com.consol.citrus" level="INFO"/>
+  <logger name="org.citrusframework" level="INFO"/>
   <logger name="org.citrusframework" level="INFO"/>
   <logger name="org.apache.http" level="INFO"/>
   <logger name="org.eclipse.jetty" level="WARN"/>

diff --git a/simulator-archetypes/archetype-mail/pom.xml b/simulator-archetypes/archetype-mail/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.citrusframework.archetypes</groupId>
     <artifactId>citrus-simulator-archetypes</artifactId>
-    <version>2.2.0-SNAPSHOT</version>
+    <version>3.0.0-M1</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/...etypes/archetype-mail/src/main/resources/archetype-resources/src/main/java/Simulator.java b/...etypes/archetype-mail/src/main/resources/archetype-resources/src/main/java/Simulator.java
@@ -16,8 +16,8 @@
 
 package ${package};
 
-import com.consol.citrus.endpoint.Endpoint;
-import com.consol.citrus.mail.server.MailServer;
+import org.citrusframework.endpoint.Endpoint;
+import org.citrusframework.mail.server.MailServer;
 import org.citrusframework.simulator.endpoint.SimulatorEndpointComponentAdapter;
 import org.citrusframework.simulator.scenario.mapper.ContentBasedXPathScenarioMapper;
 import org.citrusframework.simulator.scenario.mapper.ScenarioMapper;

diff --git a/...ype-mail/src/main/resources/archetype-resources/src/main/resources/application.properties b/...ype-mail/src/main/resources/archetype-resources/src/main/resources/application.properties
@@ -1,5 +1,5 @@
 info.simulator.name=Mail Server Simulator
-logging.level.com.consol.citrus=INFO
+logging.level.org.citrusframework=INFO
 logging.level.org.citrusframework=INFO
 
 # Enable Mail endpoint support

diff --git a/.../archetype-mail/src/main/resources/archetype-resources/src/test/java/SimulatorMailIT.java b/.../archetype-mail/src/main/resources/archetype-resources/src/test/java/SimulatorMailIT.java
@@ -16,9 +16,9 @@
 
 package ${package};
 
-import com.consol.citrus.annotations.CitrusTest;
-import com.consol.citrus.dsl.testng.TestNGCitrusTestDesigner;
-import com.consol.citrus.mail.client.MailClient;
+import org.citrusframework.annotations.CitrusTest;
+import org.citrusframework.dsl.testng.TestNGCitrusTestDesigner;
+import org.citrusframework.mail.client.MailClient;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.testng.annotations.Test;
 

diff --git a/...archetype-mail/src/main/resources/archetype-resources/src/test/resources/logback-test.xml b/...archetype-mail/src/main/resources/archetype-resources/src/test/resources/logback-test.xml
@@ -22,7 +22,7 @@
     </encoder>
   </appender>
 
-  <logger name="com.consol.citrus" level="INFO"/>
+  <logger name="org.citrusframework" level="INFO"/>
   <logger name="org.citrusframework" level="INFO"/>
   <logger name="org.apache.http" level="INFO"/>
   <logger name="org.eclipse.jetty" level="WARN"/>

diff --git a/simulator-archetypes/archetype-rest/pom.xml b/simulator-archetypes/archetype-rest/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.citrusframework.archetypes</groupId>
     <artifactId>citrus-simulator-archetypes</artifactId>
-    <version>2.2.0-SNAPSHOT</version>
+    <version>3.0.0-M1</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/...ype-rest/src/main/resources/archetype-resources/src/main/resources/application.properties b/...ype-rest/src/main/resources/archetype-resources/src/main/resources/application.properties
@@ -1,5 +1,5 @@
 info.simulator.name=REST Simulator
-logging.level.com.consol.citrus=INFO
+logging.level.org.citrusframework=INFO
 logging.level.org.citrusframework=INFO
 
 # Enable Http REST support

diff --git a/.../archetype-rest/src/main/resources/archetype-resources/src/test/java/SimulatorRestIT.java b/.../archetype-rest/src/main/resources/archetype-resources/src/test/java/SimulatorRestIT.java
@@ -16,9 +16,9 @@
 
 package ${package};
 
-import com.consol.citrus.annotations.CitrusTest;
-import com.consol.citrus.dsl.testng.TestNGCitrusTestDesigner;
-import com.consol.citrus.http.client.HttpClient;
+import org.citrusframework.annotations.CitrusTest;
+import org.citrusframework.dsl.testng.TestNGCitrusTestDesigner;
+import org.citrusframework.http.client.HttpClient;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.testng.annotations.Test;

diff --git a/...archetype-rest/src/main/resources/archetype-resources/src/test/resources/logback-test.xml b/...archetype-rest/src/main/resources/archetype-resources/src/test/resources/logback-test.xml
@@ -22,7 +22,7 @@
     </encoder>
   </appender>
 
-  <logger name="com.consol.citrus" level="INFO"/>
+  <logger name="org.citrusframework" level="INFO"/>
   <logger name="org.citrusframework" level="INFO"/>
   <logger name="org.apache.http" level="INFO"/>
   <logger name="org.eclipse.jetty" level="WARN"/>

diff --git a/simulator-archetypes/archetype-swagger/pom.xml b/simulator-archetypes/archetype-swagger/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.citrusframework.archetypes</groupId>
     <artifactId>citrus-simulator-archetypes</artifactId>
-    <version>2.2.0-SNAPSHOT</version>
+    <version>3.0.0-M1</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/...pes/archetype-swagger/src/main/resources/archetype-resources/src/main/java/Simulator.java b/...pes/archetype-swagger/src/main/resources/archetype-resources/src/main/java/Simulator.java
@@ -16,10 +16,10 @@
 
 package ${package};
 
-import com.consol.citrus.endpoint.EndpointAdapter;
-import com.consol.citrus.endpoint.adapter.StaticEndpointAdapter;
-import com.consol.citrus.http.message.HttpMessage;
-import com.consol.citrus.message.Message;
+import org.citrusframework.endpoint.EndpointAdapter;
+import org.citrusframework.endpoint.adapter.StaticEndpointAdapter;
+import org.citrusframework.http.message.HttpMessage;
+import org.citrusframework.message.Message;
 import org.citrusframework.simulator.scenario.mapper.ScenarioMapper;
 import org.citrusframework.simulator.scenario.mapper.ScenarioMappers;
 import org.springframework.boot.SpringApplication;

diff --git a/...-swagger/src/main/resources/archetype-resources/src/main/resources/application.properties b/...-swagger/src/main/resources/archetype-resources/src/main/resources/application.properties
@@ -1,5 +1,5 @@
 info.simulator.name=REST Petstore Simulator
-logging.level.com.consol.citrus=INFO
+logging.level.org.citrusframework=INFO
 logging.level.org.citrusframework=INFO
 
 # Enable Http REST support

diff --git a/...chetype-swagger/src/main/resources/archetype-resources/src/test/java/SimulatorRestIT.java b/...chetype-swagger/src/main/resources/archetype-resources/src/test/java/SimulatorRestIT.java
@@ -16,10 +16,10 @@
 
 package ${package};
 
-import com.consol.citrus.annotations.CitrusTest;
-import com.consol.citrus.dsl.testng.TestNGCitrusTestDesigner;
-import com.consol.citrus.http.client.HttpClient;
-import com.consol.citrus.message.MessageType;
+import org.citrusframework.annotations.CitrusTest;
+import org.citrusframework.dsl.testng.TestNGCitrusTestDesigner;
+import org.citrusframework.http.client.HttpClient;
+import org.citrusframework.message.MessageType;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.http.HttpStatus;

diff --git a/...hetype-swagger/src/main/resources/archetype-resources/src/test/resources/logback-test.xml b/...hetype-swagger/src/main/resources/archetype-resources/src/test/resources/logback-test.xml
@@ -22,7 +22,7 @@
     </encoder>
   </appender>
 
-  <logger name="com.consol.citrus" level="INFO"/>
+  <logger name="org.citrusframework" level="INFO"/>
   <logger name="org.citrusframework" level="INFO"/>
   <logger name="org.apache.http" level="INFO"/>
   <logger name="org.eclipse.jetty" level="WARN"/>