From d2a67a7c6cc6984a99a8d75eeeb3847d2ba456a7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 9 Nov 2022 17:01:28 +0000 Subject: [PATCH 01/39] Bump quarkiverse-parent from 10 to 11 Bumps [quarkiverse-parent](https://github.com/quarkiverse/quarkiverse-parent) from 10 to 11. - [Release notes](https://github.com/quarkiverse/quarkiverse-parent/releases) - [Commits](https://github.com/quarkiverse/quarkiverse-parent/commits) --- updated-dependencies: - dependency-name: io.quarkiverse:quarkiverse-parent dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3f2b4a4..35f2b3f 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ io.quarkiverse quarkiverse-parent - 10 + 11 io.quarkiverse.mockk From f9a761343d23d61d369347b5ed4db11ed932aec4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 16 Nov 2022 17:06:20 +0000 Subject: [PATCH 02/39] Bump quarkus.version from 2.14.0.Final to 2.14.1.Final Bumps `quarkus.version` from 2.14.0.Final to 2.14.1.Final. Updates `quarkus-bom` from 2.14.0.Final to 2.14.1.Final - [Release notes](https://github.com/quarkusio/quarkus/releases) - [Commits](https://github.com/quarkusio/quarkus/compare/2.14.0.Final...2.14.1.Final) Updates `quarkus-maven-plugin` from 2.14.0.Final to 2.14.1.Final --- updated-dependencies: - dependency-name: io.quarkus:quarkus-bom dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: io.quarkus:quarkus-maven-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 35f2b3f..1e5a77c 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ 1.7.21 1.12.4 - 2.14.0.Final + 2.14.1.Final 1.7.20 3.23.1 From 5b04ba2aa51204358c14a3129caeaa0951042794 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 25 Nov 2022 17:01:15 +0000 Subject: [PATCH 03/39] Bump quarkus.version from 2.14.1.Final to 2.14.2.Final Bumps `quarkus.version` from 2.14.1.Final to 2.14.2.Final. Updates `quarkus-bom` from 2.14.1.Final to 2.14.2.Final - [Release notes](https://github.com/quarkusio/quarkus/releases) - [Commits](https://github.com/quarkusio/quarkus/compare/2.14.1.Final...2.14.2.Final) Updates `quarkus-maven-plugin` from 2.14.1.Final to 2.14.2.Final --- updated-dependencies: - dependency-name: io.quarkus:quarkus-bom dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: io.quarkus:quarkus-maven-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 1e5a77c..a2377d1 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ 1.7.21 1.12.4 - 2.14.1.Final + 2.14.2.Final 1.7.20 3.23.1 From 0ac42d947f1684c1bed5c8f3b3a9babc337f90ff Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 28 Nov 2022 17:05:19 +0000 Subject: [PATCH 04/39] Bump kotlin.version from 1.7.21 to 1.7.22 Bumps `kotlin.version` from 1.7.21 to 1.7.22. Updates `kotlin-stdlib-jdk8` from 1.7.21 to 1.7.22 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/compare/v1.7.21...v1.7.22) Updates `kotlin-reflect` from 1.7.21 to 1.7.22 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/compare/v1.7.21...v1.7.22) Updates `kotlin-maven-plugin` from 1.7.21 to 1.7.22 Updates `kotlin-stdlib` from 1.7.21 to 1.7.22 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/compare/v1.7.21...v1.7.22) --- updated-dependencies: - dependency-name: org.jetbrains.kotlin:kotlin-stdlib-jdk8 dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.jetbrains.kotlin:kotlin-reflect dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.jetbrains.kotlin:kotlin-maven-plugin dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.jetbrains.kotlin:kotlin-stdlib dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a2377d1..01a83b6 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ Quarkus - JUnit 5 - Mockk Parent - 1.7.21 + 1.7.22 1.12.4 2.14.2.Final From f180d082c1f5e26bac69146c11c45445573b1001 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 6 Dec 2022 17:01:25 +0000 Subject: [PATCH 05/39] Bump quarkus.version from 2.14.2.Final to 2.14.3.Final Bumps `quarkus.version` from 2.14.2.Final to 2.14.3.Final. Updates `quarkus-bom` from 2.14.2.Final to 2.14.3.Final - [Release notes](https://github.com/quarkusio/quarkus/releases) - [Commits](https://github.com/quarkusio/quarkus/compare/2.14.2.Final...2.14.3.Final) Updates `quarkus-maven-plugin` from 2.14.2.Final to 2.14.3.Final --- updated-dependencies: - dependency-name: io.quarkus:quarkus-bom dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: io.quarkus:quarkus-maven-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 01a83b6..b0002a1 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ 1.7.22 1.12.4 - 2.14.2.Final + 2.14.3.Final 1.7.20 3.23.1 From a725fe1d01cedac81b43efe879e3c7a6c639c956 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 7 Dec 2022 17:01:38 +0000 Subject: [PATCH 06/39] Bump quarkus.version from 2.14.3.Final to 2.15.0.Final Bumps `quarkus.version` from 2.14.3.Final to 2.15.0.Final. Updates `quarkus-bom` from 2.14.3.Final to 2.15.0.Final - [Release notes](https://github.com/quarkusio/quarkus/releases) - [Commits](https://github.com/quarkusio/quarkus/compare/2.14.3.Final...2.15.0.Final) Updates `quarkus-maven-plugin` from 2.14.3.Final to 2.15.0.Final --- updated-dependencies: - dependency-name: io.quarkus:quarkus-bom dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: io.quarkus:quarkus-maven-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b0002a1..0164c7b 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ 1.7.22 1.12.4 - 2.14.3.Final + 2.15.0.Final 1.7.20 3.23.1 From 4c9d6dfc1bb5a958d32d4e1389dc2107356a34ac Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 9 Dec 2022 17:01:16 +0000 Subject: [PATCH 07/39] Bump quarkiverse-parent from 11 to 12 Bumps [quarkiverse-parent](https://github.com/quarkiverse/quarkiverse-parent) from 11 to 12. - [Release notes](https://github.com/quarkiverse/quarkiverse-parent/releases) - [Commits](https://github.com/quarkiverse/quarkiverse-parent/commits) --- updated-dependencies: - dependency-name: io.quarkiverse:quarkiverse-parent dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 0164c7b..8f073af 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ io.quarkiverse quarkiverse-parent - 11 + 12 io.quarkiverse.mockk From e1bca556f1120bf4aee59fbb35c7f052fbc6956f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 21 Dec 2022 17:02:06 +0000 Subject: [PATCH 08/39] Bump quarkus.version from 2.15.0.Final to 2.15.1.Final Bumps `quarkus.version` from 2.15.0.Final to 2.15.1.Final. Updates `quarkus-bom` from 2.15.0.Final to 2.15.1.Final - [Release notes](https://github.com/quarkusio/quarkus/releases) - [Commits](https://github.com/quarkusio/quarkus/compare/2.15.0.Final...2.15.1.Final) Updates `quarkus-maven-plugin` from 2.15.0.Final to 2.15.1.Final --- updated-dependencies: - dependency-name: io.quarkus:quarkus-bom dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: io.quarkus:quarkus-maven-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8f073af..40bdcba 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ 1.7.22 1.12.4 - 2.15.0.Final + 2.15.1.Final 1.7.20 3.23.1 From b8f53ba79a12d28a44aa7c3061264ce9722cf079 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 28 Dec 2022 17:03:45 +0000 Subject: [PATCH 09/39] Bump kotlin.version from 1.7.22 to 1.8.0 Bumps `kotlin.version` from 1.7.22 to 1.8.0. Updates `kotlin-stdlib-jdk8` from 1.7.22 to 1.8.0 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/compare/v1.7.22...v1.8.0) Updates `kotlin-reflect` from 1.7.22 to 1.8.0 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/compare/v1.7.22...v1.8.0) Updates `kotlin-maven-plugin` from 1.7.22 to 1.8.0 Updates `kotlin-stdlib` from 1.7.22 to 1.8.0 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/compare/v1.7.22...v1.8.0) --- updated-dependencies: - dependency-name: org.jetbrains.kotlin:kotlin-stdlib-jdk8 dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.jetbrains.kotlin:kotlin-reflect dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.jetbrains.kotlin:kotlin-maven-plugin dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.jetbrains.kotlin:kotlin-stdlib dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 40bdcba..d601815 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ Quarkus - JUnit 5 - Mockk Parent - 1.7.22 + 1.8.0 1.12.4 2.15.1.Final From c8d24df4ddceb5b7d88c003a6c28f9d20d15587d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 4 Jan 2023 17:02:21 +0000 Subject: [PATCH 10/39] Bump quarkus.version from 2.15.1.Final to 2.15.2.Final Bumps `quarkus.version` from 2.15.1.Final to 2.15.2.Final. Updates `quarkus-bom` from 2.15.1.Final to 2.15.2.Final - [Release notes](https://github.com/quarkusio/quarkus/releases) - [Commits](https://github.com/quarkusio/quarkus/compare/2.15.1.Final...2.15.2.Final) Updates `quarkus-maven-plugin` from 2.15.1.Final to 2.15.2.Final --- updated-dependencies: - dependency-name: io.quarkus:quarkus-bom dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: io.quarkus:quarkus-maven-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d601815..30fff37 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ 1.8.0 1.12.4 - 2.15.1.Final + 2.15.2.Final 1.7.20 3.23.1 From adee5800816b42700ca021f9eed6d296a46845ce Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 10 Jan 2023 17:11:14 +0000 Subject: [PATCH 11/39] Bump quarkus.version from 2.15.2.Final to 2.15.3.Final Bumps `quarkus.version` from 2.15.2.Final to 2.15.3.Final. Updates `quarkus-bom` from 2.15.2.Final to 2.15.3.Final - [Release notes](https://github.com/quarkusio/quarkus/releases) - [Commits](https://github.com/quarkusio/quarkus/compare/2.15.2.Final...2.15.3.Final) Updates `quarkus-maven-plugin` from 2.15.2.Final to 2.15.3.Final --- updated-dependencies: - dependency-name: io.quarkus:quarkus-bom dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: io.quarkus:quarkus-maven-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 30fff37..fd79cdb 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ 1.8.0 1.12.4 - 2.15.2.Final + 2.15.3.Final 1.7.20 3.23.1 From 1af109b8393196f1c194bf887abaa3df2c2b375a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 17 Jan 2023 17:01:34 +0000 Subject: [PATCH 12/39] Bump assertj-core from 3.23.1 to 3.24.2 Bumps assertj-core from 3.23.1 to 3.24.2. --- updated-dependencies: - dependency-name: org.assertj:assertj-core dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index fd79cdb..caf9fea 100644 --- a/pom.xml +++ b/pom.xml @@ -20,7 +20,7 @@ 2.15.3.Final 1.7.20 - 3.23.1 + 3.24.2 true From 8d1301af0e01cc4c29971d3fc94c0adc7a6847ea Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 18 Jan 2023 17:01:28 +0000 Subject: [PATCH 13/39] Bump quarkus.version from 2.15.3.Final to 2.16.0.Final Bumps `quarkus.version` from 2.15.3.Final to 2.16.0.Final. Updates `quarkus-bom` from 2.15.3.Final to 2.16.0.Final - [Release notes](https://github.com/quarkusio/quarkus/releases) - [Commits](https://github.com/quarkusio/quarkus/compare/2.15.3.Final...2.16.0.Final) Updates `quarkus-maven-plugin` from 2.15.3.Final to 2.16.0.Final --- updated-dependencies: - dependency-name: io.quarkus:quarkus-bom dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: io.quarkus:quarkus-maven-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index fd79cdb..86782e8 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ 1.8.0 1.12.4 - 2.15.3.Final + 2.16.0.Final 1.7.20 3.23.1 From d57c1b25257e54fc22c05b71ff25a29c5e3f1cd5 Mon Sep 17 00:00:00 2001 From: Shervinox <54137478+sherviiin@users.noreply.github.com> Date: Thu, 23 Mar 2023 09:49:27 +0100 Subject: [PATCH 14/39] Update injectmock.adoc --- docs/modules/ROOT/pages/injectmock.adoc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/modules/ROOT/pages/injectmock.adoc b/docs/modules/ROOT/pages/injectmock.adoc index 0700cbe..02a6890 100644 --- a/docs/modules/ROOT/pages/injectmock.adoc +++ b/docs/modules/ROOT/pages/injectmock.adoc @@ -5,7 +5,7 @@ This annotation allows you to inject MockK mocks in your application. This annotation has three parameters: * `relaxed`, if set to `true`, all function will return simple values. Default to `false`. -* `relacUnitFun`, if set to `true`, `Unit` function will be relaxed. Default to `false`. +* `relaxUnitFun`, if set to `true`, `Unit` function will be relaxed. Default to `false`. * `convertScopes`, it set to `true`, convert the `@Singleton` scope of bean to `@ApplicationScoped`. This allows to mock singleton beans == Example @@ -58,4 +58,4 @@ class InjectionMockTest { assertThat(firstService.greet()).isEqualTo("test") } } ----- \ No newline at end of file +---- From f40d644a512c64c107e4efab4101c43560bf669f Mon Sep 17 00:00:00 2001 From: Guillaume Smet Date: Wed, 19 Apr 2023 16:27:00 +0200 Subject: [PATCH 15/39] Update to Quarkus 3 --- .../src/main/kotlin/org/acme/MessageService.kt | 2 +- .../src/main/kotlin/org/acme/SingletonService.kt | 2 +- .../src/main/kotlin/org/acme/SuffixService.kt | 2 +- .../main/kotlin/org/acme/resource/RestRessource.kt | 4 ++-- .../test/junit/mockk/internal/ReflectionUtils.kt | 2 +- .../internal/application/SimpleSingletonBean.kt | 2 +- .../mockk/internal/example/InjectRelaxedMockTest.kt | 4 ++-- .../mockk/internal/example/InjectRestClientTest.kt | 12 ++++++------ .../mockk/internal/example/InjectionMockTest.kt | 4 ++-- .../junit/mockk/internal/example/InjectionSpyTest.kt | 4 ++-- .../mockk/internal/example/ReturnMutinyTypeTest.kt | 2 +- pom.xml | 6 +++--- 12 files changed, 23 insertions(+), 23 deletions(-) diff --git a/integration-tests/src/main/kotlin/org/acme/MessageService.kt b/integration-tests/src/main/kotlin/org/acme/MessageService.kt index 2be852f..4530670 100644 --- a/integration-tests/src/main/kotlin/org/acme/MessageService.kt +++ b/integration-tests/src/main/kotlin/org/acme/MessageService.kt @@ -1,6 +1,6 @@ package org.acme -import javax.enterprise.context.ApplicationScoped +import jakarta.enterprise.context.ApplicationScoped @ApplicationScoped class MessageService { diff --git a/integration-tests/src/main/kotlin/org/acme/SingletonService.kt b/integration-tests/src/main/kotlin/org/acme/SingletonService.kt index 940d98c..623027b 100644 --- a/integration-tests/src/main/kotlin/org/acme/SingletonService.kt +++ b/integration-tests/src/main/kotlin/org/acme/SingletonService.kt @@ -1,6 +1,6 @@ package org.acme -import javax.inject.Singleton +import jakarta.inject.Singleton @Singleton open class SingletonService { diff --git a/integration-tests/src/main/kotlin/org/acme/SuffixService.kt b/integration-tests/src/main/kotlin/org/acme/SuffixService.kt index 43ebb2b..eafd301 100644 --- a/integration-tests/src/main/kotlin/org/acme/SuffixService.kt +++ b/integration-tests/src/main/kotlin/org/acme/SuffixService.kt @@ -1,6 +1,6 @@ package org.acme -import javax.enterprise.context.ApplicationScoped +import jakarta.enterprise.context.ApplicationScoped @ApplicationScoped class SuffixService { diff --git a/integration-tests/src/main/kotlin/org/acme/resource/RestRessource.kt b/integration-tests/src/main/kotlin/org/acme/resource/RestRessource.kt index 1d6d552..6f6a1e0 100644 --- a/integration-tests/src/main/kotlin/org/acme/resource/RestRessource.kt +++ b/integration-tests/src/main/kotlin/org/acme/resource/RestRessource.kt @@ -2,8 +2,8 @@ package org.acme.resource import org.acme.MessageService import org.acme.SuffixService -import javax.ws.rs.GET -import javax.ws.rs.Path +import jakarta.ws.rs.GET +import jakarta.ws.rs.Path @Path("/message") class RestRessource(val messageService: MessageService, val suffixService: SuffixService) { diff --git a/junit5-mockk/src/main/kotlin/io/quarkiverse/test/junit/mockk/internal/ReflectionUtils.kt b/junit5-mockk/src/main/kotlin/io/quarkiverse/test/junit/mockk/internal/ReflectionUtils.kt index 10084f2..cb9e434 100644 --- a/junit5-mockk/src/main/kotlin/io/quarkiverse/test/junit/mockk/internal/ReflectionUtils.kt +++ b/junit5-mockk/src/main/kotlin/io/quarkiverse/test/junit/mockk/internal/ReflectionUtils.kt @@ -5,7 +5,7 @@ import io.quarkiverse.test.junit.mockk.InjectSpy import io.quarkus.arc.Arc import java.lang.IllegalStateException import java.lang.reflect.Field -import javax.inject.Qualifier +import jakarta.inject.Qualifier object ReflectionUtils { diff --git a/junit5-mockk/src/test/kotlin/io/quarkiverse/test/junit/mockk/internal/application/SimpleSingletonBean.kt b/junit5-mockk/src/test/kotlin/io/quarkiverse/test/junit/mockk/internal/application/SimpleSingletonBean.kt index 26ec84d..3aba421 100644 --- a/junit5-mockk/src/test/kotlin/io/quarkiverse/test/junit/mockk/internal/application/SimpleSingletonBean.kt +++ b/junit5-mockk/src/test/kotlin/io/quarkiverse/test/junit/mockk/internal/application/SimpleSingletonBean.kt @@ -1,6 +1,6 @@ package io.quarkiverse.test.junit.mockk.internal.application -import javax.inject.Singleton +import jakarta.inject.Singleton @Singleton open class SimpleSingletonBean { diff --git a/junit5-mockk/src/test/kotlin/io/quarkiverse/test/junit/mockk/internal/example/InjectRelaxedMockTest.kt b/junit5-mockk/src/test/kotlin/io/quarkiverse/test/junit/mockk/internal/example/InjectRelaxedMockTest.kt index fc7eb1b..02d931b 100644 --- a/junit5-mockk/src/test/kotlin/io/quarkiverse/test/junit/mockk/internal/example/InjectRelaxedMockTest.kt +++ b/junit5-mockk/src/test/kotlin/io/quarkiverse/test/junit/mockk/internal/example/InjectRelaxedMockTest.kt @@ -4,8 +4,8 @@ import io.mockk.verify import io.quarkiverse.test.junit.mockk.InjectMock import io.quarkus.test.junit.QuarkusTest import org.junit.jupiter.api.Test -import javax.enterprise.context.ApplicationScoped -import javax.inject.Inject +import jakarta.enterprise.context.ApplicationScoped +import jakarta.inject.Inject @QuarkusTest class InjectRelaxedMockTest { diff --git a/junit5-mockk/src/test/kotlin/io/quarkiverse/test/junit/mockk/internal/example/InjectRestClientTest.kt b/junit5-mockk/src/test/kotlin/io/quarkiverse/test/junit/mockk/internal/example/InjectRestClientTest.kt index 2f09e14..dfd08bc 100644 --- a/junit5-mockk/src/test/kotlin/io/quarkiverse/test/junit/mockk/internal/example/InjectRestClientTest.kt +++ b/junit5-mockk/src/test/kotlin/io/quarkiverse/test/junit/mockk/internal/example/InjectRestClientTest.kt @@ -9,12 +9,12 @@ import org.eclipse.microprofile.rest.client.inject.RegisterRestClient import org.eclipse.microprofile.rest.client.inject.RestClient import org.jboss.resteasy.annotations.jaxrs.PathParam import org.junit.jupiter.api.Test -import javax.enterprise.context.ApplicationScoped -import javax.inject.Inject -import javax.ws.rs.GET -import javax.ws.rs.Path -import javax.ws.rs.Produces -import javax.ws.rs.core.MediaType +import jakarta.enterprise.context.ApplicationScoped +import jakarta.inject.Inject +import jakarta.ws.rs.GET +import jakarta.ws.rs.Path +import jakarta.ws.rs.Produces +import jakarta.ws.rs.core.MediaType @QuarkusTest class InjectRestClientTest { diff --git a/junit5-mockk/src/test/kotlin/io/quarkiverse/test/junit/mockk/internal/example/InjectionMockTest.kt b/junit5-mockk/src/test/kotlin/io/quarkiverse/test/junit/mockk/internal/example/InjectionMockTest.kt index e85f683..ab9978a 100644 --- a/junit5-mockk/src/test/kotlin/io/quarkiverse/test/junit/mockk/internal/example/InjectionMockTest.kt +++ b/junit5-mockk/src/test/kotlin/io/quarkiverse/test/junit/mockk/internal/example/InjectionMockTest.kt @@ -6,8 +6,8 @@ import io.quarkiverse.test.junit.mockk.InjectMock import io.quarkus.test.junit.QuarkusTest import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.Test -import javax.enterprise.context.ApplicationScoped -import javax.inject.Inject +import jakarta.enterprise.context.ApplicationScoped +import jakarta.inject.Inject @QuarkusTest class InjectionMockTest { diff --git a/junit5-mockk/src/test/kotlin/io/quarkiverse/test/junit/mockk/internal/example/InjectionSpyTest.kt b/junit5-mockk/src/test/kotlin/io/quarkiverse/test/junit/mockk/internal/example/InjectionSpyTest.kt index a330806..5ea4369 100644 --- a/junit5-mockk/src/test/kotlin/io/quarkiverse/test/junit/mockk/internal/example/InjectionSpyTest.kt +++ b/junit5-mockk/src/test/kotlin/io/quarkiverse/test/junit/mockk/internal/example/InjectionSpyTest.kt @@ -5,8 +5,8 @@ import io.quarkiverse.test.junit.mockk.InjectSpy import io.quarkus.test.junit.QuarkusTest import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.Test -import javax.enterprise.context.ApplicationScoped -import javax.inject.Inject +import jakarta.enterprise.context.ApplicationScoped +import jakarta.inject.Inject @QuarkusTest class InjectionSpyTest { diff --git a/junit5-mockk/src/test/kotlin/io/quarkiverse/test/junit/mockk/internal/example/ReturnMutinyTypeTest.kt b/junit5-mockk/src/test/kotlin/io/quarkiverse/test/junit/mockk/internal/example/ReturnMutinyTypeTest.kt index 6c1bcc1..2d3e14f 100644 --- a/junit5-mockk/src/test/kotlin/io/quarkiverse/test/junit/mockk/internal/example/ReturnMutinyTypeTest.kt +++ b/junit5-mockk/src/test/kotlin/io/quarkiverse/test/junit/mockk/internal/example/ReturnMutinyTypeTest.kt @@ -6,7 +6,7 @@ import io.quarkus.test.junit.QuarkusTest import io.smallrye.mutiny.Uni import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.Test -import javax.enterprise.context.ApplicationScoped +import jakarta.enterprise.context.ApplicationScoped @QuarkusTest class ReturnMutinyTypeTest { diff --git a/pom.xml b/pom.xml index e806616..c25de8d 100644 --- a/pom.xml +++ b/pom.xml @@ -15,10 +15,10 @@ Quarkus - JUnit 5 - Mockk Parent - 1.8.0 + 1.8.10 1.12.4 - 2.16.0.Final + 3.0.0.Final 1.7.20 3.24.2 @@ -57,4 +57,4 @@ - \ No newline at end of file + From 4a62b255e7d22fdcda0d5e7cb4253e62478c816e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 19 Apr 2023 18:54:43 +0000 Subject: [PATCH 16/39] Bump kotlin.version from 1.8.0 to 1.8.20 Bumps `kotlin.version` from 1.8.0 to 1.8.20. Updates `kotlin-stdlib-jdk8` from 1.8.0 to 1.8.20 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/commits) Updates `kotlin-reflect` from 1.8.0 to 1.8.20 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/commits) Updates `kotlin-maven-plugin` from 1.8.0 to 1.8.20 Updates `kotlin-stdlib` from 1.8.0 to 1.8.20 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/commits) --- updated-dependencies: - dependency-name: org.jetbrains.kotlin:kotlin-stdlib-jdk8 dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.jetbrains.kotlin:kotlin-reflect dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.jetbrains.kotlin:kotlin-maven-plugin dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.jetbrains.kotlin:kotlin-stdlib dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c25de8d..844a4ed 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ Quarkus - JUnit 5 - Mockk Parent - 1.8.10 + 1.8.20 1.12.4 3.0.0.Final From 894a98fbe907e5dba076cb315100a35d4c28211e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 20 Apr 2023 17:57:08 +0000 Subject: [PATCH 17/39] Bump quarkiverse-parent from 12 to 13 Bumps [quarkiverse-parent](https://github.com/quarkiverse/quarkiverse-parent) from 12 to 13. - [Release notes](https://github.com/quarkiverse/quarkiverse-parent/releases) - [Commits](https://github.com/quarkiverse/quarkiverse-parent/commits) --- updated-dependencies: - dependency-name: io.quarkiverse:quarkiverse-parent dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c25de8d..92051c9 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ io.quarkiverse quarkiverse-parent - 12 + 13 io.quarkiverse.mockk From 27a4a8632252c5c7cb1280534ef5c11e0a2a8455 Mon Sep 17 00:00:00 2001 From: Guillaume Le Floch Date: Fri, 21 Apr 2023 08:25:56 +0200 Subject: [PATCH 18/39] Prepare readme for quarkus 3.0.0 --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index f3cd255..fb477cd 100644 --- a/README.md +++ b/README.md @@ -32,7 +32,8 @@ dependencies { ## Compatibility with Quarkus -Starting with Quarkus `2.8` and above, version `1.1.0` of `quarkus-junit5-mockk` should be used. +Starting with version ˋ3+`, version `2.0.0ˋ of `quarkus-junit5-mockk` should be used. +If you use a version between `2.8` and before `3.0.0`, version `1.1.0` of `quarkus-junit5-mockk` should be used. If you use a version before `2.7`, version `1.0.1` of `quarkus-junit5-mockk` should be used. ## Example From 08296afe6618996009e50a593d064dc3e5067ee5 Mon Sep 17 00:00:00 2001 From: Guillaume Le Floch Date: Fri, 21 Apr 2023 08:50:40 +0200 Subject: [PATCH 19/39] Bump version for quarkus 3 release (#198) Bump version for quarkus 3 release --- integration-tests/pom.xml | 2 +- junit5-mockk/pom.xml | 2 +- pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml index 2152573..f3a44f3 100644 --- a/integration-tests/pom.xml +++ b/integration-tests/pom.xml @@ -5,7 +5,7 @@ io.quarkiverse.mockk quarkus-junit5-mockk-parent - 1.2.0-SNAPSHOT + 2.0.0-SNAPSHOT ../pom.xml diff --git a/junit5-mockk/pom.xml b/junit5-mockk/pom.xml index 26622ed..ed8c10c 100644 --- a/junit5-mockk/pom.xml +++ b/junit5-mockk/pom.xml @@ -5,7 +5,7 @@ io.quarkiverse.mockk quarkus-junit5-mockk-parent - 1.2.0-SNAPSHOT + 2.0.0-SNAPSHOT ../pom.xml diff --git a/pom.xml b/pom.xml index 1c58986..b224afe 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ io.quarkiverse.mockk quarkus-junit5-mockk-parent pom - 1.2.0-SNAPSHOT + 2.0.0-SNAPSHOT Quarkus - JUnit 5 - Mockk Parent From 33810435df58c06128c14efcb7be19d785d2c034 Mon Sep 17 00:00:00 2001 From: Guillaume Le Floch Date: Fri, 21 Apr 2023 15:37:46 +0200 Subject: [PATCH 20/39] Prepare release 2.2.0 --- .github/project.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/project.yml b/.github/project.yml index e515c70..dd614b6 100644 --- a/.github/project.yml +++ b/.github/project.yml @@ -1,5 +1,5 @@ name: Quarkiverse Mockk Extension release: - current-version: 1.1.1 - next-version: 1.2.0-SNAPSHOT + current-version: 2.0.0 + next-version: 2.1.0-SNAPSHOT From fe9d5dc018ace6d4d5cb0e31dd23e5eec6e9a227 Mon Sep 17 00:00:00 2001 From: GitHub Action Date: Sat, 22 Apr 2023 13:51:23 +0000 Subject: [PATCH 21/39] [maven-release-plugin] prepare release 2.0.0 --- integration-tests/pom.xml | 2 +- junit5-mockk/pom.xml | 2 +- pom.xml | 6 +++++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml index f3a44f3..aa96ad2 100644 --- a/integration-tests/pom.xml +++ b/integration-tests/pom.xml @@ -5,7 +5,7 @@ io.quarkiverse.mockk quarkus-junit5-mockk-parent - 2.0.0-SNAPSHOT + 2.0.0 ../pom.xml diff --git a/junit5-mockk/pom.xml b/junit5-mockk/pom.xml index ed8c10c..01e4085 100644 --- a/junit5-mockk/pom.xml +++ b/junit5-mockk/pom.xml @@ -5,7 +5,7 @@ io.quarkiverse.mockk quarkus-junit5-mockk-parent - 2.0.0-SNAPSHOT + 2.0.0 ../pom.xml diff --git a/pom.xml b/pom.xml index b224afe..289702a 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ io.quarkiverse.mockk quarkus-junit5-mockk-parent pom - 2.0.0-SNAPSHOT + 2.0.0 Quarkus - JUnit 5 - Mockk Parent @@ -57,4 +57,8 @@ + + + 2.0.0 + From 1d0458075ec8592417e70c330be3dc88269bb1ea Mon Sep 17 00:00:00 2001 From: GitHub Action Date: Sat, 22 Apr 2023 13:51:23 +0000 Subject: [PATCH 22/39] [maven-release-plugin] prepare for next development iteration --- integration-tests/pom.xml | 2 +- junit5-mockk/pom.xml | 2 +- pom.xml | 6 +----- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml index aa96ad2..ecaa468 100644 --- a/integration-tests/pom.xml +++ b/integration-tests/pom.xml @@ -5,7 +5,7 @@ io.quarkiverse.mockk quarkus-junit5-mockk-parent - 2.0.0 + 2.1.0-SNAPSHOT ../pom.xml diff --git a/junit5-mockk/pom.xml b/junit5-mockk/pom.xml index 01e4085..f4eff50 100644 --- a/junit5-mockk/pom.xml +++ b/junit5-mockk/pom.xml @@ -5,7 +5,7 @@ io.quarkiverse.mockk quarkus-junit5-mockk-parent - 2.0.0 + 2.1.0-SNAPSHOT ../pom.xml diff --git a/pom.xml b/pom.xml index 289702a..32ec2ce 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ io.quarkiverse.mockk quarkus-junit5-mockk-parent pom - 2.0.0 + 2.1.0-SNAPSHOT Quarkus - JUnit 5 - Mockk Parent @@ -57,8 +57,4 @@ - - - 2.0.0 - From 4d96bf83f50dc6566811581ed8bff019fd1929a7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 25 Apr 2023 18:01:49 +0000 Subject: [PATCH 23/39] Bump kotlin.version from 1.8.20 to 1.8.21 Bumps `kotlin.version` from 1.8.20 to 1.8.21. Updates `kotlin-stdlib-jdk8` from 1.8.20 to 1.8.21 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/compare/v1.8.20...v1.8.21) Updates `kotlin-reflect` from 1.8.20 to 1.8.21 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/compare/v1.8.20...v1.8.21) Updates `kotlin-maven-plugin` from 1.8.20 to 1.8.21 Updates `kotlin-stdlib` from 1.8.20 to 1.8.21 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/compare/v1.8.20...v1.8.21) --- updated-dependencies: - dependency-name: org.jetbrains.kotlin:kotlin-stdlib-jdk8 dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.jetbrains.kotlin:kotlin-reflect dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.jetbrains.kotlin:kotlin-maven-plugin dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.jetbrains.kotlin:kotlin-stdlib dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 32ec2ce..0be9249 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ Quarkus - JUnit 5 - Mockk Parent - 1.8.20 + 1.8.21 1.12.4 3.0.0.Final From a74c47c78c012eebdf2adeb3e67b593a40e57b97 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 26 Apr 2023 17:56:58 +0000 Subject: [PATCH 24/39] Bump quarkus.version from 3.0.0.Final to 3.0.1.Final Bumps `quarkus.version` from 3.0.0.Final to 3.0.1.Final. Updates `quarkus-bom` from 3.0.0.Final to 3.0.1.Final - [Release notes](https://github.com/quarkusio/quarkus/releases) - [Commits](https://github.com/quarkusio/quarkus/compare/3.0.0.Final...3.0.1.Final) Updates `quarkus-maven-plugin` from 3.0.0.Final to 3.0.1.Final --- updated-dependencies: - dependency-name: io.quarkus:quarkus-bom dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: io.quarkus:quarkus-maven-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 32ec2ce..45da5c8 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ 1.8.20 1.12.4 - 3.0.0.Final + 3.0.1.Final 1.7.20 3.24.2 From 0a804307fef93295e363e165782dda7e45144747 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 24 May 2023 17:56:55 +0000 Subject: [PATCH 25/39] Bump quarkus.version from 3.0.1.Final to 3.1.0.Final Bumps `quarkus.version` from 3.0.1.Final to 3.1.0.Final. Updates `quarkus-bom` from 3.0.1.Final to 3.1.0.Final - [Release notes](https://github.com/quarkusio/quarkus/releases) - [Commits](https://github.com/quarkusio/quarkus/compare/3.0.1.Final...3.1.0.Final) Updates `quarkus-maven-plugin` from 3.0.1.Final to 3.1.0.Final --- updated-dependencies: - dependency-name: io.quarkus:quarkus-bom dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: io.quarkus:quarkus-maven-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 45da5c8..036e0f8 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ 1.8.20 1.12.4 - 3.0.1.Final + 3.1.0.Final 1.7.20 3.24.2 From ffc2154a6b2a263d0f8d9a4607bbfaebe55febbf Mon Sep 17 00:00:00 2001 From: George Gastaldi Date: Tue, 6 Jun 2023 12:29:18 -0300 Subject: [PATCH 26/39] Include `scm` info --- pom.xml | 111 +++++++++++++++++++++++++++----------------------------- 1 file changed, 54 insertions(+), 57 deletions(-) diff --git a/pom.xml b/pom.xml index 036e0f8..4c9a5e5 100644 --- a/pom.xml +++ b/pom.xml @@ -1,60 +1,57 @@ - 4.0.0 - - - io.quarkiverse - quarkiverse-parent - 13 - - - io.quarkiverse.mockk - quarkus-junit5-mockk-parent - pom - 2.1.0-SNAPSHOT - Quarkus - JUnit 5 - Mockk Parent - - - 1.8.20 - 1.12.4 - - 3.1.0.Final - 1.7.20 - 3.24.2 - - - true - 11 - - - - - - io.quarkus - quarkus-bom - ${quarkus.version} - pom - import - - - - - - junit5-mockk - - - - - it - - - performRelease - !true - - - - integration-tests - - - + 4.0.0 + + io.quarkiverse + quarkiverse-parent + 13 + + io.quarkiverse.mockk + quarkus-junit5-mockk-parent + pom + 2.1.0-SNAPSHOT + Quarkus - JUnit 5 - Mockk Parent + + 1.8.20 + 1.12.4 + 3.1.0.Final + 1.7.20 + 3.24.2 + + true + 11 + + + :git:git@github.com:quarkiverse/quarkus-mockk.git + scm:git:git@github.com:quarkiverse/quarkus-mockk.git + https://github.com/quarkiverse/quarkus-mockk + + + + + io.quarkus + quarkus-bom + ${quarkus.version} + pom + import + + + + + junit5-mockk + + + + it + + + performRelease + !true + + + + integration-tests + + + From 8eecaea5b3b82ffa9105bdef66711efe17ba6ce7 Mon Sep 17 00:00:00 2001 From: George Gastaldi Date: Tue, 6 Jun 2023 13:39:30 -0300 Subject: [PATCH 27/39] Update pom.xml --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4c9a5e5..d7c0939 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ 11 - :git:git@github.com:quarkiverse/quarkus-mockk.git + scm:git:git@github.com:quarkiverse/quarkus-mockk.git scm:git:git@github.com:quarkiverse/quarkus-mockk.git https://github.com/quarkiverse/quarkus-mockk From 1aa4a763d4da480e980575cdc8d423b54a471848 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 7 Jun 2023 17:57:01 +0000 Subject: [PATCH 28/39] Bump quarkiverse-parent from 13 to 15 Bumps [quarkiverse-parent](https://github.com/quarkiverse/quarkiverse-parent) from 13 to 15. - [Release notes](https://github.com/quarkiverse/quarkiverse-parent/releases) - [Commits](https://github.com/quarkiverse/quarkiverse-parent/commits) --- updated-dependencies: - dependency-name: io.quarkiverse:quarkiverse-parent dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 036e0f8..a65858f 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ io.quarkiverse quarkiverse-parent - 13 + 15 io.quarkiverse.mockk From 9f25bff4b27f0c241c60402b3e03ffcc8d36ae13 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 7 Jun 2023 17:57:09 +0000 Subject: [PATCH 29/39] Bump quarkus.version from 3.1.0.Final to 3.1.1.Final Bumps `quarkus.version` from 3.1.0.Final to 3.1.1.Final. Updates `quarkus-bom` from 3.1.0.Final to 3.1.1.Final - [Release notes](https://github.com/quarkusio/quarkus/releases) - [Commits](https://github.com/quarkusio/quarkus/compare/3.1.0.Final...3.1.1.Final) Updates `quarkus-maven-plugin` from 3.1.0.Final to 3.1.1.Final --- updated-dependencies: - dependency-name: io.quarkus:quarkus-bom dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: io.quarkus:quarkus-maven-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 036e0f8..8e9f120 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ 1.8.20 1.12.4 - 3.1.0.Final + 3.1.1.Final 1.7.20 3.24.2 From c6ea769babd11e801b8188a9e48b5d76866f9bf8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 12 Jun 2023 07:29:19 +0000 Subject: [PATCH 30/39] Bump dokka-maven-plugin from 1.7.20 to 1.8.20 Bumps [dokka-maven-plugin](https://github.com/Kotlin/dokka) from 1.7.20 to 1.8.20. - [Release notes](https://github.com/Kotlin/dokka/releases) - [Commits](https://github.com/Kotlin/dokka/commits) --- updated-dependencies: - dependency-name: org.jetbrains.dokka:dokka-maven-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3c6bcaa..3c664e9 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ 1.12.4 3.1.1.Final - 1.7.20 + 1.8.20 3.24.2 From 0dbfb1688a0d5e25da54ffb4ee719d86bcea6d64 Mon Sep 17 00:00:00 2001 From: Karthik Muralidharan <2356525+karthikmuralidharan@users.noreply.github.com> Date: Fri, 23 Jun 2023 14:29:10 +0530 Subject: [PATCH 31/39] Fix typo in readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index fb477cd..82aedfc 100644 --- a/README.md +++ b/README.md @@ -32,7 +32,7 @@ dependencies { ## Compatibility with Quarkus -Starting with version ˋ3+`, version `2.0.0ˋ of `quarkus-junit5-mockk` should be used. +Starting with version ˋ3+`, version `2.0.0` of `quarkus-junit5-mockk` should be used. If you use a version between `2.8` and before `3.0.0`, version `1.1.0` of `quarkus-junit5-mockk` should be used. If you use a version before `2.7`, version `1.0.1` of `quarkus-junit5-mockk` should be used. From 8830e6e0d374fc14f1820684b5d1a2699bf60926 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 6 Jul 2023 17:11:42 +0000 Subject: [PATCH 32/39] Bump kotlin.version from 1.8.21 to 1.9.0 Bumps `kotlin.version` from 1.8.21 to 1.9.0. Updates `kotlin-stdlib-jdk8` from 1.8.21 to 1.9.0 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/compare/v1.8.21...v1.9.0) Updates `kotlin-reflect` from 1.8.21 to 1.9.0 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/compare/v1.8.21...v1.9.0) Updates `kotlin-maven-plugin` from 1.8.21 to 1.9.0 Updates `kotlin-stdlib` from 1.8.21 to 1.9.0 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/compare/v1.8.21...v1.9.0) --- updated-dependencies: - dependency-name: org.jetbrains.kotlin:kotlin-stdlib-jdk8 dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.jetbrains.kotlin:kotlin-reflect dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.jetbrains.kotlin:kotlin-maven-plugin dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.jetbrains.kotlin:kotlin-stdlib dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 60372d6..4f9c79f 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ Quarkus - JUnit 5 - Mockk Parent - 1.8.21 + 1.9.0 1.12.4 3.1.1.Final From 7d1c4d3c6ed0be2f629495c0f4924f77b4f1a2d8 Mon Sep 17 00:00:00 2001 From: George Gastaldi Date: Fri, 7 Jul 2023 12:02:00 -0300 Subject: [PATCH 33/39] Adjust doc title --- docs/antora.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/antora.yml b/docs/antora.yml index 83d5f00..b10d20d 100644 --- a/docs/antora.yml +++ b/docs/antora.yml @@ -1,5 +1,5 @@ name: quarkus-mockk -title: Quarkus Mockk +title: Mockk version: dev nav: - modules/ROOT/nav.adoc From a9cbec755541046e156ed661c243fa533c7bac59 Mon Sep 17 00:00:00 2001 From: Rui Cardoso Date: Fri, 11 Aug 2023 11:06:55 +0100 Subject: [PATCH 34/39] Remove usage of deprecated field --- .../test/junit/mockk/internal/CreateMockkSpiesCallback.kt | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/junit5-mockk/src/main/kotlin/io/quarkiverse/test/junit/mockk/internal/CreateMockkSpiesCallback.kt b/junit5-mockk/src/main/kotlin/io/quarkiverse/test/junit/mockk/internal/CreateMockkSpiesCallback.kt index 6b694ae..55d7a77 100644 --- a/junit5-mockk/src/main/kotlin/io/quarkiverse/test/junit/mockk/internal/CreateMockkSpiesCallback.kt +++ b/junit5-mockk/src/main/kotlin/io/quarkiverse/test/junit/mockk/internal/CreateMockkSpiesCallback.kt @@ -2,7 +2,7 @@ package io.quarkiverse.test.junit.mockk.internal import io.mockk.spyk import io.quarkiverse.test.junit.mockk.InjectSpy -import io.quarkus.arc.runtime.ClientProxyUnwrapper +import io.quarkus.arc.ClientProxy import io.quarkus.test.junit.callback.QuarkusTestAfterConstructCallback import java.lang.reflect.Field @@ -24,11 +24,10 @@ class CreateMockkSpiesCallback: QuarkusTestAfterConstructCallback { } private fun createSpyAndSetTestField(testInstance: Any, field: Field, beanInstance: Any): Any { - val unwrapper = ClientProxyUnwrapper() - val spy = spyk(unwrapper.apply(beanInstance)) + val spy = spyk(ClientProxy.unwrap(beanInstance)) if (field.trySetAccessible()) { field.set(testInstance, spy) } return spy } -} \ No newline at end of file +} From 9caa382dc0a969056f4e9e38610d8442c107808c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 16 Aug 2023 16:57:18 +0000 Subject: [PATCH 35/39] Bump quarkus.version from 3.1.1.Final to 3.3.0 Bumps `quarkus.version` from 3.1.1.Final to 3.3.0. Updates `io.quarkus:quarkus-bom` from 3.1.1.Final to 3.3.0 - [Release notes](https://github.com/quarkusio/quarkus/releases) - [Commits](https://github.com/quarkusio/quarkus/compare/3.1.1.Final...3.3.0) Updates `io.quarkus:quarkus-maven-plugin` from 3.1.1.Final to 3.3.0 --- updated-dependencies: - dependency-name: io.quarkus:quarkus-bom dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: io.quarkus:quarkus-maven-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 60372d6..9abedb3 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ 1.8.21 1.12.4 - 3.1.1.Final + 3.3.0 1.8.20 3.24.2 From 3b306f752b05f1221c75f625c7ff2b8ca5f955dd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Aug 2023 17:14:06 +0000 Subject: [PATCH 36/39] Bump kotlin.version from 1.9.0 to 1.9.10 Bumps `kotlin.version` from 1.9.0 to 1.9.10. Updates `org.jetbrains.kotlin:kotlin-stdlib-jdk8` from 1.9.0 to 1.9.10 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/v1.9.10/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/compare/v1.9.0...v1.9.10) Updates `org.jetbrains.kotlin:kotlin-reflect` from 1.9.0 to 1.9.10 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/v1.9.10/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/compare/v1.9.0...v1.9.10) Updates `org.jetbrains.kotlin:kotlin-maven-plugin` from 1.9.0 to 1.9.10 Updates `org.jetbrains.kotlin:kotlin-stdlib` from 1.9.0 to 1.9.10 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/v1.9.10/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/compare/v1.9.0...v1.9.10) --- updated-dependencies: - dependency-name: org.jetbrains.kotlin:kotlin-stdlib-jdk8 dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.jetbrains.kotlin:kotlin-reflect dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.jetbrains.kotlin:kotlin-maven-plugin dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.jetbrains.kotlin:kotlin-stdlib dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 425ef0f..4deb48b 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ Quarkus - JUnit 5 - Mockk Parent - 1.9.0 + 1.9.10 1.12.4 3.3.0 From 65c04f0e554867d61ba03f1f99c6a810392ebd31 Mon Sep 17 00:00:00 2001 From: glefloch Date: Fri, 25 Aug 2023 14:45:16 +0200 Subject: [PATCH 37/39] Prepare release 2.1.0 --- .github/project.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/project.yml b/.github/project.yml index dd614b6..bc6da64 100644 --- a/.github/project.yml +++ b/.github/project.yml @@ -1,5 +1,5 @@ name: Quarkiverse Mockk Extension release: - current-version: 2.0.0 - next-version: 2.1.0-SNAPSHOT + current-version: 2.1.0 + next-version: 2.2.0-SNAPSHOT From 2fec320cd664abf5810c0e9c7fd7e78606d85fed Mon Sep 17 00:00:00 2001 From: GitHub Action Date: Mon, 28 Aug 2023 07:46:39 +0000 Subject: [PATCH 38/39] [maven-release-plugin] prepare release 2.1.0 --- integration-tests/pom.xml | 2 +- junit5-mockk/pom.xml | 2 +- pom.xml | 5 +++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml index ecaa468..d44855d 100644 --- a/integration-tests/pom.xml +++ b/integration-tests/pom.xml @@ -5,7 +5,7 @@ io.quarkiverse.mockk quarkus-junit5-mockk-parent - 2.1.0-SNAPSHOT + 2.1.0 ../pom.xml diff --git a/junit5-mockk/pom.xml b/junit5-mockk/pom.xml index f4eff50..2243d29 100644 --- a/junit5-mockk/pom.xml +++ b/junit5-mockk/pom.xml @@ -5,7 +5,7 @@ io.quarkiverse.mockk quarkus-junit5-mockk-parent - 2.1.0-SNAPSHOT + 2.1.0 ../pom.xml diff --git a/pom.xml b/pom.xml index 4deb48b..4f2af1d 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ io.quarkiverse.mockk quarkus-junit5-mockk-parent pom - 2.1.0-SNAPSHOT + 2.1.0 Quarkus - JUnit 5 - Mockk Parent @@ -31,7 +31,8 @@ scm:git:git@github.com:quarkiverse/quarkus-mockk.git scm:git:git@github.com:quarkiverse/quarkus-mockk.git https://github.com/quarkiverse/quarkus-mockk - + 2.1.0 + From 875102726ca4faa4ba6f306629a7ffb0e6c771ce Mon Sep 17 00:00:00 2001 From: GitHub Action Date: Mon, 28 Aug 2023 07:46:39 +0000 Subject: [PATCH 39/39] [maven-release-plugin] prepare for next development iteration --- integration-tests/pom.xml | 2 +- junit5-mockk/pom.xml | 2 +- pom.xml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml index d44855d..126b90f 100644 --- a/integration-tests/pom.xml +++ b/integration-tests/pom.xml @@ -5,7 +5,7 @@ io.quarkiverse.mockk quarkus-junit5-mockk-parent - 2.1.0 + 2.2.0-SNAPSHOT ../pom.xml diff --git a/junit5-mockk/pom.xml b/junit5-mockk/pom.xml index 2243d29..2357a54 100644 --- a/junit5-mockk/pom.xml +++ b/junit5-mockk/pom.xml @@ -5,7 +5,7 @@ io.quarkiverse.mockk quarkus-junit5-mockk-parent - 2.1.0 + 2.2.0-SNAPSHOT ../pom.xml diff --git a/pom.xml b/pom.xml index 4f2af1d..e038638 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ io.quarkiverse.mockk quarkus-junit5-mockk-parent pom - 2.1.0 + 2.2.0-SNAPSHOT Quarkus - JUnit 5 - Mockk Parent @@ -31,7 +31,7 @@ scm:git:git@github.com:quarkiverse/quarkus-mockk.git scm:git:git@github.com:quarkiverse/quarkus-mockk.git https://github.com/quarkiverse/quarkus-mockk - 2.1.0 + HEAD