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/06 14:02:57 UTC
[maven-ear-plugin] branch mear-216 updated (1e18480 -> 0e2218a)
This is an automated email from the ASF dual-hosted git repository.
elharo pushed a change to branch mear-216
in repository https://gitbox.apache.org/repos/asf/maven-ear-plugin.git.
from 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 ed2e25b [MEAR-153] - Support of skinnyModules option for WAR, SAR, HAR, RAR and WSR EAR modules. [MEAR-153] - Configurable library directory for each EAR module overriding default value which depends on EAR module type.
add 4d853ca [MEAR-153] - Extended tests and consistency b/w bundleDir and libDirectory parameters of EAR module
add a0e17f2 [MEAR-153] - Documentation for skinny modules and libDirectory property of EAR modules
add 83a46e0 [MEAR-153] - Minor JavaDoc, code style and documentation fixes.
add 928261a [MEAR-153] - Fixed usage of JBoss Packaging Maven Plugin in tests.
add cea24aa [MEAR-153] - More precise validation of Class-Path entry of module manifest taking into account that existing empty entry is not the same as missing entry.
add d1c3331 [MEAR-153] - Renamed integration tests to follow existing naming
add c60981a Merge branch 'MEAR-153' into merge/MEAR-153_into_MEAR-216
add 724dc04 [MEAR-153] - Fixed usage of JBoss Packaging Maven Plugin in tests.
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 162365a [MEAR-288] Check timestamp file name when removing JARs and modifying manifest (#23)
add 66ec216 remove unused mockito dependency
add cd5eee3 Merge pull request #25 from apache/dep
add 4e9dda8 replace deprecated method no longer needed in Java 7+
add 6ff83e7 Revert "replace deprecated method no longer needed in Java 7+"
add 9a2af31 make plexus inject dependency non-transitive
add 7fd24d8 Merge pull request #27 from apache/inje
add 30395be [MEAR-153] Raised version for next release: new feature implemented
add 954b736 Merge branch 'mear-153'
add 0e2218a Merge branch 'master' into MEAR-216
No new revisions were added by this update.
Summary of changes:
pom.xml | 22 ++-
.../war-module/pom.xml | 2 +-
.../filenamemapping-usage-fail/war-module/pom.xml | 2 +-
src/it/non-skinny-wars/war-module/pom.xml | 2 +-
.../war-module/pom.xml | 2 +-
.../war-module/pom.xml | 2 +-
src/it/skinny-wars-javaee5/war-module/pom.xml | 2 +-
src/it/skinny-wars-timestamp/ear-module/pom.xml | 8 +-
src/it/skinny-wars-timestamp/pom.xml | 6 +-
src/it/skinny-wars-timestamp/verify.bsh | 136 ++++++++-----
.../{war-module => war-module-one}/pom.xml | 12 +-
.../src/main/webapp/WEB-INF/web.xml | 0
.../{war-module => war-module-two}/pom.xml | 19 +-
.../src/main/webapp/WEB-INF/web.xml | 0
src/it/skinny-wars/war-module/pom.xml | 2 +-
.../maven/plugins/ear/AbstractEarModule.java | 67 ++++---
.../org/apache/maven/plugins/ear/AcrModule.java | 119 ------------
.../apache/maven/plugins/ear/AppClientModule.java | 13 +-
.../org/apache/maven/plugins/ear/EarModule.java | 3 +-
.../apache/maven/plugins/ear/EarModuleFactory.java | 51 +++--
.../java/org/apache/maven/plugins/ear/EarMojo.java | 87 +++++++--
.../apache/maven/plugins/ear/EjbClientModule.java | 14 +-
.../org/apache/maven/plugins/ear/EjbModule.java | 14 +-
.../org/apache/maven/plugins/ear/HarModule.java | 18 +-
.../org/apache/maven/plugins/ear/JarModule.java | 15 +-
.../org/apache/maven/plugins/ear/ParModule.java | 14 +-
.../org/apache/maven/plugins/ear/RarModule.java | 18 +-
.../org/apache/maven/plugins/ear/SarModule.java | 18 +-
.../org/apache/maven/plugins/ear/WebModule.java | 26 +--
.../org/apache/maven/plugins/ear/WsrModule.java | 14 +-
src/site/apt/examples/skinny-modules.apt.vm | 191 ++++++++++++++++++
src/site/apt/index.apt.vm | 11 +-
src/site/apt/modules.apt.vm | 213 ++++++++++++++-------
src/site/site.xml | 1 +
src/test/filtered-resources/settings.xml | 1 +
.../apache/maven/plugins/ear/EarModuleTest.java | 15 +-
.../maven/plugins/ear/it/AbstractEarPluginIT.java | 157 ++++++++++++++-
.../org/apache/maven/plugins/ear/it/EarMojoIT.java | 211 +++++++++++++++++++-
.../ear/expected-META-INF/application.xml | 9 +-
.../ear}/expected-META-INF/jboss-app.xml | 16 +-
.../resources/projects/project-092/ear/pom.xml | 66 ++++++-
.../{project-089/ejb => project-092/har}/pom.xml | 15 +-
.../src/main/resources/META-INF/jboss-service.xml} | 9 +-
src/test/resources/projects/project-092/pom.xml | 66 ++++++-
.../{project-089/ejb => project-092/rar}/pom.xml | 9 +-
.../project-092/rar/src/main/rar/META-INF/ra.xml} | 11 +-
.../rar/src/main/rar/SomeResource.txt} | 4 +-
.../projects/project-092/{war => sar-four}/pom.xml | 7 +-
.../src/main/resources/META-INF/jboss-service.xml} | 9 +-
.../ejb => project-092/sar-three}/pom.xml | 12 +-
.../src/main/resources/META-INF/jboss-service.xml} | 9 +-
.../ejb => project-092/sar-two}/pom.xml | 12 +-
.../src/main/resources/META-INF/jboss-service.xml} | 9 +-
.../resources/projects/project-092/war/pom.xml | 20 +-
.../ear/expected-META-INF/application.xml | 4 +-
.../ear}/expected-META-INF/jboss-app.xml | 10 +-
.../{project-090 => project-093}/ear/pom.xml | 42 +++-
.../{project-088/war => project-093/har}/pom.xml | 12 +-
.../src/main/resources/META-INF/jboss-service.xml} | 9 +-
.../projects/{project-090 => project-093}/pom.xml | 44 +++--
.../{project-089/ejb => project-093/rar}/pom.xml | 13 +-
.../project-093/rar/src/main/rar/META-INF/ra.xml} | 11 +-
.../rar/src/main/rar/SomeResource.txt} | 4 +-
.../{project-089/ejb => project-093/sar}/pom.xml | 15 +-
.../src/main/resources/META-INF/jboss-service.xml} | 9 +-
.../{project-091 => project-093}/war/pom.xml | 4 +-
.../war/src/main/webapp/WEB-INF/web.xml | 0
.../ear/expected-META-INF/application.xml | 4 +-
.../ear}/expected-META-INF/jboss-app.xml | 10 +-
.../{project-090 => project-094}/ear/pom.xml | 40 ++--
.../{project-088/war => project-094/har}/pom.xml | 12 +-
.../src/main/resources/META-INF/jboss-service.xml} | 9 +-
.../projects/{project-090 => project-094}/pom.xml | 44 +++--
.../{project-088/war => project-094/rar}/pom.xml | 12 +-
.../project-094/rar/src/main/rar/META-INF/ra.xml} | 11 +-
.../rar/src/main/rar/SomeResource.txt} | 4 +-
.../{project-088/war => project-094/sar}/pom.xml | 12 +-
.../src/main/resources/META-INF/jboss-service.xml} | 9 +-
.../{project-088 => project-094}/war/pom.xml | 6 +-
.../war/src/main/webapp/WEB-INF/web.xml | 0
.../ear/expected-META-INF/application.xml | 2 +-
.../{project-092 => project-095}/ear/pom.xml | 4 +-
.../{project-092 => project-095}/jar/pom.xml | 2 +-
.../projects/{project-092 => project-095}/pom.xml | 3 +-
.../{project-092 => project-095}/war/pom.xml | 3 +-
.../war/src/main/webapp/WEB-INF/web.xml | 0
.../ear/expected-META-INF/application.xml | 12 +-
.../{project-092 => project-096}/ear/pom.xml | 18 +-
.../war => project-096/jar-five}/pom.xml | 7 +-
.../jar => project-096/jar-four}/pom.xml | 2 +-
.../projects/{project-092 => project-096}/pom.xml | 12 +-
.../{project-092 => project-096}/war/pom.xml | 8 +-
.../war/src/main/webapp/WEB-INF/web.xml | 0
.../ear/expected-META-INF/application.xml | 4 +-
.../ear}/expected-META-INF/jboss-app.xml | 10 +-
.../{project-089 => project-097}/ear/pom.xml | 36 +++-
.../{project-088/war => project-097/har}/pom.xml | 12 +-
.../src/main/resources/META-INF/jboss-service.xml} | 9 +-
.../{project-088/war => project-097/par}/pom.xml | 12 +-
.../jpdl/par-sample-one/processdefinition.xml} | 8 +-
.../projects/{project-091 => project-097}/pom.xml | 38 ++--
.../{project-088/war => project-097/sar}/pom.xml | 12 +-
.../src/main/resources/META-INF/jboss-service.xml} | 9 +-
.../{project-088 => project-097}/war/pom.xml | 10 +-
.../war/src/main/webapp/WEB-INF/web.xml | 0
105 files changed, 1621 insertions(+), 753 deletions(-)
copy src/it/skinny-wars-timestamp/{war-module => war-module-one}/pom.xml (79%)
rename src/it/skinny-wars-timestamp/{war-module => war-module-one}/src/main/webapp/WEB-INF/web.xml (100%)
rename src/it/skinny-wars-timestamp/{war-module => war-module-two}/pom.xml (68%)
copy src/it/{skinny-wars/war-module => skinny-wars-timestamp/war-module-two}/src/main/webapp/WEB-INF/web.xml (100%)
delete mode 100644 src/main/java/org/apache/maven/plugins/ear/AcrModule.java
create mode 100644 src/site/apt/examples/skinny-modules.apt.vm
copy src/test/resources/projects/{project-033 => project-092/ear}/expected-META-INF/jboss-app.xml (70%)
copy src/test/resources/projects/{project-089/ejb => project-092/har}/pom.xml (81%)
copy src/{it/jboss/src/main/application/META-INF/appserver-application.xml => test/resources/projects/project-092/har/src/main/resources/META-INF/jboss-service.xml} (86%)
copy src/test/resources/projects/{project-089/ejb => project-092/rar}/pom.xml (88%)
copy src/{it/jboss/src/main/application/META-INF/appserver-application.xml => test/resources/projects/project-092/rar/src/main/rar/META-INF/ra.xml} (82%)
copy src/test/resources/projects/{project-014/src/main/application/ignore.txt => project-092/rar/src/main/rar/SomeResource.txt} (93%)
copy src/test/resources/projects/project-092/{war => sar-four}/pom.xml (90%)
copy src/{it/jboss/src/main/application/META-INF/appserver-application.xml => test/resources/projects/project-092/sar-four/src/main/resources/META-INF/jboss-service.xml} (86%)
copy src/test/resources/projects/{project-091/ejb => project-092/sar-three}/pom.xml (82%)
copy src/{it/jboss/src/main/application/META-INF/appserver-application.xml => test/resources/projects/project-092/sar-three/src/main/resources/META-INF/jboss-service.xml} (86%)
copy src/test/resources/projects/{project-091/ejb => project-092/sar-two}/pom.xml (82%)
copy src/{it/jboss/src/main/application/META-INF/appserver-application.xml => test/resources/projects/project-092/sar-two/src/main/resources/META-INF/jboss-service.xml} (86%)
copy src/test/resources/projects/{project-089 => project-093}/ear/expected-META-INF/application.xml (91%)
copy src/test/resources/projects/{project-033 => project-093/ear}/expected-META-INF/jboss-app.xml (80%)
copy src/test/resources/projects/{project-090 => project-093}/ear/pom.xml (61%)
copy src/test/resources/projects/{project-088/war => project-093/har}/pom.xml (80%)
copy src/{it/jboss/src/main/application/META-INF/appserver-application.xml => test/resources/projects/project-093/har/src/main/resources/META-INF/jboss-service.xml} (86%)
copy src/test/resources/projects/{project-090 => project-093}/pom.xml (72%)
copy src/test/resources/projects/{project-089/ejb => project-093/rar}/pom.xml (84%)
copy src/{it/jboss/src/main/application/META-INF/appserver-application.xml => test/resources/projects/project-093/rar/src/main/rar/META-INF/ra.xml} (82%)
copy src/test/resources/projects/{project-014/src/main/application/ignore.txt => project-093/rar/src/main/rar/SomeResource.txt} (93%)
copy src/test/resources/projects/{project-089/ejb => project-093/sar}/pom.xml (81%)
copy src/{it/jboss/src/main/application/META-INF/appserver-application.xml => test/resources/projects/project-093/sar/src/main/resources/META-INF/jboss-service.xml} (86%)
copy src/test/resources/projects/{project-091 => project-093}/war/pom.xml (93%)
copy src/test/resources/projects/{project-092 => project-093}/war/src/main/webapp/WEB-INF/web.xml (100%)
copy src/test/resources/projects/{project-091 => project-094}/ear/expected-META-INF/application.xml (90%)
copy src/test/resources/projects/{project-033 => project-094/ear}/expected-META-INF/jboss-app.xml (80%)
copy src/test/resources/projects/{project-090 => project-094}/ear/pom.xml (62%)
copy src/test/resources/projects/{project-088/war => project-094/har}/pom.xml (80%)
copy src/{it/jboss/src/main/application/META-INF/appserver-application.xml => test/resources/projects/project-094/har/src/main/resources/META-INF/jboss-service.xml} (86%)
copy src/test/resources/projects/{project-090 => project-094}/pom.xml (72%)
copy src/test/resources/projects/{project-088/war => project-094/rar}/pom.xml (80%)
copy src/{it/jboss/src/main/application/META-INF/appserver-application.xml => test/resources/projects/project-094/rar/src/main/rar/META-INF/ra.xml} (82%)
copy src/test/resources/projects/{project-014/src/main/application/ignore.txt => project-094/rar/src/main/rar/SomeResource.txt} (93%)
copy src/test/resources/projects/{project-088/war => project-094/sar}/pom.xml (80%)
copy src/{it/jboss/src/main/application/META-INF/appserver-application.xml => test/resources/projects/project-094/sar/src/main/resources/META-INF/jboss-service.xml} (86%)
copy src/test/resources/projects/{project-088 => project-094}/war/pom.xml (88%)
copy src/test/resources/projects/{project-092 => project-094}/war/src/main/webapp/WEB-INF/web.xml (100%)
copy src/test/resources/projects/{project-092 => project-095}/ear/expected-META-INF/application.xml (95%)
copy src/test/resources/projects/{project-092 => project-095}/ear/pom.xml (93%)
copy src/test/resources/projects/{project-092 => project-095}/jar/pom.xml (96%)
copy src/test/resources/projects/{project-092 => project-095}/pom.xml (96%)
copy src/test/resources/projects/{project-092 => project-095}/war/pom.xml (93%)
copy src/test/resources/projects/{project-092 => 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-092 => project-096}/ear/pom.xml (74%)
copy src/test/resources/projects/{project-088/war => project-096/jar-five}/pom.xml (87%)
rename src/test/resources/projects/{project-092/jar => project-096/jar-four}/pom.xml (96%)
copy src/test/resources/projects/{project-092 => project-096}/pom.xml (87%)
copy src/test/resources/projects/{project-092 => project-096}/war/pom.xml (85%)
copy src/test/resources/projects/{project-092 => 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-033 => project-097/ear}/expected-META-INF/jboss-app.xml (80%)
copy src/test/resources/projects/{project-089 => project-097}/ear/pom.xml (66%)
copy src/test/resources/projects/{project-088/war => project-097/har}/pom.xml (80%)
copy src/{it/jboss/src/main/application/META-INF/appserver-application.xml => test/resources/projects/project-097/har/src/main/resources/META-INF/jboss-service.xml} (86%)
copy src/test/resources/projects/{project-088/war => project-097/par}/pom.xml (80%)
copy src/test/resources/projects/{project-041/expected-META-INF/jboss-app.xml => project-097/par/src/main/jpdl/par-sample-one/processdefinition.xml} (81%)
copy src/test/resources/projects/{project-091 => project-097}/pom.xml (75%)
copy src/test/resources/projects/{project-088/war => project-097/sar}/pom.xml (80%)
copy src/{it/jboss/src/main/application/META-INF/appserver-application.xml => test/resources/projects/project-097/sar/src/main/resources/META-INF/jboss-service.xml} (86%)
copy src/test/resources/projects/{project-088 => project-097}/war/pom.xml (82%)
copy src/test/resources/projects/{project-092 => project-097}/war/src/main/webapp/WEB-INF/web.xml (100%)