Skip to content

Commit 1e4755a

Browse files
Merge pull request #323 from wttech/mvnw-improvement
Maven wrapper improvement
2 parents 7f842be + c548709 commit 1e4755a

4 files changed

Lines changed: 34 additions & 12 deletions

File tree

pkg/project/app_classic/Taskfile.yml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@ env:
88
AEM_ENV: '{{.AEM_ENV | default "local"}}'
99
AEM_INSTANCE_PROCESSING_MODE: auto
1010
AEM_OUTPUT_VALUE: NONE
11-
JAVA_HOME:
12-
sh: sh aemw vendor list -V javaHome
11+
AEM_JAVA_ENABLED: true
1312

1413
dotenv:
1514
- '.env' # VCS-ignored, user-specific
@@ -197,9 +196,7 @@ tasks:
197196

198197
aem:build:version:
199198
desc: check build tool versions
200-
cmds:
201-
- echo "JAVA_HOME=${JAVA_HOME}"
202-
- sh mvnw -version
199+
cmd: sh mvnw --version
203200

204201
aem:deploy:
205202
desc: deploy AEM application

pkg/project/app_cloud/Taskfile.yml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@ env:
88
AEM_ENV: '{{.AEM_ENV | default "local"}}'
99
AEM_INSTANCE_PROCESSING_MODE: auto
1010
AEM_OUTPUT_VALUE: NONE
11-
JAVA_HOME:
12-
sh: sh aemw vendor list -V javaHome
11+
AEM_JAVA_ENABLED: true
1312

1413
dotenv:
1514
- '.env' # VCS-ignored, user-specific
@@ -192,9 +191,7 @@ tasks:
192191

193192
aem:build:version:
194193
desc: check build tool versions
195-
cmds:
196-
- echo "JAVA_HOME=${JAVA_HOME}"
197-
- sh mvnw -version
194+
cmd: sh mvnw --version
198195

199196
aem:deploy:
200197
desc: deploy AEM application

pkg/project/common/mvnw

Lines changed: 29 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/project/instance/Taskfile.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@ env:
88
AEM_ENV: '{{.AEM_ENV | default "local"}}'
99
AEM_INSTANCE_PROCESSING_MODE: auto
1010
AEM_OUTPUT_VALUE: NONE
11-
JAVA_HOME:
12-
sh: sh aemw vendor list -V javaHome
11+
AEM_JAVA_ENABLED: true
1312

1413
dotenv:
1514
- '.env' # VCS-ignored, user-specific

0 commit comments

Comments
 (0)