From 9c5f1e470be766a09984ae997694803f2548056f Mon Sep 17 00:00:00 2001
From: Tim Yates <tim.yates@gmail.com>
Date: Fri, 16 Dec 2022 12:06:24 +0000
Subject: [PATCH 1/2] Use latest settings plugin

---
 config/checkstyle/checkstyle.xml | 6 ++++--
 settings.gradle                  | 3 +--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/config/checkstyle/checkstyle.xml b/config/checkstyle/checkstyle.xml
index e8f5b18f..c1b8e128 100644
--- a/config/checkstyle/checkstyle.xml
+++ b/config/checkstyle/checkstyle.xml
@@ -96,11 +96,13 @@
         <!-- Checks for Javadoc comments.                     -->
         <!-- See https://checkstyle.org/config_javadoc.html -->
         <module name="JavadocMethod">
-            <property name="excludeScope" value="private"/>
+            <property name="accessModifiers" value="public, protected"/>
         </module>
         <module name="JavadocType"/>
         <module name="JavadocStyle"/>
-        <module name="MissingJavadocType"/>
+        <module name="MissingJavadocType">
+            <property name="severity" value="warning"/>
+        </module>
 
         <!-- Checks for Naming Conventions.                  -->
         <!-- See https://checkstyle.org/config_naming.html -->
diff --git a/settings.gradle b/settings.gradle
index 92878067..95cf097e 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -6,7 +6,7 @@ pluginManagement {
 }
 
 plugins {
-    id("io.micronaut.build.shared.settings") version "6.1.0"
+    id("io.micronaut.build.shared.settings") version "6.1.1"
 }
 
 enableFeaturePreview 'TYPESAFE_PROJECT_ACCESSORS'
@@ -23,5 +23,4 @@ micronautBuild {
     addSnapshotRepository()
     importMicronautCatalog()
     importMicronautCatalog("micronaut-reactor")
-    importMicronautCatalog("micronaut-test")
 }

From 904c980928bbb800a40b6fcb4823a94bae676269 Mon Sep 17 00:00:00 2001
From: Tim Yates <tim.yates@gmail.com>
Date: Fri, 16 Dec 2022 14:20:04 +0000
Subject: [PATCH 2/2] Fix proxy target test

---
 .../kotlin/context/BeanContextExtensionsTest.kt   | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/kotlin-extension-functions/src/test/kotlin/io/micronaut/kotlin/context/BeanContextExtensionsTest.kt b/kotlin-extension-functions/src/test/kotlin/io/micronaut/kotlin/context/BeanContextExtensionsTest.kt
index 859e26b1..8dcc68bf 100644
--- a/kotlin-extension-functions/src/test/kotlin/io/micronaut/kotlin/context/BeanContextExtensionsTest.kt
+++ b/kotlin-extension-functions/src/test/kotlin/io/micronaut/kotlin/context/BeanContextExtensionsTest.kt
@@ -15,6 +15,7 @@
  */
 package io.micronaut.kotlin.context
 
+import io.micronaut.aop.Around
 import io.micronaut.context.BeanContext
 import io.micronaut.context.annotation.Context
 import io.micronaut.context.annotation.Factory
@@ -170,8 +171,10 @@ class BeanContextTest {
 
     @Test
     fun getProxyTargetBean() {
-        assertSame(context.getProxyTargetBean(TestFactory.Baz::class.java, Qualifiers.byStereotype(Context::class.java))::class,
-                context.getProxyTargetBean<TestFactory.Baz, Context>()::class)
+        assertSame(
+            context.getProxyTargetBean(TestFactory.Boz::class.java, Qualifiers.byStereotype(Context::class.java))::class,
+            context.getProxyTargetBean<TestFactory.Boz, Context>()::class
+        )
     }
 
     @Test
@@ -180,6 +183,10 @@ class BeanContextTest {
         assertSame(context.findOrInstantiateBean(TestFactory.Baz::class.java).get()::class, context.findOrInstantiateBean<TestFactory.Baz>()!!::class)
     }
 
+    @Around(proxyTarget = true)
+    @Target(AnnotationTarget.CLASS)
+    annotation class ProxyTarget
+
     @Factory
     class TestFactory {
 
@@ -192,6 +199,10 @@ class BeanContextTest {
         @Context
         class Baz
 
+        @Context
+        @ProxyTarget
+        open class Boz
+
         @Context
         @Requires(property = "qux.enabled")
         class Qux