Skip to content

Commit

Permalink
[MDEPLOY-206] Deploy improvements (#38)
Browse files Browse the repository at this point in the history
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
  • Loading branch information
cstamas committed Feb 2, 2023
1 parent 59bee05 commit 2ff9a2e
Show file tree
Hide file tree
Showing 11 changed files with 14 additions and 361 deletions.
3 changes: 2 additions & 1 deletion src/it/MDEPLOY-224_deploy-at-end-only-modules/verify.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,5 @@ def buildLog = new File ( basedir, "build.log").text

assert ! buildLog.contains('[INFO] Deferring deploy for org.apache.maven.its.mdeploy-224:parent:1.0 at end')
assert buildLog.contains('[INFO] Deferring deploy for org.apache.maven.its.mdeploy-224:module1:1.0 at end')
assert buildLog.contains('[INFO] Deferring deploy for org.apache.maven.its.mdeploy-224:module2:1.0 at end')
// Last module does not emit this misleading message, as it IS "the end", not deferring anymore
// assert buildLog.contains('[INFO] Deferring deploy for org.apache.maven.its.mdeploy-224:module2:1.0 at end')
18 changes: 0 additions & 18 deletions src/it/deploy-at-end-parallel/invoker.properties

This file was deleted.

25 changes: 0 additions & 25 deletions src/it/deploy-at-end-parallel/module1/pom.xml

This file was deleted.

25 changes: 0 additions & 25 deletions src/it/deploy-at-end-parallel/module2/pom.xml

This file was deleted.

25 changes: 0 additions & 25 deletions src/it/deploy-at-end-parallel/module3/pom.xml

This file was deleted.

25 changes: 0 additions & 25 deletions src/it/deploy-at-end-parallel/module4/pom.xml

This file was deleted.

103 changes: 0 additions & 103 deletions src/it/deploy-at-end-parallel/pom.xml

This file was deleted.

26 changes: 0 additions & 26 deletions src/it/deploy-at-end-parallel/setup.groovy

This file was deleted.

37 changes: 0 additions & 37 deletions src/it/deploy-at-end-parallel/verify.groovy

This file was deleted.

3 changes: 2 additions & 1 deletion src/it/deploy-at-end-pass/verify.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -27,5 +27,6 @@ File buildLog = new File( basedir, 'build.log' )
assert buildLog.exists()
assert buildLog.text.contains( "[INFO] Deferring deploy for org.apache.maven.its.deploy.dae.pass:dae:1.0 at end" )
assert buildLog.text.contains( "[INFO] Deferring deploy for org.apache.maven.its.deploy.dae.pass:module1:1.0 at end" )
assert buildLog.text.contains( "[INFO] Deferring deploy for org.apache.maven.its.deploy.dae.pass:module3:1.0 at end" )
// Last module does not emit this misleading message, as it IS "the end", not deferring anymore
//assert buildLog.text.contains( "[INFO] Deferring deploy for org.apache.maven.its.deploy.dae.pass:module3:1.0 at end" )

Loading

0 comments on commit 2ff9a2e

Please sign in to comment.