From c2c8aeef434104f1ac0167c6bd03d9ad2f8d9e70 Mon Sep 17 00:00:00 2001 From: Burt Beckwith Date: Mon, 11 Aug 2025 08:28:45 -0400 Subject: [PATCH] 4.9.1.1 release --- buildSrc/src/main/groovy/gdk-base.gradle | 2 +- buildSrc/src/main/groovy/gdk-cli.gradle | 6 +- gdk-cli-core/build.gradle | 2 +- gdk-core/build.gradle | 13 +- .../cloud/graal/gdk/GdkGeneratorContext.java | 9 +- .../graal/gdk/feature/GdkTestedFeatures.java | 4 +- .../feature/create/GdkMavenBuildCreator.java | 10 + .../function/GdkAzureCloudFunction.java | 13 + .../AbstractGdkCloudGatewayFunction.java | 4 +- .../GdkAzureCloudGatewayFunction.java | 16 ++ .../feature/replaced/GdkAzureRawFunction.java | 41 +++ .../graal/gdk/feature/replaced/GdkGradle.java | 32 ++- .../replaced/GdkOracleRawFunction.java | 38 +-- .../replaced/template/maindocs.rocker.raw | 8 +- .../service/k8s/AbstractK8sFeature.java | 11 +- .../graal/gdk/feature/service/k8s/AwsK8s.java | 3 +- .../gdk/feature/service/k8s/AzureK8s.java | 3 +- .../k8s/DiscoveryKubernetesOpenApi.java | 58 +++++ .../graal/gdk/feature/service/k8s/GcpK8s.java | 3 +- .../service/k8s/KubernetesClientOpenApi.java | 74 ++++++ .../gdk/feature/service/k8s/NonCloudK8s.java | 3 +- .../graal/gdk/feature/service/k8s/OciK8s.java | 3 +- .../feature/service/tracing/AzureTracing.java | 42 ++- .../feature/service/tracing/GcpTracing.java | 2 +- gradle.properties | 4 +- gradle/libs.versions.toml | 51 +--- gradle/templates.versions.toml | 241 ++++++++---------- gradle/wrapper/gradle-wrapper.jar | Bin 43453 -> 43583 bytes gradle/wrapper/gradle-wrapper.properties | 2 +- gradlew | 6 +- gradlew.bat | 2 + 31 files changed, 451 insertions(+), 255 deletions(-) create mode 100644 gdk-core/src/main/java/cloud/graal/gdk/feature/replaced/GdkAzureRawFunction.java create mode 100644 gdk-core/src/main/java/cloud/graal/gdk/feature/service/k8s/DiscoveryKubernetesOpenApi.java create mode 100644 gdk-core/src/main/java/cloud/graal/gdk/feature/service/k8s/KubernetesClientOpenApi.java diff --git a/buildSrc/src/main/groovy/gdk-base.gradle b/buildSrc/src/main/groovy/gdk-base.gradle index 30eea09..dd52987 100644 --- a/buildSrc/src/main/groovy/gdk-base.gradle +++ b/buildSrc/src/main/groovy/gdk-base.gradle @@ -29,7 +29,7 @@ repositories { dependencies { compileOnly mnLibs.jsr305 // for 'warning: unknown enum constant When.MAYBE' implementation mnLibs.jakarta.annotation.api - runtimeOnly libs.logback.classic + runtimeOnly mnLibs.logback.classic } java { diff --git a/buildSrc/src/main/groovy/gdk-cli.gradle b/buildSrc/src/main/groovy/gdk-cli.gradle index 2b4f028..8c5fe24 100644 --- a/buildSrc/src/main/groovy/gdk-cli.gradle +++ b/buildSrc/src/main/groovy/gdk-cli.gradle @@ -17,7 +17,7 @@ plugins { id 'gdk-module' id 'io.micronaut.application' - id 'com.github.johnrengelman.shadow' + id 'com.gradleup.shadow' } dependencies { @@ -31,7 +31,7 @@ dependencies { runtimeOnly libs.bouncycastle.bcprov runtimeOnly libs.jansi runtimeOnly libs.jline - runtimeOnly libs.slf4j.nop + runtimeOnly mnLibs.slf4j.nop } configurations.configureEach { @@ -39,7 +39,7 @@ configurations.configureEach { } micronaut { - version libs.micronaut.starter.api.get().version + version libs.versions.micronaut.starter.get() processing { incremental true annotations 'cloud.graal.gdk.*' diff --git a/gdk-cli-core/build.gradle b/gdk-cli-core/build.gradle index 8378f50..db397fa 100644 --- a/gdk-cli-core/build.gradle +++ b/gdk-cli-core/build.gradle @@ -51,7 +51,7 @@ dependencies { } micronaut { - version libs.micronaut.starter.api.get().version + version libs.versions.micronaut.starter.get() processing { incremental true annotations 'cloud.graal.gdk.*' diff --git a/gdk-core/build.gradle b/gdk-core/build.gradle index a684d28..d3a75c1 100644 --- a/gdk-core/build.gradle +++ b/gdk-core/build.gradle @@ -44,17 +44,6 @@ dependencies { exclude group: 'org.eclipse.jgit', module: 'org.eclipse.jgit' } implementation(mnLibs.micronaut.http.client) - implementation(libs.netty.buffer) - implementation(libs.netty.codec) - implementation(libs.netty.codec.http) - implementation(libs.netty.codec.http2) - implementation(libs.netty.codec.socks) - implementation(libs.netty.common) - implementation(libs.netty.handler) - implementation(libs.netty.handler.proxy) - implementation(libs.netty.resolver) - implementation(libs.netty.transport) - implementation(libs.netty.transport.native.unix.common) } def writeVersions = tasks.register('writeVersions', cloud.graal.gdk.util.WriteVersionsTask) { @@ -74,7 +63,7 @@ sourceSets { } micronaut { - version libs.micronaut.starter.api.get().version + version libs.versions.micronaut.starter.get() processing { incremental true annotations 'cloud.graal.gdk.*' diff --git a/gdk-core/src/main/java/cloud/graal/gdk/GdkGeneratorContext.java b/gdk-core/src/main/java/cloud/graal/gdk/GdkGeneratorContext.java index 9de8758..f7b313d 100644 --- a/gdk-core/src/main/java/cloud/graal/gdk/GdkGeneratorContext.java +++ b/gdk-core/src/main/java/cloud/graal/gdk/GdkGeneratorContext.java @@ -109,7 +109,7 @@ public class GdkGeneratorContext extends GeneratorContext { /** * The id of the Gradle Shadow plugin. */ - public static final String PLUGIN_SHADOW = "com.github.johnrengelman.shadow"; + public static final String PLUGIN_SHADOW = "com.gradleup.shadow"; private static final String PLUGIN_GRADLE_AZUREFUNCTIONS = "com.microsoft.azure.azurefunctions"; private static final String PLUGIN_MAVEN_AZUREFUNCTIONS = "azure-functions-maven-plugin"; @@ -122,7 +122,7 @@ public class GdkGeneratorContext extends GeneratorContext { ); private static final Map PLUGIN_GAVS = Map.ofEntries( - gavMapEntry("com.github.johnrengelman.shadow", "com.github.johnrengelman:shadow", StarterCoordinates.SHADOW), + gavMapEntry("com.gradleup.shadow", "com.gradleup.shadow:com.gradleup.shadow.gradle.plugin", StarterCoordinates.COM_GRADLEUP_SHADOW_GRADLE_PLUGIN), gavMapEntry("io.micronaut.application", "io.micronaut.gradle:micronaut-gradle-plugin", GdkDependencies.IO_MICRONAUT_GRADLE_MICRONAUT_GRADLE_PLUGIN), gavMapEntry("io.micronaut.library", "io.micronaut.gradle:micronaut-gradle-plugin", GdkDependencies.IO_MICRONAUT_GRADLE_MICRONAUT_GRADLE_PLUGIN), gavMapEntry("io.micronaut.test-resources", "io.micronaut.gradle:micronaut-test-resources-plugin", GdkDependencies.IO_MICRONAUT_GRADLE_MICRONAUT_GRADLE_PLUGIN), @@ -132,7 +132,8 @@ public class GdkGeneratorContext extends GeneratorContext { gavMapEntry("com.google.cloud.tools.jib", "com.google.cloud.tools.jib:com.google.cloud.tools.jib.gradle.plugin", StarterCoordinates.JIB_GRADLE_PLUGIN), gavMapEntry("io.micronaut.aot", "io.micronaut.gradle:micronaut-aot-plugin", GdkDependencies.IO_MICRONAUT_GRADLE_MICRONAUT_GRADLE_PLUGIN), gavMapEntry("com.google.devtools.ksp", "com.google.devtools.ksp:com.google.devtools.ksp.gradle.plugin", StarterCoordinates.COM_GOOGLE_DEVTOOLS_KSP_GRADLE_PLUGIN), - gavMapEntry("gg.jte.gradle", "gg.jte:jte-gradle-plugin", StarterCoordinates.JTE_GRADLE_PLUGIN) + gavMapEntry("gg.jte.gradle", "gg.jte:jte-gradle-plugin", StarterCoordinates.JTE_GRADLE_PLUGIN), + gavMapEntry("com.microsoft.azure.azurefunctions", "com.microsoft.azure:azure-functions-gradle-plugin", StarterCoordinates.AZURE_FUNCTIONS_GRADLE_PLUGIN) ); private static final ThreadLocal INSTANCE = new ThreadLocal<>(); @@ -896,7 +897,7 @@ public void addTemplate(String name, RockerModel rockerModel = testRockerModelProvider.findModel(getLanguage(), getTestFramework()); if (rockerModel != null) { - addTemplateInternal(name, new RockerTemplate(moduleName, path, rockerModel)); + addTemplateInternal(name + "-" + cloud.getModuleName(), new RockerTemplate(moduleName, path, rockerModel)); } } diff --git a/gdk-core/src/main/java/cloud/graal/gdk/feature/GdkTestedFeatures.java b/gdk-core/src/main/java/cloud/graal/gdk/feature/GdkTestedFeatures.java index db59200..c53a943 100644 --- a/gdk-core/src/main/java/cloud/graal/gdk/feature/GdkTestedFeatures.java +++ b/gdk-core/src/main/java/cloud/graal/gdk/feature/GdkTestedFeatures.java @@ -55,7 +55,7 @@ public final class GdkTestedFeatures { "email-javamail", "email-template", // K8S - "kubernetes-client", + "kubernetes-client-openapi", // LOGGING "logback", // METRICS @@ -100,6 +100,8 @@ public final class GdkTestedFeatures { // TRACING AWS "tracing-opentelemetry-exporter-otlp", "tracing-opentelemetry-xray", + // TRACING Azure + "azure-tracing", // TRACING GCP "tracing-opentelemetry-exporter-gcp", "tracing-opentelemetry-gcp" diff --git a/gdk-core/src/main/java/cloud/graal/gdk/feature/create/GdkMavenBuildCreator.java b/gdk-core/src/main/java/cloud/graal/gdk/feature/create/GdkMavenBuildCreator.java index 4e5db03..0e7465e 100644 --- a/gdk-core/src/main/java/cloud/graal/gdk/feature/create/GdkMavenBuildCreator.java +++ b/gdk-core/src/main/java/cloud/graal/gdk/feature/create/GdkMavenBuildCreator.java @@ -30,6 +30,8 @@ import io.micronaut.starter.build.maven.MavenPlugin; import io.micronaut.starter.build.maven.MavenRepository; import io.micronaut.starter.feature.build.maven.templates.mavenPlugin; +import io.micronaut.starter.feature.function.azure.AbstractAzureFunction; +import io.micronaut.starter.feature.function.azure.template.azureFunctionMavenPlugin; import io.micronaut.starter.feature.testresources.TestResourcesAdditionalModulesProvider; import io.micronaut.starter.template.RockerWritable; import jakarta.inject.Singleton; @@ -46,6 +48,8 @@ @Singleton public class GdkMavenBuildCreator extends MavenBuildCreator { + private static final String AZURE_FUNCTIONS_MAVEN_PLUGIN = "azure-functions-maven-plugin"; + @NonNull @Override public MavenBuild create(GeneratorContext generatorContext, List repositories) { @@ -93,6 +97,12 @@ private MavenPlugin clonePlugin(MavenPlugin plugin) { extensionModel.templateDirectory())), 0); } + if (AZURE_FUNCTIONS_MAVEN_PLUGIN.equals(plugin.getArtifactId())) { + return new MavenPlugin( + plugin.getArtifactId(), + new RockerWritable(azureFunctionMavenPlugin.template(AbstractAzureFunction.AZURE_FUNCTIONS_EXTENSION_VERSION)), 0); + } + mavenPlugin extensionModel = (mavenPlugin) ((RockerWritable) plugin.getExtension()).getModel(); return new MavenPlugin( plugin.getArtifactId(), diff --git a/gdk-core/src/main/java/cloud/graal/gdk/feature/create/function/GdkAzureCloudFunction.java b/gdk-core/src/main/java/cloud/graal/gdk/feature/create/function/GdkAzureCloudFunction.java index afa815b..00a7162 100644 --- a/gdk-core/src/main/java/cloud/graal/gdk/feature/create/function/GdkAzureCloudFunction.java +++ b/gdk-core/src/main/java/cloud/graal/gdk/feature/create/function/GdkAzureCloudFunction.java @@ -15,8 +15,10 @@ */ package cloud.graal.gdk.feature.create.function; +import cloud.graal.gdk.feature.GdkFeatureContext; import cloud.graal.gdk.model.GdkCloud; import io.micronaut.core.annotation.NonNull; +import io.micronaut.starter.feature.function.azure.AzureRawFunction; import jakarta.inject.Singleton; import static cloud.graal.gdk.model.GdkCloud.AZURE; @@ -29,6 +31,17 @@ @Singleton public class GdkAzureCloudFunction extends AbstractGdkCloudFunction { + private final AzureRawFunction azureRawFunction; + + public GdkAzureCloudFunction(AzureRawFunction azureRawFunction) { + this.azureRawFunction = azureRawFunction; + } + + @Override + public void processSelectedFeatures(GdkFeatureContext featureContext) { + featureContext.addFeature(azureRawFunction, AzureRawFunction.class); + } + @NonNull @Override public GdkCloud getCloud() { diff --git a/gdk-core/src/main/java/cloud/graal/gdk/feature/create/gatewayfunction/AbstractGdkCloudGatewayFunction.java b/gdk-core/src/main/java/cloud/graal/gdk/feature/create/gatewayfunction/AbstractGdkCloudGatewayFunction.java index 3609cc6..5cc5449 100644 --- a/gdk-core/src/main/java/cloud/graal/gdk/feature/create/gatewayfunction/AbstractGdkCloudGatewayFunction.java +++ b/gdk-core/src/main/java/cloud/graal/gdk/feature/create/gatewayfunction/AbstractGdkCloudGatewayFunction.java @@ -27,7 +27,9 @@ * * @since 1.0.0 */ -public abstract class AbstractGdkCloudGatewayFunction extends AbstractGdkCreateFeature implements FunctionFeature { +public abstract class AbstractGdkCloudGatewayFunction + extends AbstractGdkCreateFeature + implements FunctionFeature { @NonNull @Override diff --git a/gdk-core/src/main/java/cloud/graal/gdk/feature/create/gatewayfunction/GdkAzureCloudGatewayFunction.java b/gdk-core/src/main/java/cloud/graal/gdk/feature/create/gatewayfunction/GdkAzureCloudGatewayFunction.java index 3757010..5d2fef9 100644 --- a/gdk-core/src/main/java/cloud/graal/gdk/feature/create/gatewayfunction/GdkAzureCloudGatewayFunction.java +++ b/gdk-core/src/main/java/cloud/graal/gdk/feature/create/gatewayfunction/GdkAzureCloudGatewayFunction.java @@ -15,8 +15,10 @@ */ package cloud.graal.gdk.feature.create.gatewayfunction; +import cloud.graal.gdk.feature.GdkFeatureContext; import cloud.graal.gdk.model.GdkCloud; import io.micronaut.core.annotation.NonNull; +import io.micronaut.starter.feature.function.azure.AzureRawFunction; import jakarta.inject.Singleton; import static cloud.graal.gdk.model.GdkCloud.AZURE; @@ -29,6 +31,20 @@ @Singleton public class GdkAzureCloudGatewayFunction extends AbstractGdkCloudGatewayFunction { + private final AzureRawFunction azureRawFunction; + + /** + * @param azureRawFunction AzureRawFunction feature + */ + public GdkAzureCloudGatewayFunction(AzureRawFunction azureRawFunction) { + this.azureRawFunction = azureRawFunction; + } + + @Override + public void processSelectedFeatures(GdkFeatureContext featureContext) { + featureContext.addFeature(azureRawFunction, AzureRawFunction.class); + } + @NonNull @Override public GdkCloud getCloud() { diff --git a/gdk-core/src/main/java/cloud/graal/gdk/feature/replaced/GdkAzureRawFunction.java b/gdk-core/src/main/java/cloud/graal/gdk/feature/replaced/GdkAzureRawFunction.java new file mode 100644 index 0000000..c1abf8a --- /dev/null +++ b/gdk-core/src/main/java/cloud/graal/gdk/feature/replaced/GdkAzureRawFunction.java @@ -0,0 +1,41 @@ +/* + * 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. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package cloud.graal.gdk.feature.replaced; + +import cloud.graal.gdk.GdkGeneratorContext; +import io.micronaut.context.annotation.Replaces; +import io.micronaut.starter.application.generator.GeneratorContext; +import io.micronaut.starter.build.dependencies.CoordinateResolver; +import io.micronaut.starter.feature.function.azure.AzureHttpFunction; +import io.micronaut.starter.feature.function.azure.AzureRawFunction; +import jakarta.inject.Singleton; + +@Replaces(AzureRawFunction.class) +@Singleton +public class GdkAzureRawFunction extends AzureRawFunction { + public GdkAzureRawFunction(CoordinateResolver coordinateResolver, AzureHttpFunction httpFunction) { + super(coordinateResolver, httpFunction); + } + + @Override + public void apply(GeneratorContext generatorContext) { + super.apply(generatorContext); + + GdkGeneratorContext context = (GdkGeneratorContext) generatorContext; + context.addUrlTemplate("azure", "host.json", "host.json", "functions/azure/host.json"); + context.addUrlTemplate("azure", "local.settings.json", "local.settings.json", "functions/azure/local.settings.json"); + } +} diff --git a/gdk-core/src/main/java/cloud/graal/gdk/feature/replaced/GdkGradle.java b/gdk-core/src/main/java/cloud/graal/gdk/feature/replaced/GdkGradle.java index 577844e..173e655 100644 --- a/gdk-core/src/main/java/cloud/graal/gdk/feature/replaced/GdkGradle.java +++ b/gdk-core/src/main/java/cloud/graal/gdk/feature/replaced/GdkGradle.java @@ -45,6 +45,7 @@ import io.micronaut.starter.feature.build.gradle.MicronautApplicationGradlePlugin; import io.micronaut.starter.feature.build.gradle.templates.buildGradle; import io.micronaut.starter.feature.build.gradle.templates.micronautGradle; +import io.micronaut.starter.feature.function.azure.template.azurefunctions; import io.micronaut.starter.template.RockerTemplate; import io.micronaut.starter.template.RockerWritable; import jakarta.inject.Singleton; @@ -88,6 +89,11 @@ public class GdkGradle extends Gradle { */ private static final String JTE_PLUGIN_ID = "gg.jte.gradle"; + /** + * The plugin id for the AZURE functions plugin. + */ + private static final String AZURE_FUNCTIONS_PLUGIN = "com.microsoft.azure.azurefunctions"; + private static final GradlePlugin GROOVY_PLUGIN = GradlePlugin.builder().id("groovy").build(); private final CoordinateResolver coordinateResolver; @@ -260,6 +266,8 @@ private void addCloudGradleBuild(GdkGeneratorContext generatorContext, GradleDsl copiedPlugins.add(cloneMicronautPlugin(plugin, generatorContext)); } else if (JTE_PLUGIN_ID.equals(id)) { copiedPlugins.add(cloneJtePlugin(plugin)); + } else if (AZURE_FUNCTIONS_PLUGIN.equals(id)) { + copiedPlugins.add(cloneAzureFunctionsPlugin(plugin, generatorContext)); } else { throw new IllegalStateException("Unknown build plugin '" + id + "'"); } @@ -290,7 +298,6 @@ private void addCloudGradleBuild(GdkGeneratorContext generatorContext, GradleDsl } private GradlePlugin cloneJtePlugin(GradlePlugin plugin) { - gdkGradlePluginJTE extensionModel = (gdkGradlePluginJTE) ((RockerWritable) plugin.getExtension()).getModel(); return new GradlePlugin( @@ -344,4 +351,27 @@ private GradlePlugin cloneMicronautPlugin(GradlePlugin plugin, plugin.getBuildImports(), plugin.getSettingsImports()); } + + private GradlePlugin cloneAzureFunctionsPlugin(GradlePlugin plugin, GeneratorContext generatorContext) { + + + azurefunctions extensionModel = (azurefunctions) ((RockerWritable) plugin.getExtension()).getModel(); + + return new GradlePlugin( + plugin.getGradleFile(), + plugin.getId(), + plugin.getVersion(), + null, + new RockerWritable(azurefunctions.template( + generatorContext.getProject(), + extensionModel.dsl(), + generatorContext.getJdkVersion().asString()) + ), + null, + plugin.getPluginsManagementRepositories(), + false, + plugin.getOrder(), + plugin.getBuildImports(), + plugin.getSettingsImports()); + } } diff --git a/gdk-core/src/main/java/cloud/graal/gdk/feature/replaced/GdkOracleRawFunction.java b/gdk-core/src/main/java/cloud/graal/gdk/feature/replaced/GdkOracleRawFunction.java index ba58510..090319b 100644 --- a/gdk-core/src/main/java/cloud/graal/gdk/feature/replaced/GdkOracleRawFunction.java +++ b/gdk-core/src/main/java/cloud/graal/gdk/feature/replaced/GdkOracleRawFunction.java @@ -16,7 +16,6 @@ package cloud.graal.gdk.feature.replaced; import cloud.graal.gdk.GdkGeneratorContext; -import cloud.graal.gdk.model.GdkCloud; import io.micronaut.context.annotation.Replaces; import io.micronaut.starter.application.ApplicationType; import io.micronaut.starter.application.Project; @@ -28,52 +27,61 @@ import io.micronaut.starter.feature.function.oraclefunction.template.raw.oracleRawFunctionKotlin; import io.micronaut.starter.feature.json.JacksonDatabindFeature; import io.micronaut.starter.feature.logging.SimpleLogging; -import io.micronaut.starter.options.BuildTool; import io.micronaut.starter.options.Language; import io.micronaut.starter.template.RockerTemplate; import jakarta.inject.Singleton; +import static cloud.graal.gdk.model.GdkCloud.OCI; +import static io.micronaut.starter.application.ApplicationType.FUNCTION; +import static io.micronaut.starter.options.BuildTool.MAVEN; + @Singleton @Replaces(OracleRawFunction.class) -public class GdkOracleRawFunction extends OracleRawFunction { +public class GdkOracleRawFunction extends OracleRawFunction { - public GdkOracleRawFunction(SimpleLogging simpleLogging, OracleFunction httpFunction, JacksonDatabindFeature jacksonDatabindFeature) { + public GdkOracleRawFunction(SimpleLogging simpleLogging, + OracleFunction httpFunction, + JacksonDatabindFeature jacksonDatabindFeature) { super(simpleLogging, httpFunction, jacksonDatabindFeature); } @Override - public void apply(GeneratorContext generatorContext) { + public void apply(GeneratorContext gc) { + var generatorContext = (GdkGeneratorContext) gc; + ApplicationType type = generatorContext.getApplicationType(); - GdkGeneratorContext gdkGeneratorContext = (GdkGeneratorContext) generatorContext; - if (type == ApplicationType.FUNCTION && (gdkGeneratorContext.isPlatformIndependent() || gdkGeneratorContext.getCloud().equals(GdkCloud.OCI))) { - this.applyFunction(generatorContext, type); + if (type == FUNCTION && (generatorContext.isPlatformIndependent() || generatorContext.getCloud() == OCI)) { + applyFunction(generatorContext, type); Language language = generatorContext.getLanguage(); Project project = generatorContext.getProject(); String sourceFile = generatorContext.getSourcePath("/{packagePath}/Function"); switch (language) { case GROOVY: - generatorContext.addTemplate("function", new RockerTemplate(sourceFile, oracleRawFunctionGroovy.template(project))); + generatorContext.addTemplate("function", + new RockerTemplate(sourceFile, oracleRawFunctionGroovy.template(project))); break; case KOTLIN: - generatorContext.addTemplate("function", new RockerTemplate(sourceFile, oracleRawFunctionKotlin.template(project))); + generatorContext.addTemplate("function", + new RockerTemplate(sourceFile, oracleRawFunctionKotlin.template(project))); break; case JAVA: default: - generatorContext.addTemplate("function", new RockerTemplate(sourceFile, oracleRawFunctionJava.template(project))); + generatorContext.addTemplate("function", + new RockerTemplate(sourceFile, oracleRawFunctionJava.template(project))); } - if (generatorContext.getBuildTool() == BuildTool.MAVEN) { - this.addMicronautRuntimeBuildProperty(generatorContext); + if (generatorContext.getBuildTool() == MAVEN) { + addMicronautRuntimeBuildProperty(generatorContext); generatorContext.getBuildProperties().put("jib.docker.tag", "${project.version}"); generatorContext.getBuildProperties().put("exec.mainClass", "com.fnproject.fn.runtime.EntryPoint"); generatorContext.getBuildProperties().put("jib.docker.image", "[REGION].ocir.io/[TENANCY]/[REPO]/${project.artifactId}"); generatorContext.getBuildProperties().put("function.entrypoint", project.getPackageName() + ".Function::handleRequest"); } - this.applyTestTemplate(generatorContext, project, "Function"); + applyTestTemplate(generatorContext, project, "Function"); } - this.addDependencies(generatorContext); + addDependencies(generatorContext); } } diff --git a/gdk-core/src/main/java/cloud/graal/gdk/feature/replaced/template/maindocs.rocker.raw b/gdk-core/src/main/java/cloud/graal/gdk/feature/replaced/template/maindocs.rocker.raw index 0c7c234..0f0e664 100644 --- a/gdk-core/src/main/java/cloud/graal/gdk/feature/replaced/template/maindocs.rocker.raw +++ b/gdk-core/src/main/java/cloud/graal/gdk/feature/replaced/template/maindocs.rocker.raw @@ -1,16 +1,16 @@ @import io.micronaut.starter.util.VersionInfo @import java.util.List -## Micronaut 4.7.3 Documentation +## Micronaut @VersionInfo.getMicronautVersion() Documentation @if (VersionInfo.isMicronautSnapshot()) { - [User Guide](https://docs.micronaut.io/snapshot/guide/) - [API Reference](https://docs.micronaut.io/snapshot/api/) - [Configuration Reference](https://docs.micronaut.io/snapshot/guide/configurationreference.html) } else { -- [User Guide](https://docs.micronaut.io/4.7.3/guide/) -- [API Reference](https://docs.micronaut.io/4.7.3/api/) -- [Configuration Reference](https://docs.micronaut.io/4.7.3/guide/configurationreference.html) +- [User Guide](https://docs.micronaut.io/@VersionInfo.getMicronautVersion()/guide/) +- [API Reference](https://docs.micronaut.io/@VersionInfo.getMicronautVersion()/api/) +- [Configuration Reference](https://docs.micronaut.io/@VersionInfo.getMicronautVersion()/guide/configurationreference.html) } - [Micronaut Guides](https://guides.micronaut.io/) --- diff --git a/gdk-core/src/main/java/cloud/graal/gdk/feature/service/k8s/AbstractK8sFeature.java b/gdk-core/src/main/java/cloud/graal/gdk/feature/service/k8s/AbstractK8sFeature.java index f283b5a..d0b23a3 100644 --- a/gdk-core/src/main/java/cloud/graal/gdk/feature/service/k8s/AbstractK8sFeature.java +++ b/gdk-core/src/main/java/cloud/graal/gdk/feature/service/k8s/AbstractK8sFeature.java @@ -22,11 +22,10 @@ import io.micronaut.core.annotation.NonNull; import io.micronaut.starter.build.dependencies.Dependency; import io.micronaut.starter.feature.k8s.Kubernetes; -import io.micronaut.starter.feature.k8s.KubernetesClient; import io.micronaut.starter.feature.other.Management; import static cloud.graal.gdk.model.GdkService.K8S; -import static io.micronaut.starter.feature.k8s.KubernetesClient.MICRONAUT_KUBERNETES_GROUP_ID; +import static cloud.graal.gdk.feature.service.k8s.KubernetesClientOpenApi.MICRONAUT_KUBERNETES_GROUP_ID; /** * Base class for Kubernetes service features. @@ -37,18 +36,18 @@ public abstract class AbstractK8sFeature extends AbstractGdkServiceFeature { private static final Dependency DISCOVERY_CLIENT = Dependency.builder() .groupId(MICRONAUT_KUBERNETES_GROUP_ID) - .artifactId("micronaut-kubernetes-discovery-client") + .artifactId("micronaut-kubernetes-client-openapi-discovery") .compile() .build(); - private final KubernetesClient kubernetesClient; + private final KubernetesClientOpenApi kubernetesClient; private final Management management; private final Kubernetes kubernetes; /** * @param kubernetesClient KubernetesClient feature */ - protected AbstractK8sFeature(KubernetesClient kubernetesClient, + protected AbstractK8sFeature(KubernetesClientOpenApi kubernetesClient, Management management, Kubernetes kubernetes) { this.kubernetesClient = kubernetesClient; @@ -58,7 +57,7 @@ protected AbstractK8sFeature(KubernetesClient kubernetesClient, @Override public final void processSelectedFeatures(GdkFeatureContext featureContext) { - featureContext.addFeature(kubernetesClient, KubernetesClient.class); + featureContext.addFeature(kubernetesClient, KubernetesClientOpenApi.class); featureContext.addFeature(management, Management.class); featureContext.addFeature(kubernetes, Kubernetes.class); } diff --git a/gdk-core/src/main/java/cloud/graal/gdk/feature/service/k8s/AwsK8s.java b/gdk-core/src/main/java/cloud/graal/gdk/feature/service/k8s/AwsK8s.java index 9b5e7fe..42e7d96 100644 --- a/gdk-core/src/main/java/cloud/graal/gdk/feature/service/k8s/AwsK8s.java +++ b/gdk-core/src/main/java/cloud/graal/gdk/feature/service/k8s/AwsK8s.java @@ -18,7 +18,6 @@ import cloud.graal.gdk.model.GdkCloud; import io.micronaut.core.annotation.NonNull; import io.micronaut.starter.feature.k8s.Kubernetes; -import io.micronaut.starter.feature.k8s.KubernetesClient; import io.micronaut.starter.feature.other.Management; import jakarta.inject.Singleton; @@ -35,7 +34,7 @@ public class AwsK8s extends AbstractK8sFeature { /** * @param kubernetesClient KubernetesClient feature */ - public AwsK8s(KubernetesClient kubernetesClient, + public AwsK8s(KubernetesClientOpenApi kubernetesClient, Management management, Kubernetes kubernetes) { super(kubernetesClient, management, kubernetes); diff --git a/gdk-core/src/main/java/cloud/graal/gdk/feature/service/k8s/AzureK8s.java b/gdk-core/src/main/java/cloud/graal/gdk/feature/service/k8s/AzureK8s.java index 2bfed8e..e0d7da7 100644 --- a/gdk-core/src/main/java/cloud/graal/gdk/feature/service/k8s/AzureK8s.java +++ b/gdk-core/src/main/java/cloud/graal/gdk/feature/service/k8s/AzureK8s.java @@ -18,7 +18,6 @@ import cloud.graal.gdk.model.GdkCloud; import io.micronaut.core.annotation.NonNull; import io.micronaut.starter.feature.k8s.Kubernetes; -import io.micronaut.starter.feature.k8s.KubernetesClient; import io.micronaut.starter.feature.other.Management; import jakarta.inject.Singleton; @@ -35,7 +34,7 @@ public class AzureK8s extends AbstractK8sFeature { /** * @param kubernetesClient KubernetesClient feature */ - public AzureK8s(KubernetesClient kubernetesClient, + public AzureK8s(KubernetesClientOpenApi kubernetesClient, Management management, Kubernetes kubernetes) { super(kubernetesClient, management, kubernetes); diff --git a/gdk-core/src/main/java/cloud/graal/gdk/feature/service/k8s/DiscoveryKubernetesOpenApi.java b/gdk-core/src/main/java/cloud/graal/gdk/feature/service/k8s/DiscoveryKubernetesOpenApi.java new file mode 100644 index 0000000..90b351e --- /dev/null +++ b/gdk-core/src/main/java/cloud/graal/gdk/feature/service/k8s/DiscoveryKubernetesOpenApi.java @@ -0,0 +1,58 @@ +/* + * 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. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package cloud.graal.gdk.feature.service.k8s; + + +import io.micronaut.context.annotation.Replaces; +import io.micronaut.context.annotation.Requires; +import io.micronaut.core.annotation.NonNull; +import io.micronaut.starter.application.generator.GeneratorContext; +import io.micronaut.starter.build.dependencies.Dependency; +import io.micronaut.starter.feature.discovery.DiscoveryKubernetes; +import jakarta.inject.Singleton; + +@Requires( + property = "micronaut.starter.feature.discovery.kubernetes.enabled", + value = "true", + defaultValue = "true" +) +@Replaces(DiscoveryKubernetes.class) +@Singleton +public class DiscoveryKubernetesOpenApi extends DiscoveryKubernetes { + private static final Dependency DEPENDENCY_MICRONAUT_DISCOVERY_K8S = Dependency.builder().groupId("io.micronaut.kubernetes").artifactId("micronaut-kubernetes-client-openapi-discovery").compile().build(); + + public @NonNull String getName() { + return "discovery-kubernetes"; + } + + public String getTitle() { + return "Kubernetes Service Discovery"; + } + + public String getDescription() { + return "Adds support for Service Discovery with Kubernetes"; + } + + public void apply(GeneratorContext generatorContext) { + generatorContext.getBootstrapConfiguration().put("kubernetes.client.discovery.mode", "endpoint"); + generatorContext.getBootstrapConfiguration().put("kubernetes.client.discovery.mode-configuration.endpoint.watch.enabled", true); + generatorContext.addDependency(DEPENDENCY_MICRONAUT_DISCOVERY_K8S); + } + + public String getMicronautDocumentation() { + return "https://micronaut-projects.github.io/micronaut-kubernetes/latest/guide/#service-discovery"; + } +} diff --git a/gdk-core/src/main/java/cloud/graal/gdk/feature/service/k8s/GcpK8s.java b/gdk-core/src/main/java/cloud/graal/gdk/feature/service/k8s/GcpK8s.java index 3ec7827..0c4afb2 100644 --- a/gdk-core/src/main/java/cloud/graal/gdk/feature/service/k8s/GcpK8s.java +++ b/gdk-core/src/main/java/cloud/graal/gdk/feature/service/k8s/GcpK8s.java @@ -18,7 +18,6 @@ import cloud.graal.gdk.model.GdkCloud; import io.micronaut.core.annotation.NonNull; import io.micronaut.starter.feature.k8s.Kubernetes; -import io.micronaut.starter.feature.k8s.KubernetesClient; import io.micronaut.starter.feature.other.Management; import jakarta.inject.Singleton; @@ -35,7 +34,7 @@ public class GcpK8s extends AbstractK8sFeature { /** * @param kubernetesClient KubernetesClient feature */ - public GcpK8s(KubernetesClient kubernetesClient, + public GcpK8s(KubernetesClientOpenApi kubernetesClient, Management management, Kubernetes kubernetes) { super(kubernetesClient, management, kubernetes); diff --git a/gdk-core/src/main/java/cloud/graal/gdk/feature/service/k8s/KubernetesClientOpenApi.java b/gdk-core/src/main/java/cloud/graal/gdk/feature/service/k8s/KubernetesClientOpenApi.java new file mode 100644 index 0000000..39588a5 --- /dev/null +++ b/gdk-core/src/main/java/cloud/graal/gdk/feature/service/k8s/KubernetesClientOpenApi.java @@ -0,0 +1,74 @@ +/* + * 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. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package cloud.graal.gdk.feature.service.k8s; + +import io.micronaut.context.annotation.Replaces; +import io.micronaut.core.annotation.NonNull; +import io.micronaut.starter.application.ApplicationType; +import io.micronaut.starter.application.generator.GeneratorContext; +import io.micronaut.starter.build.dependencies.Dependency; +import io.micronaut.starter.build.dependencies.MicronautDependencyUtils; +import io.micronaut.starter.feature.discovery.DiscoveryCore; +import io.micronaut.starter.feature.k8s.KubernetesClient; +import io.micronaut.starter.options.BuildTool; +import io.micronaut.starter.options.Language; +import jakarta.inject.Singleton; + +@Replaces(KubernetesClient.class) +@Singleton +public class KubernetesClientOpenApi extends KubernetesClient { + public static final String MICRONAUT_KUBERNETES_GROUP_ID = "io.micronaut.kubernetes"; + + public boolean supports(ApplicationType applicationType) { + return true; + } + + public @NonNull String getName() { + return "kubernetes-client-openapi"; + } + + public String getTitle() { + return "The Micronaut Kubernetes Client OpenApi"; + } + + public String getDescription() { + return "The Micronaut Kubernetes Client OpenApi is a kubernetes client which uses Micronaut Netty HTTP Client and generated apis and modules from the OpenApi"; + } + + public String getCategory() { + return "Client"; + } + + public String getMicronautDocumentation() { + return "https://micronaut-projects.github.io/micronaut-kubernetes/latest/guide/#kubernetes-client-openapi"; + } + + public String getThirdPartyDocumentation() { + return null; + } + + public void apply(GeneratorContext generatorContext) { + generatorContext.addDependency(Dependency.builder().groupId("io.micronaut.kubernetes").artifactId("micronaut-kubernetes-client-openapi").compile()); + fixupDependencies(generatorContext); + } + + static void fixupDependencies(GeneratorContext generatorContext) { + if (!generatorContext.hasFeature(DiscoveryCore.class) && generatorContext.getBuildTool() == BuildTool.MAVEN && generatorContext.getLanguage() == Language.GROOVY) { + generatorContext.addDependency(MicronautDependencyUtils.coreDependency().artifactId("micronaut-discovery-core").compileOnly()); + } + + } +} diff --git a/gdk-core/src/main/java/cloud/graal/gdk/feature/service/k8s/NonCloudK8s.java b/gdk-core/src/main/java/cloud/graal/gdk/feature/service/k8s/NonCloudK8s.java index c623a2a..f9f097f 100644 --- a/gdk-core/src/main/java/cloud/graal/gdk/feature/service/k8s/NonCloudK8s.java +++ b/gdk-core/src/main/java/cloud/graal/gdk/feature/service/k8s/NonCloudK8s.java @@ -18,7 +18,6 @@ import cloud.graal.gdk.model.GdkCloud; import io.micronaut.core.annotation.NonNull; import io.micronaut.starter.feature.k8s.Kubernetes; -import io.micronaut.starter.feature.k8s.KubernetesClient; import io.micronaut.starter.feature.other.Management; import jakarta.inject.Singleton; @@ -35,7 +34,7 @@ public class NonCloudK8s extends AbstractK8sFeature { /** * @param kubernetesClient KubernetesClient feature */ - public NonCloudK8s(KubernetesClient kubernetesClient, + public NonCloudK8s(KubernetesClientOpenApi kubernetesClient, Management management, Kubernetes kubernetes) { super(kubernetesClient, management, kubernetes); diff --git a/gdk-core/src/main/java/cloud/graal/gdk/feature/service/k8s/OciK8s.java b/gdk-core/src/main/java/cloud/graal/gdk/feature/service/k8s/OciK8s.java index 7e035a6..41c1759 100644 --- a/gdk-core/src/main/java/cloud/graal/gdk/feature/service/k8s/OciK8s.java +++ b/gdk-core/src/main/java/cloud/graal/gdk/feature/service/k8s/OciK8s.java @@ -18,7 +18,6 @@ import cloud.graal.gdk.model.GdkCloud; import io.micronaut.core.annotation.NonNull; import io.micronaut.starter.feature.k8s.Kubernetes; -import io.micronaut.starter.feature.k8s.KubernetesClient; import io.micronaut.starter.feature.other.Management; import jakarta.inject.Singleton; @@ -35,7 +34,7 @@ public class OciK8s extends AbstractK8sFeature { /** * @param kubernetesClient KubernetesClient feature */ - public OciK8s(KubernetesClient kubernetesClient, + public OciK8s(KubernetesClientOpenApi kubernetesClient, Management management, Kubernetes kubernetes) { super(kubernetesClient, management, kubernetes); diff --git a/gdk-core/src/main/java/cloud/graal/gdk/feature/service/tracing/AzureTracing.java b/gdk-core/src/main/java/cloud/graal/gdk/feature/service/tracing/AzureTracing.java index cf51830..5919679 100644 --- a/gdk-core/src/main/java/cloud/graal/gdk/feature/service/tracing/AzureTracing.java +++ b/gdk-core/src/main/java/cloud/graal/gdk/feature/service/tracing/AzureTracing.java @@ -16,38 +16,56 @@ package cloud.graal.gdk.feature.service.tracing; import cloud.graal.gdk.GdkGeneratorContext; -import cloud.graal.gdk.feature.service.AbstractGdkServiceFeature; +import cloud.graal.gdk.feature.GdkFeatureContext; import cloud.graal.gdk.model.GdkCloud; -import cloud.graal.gdk.model.GdkService; import io.micronaut.core.annotation.NonNull; +import io.micronaut.starter.feature.opentelemetry.OpenTelemetry; +import io.micronaut.starter.feature.opentelemetry.OpenTelemetryAnnotations; +import io.micronaut.starter.feature.opentelemetry.OpenTelemetryHttp; +import io.micronaut.starter.feature.other.HttpClient; import jakarta.inject.Singleton; import static cloud.graal.gdk.model.GdkCloud.AZURE; -import static cloud.graal.gdk.model.GdkService.TRACING; /** * Azure tracing service feature. * - * @since 1.0.0 + * @since 4.9 */ @Singleton -public class AzureTracing extends AbstractGdkServiceFeature { +public class AzureTracing extends AbstractTracingFeature { + + private final io.micronaut.starter.feature.azure.AzureTracing azureTracing; + + /** + * @param openTelemetry OpenTelemetry feature + * @param openTelemetryHttp OpenTelemetryHttp feature + * @param openTelemetryAnnotations OpenTelemetryAnnotations feature + */ + public AzureTracing(OpenTelemetry openTelemetry, + OpenTelemetryHttp openTelemetryHttp, + OpenTelemetryAnnotations openTelemetryAnnotations, + HttpClient httpClient, + io.micronaut.starter.feature.azure.AzureTracing azureTracing) { + super(openTelemetry, openTelemetryHttp, openTelemetryAnnotations, httpClient); + this.azureTracing = azureTracing; + } @Override - public void apply(GdkGeneratorContext generatorContext) { - // TODO + public void processSelectedFeatures(GdkFeatureContext featureContext) { + super.processSelectedFeatures(featureContext); + featureContext.addFeature(azureTracing, io.micronaut.starter.feature.azure.AzureTracing.class); } - @NonNull @Override - public GdkCloud getCloud() { - return AZURE; + protected void doApply(GdkGeneratorContext generatorContext) { + addAzureNativeImageProperties(generatorContext); } @NonNull @Override - public GdkService getService() { - return TRACING; + public GdkCloud getCloud() { + return AZURE; } @NonNull diff --git a/gdk-core/src/main/java/cloud/graal/gdk/feature/service/tracing/GcpTracing.java b/gdk-core/src/main/java/cloud/graal/gdk/feature/service/tracing/GcpTracing.java index ee9555f..e35020f 100644 --- a/gdk-core/src/main/java/cloud/graal/gdk/feature/service/tracing/GcpTracing.java +++ b/gdk-core/src/main/java/cloud/graal/gdk/feature/service/tracing/GcpTracing.java @@ -38,7 +38,7 @@ public class GcpTracing extends AbstractTracingFeature { private static final Dependency OPENTELEMETRY_SEMCONV = Dependency.builder() - .groupId("io.opentelemetry") + .groupId("io.opentelemetry.semconv") .artifactId("opentelemetry-semconv") .compile() .build(); diff --git a/gradle.properties b/gradle.properties index 167ae0f..41f86d9 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,5 @@ org.gradle.parallel=true org.gradle.caching=true -version=4.7.3.5 +projectGroup=cloud.graal.gdk +version=4.9.1.1 +org.gradle.daemon=false \ No newline at end of file diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 51b164e..6d21e74 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -15,64 +15,37 @@ # [versions] -bouncycastle = '1.79' -docker = '3.4.1' -groovy = '4.0.24' # TODO keep in sync when changing Micronaut version -jansi = '2.4.1' -jline = '3.28.0' -logback = '1.5.15' -micronaut-plugins = '4.4.4' -micronaut-starter = '4.7.4' -netty = "4.1.118.Final" +bouncycastle = '1.81' +gcp = '26.10.0' +jansi = '2.4.2' +jline = '3.30.4' +jsch = '0.2.26' +micronaut-plugins = '4.5.4' +micronaut-starter = '4.9.1' reflections = '0.10.2' rocker = '1.4.0' -shadow = '8.1.1' -slf4j = '2.0.16' +shadow = '8.3.7' spotless = '6.25.0' test-logger = '4.0.0' tomlj = '1.1.1' -micronaut-internal-build = '7.3.0' -micronaut-guides = '0.0.11' -micronaut-serde = '2.13.1' -micronaut-json = '1.4.0' +micronaut-internal-build = '7.5.0' +micronaut-guides = '0.1.0' [libraries] bouncycastle-bcpkix = { module = 'org.bouncycastle:bcpkix-jdk18on', version.ref = 'bouncycastle' } bouncycastle-bcprov = { module = 'org.bouncycastle:bcprov-jdk18on', version.ref = 'bouncycastle' } -docker = { module = 'com.github.docker-java:docker-java-core', version.ref = 'docker' } -docker-transport = { module = 'com.github.docker-java:docker-java-transport-zerodep', version.ref = 'docker' } -groovy-ant = { module = 'org.apache.groovy:groovy-ant', version.ref = 'groovy' } -groovy-json = { module = 'org.apache.groovy:groovy-json', version.ref = 'groovy' } -groovy-xml = { module = 'org.apache.groovy:groovy-xml', version.ref = 'groovy' } jansi = { module = 'org.fusesource.jansi:jansi', version.ref = 'jansi' } jline = { module = 'org.jline:jline', version.ref = 'jline' } -jul-slf4j = { module = 'org.slf4j:jul-to-slf4j', version.ref = 'slf4j' } -logback-classic = { module = 'ch.qos.logback:logback-classic', version.ref = 'logback' } +jsch = { module = 'com.github.mwiede:jsch', version.ref = 'jsch' } micronaut-application = { module = 'io.micronaut.gradle:micronaut-gradle-plugin', version.ref = 'micronaut-plugins' } micronaut-library = { module = 'io.micronaut.gradle:micronaut-gradle-plugin', version.ref = 'micronaut-plugins' } micronaut-starter-api = { module = 'io.micronaut.starter:micronaut-starter-api', version.ref = 'micronaut-starter' } micronaut-starter-cli = { module = 'io.micronaut.starter:micronaut-cli', version.ref = 'micronaut-starter' } -netty-buffer = { module = "io.netty:netty-buffer", version.ref = "netty" } -netty-codec = { module = "io.netty:netty-codec", version.ref = "netty" } -netty-codec-http = { module = "io.netty:netty-codec-http", version.ref = "netty" } -netty-codec-http2 = { module = "io.netty:netty-codec-http2", version.ref = "netty" } -netty-codec-socks = { module = "io.netty:netty-codec-socks", version.ref = "netty" } -netty-common = { module = "io.netty:netty-common", version.ref = "netty" } -netty-handler = { module = "io.netty:netty-handler", version.ref = "netty" } -netty-handler-proxy = { module = "io.netty:netty-handler-proxy", version.ref = "netty" } -netty-resolver = { module = "io.netty:netty-resolver", version.ref = "netty" } -netty-transport = { module = "io.netty:netty-transport", version.ref = "netty" } -netty-transport-native-unix-common = { module = "io.netty:netty-transport-native-unix-common", version.ref = "netty" } reflections = { module = 'org.reflections:reflections', version.ref = 'reflections' } rocker = { module = 'com.fizzed:rocker-compiler', version.ref = 'rocker' } -shadow = { module = 'com.github.johnrengelman:shadow', version.ref = 'shadow' } -slf4j-nop = { module = 'org.slf4j:slf4j-nop', version.ref = 'slf4j' } +shadow = { module = 'com.gradleup.shadow:com.gradleup.shadow.gradle.plugin', version.ref = 'shadow' } spotless = { module = 'com.diffplug.spotless:spotless-plugin-gradle', version.ref = 'spotless' } test-logger = { module = 'com.adarshr:gradle-test-logger-plugin', version.ref = 'test-logger' } tomlj = { module = 'org.tomlj:tomlj', version.ref = 'tomlj' } micronaut-guides = { module = 'io.micronaut.guides:micronaut-guides', version.ref = 'micronaut-guides' } -micronaut-serde-processor = { module = 'io.micronaut.serde:micronaut-serde-processor', version.ref = 'micronaut-serde' } -micronaut-serde-jackson = { module = 'io.micronaut.serde:micronaut-serde-jackson', version.ref = 'micronaut-serde' } -micronaut-json-processor = { module = 'io.micronaut.jsonschema:micronaut-json-schema-processor', version.ref = 'micronaut-json' } -micronaut-json-annotations = { module = 'io.micronaut.jsonschema:micronaut-json-schema-annotations', version.ref = 'micronaut-json' } micronaut-internal-build-bom = { module = 'io.micronaut.build.internal.bom:io.micronaut.build.internal.bom.gradle.plugin', version.ref = 'micronaut-internal-build' } diff --git a/gradle/templates.versions.toml b/gradle/templates.versions.toml index 564bc32..1209485 100644 --- a/gradle/templates.versions.toml +++ b/gradle/templates.versions.toml @@ -15,122 +15,106 @@ # [versions] -apache-commons-commons-collections4 = '4.4-oracle-00001' -apache-commons-commons-lang3 = '3.13.0-oracle-00001' -apache-commons-compress = "1.27.1-oracle-00001" -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.6-oracle-00001' -bouncycastle = "1.79" -ch-randelshofer-fastdoubleparser = '1.0.0-oracle-00001' -code-findbugs-jsr305 = '3.0.2-oracle-00001' -code-gson-gson = '2.10.1-oracle-00001' -com-nimbusds-nimbus-jose-jwt = '9.41.2-oracle-00001' -com-zaxxer-HikariCP = '5.1.0-oracle-00001' -commons-codec-commons-codec = '1.16.0-oracle-00001' +apache-kafka-kafka-clients = '3.9.1-oracle-00001' +asm = '9.8-oracle-00001' +aws-msk-iam-auth = "2.3.2" +tracing-exporter-auto = '0.36.0-alpha' +com-nimbusds-nimbus-jose-jwt = '10.3-oracle-00001' +com-zaxxer-HikariCP = '6.3.0-oracle-00001' commons-io-commons-io = '2.14.0-oracle-00002' -context-propagation = '1.1.2-oracle-00001' -dev-jna-jna = '5.14.0-oracle-00001' -eclipse-angus-angus-activation = '2.0.2-oracle-00001' +context-propagation = '1.1.3-oracle-00001' +dev-jna-jna = '5.17.0' +eclipse-angus-angus-activation = '2.0.0-oracle-00001' eclipse-angus-angus-mail = '2.0.3-oracle-00001' -flipkart-zjsonpatch-zjsonpatch = '0.4.14-oracle-00002' -gax = "2.59.0" -gax-grpc = "2.59.0" -gg-jte = '3.1.16-oracle-00001' -github-javaparser = '3.26.3-oracle-00001' +fn = "1.0.209-oracle-00001" +gax = "2.67.1" +gax-grpc = "2.67.1" +gg-jte = '3.2.1-oracle-00001' +github-javaparser = '3.26.4-oracle-00001' 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.0-oracle-00001' -graalvm-metadata-version = "0.3.15" -guava = "33.4.0-jre" -intellij-deps-trove4j = '1.0.20200330-oracle-00001' -io-gsonfire-gson-fire = '1.8.5-oracle-00001' -io-kubernetes = '19.0.1-oracle-00003' -io-micrometer = '1.13.6-oracle-00001' -io-opentelemetry = '1.43.0-oracle-00001' -io-opentelemetry-opentelemetry-api-events = '1.36.0-alpha-oracle-00001' -io-opentelemetry-opentelemetry-api-incubator = '1.40.0-alpha-oracle-00001' -io-projectreactor = '3.6.6-oracle-00002' -io-projectreactor-reactor-core = '3.6.10-oracle-00001' -io-projectreactor-reactor-core-micrometer = '1.1.6-oracle-00002' -io-prometheus = '0.16.0-oracle-00001' +google-auth-library = "1.37.0" +google-cloud-logging = "0.132.4-alpha" +graalvm-metadata-version = "0.3.22" +guava = "33.4.8-jre" +httpcore = "4.4.14-oracle-00001" +io-micrometer = '1.15.0-oracle-00001' +io-opentelemetry = '1.51.0-oracle-00001' +io-opentelemetry-opentelemetry-api-incubator = '1.51.0-alpha-oracle-00001' +io-projectreactor = '3.7.7-oracle-00001' +io-projectreactor-reactor-core = '3.7.7-oracle-00001' +io-projectreactor-reactor-core-micrometer = '1.2.7-oracle-00001' io-spring-gradle-dependency-management-plugin = "1.1.7" -io-swagger-swagger-annotations = '1.6.11-oracle-00001' -io-vavr = '0.10.2-oracle-00001' -jackson-core = '2.17.2-oracle-00001' -jackson-dataformat-jackson-dataformat-toml = '2.17.2-oracle-00001' -jackson-datatype = '2.17.2-oracle-00001' +io-vavr = '0.10.4-oracle-00001' +jackson-core = '2.19.1-oracle-00001' +jackson-dataformat-jackson-dataformat-toml = '2.19.1-oracle-00001' +jackson-datatype = '2.19.1-oracle-00001' jakarta-activation-jakarta-activation-api = '2.1.3-oracle-00001' jakarta-annotation-jakarta-annotation-api = '2.1.1-oracle-00001' jakarta-inject-jakarta-inject-api = '2.0.1-oracle-00001' jakarta-mail-jakarta-mail-api = '2.1.3-oracle-00001' -jakarta-persistence-jakarta-persistence-api = '3.1.0-oracle-00001' +jakarta-persistence-jakarta-persistence-api = '3.2.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' +jakarta-validation-jakarta-validation-api = '3.1.1-oracle-00001' json-smart = "2.5.2" kotlin = "1.8.22-oracle-00001" -logback = "1.5.15-oracle-00001" +logback = "1.5.18-oracle-00001" logback-contrib = '0.1.5-oracle-00001' -micronaut-cache = "5.1.0-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" -micronaut-flyway = "7.6.1-oracle-00001" -micronaut-gradle-plugin = "4.4.4" -micronaut-jaxrs = "4.7.2-oracle-00001" -micronaut-kafka = "5.7.0-oracle-00001" -micronaut-kubernetes = "6.2.1-oracle-00001" -micronaut-liquibase = "6.6.1-oracle-00001" -micronaut-maven-plugin = "4.7.1" -micronaut-maven-test-resources-plugin = "2.7.0" -micronaut-micrometer = "5.9.3-oracle-00001" -micronaut-mongo = "5.5.0-oracle-00001" -micronaut-object-storage = "2.7.0-oracle-00001" -micronaut-openapi = "6.13.2-oracle-00001" -micronaut-oracle-cloud = "4.3.8-oracle-00002" -micronaut-picocli = "5.6.0-oracle-00001" -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" -micronaut-validation = "4.8.0-oracle-00001" -micronaut-views = "5.6.0-oracle-00001" -micronaut-coherence = "5.0.5-oracle-00001" -netty = "4.1.118.Final-oracle-00001" +micronaut-cache = "5.3.0-oracle-00001" +micronaut-core = "4.9.7-oracle-00001" +micronaut-data = "4.13.3-oracle-00001" +micronaut-discovery = "4.7.1-oracle-00001" +micronaut-email = "2.9.0-oracle-00001" +micronaut-flyway = "7.8.0-oracle-00001" +micronaut-gradle-plugin = "4.5.4" +micronaut-jaxrs = "4.9.1-oracle-00001" +micronaut-kafka = "5.9.0-oracle-00001" +micronaut-kubernetes = "7.1.0-oracle-00001" +micronaut-liquibase = "6.8.0-oracle-00001" +micronaut-maven-plugin = "4.9.0" +micronaut-maven-test-resources-plugin = "2.9.0" +micronaut-micrometer = "5.12.0-oracle-00001" +micronaut-mongo = "5.7.0-oracle-00001" +micronaut-object-storage = "2.9.0-oracle-00001" +micronaut-openapi = "6.17.3-oracle-00001" +micronaut-oracle-cloud = "5.2.1-oracle-00001" +micronaut-picocli = "5.8.0-oracle-00001" +micronaut-platform = "4.9.1-oracle-00001" +micronaut-reactor = "3.8.0-oracle-00001" +micronaut-security = "4.13.0-oracle-00001" +micronaut-serde = "2.15.0-oracle-00001" +micronaut-servlet = "5.4.0-oracle-00001" +micronaut-session = "4.7.0-oracle-00001" +micronaut-sourcegen = "1.8.2-oracle-00001" +micronaut-sql = "6.2.1-oracle-00001" +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" okhttp = "4.12.0-oracle-00001" -opentelemetry-instrumentation = '1.33.6-oracle-00001' -opentelemetry-instrumentation-opentelemetry-instrumentation-api-semconv = '1.33.5-alpha-oracle-00001' -opentelemetry-semconv = "1.30.1-alpha" -opentelemetry-semconv-opentelemetry-semconv = '1.23.1-alpha-oracle-00001' -org-checkerframework-checker-qual = '3.37.0-oracle-00002' +opentelemetry-api-incubator = "2.16.0-alpha-oracle-00001" +opentelemetry-instrumentation = '2.16.0-oracle-00001' +opentelemetry-semconv = "1.34.0-oracle-00001" +opentelemetry-semconv-opentelemetry-semconv = '1.34.0-oracle-00001' org-flywaydb = '10.22.0-oracle-00001' -org-hdrhistogram-HdrHistogram = '2.2.2-oracle-00001' -org-jetbrains-annotations = '13.0-oracle-00001' +org-hdrhistogram-HdrHistogram = '2.1.12-oracle-00001' +org-jetbrains-annotations = '23.1.0-oracle-00001' org-latencyutils-LatencyUtils = '2.0.3-oracle-00001' org-lz4-lz4-java = '1.8.0-oracle-00001' org-reactivestreams-reactive-streams = '1.0.4-oracle-00001' -org-slf4j-jcl-over-slf4j = '2.0.16-oracle-00001' -org-slf4j-slf4j-api = '2.0.16-oracle-00001' -org-springframework-boot-spring-boot-starter-parent = "3.4.0" -protobuf = "3.25.5-oracle-00001" -snakeyaml = '2.2-oracle-00002' -spring-boot-gradle-plugin = "3.4.0" -squareup-okio = '3.6.0-oracle-00001' -test-containers-oracle-xe = "1.20.4" -xerial-snappy-snappy-java = '1.1.10.5-oracle-00001' -zipkin-reporter2 = '3.4.2-oracle-00001' +org-springframework-boot-spring-boot-starter-parent = "3.5.3" +protobuf = "4.29.0-oracle-00001" +reactor-netty-http = "1.2.8" +slf4j = '2.0.17-oracle-00001' +snakeyaml = '2.4-oracle-00001' +spring-boot-gradle-plugin = "3.5.3" +squareup-okio = '3.9.1-oracle-00001' +test-containers-oracle-xe = "1.21.3" +typetools = "0.6.3-oracle-00001" +xerial-snappy-snappy-java = "1.1.10.5" #'1.1.10.7' +zipkin-reporter2 = '3.5.1-oracle-00001' zipkin-zipkin2-zipkin = '2.27.1-oracle-00001' -zstd-jni = '1.5.6-3-reduced-oracle-00001' +zstd-jni = "1.5.6-4-reduced-oracle-00001" #'1.5.7-3' [libraries] ch-qos-logback-logback-classic = { module = 'ch.qos.logback:logback-classic', version.ref = 'logback'} @@ -143,6 +127,7 @@ com-google-cloud-google-cloud-logging-logback = { module = 'com.google.cloud:goo com-google-guava-guava = { module = 'com.google.guava:guava', version.ref = 'guava'} com-google-protobuf-protobuf-java = { module = 'com.google.protobuf:protobuf-java', version.ref = 'protobuf'} com-google-protobuf-protobuf-java-util = { module = 'com.google.protobuf:protobuf-java-util', version.ref = 'protobuf'} +com-google-cloud-opentelemetry-exporter-auto = { module = 'com.google.cloud.opentelemetry:exporter-auto', version.ref = 'tracing-exporter-auto'} com-squareup-okhttp3-logging-interceptor = { module = 'com.squareup.okhttp3:logging-interceptor', version.ref = 'okhttp'} com-squareup-okhttp3-okhttp = { module = 'com.squareup.okhttp3:okhttp', version.ref = 'okhttp'} io-micronaut-cache-micronaut-cache-core = { module = 'io.micronaut.cache:micronaut-cache-core', version.ref = 'micronaut-cache'} @@ -206,6 +191,8 @@ io-micronaut-reactor-micronaut-reactor-bom = { module = 'io.micronaut.reactor:mi 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-sourcegen-micronaut-sourcegen-bytecode-writer = { module = 'io.micronaut.sourcegen:micronaut-sourcegen-bytecode-writer', version.ref = 'micronaut-sourcegen'} +io-micronaut-sourcegen-micronaut-sourcegen-model = { module = 'io.micronaut.sourcegen:micronaut-sourcegen-model', version.ref = 'micronaut-sourcegen'} 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'} @@ -214,15 +201,10 @@ 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-micronaut-coherence-micronaut-coherence-bom = { module = 'io.micronaut.coherence:micronaut-coherence-bom', version.ref = 'micronaut-coherence'} -io-opentelemetry-opentelemetry-semconv = { module = 'io.opentelemetry:opentelemetry-semconv', version.ref = 'opentelemetry-semconv'} +io-opentelemetry-semconv-opentelemetry-semconv = { module = 'io.opentelemetry.semconv:opentelemetry-semconv', version.ref = 'opentelemetry-semconv'} +io-projectreactor-netty-reactor-netty-http = { module = 'io.projectreactor.netty:reactor-netty-http', version.ref = 'reactor-netty-http'} +net-jodah-typetools = { module = 'net.jodah:typetools', version.ref = 'typetools'} 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'} -org-bouncycastle-bcprov-jdk15to18 = { module = 'org.bouncycastle:bcprov-jdk15to18', version.ref = 'bouncycastle'} -org-bouncycastle-bcprov-jdk18on = { module = 'org.bouncycastle:bcprov-jdk18on', version.ref = 'bouncycastle'} -org-bouncycastle-bcutil-jdk15to18 = { module = 'org.bouncycastle:bcutil-jdk15to18', version.ref = 'bouncycastle'} -org-bouncycastle-bcutil-jdk18on = { module = 'org.bouncycastle:bcutil-jdk18on', version.ref = 'bouncycastle'} org-jetbrains-kotlin-kotlin-annotation-processing-embeddable = { module = 'org.jetbrains.kotlin:kotlin-annotation-processing-embeddable', version.ref = 'kotlin'} org-jetbrains-kotlin-kotlin-compiler-embeddable = { module = 'org.jetbrains.kotlin:kotlin-compiler-embeddable', version.ref = 'kotlin'} org-jetbrains-kotlin-kotlin-reflect = { module = 'org.jetbrains.kotlin:kotlin-reflect', version.ref = 'kotlin'} @@ -247,27 +229,21 @@ exclude-org-testcontainers-oracle-xe = { module = 'org.testcontainers:oracle-xe' # New Added libs ch-qos-logback-contrib-logback-json-classic = { module = 'ch.qos.logback.contrib:logback-json-classic', version.ref = 'logback-contrib' } ch-qos-logback-contrib-logback-json-core = { module = 'ch.qos.logback.contrib:logback-json-core', version.ref = 'logback-contrib' } -ch-randelshofer-fastdoubleparser = { module = 'ch.randelshofer:fastdoubleparser', version.ref = 'ch-randelshofer-fastdoubleparser' } com-fasterxml-jackson-core-jackson-annotations = { module = 'com.fasterxml.jackson.core:jackson-annotations', version.ref = 'jackson-core' } com-fasterxml-jackson-core-jackson-core = { module = 'com.fasterxml.jackson.core:jackson-core', version.ref = 'jackson-core' } com-fasterxml-jackson-core-jackson-databind = { module = 'com.fasterxml.jackson.core:jackson-databind', version.ref = 'jackson-core' } com-fasterxml-jackson-dataformat-jackson-dataformat-toml = { module = 'com.fasterxml.jackson.dataformat:jackson-dataformat-toml', version.ref = 'jackson-dataformat-jackson-dataformat-toml' } com-fasterxml-jackson-datatype-jackson-datatype-jdk8 = { module = 'com.fasterxml.jackson.datatype:jackson-datatype-jdk8', version.ref = 'jackson-datatype' } com-fasterxml-jackson-datatype-jackson-datatype-jsr310 = { module = 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310', version.ref = 'jackson-datatype' } -com-flipkart-zjsonpatch-zjsonpatch = { module = 'com.flipkart.zjsonpatch:zjsonpatch', version.ref = 'flipkart-zjsonpatch-zjsonpatch' } -com-github-ben-manes-caffeine-caffeine = { module = 'com.github.ben-manes.caffeine:caffeine', version.ref = 'ben-manes-caffeine-caffeine' } +com-fnproject-fn-api = { module = 'com.fnproject.fn:api', version.ref = 'fn' } +com-fnproject-fn-runtime = { module = 'com.fnproject.fn:runtime', version.ref = 'fn' } com-github-javaparser-javaparser-core = { module = 'com.github.javaparser:javaparser-core', version.ref = 'github-javaparser' } com-github-javaparser-javaparser-symbol-solver-core = { module = 'com.github.javaparser:javaparser-symbol-solver-core', version.ref = 'github-javaparser' } com-github-luben-zstd-jni={module = 'com.github.luben:zstd-jni', version.ref = 'zstd-jni' } -com-github-vladimir-bukhtoyarov-bucket4j-core = { module = 'com.github.vladimir-bukhtoyarov:bucket4j-core', version.ref = 'github-vladimir-bukhtoyarov-bucket4j-core' } -com-google-code-findbugs-jsr305 = { module = 'com.google.code.findbugs:jsr305', version.ref = 'code-findbugs-jsr305' } -com-google-code-gson-gson = { module = 'com.google.code.gson:gson', version.ref = 'code-gson-gson' } -com-google-errorprone-error_prone_annotations = { module = 'com.google.errorprone:error_prone_annotations', version.ref = 'google-errorprone-error_prone_annotations' } com-nimbusds-nimbus-jose-jwt = { module = 'com.nimbusds:nimbus-jose-jwt', version.ref = 'com-nimbusds-nimbus-jose-jwt' } com-squareup-okio-okio = { module = 'com.squareup.okio:okio', version.ref = 'squareup-okio' } com-squareup-okio-okio-jvm = { module = 'com.squareup.okio:okio-jvm', version.ref = 'squareup-okio' } com-zaxxer-HikariCP = { module = 'com.zaxxer:HikariCP', version.ref = 'com-zaxxer-HikariCP' } -commons-codec-commons-codec = { module = 'commons-codec:commons-codec', version.ref = 'commons-codec-commons-codec' } commons-io-commons-io = { module = 'commons-io:commons-io', version.ref = 'commons-io-commons-io' } gg-jte-jte = { module = 'gg.jte:jte', version.ref = 'gg-jte' } gg-jte-jte-extension-api = { module = 'gg.jte:jte-extension-api', version.ref = 'gg-jte' } @@ -275,12 +251,6 @@ gg-jte-jte-kotlin = { module = 'gg.jte:jte-kotlin', version.ref = 'gg-jte' } gg-jte-jte-runtime = { module = 'gg.jte:jte-runtime', version.ref = 'gg-jte' } io-github-resilience4j-resilience4j-circuitbreaker = { module = 'io.github.resilience4j:resilience4j-circuitbreaker', version.ref = 'github-resilience4j' } io-github-resilience4j-resilience4j-core = { module = 'io.github.resilience4j:resilience4j-core', version.ref = 'github-resilience4j' } -io-gsonfire-gson-fire = { module = 'io.gsonfire:gson-fire', version.ref = 'io-gsonfire-gson-fire' } -io-kubernetes-client-java = { module = 'io.kubernetes:client-java', version.ref = 'io-kubernetes' } -io-kubernetes-client-java-api = { module = 'io.kubernetes:client-java-api', version.ref = 'io-kubernetes' } -io-kubernetes-client-java-api-fluent = { module = 'io.kubernetes:client-java-api-fluent', version.ref = 'io-kubernetes' } -io-kubernetes-client-java-extended = { module = 'io.kubernetes:client-java-extended', version.ref = 'io-kubernetes' } -io-kubernetes-client-java-proto = { module = 'io.kubernetes:client-java-proto', version.ref = 'io-kubernetes' } io-micrometer-context-propagation = { module = 'io.micrometer:context-propagation', version.ref = 'context-propagation' } io-micrometer-micrometer-commons = { module = 'io.micrometer:micrometer-commons', version.ref = 'io-micrometer' } io-micrometer-micrometer-core = { module = 'io.micrometer:micrometer-core', version.ref = 'io-micrometer' } @@ -288,6 +258,8 @@ io-micrometer-micrometer-observation = { module = 'io.micrometer:micrometer-obse io-netty-netty-bom = { module = "io.netty:netty-bom", version.ref = "netty" } io-netty-netty-buffer = { module = "io.netty:netty-buffer", version.ref = "netty" } io-netty-netty-codec = { module = "io.netty:netty-codec", version.ref = "netty" } +io-netty-netty-codec-base = { module = "io.netty:netty-codec-base", version.ref = "netty" } +io-netty-netty-codec-compression = { module = "io.netty:netty-codec-compression", version.ref = "netty" } io-netty-netty-codec-http = { module = "io.netty:netty-codec-http", version.ref = "netty" } io-netty-netty-codec-http2 = { module = "io.netty:netty-codec-http2", version.ref = "netty" } io-netty-netty-codec-socks = { module = "io.netty:netty-codec-socks", version.ref = "netty" } @@ -298,10 +270,10 @@ io-netty-netty-resolver = { module = "io.netty:netty-resolver", version.ref = "n io-netty-netty-transport= { module = "io.netty:netty-transport", version.ref = "netty" } io-netty-netty-transport-native-unix-common = { module = "io.netty:netty-transport-native-unix-common", version.ref = "netty" } io-opentelemetry-instrumentation-opentelemetry-instrumentation-annotations = { module = 'io.opentelemetry.instrumentation:opentelemetry-instrumentation-annotations', version.ref = 'opentelemetry-instrumentation' } +io-opentelemetry-instrumentation-opentelemetry-instrumentation-api-incubator = { module = 'io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-incubator', version.ref = 'opentelemetry-api-incubator' } io-opentelemetry-instrumentation-opentelemetry-instrumentation-api = { module = 'io.opentelemetry.instrumentation:opentelemetry-instrumentation-api', version.ref = 'opentelemetry-instrumentation' } -io-opentelemetry-instrumentation-opentelemetry-instrumentation-api-semconv = { module = 'io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-semconv', version.ref = 'opentelemetry-instrumentation-opentelemetry-instrumentation-api-semconv' } +# io-opentelemetry-instrumentation-opentelemetry-instrumentation-api-semconv = { module = 'io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-semconv', version.ref = 'opentelemetry-instrumentation-opentelemetry-instrumentation-api-semconv' } io-opentelemetry-opentelemetry-api = { module = 'io.opentelemetry:opentelemetry-api', version.ref = 'io-opentelemetry' } -io-opentelemetry-opentelemetry-api-events = { module = 'io.opentelemetry:opentelemetry-api-events', version.ref = 'io-opentelemetry-opentelemetry-api-events' } io-opentelemetry-opentelemetry-api-incubator = { module = 'io.opentelemetry:opentelemetry-api-incubator', version.ref = 'io-opentelemetry-opentelemetry-api-incubator' } io-opentelemetry-opentelemetry-context = { module = 'io.opentelemetry:opentelemetry-context', version.ref = 'io-opentelemetry' } io-opentelemetry-opentelemetry-exporter-common = { module = 'io.opentelemetry:opentelemetry-exporter-common', version.ref = 'io-opentelemetry' } @@ -313,18 +285,11 @@ io-opentelemetry-opentelemetry-sdk-extension-autoconfigure-spi = { module = 'io. io-opentelemetry-opentelemetry-sdk-logs = { module = 'io.opentelemetry:opentelemetry-sdk-logs', version.ref = 'io-opentelemetry' } io-opentelemetry-opentelemetry-sdk-metrics = { module = 'io.opentelemetry:opentelemetry-sdk-metrics', version.ref = 'io-opentelemetry' } io-opentelemetry-opentelemetry-sdk-trace = { module = 'io.opentelemetry:opentelemetry-sdk-trace', version.ref = 'io-opentelemetry' } -io-opentelemetry-semconv-opentelemetry-semconv = { module = 'io.opentelemetry.semconv:opentelemetry-semconv', version.ref = 'opentelemetry-semconv-opentelemetry-semconv' } +# io-opentelemetry-semconv-opentelemetry-semconv = { module = 'io.opentelemetry.semconv:opentelemetry-semconv', version.ref = 'opentelemetry-semconv-opentelemetry-semconv' } io-projectreactor-reactor-core = { module = 'io.projectreactor:reactor-core', version.ref = 'io-projectreactor-reactor-core' } io-projectreactor-reactor-core-micrometer = { module = 'io.projectreactor:reactor-core-micrometer', version.ref = 'io-projectreactor-reactor-core-micrometer' } io-projectreactor-reactor-test = { module = 'io.projectreactor:reactor-test', version.ref = 'io-projectreactor' } io-projectreactor-reactor-tools = { module = 'io.projectreactor:reactor-tools', version.ref = 'io-projectreactor' } -io-prometheus-simpleclient = { module = 'io.prometheus:simpleclient', version.ref = 'io-prometheus' } -io-prometheus-simpleclient_common = { module = 'io.prometheus:simpleclient_common', version.ref = 'io-prometheus' } -io-prometheus-simpleclient_httpserver = { module = 'io.prometheus:simpleclient_httpserver', version.ref = 'io-prometheus' } -io-prometheus-simpleclient_tracer_common = { module = 'io.prometheus:simpleclient_tracer_common', version.ref = 'io-prometheus' } -io-prometheus-simpleclient_tracer_otel = { module = 'io.prometheus:simpleclient_tracer_otel', version.ref = 'io-prometheus' } -io-prometheus-simpleclient_tracer_otel_agent = { module = 'io.prometheus:simpleclient_tracer_otel_agent', version.ref = 'io-prometheus' } -io-swagger-swagger-annotations = { module = 'io.swagger:swagger-annotations', version.ref = 'io-swagger-swagger-annotations' } io-vavr-vavr = { module = 'io.vavr:vavr', version.ref = 'io-vavr' } io-vavr-vavr-match = { module = 'io.vavr:vavr-match', version.ref = 'io-vavr' } io-zipkin-reporter2-zipkin-reporter = { module = 'io.zipkin.reporter2:zipkin-reporter', version.ref = 'zipkin-reporter2' } @@ -337,30 +302,26 @@ jakarta-mail-jakarta-mail-api = { module = 'jakarta.mail:jakarta.mail-api', vers jakarta-persistence-jakarta-persistence-api = { module = 'jakarta.persistence:jakarta.persistence-api', version.ref = 'jakarta-persistence-jakarta-persistence-api' } jakarta-transaction-jakarta-transaction-api = { module = 'jakarta.transaction:jakarta.transaction-api', version.ref = 'jakarta-transaction-jakarta-transaction-api' } jakarta-validation-jakarta-validation-api = { module = 'jakarta.validation:jakarta.validation-api', version.ref = 'jakarta-validation-jakarta-validation-api' } -javax-annotation-javax-annotation-api = { module = 'javax.annotation:javax.annotation-api', version.ref = 'javax-annotation-javax-annotation-api' } - net-java-dev-jna-jna = { module = 'net.java.dev.jna:jna', version.ref = 'dev-jna-jna' } -org-apache-commons-commons-collections4 = { module = 'org.apache.commons:commons-collections4', version.ref = 'apache-commons-commons-collections4' } -org-apache-commons-commons-lang3 = { module = 'org.apache.commons:commons-lang3', version.ref = 'apache-commons-commons-lang3' } org-apache-kafka-kafka-clients = { module = 'org.apache.kafka:kafka-clients', version.ref = 'apache-kafka-kafka-clients' } -org-bitbucket-b_c-jose4j = { module = 'org.bitbucket.b_c:jose4j', version.ref = 'bitbucket-b_c-jose4j' } -org-checkerframework-checker-qual = { module = 'org.checkerframework:checker-qual', version.ref = 'org-checkerframework-checker-qual' } +org-apache-httpcomponents-httpcomponents-core = { module = 'org.apache.httpcomponents:httpcore', version.ref = 'httpcore' } org-eclipse-angus-angus-activation = { module = 'org.eclipse.angus:angus-activation', version.ref = 'eclipse-angus-angus-activation' } org-eclipse-angus-angus-mail = { module = 'org.eclipse.angus:angus-mail', version.ref = 'eclipse-angus-angus-mail' } - org-flywaydb-flyway-core = { module = 'org.flywaydb:flyway-core', version.ref = 'org-flywaydb' } org-flywaydb-flyway-database-oracle = { module = 'org.flywaydb:flyway-database-oracle', version.ref = 'org-flywaydb' } org-flywaydb-flyway-mysql = { module = 'org.flywaydb:flyway-mysql', version.ref = 'org-flywaydb' } org-hdrhistogram-HdrHistogram = { module = 'org.hdrhistogram:HdrHistogram', version.ref = 'org-hdrhistogram-HdrHistogram' } org-jetbrains-annotations = { module = 'org.jetbrains:annotations', version.ref = 'org-jetbrains-annotations' } -org-jetbrains-intellij-deps-trove4j = { module = 'org.jetbrains.intellij.deps:trove4j', version.ref = 'intellij-deps-trove4j' } org-latencyutils-LatencyUtils = { module = 'org.latencyutils:LatencyUtils', version.ref = 'org-latencyutils-LatencyUtils' } org-lz4-lz4-java = { module = 'org.lz4:lz4-java', version.ref = 'org-lz4-lz4-java' } org-ow2-asm-asm = { module = 'org.ow2.asm:asm', version.ref = 'asm' } +org-ow2-asm-asm-analysis = { module = 'org.ow2.asm:asm-analysis', version.ref = 'asm' } org-ow2-asm-asm-commons = { module = 'org.ow2.asm:asm-commons', version.ref = 'asm' } org-ow2-asm-asm-tree = { module = 'org.ow2.asm:asm-tree', version.ref = 'asm' } +org-ow2-asm-asm-util = { module = 'org.ow2.asm:asm-util', version.ref = 'asm' } org-reactivestreams-reactive-streams = { module = 'org.reactivestreams:reactive-streams', version.ref = 'org-reactivestreams-reactive-streams' } -org-slf4j-jcl-over-slf4j = { module = 'org.slf4j:jcl-over-slf4j', version.ref = 'org-slf4j-jcl-over-slf4j' } -org-slf4j-slf4j-api = { module = 'org.slf4j:slf4j-api', version.ref = 'org-slf4j-slf4j-api' } +org-slf4j-jcl-over-slf4j = { module = 'org.slf4j:jcl-over-slf4j', version.ref = 'slf4j' } +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' } \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index e6441136f3d4ba8a0da8d277868979cfbc8ad796..a4b76b9530d66f5e68d973ea569d8e19de379189 100644 GIT binary patch delta 12612 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 HJ4oML2Lo<@i8BwbL^1~GkG`E7C$SEa_ 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 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index a441313..e18bc25 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index 1aa94a4..f3b75f3 100755 --- a/gradlew +++ b/gradlew @@ -15,6 +15,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 +# ############################################################################## # @@ -55,7 +57,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/. @@ -84,7 +86,7 @@ done # shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) -APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum diff --git a/gradlew.bat b/gradlew.bat index 7101f8e..9b42019 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -13,6 +13,8 @@ @rem See the License for the specific language governing permissions and @rem limitations under the License. @rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem @if "%DEBUG%"=="" @echo off @rem ##########################################################################