diff --git a/applications/mp/pom.xml b/applications/mp/pom.xml index c6426da394a..a0b4354dd5c 100644 --- a/applications/mp/pom.xml +++ b/applications/mp/pom.xml @@ -77,14 +77,12 @@ generateResourceConfig - package build-native-image compile - package diff --git a/applications/parent/pom.xml b/applications/parent/pom.xml index 1ab08a1e573..9a42ab79e65 100644 --- a/applications/parent/pom.xml +++ b/applications/parent/pom.xml @@ -184,6 +184,7 @@ resource-config + package true @@ -191,6 +192,7 @@ build-native-image + package true @@ -205,7 +207,6 @@ --add-exports=org.graalvm.nativeimage.builder/com.oracle.svm.core.configure=ALL-UNNAMED - --static @@ -215,6 +216,58 @@ + + native-image-skip + + + native.image.skip + + + + + + org.graalvm.buildtools + native-maven-plugin + + + resource-config + none + + + build-native-image + none + + + + + + + + native-image-static + + + native.image.buildStatic + + + + + + org.graalvm.buildtools + native-maven-plugin + + + build-native-image + + + --static + + + + + + + + helidon-cli diff --git a/applications/se/pom.xml b/applications/se/pom.xml index e9c9af563ff..214411c0e7e 100644 --- a/applications/se/pom.xml +++ b/applications/se/pom.xml @@ -66,14 +66,12 @@ generateResourceConfig - package build-native-image compile - package diff --git a/archetypes/helidon/src/main/archetype/common/files/Dockerfile.native.mustache b/archetypes/helidon/src/main/archetype/common/files/Dockerfile.native.mustache index 7f8ba5c4d83..4ff85c6391e 100644 --- a/archetypes/helidon/src/main/archetype/common/files/Dockerfile.native.mustache +++ b/archetypes/helidon/src/main/archetype/common/files/Dockerfile.native.mustache @@ -18,12 +18,12 @@ WORKDIR /helidon # Incremental docker builds will always resume after that, unless you update # the pom ADD pom.xml . -RUN mvn package -Dmaven.test.skip -Declipselink.weave.skip +RUN mvn package -Pnative-image -Dnative.image.skip -Dmaven.test.skip -Declipselink.weave.skip # Do the Maven build! # Incremental docker builds will resume here when you change sources ADD src src -RUN mvn package -Pnative-image -DskipTests +RUN mvn package -Pnative-image -Dnative.image.buildStatic -DskipTests RUN echo "done!" diff --git a/examples/quickstarts/helidon-quickstart-mp/Dockerfile.native b/examples/quickstarts/helidon-quickstart-mp/Dockerfile.native index b7687c6c092..d3e3eddc569 100644 --- a/examples/quickstarts/helidon-quickstart-mp/Dockerfile.native +++ b/examples/quickstarts/helidon-quickstart-mp/Dockerfile.native @@ -33,12 +33,12 @@ WORKDIR /helidon # Incremental docker builds will always resume after that, unless you update # the pom ADD pom.xml . -RUN mvn package -Dmaven.test.skip -Declipselink.weave.skip +RUN mvn package -Pnative-image -Dnative.image.skip -Dmaven.test.skip -Declipselink.weave.skip # Do the Maven build! # Incremental docker builds will resume here when you change sources ADD src src -RUN mvn package -Pnative-image -DskipTests +RUN mvn package -Pnative-image -Dnative.image.buildStatic -DskipTests RUN echo "done!" diff --git a/examples/quickstarts/helidon-quickstart-se/Dockerfile.native b/examples/quickstarts/helidon-quickstart-se/Dockerfile.native index 5662e3b1a14..991ca332494 100644 --- a/examples/quickstarts/helidon-quickstart-se/Dockerfile.native +++ b/examples/quickstarts/helidon-quickstart-se/Dockerfile.native @@ -33,12 +33,12 @@ WORKDIR /helidon # Incremental docker builds will always resume after that, unless you update # the pom ADD pom.xml . -RUN mvn package -Dmaven.test.skip -Declipselink.weave.skip +RUN mvn package -Pnative-image -Dnative.image.skip -Dmaven.test.skip -Declipselink.weave.skip # Do the Maven build! # Incremental docker builds will resume here when you change sources ADD src src -RUN mvn package -Pnative-image -DskipTests +RUN mvn package -Pnative-image -Dnative.image.buildStatic -DskipTests RUN echo "done!" diff --git a/examples/quickstarts/helidon-standalone-quickstart-mp/Dockerfile.native b/examples/quickstarts/helidon-standalone-quickstart-mp/Dockerfile.native index 9c400eb8654..ea9b8eb9fb6 100644 --- a/examples/quickstarts/helidon-standalone-quickstart-mp/Dockerfile.native +++ b/examples/quickstarts/helidon-standalone-quickstart-mp/Dockerfile.native @@ -33,12 +33,12 @@ WORKDIR /helidon # Incremental docker builds will always resume after that, unless you update # the pom ADD pom.xml . -RUN mvn package -Dmaven.test.skip -Declipselink.weave.skip +RUN mvn package -Pnative-image -Dnative.image.skip -Dmaven.test.skip -Declipselink.weave.skip # Do the Maven build! # Incremental docker builds will resume here when you change sources ADD src src -RUN mvn package -Pnative-image -DskipTests +RUN mvn package -Pnative-image -Dnative.image.buildStatic -DskipTests RUN echo "done!" diff --git a/examples/quickstarts/helidon-standalone-quickstart-se/Dockerfile.native b/examples/quickstarts/helidon-standalone-quickstart-se/Dockerfile.native index 88546252221..7c4461c0d40 100644 --- a/examples/quickstarts/helidon-standalone-quickstart-se/Dockerfile.native +++ b/examples/quickstarts/helidon-standalone-quickstart-se/Dockerfile.native @@ -33,12 +33,12 @@ WORKDIR /helidon # Incremental docker builds will always resume after that, unless you update # the pom ADD pom.xml . -RUN mvn package -Dmaven.test.skip -Declipselink.weave.skip +RUN mvn package -Pnative-image -Dnative.image.skip -Dmaven.test.skip -Declipselink.weave.skip # Do the Maven build! # Incremental docker builds will resume here when you change sources ADD src src -RUN mvn package -Pnative-image -DskipTests +RUN mvn package -Pnative-image -Dnative.image.buildStatic -DskipTests RUN echo "done!"