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

kdubois · web-flow · commit e1faaa78a78f · 2023-08-21T10:32:30.000+02:00
remove maven dependency and use ./mvnw instead
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: mvn package -Pnative -Dquarkus.native.container-build=true
+      run: ./mvnwpackage -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:
 #
-# mvn package
+# ./mvnwpackage
 #
 # 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:
 #
-# mvn package -Pnative -Dquarkus.native.container-build=true
+# ./mvnwpackage -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>mvn compile quarkus:dev</code>.
+        <p>If not already done, run the application in <em>dev mode</em> using: <code>./mvnwcompile 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/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"]
 ----
- mvn package 
+ ./mvnwpackage 
 ----
 
 a|
@@ -60,7 +60,7 @@ a|
 [.console-input]
 [source,bash,subs="+macros,+attributes"]
 ----
- mvn package -Dnative
+ ./mvnwpackage -Dnative
 ----
 
 a|
@@ -100,7 +100,7 @@ a|
 [.console-input]
 [source,bash,subs="+macros,+attributes"]
 ----
- mvn quarkus:image-build \
+ ./mvnwquarkus:image-build \
   -Dnative
 ----
 a|
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"]
 ----
-mvn "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"]
 ----
-mvn clean test
+./mvnwclean test
 ----
 
 --
@@ -143,7 +143,7 @@ Maven::
 [.console-input]
 [source,bash,subs="+macros,+attributes"]
 ----
-mvn quarkus:dev
+./mvnwquarkus: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"]
 ----
-mvn clean test
+./mvnwclean test
 ----
 
 --
@@ -184,7 +184,7 @@ Maven::
 [.console-input]
 [source,bash,subs="+macros,+attributes"]
 ----
-mvn quarkus:dev
+./mvnwquarkus: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"]
 ----
-mvn quarkus:remove-extension -Dextension=quarkus-jdbc-h2
-mvn quarkus:add-extension -Dextension=quarkus-jdbc-postgresql
+./mvnwquarkus:remove-extension -Dextension=quarkus-jdbc-h2
+./mvnwquarkus:add-extension -Dextension=quarkus-jdbc-postgresql
 ----
 
 --
@@ -127,7 +127,7 @@ Maven::
 [.console-input]
 [source,bash,subs="+macros,+attributes"]
 ----
-mvn test
+./mvnwtest
 ----
 
 --
@@ -265,7 +265,7 @@ Maven::
 [.console-input]
 [source,bash,subs="+macros,+attributes"]
 ----
-mvn clean package -DskipTests -Dquarkus.container-image.push=true
+./mvnwclean 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"]
 ----
-mvn quarkus:add-extension -Dextensions=quarkus-smallrye-fault-tolerance
+./mvnwquarkus: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"]
 ----
-mvn quarkus:add-extension -Dextension=quarkus-smallrye-health
+./mvnwquarkus: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"]
 ----
-mvn quarkus:add-extension -Dextensions=quarkus-smallrye-reactive-messaging-kafka
+./mvnwquarkus: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"]
 ----
-mvn quarkus:add-extension -Dextensions=quarkus-kubernetes,quarkus-container-image-jib
+./mvnwquarkus:add-extension -Dextensions=quarkus-kubernetes,quarkus-container-image-jib
 ----
 
 --
@@ -90,7 +90,7 @@ Maven::
 [.console-input]
 [source,bash,subs="+macros,+attributes"]
 ----
-mvn clean package -DskipTests -Dquarkus.container-image.push=true -Dquarkus.container-image.builder=jib
+./mvnwclean 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"]
 ----
-mvn quarkus:add-extension -Dextensions=quarkus-micrometer
+./mvnwquarkus:add-extension -Dextensions=quarkus-micrometer
 ----
 
 --
@@ -41,7 +41,7 @@ Maven::
 [.console-input]
 [source,bash,subs="+macros,+attributes"]
 ----
-mvn quarkus:add-extension -Dextensions=quarkus-micrometer-registry-prometheus
+./mvnwquarkus: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 `mvn quarkus:dev` running in your terminal. And that's perfectly fine!
+You probably still have `./mvnwquarkus: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"]
 ----
-mvn quarkus:add-extension -Dextension="quarkus-resteasy-reactive-jsonb, quarkus-jdbc-h2, quarkus-hibernate-orm-panache, quarkus-smallrye-openapi"
+./mvnwquarkus: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"]
 ----
-mvn quarkus:add-extension -Dextension=quarkus-smallrye-reactive-messaging
+./mvnwquarkus:add-extension -Dextension=quarkus-smallrye-reactive-messaging
 ----
 
 --
@@ -286,7 +286,7 @@ Maven::
 [.console-input]
 [source,bash,subs="+macros,+attributes"]
 ----
-mvn quarkus:add-extension -Dextension=quarkus-smallrye-fault-tolerance
+./mvnwquarkus: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"]
 ----
-mvn quarkus:add-extension -Dextension=quarkus-mutiny
+./mvnwquarkus: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"]
 ----
-mvn quarkus:add-extension -Dextensions=quarkus-rest-client-reactive,quarkus-rest-client-reactive-jsonb
+./mvnwquarkus: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"]
 ----
-mvn quarkus:add-extension -Dextensions=quarkus-oidc,quarkus-keycloak-authorization
+./mvnwquarkus: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"]
 ----
-mvn quarkus:add-extension -Dextension=quarkus-smallrye-jwt
+./mvnwquarkus:add-extension -Dextension=quarkus-smallrye-jwt
 ----
 
 --
diff --git a/documentation/modules/ROOT/pages/setup.adoc b/documentation/modules/ROOT/pages/setup.adoc
@@ -47,17 +47,10 @@ Please have them installed and configured before you get started with any of the
 | https://podman-desktop.io/downloads[Podman Desktop for Mac, window="_blank"]
 | https://podman-desktop.io/downloads[Podman Desktop for Linux, window="_blank"]
 | https://podman-desktop.io/downloads[Podman Desktop for Windows, window="_blank"]
-
 | **Java 17**
 | `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`)
-
-| **Apache Maven 3.8.1+**
-| `brew install maven`
-| `dnf install maven`
-| https://maven.apache.org/download.cgi[Windows] (Make sure you set the `MAVEN_HOME` environment variable and add `%MAVEN_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}]
@@ -67,15 +60,14 @@ Please have them installed and configured before you get started with any of the
 
 [TIP]
 =====
-You can also install Java and Maven using https://sdkman.io[SDKMAN!]. This allows easy version/distribution switching (and you can install the Quarkus CLI with it as well)
+You can also install Java using https://sdkman.io[SDKMAN!]. This allows easy version/distribution switching (and you can install the Quarkus CLI with it as well)
 [.console-input]
 [source,bash,subs="+macros,+attributes"]
 ----
   curl -s "https://get.sdkman.io" | bash
   source "$HOME/.sdkman/bin/sdkman-init.sh"
 
   sdk install java 
-  sdk install maven
   sdk install quarkus
 ----
 =====
@@ -92,13 +84,13 @@ mkdir quarkus-tutorial
 cd quarkus-tutorial
 mkdir work
 docker run -ti -p 8080:8080 -v `pwd`/work:/work \
-  -v `mvn help:evaluate -Dexpression=settings.localRepository | grep \
+  -v `./mvnwhelp: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 `mvn ...` 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"]
 ----
-mvn quarkus:remove-extension -Dextensions=quarkus-resteasy-reactive
-mvn quarkus:add-extension -Dextensions=quarkus-spring-web,quarkus-spring-data-jpa,quarkus-resteasy-reactive-jackson
+./mvnwquarkus:remove-extension -Dextensions=quarkus-resteasy-reactive
+./mvnwquarkus: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`		`-# mvn package`
	`6`	`+# ./mvnwpackage`
`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`		`-# mvn package -Pnative -Dquarkus.native.container-build=true`
	`6`	`+# ./mvnwpackage -Pnative -Dquarkus.native.container-build=true`
`7`	`7`	`#`
`8`	`8`	`# Then, build the image with:`
`9`	`9`	`#`