Skip to content

Commit

Permalink
Merge up 4.5.x (#1085)
Browse files Browse the repository at this point in the history
* Update openapi version to 6.7.0 (#1078)

* Update openapi version to 6.8.0

In 6.7.0 a the base-url property was renamed to have a dot separator instead of hyphen.

micronaut-projects/micronaut-openapi#1467

We are doing this in a patch release as it is an ongoing bug in Micronaut 4.4.0 and will be released with 4.4.1.

* Prepare for 4.5.3 release

* Switch to use micronaut 4.4.0 for integration tests

* Cleanup

* Fix crac-aot integration test

* 6.7.0 to align with the Gradle plugin

* [maven-release-plugin] prepare release v4.5.3

* [maven-release-plugin] prepare for next development iteration

---------

Co-authored-by: Tim Yates <tim.yates@gmail.com>
Co-authored-by: micronaut-build <micronaut-build-account@grails.org>
  • Loading branch information
3 people committed Apr 23, 2024
1 parent 22a7cb6 commit 5619b77
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
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

0 comments on commit 5619b77

Please sign in to comment.