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.

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

Merge up 4.5.x #1085

Merged
merged 4 commits into from
Apr 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 1 addition & 3 deletions micronaut-maven-integration-tests/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<maven.deploy.skip>true</maven.deploy.skip>
<maven.javadoc.skip>true</maven.javadoc.skip>

<it.micronaut.version>4.2.3</it.micronaut.version>
<it.micronaut.version>4.4.0</it.micronaut.version>

<!-- Enable recording of coverage during execution of maven-invoker-plugin -->
<jacoco.propertyName>invoker.mavenOpts</jacoco.propertyName>
Expand Down Expand Up @@ -106,8 +106,6 @@
<writeJunitReport>true</writeJunitReport>
<properties>
<jdk.version>${java.specification.version}</jdk.version>
<!-- TODO: remove when using Micronaut 4.3 -->
<resources.autodetection.enabled>true</resources.autodetection.enabled>
</properties>
</configuration>
<executions>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ assert log.text.contains("BUILD SUCCESS")

def petApi = new File(basedir, "target/generated-sources/openapi/src/main/java/io/micronaut/openapi/api/PetApi.java")
assert petApi.exists()
assert petApi.text.contains('@Client("${openapi-micronaut-client.base-path}")')
assert new File(basedir, "target/generated-sources/openapi/src/main/java/io/micronaut/openapi/model/Pet.java").exists()
assert new File(basedir, "target/classes/io/micronaut/openapi/api/PetApi.class").exists()
assert new File(basedir, "target/classes/io/micronaut/openapi/model/Pet.class").exists()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,7 @@
<image>
<name>alvarosanchez/${project.artifactId}:${project.version}</name>
<run>
<privileged>true</privileged>
<wait>
<log>Restore completed!</log>
<time>20000</time>
Expand Down