Merge pull request #130 from redhat-developer-demos/mvnw

kdubois · web-flow · commit 45c339c1c0eb · 2023-08-21T12:41:54.000+02:00
fix mvnw
diff --git a/.github/workflows/price-generator.yml b/.github/workflows/price-generator.yml
@@ -20,4 +20,4 @@ jobs:
         java-version: 11
     - name: Maven build
       working-directory: apps/price-generator
-      run: ./mvnwpackage -Pnative -Dquarkus.native.container-build=true
+      run: ./mvnw package -Pnative -Dquarkus.native.container-build=true
diff --git a/apps/price-generator/src/main/docker/Dockerfile.jvm b/apps/price-generator/src/main/docker/Dockerfile.jvm
@@ -3,7 +3,7 @@
 #
 # Before building the docker image run:
 #
-# ./mvnwpackage
+# ./mvnw package
 #
 # Then, build the image with:
 #
diff --git a/apps/price-generator/src/main/docker/Dockerfile.native b/apps/price-generator/src/main/docker/Dockerfile.native
@@ -3,7 +3,7 @@
 #
 # Before building the docker image run:
 #
-# ./mvnwpackage -Pnative -Dquarkus.native.container-build=true
+# ./mvnw package -Pnative -Dquarkus.native.container-build=true
 #
 # Then, build the image with:
 #
diff --git a/apps/price-generator/src/main/resources/META-INF/resources/index.html b/apps/price-generator/src/main/resources/META-INF/resources/index.html
@@ -114,7 +114,7 @@ <h2>Why do you see this?</h2>
 
         <h2>What can I do from here?</h2>
 
-        <p>If not already done, run the application in <em>dev mode</em> using: <code>./mvnwcompile quarkus:dev</code>.
+        <p>If not already done, run the application in <em>dev mode</em> using: <code>./mvnw compile quarkus:dev</code>.
         </p>
         <ul>
             <li>Add REST resources, Servlets, functions and other services in <code>src/main/java</code>.</li>
diff --git a/documentation/modules/ROOT/pages/_partials/build.adoc b/documentation/modules/ROOT/pages/_partials/build.adoc
@@ -11,7 +11,7 @@ JVM mode::
 [.console-input]
 [source,bash,subs="+macros,+attributes"]
 ----
-./mvnw -DskipTests clean package
+./mvnw  -DskipTests clean package
 ----
 
 After successful maven build, run the following command to build the container - choose the terminal of the target environment you wish to use (podman, minishift or minokube) as you want to build and publish the image in the right registry:
@@ -31,7 +31,7 @@ Native mode::
 [.console-input]
 [source,bash,subs="+macros,+attributes"]
 ----
-./mvnw -DskipTests clean package -Pnative -Dnative-image.docker-build=true <1>
+./mvnw  -DskipTests clean package -Pnative -Dnative-image.docker-build=true <1>
 ----
 <1> Using the `-Dnative-image.docker-build=true` is very important as need a linux native binary what will be containerized. 
 
diff --git a/documentation/modules/ROOT/pages/_partials/compile-and-run.adoc b/documentation/modules/ROOT/pages/_partials/compile-and-run.adoc
@@ -16,7 +16,7 @@ a|
 [.console-input]
 [source,bash,subs="+macros,+attributes"]
 ----
- ./mvnwpackage 
+ ./mvnw package 
 ----
 
 a|
@@ -60,7 +60,7 @@ a|
 [.console-input]
 [source,bash,subs="+macros,+attributes"]
 ----
- ./mvnwpackage -Dnative
+ ./mvnw package -Dnative
 ----
 
 a|
@@ -100,7 +100,7 @@ a|
 [.console-input]
 [source,bash,subs="+macros,+attributes"]
 ----
- ./mvnwquarkus:image-build \
+ ./mvnw quarkus:image-build \
   -Dnative
 ----
 a|
diff --git a/documentation/modules/ROOT/pages/_partials/invoke-service.adoc b/documentation/modules/ROOT/pages/_partials/invoke-service.adoc
@@ -46,6 +46,6 @@ You can run the test either in IDE or by running Maven:
 [.console-input]
 [source,bash,subs="+macros,+attributes"]
 ----
-./mvnw clean compile test
+./mvnw  clean compile test
 ----
 #end::test[]
diff --git a/documentation/modules/ROOT/pages/_partials/k8s-build-deploy.adoc b/documentation/modules/ROOT/pages/_partials/k8s-build-deploy.adoc
@@ -10,7 +10,7 @@ If you have not deployed the application previously, you need to add Quarkus Kub
 [.console-input]
 [source,bash,subs="+macros,+attributes"]
 ----
-./mvnw quarkus:add-extension -Dextensions="quarkus-kubernetes"
+./mvnw  quarkus:add-extension -Dextensions="quarkus-kubernetes"
 ----
 
 You need to configure group and name of the container used to deploy into Kubernetes.
@@ -33,7 +33,7 @@ Now you need to run Maven goal to generate Kubernetes resource.
 [.console-input]
 [source,bash,subs="+macros,+attributes"]
 ----
-./mvnw package -DskipTests
+./mvnw  package -DskipTests
 ----
 
 You can inspect the generated file by accessing next file:
diff --git a/documentation/modules/ROOT/pages/_partials/run-dev-mode.adoc b/documentation/modules/ROOT/pages/_partials/run-dev-mode.adoc
@@ -6,5 +6,5 @@ If you are not in dev mode, run the following command to start Quarkus applicati
 [.console-input]
 [source,bash,subs="+macros,+attributes"]
 ----
-./mvnw compile quarkus:dev 
+./mvnw  compile quarkus:dev 
 ----
diff --git a/documentation/modules/ROOT/pages/basics.adoc b/documentation/modules/ROOT/pages/basics.adoc
@@ -13,7 +13,7 @@ Maven::
 [.console-input]
 [source,bash,subs="+macros,+attributes"]
 ----
-./mvnw"io.quarkus.platform:quarkus-maven-plugin:create" \
+./mvnw "io.quarkus.platform:quarkus-maven-plugin:create" \
 -DprojectGroupId="com.redhat.developers" \
 -DprojectArtifactId="tutorial-app" \
 -DprojectVersion="1.0-SNAPSHOT" \
@@ -94,7 +94,7 @@ Maven::
 [.console-input]
 [source,bash,subs="+macros,+attributes"]
 ----
-./mvnwclean test
+./mvnw clean test
 ----
 
 --
@@ -143,7 +143,7 @@ Maven::
 [.console-input]
 [source,bash,subs="+macros,+attributes"]
 ----
-./mvnwquarkus:dev
+./mvnw quarkus:dev
 ----
 
 --
diff --git a/documentation/modules/ROOT/pages/configuration.adoc b/documentation/modules/ROOT/pages/configuration.adoc
@@ -143,7 +143,7 @@ Maven::
 [.console-input]
 [source,bash,subs="+macros,+attributes"]
 ----
-./mvnwclean test
+./mvnw clean test
 ----
 
 --
@@ -184,7 +184,7 @@ Maven::
 [.console-input]
 [source,bash,subs="+macros,+attributes"]
 ----
-./mvnwquarkus:dev
+./mvnw quarkus:dev
 ----
 
 --
diff --git a/documentation/modules/ROOT/pages/dev-services.adoc b/documentation/modules/ROOT/pages/dev-services.adoc
@@ -22,8 +22,8 @@ Maven::
 [.console-input]
 [source,bash,subs="+macros,+attributes"]
 ----
-./mvnwquarkus:remove-extension -Dextension=quarkus-jdbc-h2
-./mvnwquarkus:add-extension -Dextension=quarkus-jdbc-postgresql
+./mvnw quarkus:remove-extension -Dextension=quarkus-jdbc-h2
+./mvnw quarkus:add-extension -Dextension=quarkus-jdbc-postgresql
 ----
 
 --
@@ -127,7 +127,7 @@ Maven::
 [.console-input]
 [source,bash,subs="+macros,+attributes"]
 ----
-./mvnwtest
+./mvnw test
 ----
 
 --
@@ -265,7 +265,7 @@ Maven::
 [.console-input]
 [source,bash,subs="+macros,+attributes"]
 ----
-./mvnwclean package -DskipTests -Dquarkus.container-image.push=true
+./mvnw clean package -DskipTests -Dquarkus.container-image.push=true
 ----
 
 --
diff --git a/documentation/modules/ROOT/pages/fault-tolerance.adoc b/documentation/modules/ROOT/pages/fault-tolerance.adoc
@@ -14,7 +14,7 @@ Maven::
 [.console-input]
 [source,bash,subs="+macros,+attributes"]
 ----
-./mvnwquarkus:add-extension -Dextensions=quarkus-smallrye-fault-tolerance
+./mvnw quarkus:add-extension -Dextensions=quarkus-smallrye-fault-tolerance
 ----
 
 --
diff --git a/documentation/modules/ROOT/pages/health.adoc b/documentation/modules/ROOT/pages/health.adoc
@@ -20,7 +20,7 @@ Maven::
 [.console-input]
 [source,bash,subs="+macros,+attributes"]
 ----
-./mvnwquarkus:add-extension -Dextension=quarkus-smallrye-health
+./mvnw quarkus:add-extension -Dextension=quarkus-smallrye-health
 ----
 
 --
diff --git a/documentation/modules/ROOT/pages/kafka-and-streams.adoc b/documentation/modules/ROOT/pages/kafka-and-streams.adoc
@@ -17,7 +17,7 @@ Maven::
 [.console-input]
 [source,bash,subs="+macros,+attributes"]
 ----
-./mvnwquarkus:add-extension -Dextensions=quarkus-smallrye-reactive-messaging-kafka
+./mvnw quarkus:add-extension -Dextensions=quarkus-smallrye-reactive-messaging-kafka
 ----
 
 --
diff --git a/documentation/modules/ROOT/pages/kubernetes.adoc b/documentation/modules/ROOT/pages/kubernetes.adoc
@@ -25,7 +25,7 @@ Maven::
 [.console-input]
 [source,bash,subs="+macros,+attributes"]
 ----
-./mvnwquarkus:add-extension -Dextensions=quarkus-kubernetes,quarkus-container-image-jib
+./mvnw quarkus:add-extension -Dextensions=quarkus-kubernetes,quarkus-container-image-jib
 ----
 
 --
@@ -90,7 +90,7 @@ Maven::
 [.console-input]
 [source,bash,subs="+macros,+attributes"]
 ----
-./mvnwclean package -DskipTests -Dquarkus.container-image.push=true -Dquarkus.container-image.builder=jib
+./mvnw clean package -DskipTests -Dquarkus.container-image.push=true -Dquarkus.container-image.builder=jib
 ----
 
 --
diff --git a/documentation/modules/ROOT/pages/metrics.adoc b/documentation/modules/ROOT/pages/metrics.adoc
@@ -16,7 +16,7 @@ Maven::
 [.console-input]
 [source,bash,subs="+macros,+attributes"]
 ----
-./mvnwquarkus:add-extension -Dextensions=quarkus-micrometer
+./mvnw quarkus:add-extension -Dextensions=quarkus-micrometer
 ----
 
 --
@@ -41,7 +41,7 @@ Maven::
 [.console-input]
 [source,bash,subs="+macros,+attributes"]
 ----
-./mvnwquarkus:add-extension -Dextensions=quarkus-micrometer-registry-prometheus
+./mvnw quarkus:add-extension -Dextensions=quarkus-micrometer-registry-prometheus
 ----
 
 --
diff --git a/documentation/modules/ROOT/pages/panache.adoc b/documentation/modules/ROOT/pages/panache.adoc
@@ -14,7 +14,7 @@ We'll use http://www.h2database.com[H2,window="_blank"] as our backing database
 
 Quarkus provides a lot of optimized dependencies to its ecosystem through *extensions*. For this particular chapter, we'll need to add extensions that enables us to work with H2, Hibernate ORM, Panache (a novel persistence API), and JSON.
 
-You probably still have `./mvnwquarkus:dev` running in your terminal. And that's perfectly fine!
+You probably still have `./mvnw quarkus:dev` running in your terminal. And that's perfectly fine!
 
 Just open a new terminal window, and make sure you're at the root of your `{project-name}` project, then run:
 
@@ -26,7 +26,7 @@ Maven::
 [.console-input]
 [source,bash,subs="+macros,+attributes"]
 ----
-./mvnwquarkus:add-extension -Dextension="quarkus-resteasy-reactive-jsonb, quarkus-jdbc-h2, quarkus-hibernate-orm-panache, quarkus-smallrye-openapi"
+./mvnw quarkus:add-extension -Dextension="quarkus-resteasy-reactive-jsonb, quarkus-jdbc-h2, quarkus-hibernate-orm-panache, quarkus-smallrye-openapi"
 ----
 
 --
diff --git a/documentation/modules/ROOT/pages/reactive-messaging.adoc b/documentation/modules/ROOT/pages/reactive-messaging.adoc
@@ -20,7 +20,7 @@ Maven::
 [.console-input]
 [source,bash,subs="+macros,+attributes"]
 ----
-./mvnwquarkus:add-extension -Dextension=quarkus-smallrye-reactive-messaging
+./mvnw quarkus:add-extension -Dextension=quarkus-smallrye-reactive-messaging
 ----
 
 --
@@ -286,7 +286,7 @@ Maven::
 [.console-input]
 [source,bash,subs="+macros,+attributes"]
 ----
-./mvnwquarkus:add-extension -Dextension=quarkus-smallrye-fault-tolerance
+./mvnw quarkus:add-extension -Dextension=quarkus-smallrye-fault-tolerance
 ----
 
 --
diff --git a/documentation/modules/ROOT/pages/reactive.adoc b/documentation/modules/ROOT/pages/reactive.adoc
@@ -19,7 +19,7 @@ Maven::
 [.console-input]
 [source,bash,subs="+macros,+attributes"]
 ----
-./mvnwquarkus:add-extension -Dextension=quarkus-mutiny
+./mvnw quarkus:add-extension -Dextension=quarkus-mutiny
 ----
 
 --
diff --git a/documentation/modules/ROOT/pages/rest-client.adoc b/documentation/modules/ROOT/pages/rest-client.adoc
@@ -37,7 +37,7 @@ Maven::
 [.console-input]
 [source,bash,subs="+macros,+attributes"]
 ----
-./mvnwquarkus:add-extension -Dextensions=quarkus-rest-client-reactive,quarkus-rest-client-reactive-jsonb
+./mvnw quarkus:add-extension -Dextensions=quarkus-rest-client-reactive,quarkus-rest-client-reactive-jsonb
 ----
 
 --
diff --git a/documentation/modules/ROOT/pages/security-oidc.adoc b/documentation/modules/ROOT/pages/security-oidc.adoc
@@ -19,7 +19,7 @@ Maven::
 [.console-input]
 [source,bash,subs="+macros,+attributes"]
 ----
-./mvnwquarkus:add-extension -Dextensions=quarkus-oidc,quarkus-keycloak-authorization
+./mvnw quarkus:add-extension -Dextensions=quarkus-oidc,quarkus-keycloak-authorization
 ----
 
 --
diff --git a/documentation/modules/ROOT/pages/security.adoc b/documentation/modules/ROOT/pages/security.adoc
@@ -19,7 +19,7 @@ Maven::
 [.console-input]
 [source,bash,subs="+macros,+attributes"]
 ----
-./mvnwquarkus:add-extension -Dextension=quarkus-smallrye-jwt
+./mvnw quarkus:add-extension -Dextension=quarkus-smallrye-jwt
 ----
 
 --
diff --git a/documentation/modules/ROOT/pages/setup.adoc b/documentation/modules/ROOT/pages/setup.adoc
@@ -24,12 +24,12 @@ endif::workshop[]
 
 [TIP]
 ====
-GraalVM is only required if you intend to build a native image for your local operating system. If you want to create a container using a native image, you can use the Quarkus feature for this and don't need to install GraalVM locally.
+Installing GraalVM is only required if you intend to build a https://quarkus.io/guides/building-native-image[native binary] for your local operating system and don't have a container runtime. Otherwise Quarkus can build the native binary inside a GraalVM-like container based on the Mandrel project which is easier and doesn't require you to install and configure GraalVM on your machine. Note that for Windows users this feature might only work in WSL with Podman/Docker installed.
 ====
 
 NOTE: * You can also use Docker instead of Podman. The advantage of Podman is that it is 100% Free Open Source and does not need to run with elevated privileges. 
 
-IMPORTANT: We highly recommend Windows users to use https://learn.microsoft.com/en-us/windows/wsl/install[WSL].
+IMPORTANT: We highly recommend Windows users to use https://learn.microsoft.com/en-us/windows/wsl/install[WSL2] 
 
 [tabs]
 ====
@@ -51,10 +51,10 @@ Please have them installed and configured before you get started with any of the
 | `brew tap AdoptOpenJDK/openjdk && brew cask install adoptopenjdk17`
 | `dnf install java-17-openjdk.x86_64`
 | https://adoptopenjdk.net[Windows] (Make sure you set the `JAVA_HOME` environment variable and add `%JAVA_HOME%\bin` to your `PATH`)
-| **Graal VM**
-| https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-{graalvm-version}/graalvm-ce-java17-darwin-amd64-{graalvm-version}.tar.gz[GraalVM Community Edition {graalvm-version}]
-| https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-{graalvm-version}/graalvm-ce-java17-linux-amd64-{graalvm-version}.tar.gz[GraalVM Community Edition {graalvm-version}]
-| https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-{graalvm-version}/graalvm-ce-java17-windows-amd64-{graalvm-version}.zip[GraalVM Community Edition {graalvm-version}]
+| **Graal VM [Optional *]**
+| https://www.graalvm.org/latest/docs/getting-started/macos/[Download & install GraalVM for MacOS]
+| https://www.graalvm.org/latest/docs/getting-started/linux/[Download & install GraalVM for Linux]
+| https://www.graalvm.org/latest/docs/getting-started/windows/[Download & install GraalVM for Windows]
 
 |===
 
@@ -75,7 +75,7 @@ You can also install Java using https://sdkman.io[SDKMAN!]. This allows easy ver
 Container Image::
 +
 --
-You can run the tutorial from inside a container which has all the tools listed below installed and pre-configured.
+You can run the tutorial from inside a container which has all the tools listed above installed and pre-configured.
 [#docker-pull-tutorials-cli]
 [source,bash]
 -----
@@ -84,13 +84,13 @@ mkdir quarkus-tutorial
 cd quarkus-tutorial
 mkdir work
 docker run -ti -p 8080:8080 -v `pwd`/work:/work \
-  -v `./mvnwhelp:evaluate -Dexpression=settings.localRepository | grep \
+  -v `./mvnw help:evaluate -Dexpression=settings.localRepository | grep \
   -v '\[INFO\]' | grep -v '\[WARNING\]'`:/opt/developer/.m2/repository \
   --rm quay.io/rhdevelopers/tutorial-tools:0.0.7 bash
 
 # -p will map Quarkus running in the container to your host port
 # -v `pwd`... will map the host work subdirectory to the container /work directory, this is where you will create your application
-# -v `./mvnw...` will map your ~/.m2/repository of your host to the container repository to save downloading again between image runs
+# -v `./mvnw ...` will map your ~/.m2/repository of your host to the container repository to save downloading again between image runs
 -----
 
 [TIP]
diff --git a/documentation/modules/ROOT/pages/spring.adoc b/documentation/modules/ROOT/pages/spring.adoc
@@ -14,8 +14,8 @@ Maven::
 [.console-input]
 [source,bash,subs="+macros,+attributes"]
 ----
-./mvnwquarkus:remove-extension -Dextensions=quarkus-resteasy-reactive
-./mvnwquarkus:add-extension -Dextensions=quarkus-spring-web,quarkus-spring-data-jpa,quarkus-resteasy-reactive-jackson
+./mvnw quarkus:remove-extension -Dextensions=quarkus-resteasy-reactive
+./mvnw quarkus:add-extension -Dextensions=quarkus-spring-web,quarkus-spring-data-jpa,quarkus-resteasy-reactive-jackson
 ----
 
 --

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`#`
`4`	`4`	`# Before building the docker image run:`
`5`	`5`	`#`
`6`		`-# ./mvnwpackage`
	`6`	`+# ./mvnw package`
`7`	`7`	`#`
`8`	`8`	`# Then, build the image with:`
`9`	`9`	`#`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`#`
`4`	`4`	`# Before building the docker image run:`
`5`	`5`	`#`
`6`		`-# ./mvnwpackage -Pnative -Dquarkus.native.container-build=true`
	`6`	`+# ./mvnw package -Pnative -Dquarkus.native.container-build=true`
`7`	`7`	`#`
`8`	`8`	`# Then, build the image with:`
`9`	`9`	`#`