You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2020/12/20 09:26:11 UTC

[maven-ear-plugin] 01/01: Merge pull request #22 from mabrarov/MEAR-216

This is an automated email from the ASF dual-hosted git repository.

hboutemy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-ear-plugin.git

commit dbcdb6b04306e84dd9608467ef19b9c8fc274787
Merge: d2a13b7 0e2218a
Author: Hervé Boutemy <hb...@apache.org>
AuthorDate: Sun Dec 20 10:26:02 2020 +0100

    Merge pull request #22 from mabrarov/MEAR-216
    
    [MEAR-216] Handling test JARs as regular JARs

 pom.xml                                            |   2 +
 .../maven/plugins/ear/AbstractEarModule.java       |  11 ++
 .../org/apache/maven/plugins/ear/AcrModule.java    | 119 ----------------
 .../apache/maven/plugins/ear/AppClientModule.java  |  13 +-
 .../apache/maven/plugins/ear/EarModuleFactory.java |  51 +++++--
 .../java/org/apache/maven/plugins/ear/EarMojo.java |   4 +-
 .../apache/maven/plugins/ear/EjbClientModule.java  |  14 +-
 .../org/apache/maven/plugins/ear/EjbModule.java    |  14 +-
 .../org/apache/maven/plugins/ear/HarModule.java    |  14 +-
 .../org/apache/maven/plugins/ear/JarModule.java    |  15 +-
 .../org/apache/maven/plugins/ear/ParModule.java    |  14 +-
 .../org/apache/maven/plugins/ear/RarModule.java    |  14 +-
 .../org/apache/maven/plugins/ear/SarModule.java    |  14 +-
 .../org/apache/maven/plugins/ear/WebModule.java    |  14 +-
 .../org/apache/maven/plugins/ear/WsrModule.java    |  14 +-
 src/site/apt/modules.apt.vm                        | 158 ++++++++++++---------
 .../org/apache/maven/plugins/ear/it/EarMojoIT.java |  63 +++++++-
 .../ear/expected-META-INF/application.xml          |  29 ++++
 .../resources/projects/project-095/ear/pom.xml     |  57 ++++++++
 .../resources/projects/project-095/jar/pom.xml     |  54 +++++++
 src/test/resources/projects/project-095/pom.xml    |  77 ++++++++++
 .../resources/projects/project-095/war/pom.xml     |  41 ++++++
 .../war/src/main/webapp/WEB-INF/web.xml            |  24 ++++
 .../ear/expected-META-INF/application.xml          |  34 +++++
 .../resources/projects/project-096/ear/pom.xml     |  69 +++++++++
 .../projects/project-096/jar-five/pom.xml          |  38 +++++
 .../projects/project-096/jar-four/pom.xml          |  54 +++++++
 src/test/resources/projects/project-096/pom.xml    |  84 +++++++++++
 .../resources/projects/project-096/war/pom.xml     |  46 ++++++
 .../war/src/main/webapp/WEB-INF/web.xml            |  24 ++++
 .../ear/expected-META-INF/application.xml          |  31 ++++
 .../ear/expected-META-INF/jboss-app.xml            |  31 ++++
 .../resources/projects/project-097/ear/pom.xml     |  83 +++++++++++
 .../resources/projects/project-097/har/pom.xml     |  33 +++++
 .../src/main/resources/META-INF/jboss-service.xml  |  21 +++
 .../resources/projects/project-097/par/pom.xml     |  33 +++++
 .../main/jpdl/par-sample-one/processdefinition.xml |  22 +++
 src/test/resources/projects/project-097/pom.xml    |  90 ++++++++++++
 .../resources/projects/project-097/sar/pom.xml     |  33 +++++
 .../src/main/resources/META-INF/jboss-service.xml  |  21 +++
 .../resources/projects/project-097/war/pom.xml     |  33 +++++
 .../war/src/main/webapp/WEB-INF/web.xml            |  24 ++++
 42 files changed, 1341 insertions(+), 293 deletions(-)