4.9.1.2 release (#52)

burtbeckwith · web-flow · commit beb47875c234 · 2025-09-01T12:07:21.000-04:00
diff --git a/gdk-core/src/main/java/cloud/graal/gdk/feature/create/template/EnforceVersionsGroovy.rocker.raw b/gdk-core/src/main/java/cloud/graal/gdk/feature/create/template/EnforceVersionsGroovy.rocker.raw
@@ -17,8 +17,15 @@ abstract class EnforceBomDependencies implements ComponentMetadataRule {
                         String key = "${constraint.group}:${constraint.module}"
                         String version = constraint.versionConstraint.requiredVersion
 
-                        if (version && version ==~ /.*-oracle-\d+/) {
-                            gdkBomConstraints[key] = version
+                        if (version) {
+                            if (version ==~ /.*-oracle-\d+/)
+                                gdkBomConstraints[key] = version
+                            else {
+                                if ((gdkBomConstraints[key] ==~ /.*-oracle-\d+/))
+                                    println("skiping adding it " + key + "=" + version)
+                                else
+                                    gdkBomConstraints[key] = version
+                            }
                         }
 
                         constraint.version {
diff --git a/gdk-core/src/main/java/cloud/graal/gdk/feature/service/streaming/AbstractStreamingFeature.java b/gdk-core/src/main/java/cloud/graal/gdk/feature/service/streaming/AbstractStreamingFeature.java
@@ -18,9 +18,11 @@
 import cloud.graal.gdk.GdkGeneratorContext;
 import cloud.graal.gdk.feature.GdkFeatureContext;
 import cloud.graal.gdk.feature.service.AbstractGdkServiceFeature;
+import cloud.graal.gdk.feature.service.template.StreamingReflectConfig;
 import cloud.graal.gdk.model.GdkService;
 import io.micronaut.core.annotation.NonNull;
 import io.micronaut.starter.feature.messaging.kafka.Kafka;
+import io.micronaut.starter.template.RockerTemplate;
 
 import static cloud.graal.gdk.model.GdkService.STREAMING;
 
@@ -67,4 +69,13 @@ public final void apply(GdkGeneratorContext generatorContext) {
     public final GdkService getService() {
         return STREAMING;
     }
+
+    protected void addStreamingReflectConfig(GdkGeneratorContext generatorContext) {
+        generatorContext.addTemplate("streaming-reflect-config-" + getCloud().getTitle(),
+                new RockerTemplate(
+                        getModuleName(),
+                        "src/main/resources/META-INF/native-image/" + generatorContext.getProject().getPackagePath() + "/reflect-config.json",
+                        StreamingReflectConfig.template())
+        );
+    }
 }
diff --git a/gdk-core/src/main/java/cloud/graal/gdk/feature/service/streaming/AwsStreaming.java b/gdk-core/src/main/java/cloud/graal/gdk/feature/service/streaming/AwsStreaming.java
@@ -94,6 +94,8 @@ protected void doApply(GdkGeneratorContext generatorContext) {
                 "kafka.sasl.mechanism", "AWS_MSK_IAM",
                 "kafka.security.protocol", "SASL_SSL"
         ));
+
+        addStreamingReflectConfig(generatorContext);
     }
 
     @NonNull
diff --git a/gdk-core/src/main/java/cloud/graal/gdk/feature/service/streaming/AzureStreaming.java b/gdk-core/src/main/java/cloud/graal/gdk/feature/service/streaming/AzureStreaming.java
@@ -55,6 +55,8 @@ protected void doApply(GdkGeneratorContext generatorContext) {
                 "kafka.sasl.mechanism", "PLAIN",
                 "kafka.security.protocol", "SASL_SSL"
         ));
+
+        addStreamingReflectConfig(generatorContext);
     }
 
     @NonNull
diff --git a/gdk-core/src/main/java/cloud/graal/gdk/feature/service/streaming/OciStreaming.java b/gdk-core/src/main/java/cloud/graal/gdk/feature/service/streaming/OciStreaming.java
@@ -84,6 +84,8 @@ protected void doApply(GdkGeneratorContext generatorContext) {
                 "kafka.sasl.jaas.config", "org.apache.kafka.common.security.plain.PlainLoginModule required username=\"${OCI_TENANCY_NAME}/${OCI_USERNAME}/${OCI_STREAM_POOL_OCID}\" password=\"${OCI_AUTH_TOKEN}\";",
                 "kafka.security.protocol", "SASL_SSL"
         ));
+
+        addStreamingReflectConfig(generatorContext);
     }
 
     @NonNull
diff --git a/gdk-core/src/main/java/cloud/graal/gdk/feature/service/template/StreamingReflectConfig.rocker.raw b/gdk-core/src/main/java/cloud/graal/gdk/feature/service/template/StreamingReflectConfig.rocker.raw
@@ -0,0 +1,37 @@
+[
+  {
+    "name": "org.apache.kafka.common.security.authenticator.SaslClientAuthenticator",
+    "allDeclaredMethods": true,
+    "allDeclaredConstructors": true
+  },
+  {
+    "name": "org.apache.kafka.common.internals.CompositeStrategy",
+    "allDeclaredMethods": true,
+    "allDeclaredConstructors": true
+  },
+  {
+    "name": "org.apache.kafka.common.internals.ModernStrategy",
+    "allDeclaredMethods": true,
+    "allDeclaredConstructors": true
+  },
+  {
+    "name": "org.apache.kafka.common.internals.LegacyStrategy",
+    "allDeclaredMethods": true,
+    "allDeclaredConstructors": true
+  },
+  {
+    "name": "org.apache.kafka.common.internals.SecurityManagerCompatibility",
+    "allDeclaredMethods": true,
+    "allDeclaredConstructors": true
+  },
+  {
+    "name": "java.security.AccessController",
+    "allDeclaredMethods": true,
+    "allDeclaredConstructors": true
+  },
+  {
+    "name": "javax.security.auth.Subject",
+    "allDeclaredMethods": true,
+    "allDeclaredConstructors": true
+  }
+]
diff --git a/gradle.properties b/gradle.properties
@@ -1,5 +1,5 @@
 org.gradle.parallel=true
 org.gradle.caching=true
 projectGroup=cloud.graal.gdk
-version=4.9.1.1
-org.gradle.daemon=false
+version=4.9.1.2
+org.gradle.daemon=false
diff --git a/gradle/templates.versions.toml b/gradle/templates.versions.toml
@@ -60,7 +60,7 @@ kotlin = "1.8.22-oracle-00001"
 logback = "1.5.18-oracle-00001"
 logback-contrib = '0.1.5-oracle-00001'
 micronaut-cache = "5.3.0-oracle-00001"
-micronaut-core = "4.9.7-oracle-00001"
+micronaut-core = "4.9.9-oracle-00001"
 micronaut-data = "4.13.3-oracle-00001"
 micronaut-discovery = "4.7.1-oracle-00001"
 micronaut-email = "2.9.0-oracle-00001"
@@ -90,7 +90,7 @@ micronaut-tracing = "7.1.2-oracle-00001"
 micronaut-validation = "4.10.0-oracle-00001"
 micronaut-views = "5.8.0-oracle-00001"
 micronaut-coherence = "5.0.6-oracle-00001"
-netty = "4.2.2.Final-oracle-00001"
+netty = "4.2.4.Final-oracle-00001"
 okhttp = "4.12.0-oracle-00001"
 opentelemetry-api-incubator = "2.16.0-alpha-oracle-00001"
 opentelemetry-instrumentation = '2.16.0-oracle-00001'
@@ -324,4 +324,4 @@ org-slf4j-jcl-over-slf4j = { module = 'org.slf4j:jcl-over-slf4j', version.ref =
 org-slf4j-slf4j-api = { module = 'org.slf4j:slf4j-api', version.ref = 'slf4j' }
 org-slf4j-slf4j-simple = { module = 'org.slf4j:slf4j-simple', version.ref = 'slf4j' }
 org-xerial-snappy-snappy-java = { module = 'org.xerial.snappy:snappy-java', version.ref = 'xerial-snappy-snappy-java' }
-org-yaml-snakeyaml = { module = 'org.yaml:snakeyaml', version.ref = 'snakeyaml' }
+org-yaml-snakeyaml = { module = 'org.yaml:snakeyaml', version.ref = 'snakeyaml' }

Original file line number	Diff line number	Diff line change
`@@ -94,6 +94,8 @@ protected void doApply(GdkGeneratorContext generatorContext) {`
`94`	`94`	`"kafka.sasl.mechanism", "AWS_MSK_IAM",`
`95`	`95`	`"kafka.security.protocol", "SASL_SSL"`
`96`	`96`	`));`
	`97`	`+`
	`98`	`+ addStreamingReflectConfig(generatorContext);`
`97`	`99`	`}`
`98`	`100`
`99`	`101`	`@NonNull`
Original file line number	Diff line number	Diff line change
`@@ -55,6 +55,8 @@ protected void doApply(GdkGeneratorContext generatorContext) {`
`55`	`55`	`"kafka.sasl.mechanism", "PLAIN",`
`56`	`56`	`"kafka.security.protocol", "SASL_SSL"`
`57`	`57`	`));`
	`58`	`+`
	`59`	`+ addStreamingReflectConfig(generatorContext);`
`58`	`60`	`}`
`59`	`61`
`60`	`62`	`@NonNull`
Original file line number	Diff line number	Diff line change
`@@ -84,6 +84,8 @@ protected void doApply(GdkGeneratorContext generatorContext) {`
`84`	`84`	`"kafka.sasl.jaas.config", "org.apache.kafka.common.security.plain.PlainLoginModule required username=\"${OCI_TENANCY_NAME}/${OCI_USERNAME}/${OCI_STREAM_POOL_OCID}\" password=\"${OCI_AUTH_TOKEN}\";",`
`85`	`85`	`"kafka.security.protocol", "SASL_SSL"`
`86`	`86`	`));`
	`87`	`+`
	`88`	`+ addStreamingReflectConfig(generatorContext);`
`87`	`89`	`}`
`88`	`90`
`89`	`91`	`@NonNull`