From 50f54a05b55f4509d345f9ed4bb4492f5a148326 Mon Sep 17 00:00:00 2001 From: Kyle Aure Date: Mon, 11 Dec 2023 11:50:46 -0600 Subject: [PATCH] Revert "Revert "Prepare for next release 0.9.3"" --- README.md | 32 +++++++++++++++++-- build.gradle | 4 +-- .../testing/jaxrs/RestClientBuilder.java | 4 ++- docs/features/SupportedRuntimes.md | 10 +++--- docs/features/Walkthrough.md | 9 +++++- docs/index.md | 9 +++++- sample-apps/maven-app/pom.xml | 4 +-- sample-apps/quarkus-app/pom.xml | 4 +-- 8 files changed, 60 insertions(+), 16 deletions(-) diff --git a/README.md b/README.md index ecf8ea09..d5cdd24e 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,7 @@ Add `microshed-testing-testcontainers` and `junit-jupiter` as test-scoped depend org.microshed microshed-testing-testcontainers - 0.9.1 + 0.9.2 test @@ -40,6 +40,34 @@ Add `microshed-testing-testcontainers` and `junit-jupiter` as test-scoped depend ``` +## How to test a Java EE application + +Add `microshed-testing-core` as a test-scoped dependency: +```xml + + + org.microshed + microshed-testing-core + 0.9.2 + test + + +``` + +## How to test a Jakarta EE application + +Add `microshed-testing-core-jakarta` as a test-scoped dependency: +```xml + + + org.microshed + microshed-testing-core-jakarta + 0.9.2 + test + + +``` + # How to try out a sample locally: ### Run with Maven: @@ -59,7 +87,7 @@ NOTE: The first run will take longer due to downloading required container layer NOTE: If a container is consistantly timing out on your system you can set a longer timeout (in seconds) with the system property `microshed.testing.startup.timeout` default value is 60 seconds. -NOTE: If a mockserver has started, but HTTP calls are consistantly timint out on your system you can set a longer timeout (in milliseconds) +NOTE: If a mockserver has started, but HTTP calls are consistantly timing out on your system you can set a longer timeout (in milliseconds) with the system property `mockserver.maxSocketTimeout` default value is 120000 milliseconds. ### Tested with: diff --git a/build.gradle b/build.gradle index dd395bab..09f71461 100644 --- a/build.gradle +++ b/build.gradle @@ -2,8 +2,8 @@ plugins { // to check for updates run: ./gradlew dependencyUpdates -Drevision=release id 'com.github.ben-manes.versions' version '0.50.0' } -ext.currentVersion = '0.9.2-SNAPSHOT' -ext.lastRelease = '0.9.1' +ext.currentVersion = '0.9.3-SNAPSHOT' +ext.lastRelease = '0.9.2' subprojects { apply plugin: 'java' diff --git a/core/src/main/java/org/microshed/testing/jaxrs/RestClientBuilder.java b/core/src/main/java/org/microshed/testing/jaxrs/RestClientBuilder.java index 768f0f96..a65e63d9 100644 --- a/core/src/main/java/org/microshed/testing/jaxrs/RestClientBuilder.java +++ b/core/src/main/java/org/microshed/testing/jaxrs/RestClientBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 IBM Corporation and others + * Copyright (c) 2019, 2023 IBM Corporation and others * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. @@ -110,6 +110,8 @@ public RestClientBuilder withBasicAuth(String user, String password) { } /** + * @param key The header key + * @param value The header value * @return The same builder instance */ public RestClientBuilder withHeader(String key, String value) { diff --git a/docs/features/SupportedRuntimes.md b/docs/features/SupportedRuntimes.md index 0b0492fa..0199924c 100644 --- a/docs/features/SupportedRuntimes.md +++ b/docs/features/SupportedRuntimes.md @@ -12,7 +12,7 @@ Maven Dependency: org.microshed microshed-testing-liberty - 0.9.1 + 0.9.2 ``` @@ -32,7 +32,7 @@ Maven Dependency: org.microshed microshed-testing-payara-micro - 0.9.1 + 0.9.2 ``` @@ -52,7 +52,7 @@ Maven Dependency: org.microshed microshed-testing-payara-server - 0.9.1 + 0.9.2 ``` @@ -71,7 +71,7 @@ Maven Dependency: org.microshed microshed-testing-wildfly - 0.9.1 + 0.9.2 ``` @@ -93,7 +93,7 @@ Maven Dependency: org.microshed microshed-testing-quarkus - 0.9.1 + 0.9.2 ``` diff --git a/docs/features/Walkthrough.md b/docs/features/Walkthrough.md index 16e321da..0e246f68 100644 --- a/docs/features/Walkthrough.md +++ b/docs/features/Walkthrough.md @@ -61,7 +61,14 @@ Given the above application code, we can start by adding maven dependencies: org.microshed microshed-testing-testcontainers - 0.9.1 + 0.9.2 + test + + + + org.microshed + microshed-testing-core-jakarta + 0.9.2 test diff --git a/docs/index.md b/docs/index.md index 03ca9f54..3519f7d8 100644 --- a/docs/index.md +++ b/docs/index.md @@ -128,7 +128,14 @@ To get started writing a test with MicroShed Testing, add `system-test` and `jun org.microshed microshed-testing-testcontainers - 0.9.1 + 0.9.2 + test + + + + org.microshed + microshed-testing-core-jakarta + 0.9.2 test diff --git a/sample-apps/maven-app/pom.xml b/sample-apps/maven-app/pom.xml index 2e5ef3f4..e061e027 100644 --- a/sample-apps/maven-app/pom.xml +++ b/sample-apps/maven-app/pom.xml @@ -34,13 +34,13 @@ org.microshed microshed-testing-testcontainers - 0.9.2-SNAPSHOT + 0.9.3-SNAPSHOT test org.microshed microshed-testing-core - 0.9.2-SNAPSHOT + 0.9.3-SNAPSHOT test diff --git a/sample-apps/quarkus-app/pom.xml b/sample-apps/quarkus-app/pom.xml index e11df3f6..58f825f5 100644 --- a/sample-apps/quarkus-app/pom.xml +++ b/sample-apps/quarkus-app/pom.xml @@ -87,13 +87,13 @@ org.microshed microshed-testing-quarkus - 0.9.2-SNAPSHOT + 0.9.3-SNAPSHOT test org.microshed microshed-testing-core-jakarta - 0.9.2-SNAPSHOT + 0.9.3-SNAPSHOT test