You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by br...@apache.org on 2005/10/03 15:13:57 UTC
svn commit: r293332 - in /maven/components/trunk:
maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
maven-model/maven.mdo
maven-project/src/main/java/org/apache/maven/project/ModelUtils.java
Author: brett
Date: Mon Oct 3 06:13:44 2005
New Revision: 293332
URL: http://svn.apache.org/viewcvs?rev=293332&view=rev
Log:
PR: MNG-644
remove deprecated goal syntax
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
maven/components/trunk/maven-model/maven.mdo
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/ModelUtils.java
Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java?rev=293332&r1=293331&r2=293332&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java Mon Oct 3 06:13:44 2005
@@ -1020,12 +1020,6 @@
private void bindPluginToLifecycle( Plugin plugin, MavenSession session, Map phaseMap, MavenProject project )
throws LifecycleExecutionException, ArtifactResolutionException
{
- if ( plugin.getGoals() != null && !plugin.getGoals().isEmpty() )
- {
- getLogger().warn(
- "DEPRECATED: goal definitions for plugin '" + plugin.getKey() + "' must be in an executions element" );
- }
-
PluginDescriptor pluginDescriptor;
Settings settings = session.getSettings();
Modified: maven/components/trunk/maven-model/maven.mdo
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-model/maven.mdo?rev=293332&r1=293331&r2=293332&view=diff
==============================================================================
--- maven/components/trunk/maven-model/maven.mdo (original)
+++ maven/components/trunk/maven-model/maven.mdo Mon Oct 3 06:13:44 2005
@@ -2405,15 +2405,6 @@
<multiplicity>*</multiplicity>
</association>
</field>
- <!-- TODO: this is deprecated -->
- <field>
- <name>goals</name>
- <version>4.0.0</version>
- <association>
- <type>Goal</type>
- <multiplicity>*</multiplicity>
- </association>
- </field>
</fields>
<codeSegments>
<codeSegment>
@@ -2458,32 +2449,6 @@
public static String constructKey( String groupId, String artifactId )
{
return groupId + ":" + artifactId;
- }
-
- /** @deprecated */
- private java.util.Map goalMap = null;
- /** @deprecated */
- public void flushGoalMap()
- {
- this.goalMap = null;
- }
-
- /** @deprecated */
- public java.util.Map getGoalsAsMap()
- {
- if ( goalMap == null )
- {
- goalMap = new java.util.HashMap();
- if ( goals != null )
- {
- for ( java.util.Iterator i = goals.iterator(); i.hasNext(); )
- {
- Goal g = (Goal) i.next();
- goalMap.put( g.getId(), g );
- }
- }
- }
- return goalMap;
}
]]></code>
</codeSegment>
Modified: maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/ModelUtils.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/ModelUtils.java?rev=293332&r1=293331&r2=293332&view=diff
==============================================================================
--- maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/ModelUtils.java (original)
+++ maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/ModelUtils.java Mon Oct 3 06:13:44 2005
@@ -828,14 +828,6 @@
// TODO: Deep-copy this!
newPlugin.setConfiguration( plugin.getConfiguration() );
- List goals = plugin.getGoals();
- if ( goals != null && !goals.isEmpty() )
- {
- List newGoals = new ArrayList( goals );
-
- newPlugin.setGoals( newGoals );
- }
-
newPlugin.setExecutions( cloneExecutions( plugin.getExecutions() ) );
newPlugins.add( newPlugin );
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org