Merge remote-tracking branch 'origin/main' into java21-infra

# Conflicts: # README.md # docker-compose.yml # spring-native-aws-lambda-function/pom.xml # spring-native-aws-lambda-infra/src/main/java/com/coffeebeans/springnativeawslambda/infra/lambda/CustomRuntime2Function.java # spring-native-aws-lambda-infra/src/test/java/com/coffeebeans/springnativeawslambda/infra/LambdaTest.java # spring-native-aws-lambda-infra/src/test/java/com/coffeebeans/springnativeawslambda/infra/lambda/CustomRuntime2FunctionTest.java
muhamadto · Jan 8, 2024 · cebee01 · cebee01
2 parents 25a9d2c + 7b695f7
commit cebee01
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 15 deletions.
diff --git a/README.md b/README.md
@@ -56,7 +56,7 @@ $ ./mvnw -ntp clean verify -U
 1. Run the following commands
     ```shell
     $ export SPRING_PROFILES_ACTIVE=local
-    $ ./mvnw -ntp  clean package -U -Pnative -DskipTests -pl spring-native-aws-lambda-function
+    $ ./mvnw -ntp clean -Pnative -DskipTests native:compile package -pl spring-native-aws-lambda-function
     $ ./spring-native-aws-lambda-function/target/spring-native-aws-lambda-function
     ```
    The service starts in less than 100 ms

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -51,7 +51,7 @@ services:
 
       print_info_message "divider" "Package GraalVM function" &&
 
-      ./mvnw -ntp  clean package -U -Pnative -DskipTests -pl spring-native-aws-lambda-function &&
+      ./mvnw -ntp clean -Pnative -DskipTests native:compile package -pl spring-native-aws-lambda-function &&
 
       print_info_message "divider" "Creating LAMBDA function" &&
       lambda_create_function lambda-FUNCTION provided.al2023 512 ./spring-native-aws-lambda-function/target/spring-native-aws-lambda-function-native-zip.zip spring-native-aws-lambda-function &&

diff --git a/spring-native-aws-lambda-function/pom.xml b/spring-native-aws-lambda-function/pom.xml
@@ -167,23 +167,10 @@
                 <buildArg>--verbose</buildArg>
                 <buildArg>--no-fallback</buildArg>
                 <buildArg>--enable-preview</buildArg>
-                  <buildArg>--gc=G1</buildArg>
-                <buildArg>-march=native</buildArg>
                 <buildArg>--strict-image-heap</buildArg>
-                <buildArg>--enable-url-protocols=http</buildArg>
-                <buildArg>-H:+AddAllCharsets</buildArg>
                 <buildArg>-H:+ReportExceptionStackTraces</buildArg>
               </buildArgs>
             </configuration>
-            <executions>
-              <execution>
-                <id>build-native</id>
-                <phase>prepare-package</phase>
-                <goals>
-                  <goal>compile</goal>
-                </goals>
-              </execution>
-            </executions>
           </plugin>
           <plugin>
             <artifactId>maven-assembly-plugin</artifactId>