Skip to content

Commit 23daee3

Browse files
burtbeckwithburtbeckwith
authored
4.9.1.1 release (#48)
1 parent ee90cbe commit 23daee3

31 files changed

+451
-255
lines changed

‎buildSrc/src/main/groovy/gdk-base.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ repositories {
2929
dependencies {
3030
compileOnly mnLibs.jsr305 // for 'warning: unknown enum constant When.MAYBE'
3131
implementation mnLibs.jakarta.annotation.api
32-
runtimeOnly libs.logback.classic
32+
runtimeOnly mnLibs.logback.classic
3333
}
3434

3535
java {

‎buildSrc/src/main/groovy/gdk-cli.gradle‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
plugins {
1818
id 'gdk-module'
1919
id 'io.micronaut.application'
20-
id 'com.github.johnrengelman.shadow'
20+
id 'com.gradleup.shadow'
2121
}
2222

2323
dependencies {
@@ -31,15 +31,15 @@ dependencies {
3131
runtimeOnly libs.bouncycastle.bcprov
3232
runtimeOnly libs.jansi
3333
runtimeOnly libs.jline
34-
runtimeOnly libs.slf4j.nop
34+
runtimeOnly mnLibs.slf4j.nop
3535
}
3636

3737
configurations.configureEach {
3838
exclude module: 'logback-classic'
3939
}
4040

4141
micronaut {
42-
version libs.micronaut.starter.api.get().version
42+
version libs.versions.micronaut.starter.get()
4343
processing {
4444
incremental true
4545
annotations 'cloud.graal.gdk.*'

‎gdk-cli-core/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ dependencies {
5151
}
5252

5353
micronaut {
54-
version libs.micronaut.starter.api.get().version
54+
version libs.versions.micronaut.starter.get()
5555
processing {
5656
incremental true
5757
annotations 'cloud.graal.gdk.*'

‎gdk-core/build.gradle‎

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -44,17 +44,6 @@ dependencies {
4444
exclude group: 'org.eclipse.jgit', module: 'org.eclipse.jgit'
4545
}
4646
implementation(mnLibs.micronaut.http.client)
47-
implementation(libs.netty.buffer)
48-
implementation(libs.netty.codec)
49-
implementation(libs.netty.codec.http)
50-
implementation(libs.netty.codec.http2)
51-
implementation(libs.netty.codec.socks)
52-
implementation(libs.netty.common)
53-
implementation(libs.netty.handler)
54-
implementation(libs.netty.handler.proxy)
55-
implementation(libs.netty.resolver)
56-
implementation(libs.netty.transport)
57-
implementation(libs.netty.transport.native.unix.common)
5847
}
5948

6049
def writeVersions = tasks.register('writeVersions', cloud.graal.gdk.util.WriteVersionsTask) {
@@ -74,7 +63,7 @@ sourceSets {
7463
}
7564

7665
micronaut {
77-
version libs.micronaut.starter.api.get().version
66+
version libs.versions.micronaut.starter.get()
7867
processing {
7968
incremental true
8069
annotations 'cloud.graal.gdk.*'

‎gdk-core/src/main/java/cloud/graal/gdk/GdkGeneratorContext.java‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ public class GdkGeneratorContext extends GeneratorContext {
109109
/**
110110
* The id of the Gradle Shadow plugin.
111111
*/
112-
public static final String PLUGIN_SHADOW = "com.github.johnrengelman.shadow";
112+
public static final String PLUGIN_SHADOW = "com.gradleup.shadow";
113113

114114
private static final String PLUGIN_GRADLE_AZUREFUNCTIONS = "com.microsoft.azure.azurefunctions";
115115
private static final String PLUGIN_MAVEN_AZUREFUNCTIONS = "azure-functions-maven-plugin";
@@ -122,7 +122,7 @@ public class GdkGeneratorContext extends GeneratorContext {
122122
);
123123

124124
private static final Map<String, String> PLUGIN_GAVS = Map.ofEntries(
125-
gavMapEntry("com.github.johnrengelman.shadow", "com.github.johnrengelman:shadow", StarterCoordinates.SHADOW),
125+
gavMapEntry("com.gradleup.shadow", "com.gradleup.shadow:com.gradleup.shadow.gradle.plugin", StarterCoordinates.COM_GRADLEUP_SHADOW_GRADLE_PLUGIN),
126126
gavMapEntry("io.micronaut.application", "io.micronaut.gradle:micronaut-gradle-plugin", GdkDependencies.IO_MICRONAUT_GRADLE_MICRONAUT_GRADLE_PLUGIN),
127127
gavMapEntry("io.micronaut.library", "io.micronaut.gradle:micronaut-gradle-plugin", GdkDependencies.IO_MICRONAUT_GRADLE_MICRONAUT_GRADLE_PLUGIN),
128128
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 {
132132
gavMapEntry("com.google.cloud.tools.jib", "com.google.cloud.tools.jib:com.google.cloud.tools.jib.gradle.plugin", StarterCoordinates.JIB_GRADLE_PLUGIN),
133133
gavMapEntry("io.micronaut.aot", "io.micronaut.gradle:micronaut-aot-plugin", GdkDependencies.IO_MICRONAUT_GRADLE_MICRONAUT_GRADLE_PLUGIN),
134134
gavMapEntry("com.google.devtools.ksp", "com.google.devtools.ksp:com.google.devtools.ksp.gradle.plugin", StarterCoordinates.COM_GOOGLE_DEVTOOLS_KSP_GRADLE_PLUGIN),
135-
gavMapEntry("gg.jte.gradle", "gg.jte:jte-gradle-plugin", StarterCoordinates.JTE_GRADLE_PLUGIN)
135+
gavMapEntry("gg.jte.gradle", "gg.jte:jte-gradle-plugin", StarterCoordinates.JTE_GRADLE_PLUGIN),
136+
gavMapEntry("com.microsoft.azure.azurefunctions", "com.microsoft.azure:azure-functions-gradle-plugin", StarterCoordinates.AZURE_FUNCTIONS_GRADLE_PLUGIN)
136137
);
137138

138139
private static final ThreadLocal<GdkGeneratorContext> INSTANCE = new ThreadLocal<>();
@@ -896,7 +897,7 @@ public void addTemplate(String name,
896897

897898
RockerModel rockerModel = testRockerModelProvider.findModel(getLanguage(), getTestFramework());
898899
if (rockerModel != null) {
899-
addTemplateInternal(name, new RockerTemplate(moduleName, path, rockerModel));
900+
addTemplateInternal(name + "-" + cloud.getModuleName(), new RockerTemplate(moduleName, path, rockerModel));
900901
}
901902
}
902903

‎gdk-core/src/main/java/cloud/graal/gdk/feature/GdkTestedFeatures.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ public final class GdkTestedFeatures {
5555
"email-javamail",
5656
"email-template",
5757
// K8S
58-
"kubernetes-client",
58+
"kubernetes-client-openapi",
5959
// LOGGING
6060
"logback",
6161
// METRICS
@@ -100,6 +100,8 @@ public final class GdkTestedFeatures {
100100
// TRACING AWS
101101
"tracing-opentelemetry-exporter-otlp",
102102
"tracing-opentelemetry-xray",
103+
// TRACING Azure
104+
"azure-tracing",
103105
// TRACING GCP
104106
"tracing-opentelemetry-exporter-gcp",
105107
"tracing-opentelemetry-gcp"

‎gdk-core/src/main/java/cloud/graal/gdk/feature/create/GdkMavenBuildCreator.java‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@
3030
import io.micronaut.starter.build.maven.MavenPlugin;
3131
import io.micronaut.starter.build.maven.MavenRepository;
3232
import io.micronaut.starter.feature.build.maven.templates.mavenPlugin;
33+
import io.micronaut.starter.feature.function.azure.AbstractAzureFunction;
34+
import io.micronaut.starter.feature.function.azure.template.azureFunctionMavenPlugin;
3335
import io.micronaut.starter.feature.testresources.TestResourcesAdditionalModulesProvider;
3436
import io.micronaut.starter.template.RockerWritable;
3537
import jakarta.inject.Singleton;
@@ -46,6 +48,8 @@
4648
@Singleton
4749
public class GdkMavenBuildCreator extends MavenBuildCreator {
4850

51+
private static final String AZURE_FUNCTIONS_MAVEN_PLUGIN = "azure-functions-maven-plugin";
52+
4953
@NonNull
5054
@Override
5155
public MavenBuild create(GeneratorContext generatorContext, List<Repository> repositories) {
@@ -93,6 +97,12 @@ private MavenPlugin clonePlugin(MavenPlugin plugin) {
9397
extensionModel.templateDirectory())), 0);
9498
}
9599

100+
if (AZURE_FUNCTIONS_MAVEN_PLUGIN.equals(plugin.getArtifactId())) {
101+
return new MavenPlugin(
102+
plugin.getArtifactId(),
103+
new RockerWritable(azureFunctionMavenPlugin.template(AbstractAzureFunction.AZURE_FUNCTIONS_EXTENSION_VERSION)), 0);
104+
}
105+
96106
mavenPlugin extensionModel = (mavenPlugin) ((RockerWritable) plugin.getExtension()).getModel();
97107
return new MavenPlugin(
98108
plugin.getArtifactId(),

‎gdk-core/src/main/java/cloud/graal/gdk/feature/create/function/GdkAzureCloudFunction.java‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,10 @@
1515
*/
1616
package cloud.graal.gdk.feature.create.function;
1717

18+
import cloud.graal.gdk.feature.GdkFeatureContext;
1819
import cloud.graal.gdk.model.GdkCloud;
1920
import io.micronaut.core.annotation.NonNull;
21+
import io.micronaut.starter.feature.function.azure.AzureRawFunction;
2022
import jakarta.inject.Singleton;
2123

2224
import static cloud.graal.gdk.model.GdkCloud.AZURE;
@@ -29,6 +31,17 @@
2931
@Singleton
3032
public class GdkAzureCloudFunction extends AbstractGdkCloudFunction {
3133

34+
private final AzureRawFunction azureRawFunction;
35+
36+
public GdkAzureCloudFunction(AzureRawFunction azureRawFunction) {
37+
this.azureRawFunction = azureRawFunction;
38+
}
39+
40+
@Override
41+
public void processSelectedFeatures(GdkFeatureContext featureContext) {
42+
featureContext.addFeature(azureRawFunction, AzureRawFunction.class);
43+
}
44+
3245
@NonNull
3346
@Override
3447
public GdkCloud getCloud() {

‎gdk-core/src/main/java/cloud/graal/gdk/feature/create/gatewayfunction/AbstractGdkCloudGatewayFunction.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,9 @@
2727
*
2828
* @since 1.0.0
2929
*/
30-
public abstract class AbstractGdkCloudGatewayFunction extends AbstractGdkCreateFeature implements FunctionFeature {
30+
public abstract class AbstractGdkCloudGatewayFunction
31+
extends AbstractGdkCreateFeature
32+
implements FunctionFeature {
3133

3234
@NonNull
3335
@Override

‎gdk-core/src/main/java/cloud/graal/gdk/feature/create/gatewayfunction/GdkAzureCloudGatewayFunction.java‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,10 @@
1515
*/
1616
package cloud.graal.gdk.feature.create.gatewayfunction;
1717

18+
import cloud.graal.gdk.feature.GdkFeatureContext;
1819
import cloud.graal.gdk.model.GdkCloud;
1920
import io.micronaut.core.annotation.NonNull;
21+
import io.micronaut.starter.feature.function.azure.AzureRawFunction;
2022
import jakarta.inject.Singleton;
2123

2224
import static cloud.graal.gdk.model.GdkCloud.AZURE;
@@ -29,6 +31,20 @@
2931
@Singleton
3032
public class GdkAzureCloudGatewayFunction extends AbstractGdkCloudGatewayFunction {
3133

34+
private final AzureRawFunction azureRawFunction;
35+
36+
/**
37+
* @param azureRawFunction AzureRawFunction feature
38+
*/
39+
public GdkAzureCloudGatewayFunction(AzureRawFunction azureRawFunction) {
40+
this.azureRawFunction = azureRawFunction;
41+
}
42+
43+
@Override
44+
public void processSelectedFeatures(GdkFeatureContext featureContext) {
45+
featureContext.addFeature(azureRawFunction, AzureRawFunction.class);
46+
}
47+
3248
@NonNull
3349
@Override
3450
public GdkCloud getCloud() {

0 commit comments

Comments
 (0)