This is an automated email from the ASF dual-hosted git repository. elharo pushed a commit to branch resolve-conflicts-pr-540-1793192342 in repository https://gitbox.apache.org/repos/asf/maven-ear-plugin.git
commit fbdcece725c2b65f1a033b276d487e3236b19d89 Merge: ff8a3b8 83f96d7 Author: Elliotte Rusty Harold <[email protected]> AuthorDate: Wed Oct 28 12:56:32 2026 +0000 Resolve merge conflict src/it/skinny-wars-javaee5/verify.groovy | 2 +- .../java/org/apache/maven/plugins/ear/EarMojo.java | 48 ++++++++++------------ .../org/apache/maven/plugins/ear/it/EarMojoIT.java | 11 +++-- 3 files changed, 29 insertions(+), 32 deletions(-) diff --cc src/it/skinny-wars-javaee5/verify.groovy index 0311d2c,5e82942..c0c3257 --- a/src/it/skinny-wars-javaee5/verify.groovy +++ b/src/it/skinny-wars-javaee5/verify.groovy @@@ -130,12 -130,12 +130,12 @@@ assertJar( earLibDir + "commons-lang-co assertJar( earLibDir + "org.apache.commons-commons-collections4-4.2.jar", null, null, false, null ); -String[] includedEntries = { +includedEntries = [ "WEB-INF/web.xml", "META-INF/MANIFEST.MF" -}; +]; - String[] warModule1ExpectedClassPathElements = [ "lib/commons-lang-commons-lang-2.6.jar" ]; -String[] warModule1ExpectedClassPathElements = { "commons-lang-2.6.jar" }; ++String[] warModule1ExpectedClassPathElements = [ "commons-lang-2.6.jar" ]; assertJar( earBaseDir + "org.apache.maven.its.ear.skinnywars-war-module1-1.0.war", includedEntries, warModuleExcludedEntries, true, warModule1ExpectedClassPathElements );
