Merge pull request #79 from oracle-quickstart/functions-to-micronaut-4

upgrade functions service to micronaut 4.3.4

src/functions/newsletter-subscription/build.gradle

@@ -1,76 +1,90 @@
-plugins {
- id("com.github.johnrengelman.shadow") version "7.1.2"
- id("io.micronaut.application") version "3.6.2"
-}
-
-group = "microanut.mushop.newsletter.subscription"
-
-repositories {
- mavenCentral()
-}
-
-dependencies {
- implementation("io.micronaut:micronaut-validation")
- implementation("io.micronaut:micronaut-jackson-databind")
- implementation("io.micronaut:micronaut-runtime")
- implementation("jakarta.annotation:jakarta.annotation-api")
- implementation("io.micronaut:micronaut-http-client")
- implementation 'javax.mail:mail:1.5.0-b01'
-
- runtimeOnly("org.slf4j:slf4j-simple")
- implementation("io.micronaut:micronaut-validation")
-
- testImplementation("com.fnproject.fn:testing-junit4")
- testImplementation("io.micronaut:micronaut-http-client")
-
-}
-
-application {
- mainClass.set("com.example.Application")
-}
-
-java {
- sourceCompatibility = JavaVersion.VERSION_11
- targetCompatibility = JavaVersion.VERSION_11
-}
-
-tasks {
- // the base image for Oracle Function is fnproject/fn-java-fdk:jre11-latest
- // TODO: build fnproject image on top of graalvm-ce
-// if (javaBaseImage == "graalvm") {
-// dockerfile {
-// baseImage = "ghcr.io/graalvm/graalvm-ce:ol8-java11-22"
-// }
-// }
-
- dockerfileNative {
- args("-XX:MaximumHeapSizePercent=80")
- instruction "RUN echo 'http://dl-cdn.alpinelinux.org/alpine/v3.11/main' >> /etc/apk/repositories && apk update && apk add 'zlib<1.2.12'"
- }
-
- dockerBuild {
- images = ["phx.ocir.io/oraclelabs/micronaut-showcase/mushop/$project.name-${javaBaseImage}:$project.version"]
- }
-
- dockerBuildNative {
- images = ["phx.ocir.io/oraclelabs/micronaut-showcase/mushop/${project.name}-native:$project.version"]
- }
-}
-
-graalvmNative.toolchainDetection = false
-graalvmNative {
- binaries.configureEach {
- buildArgs.add("--initialize-at-build-time=newsletter.subscription")
- buildArgs.add("--static")
- buildArgs.add("--add-exports=org.graalvm.nativeimage.builder/com.oracle.svm.core.jni=ALL-UNNAMED")
- }
-}
-
-micronaut {
- runtime("oracle_function")
- testRuntime("junit5")
- processing {
- incremental(true)
- annotations("newsletter.subscription.*")
- }
-}
+plugins {
+ id("com.github.johnrengelman.shadow") version "8.1.1"
+ id("io.micronaut.application") version "4.3.4"
+ id("io.micronaut.aot") version "4.3.4"
+}
+
+group = "microanut.mushop.newsletter.subscription"
+
+repositories {
+ mavenCentral()
+}
+
+dependencies {
+ annotationProcessor("io.micronaut.validation:micronaut-validation-processor")
+ annotationProcessor("io.micronaut:micronaut-http-validation")
+ annotationProcessor("io.micronaut.serde:micronaut-serde-processor")
+ annotationProcessor("io.micronaut.openapi:micronaut-openapi")
+
+ implementation("io.micronaut.validation:micronaut-validation")
+ implementation("io.micronaut.serde:micronaut-serde-jackson")
+ implementation("io.micronaut:micronaut-runtime")
+ implementation("jakarta.annotation:jakarta.annotation-api")
+ implementation("io.micronaut:micronaut-http-client")
+ implementation("io.micronaut.email:micronaut-email-javamail")
+
+ compileOnly("io.micronaut.openapi:micronaut-openapi-annotations")
+
+ runtimeOnly("org.slf4j:slf4j-simple")
+ runtimeOnly("org.yaml:snakeyaml")
+
+ testImplementation("com.fnproject.fn:testing-junit4")
+ testImplementation("io.micronaut:micronaut-http-client")
+
+}
+
+application {
+ mainClass.set("com.example.Application")
+}
+
+java {
+ sourceCompatibility = JavaVersion.toVersion("21")
+ targetCompatibility = JavaVersion.toVersion("21")
+}
+
+tasks {
+ if (javaBaseImage == "graalvm") {
+ dockerfile {
+ baseImage = "ghcr.io/graalvm/native-image-community:21"
+ }
+ }
+
+ dockerfileNative {
+ args("-XX:MaximumHeapSizePercent=80")
+ instruction "RUN echo 'http://dl-cdn.alpinelinux.org/alpine/v3.11/main' >> /etc/apk/repositories && apk update && apk add 'zlib<1.2.12'"
+ }
+
+ dockerBuild {
+ images = ["phx.ocir.io/oraclelabs/micronaut-showcase/mushop/$project.name-${javaBaseImage}:$project.version"]
+ }
+
+ dockerBuildNative {
+ images = ["phx.ocir.io/oraclelabs/micronaut-showcase/mushop/${project.name}-native:$project.version"]
+ }
+}
+
+graalvmNative.toolchainDetection = false
+graalvmNative {
+ binaries.configureEach {
+ buildArgs.add("--initialize-at-build-time=newsletter.subscription")
+ buildArgs.add("--static")
+ buildArgs.add("--add-exports=org.graalvm.nativeimage.builder/com.oracle.svm.core.jni=ALL-UNNAMED")
+ }
+}
+
+micronaut {
+ runtime("oracle_function")
+ testRuntime("junit5")
+ processing {
+ incremental(true)
+ annotations("newsletter.subscription.*")
+ }aot {
+ optimizeServiceLoading = false
+ convertYamlToJava = false
+ precomputeOperations = true
+ cacheEnvironment = true
+ optimizeClassLoading = true
+ deduceEnvironment = true
+ optimizeNetty = true
+ }
+}

src/functions/newsletter-subscription/gradle.properties

@@ -1,3 +1,3 @@
-micronautVersion=3.7.3
-version=2.0.99-SNAPSHOT
-javaBaseImage=graalvm
+micronautVersion=4.3.4
+version=2.0.99-SNAPSHOT
+javaBaseImage=graalvm

src/functions/newsletter-subscription/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

src/functions/newsletter-subscription/gradlew

@@ -55,7 +55,7 @@
 # Darwin, MinGW, and NonStop.
 #
 # (3) This script is generated from the Groovy template
-# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 # within the Gradle project.
 #
 # You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,13 +80,11 @@ do
  esac
 done
 
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-APP_NAME="Gradle"
+# This is normally unused
+# shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+# 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
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -133,22 +131,29 @@ location of your Java installation."
  fi
 else
  JAVACMD=java
- which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+ if ! command -v java >/dev/null 2>&1
+ then
+ die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+ fi
 fi
 
 # Increase the maximum file descriptors if we can.
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
  case $MAX_FD in #(
  max*)
+ # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+ # shellcheck disable=SC2039,SC3045
  MAX_FD=$( ulimit -H -n ) ||
  warn "Could not query maximum file descriptor limit"
  esac
  case $MAX_FD in #(
  '' | soft) :;; #(
  *)
+ # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+ # shellcheck disable=SC2039,SC3045
  ulimit -n "$MAX_FD" ||
  warn "Could not set maximum file descriptor limit to $MAX_FD"
  esac
@@ -193,11 +198,15 @@ if "$cygwin" || "$msys" ; then
  done
 fi
 
-# Collect all arguments for the java command;
-# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-# shell script including quotes and variable substitutions, so put them in
-# double quotes to make sure that they get re-expanded; and
-# * put everything else in single quotes, so that it's not re-expanded.
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Collect all arguments for the java command:
+# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+# and any embedded shellness will be escaped.
+# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+# treated as '${Hostname}' itself on the command line.
 
 set -- \
  "-Dorg.gradle.appname=$APP_BASE_NAME" \