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

[maven-ear-plugin] branch lang updated (c48c466 -> 92328d5)

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

elharo pushed a change to branch lang
in repository https://gitbox.apache.org/repos/asf/maven-ear-plugin.git.


    from c48c466  code review
     add 61e6194  [MEAR-292] skipClassPathModification in case of undefined Class-Path entry of MANIFEST.mf (#29)
     add beb1ce7  [MEAR-294] Removal of provided artifacts from the Class-Path entry of MANIFEST.mf (#31)
     add 92328d5  Merge branch 'master' into lang

No new revisions were added by this update.

Summary of changes:
 .../ear-module/pom.xml                             |   8 +-
 src/it/MEAR-243-skinny-wars-provided/pom.xml       |   5 +-
 src/it/MEAR-243-skinny-wars-provided/verify.bsh    | 138 +++++++++++--------
 .../{war-module => war-module-one}/pom.xml         |   2 +-
 .../src/main/webapp/WEB-INF/web.xml                |   0
 .../war-module-two}/pom.xml                        |   9 +-
 .../src/main/webapp/WEB-INF/web.xml                |   0
 src/it/skinny-wars-javaee5/ear-module/pom.xml      |  21 ++-
 src/it/skinny-wars-javaee5/pom.xml                 |  23 +++-
 src/it/skinny-wars-javaee5/verify.bsh              | 153 ++++++++++++++-------
 src/it/skinny-wars-javaee5/war-module/pom.xml      |  47 -------
 .../war-module1}/pom.xml                           |  12 +-
 .../war-module1}/src/main/webapp/WEB-INF/web.xml   |   0
 .../war-module2}/pom.xml                           |  17 +--
 .../war-module2}/src/main/webapp/WEB-INF/web.xml   |   0
 .../war-module3}/pom.xml                           |  16 ++-
 .../war-module3}/src/main/webapp/WEB-INF/web.xml   |   0
 .../apache/maven/plugins/ear/AbstractEarMojo.java  |  22 ++-
 .../java/org/apache/maven/plugins/ear/EarMojo.java |  44 +++---
 .../org/apache/maven/plugins/ear/it/EarMojoIT.java |  34 +++--
 .../resources/projects/project-092/ear/pom.xml     |   5 +
 src/test/resources/projects/project-092/pom.xml    |   5 +
 .../resources/projects/project-092/war/pom.xml     |   4 +
 .../ear/expected-META-INF/application.xml          |   4 +
 .../resources/projects/project-094/ear/pom.xml     |  11 ++
 .../{project-089 => project-094}/ejb/pom.xml       |   6 +-
 .../ejb/src/main/java/eartest/Stub.java            |   0
 src/test/resources/projects/project-094/pom.xml    |  12 ++
 28 files changed, 389 insertions(+), 209 deletions(-)
 rename src/it/MEAR-243-skinny-wars-provided/{war-module => war-module-one}/pom.xml (97%)
 rename src/it/{skinny-wars-javaee5/war-module => MEAR-243-skinny-wars-provided/war-module-one}/src/main/webapp/WEB-INF/web.xml (100%)
 copy src/it/{filenamemapping-usage-fail/war-module => MEAR-243-skinny-wars-provided/war-module-two}/pom.xml (85%)
 rename src/it/MEAR-243-skinny-wars-provided/{war-module => war-module-two}/src/main/webapp/WEB-INF/web.xml (100%)
 delete mode 100644 src/it/skinny-wars-javaee5/war-module/pom.xml
 copy src/it/{filenamemapping-usage-fail/war-module => skinny-wars-javaee5/war-module1}/pom.xml (83%)
 copy src/it/{skinny-wars/war-module => skinny-wars-javaee5/war-module1}/src/main/webapp/WEB-INF/web.xml (100%)
 copy src/it/{skinny-wars-filenamemapping-no-version => skinny-wars-javaee5/war-module2}/pom.xml (79%)
 copy src/it/{skinny-wars/war-module => skinny-wars-javaee5/war-module2}/src/main/webapp/WEB-INF/web.xml (100%)
 copy src/it/{filenamemapping-usage-fail/war-module => skinny-wars-javaee5/war-module3}/pom.xml (78%)
 copy src/it/{skinny-wars/war-module => skinny-wars-javaee5/war-module3}/src/main/webapp/WEB-INF/web.xml (100%)
 copy src/test/resources/projects/{project-089 => project-094}/ejb/pom.xml (90%)
 copy src/test/resources/projects/{project-091 => project-094}/ejb/src/main/java/eartest/Stub.java (100%)