diff --git a/Mage.Client/pom.xml b/Mage.Client/pom.xml index ff47708a065..1fe29e95f4e 100644 --- a/Mage.Client/pom.xml +++ b/Mage.Client/pom.xml @@ -224,6 +224,7 @@ + ${project.basedir}/.. src/main/resources/META-INF/MANIFEST.MF diff --git a/Mage.Common/pom.xml b/Mage.Common/pom.xml index 79fef78ce73..dfa8dea5840 100644 --- a/Mage.Common/pom.xml +++ b/Mage.Common/pom.xml @@ -96,4 +96,8 @@ mage-common + + + ${project.basedir}/.. + diff --git a/Mage.Plugins/Mage.Counter.Plugin/pom.xml b/Mage.Plugins/Mage.Counter.Plugin/pom.xml index c4e805cea5d..feef21718b4 100644 --- a/Mage.Plugins/Mage.Counter.Plugin/pom.xml +++ b/Mage.Plugins/Mage.Counter.Plugin/pom.xml @@ -38,4 +38,8 @@ mage-counter-plugin + + + ${project.basedir}/../.. + diff --git a/Mage.Plugins/pom.xml b/Mage.Plugins/pom.xml index 2bcf6c49a71..dbb03e73eae 100644 --- a/Mage.Plugins/pom.xml +++ b/Mage.Plugins/pom.xml @@ -19,4 +19,8 @@ Mage.Counter.Plugin + + ${project.basedir}/.. + + diff --git a/Mage.Reports/pom.xml b/Mage.Reports/pom.xml new file mode 100644 index 00000000000..fa0934a9ee8 --- /dev/null +++ b/Mage.Reports/pom.xml @@ -0,0 +1,81 @@ + + + 4.0.0 + + + org.mage + mage-root + 1.4.50 + + + mage-reports + pom + Mage Reports + + + + + + org.codehaus.gmaven + groovy-maven-plugin + 2.1.1 + + + patch-maven-dependencies + process-resources + + execute + + + + // add all modules to the dependencies to make Jacoco aggregate report work (without listing them manually) + // see https://github.com/jacoco/jacoco/issues/974 + for (dependencyProject in session.getProjectDependencyGraph().getSortedProjects()) { + def dependency = new org.apache.maven.model.Dependency() as Object + dependency.setGroupId(dependencyProject.getGroupId()) + dependency.setArtifactId(dependencyProject.getArtifactId()) + dependency.setVersion(dependencyProject.getVersion()) + dependency.setScope("compile") + + project.getDependencies().add(dependency) + } + + + + + + + + + org.jacoco + jacoco-maven-plugin + + + + report-aggregate + verify + + report-aggregate + + + ${jacoco.formats} + + + + + + + + + ${project.basedir}/.. + + \ No newline at end of file diff --git a/Mage.Server.Console/pom.xml b/Mage.Server.Console/pom.xml index 4d9a46a3ec6..d99a3e07d80 100644 --- a/Mage.Server.Console/pom.xml +++ b/Mage.Server.Console/pom.xml @@ -70,4 +70,8 @@ mage-serverconsole + + + ${project.basedir}/.. + diff --git a/Mage.Server.Plugins/Mage.Deck.Constructed/pom.xml b/Mage.Server.Plugins/Mage.Deck.Constructed/pom.xml index 920e14a7f62..8e86fa082ed 100644 --- a/Mage.Server.Plugins/Mage.Deck.Constructed/pom.xml +++ b/Mage.Server.Plugins/Mage.Deck.Constructed/pom.xml @@ -49,5 +49,7 @@ mage-deck-constructed - + + ${project.basedir}/../.. + diff --git a/Mage.Server.Plugins/Mage.Deck.Limited/pom.xml b/Mage.Server.Plugins/Mage.Deck.Limited/pom.xml index fca4f79491e..f1685d0daf7 100644 --- a/Mage.Server.Plugins/Mage.Deck.Limited/pom.xml +++ b/Mage.Server.Plugins/Mage.Deck.Limited/pom.xml @@ -45,5 +45,7 @@ mage-deck-limited - + + ${project.basedir}/../.. + diff --git a/Mage.Server.Plugins/Mage.Game.BrawlDuel/pom.xml b/Mage.Server.Plugins/Mage.Game.BrawlDuel/pom.xml index 3234d4613e3..fc9b4e667df 100644 --- a/Mage.Server.Plugins/Mage.Game.BrawlDuel/pom.xml +++ b/Mage.Server.Plugins/Mage.Game.BrawlDuel/pom.xml @@ -45,6 +45,8 @@ mage-game-brawlduel - + + ${project.basedir}/../.. + diff --git a/Mage.Server.Plugins/Mage.Game.BrawlFreeForAll/pom.xml b/Mage.Server.Plugins/Mage.Game.BrawlFreeForAll/pom.xml index c25c971b568..10a9cc60d0b 100644 --- a/Mage.Server.Plugins/Mage.Game.BrawlFreeForAll/pom.xml +++ b/Mage.Server.Plugins/Mage.Game.BrawlFreeForAll/pom.xml @@ -44,6 +44,8 @@ mage-game-brawlfreeforall - + + ${project.basedir}/../.. + diff --git a/Mage.Server.Plugins/Mage.Game.CanadianHighlanderDuel/pom.xml b/Mage.Server.Plugins/Mage.Game.CanadianHighlanderDuel/pom.xml index 29714e464ad..3dc5137260f 100644 --- a/Mage.Server.Plugins/Mage.Game.CanadianHighlanderDuel/pom.xml +++ b/Mage.Server.Plugins/Mage.Game.CanadianHighlanderDuel/pom.xml @@ -45,6 +45,8 @@ mage-game-canadianhighlanderduel - + + ${project.basedir}/../.. + diff --git a/Mage.Server.Plugins/Mage.Game.CommanderDuel/pom.xml b/Mage.Server.Plugins/Mage.Game.CommanderDuel/pom.xml index 999630d4961..ff1d054a57d 100644 --- a/Mage.Server.Plugins/Mage.Game.CommanderDuel/pom.xml +++ b/Mage.Server.Plugins/Mage.Game.CommanderDuel/pom.xml @@ -45,6 +45,8 @@ mage-game-commanderduel - + + ${project.basedir}/../.. + diff --git a/Mage.Server.Plugins/Mage.Game.CommanderFreeForAll/pom.xml b/Mage.Server.Plugins/Mage.Game.CommanderFreeForAll/pom.xml index da85d1a8793..07f1a413f74 100644 --- a/Mage.Server.Plugins/Mage.Game.CommanderFreeForAll/pom.xml +++ b/Mage.Server.Plugins/Mage.Game.CommanderFreeForAll/pom.xml @@ -44,6 +44,8 @@ mage-game-freeforall - + + ${project.basedir}/../.. + diff --git a/Mage.Server.Plugins/Mage.Game.CustomPillarOfTheParunsDuel/pom.xml b/Mage.Server.Plugins/Mage.Game.CustomPillarOfTheParunsDuel/pom.xml index 7456f5aa11e..7efef8c7082 100644 --- a/Mage.Server.Plugins/Mage.Game.CustomPillarOfTheParunsDuel/pom.xml +++ b/Mage.Server.Plugins/Mage.Game.CustomPillarOfTheParunsDuel/pom.xml @@ -50,6 +50,8 @@ mage-game-custompillaroftheparunsduel - + + ${project.basedir}/../.. + diff --git a/Mage.Server.Plugins/Mage.Game.FreeForAll/pom.xml b/Mage.Server.Plugins/Mage.Game.FreeForAll/pom.xml index bebdf25c837..ed890370e79 100644 --- a/Mage.Server.Plugins/Mage.Game.FreeForAll/pom.xml +++ b/Mage.Server.Plugins/Mage.Game.FreeForAll/pom.xml @@ -45,5 +45,7 @@ mage-game-freeforall - + + ${project.basedir}/../.. + diff --git a/Mage.Server.Plugins/Mage.Game.FreeformCommanderDuel/pom.xml b/Mage.Server.Plugins/Mage.Game.FreeformCommanderDuel/pom.xml index 83f678f4fd6..a0fe1f84de4 100644 --- a/Mage.Server.Plugins/Mage.Game.FreeformCommanderDuel/pom.xml +++ b/Mage.Server.Plugins/Mage.Game.FreeformCommanderDuel/pom.xml @@ -45,6 +45,8 @@ mage-game-freeformcommanderduel - + + ${project.basedir}/../.. + diff --git a/Mage.Server.Plugins/Mage.Game.FreeformCommanderFreeForAll/pom.xml b/Mage.Server.Plugins/Mage.Game.FreeformCommanderFreeForAll/pom.xml index 9004a1006f2..bddcb5714a4 100644 --- a/Mage.Server.Plugins/Mage.Game.FreeformCommanderFreeForAll/pom.xml +++ b/Mage.Server.Plugins/Mage.Game.FreeformCommanderFreeForAll/pom.xml @@ -44,6 +44,8 @@ mage-game-freeforall - + + ${project.basedir}/../.. + diff --git a/Mage.Server.Plugins/Mage.Game.FreeformUnlimitedCommander/pom.xml b/Mage.Server.Plugins/Mage.Game.FreeformUnlimitedCommander/pom.xml index 5c1be165376..16f1630ab57 100644 --- a/Mage.Server.Plugins/Mage.Game.FreeformUnlimitedCommander/pom.xml +++ b/Mage.Server.Plugins/Mage.Game.FreeformUnlimitedCommander/pom.xml @@ -51,6 +51,8 @@ mage-game-freeformunlimitedcommander - + + ${project.basedir}/../.. + diff --git a/Mage.Server.Plugins/Mage.Game.MomirDuel/pom.xml b/Mage.Server.Plugins/Mage.Game.MomirDuel/pom.xml index c1be5c157f0..9df3782b72a 100644 --- a/Mage.Server.Plugins/Mage.Game.MomirDuel/pom.xml +++ b/Mage.Server.Plugins/Mage.Game.MomirDuel/pom.xml @@ -44,7 +44,9 @@ mage-game-momirduel - - + + + ${project.basedir}/../.. + diff --git a/Mage.Server.Plugins/Mage.Game.MomirGame/pom.xml b/Mage.Server.Plugins/Mage.Game.MomirGame/pom.xml index 01e2f6be71f..4b8d2fb7eb7 100644 --- a/Mage.Server.Plugins/Mage.Game.MomirGame/pom.xml +++ b/Mage.Server.Plugins/Mage.Game.MomirGame/pom.xml @@ -49,7 +49,9 @@ mage-game-momir - - + + + ${project.basedir}/../.. + diff --git a/Mage.Server.Plugins/Mage.Game.OathbreakerDuel/pom.xml b/Mage.Server.Plugins/Mage.Game.OathbreakerDuel/pom.xml index ef78e3b70cd..165407d5654 100644 --- a/Mage.Server.Plugins/Mage.Game.OathbreakerDuel/pom.xml +++ b/Mage.Server.Plugins/Mage.Game.OathbreakerDuel/pom.xml @@ -50,6 +50,8 @@ mage-game-oathbreakerduel - + + ${project.basedir}/../.. + diff --git a/Mage.Server.Plugins/Mage.Game.OathbreakerFreeForAll/pom.xml b/Mage.Server.Plugins/Mage.Game.OathbreakerFreeForAll/pom.xml index 6d42894a514..468fd01798f 100644 --- a/Mage.Server.Plugins/Mage.Game.OathbreakerFreeForAll/pom.xml +++ b/Mage.Server.Plugins/Mage.Game.OathbreakerFreeForAll/pom.xml @@ -45,6 +45,8 @@ mage-game-freeforall - + + ${project.basedir}/../.. + diff --git a/Mage.Server.Plugins/Mage.Game.PennyDreadfulCommanderFreeForAll/pom.xml b/Mage.Server.Plugins/Mage.Game.PennyDreadfulCommanderFreeForAll/pom.xml index 89b29661b85..3795fa41f05 100644 --- a/Mage.Server.Plugins/Mage.Game.PennyDreadfulCommanderFreeForAll/pom.xml +++ b/Mage.Server.Plugins/Mage.Game.PennyDreadfulCommanderFreeForAll/pom.xml @@ -44,6 +44,8 @@ mage-game-freeforall - + + ${project.basedir}/../.. + diff --git a/Mage.Server.Plugins/Mage.Game.TinyLeadersDuel/pom.xml b/Mage.Server.Plugins/Mage.Game.TinyLeadersDuel/pom.xml index d2d7b7a37cd..7305e0dab41 100644 --- a/Mage.Server.Plugins/Mage.Game.TinyLeadersDuel/pom.xml +++ b/Mage.Server.Plugins/Mage.Game.TinyLeadersDuel/pom.xml @@ -44,7 +44,9 @@ mage-game-tinyleadersduel - - + + + ${project.basedir}/../.. + diff --git a/Mage.Server.Plugins/Mage.Game.TwoPlayerDuel/pom.xml b/Mage.Server.Plugins/Mage.Game.TwoPlayerDuel/pom.xml index c179973b8b4..824d68bc89b 100644 --- a/Mage.Server.Plugins/Mage.Game.TwoPlayerDuel/pom.xml +++ b/Mage.Server.Plugins/Mage.Game.TwoPlayerDuel/pom.xml @@ -45,6 +45,8 @@ mage-game-twoplayerduel - + + ${project.basedir}/../.. + diff --git a/Mage.Server.Plugins/Mage.Player.AI.DraftBot/pom.xml b/Mage.Server.Plugins/Mage.Player.AI.DraftBot/pom.xml index cbd5cdeef8e..4c02450c7fe 100644 --- a/Mage.Server.Plugins/Mage.Player.AI.DraftBot/pom.xml +++ b/Mage.Server.Plugins/Mage.Player.AI.DraftBot/pom.xml @@ -50,6 +50,8 @@ mage-player-ai-draft-bot - + + ${project.basedir}/../.. + diff --git a/Mage.Server.Plugins/Mage.Player.AI.MA/pom.xml b/Mage.Server.Plugins/Mage.Player.AI.MA/pom.xml index 6e66b799834..0e3857d37ae 100644 --- a/Mage.Server.Plugins/Mage.Player.AI.MA/pom.xml +++ b/Mage.Server.Plugins/Mage.Player.AI.MA/pom.xml @@ -50,6 +50,8 @@ mage-player-ai-ma - + + ${project.basedir}/../.. + diff --git a/Mage.Server.Plugins/Mage.Player.AI/pom.xml b/Mage.Server.Plugins/Mage.Player.AI/pom.xml index 7daebd3d0ac..f50a620ece1 100644 --- a/Mage.Server.Plugins/Mage.Player.AI/pom.xml +++ b/Mage.Server.Plugins/Mage.Player.AI/pom.xml @@ -54,6 +54,8 @@ mage-player-ai - + + ${project.basedir}/../.. + diff --git a/Mage.Server.Plugins/Mage.Player.AIMCTS/pom.xml b/Mage.Server.Plugins/Mage.Player.AIMCTS/pom.xml index d60b4e4453a..6d5ad3848b0 100644 --- a/Mage.Server.Plugins/Mage.Player.AIMCTS/pom.xml +++ b/Mage.Server.Plugins/Mage.Player.AIMCTS/pom.xml @@ -54,6 +54,8 @@ mage-player-ai-mcts - + + ${project.basedir}/../.. + diff --git a/Mage.Server.Plugins/Mage.Player.AIMinimax/pom.xml b/Mage.Server.Plugins/Mage.Player.AIMinimax/pom.xml index 238f320ccfe..305709ae6b1 100644 --- a/Mage.Server.Plugins/Mage.Player.AIMinimax/pom.xml +++ b/Mage.Server.Plugins/Mage.Player.AIMinimax/pom.xml @@ -50,6 +50,8 @@ mage-player-aiminimax - + + ${project.basedir}/../.. + diff --git a/Mage.Server.Plugins/Mage.Player.Human/pom.xml b/Mage.Server.Plugins/Mage.Player.Human/pom.xml index debdf041c6f..8d92562b225 100644 --- a/Mage.Server.Plugins/Mage.Player.Human/pom.xml +++ b/Mage.Server.Plugins/Mage.Player.Human/pom.xml @@ -50,6 +50,8 @@ mage-player-human - + + ${project.basedir}/../.. + diff --git a/Mage.Server.Plugins/Mage.Tournament.BoosterDraft/pom.xml b/Mage.Server.Plugins/Mage.Tournament.BoosterDraft/pom.xml index 804b34c1296..36ffaac9fee 100644 --- a/Mage.Server.Plugins/Mage.Tournament.BoosterDraft/pom.xml +++ b/Mage.Server.Plugins/Mage.Tournament.BoosterDraft/pom.xml @@ -45,6 +45,8 @@ mage-tournament-booster-draft - + + ${project.basedir}/../.. + diff --git a/Mage.Server.Plugins/Mage.Tournament.Constructed/pom.xml b/Mage.Server.Plugins/Mage.Tournament.Constructed/pom.xml index e05217f82d5..cbddebd63a1 100644 --- a/Mage.Server.Plugins/Mage.Tournament.Constructed/pom.xml +++ b/Mage.Server.Plugins/Mage.Tournament.Constructed/pom.xml @@ -45,6 +45,8 @@ mage-tournament-constructed - + + ${project.basedir}/../.. + \ No newline at end of file diff --git a/Mage.Server.Plugins/Mage.Tournament.Sealed/pom.xml b/Mage.Server.Plugins/Mage.Tournament.Sealed/pom.xml index 1b1f728cacf..33ad3f123e0 100644 --- a/Mage.Server.Plugins/Mage.Tournament.Sealed/pom.xml +++ b/Mage.Server.Plugins/Mage.Tournament.Sealed/pom.xml @@ -45,6 +45,8 @@ mage-tournament-sealed - + + ${project.basedir}/../.. + diff --git a/Mage.Server.Plugins/pom.xml b/Mage.Server.Plugins/pom.xml index a2cf852313a..f5ff42689c7 100644 --- a/Mage.Server.Plugins/pom.xml +++ b/Mage.Server.Plugins/pom.xml @@ -46,4 +46,8 @@ Mage.Tournament.Sealed + + ${project.basedir}/.. + + diff --git a/Mage.Server/pom.xml b/Mage.Server/pom.xml index 8e545b76686..28e9f587753 100644 --- a/Mage.Server/pom.xml +++ b/Mage.Server/pom.xml @@ -347,6 +347,8 @@ mage-server - + + ${project.basedir}/.. + diff --git a/Mage.Sets/pom.xml b/Mage.Sets/pom.xml index b14b92ca739..5786c9bfb78 100644 --- a/Mage.Sets/pom.xml +++ b/Mage.Sets/pom.xml @@ -42,6 +42,8 @@ mage-sets - + + ${project.basedir}/.. + diff --git a/Mage.Tests/pom.xml b/Mage.Tests/pom.xml index 33eda6a3fb0..4c96e7b484c 100644 --- a/Mage.Tests/pom.xml +++ b/Mage.Tests/pom.xml @@ -139,6 +139,8 @@ mage-tests - + + ${project.basedir}/.. + diff --git a/Mage.Verify/pom.xml b/Mage.Verify/pom.xml index f24567db19a..605f131f0ea 100644 --- a/Mage.Verify/pom.xml +++ b/Mage.Verify/pom.xml @@ -90,6 +90,8 @@ mage-verify - + + ${project.basedir}/.. + diff --git a/Mage/pom.xml b/Mage/pom.xml index 6205dce3b35..397e7b79384 100644 --- a/Mage/pom.xml +++ b/Mage/pom.xml @@ -99,6 +99,7 @@ + ${project.basedir}/.. ${project.basedir}/src/main/proto ${project.build.directory}/generated-sources diff --git a/pom.xml b/pom.xml index dd31b2f799c..cabed2ccfab 100644 --- a/pom.xml +++ b/pom.xml @@ -2,6 +2,7 @@ 4.0.0 + org.mage mage-root 1.4.50 @@ -9,6 +10,47 @@ Mage Root Mage Root POM + + + 1.8 + ${project.basedir} + + + 1.4.50 + -Dfile.encoding=UTF-8 + UTF-8 + yyyy-MM-dd'T'HH:mm:ss'Z' + + + false + + + XML,HTML + true + + + ${root.dir}/Mage.Reports/target/site/jacoco-aggregate/jacoco.xml + + @@ -37,12 +79,14 @@ - - + org.jacoco jacoco-maven-plugin - 0.8.7 + 0.8.11 @@ -50,22 +94,6 @@ prepare-agent - - - generate-code-coverage-report - verify - - report - - - - - report-aggregate - verify - - report-aggregate - - @@ -213,6 +241,7 @@ Mage.Server.Console Mage.Tests Mage.Verify + Mage.Reports @@ -234,36 +263,6 @@ - - - 1.8 - 1.4.50 - -Dfile.encoding=UTF-8 - UTF-8 - yyyy-MM-dd'T'HH:mm:ss'Z' - - - false - - - true - - - Mage.Verify/target/site/jacoco-aggregate/jacoco.xml - ${project.basedir}/../${aggregate.report.dir} - -