Merge pull request #44 from oracle/4733

ezzarghili · web-flow · commit 68cf7d517ed3 · 2025-04-15T14:17:58.000+02:00
4.7.3.4 release
diff --git a/buildSrc/src/main/groovy/cloud/graal/gdk/dependencies/VersionCatalogUpdate.groovy b/buildSrc/src/main/groovy/cloud/graal/gdk/dependencies/VersionCatalogUpdate.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Oracle and/or its affiliates
+ * Copyright 2025 Oracle and/or its affiliates
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -131,16 +131,23 @@ abstract class VersionCatalogUpdate extends DefaultTask {
                         'io.micronaut.build',
                         'io.micronaut.build.internal.bom',
                         'io.micronaut.gradle',
-                        'io.micronaut.starter',
+                        'io.micronaut.guides',
                         'io.micronaut.maven',
+                        'io.micronaut.starter',
                         'io.micronaut.testresources'
                 ]
 
                 if (candidateModule.getGroup().contains('io.micronaut') && !micronautIgnoreGroups.contains(candidateModule.getGroup()) && !VersionCatalogUpdate.ORACLE_VERSION_PATTERN.matcher(candidateVersion).find()) {
                     rules.reject('Rejecting Micronaut module not build at Oracle')
                     log.println("Rejecting " + candidateModule.getModuleIdentifier() + " version " + candidateVersion)
                 }
-                Set<String> modulesToAllowAlpha = Set.of("google-cloud-logging-logback", "opentelemetry-semconv")
+                Set<String> modulesToAllowAlpha = Set.of(
+                        "google-cloud-logging-logback",
+                        "opentelemetry-semconv",
+                        "opentelemetry-api-events",
+                        "opentelemetry-instrumentation-api-semconv",
+                        "opentelemetry-api-incubator"
+                )
                 for (Pattern qualifier in rejectedQualifiers) {
                     if (qualifier.matcher(candidateVersion).find()) {
                         if (!modulesToAllowAlpha.contains(candidateModule.getModule()) || !candidateVersion.contains("alpha")) {
diff --git a/buildSrc/src/main/groovy/cloud/graal/gdk/pom/GdkBomPlugin.groovy b/buildSrc/src/main/groovy/cloud/graal/gdk/pom/GdkBomPlugin.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Oracle and/or its affiliates
+ * Copyright 2025 Oracle and/or its affiliates
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -133,7 +133,8 @@ abstract class GdkBomPlugin implements Plugin<Project> {
                         String alias = Optional.ofNullable(library.version.reference).map(a -> a.replace('-', '.')).orElse("")
                         String bomPropertyName = bomPropertyName(alias)
                         def version = modelProvider.versionsTable.find(x -> x.reference == library.version.reference).version
-                        mapAliasToVersion[library.alias] = '\${' + bomPropertyName + '}'
+                        String key = library.alias.replace("-",".").replace("_",".")
+                        mapAliasToVersion[key] = '\${' + bomPropertyName + '}'
                         pomProperties.put(bomPropertyName, version.require)
                     }
                 })
@@ -186,19 +187,19 @@ abstract class GdkBomPlugin implements Plugin<Project> {
             DefaultExternalModuleDependency existingDep = api.dependencies.find(x -> x.name == lib.name) as DefaultExternalModuleDependency
 
             if (existingDep != null) {
-                existingDep.version { it.strictly(mapAliasToVersion.get(alias.replace(".", "-"))) }
+                existingDep.version { it.strictly(mapAliasToVersion.get(alias)) }
             } else if (alias.endsWith(".bom")) {
                 DefaultMutableMinimalDependency bomDependency = project.dependencies.platform(versionCatalog.findLibrary(alias)
                         .map(Provider::get)
                         .orElseThrow(() -> new RuntimeException("Unexpected missing alias in catalog: " + alias))
                 ) as DefaultMutableMinimalDependency
-                bomDependency.version { it.strictly(mapAliasToVersion.get(alias.replace(".", "-"))) }
+                bomDependency.version { it.strictly(mapAliasToVersion.get(alias)) }
                 api.dependencies.add(bomDependency)
                 catalogs.dependencies.add(bomDependency)
 
             } else if (!alias.startsWith("exclude.")) {
                 DependencyConstraint dependencyConstraint = project.dependencies.constraints.create(lib)
-                dependencyConstraint.version { it.strictly(mapAliasToVersion.get(alias.replace(".", "-"))) }
+                dependencyConstraint.version { it.strictly(mapAliasToVersion.get(alias)) }
                 api.dependencyConstraints.add(dependencyConstraint)
             }
         })
diff --git a/gdk-core/src/main/java/cloud/graal/gdk/GdkGeneratorContext.java b/gdk-core/src/main/java/cloud/graal/gdk/GdkGeneratorContext.java
@@ -179,7 +179,7 @@ public GdkGeneratorContext(Project project,
         clouds.add(NONE); // for lib module
         buildProperties = new GdkBuildProperties(this, clouds);
         if (featureContext.getOptions().getBuildTool().isGradle()) {
-            buildProperties.put("micronautVersion", GdkUtils.getMicronautVersion() + GdkUtils.BOM_VERSION_SUFFIX);
+            buildProperties.put("micronautVersion", GdkUtils.getMicronautVersion() + GdkUtils.MICRONAUT_PLATFORM_BOM_VERSION_SUFFIX);
         }
         INSTANCE.set(this);
     }
diff --git a/gdk-core/src/main/java/cloud/graal/gdk/GdkUtils.java b/gdk-core/src/main/java/cloud/graal/gdk/GdkUtils.java
@@ -62,7 +62,7 @@ public final class GdkUtils {
     /**
      * The version suffix appended to the Micronaut version in the BOM.
      */
-    public static final String BOM_VERSION_SUFFIX = getBomVersionSuffix();
+    public static final String MICRONAUT_PLATFORM_BOM_VERSION_SUFFIX = getMicronautPlatformBomVersionSuffix();
 
     private static final String GDK_BOM_VERSION = loadVersion("version.txt");
 
@@ -79,8 +79,8 @@ private static String loadVersion(String resourcePath) {
         }
     }
 
-    private static String getBomVersionSuffix() {
-        Matcher m = Pattern.compile("(-oracle-\\d+)").matcher(GdkDependencies.IO_MICRONAUT_MICRONAUT_CORE.getVersion());
+    private static String getMicronautPlatformBomVersionSuffix() {
+        Matcher m = Pattern.compile("(-oracle-\\d+)").matcher(GdkDependencies.IO_MICRONAUT_PLATFORM_MICRONAUT_PARENT.getVersion());
         m.find();
         return m.group();
     }
diff --git a/gdk-core/src/main/java/cloud/graal/gdk/template/BuildGradlePostProcessor.java b/gdk-core/src/main/java/cloud/graal/gdk/template/BuildGradlePostProcessor.java
@@ -25,7 +25,7 @@
 import java.util.Objects;
 import java.util.regex.Pattern;
 
-import static cloud.graal.gdk.GdkUtils.BOM_VERSION_SUFFIX;
+import static cloud.graal.gdk.GdkUtils.MICRONAUT_PLATFORM_BOM_VERSION_SUFFIX;
 import static io.micronaut.starter.build.gradle.GradleDsl.GROOVY;
 
 /**
@@ -121,7 +121,7 @@ public class BuildGradlePostProcessor implements TemplatePostProcessor {
     private static final Pattern RESOLUTION_STRATEGY_REGEX = Pattern.compile(
             "(?s)(substitute\\(module\\(\"io\\.micronaut.+\"\\)\\).*\\.using\\(module\\(\"io\\.micronaut.+:[0-9.]+)(\"\\)\\))");
 
-    private static final String RESOLUTION_STRATEGY_REPLACEMENT = String.format("$1%s$2", BOM_VERSION_SUFFIX);
+    private static final String RESOLUTION_STRATEGY_REPLACEMENT = String.format("$1%s$2", MICRONAUT_PLATFORM_BOM_VERSION_SUFFIX);
 
     private final GradleDsl dsl;
     private final boolean forCloudModule;
diff --git a/gdk-core/src/main/java/cloud/graal/gdk/template/MavenPomPostProcessor.java b/gdk-core/src/main/java/cloud/graal/gdk/template/MavenPomPostProcessor.java
@@ -24,7 +24,7 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import static cloud.graal.gdk.GdkUtils.BOM_VERSION_SUFFIX;
+import static cloud.graal.gdk.GdkUtils.MICRONAUT_PLATFORM_BOM_VERSION_SUFFIX;
 import static cloud.graal.gdk.GdkUtils.LIB_MODULE;
 
 /**
@@ -179,10 +179,10 @@ private String fixProcessingModule(@NonNull String pom) {
     @NonNull
     private String fixMicronautVersion(@NonNull String pom) {
 
-        if (!libModule && !pom.contains(BOM_VERSION_SUFFIX)) {
+        if (!libModule && !pom.contains(MICRONAUT_PLATFORM_BOM_VERSION_SUFFIX)) {
             Matcher m = MICRONAUT_VERSION_PATTERN.matcher(pom);
             if (m.find() && m.groupCount() == 1) {
-                pom = m.replaceAll(MICRONAUT_VERSION_START + m.group(1) + BOM_VERSION_SUFFIX + MICRONAUT_VERSION_END);
+                pom = m.replaceAll(MICRONAUT_VERSION_START + m.group(1) + MICRONAUT_PLATFORM_BOM_VERSION_SUFFIX + MICRONAUT_VERSION_END);
             }
         }
 
diff --git a/gradle/templates.versions.toml b/gradle/templates.versions.toml
@@ -22,7 +22,7 @@ apache-kafka-kafka-clients = '3.8.0-oracle-00001'
 asm = '9.7.1-oracle-00001'
 aws-msk-iam-auth = "2.2.0"
 ben-manes-caffeine-caffeine = '3.1.8-oracle-00001'
-bitbucket-b_c-jose4j = '0.9.3-oracle-00001'
+bitbucket-b_c-jose4j = '0.9.6-oracle-00001'
 bouncycastle = "1.79"
 ch-randelshofer-fastdoubleparser = '1.0.0-oracle-00001'
 code-findbugs-jsr305 = '3.0.2-oracle-00001'
@@ -44,7 +44,7 @@ github-resilience4j = '1.7.1-oracle-00002'
 github-vladimir-bukhtoyarov-bucket4j-core = '7.6.0-oracle-00001'
 google-auth-library = "1.30.1"
 google-cloud-logging = "0.132.0-alpha"
-google-errorprone-error_prone_annotations = '2.21.1-oracle-00001'
+google-errorprone-error_prone_annotations = '2.21.0-oracle-00001'
 graalvm-metadata-version = "0.3.15"
 guava = "33.4.0-jre"
 intellij-deps-trove4j = '1.0.20200330-oracle-00001'
@@ -72,11 +72,12 @@ jakarta-persistence-jakarta-persistence-api = '3.1.0-oracle-00001'
 jakarta-transaction-jakarta-transaction-api = '2.0.1-oracle-00001'
 jakarta-validation-jakarta-validation-api = '3.1.0-oracle-00001'
 javax-annotation-javax-annotation-api = '1.3.2-oracle-00001'
+json-smart = "2.5.2"
 kotlin = "1.8.22-oracle-00001"
 logback = "1.5.15-oracle-00001"
 logback-contrib = '0.1.5-oracle-00001'
 micronaut-cache = "5.1.0-oracle-00001"
-micronaut-core = "4.7.10-oracle-00001"
+micronaut-core = "4.7.10-oracle-00002"
 micronaut-data = "4.10.5-oracle-00001"
 micronaut-discovery = "4.5.0-oracle-00001"
 micronaut-email = "2.7.0-oracle-00001"
@@ -98,6 +99,7 @@ micronaut-platform = "4.7.3-oracle-00001"
 micronaut-reactor = "3.6.0-oracle-00001"
 micronaut-security = "4.11.2-oracle-00001"
 micronaut-serde = "2.13.0-oracle-00001"
+micronaut-servlet = "4.12.0-oracle-00001"
 micronaut-session = "4.5.0-oracle-00001"
 micronaut-sql = "5.8.2-oracle-00001"
 micronaut-tracing = "6.9.0-oracle-00001"
@@ -202,6 +204,7 @@ io-micronaut-picocli-micronaut-picocli-bom = { module = 'io.micronaut.picocli:mi
 io-micronaut-reactor-micronaut-reactor-bom = { module = 'io.micronaut.reactor:micronaut-reactor-bom', version.ref = 'micronaut-reactor'}
 io-micronaut-security-micronaut-security-bom = { module = 'io.micronaut.security:micronaut-security-bom', version.ref = 'micronaut-security'}
 io-micronaut-serde-micronaut-serde-bom = { module = 'io.micronaut.serde:micronaut-serde-bom', version.ref = 'micronaut-serde'}
+io-micronaut-servlet-bom = { module = 'io.micronaut.servlet:micronaut-servlet-bom', version.ref = 'micronaut-servlet'}
 io-micronaut-sql-micronaut-jdbc = { module = 'io.micronaut.sql:micronaut-jdbc', version.ref = 'micronaut-sql'}
 io-micronaut-sql-micronaut-jdbc-tomcat = { module = 'io.micronaut.sql:micronaut-jdbc-tomcat', version.ref = 'micronaut-sql'}
 io-micronaut-sql-micronaut-sql-bom = { module = 'io.micronaut.sql:micronaut-sql-bom', version.ref = 'micronaut-sql'}
@@ -210,6 +213,7 @@ io-micronaut-validation-micronaut-validation-bom = { module = 'io.micronaut.vali
 io-micronaut-views-micronaut-views-core = { module = 'io.micronaut.views:micronaut-views-core', version.ref = 'micronaut-views'}
 io-micronaut-views-micronaut-views-jte = { module = 'io.micronaut.views:micronaut-views-jte', version.ref = 'micronaut-views'}
 io-opentelemetry-opentelemetry-semconv = { module = 'io.opentelemetry:opentelemetry-semconv', version.ref = 'opentelemetry-semconv'}
+net-minidev-json-smart = { module = 'net.minidev:json-smart', version.ref = 'json-smart'}
 org-apache-commons-commons-compress = { module = 'org.apache.commons:commons-compress', version.ref = 'apache-commons-compress'}
 org-bouncycastle-bcpkix-jdk15to18 = { module = 'org.bouncycastle:bcpkix-jdk15to18', version.ref = 'bouncycastle'}
 org-bouncycastle-bcpkix-jdk18on = { module = 'org.bouncycastle:bcpkix-jdk18on', version.ref = 'bouncycastle'}

Original file line number	Diff line number	Diff line change
`@@ -179,7 +179,7 @@ public GdkGeneratorContext(Project project,`
`179`	`179`	`clouds.add(NONE); // for lib module`
`180`	`180`	`buildProperties = new GdkBuildProperties(this, clouds);`
`181`	`181`	`if (featureContext.getOptions().getBuildTool().isGradle()) {`
`182`		`- buildProperties.put("micronautVersion", GdkUtils.getMicronautVersion() + GdkUtils.BOM_VERSION_SUFFIX);`
	`182`	`+ buildProperties.put("micronautVersion", GdkUtils.getMicronautVersion() + GdkUtils.MICRONAUT_PLATFORM_BOM_VERSION_SUFFIX);`
`183`	`183`	`}`
`184`	`184`	`INSTANCE.set(this);`
`185`	`185`	`}`
Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ public final class GdkUtils {`
`62`	`62`	`/**`
`63`	`63`	`* The version suffix appended to the Micronaut version in the BOM.`
`64`	`64`	`*/`
`65`		`- public static final String BOM_VERSION_SUFFIX = getBomVersionSuffix();`
	`65`	`+ public static final String MICRONAUT_PLATFORM_BOM_VERSION_SUFFIX = getMicronautPlatformBomVersionSuffix();`
`66`	`66`
`67`	`67`	`private static final String GDK_BOM_VERSION = loadVersion("version.txt");`
`68`	`68`
`@@ -79,8 +79,8 @@ private static String loadVersion(String resourcePath) {`
`79`	`79`	`}`
`80`	`80`	`}`
`81`	`81`
`82`		`- private static String getBomVersionSuffix() {`
`83`		`- Matcher m = Pattern.compile("(-oracle-\\d+)").matcher(GdkDependencies.IO_MICRONAUT_MICRONAUT_CORE.getVersion());`
	`82`	`+ private static String getMicronautPlatformBomVersionSuffix() {`
	`83`	`+ Matcher m = Pattern.compile("(-oracle-\\d+)").matcher(GdkDependencies.IO_MICRONAUT_PLATFORM_MICRONAUT_PARENT.getVersion());`
`84`	`84`	`m.find();`
`85`	`85`	`return m.group();`
`86`	`86`	`}`