Skip to content

Commit

Permalink
Merge pull request #21 from InditexTech/develop
Browse files Browse the repository at this point in the history
[Karate Tools] Release 5.0.1
  • Loading branch information
teresamib authored Jan 17, 2025
2 parents e5faeb7 + cc47daa commit dcd21d6
Show file tree
Hide file tree
Showing 40 changed files with 119 additions and 77 deletions.
57 changes: 57 additions & 0 deletions .github/workflows/code-maven_java-QA_compatibility.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
# The name of the workflow
name: code-maven-QA-compatibility
# The name of the workflow run
run-name: "${{ github.workflow }}-[${{ github.head_ref || github.ref_name }}]=>[${{ github.base_ref }}]"

# Concurrency configuration
concurrency:
# The concurrency group for this workflow
group: "${{ github.workflow }}-[${{ github.head_ref || github.ref_name }}]=>[${{ github.base_ref }}]"
# Cancel all previous runs in progress
cancel-in-progress: true

# Events that trigger the workflow
on:
# Allows you to run this workflow manually from the Actions tab
workflow_dispatch:
inputs:
RUNNERS:
description: |
Array of runners where the tests must be executed, for example: ["ubuntu-latest","windows-latest","macos-latest"].
required: true
default: '["ubuntu-latest","windows-latest","macos-latest"]'
# Automatically run the workflow on pull_request events
pull_request:
types: [ opened, edited, labeled, synchronize, ready_for_review, reopened ]
paths:
- 'code/**'
- '.github/workflows/code*'

# Environment variables available to all jobs and steps in this workflow
env:
WORKFLOW_VERSION: 1.0.0
MAVEN_OPTS: "-Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn"

# A workflow run is made up of one or more jobs that can run sequentially or in parallel
jobs:

# compatibility-tests
compatibility-tests:
# The name of the job
name: compatibility-tests
# The type of runner that the job will run on
runs-on: ${{ matrix.runner }}
strategy:
matrix:
runner: ${{ fromJSON(github.event.inputs.RUNNERS) }}
# Conditions to run the job
if: ${{ github.event_name == 'workflow_dispatch' || github.event.pull_request.draft == false }}
# Steps represent a sequence of tasks that will be executed as part of the job
steps:

# checkout
- name: checkout
id: checkout
uses: actions/checkout@v4
with:
fetch-depth: 0
3 changes: 0 additions & 3 deletions .github/workflows/code-maven_java-QA_e2e_karate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,6 @@ on:
# Environment variables available to all jobs and steps in this workflow
env:
WORKFLOW_VERSION: 1.0.0
# JaCoCo configuration
JACOCO_RELATIVE_CLASS_DUMP_DIR: classes
JACOCO_RELATIVE_DEST_FILE: jacoco-e2e.exec
MAVEN_OPTS: "-Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn"

# A workflow run is made up of one or more jobs that can run sequentially or in parallel
Expand Down
6 changes: 4 additions & 2 deletions code/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

- [#19](https://github.com/InditexTech/karatetools-oss/issues/19) [Karate Tools] Bug-Fix - exec-maven-plugin:3.5.0 causes Could not load library for *jansi*

## [5.0.0] - 2025-01-14

- [#10](https://github.com/InditexTech/karatetools-oss/issues/10) \[Karate-Tools] Update to JDK 21
- [#7](https://github.com/InditexTech/karatetools-oss/issues/7) \[Karate-Tools] Sonar Issues Fix
- [#10](https://github.com/InditexTech/karatetools-oss/issues/10) [Karate-Tools] Update to JDK 21
- [#7](https://github.com/InditexTech/karatetools-oss/issues/7) [Karate-Tools] Sonar Issues Fix

## [4.0.0] - 2024-11-26

Expand Down
2 changes: 1 addition & 1 deletion code/archetype/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>dev.inditex.karate</groupId>
<artifactId>karatetools</artifactId>
<version>5.1.0-SNAPSHOT</version>
<version>5.0.1-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@

<!-- Karate Tools -->
<karatetools.version>@archetype-${project.version}</karatetools.version>
<exec-maven-plugin.version>3.5.0</exec-maven-plugin.version>
<exec-maven-plugin.version>3.1.0</exec-maven-plugin.version>
#if (${includeKafkaClients} == 'yes' || ${includeKafkaClients} == 'y')

<!-- Karate Clients -->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@

<!-- Karate Tools -->
<karatetools.version>@archetype-${project.version}</karatetools.version>
<exec-maven-plugin.version>3.5.0</exec-maven-plugin.version>
<exec-maven-plugin.version>3.1.0</exec-maven-plugin.version>
</properties>

<dependencies>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@

<!-- Karate Tools -->
<karatetools.version>@archetype-${project.version}</karatetools.version>
<exec-maven-plugin.version>3.5.0</exec-maven-plugin.version>
<exec-maven-plugin.version>3.1.0</exec-maven-plugin.version>

<!-- Karate Clients -->
<maven-compiler-plugin.version>3.11.0</maven-compiler-plugin.version>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@

<!-- Karate Tools -->
<karatetools.version>@archetype-${project.version}</karatetools.version>
<exec-maven-plugin.version>3.5.0</exec-maven-plugin.version>
<exec-maven-plugin.version>3.1.0</exec-maven-plugin.version>

<!-- Karate Clients -->
<maven-compiler-plugin.version>3.11.0</maven-compiler-plugin.version>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@

<!-- Karate Tools -->
<karatetools.version>@archetype-${project.version}</karatetools.version>
<exec-maven-plugin.version>3.5.0</exec-maven-plugin.version>
<exec-maven-plugin.version>3.1.0</exec-maven-plugin.version>
</properties>

<dependencies>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@

<!-- Karate Tools -->
<karatetools.version>@archetype-${project.version}</karatetools.version>
<exec-maven-plugin.version>3.5.0</exec-maven-plugin.version>
<exec-maven-plugin.version>3.1.0</exec-maven-plugin.version>

<!-- Karate Clients -->
<maven-compiler-plugin.version>3.11.0</maven-compiler-plugin.version>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@

<!-- Karate Tools -->
<karatetools.version>@archetype-${project.version}</karatetools.version>
<exec-maven-plugin.version>3.5.0</exec-maven-plugin.version>
<exec-maven-plugin.version>3.1.0</exec-maven-plugin.version>
</properties>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion code/boot/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>dev.inditex.karate</groupId>
<artifactId>karatetools</artifactId>
<version>5.1.0-SNAPSHOT</version>
<version>5.0.1-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion code/clients/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>dev.inditex.karate</groupId>
<artifactId>karatetools</artifactId>
<version>5.1.0-SNAPSHOT</version>
<version>5.0.1-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion code/clients/src/main/resources/logback.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
</appender>

<appender name="file" class="ch.qos.logback.core.FileAppender">
<file>target/karate-utils.log</file>
<file>target/karate-tools.log</file>
<append>true</append>
<encoder>
<pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n
Expand Down
34 changes: 1 addition & 33 deletions code/generators/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>dev.inditex.karate</groupId>
<artifactId>karatetools</artifactId>
<version>5.1.0-SNAPSHOT</version>
<version>5.0.1-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

Expand Down Expand Up @@ -141,38 +141,6 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<version>${exec-maven-plugin.version}</version>
<dependencies>
<dependency>
<groupId>dev.inditex.karate</groupId>
<artifactId>generators</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
<executions>
<!-- Karate Generators - OpenApi -->
<execution>
<id>open-api-generator</id>
<goals>
<goal>java</goal>
</goals>
<configuration>
<mainClass>dev.inditex.karate.openapi.OpenApiGeneratorCLI</mainClass>
<classpathScope>test</classpathScope>
<includeProjectDependencies>false</includeProjectDependencies>
<includePluginDependencies>true</includePluginDependencies>
<cleanupDaemonThreads>false</cleanupDaemonThreads>
<executableDependency>
<groupId>dev.inditex.karate</groupId>
<artifactId>generators</artifactId>
</executableDependency>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>

Expand Down
2 changes: 1 addition & 1 deletion code/generators/src/main/resources/logback.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
</appender>

<appender name="file" class="ch.qos.logback.core.FileAppender">
<file>target/karate-utils.log</file>
<file>target/karate-tools.log</file>
<append>true</append>
<encoder>
<pattern>%d{yyyy-MM-dd} %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
Expand Down
2 changes: 1 addition & 1 deletion code/generators/src/test/resources/logback-test.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
</appender>

<appender name="file" class="ch.qos.logback.core.FileAppender">
<file>target/karate-utils.log</file>
<file>target/karate-tools.log</file>
<append>true</append>
<encoder>
<pattern>%d{yyyy-MM-dd} %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ info:
version: 1.0.0
contact:
name: KarateTools
email: karate-utils@inditex.com
email: karate-tools@inditex.com
description: KarateTools Open Api - Basic
servers:
- url: http://localhost:8080/karatetools
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ info:
version: 1.0.0
contact:
name: Karate Tools
email: karate-utils@inditex.com
email: karate-tools@inditex.com
description: KarateTools Open Api - Invalid
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ info:
version: 1.0.0
contact:
name: Karate Tools
email: karate-utils@inditex.com
email: karate-tools@inditex.com
description: KarateTools Open Api - Circular
servers:
- url: http://localhost:8080/karatetools
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ info:
version: 1.0.0
contact:
name: Karate Tools
email: karate-utils@inditex.com
email: karate-tools@inditex.com
description: KarateTools Open Api - Composed - AllOf
servers:
- url: http://localhost:8080/karatetools
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ info:
version: 1.0.0
contact:
name: Karate Tools
email: karate-utils@inditex.com
email: karate-tools@inditex.com
description: KarateTools Open Api - Composed - AnyOf
servers:
- url: http://localhost:8080/karatetools
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ info:
version: 1.0.0
contact:
name: Karate Tools
email: karate-utils@inditex.com
email: karate-tools@inditex.com
description: KarateTools Open Api - Composed - OneOf
servers:
- url: http://localhost:8080/karatetools
Expand Down
2 changes: 1 addition & 1 deletion code/jacoco-report-aggregate/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>dev.inditex.karate</groupId>
<artifactId>karatetools</artifactId>
<version>5.1.0-SNAPSHOT</version>
<version>5.0.1-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

Expand Down
4 changes: 2 additions & 2 deletions code/karate-release/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>dev.inditex.karate</groupId>
<artifactId>karatetools</artifactId>
<version>5.1.0-SNAPSHOT</version>
<version>5.0.1-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

Expand All @@ -25,7 +25,7 @@
</developers>

<properties>
<exec-maven-plugin.version>3.5.0</exec-maven-plugin.version>
<exec-maven-plugin.version>3.1.0</exec-maven-plugin.version>
<maven-scm-plugin.version>2.1.0</maven-scm-plugin.version>
</properties>

Expand Down
2 changes: 1 addition & 1 deletion code/openapi-test/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>dev.inditex.karate</groupId>
<artifactId>karatetools</artifactId>
<version>5.1.0-SNAPSHOT</version>
<version>5.0.1-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion code/openapi-test/xxx-api-rest-stable/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>dev.inditex.karate</groupId>
<artifactId>karatetools-openapi-test</artifactId>
<version>5.1.0-SNAPSHOT</version>
<version>5.0.1-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion code/openapi-test/xxx-external-api-rest-stable/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>dev.inditex.karate</groupId>
<artifactId>karatetools-openapi-test</artifactId>
<version>5.1.0-SNAPSHOT</version>
<version>5.0.1-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

Expand Down
12 changes: 9 additions & 3 deletions code/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

<groupId>dev.inditex.karate</groupId>
<artifactId>karatetools</artifactId>
<version>5.1.0-SNAPSHOT</version>
<version>5.0.1-SNAPSHOT</version>
<packaging>pom</packaging>

<name>${project.groupId}:${project.artifactId}</name>
Expand Down Expand Up @@ -154,7 +154,7 @@
<kafka-avro-serializer.version>7.6.2</kafka-avro-serializer.version>

<!-- Karate Generators -->
<exec-maven-plugin.version>3.5.0</exec-maven-plugin.version>
<exec-maven-plugin.version>3.1.0</exec-maven-plugin.version>
<spring-core.version>6.1.15</spring-core.version>
<!-- Karate Generators - Console -->
<consoleui.version>0.0.13</consoleui.version>
Expand Down Expand Up @@ -764,7 +764,7 @@
<skipTests>${skipUTs}</skipTests>
<!-- Excludes integration tests when unit tests are run. -->
<excludes>
<exclude>**/IT*.java</exclude>
<exclude>**/*IT.java</exclude>
</excludes>
</configuration>
</plugin>
Expand All @@ -777,6 +777,12 @@
<aggregate>true</aggregate>
</configuration>
</plugin>
<!-- Exec Maven Plugin -->
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<version>${exec-maven-plugin.version}</version>
</plugin>
<!-- Jacoco -->
<plugin>
<groupId>org.jacoco</groupId>
Expand Down
Loading

0 comments on commit dcd21d6

Please sign in to comment.