Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft: migrate to [email protected] #163

Closed
wants to merge 1 commit into from
Closed

Draft: migrate to [email protected] #163

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
# limitations under the License.
# ---------------------------------------------------------------------------

name: build_jdk11
name: main
on:
pull_request:
branches:
Expand All @@ -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
Expand All @@ -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
17 changes: 10 additions & 7 deletions .github/workflows/lts.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
# limitations under the License.
# ---------------------------------------------------------------------------

name: build_jdk17
name: lts_preview
on:
pull_request:
branches:
Expand All @@ -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
Expand All @@ -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
22 changes: 8 additions & 14 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
}
```
Expand All @@ -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>2.2.0-SNAPSHOT</citrus.simulator.version>
<spring.boot.version>3.1.2</spring.boot.version>
</properties>

<dependencyManagement>
Expand All @@ -116,15 +116,9 @@ When choosing Maven as build tool the pom file is a normal Spring Boot project w
</dependencyManagement>

<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
</dependency>

<!-- Citrus Simulator -->

<dependency>
<groupId>com.consol.citrus</groupId>
<groupId>org.citrusframework</groupId>
<artifactId>citrus-simulator-starter</artifactId>
<version>${citrus.simulator.version}</version>
</dependency>
Expand Down Expand Up @@ -190,7 +184,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;

Expand Down Expand Up @@ -246,7 +240,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>
Expand Down
105 changes: 36 additions & 69 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,24 +14,26 @@
<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>

<javadoc.doclint>none</javadoc.doclint>

<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>
<slf4j.version>1.7.36</slf4j.version>
<spring.boot.version>2.6.7</spring.boot.version>
<spring.version>5.3.19</spring.version>
<citrus.version>4.0.0-M2</citrus.version>
<spring.boot.version>3.1.2</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>
<xerces.version>2.12.1</xerces.version>

<!-- see https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-starter-log4j2/3.1.2 -->
<log4j2.version>2.20.0</log4j2.version>
<!-- see https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-starter-logging/3.1.2 -->
<logback.classic.version>1.4.8</logback.classic.version>

<node.version>v16.13.1</node.version>
<npm.version>8.1.2</npm.version>

Expand Down Expand Up @@ -149,82 +151,57 @@

<dependencyManagement>
<dependencies>
<!-- Citrus -->
<dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
<version>${xerces.version}</version>
<groupId>org.citrusframework</groupId>
<artifactId>citrus-bom</artifactId>
<version>${citrus.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>

<!-- Spring Boot -->
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
<version>1.10.11</version>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
<version>${spring.boot.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>

<!-- Citrus Simulator -->
<dependency>
<groupId>org.citrusframework</groupId>
<artifactId>citrus-simulator-ui</artifactId>
<artifactId>citrus-simulator-starter</artifactId>
<version>${project.version}</version>
</dependency>

<dependency>
<groupId>org.citrusframework</groupId>
<artifactId>citrus-simulator-starter</artifactId>
<artifactId>citrus-simulator-ui</artifactId>
<version>${project.version}</version>
</dependency>

<!-- Citrus -->
<dependency>
<groupId>com.consol.citrus</groupId>
<artifactId>citrus-core</artifactId>
<version>${citrus.version}</version>
</dependency>
<dependency>
<groupId>com.consol.citrus</groupId>
<artifactId>citrus-http</artifactId>
<version>${citrus.version}</version>
</dependency>
<dependency>
<groupId>com.consol.citrus</groupId>
<artifactId>citrus-ws</artifactId>
<version>${citrus.version}</version>
</dependency>
<dependency>
<groupId>com.consol.citrus</groupId>
<artifactId>citrus-jms</artifactId>
<version>${citrus.version}</version>
</dependency>
<dependency>
<groupId>com.consol.citrus</groupId>
<artifactId>citrus-java-dsl</artifactId>
<version>${citrus.version}</version>
<groupId>jakarta.interceptor</groupId>
<artifactId>jakarta.interceptor-api</artifactId>
<version>2.1.0</version>
</dependency>

<!-- Spring Boot -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
<version>${spring.boot.version}</version>
<type>pom</type>
<scope>import</scope>
<groupId>jakarta.transaction</groupId>
<artifactId>jakarta.transaction-api</artifactId>
<version>2.0.1</version>
</dependency>

<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId>
<version>${spring.version}</version>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
<version>${xerces.version}</version>
</dependency>

<dependency>
<groupId>jakarta.interceptor</groupId>
<artifactId>jakarta.interceptor-api</artifactId>
<version>1.2.4</version>
</dependency>
<dependency>
<groupId>jakarta.transaction</groupId>
<artifactId>jakarta.transaction-api</artifactId>
<version>1.3.2</version>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
<version>1.10.11</version>
</dependency>

<dependency>
Expand All @@ -241,7 +218,7 @@
<dependency>
<groupId>io.swagger.parser.v3</groupId>
<artifactId>swagger-parser</artifactId>
<version>2.0.28</version>
<version>2.1.16</version>
</dependency>

<dependency>
Expand All @@ -252,16 +229,6 @@
</dependency>

<!-- Logging -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>${slf4j.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
<version>${slf4j.version}</version>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
Expand Down
59 changes: 7 additions & 52 deletions simulator-archetypes/archetype-jms/src/main/resources/archetype-resources/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@
<java.version>11</java.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<citrus.version>3.1.0</citrus.version>
<citrus.version>4.0.0-M2</citrus.version>
<citrus.simulator.version>2.2.0-SNAPSHOT</citrus.simulator.version>
<spring.boot.version>2.5.4</spring.boot.version>
<activemq.version>5.15.9</activemq.version>
<spring.boot.version>3.1.2</spring.boot.version>
<artemis.version>2.30.0</artemis.version>
<testng.version>7.7.0</testng.version>
</properties>

Expand All @@ -34,11 +34,6 @@
</dependencyManagement>

<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
</dependency>

<!-- Citrus Simulator -->
<dependency>
<groupId>org.citrusframework</groupId>
Expand All @@ -53,21 +48,15 @@

<!-- Citrus -->
<dependency>
<groupId>com.consol.citrus</groupId>
<groupId>org.citrusframework</groupId>
<artifactId>citrus-jms</artifactId>
<version>${citrus.version}</version>
</dependency>

<!-- ActiveMQ broker -->
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-broker</artifactId>
<version>${activemq.version}</version>
</dependency>
<!-- ActiveMQ Artemis broker -->
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-spring</artifactId>
<version>${activemq.version}</version>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-artemis</artifactId>
</dependency>

<dependency>
Expand Down Expand Up @@ -117,40 +106,6 @@
</configuration>
</plugin>

<plugin>
<groupId>org.apache.activemq.tooling</groupId>
<artifactId>activemq-maven-plugin</artifactId>
<version>${activemq.version}</version>
<configuration>
<fork>false</fork>
<systemProperties>
<property>
<name>log4j.configuration</name>
<value>log4j.properties</value>
</property>
</systemProperties>
</configuration>
<executions>
<execution>
<id>start-activemq</id>
<phase>pre-integration-test</phase>
<goals>
<goal>run</goal>
</goals>
<configuration>
<fork>true</fork>
</configuration>
</execution>
<execution>
<id>stop-activemq</id>
<phase>post-integration-test</phase>
<goals>
<goal>stop</goal>
</goals>
</execution>
</executions>
</plugin>

<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
Expand Down
Loading