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:10 UTC
[maven-ear-plugin] branch master updated (d2a13b7 -> dbcdb6b)
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/maven-ear-plugin.git.
from d2a13b7 replace deprecated method no longer needed in Java 7+ (#26)
add 1e18480 [MEAR-216] - Handling test JARs as regular JARs
add b6ea8e6 [MEAR-216] - Fixed dependency on test JAR in test to follow https://maven.apache.org/guides/mini/guide-attached-tests.html.
add b5b2394 [MEAR-216] - Generation of deployment descriptor for test JARs
add 90df465 [MEAR-216] - Support of jboss-sar, jboss-har and jboss-par types of artifacts.
add 4fb3642 [MEAR-216] - Refactoring.
add c1ce541 [MEAR-153] - Documentation for EAR modules which artifacts are built with JBoss Packaging Maven Plugin.
add f771669 [MEAR-216] - Renamed integration tests to follow existing naming
add 27f6070 [MEAR-216] - Fixed typo in comments for tests.
add 5c1d3e4 [MEAR-216] - Fixed usage of JBoss Packaging Maven Plugin in test.
add c60981a Merge branch 'MEAR-153' into merge/MEAR-153_into_MEAR-216
add c656c58 Merge branch 'MEAR-153' into merge/MEAR-153_into_MEAR-216
add e220b9d Merge branch 'merge/MEAR-153_into_MEAR-216' into MEAR-216
add 0e2218a Merge branch 'master' into MEAR-216
new dbcdb6b Merge pull request #22 from mabrarov/MEAR-216
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
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 | 5 +-
.../{project-088 => project-095}/ear/pom.xml | 13 +-
.../{project-092/rar => project-095/jar}/pom.xml | 22 +--
.../projects/{project-088 => project-095}/pom.xml | 21 ++-
.../{project-088 => project-095}/war/pom.xml | 6 +-
.../war/src/main/webapp/WEB-INF/web.xml | 0
.../ear/expected-META-INF/application.xml | 12 +-
.../{project-088 => project-096}/ear/pom.xml | 27 ++--
.../war => project-096/jar-five}/pom.xml | 5 +-
.../rar => project-096/jar-four}/pom.xml | 22 +--
.../projects/{project-091 => project-096}/pom.xml | 36 ++---
.../{project-088 => project-096}/war/pom.xml | 11 +-
.../war/src/main/webapp/WEB-INF/web.xml | 0
.../ear/expected-META-INF/application.xml | 4 +-
.../ear/expected-META-INF/jboss-app.xml | 0
.../{project-094 => project-097}/ear/pom.xml | 41 +++---
.../{project-088/war => project-097/har}/pom.xml | 12 +-
.../src/main/resources/META-INF/jboss-service.xml | 0
.../{project-088/war => project-097/par}/pom.xml | 12 +-
.../jpdl/par-sample-one/processdefinition.xml} | 5 +-
.../projects/{project-094 => project-097}/pom.xml | 28 +---
.../sar-four => project-097/sar}/pom.xml | 10 +-
.../src/main/resources/META-INF/jboss-service.xml | 0
.../{project-094 => project-097}/war/pom.xml | 8 +-
.../war/src/main/webapp/WEB-INF/web.xml | 0
42 files changed, 393 insertions(+), 455 deletions(-)
delete mode 100644 src/main/java/org/apache/maven/plugins/ear/AcrModule.java
copy src/test/resources/projects/{project-088 => project-095}/ear/expected-META-INF/application.xml (90%)
copy src/test/resources/projects/{project-088 => project-095}/ear/pom.xml (83%)
copy src/test/resources/projects/{project-092/rar => project-095/jar}/pom.xml (80%)
copy src/test/resources/projects/{project-088 => project-095}/pom.xml (75%)
copy src/test/resources/projects/{project-088 => project-095}/war/pom.xml (88%)
copy src/test/resources/projects/{project-094 => project-095}/war/src/main/webapp/WEB-INF/web.xml (100%)
copy src/test/resources/projects/{project-088 => project-096}/ear/expected-META-INF/application.xml (86%)
copy src/test/resources/projects/{project-088 => project-096}/ear/pom.xml (71%)
copy src/test/resources/projects/{project-094/war => project-096/jar-five}/pom.xml (90%)
copy src/test/resources/projects/{project-092/rar => project-096/jar-four}/pom.xml (80%)
copy src/test/resources/projects/{project-091 => project-096}/pom.xml (75%)
copy src/test/resources/projects/{project-088 => project-096}/war/pom.xml (81%)
copy src/test/resources/projects/{project-094 => project-096}/war/src/main/webapp/WEB-INF/web.xml (100%)
copy src/test/resources/projects/{project-091 => project-097}/ear/expected-META-INF/application.xml (91%)
copy src/test/resources/projects/{project-094 => project-097}/ear/expected-META-INF/jboss-app.xml (100%)
copy src/test/resources/projects/{project-094 => project-097}/ear/pom.xml (70%)
copy src/test/resources/projects/{project-088/war => project-097/har}/pom.xml (80%)
copy src/test/resources/projects/{project-094/sar => project-097/har}/src/main/resources/META-INF/jboss-service.xml (100%)
copy src/test/resources/projects/{project-088/war => project-097/par}/pom.xml (80%)
copy src/test/resources/projects/{project-092/sar-four/src/main/resources/META-INF/jboss-service.xml => project-097/par/src/main/jpdl/par-sample-one/processdefinition.xml} (89%)
copy src/test/resources/projects/{project-094 => project-097}/pom.xml (77%)
copy src/test/resources/projects/{project-092/sar-four => project-097/sar}/pom.xml (82%)
copy src/test/resources/projects/{project-094 => project-097}/sar/src/main/resources/META-INF/jboss-service.xml (100%)
copy src/test/resources/projects/{project-094 => project-097}/war/pom.xml (84%)
copy src/test/resources/projects/{project-094 => project-097}/war/src/main/webapp/WEB-INF/web.xml (100%)
[maven-ear-plugin] 01/01: Merge pull request #22 from
mabrarov/MEAR-216
Posted by hb...@apache.org.
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(-)