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 <[email protected]> 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>
