Skip to content

Commit

Permalink
Revert "Revert "Prepare for next release 0.9.3""
Browse files Browse the repository at this point in the history
  • Loading branch information
KyleAure authored Dec 11, 2023
1 parent 17aa70d commit 50f54a0
Show file tree
Hide file tree
Showing 8 changed files with 60 additions and 16 deletions.
32 changes: 30 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ Add `microshed-testing-testcontainers` and `junit-jupiter` as test-scoped depend
<dependency>
<groupId>org.microshed</groupId>
<artifactId>microshed-testing-testcontainers</artifactId>
<version>0.9.1</version>
<version>0.9.2</version>
<scope>test</scope>
</dependency>

Expand All @@ -40,6 +40,34 @@ Add `microshed-testing-testcontainers` and `junit-jupiter` as test-scoped depend
</dependencies>
```

## How to test a Java EE application

Add `microshed-testing-core` as a test-scoped dependency:
```xml
<dependencies>
<dependency>
<groupId>org.microshed</groupId>
<artifactId>microshed-testing-core</artifactId>
<version>0.9.2</version>
<scope>test</scope>
</dependency>
</dependencies>
```

## How to test a Jakarta EE application

Add `microshed-testing-core-jakarta` as a test-scoped dependency:
```xml
<dependencies>
<dependency>
<groupId>org.microshed</groupId>
<artifactId>microshed-testing-core-jakarta</artifactId>
<version>0.9.2</version>
<scope>test</scope>
</dependency>
</dependencies>
```

# How to try out a sample locally:

### Run with Maven:
Expand All @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
Original file line number Diff line number Diff line change
@@ -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.
Expand Down Expand Up @@ -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) {
Expand Down
10 changes: 5 additions & 5 deletions docs/features/SupportedRuntimes.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Maven Dependency:
<dependency>
<groupId>org.microshed</groupId>
<artifactId>microshed-testing-liberty</artifactId>
<version>0.9.1</version>
<version>0.9.2</version>
</dependency>
```

Expand All @@ -32,7 +32,7 @@ Maven Dependency:
<dependency>
<groupId>org.microshed</groupId>
<artifactId>microshed-testing-payara-micro</artifactId>
<version>0.9.1</version>
<version>0.9.2</version>
</dependency>
```

Expand All @@ -52,7 +52,7 @@ Maven Dependency:
<dependency>
<groupId>org.microshed</groupId>
<artifactId>microshed-testing-payara-server</artifactId>
<version>0.9.1</version>
<version>0.9.2</version>
</dependency>
```

Expand All @@ -71,7 +71,7 @@ Maven Dependency:
<dependency>
<groupId>org.microshed</groupId>
<artifactId>microshed-testing-wildfly</artifactId>
<version>0.9.1</version>
<version>0.9.2</version>
</dependency>
```

Expand All @@ -93,7 +93,7 @@ Maven Dependency:
<dependency>
<groupId>org.microshed</groupId>
<artifactId>microshed-testing-quarkus</artifactId>
<version>0.9.1</version>
<version>0.9.2</version>
</dependency>
```

Expand Down
9 changes: 8 additions & 1 deletion docs/features/Walkthrough.md
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,14 @@ Given the above application code, we can start by adding maven dependencies:
<dependency>
<groupId>org.microshed</groupId>
<artifactId>microshed-testing-testcontainers</artifactId>
<version>0.9.1</version>
<version>0.9.2</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.microshed</groupId>
<artifactId>microshed-testing-core-jakarta</artifactId>
<version>0.9.2</version>
<scope>test</scope>
</dependency>

Expand Down
9 changes: 8 additions & 1 deletion docs/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,14 @@ To get started writing a test with MicroShed Testing, add `system-test` and `jun
<dependency>
<groupId>org.microshed</groupId>
<artifactId>microshed-testing-testcontainers</artifactId>
<version>0.9.1</version>
<version>0.9.2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.microshed</groupId>
<artifactId>microshed-testing-core-jakarta</artifactId>
<version>0.9.2</version>
<scope>test</scope>
</dependency>
Expand Down
4 changes: 2 additions & 2 deletions sample-apps/maven-app/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,13 @@
<dependency>
<groupId>org.microshed</groupId>
<artifactId>microshed-testing-testcontainers</artifactId>
<version>0.9.2-SNAPSHOT</version>
<version>0.9.3-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.microshed</groupId>
<artifactId>microshed-testing-core</artifactId>
<version>0.9.2-SNAPSHOT</version>
<version>0.9.3-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
4 changes: 2 additions & 2 deletions sample-apps/quarkus-app/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -87,13 +87,13 @@
<dependency>
<groupId>org.microshed</groupId>
<artifactId>microshed-testing-quarkus</artifactId>
<version>0.9.2-SNAPSHOT</version>
<version>0.9.3-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.microshed</groupId>
<artifactId>microshed-testing-core-jakarta</artifactId>
<version>0.9.2-SNAPSHOT</version>
<version>0.9.3-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down

0 comments on commit 50f54a0

Please sign in to comment.