complete merge for version 1.5.2 final

Author: ptrthomas

.github/workflows/codeql.yml

@@ -40,7 +40,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: set up jdk 17
         uses: actions/setup-java@v5

.github/workflows/jdk-compat.yml

@@ -10,12 +10,12 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: git checkout
-      uses: actions/checkout@v5
+      uses: actions/checkout@v6
     - name: get latest jdk ga
       uses: oracle-actions/setup-java@v1
       with:
         website: jdk.java.net
-        release: 23
+        release: 25
     - name: cache maven packages
       uses: actions/cache@v4
       with:

.github/workflows/maven-build.yml

@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: git checkout
-      uses: actions/checkout@v5    
+      uses: actions/checkout@v6
     - name: set up jdk 17
       uses: actions/setup-java@v5
       with:

.github/workflows/maven-release.yml

@@ -28,15 +28,15 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: git checkout
-      uses: actions/checkout@v5
+      uses: actions/checkout@v6
     - name: set up jdk 17
       uses: actions/setup-java@v5
       with:
         distribution: adopt
         java-version: 17
-        server-id: ossrh
-        server-username: MAVEN_USERNAME
-        server-password: MAVEN_PASSWORD
+        server-id: central
+        server-username: CENTRAL_TOKEN_USERNAME
+        server-password: CENTRAL_TOKEN_PASSWORD
         gpg-private-key: ${{ secrets.OSSRH_GPG_SECRET_KEY }}
         gpg-passphrase: MAVEN_GPG_PASSPHRASE
     - name: set maven version
@@ -63,11 +63,11 @@ jobs:
     - name: maven deploy to central
       if: ( github.event.inputs.maven == 'enabled' )
       env:
-        MAVEN_USERNAME: ${{ secrets.OSSRH_TOKEN_USER }}
-        MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }}
+        CENTRAL_TOKEN_USERNAME: ${{ secrets.OSSRH_TOKEN_USER }}
+        CENTRAL_TOKEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }}
         MAVEN_GPG_PASSPHRASE: ${{ secrets.OSSRH_GPG_SECRET_KEY_PASSWORD }}
       run: |
-        mvn -B -ntp deploy -DskipTests -P pre-release,release
+        mvn -B -ntp deploy -DskipTests -P pre-release,release -pl "!karate-archetype,!karate-demo,!karate-e2e-tests"
     - name: maven build binaries
       run: |
         mvn package -DskipTests -P fatjar -f karate-core/pom.xml

README.md

@@ -349,7 +349,7 @@ All you need is available in the [`karate-core`](https://search.maven.org/artifa
 <dependency>
     <groupId>io.karatelabs</groupId>
     <artifactId>karate-junit5</artifactId>
-    <version>1.5.1</version>
+    <version>1.5.2</version>
     <scope>test</scope>
 </dependency>
 ```
@@ -358,7 +358,7 @@ All you need is available in the [`karate-core`](https://search.maven.org/artifa
 Alternatively for [Gradle](https://gradle.org):
 
 ```yml
-    testImplementation 'io.karatelabs:karate-junit5:1.5.1'
+    testImplementation 'io.karatelabs:karate-junit5:1.5.2'
 ```
 
 Also refer to the wiki for using [Karate with Gradle](https://github.com/karatelabs/karate/wiki/Gradle).
@@ -393,7 +393,7 @@ You can replace the values of `com.mycompany` and `myproject` as per your needs.
 mvn archetype:generate \
 -DarchetypeGroupId=io.karatelabs \
 -DarchetypeArtifactId=karate-archetype \
--DarchetypeVersion=1.5.1 \
+-DarchetypeVersion=1.5.2 \
 -DgroupId=com.mycompany \
 -DartifactId=myproject
 ```
@@ -2419,6 +2419,8 @@ karate.configure('ssl', { trustAll: true });
 
 For end-to-end examples in the Karate demos, look at the files in [this folder](karate-demo/src/test/java/ssl).
 
+There is also a minimal Spring Boot based example here: [Karate and SSL](https://github.com/karatelabs/karate-examples/blob/main/ssl/README.md)
+
 ### NTLM Authentication
 Karate provides support for NTLM authentication using the Apache NTLMEngine implementation.
 
@@ -4271,6 +4273,7 @@ Karate also has built-in support for [websocket](http://www.websocket.org) that
   * `subProtocol` - in case the server expects it
   * `headers` - another JSON of key-value pairs
   * `maxPayloadSize` - this defaults to 4194304 (bytes, around 4 MB)
+  * `useFrameAggregation` - (Boolean) defaults to `false`.  Can be enabled to aggregate multiple frames if the server sends multiple frames for a single payload.
 
 These will init a websocket client for the given `url` and optional `subProtocol`. You can call `send()` on the returned object to send a message.
 
@@ -4330,6 +4333,7 @@ For completeness, the "built-in" tags are the following:
 Tag | Description
 --- | -----------
 `@ignore` | Any `Scenario` with (or that has inherited) this tag will be skipped at run-time. This does not apply to anything that is "called" though
+`@fail` | Any `Scenario` with (or that has inherited) this tag will be expected to fail. This can be used if e.g. tests are written before fixes
 `@parallel` | See [`@parallel=false`](#parallelfalse)
 `@report` | See [`@report=false`](#reportfalse)
 `@setup` | See [`@setup`](#setup)

build-docker.sh

@@ -12,40 +12,51 @@ mvn clean test -B -ntp -f examples/gatling/pom.xml
 
 # copy only karate jars to a place where the docker image build can add from
 KARATE_REPO=karate-docker/karate-chrome/target/repository/io/karatelabs
-mkdir -p ${KARATE_REPO}
-cp -r ~/.m2/repository/io/karatelabs ${KARATE_REPO}
+mkdir -p "${KARATE_REPO}"
+cp -r ~/.m2/repository/io/karatelabs "${KARATE_REPO}"
 
 # create / copy the karate fatjar so that the docker image build can add it
 mvn package -B -ntp -P fatjar -DskipTests -f karate-core/pom.xml
-cp karate-core/target/karate-${KARATE_VERSION}.jar karate-docker/karate-chrome/target/karate.jar
+cp "karate-core/target/karate-${KARATE_VERSION}.jar" karate-docker/karate-chrome/target/karate.jar
 
-# setup multiplatform build
-docker buildx rm multiplatform-builder
+# setup multiplatform build (ignore error if builder doesn't exist)
+docker buildx rm multiplatform-builder || true
 docker buildx create --name multiplatform-builder
 docker buildx use multiplatform-builder
 
 # build karate-chrome docker image that includes karate fatjar + maven jars for convenience
-# Only possible for linux/amd64 as chrome not available on linux/arm64
-docker buildx build --platform linux/amd64 --cache-from=type=local,src=./target/docker --cache-to=type=local,dest=./target/docker -t karatelabs/karate-chrome:${{ github.event.inputs.version }} -t karatelabs/karate-chrome:latest karate-docker/karate-chrome
-# build karate-chromium docker image that includes karate fatjar + maven jars for convenience
-# Both platform
-docker buildx build --platform linux/amd64,linux/arm64 --cache-from=type=local,src=./target/docker --cache-to=type=local,dest=./target/docker -t karatelabs/karate-chromium:${{ github.event.inputs.version }} -t karatelabs/karate-chromium:latest karate-docker/karate-chromium
+# Only linux/amd64 is supported because google-chrome-stable is amd64-only
+docker buildx build \
+  --platform linux/amd64 \
+  --cache-from=type=local,src=./target/docker \
+  --cache-to=type=local,dest=./target/docker \
+  -t karatelabs/karate-chrome:${{ github.event.inputs.version }} \
+  -t karatelabs/karate-chrome:latest \
+  karate-docker/karate-chrome
 
-# Select image for test depending current OS
+# Decide platform for local "load" build
+PLATFORM_FLAG=""
 if [[ "$OSTYPE" == "darwin"* ]]; then
-  # chromium only solution on Mac darwin
-  IMAGE=chromium
-else
-  IMAGE=chrome
+  # On Mac (including M1), force linux/amd64 so Chrome is available
+  PLATFORM_FLAG="--platform=linux/amd64"
 fi
-# Load image image for local
-docker buildx build --load --cache-from=type=local,src=./target/docker -t karate-$IMAGE karate-docker/karate-$IMAGE
+
+# Build local image (for running tests) and load into Docker
+docker buildx build \
+  --load \
+  ${PLATFORM_FLAG} \
+  --cache-from=type=local,src=./target/docker \
+  -t karate-chrome \
+  karate-docker/karate-chrome
 
 # just in case a previous run had hung (likely only in local dev)
 docker stop karate || true
 
 # note that this command is run as a background process
-docker run --name karate --rm --cap-add=SYS_ADMIN -v "$PWD":/karate -v "$HOME"/.m2:/root/.m2 karate-$IMAGE &
+docker run --name karate --rm --cap-add=SYS_ADMIN \
+  -v "$PWD":/karate \
+  -v "$HOME/.m2":/root/.m2 \
+  karate-chrome &
 
 # just ensure that the docker container named "karate" exists after the above command
 # it does not have to have completed startup, the command / karate test below will wait
@@ -59,4 +70,3 @@ docker exec -w /karate karate mvn test -B -ntp -f karate-e2e-tests/pom.xml -Dtes
 
 docker stop karate
 wait
-

examples/consumer-driven-contracts/pom.xml

@@ -19,7 +19,7 @@
         <spring.boot.version>3.2.2</spring.boot.version>
         <junit5.version>5.7.0</junit5.version>
         <java.version>17</java.version>
-        <karate.version>1.5.1</karate.version>
+        <karate.version>1.5.2</karate.version>
     </properties>    
 
     <dependencies>

examples/gatling/build.gradle

@@ -3,7 +3,7 @@ plugins {
 }
 
 ext {
-    karateVersion = '1.5.1'
+    karateVersion = '1.5.2'
 }
 
 dependencies {

examples/gatling/pom.xml

@@ -13,7 +13,7 @@
         <maven.compiler.version>3.6.0</maven.compiler.version>
 	<!-- please change this when running locally -->
         <karate.version>${project.version}</karate.version>
-        <gatling.plugin.version>4.1.1</gatling.plugin.version>
+        <gatling.plugin.version>4.3.4</gatling.plugin.version>
     </properties>    
 
     <dependencies>

examples/image-comparison/pom.xml

@@ -11,7 +11,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <java.version>17</java.version>
         <maven.compiler.version>3.8.1</maven.compiler.version>
-        <karate.version>1.5.1</karate.version>
+        <karate.version>1.5.2</karate.version>
     </properties>    
 
     <dependencies>