This is an automated email from the ASF dual-hosted git repository. elharo pushed a commit to branch fix/MEAR-303-ejb-client-missing in repository https://gitbox.apache.org/repos/asf/maven-ear-plugin.git
commit 281e575c21283ee992bb6cf433f76d790fe1c49c Merge: 83f96d7 ff8a3b8 Author: Elliotte Rusty Harold <[email protected]> AuthorDate: Wed Oct 28 13:11:06 2026 +0000 Resolve merge conflicts .asf.yaml | 32 + .github/pull_request_template.md | 24 +- .github/release-drafter.yml | 1 + .github/workflows/maven-verify.yml | 2 +- .github/workflows/pr-automation.yml | 8 +- .github/workflows/{stale.yml => pr-check.yml} | 13 +- .../workflows/{maven-verify.yml => pr-signal.yml} | 18 +- .github/workflows/release-drafter.yml | 2 +- .github/workflows/stale.yml | 2 +- pom.xml | 33 +- src/it/MEAR-198/{verify.bsh => verify.groovy} | 0 .../{verify.bsh => verify.groovy} | 26 +- src/it/basic/{verify.bsh => verify.groovy} | 6 +- src/it/jboss/{verify.bsh => verify.groovy} | 6 +- .../non-skinny-wars/{verify.bsh => verify.groovy} | 12 +- .../{verify.bsh => verify.groovy} | 8 +- .../{verify.bsh => verify.groovy} | 8 +- .../{verify.bsh => verify.groovy} | 6 +- .../{verify.bsh => verify.groovy} | 16 +- .../{verify.bsh => verify.groovy} | 16 +- .../{verify.bsh => verify.groovy} | 24 +- .../{verify.bsh => verify.groovy} | 34 +- src/it/skinny-wars/{verify.bsh => verify.groovy} | 16 +- .../maven/plugins/ear/AbstractEarModule.java | 3 +- .../apache/maven/plugins/ear/AbstractEarMojo.java | 6 +- .../maven/plugins/ear/ApplicationXmlWriter.java | 125 +--- .../java/org/apache/maven/plugins/ear/EarMojo.java | 15 +- .../apache/maven/plugins/ear/FileNameMapping.java | 74 +++ .../org/apache/maven/plugins/ear/ResourceRef.java | 5 +- .../examples/customize-file-name-mapping.apt.vm | 81 --- .../examples/customizing-a-module-filename.apt.vm | 51 -- .../apt/examples/customizing-context-root.apt.vm | 52 -- .../examples/customizing-module-location.apt.vm | 82 --- .../apt/examples/customizing-module-uri.apt.vm | 53 -- .../examples/eclipse-and-maven-integration.apt.vm | 63 -- src/site/apt/examples/excluding-a-module.apt.vm | 52 -- .../apt/examples/excluding-files-from-ear.apt.vm | 209 ------- src/site/apt/examples/filtering-advanced.apt.vm | 105 ---- src/site/apt/examples/filtering-sources.apt.vm | 70 --- src/site/apt/examples/generating-jboss-app.apt.vm | 50 -- src/site/apt/examples/generating-modules-id.apt.vm | 71 --- ...a-third-party-library-in-application-xml.apt.vm | 53 -- src/site/apt/examples/skinny-modules.apt.vm | 191 ------ src/site/apt/examples/skinny-wars.apt.vm | 116 ---- ...ntries-for-the-generated-application-xml.apt.vm | 53 -- ...-roles-for-the-generated-application-xml.apt.vm | 53 -- src/site/apt/examples/unpacking-a-module.apt.vm | 74 --- src/site/apt/examples/using-app-client.apt.vm | 54 -- src/site/apt/index.apt.vm | 172 ------ src/site/apt/modules.apt.vm | 641 --------------------- src/site/apt/tests.apt | 193 ------- src/site/apt/usage.apt.vm | 203 ------- src/site/fml/faq.fml | 76 --- .../examples/customize-file-name-mapping.md.vm | 77 +++ .../examples/customizing-a-module-filename.md.vm | 49 ++ .../examples/customizing-context-root.md.vm | 49 ++ .../examples/customizing-module-location.md.vm | 76 +++ .../markdown/examples/customizing-module-uri.md.vm | 49 ++ .../examples/eclipse-and-maven-integration.md.vm | 58 ++ .../markdown/examples/excluding-a-module.md.vm | 49 ++ .../examples/excluding-files-from-ear.md.vm | 174 ++++++ .../markdown/examples/filtering-advanced.md.vm | 95 +++ src/site/markdown/examples/filtering-sources.md.vm | 64 ++ .../markdown/examples/generating-jboss-app.md.vm | 47 ++ .../markdown/examples/generating-modules-id.md.vm | 67 +++ ...-a-third-party-library-in-application-xml.md.vm | 49 ++ src/site/markdown/examples/skinny-modules.md.vm | 166 ++++++ src/site/markdown/examples/skinny-wars.md.vm | 100 ++++ ...entries-for-the-generated-application-xml.md.vm | 51 ++ ...ntries-for-the-generated-application-xml.md.vm} | 50 +- ...ntries-for-the-generated-application-xml.md.vm} | 48 +- ...y-roles-for-the-generated-application-xml.md.vm | 51 ++ .../markdown/examples/unpacking-a-module.md.vm | 69 +++ src/site/markdown/examples/using-app-client.md | 48 ++ src/site/markdown/faq.md | 64 ++ src/site/markdown/index.md | 101 ++++ src/site/markdown/modules.md.vm | 301 ++++++++++ src/site/markdown/tests.md | 108 ++++ src/site/markdown/usage.md.vm | 160 +++++ src/site/site.xml | 6 +- src/site/xdoc/download.xml.vm | 7 +- .../plugins/ear/ApplicationXmlWriterTest.java | 74 +++ .../org/apache/maven/plugins/ear/EarMojoTest.java | 57 ++ .../maven/plugins/ear/FileNameMappingTest.java | 158 +++++ .../maven/plugins/ear/it/AbstractEarPluginIT.java | 141 ++++- .../org/apache/maven/plugins/ear/it/EarMojoIT.java | 13 + src/test/resources/projects/project-103/pom.xml | 50 ++ 87 files changed, 2914 insertions(+), 3171 deletions(-) diff --cc src/it/skinny-wars-javaee5/verify.groovy index 5e82942,0311d2c..4ee3eb1 --- 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" }; assertJar( earBaseDir + "org.apache.maven.its.ear.skinnywars-war-module1-1.0.war", includedEntries, warModuleExcludedEntries, true, warModule1ExpectedClassPathElements );
