Skip to content

Commit 2ff9a2e

Browse files
authored
[MDEPLOY-206] Deploy improvements (#38)
Changes: * remove deployInParallel, deploy plugin when deployAtEnd always creates one deploy request and passes it to resolver * remove misleading log "deferring deploy" when the module is actually last and is not deferred by deploys all * Remove obsolete IT --- https://issues.apache.org/jira/browse/MDEPLOY-206
1 parent 59bee05 commit 2ff9a2e

File tree

11 files changed

+14
-361
lines changed

11 files changed

+14
-361
lines changed

src/it/MDEPLOY-224_deploy-at-end-only-modules/verify.groovy

+2-1
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,5 @@ def buildLog = new File ( basedir, "build.log").text
2525

2626
assert ! buildLog.contains('[INFO] Deferring deploy for org.apache.maven.its.mdeploy-224:parent:1.0 at end')
2727
assert buildLog.contains('[INFO] Deferring deploy for org.apache.maven.its.mdeploy-224:module1:1.0 at end')
28-
assert buildLog.contains('[INFO] Deferring deploy for org.apache.maven.its.mdeploy-224:module2:1.0 at end')
28+
// Last module does not emit this misleading message, as it IS "the end", not deferring anymore
29+
// assert buildLog.contains('[INFO] Deferring deploy for org.apache.maven.its.mdeploy-224:module2:1.0 at end')

src/it/deploy-at-end-parallel/invoker.properties

-18
This file was deleted.

src/it/deploy-at-end-parallel/module1/pom.xml

-25
This file was deleted.

src/it/deploy-at-end-parallel/module2/pom.xml

-25
This file was deleted.

src/it/deploy-at-end-parallel/module3/pom.xml

-25
This file was deleted.

src/it/deploy-at-end-parallel/module4/pom.xml

-25
This file was deleted.

src/it/deploy-at-end-parallel/pom.xml

-103
This file was deleted.

src/it/deploy-at-end-parallel/setup.groovy

-26
This file was deleted.

src/it/deploy-at-end-parallel/verify.groovy

-37
This file was deleted.

src/it/deploy-at-end-pass/verify.groovy

+2-1
Original file line numberDiff line numberDiff line change
@@ -27,5 +27,6 @@ File buildLog = new File( basedir, 'build.log' )
2727
assert buildLog.exists()
2828
assert buildLog.text.contains( "[INFO] Deferring deploy for org.apache.maven.its.deploy.dae.pass:dae:1.0 at end" )
2929
assert buildLog.text.contains( "[INFO] Deferring deploy for org.apache.maven.its.deploy.dae.pass:module1:1.0 at end" )
30-
assert buildLog.text.contains( "[INFO] Deferring deploy for org.apache.maven.its.deploy.dae.pass:module3:1.0 at end" )
30+
// Last module does not emit this misleading message, as it IS "the end", not deferring anymore
31+
//assert buildLog.text.contains( "[INFO] Deferring deploy for org.apache.maven.its.deploy.dae.pass:module3:1.0 at end" )
3132

0 commit comments

Comments
 (0)