You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by rf...@apache.org on 2019/03/16 11:44:40 UTC
[maven-archetype] branch ARCHETYPE-551 updated (98dc266 -> 489576e)
This is an automated email from the ASF dual-hosted git repository.
rfscholte pushed a change to branch ARCHETYPE-551
in repository https://gitbox.apache.org/repos/asf/maven-archetype.git.
from 98dc266 [ARCHETYPE-551] - Upgrade maven-invoker to 3.0.1
add 8c92e3e [ARCHETYPE-560] Require Java 7
new 7b31fb2 [ARCHETYPE-551] Upgrade maven-invoker to 3.0.1
new 489576e Merge branch 'ARCHETYPE-551' of https://gitbox.apache.org/repos/asf/maven-archetype into ARCHETYPE-551
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/ArchetypeGenerationRequest.java | 3 +
.../maven/archetype/DefaultArchetypeManager.java | 26 +--
.../common/DefaultArchetypeArtifactManager.java | 191 +++++----------------
.../common/DefaultArchetypeFilesResolver.java | 14 ++
.../maven/archetype/common/DefaultPomManager.java | 108 ++++--------
.../maven/archetype/common/MavenJDOMWriter.java | 1 +
.../archetype/common/util/FileCharsetDetector.java | 13 +-
.../apache/maven/archetype/common/util/Format.java | 7 +-
.../archetype/common/util/NamespaceStack.java | 5 +-
.../maven/archetype/common/util/XMLOutputter.java | 2 +
.../archetype/creator/FilesetArchetypeCreator.java | 98 ++---------
.../archetype/downloader/DefaultDownloader.java | 2 +
.../generator/DefaultArchetypeGenerator.java | 2 +
.../DefaultFilesetArchetypeGenerator.java | 37 +---
.../maven/archetype/old/DefaultOldArchetype.java | 148 +++++-----------
.../DefaultRepositoryCrawler.java | 15 +-
.../source/CatalogArchetypeDataSource.java | 18 +-
.../source/InternalCatalogArchetypeDataSource.java | 1 +
.../source/LocalCatalogArchetypeDataSource.java | 2 +
.../source/RemoteCatalogArchetypeDataSource.java | 1 +
.../generator/DefaultArchetypeGeneratorTest.java | 53 ++----
.../apache/maven/archetype/old/ArchetypeTest.java | 1 +
.../archetype/old/descriptor/ArchetypeXsdTest.java | 10 +-
.../LocalCatalogArchetypeDataSourceTest.java | 9 +-
.../RemoteCatalogArchetypeDataSourceTest.java | 12 +-
.../archetype/test/ArchetypeGenerationTest.java | 2 +-
.../creator/DefaultArchetypeCreatorIT.java | 6 +-
.../archetype/test/ArchetyperRoundtripIT.java | 20 ++-
.../test/ArchetyperRoundtripWithProxyIT.java | 10 +-
.../archetype/test/RoundtripMultiModuleIT.java | 26 +--
.../apache/maven/archetype/proxy/ProxyServlet.java | 12 +-
.../maven/archetype/proxy/RepositoryServlet.java | 13 +-
.../archetype/repository/RepositoryServlet.java | 11 +-
maven-archetype-plugin/pom.xml | 2 +
.../src/it/projects/build-and-run-its/pom.xml | 4 +-
.../src/it/projects/build-archetype/pom.xml | 4 +-
.../src/it/projects/build-ignore-eol/pom.xml | 4 +-
.../maven/archetype/mojos/CrawlRepositoryMojo.java | 1 +
.../mojos/CreateArchetypeFromProjectMojo.java | 1 +
.../mojos/CreateProjectFromArchetypeMojo.java | 1 +
.../maven/archetype/mojos/IntegrationTestMojo.java | 66 +++----
.../org/apache/maven/archetype/mojos/JarMojo.java | 1 +
.../archetype/mojos/UpdateLocalCatalogMojo.java | 1 +
.../maven/archetype/ui/ArchetypePrompter.java | 6 +
.../archetype/ui/DefaultArchetypeFactory.java | 5 +
.../DefaultArchetypeCreationConfigurator.java | 18 +-
.../creation/DefaultArchetypeCreationQueryer.java | 11 ++
.../DefaultArchetypeGenerationConfigurator.java | 11 +-
.../DefaultArchetypeGenerationQueryer.java | 2 +
.../DefaultArchetypeSelectionQueryer.java | 3 +
.../ui/generation/DefaultArchetypeSelector.java | 1 +
...efaultArchetypeGenerationConfigurator2Test.java | 1 +
...DefaultArchetypeGenerationConfiguratorTest.java | 1 +
.../DefaultArchetypeGenerationQueryerTest.java | 3 +
.../DefaultArchetypeSelectionQueryerTest.java | 3 +
.../generation/DefaultArchetypeSelectorTest.java | 3 +
pom.xml | 3 +-
57 files changed, 378 insertions(+), 657 deletions(-)
[maven-archetype] 02/02: Merge branch 'ARCHETYPE-551' of
https://gitbox.apache.org/repos/asf/maven-archetype into ARCHETYPE-551
Posted by rf...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rfscholte pushed a commit to branch ARCHETYPE-551
in repository https://gitbox.apache.org/repos/asf/maven-archetype.git
commit 489576e6c27b4c0f1daab365e35cf6bbd1eba8ee
Merge: 7b31fb2 98dc266
Author: rfscholte <rf...@apache.org>
AuthorDate: Sat Mar 16 12:44:11 2019 +0100
Merge branch 'ARCHETYPE-551' of https://gitbox.apache.org/repos/asf/maven-archetype into ARCHETYPE-551
[maven-archetype] 01/02: [ARCHETYPE-551] Upgrade maven-invoker to
3.0.1
Posted by rf...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rfscholte pushed a commit to branch ARCHETYPE-551
in repository https://gitbox.apache.org/repos/asf/maven-archetype.git
commit 7b31fb242f895f664c0ebc6264d86a449e608042
Author: rfscholte <rf...@apache.org>
AuthorDate: Sat Mar 16 12:43:12 2019 +0100
[ARCHETYPE-551] Upgrade maven-invoker to 3.0.1
---
.../main/java/org/apache/maven/archetype/mojos/IntegrationTestMojo.java | 2 +-
pom.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/IntegrationTestMojo.java b/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/IntegrationTestMojo.java
index 4d5e2ab..2f57b21 100644
--- a/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/IntegrationTestMojo.java
+++ b/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/IntegrationTestMojo.java
@@ -636,7 +636,7 @@ public class IntegrationTestMojo
//@formatter:off
InvocationRequest request = new DefaultInvocationRequest().setBaseDirectory( basedir ).setGoals(
Arrays.asList( StringUtils.split( goals, "," ) ) ).setLocalRepositoryDirectory(
- localRepositoryPath ).setInteractive( false ).setShowErrors( true );
+ localRepositoryPath ).setBatchMode( true ).setShowErrors( true );
//@formatter:on
request.setDebug( debug );
diff --git a/pom.xml b/pom.xml
index 80c54ba..bf287f3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -146,7 +146,7 @@
<dependency>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-invoker</artifactId>
- <version>2.2</version>
+ <version>3.0.1</version>
</dependency>
<dependency>
<groupId>org.apache.maven.shared</groupId>