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 2017/02/07 12:29:53 UTC
[2/2] maven-archetype git commit: [ARCHETYPE-439] Remove
archetypeRepository param
[ARCHETYPE-439] Remove archetypeRepository param
Project: http://git-wip-us.apache.org/repos/asf/maven-archetype/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-archetype/commit/3670dff7
Tree: http://git-wip-us.apache.org/repos/asf/maven-archetype/tree/3670dff7
Diff: http://git-wip-us.apache.org/repos/asf/maven-archetype/diff/3670dff7
Branch: refs/heads/master
Commit: 3670dff7b762caa5517e172e4ae08ee088b6eb5f
Parents: ddae9ef
Author: rfscholte <rf...@apache.org>
Authored: Tue Feb 7 13:29:24 2017 +0100
Committer: rfscholte <rf...@apache.org>
Committed: Tue Feb 7 13:29:24 2017 +0100
----------------------------------------------------------------------
.../archetype/ArchetypeGenerationRequest.java | 16 ++++++++++++++++
.../src/main/mdo/archetype-catalog.mdo | 5 ++++-
.../mojos/CreateProjectFromArchetypeMojo.java | 9 +--------
.../ui/generation/DefaultArchetypeSelector.java | 19 ++-----------------
4 files changed, 23 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven-archetype/blob/3670dff7/archetype-common/src/main/java/org/apache/maven/archetype/ArchetypeGenerationRequest.java
----------------------------------------------------------------------
diff --git a/archetype-common/src/main/java/org/apache/maven/archetype/ArchetypeGenerationRequest.java b/archetype-common/src/main/java/org/apache/maven/archetype/ArchetypeGenerationRequest.java
index a3d63cf..c3858cf 100644
--- a/archetype-common/src/main/java/org/apache/maven/archetype/ArchetypeGenerationRequest.java
+++ b/archetype-common/src/main/java/org/apache/maven/archetype/ArchetypeGenerationRequest.java
@@ -65,6 +65,11 @@ public class ArchetypeGenerationRequest
private String archetypeGoals = "";
+ /**
+ * The URL to the archetype repository
+ *
+ * @deprecated see ARCHETYPE-439
+ */
private String archetypeRepository;
// Archetype configuration
@@ -170,11 +175,22 @@ public class ArchetypeGenerationRequest
return this;
}
+ /**
+ *
+ * @return the URL of the archetype repository
+ * @deprecated see ARCHETYPE-439
+ */
public String getArchetypeRepository()
{
return archetypeRepository;
}
+ /**
+ *
+ * @param archetypeRepository the URL of the archetype repository
+ * @return this request
+ * @deprecated see ARCHETYPE-439
+ */
public ArchetypeGenerationRequest setArchetypeRepository( String archetypeRepository )
{
this.archetypeRepository = archetypeRepository;
http://git-wip-us.apache.org/repos/asf/maven-archetype/blob/3670dff7/archetype-models/archetype-catalog/src/main/mdo/archetype-catalog.mdo
----------------------------------------------------------------------
diff --git a/archetype-models/archetype-catalog/src/main/mdo/archetype-catalog.mdo b/archetype-models/archetype-catalog/src/main/mdo/archetype-catalog.mdo
index 206202a..091be1f 100644
--- a/archetype-models/archetype-catalog/src/main/mdo/archetype-catalog.mdo
+++ b/archetype-models/archetype-catalog/src/main/mdo/archetype-catalog.mdo
@@ -97,8 +97,11 @@
<name>repository</name>
<type>String</type>
<required>false</required>
- <description>The repository where to find the archetype.
+ <description>The URL of the repository where to find the archetype.
When omitted, the archetype is searched for in the repository where the catalog comes from.</description>
+ <annotations>
+ <annotation>@Deprecated</annotation>
+ </annotations>
</field>
<field>
<name>description</name>
http://git-wip-us.apache.org/repos/asf/maven-archetype/blob/3670dff7/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/CreateProjectFromArchetypeMojo.java
----------------------------------------------------------------------
diff --git a/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/CreateProjectFromArchetypeMojo.java b/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/CreateProjectFromArchetypeMojo.java
index 5300373..b13fe9e 100644
--- a/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/CreateProjectFromArchetypeMojo.java
+++ b/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/CreateProjectFromArchetypeMojo.java
@@ -90,12 +90,6 @@ public class CreateProjectFromArchetypeMojo
private String archetypeVersion;
/**
- * The archetype's repository.
- */
- @Parameter( property = "archetypeRepository" )
- private String archetypeRepository;
-
- /**
* The archetype catalogs to use to build a list and let the user choose from.
* It is a comma separated list of catalogs.
* Catalogs use the following schemes:
@@ -156,7 +150,7 @@ public class CreateProjectFromArchetypeMojo
public void execute()
throws MojoExecutionException, MojoFailureException
{
- Properties executionProperties = session.getExecutionProperties();
+ Properties executionProperties = session.getUserProperties();
ArchetypeGenerationRequest request =
new ArchetypeGenerationRequest().setArchetypeGroupId( archetypeGroupId )
@@ -164,7 +158,6 @@ public class CreateProjectFromArchetypeMojo
.setArchetypeVersion( archetypeVersion )
.setOutputDirectory( basedir.getAbsolutePath() )
.setLocalRepository( localRepository )
- .setArchetypeRepository( archetypeRepository )
.setRemoteArtifactRepositories( remoteArtifactRepositories )
.setFilter( filter )
.setProjectBuildingRequest( session.getProjectBuildingRequest() );
http://git-wip-us.apache.org/repos/asf/maven-archetype/blob/3670dff7/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/generation/DefaultArchetypeSelector.java
----------------------------------------------------------------------
diff --git a/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/generation/DefaultArchetypeSelector.java b/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/generation/DefaultArchetypeSelector.java
index c8bd6c6..9c0ce4d 100644
--- a/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/generation/DefaultArchetypeSelector.java
+++ b/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/generation/DefaultArchetypeSelector.java
@@ -82,7 +82,7 @@ public class DefaultArchetypeSelector
}
}
- if ( definition.isDefined() && StringUtils.isEmpty( request.getArchetypeRepository() ) )
+ if ( definition.isDefined() )
{
Map.Entry<String, Archetype> found =
findArchetype( archetypes, request.getArchetypeGroupId(), request.getArchetypeArtifactId() );
@@ -107,8 +107,7 @@ public class DefaultArchetypeSelector
definition.setRepository( "http://repo.maven.apache.org/maven2" );
}
}
-
- if ( !definition.isDefined() && definition.isPartiallyDefined() )
+ else if ( definition.isPartiallyDefined() )
{
Map.Entry<String, Archetype> found =
findArchetype( archetypes, request.getArchetypeGroupId(), request.getArchetypeArtifactId() );
@@ -244,20 +243,6 @@ public class DefaultArchetypeSelector
this.archetypeSelectionQueryer = archetypeSelectionQueryer;
}
- private String getCatalogKey( Map<String, List<Archetype>> archetypes, Archetype selectedArchetype )
- {
- for ( Map.Entry<String, List<Archetype>> entry : archetypes.entrySet() )
- {
- List<Archetype> catalog = entry.getValue();
-
- if ( catalog.contains( selectedArchetype ) )
- {
- return entry.getKey();
- }
- }
- return "";
- }
-
private Map.Entry<String, Archetype> findArchetype( Map<String, List<Archetype>> archetypes, String groupId,
String artifactId )
{