This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/maven-archetype.git
from dc2dfae8 Replace commons-lang3 with JDK and plexus-utils in
archetype-common
new 9a3dc667 Skip building the created archetype when no post phase is
given
new 871677f5 Move fileset archetype creation ITs to unit tests
The 2 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:
archetype-common/pom.xml | 10 +
.../maven/archetype/ArchetypeCreationRequest.java | 3 +
.../archetype/creator/FilesetArchetypeCreator.java | 65 ++--
.../creator/FilesetArchetypeCreatorTest.java | 370 +++++++++++++++++++++
.../fileset}/create-1/archetype.properties | 0
.../resources/projects/fileset}/create-1/pom.xml | 0
.../src/main/java/archetype/subfolder1/App.java | 0
.../src/main/java/archetype/subfolder2/App.java | 0
.../create-1/src/main/resources/log4j.properties | 0
.../create-1/src/main/webapp/WEB-INF/web.xml | 0
.../projects/fileset}/create-1/src/site/site.xml | 0
.../src/test/java/archetype/test/AppTest.java | 0
.../create-1/src/test/resources/log4j.properties | 0
.../fileset}/create-2/archetype.properties | 0
.../resources/projects/fileset}/create-2/pom.xml | 0
.../org/apache/maven/archetype/subfolder1/App.java | 0
.../org/apache/maven/archetype/subfolder2/App.java | 0
.../src/it-test/resources/log4j.properties | 0
.../org/apache/maven/archetype/subfolder1/App.java | 0
.../org/apache/maven/archetype/subfolder2/App.java | 0
.../create-2/src/main/resources/log4j.properties | 0
.../create-2/src/main/webapp/WEB-INF/web.xml | 0
.../projects/fileset}/create-2/src/site/site.xml | 0
.../org/apache/maven/archetype/test/AppTest.java | 0
.../create-2/src/test/resources/log4j.properties | 0
.../projects/fileset}/create-2/subModule/pom.xml | 0
.../projects/fileset}/create-3/application/pom.xml | 0
.../application/src/it-test/java/ItTestAll.java | 0
.../org/apache/maven/archetype/test/ItTest1.java | 0
.../src/it-test/resources/ItTest1Result.txt | 0
.../create-3/application/src/main/java/Main.java | 0
.../archetype/test/application/Application.java | 0
.../test/application/audios/Application.ogg | 0
.../test/application/images/Application.png | 0
.../src/main/resources/META-INF/MANIFEST.MF | 0
.../src/main/resources/log4j.properties | 0
.../archetype/test/application/some/Gro.groovy | 0
.../application/src/main/resources/splash.png | 0
.../application/src/test/java/TestAll.java | 0
.../test/application/ApplicationTest.java | 0
.../fileset}/create-3/archetype.properties | 0
.../projects/fileset}/create-3/libs/pom.xml | 0
.../projects/fileset}/create-3/libs/prj-a/pom.xml | 0
.../libs/prj-a/src/main/mdo/descriptor.xml | 0
.../projects/fileset}/create-3/libs/prj-b/pom.xml | 0
.../apache/maven/archetype/test/com/Component.java | 0
.../apache/maven/archetype/test/com/package.html | 0
.../maven/archetype/test/common/ComponentTest.java | 0
.../resources/projects/fileset}/create-3/pom.xml | 0
.../fileset}/create-3/src/site/apt/index.apt | 0
.../fileset}/create-3/src/site/resources/site.png | 0
.../projects/fileset}/create-3/src/site/site.xml | 0
.../fileset}/create-4/archetype.properties | 0
.../resources/projects/fileset}/create-4/pom.xml | 0
.../fileset}/create-4/subModuleEAR/pom.xml | 0
.../fileset}/create-4/subModuleWar/pom.xml | 0
.../fileset}/create-5/archetype.properties | 0
.../projects/fileset}/create-5/dummy.file | 0
.../resources/projects/fileset}/create-5/pom.xml | 0
.../fileset}/create-6/archetype.properties | 0
.../resources/projects/fileset}/create-6/pom.xml | 0
.../src/main/webapp/resources/create-6/a.gif | 0
.../src/main/webapp/resources/create-6/a.jsp | 0
.../fileset}/exclude-patterns-2/.sonar/file.txt | 0
.../exclude-patterns-2/archetype.properties | 0
.../exclude-patterns-2/folder/.sonar/file.txt | 0
.../fileset}/exclude-patterns-2/folder/file.txt | 0
.../projects/fileset}/exclude-patterns-2/pom.xml | 0
.../exclude-patterns/.toexclude/dummy.file | 0
.../fileset}/exclude-patterns/archetype.properties | 0
.../exclude-patterns/nottoexclude/dummy.file | 0
.../projects/fileset}/exclude-patterns/pom.xml | 0
.../archetype.properties | 0
.../include-file-with-no-extension/pom.xml | 0
.../src/main/csharp/filewithnoextension | 0
.../archetype.properties | 0
.../pom.xml | 0
.../res/txt/filewithnoextension | 0
maven-archetype-plugin/pom.xml | 3 -
.../src/it/projects/create-1/invoker.properties | 18 -
.../src/it/projects/create-1/verify.groovy | 27 --
.../src/it/projects/create-2/invoker.properties | 18 -
.../src/it/projects/create-2/verify.groovy | 41 ---
.../src/it/projects/create-3/invoker.properties | 18 -
.../src/it/projects/create-3/verify.groovy | 168 ----------
.../src/it/projects/create-4/invoker.properties | 18 -
.../src/it/projects/create-4/verify.groovy | 43 ---
.../src/it/projects/create-5/invoker.properties | 18 -
.../src/it/projects/create-5/verify.groovy | 23 --
.../src/it/projects/create-6/invoker.properties | 18 -
.../src/it/projects/create-6/verify.groovy | 23 --
.../projects/exclude-patterns-2/invoker.properties | 18 -
.../it/projects/exclude-patterns-2/verify.groovy | 24 --
.../projects/exclude-patterns/invoker.properties | 18 -
.../src/it/projects/exclude-patterns/verify.groovy | 26 --
.../invoker.properties | 18 -
.../include-file-with-no-extension/verify.groovy | 22 --
.../invoker.properties | 18 -
.../verify.groovy | 22 --
99 files changed, 421 insertions(+), 629 deletions(-)
create mode 100644
archetype-common/src/test/java/org/apache/maven/archetype/creator/FilesetArchetypeCreatorTest.java
rename {maven-archetype-plugin/src/it/projects =>
archetype-common/src/test/resources/projects/fileset}/create-1/archetype.properties
(100%)
rename {maven-archetype-plugin/src/it/projects =>
archetype-common/src/test/resources/projects/fileset}/create-1/pom.xml (100%)
rename {maven-archetype-plugin/src/it/projects =>
archetype-common/src/test/resources/projects/fileset}/create-1/src/main/java/archetype/subfolder1/App.java
(100%)
rename {maven-archetype-plugin/src/it/projects =>
archetype-common/src/test/resources/projects/fileset}/create-1/src/main/java/archetype/subfolder2/App.java
(100%)
rename {maven-archetype-plugin/src/it/projects =>
archetype-common/src/test/resources/projects/fileset}/create-1/src/main/resources/log4j.properties
(100%)
rename {maven-archetype-plugin/src/it/projects =>
archetype-common/src/test/resources/projects/fileset}/create-1/src/main/webapp/WEB-INF/web.xml
(100%)
rename {maven-archetype-plugin/src/it/projects =>
archetype-common/src/test/resources/projects/fileset}/create-1/src/site/site.xml
(100%)
rename {maven-archetype-plugin/src/it/projects =>
archetype-common/src/test/resources/projects/fileset}/create-1/src/test/java/archetype/test/AppTest.java
(100%)
rename {maven-archetype-plugin/src/it/projects =>
archetype-common/src/test/resources/projects/fileset}/create-1/src/test/resources/log4j.properties
(100%)
rename {maven-archetype-plugin/src/it/projects =>
archetype-common/src/test/resources/projects/fileset}/create-2/archetype.properties
(100%)
rename {maven-archetype-plugin/src/it/projects =>
archetype-common/src/test/resources/projects/fileset}/create-2/pom.xml (100%)
rename {maven-archetype-plugin/src/it/projects =>
archetype-common/src/test/resources/projects/fileset}/create-2/src/it-test/java/org/apache/maven/archetype/subfolder1/App.java
(100%)
rename {maven-archetype-plugin/src/it/projects =>
archetype-common/src/test/resources/projects/fileset}/create-2/src/it-test/java/org/apache/maven/archetype/subfolder2/App.java
(100%)
rename {maven-archetype-plugin/src/it/projects =>
archetype-common/src/test/resources/projects/fileset}/create-2/src/it-test/resources/log4j.properties
(100%)
rename {maven-archetype-plugin/src/it/projects =>
archetype-common/src/test/resources/projects/fileset}/create-2/src/main/java/org/apache/maven/archetype/subfolder1/App.java
(100%)
rename {maven-archetype-plugin/src/it/projects =>
archetype-common/src/test/resources/projects/fileset}/create-2/src/main/java/org/apache/maven/archetype/subfolder2/App.java
(100%)
rename {maven-archetype-plugin/src/it/projects =>
archetype-common/src/test/resources/projects/fileset}/create-2/src/main/resources/log4j.properties
(100%)
rename {maven-archetype-plugin/src/it/projects =>
archetype-common/src/test/resources/projects/fileset}/create-2/src/main/webapp/WEB-INF/web.xml
(100%)
rename {maven-archetype-plugin/src/it/projects =>
archetype-common/src/test/resources/projects/fileset}/create-2/src/site/site.xml
(100%)
rename {maven-archetype-plugin/src/it/projects =>
archetype-common/src/test/resources/projects/fileset}/create-2/src/test/java/org/apache/maven/archetype/test/AppTest.java
(100%)
rename {maven-archetype-plugin/src/it/projects =>
archetype-common/src/test/resources/projects/fileset}/create-2/src/test/resources/log4j.properties
(100%)
rename {maven-archetype-plugin/src/it/projects =>
archetype-common/src/test/resources/projects/fileset}/create-2/subModule/pom.xml
(100%)
rename {maven-archetype-plugin/src/it/projects =>
archetype-common/src/test/resources/projects/fileset}/create-3/application/pom.xml
(100%)
rename {maven-archetype-plugin/src/it/projects =>
archetype-common/src/test/resources/projects/fileset}/create-3/application/src/it-test/java/ItTestAll.java
(100%)
rename {maven-archetype-plugin/src/it/projects =>
archetype-common/src/test/resources/projects/fileset}/create-3/application/src/it-test/java/org/apache/maven/archetype/test/ItTest1.java
(100%)
rename {maven-archetype-plugin/src/it/projects =>
archetype-common/src/test/resources/projects/fileset}/create-3/application/src/it-test/resources/ItTest1Result.txt
(100%)
rename {maven-archetype-plugin/src/it/projects =>
archetype-common/src/test/resources/projects/fileset}/create-3/application/src/main/java/Main.java
(100%)
rename {maven-archetype-plugin/src/it/projects =>
archetype-common/src/test/resources/projects/fileset}/create-3/application/src/main/java/org/apache/maven/archetype/test/application/Application.java
(100%)
rename {maven-archetype-plugin/src/it/projects =>
archetype-common/src/test/resources/projects/fileset}/create-3/application/src/main/java/org/apache/maven/archetype/test/application/audios/Application.ogg
(100%)
rename {maven-archetype-plugin/src/it/projects =>
archetype-common/src/test/resources/projects/fileset}/create-3/application/src/main/java/org/apache/maven/archetype/test/application/images/Application.png
(100%)
rename {maven-archetype-plugin/src/it/projects =>
archetype-common/src/test/resources/projects/fileset}/create-3/application/src/main/resources/META-INF/MANIFEST.MF
(100%)
rename {maven-archetype-plugin/src/it/projects =>
archetype-common/src/test/resources/projects/fileset}/create-3/application/src/main/resources/log4j.properties
(100%)
rename {maven-archetype-plugin/src/it/projects =>
archetype-common/src/test/resources/projects/fileset}/create-3/application/src/main/resources/org/apache/maven/archetype/test/application/some/Gro.groovy
(100%)
rename {maven-archetype-plugin/src/it/projects =>
archetype-common/src/test/resources/projects/fileset}/create-3/application/src/main/resources/splash.png
(100%)
rename {maven-archetype-plugin/src/it/projects =>
archetype-common/src/test/resources/projects/fileset}/create-3/application/src/test/java/TestAll.java
(100%)
rename {maven-archetype-plugin/src/it/projects =>
archetype-common/src/test/resources/projects/fileset}/create-3/application/src/test/java/org/apache/maven/archetype/test/application/ApplicationTest.java
(100%)
rename {maven-archetype-plugin/src/it/projects =>
archetype-common/src/test/resources/projects/fileset}/create-3/archetype.properties
(100%)
rename {maven-archetype-plugin/src/it/projects =>
archetype-common/src/test/resources/projects/fileset}/create-3/libs/pom.xml
(100%)
rename {maven-archetype-plugin/src/it/projects =>
archetype-common/src/test/resources/projects/fileset}/create-3/libs/prj-a/pom.xml
(100%)
rename {maven-archetype-plugin/src/it/projects =>
archetype-common/src/test/resources/projects/fileset}/create-3/libs/prj-a/src/main/mdo/descriptor.xml
(100%)
rename {maven-archetype-plugin/src/it/projects =>
archetype-common/src/test/resources/projects/fileset}/create-3/libs/prj-b/pom.xml
(100%)
rename {maven-archetype-plugin/src/it/projects =>
archetype-common/src/test/resources/projects/fileset}/create-3/libs/prj-b/src/main/java/org/apache/maven/archetype/test/com/Component.java
(100%)
rename {maven-archetype-plugin/src/it/projects =>
archetype-common/src/test/resources/projects/fileset}/create-3/libs/prj-b/src/main/java/org/apache/maven/archetype/test/com/package.html
(100%)
rename {maven-archetype-plugin/src/it/projects =>
archetype-common/src/test/resources/projects/fileset}/create-3/libs/prj-b/src/test/java/org/apache/maven/archetype/test/common/ComponentTest.java
(100%)
rename {maven-archetype-plugin/src/it/projects =>
archetype-common/src/test/resources/projects/fileset}/create-3/pom.xml (100%)
rename {maven-archetype-plugin/src/it/projects =>
archetype-common/src/test/resources/projects/fileset}/create-3/src/site/apt/index.apt
(100%)
rename {maven-archetype-plugin/src/it/projects =>
archetype-common/src/test/resources/projects/fileset}/create-3/src/site/resources/site.png
(100%)
rename {maven-archetype-plugin/src/it/projects =>
archetype-common/src/test/resources/projects/fileset}/create-3/src/site/site.xml
(100%)
rename {maven-archetype-plugin/src/it/projects =>
archetype-common/src/test/resources/projects/fileset}/create-4/archetype.properties
(100%)
rename {maven-archetype-plugin/src/it/projects =>
archetype-common/src/test/resources/projects/fileset}/create-4/pom.xml (100%)
rename {maven-archetype-plugin/src/it/projects =>
archetype-common/src/test/resources/projects/fileset}/create-4/subModuleEAR/pom.xml
(100%)
rename {maven-archetype-plugin/src/it/projects =>
archetype-common/src/test/resources/projects/fileset}/create-4/subModuleWar/pom.xml
(100%)
rename {maven-archetype-plugin/src/it/projects =>
archetype-common/src/test/resources/projects/fileset}/create-5/archetype.properties
(100%)
rename {maven-archetype-plugin/src/it/projects =>
archetype-common/src/test/resources/projects/fileset}/create-5/dummy.file (100%)
rename {maven-archetype-plugin/src/it/projects =>
archetype-common/src/test/resources/projects/fileset}/create-5/pom.xml (100%)
rename {maven-archetype-plugin/src/it/projects =>
archetype-common/src/test/resources/projects/fileset}/create-6/archetype.properties
(100%)
rename {maven-archetype-plugin/src/it/projects =>
archetype-common/src/test/resources/projects/fileset}/create-6/pom.xml (100%)
rename {maven-archetype-plugin/src/it/projects =>
archetype-common/src/test/resources/projects/fileset}/create-6/src/main/webapp/resources/create-6/a.gif
(100%)
rename {maven-archetype-plugin/src/it/projects =>
archetype-common/src/test/resources/projects/fileset}/create-6/src/main/webapp/resources/create-6/a.jsp
(100%)
rename {maven-archetype-plugin/src/it/projects =>
archetype-common/src/test/resources/projects/fileset}/exclude-patterns-2/.sonar/file.txt
(100%)
rename {maven-archetype-plugin/src/it/projects =>
archetype-common/src/test/resources/projects/fileset}/exclude-patterns-2/archetype.properties
(100%)
rename {maven-archetype-plugin/src/it/projects =>
archetype-common/src/test/resources/projects/fileset}/exclude-patterns-2/folder/.sonar/file.txt
(100%)
rename {maven-archetype-plugin/src/it/projects =>
archetype-common/src/test/resources/projects/fileset}/exclude-patterns-2/folder/file.txt
(100%)
rename {maven-archetype-plugin/src/it/projects =>
archetype-common/src/test/resources/projects/fileset}/exclude-patterns-2/pom.xml
(100%)
rename {maven-archetype-plugin/src/it/projects =>
archetype-common/src/test/resources/projects/fileset}/exclude-patterns/.toexclude/dummy.file
(100%)
rename {maven-archetype-plugin/src/it/projects =>
archetype-common/src/test/resources/projects/fileset}/exclude-patterns/archetype.properties
(100%)
rename {maven-archetype-plugin/src/it/projects =>
archetype-common/src/test/resources/projects/fileset}/exclude-patterns/nottoexclude/dummy.file
(100%)
rename {maven-archetype-plugin/src/it/projects =>
archetype-common/src/test/resources/projects/fileset}/exclude-patterns/pom.xml
(100%)
rename {maven-archetype-plugin/src/it/projects =>
archetype-common/src/test/resources/projects/fileset}/include-file-with-no-extension/archetype.properties
(100%)
rename {maven-archetype-plugin/src/it/projects =>
archetype-common/src/test/resources/projects/fileset}/include-file-with-no-extension/pom.xml
(100%)
rename {maven-archetype-plugin/src/it/projects =>
archetype-common/src/test/resources/projects/fileset}/include-file-with-no-extension/src/main/csharp/filewithnoextension
(100%)
rename {maven-archetype-plugin/src/it/projects =>
archetype-common/src/test/resources/projects/fileset}/include-resource-file-with-no-extension/archetype.properties
(100%)
rename {maven-archetype-plugin/src/it/projects =>
archetype-common/src/test/resources/projects/fileset}/include-resource-file-with-no-extension/pom.xml
(100%)
rename {maven-archetype-plugin/src/it/projects =>
archetype-common/src/test/resources/projects/fileset}/include-resource-file-with-no-extension/res/txt/filewithnoextension
(100%)
delete mode 100644
maven-archetype-plugin/src/it/projects/create-1/invoker.properties
delete mode 100644
maven-archetype-plugin/src/it/projects/create-1/verify.groovy
delete mode 100644
maven-archetype-plugin/src/it/projects/create-2/invoker.properties
delete mode 100644
maven-archetype-plugin/src/it/projects/create-2/verify.groovy
delete mode 100644
maven-archetype-plugin/src/it/projects/create-3/invoker.properties
delete mode 100644
maven-archetype-plugin/src/it/projects/create-3/verify.groovy
delete mode 100644
maven-archetype-plugin/src/it/projects/create-4/invoker.properties
delete mode 100644
maven-archetype-plugin/src/it/projects/create-4/verify.groovy
delete mode 100644
maven-archetype-plugin/src/it/projects/create-5/invoker.properties
delete mode 100644
maven-archetype-plugin/src/it/projects/create-5/verify.groovy
delete mode 100644
maven-archetype-plugin/src/it/projects/create-6/invoker.properties
delete mode 100644
maven-archetype-plugin/src/it/projects/create-6/verify.groovy
delete mode 100644
maven-archetype-plugin/src/it/projects/exclude-patterns-2/invoker.properties
delete mode 100644
maven-archetype-plugin/src/it/projects/exclude-patterns-2/verify.groovy
delete mode 100644
maven-archetype-plugin/src/it/projects/exclude-patterns/invoker.properties
delete mode 100644
maven-archetype-plugin/src/it/projects/exclude-patterns/verify.groovy
delete mode 100644
maven-archetype-plugin/src/it/projects/include-file-with-no-extension/invoker.properties
delete mode 100644
maven-archetype-plugin/src/it/projects/include-file-with-no-extension/verify.groovy
delete mode 100644
maven-archetype-plugin/src/it/projects/include-resource-file-with-no-extension/invoker.properties
delete mode 100644
maven-archetype-plugin/src/it/projects/include-resource-file-with-no-extension/verify.groovy