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/06 11:03:12 UTC
[maven-ear-plugin] branch master updated (7fd24d8 -> 954b736)
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 7fd24d8 Merge pull request #27 from apache/inje
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 724dc04 [MEAR-153] - Fixed usage of JBoss Packaging Maven Plugin in tests.
add 30395be [MEAR-153] Raised version for next release: new feature implemented
new 954b736 Merge branch 'mear-153'
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 | 6 +-
.../maven/plugins/ear/AbstractEarModule.java | 56 +++---
.../org/apache/maven/plugins/ear/EarModule.java | 3 +-
.../java/org/apache/maven/plugins/ear/EarMojo.java | 29 +++-
.../org/apache/maven/plugins/ear/HarModule.java | 4 +
.../org/apache/maven/plugins/ear/RarModule.java | 4 +
.../org/apache/maven/plugins/ear/SarModule.java | 4 +
.../org/apache/maven/plugins/ear/WebModule.java | 12 +-
src/site/apt/examples/skinny-modules.apt.vm | 191 +++++++++++++++++++++
src/site/apt/index.apt.vm | 11 +-
src/site/apt/modules.apt.vm | 55 ++++++
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 | 164 ++++++++++++++++++
.../ear/expected-META-INF/application.xml | 5 +-
.../ear}/expected-META-INF/jboss-app.xml | 16 +-
.../{project-036 => project-092/ear}/pom.xml | 90 +++++-----
.../{project-089/ejb => project-092/har}/pom.xml | 15 +-
.../src/main/resources/META-INF/jboss-service.xml} | 9 +-
.../projects/{project-089 => project-092}/pom.xml | 58 +++++--
.../{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 +-
.../war => project-092/sar-four}/pom.xml | 8 +-
.../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 +-
.../{project-090 => project-092}/war/pom.xml | 2 +-
.../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-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
59 files changed, 1034 insertions(+), 307 deletions(-)
create mode 100644 src/site/apt/examples/skinny-modules.apt.vm
copy src/test/resources/projects/{project-091 => project-092}/ear/expected-META-INF/application.xml (87%)
copy src/test/resources/projects/{project-033 => project-092/ear}/expected-META-INF/jboss-app.xml (70%)
copy src/test/resources/projects/{project-036 => project-092/ear}/pom.xml (52%)
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 => project-092}/pom.xml (65%)
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-088/war => project-092/sar-four}/pom.xml (87%)
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-090 => project-092}/war/pom.xml (96%)
copy src/test/resources/projects/{project-091 => project-092}/war/src/main/webapp/WEB-INF/web.xml (100%)
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-091 => 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-091 => project-094}/war/src/main/webapp/WEB-INF/web.xml (100%)
[maven-ear-plugin] 01/01: Merge branch 'mear-153'
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 954b7363f7d522c0477207ca16b13b64272650fd
Merge: 7fd24d8 30395be
Author: Hervé Boutemy <hb...@apache.org>
AuthorDate: Sun Dec 6 12:02:46 2020 +0100
Merge branch 'mear-153'
pom.xml | 6 +-
.../maven/plugins/ear/AbstractEarModule.java | 56 +++---
.../org/apache/maven/plugins/ear/EarModule.java | 3 +-
.../java/org/apache/maven/plugins/ear/EarMojo.java | 29 +++-
.../org/apache/maven/plugins/ear/HarModule.java | 4 +
.../org/apache/maven/plugins/ear/RarModule.java | 4 +
.../org/apache/maven/plugins/ear/SarModule.java | 4 +
.../org/apache/maven/plugins/ear/WebModule.java | 12 +-
src/site/apt/examples/skinny-modules.apt.vm | 191 +++++++++++++++++++++
src/site/apt/index.apt.vm | 11 +-
src/site/apt/modules.apt.vm | 55 ++++++
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 | 164 ++++++++++++++++++
.../ear/expected-META-INF/application.xml | 32 ++++
.../ear/expected-META-INF/jboss-app.xml | 37 ++++
.../resources/projects/project-092/ear/pom.xml | 113 ++++++++++++
.../resources/projects/project-092/har/pom.xml | 58 +++++++
.../src/main/resources/META-INF/jboss-service.xml | 21 +++
src/test/resources/projects/project-092/pom.xml | 124 +++++++++++++
.../resources/projects/project-092/rar/pom.xml | 54 ++++++
.../project-092/rar/src/main/rar/META-INF/ra.xml | 23 +++
.../project-092/rar/src/main/rar/SomeResource.txt | 16 ++
.../projects/project-092/sar-four/pom.xml | 39 +++++
.../src/main/resources/META-INF/jboss-service.xml | 21 +++
.../projects/project-092/sar-three/pom.xml | 55 ++++++
.../src/main/resources/META-INF/jboss-service.xml | 21 +++
.../resources/projects/project-092/sar-two/pom.xml | 55 ++++++
.../src/main/resources/META-INF/jboss-service.xml | 21 +++
.../resources/projects/project-092/war/pom.xml | 54 ++++++
.../war/src/main/webapp/WEB-INF/web.xml | 24 +++
.../ear/expected-META-INF/application.xml | 32 ++++
.../ear/expected-META-INF/jboss-app.xml | 31 ++++
.../resources/projects/project-093/ear/pom.xml | 92 ++++++++++
.../resources/projects/project-093/har/pom.xml | 43 +++++
.../src/main/resources/META-INF/jboss-service.xml | 21 +++
src/test/resources/projects/project-093/pom.xml | 110 ++++++++++++
.../resources/projects/project-093/rar/pom.xml | 58 +++++++
.../project-093/rar/src/main/rar/META-INF/ra.xml | 23 +++
.../project-093/rar/src/main/rar/SomeResource.txt | 16 ++
.../resources/projects/project-093/sar/pom.xml | 58 +++++++
.../src/main/resources/META-INF/jboss-service.xml | 21 +++
.../resources/projects/project-093/war/pom.xml | 54 ++++++
.../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-094/ear/pom.xml | 86 ++++++++++
.../resources/projects/project-094/har/pom.xml | 43 +++++
.../src/main/resources/META-INF/jboss-service.xml | 21 +++
src/test/resources/projects/project-094/pom.xml | 110 ++++++++++++
.../resources/projects/project-094/rar/pom.xml | 43 +++++
.../project-094/rar/src/main/rar/META-INF/ra.xml | 23 +++
.../project-094/rar/src/main/rar/SomeResource.txt | 16 ++
.../resources/projects/project-094/sar/pom.xml | 43 +++++
.../src/main/resources/META-INF/jboss-service.xml | 21 +++
.../resources/projects/project-094/war/pom.xml | 39 +++++
.../war/src/main/webapp/WEB-INF/web.xml | 24 +++
59 files changed, 2538 insertions(+), 57 deletions(-)
diff --cc pom.xml
index c0819cf,c6b9207..8607f9c
--- a/pom.xml
+++ b/pom.xml
@@@ -86,9 -86,11 +86,11 @@@
<javaVersion>7</javaVersion>
<surefire.version>2.22.2</surefire.version>
<project.build.outputTimestamp>2020-09-26T20:10:30Z</project.build.outputTimestamp>
- <mavenWarPluginVersion>2.1.1</mavenWarPluginVersion>
+ <mavenWarPluginVersion>3.3.1</mavenWarPluginVersion>
<mavenCompilerPluginVersion>2.5.1</mavenCompilerPluginVersion>
<mavenEjbPluginVersion>2.3</mavenEjbPluginVersion>
+ <mavenRarPluginVersion>2.4</mavenRarPluginVersion>
+ <jbossPackagingPluginVersion>2.2</jbossPackagingPluginVersion>
<invoker.skip>false</invoker.skip>
<invoker.install.skip>${invoker.skip}</invoker.install.skip>
<invoker.it.skip>${invoker.skip}</invoker.it.skip>