o upgraded Modello version to 1.0

o improved models to use Modello new features (merged from 2.1.x branch r745216)

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@745260 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Herve Boutemy 2009-02-17 21:46:38 +00:00
parent 29df2bf1bf
commit 3d52a23b10
9 changed files with 134 additions and 115 deletions

View File

@ -19,18 +19,18 @@ under the License.
<!-- START SNIPPET: ant-bootstrap
By default the bootstrap will use ~/.m2/repository as the integration repository but you can define the integration
By default the bootstrap will use ~/.m2/repository as the integration repository but you can define the integration
repository by specifying a property on the command line:
ant -Dmaven.repo.local=/my/integration/repository
Those familiar with Maven will note this is the same way the local repository can be set from the command-line.
Those familiar with Maven will note this is the same way the local repository can be set from the command-line.
This facilitates having a set of builds converge on the same repository for integration purposes.
END SNIPPET: ant-bootstrap -->
<project default="all" basedir="." xmlns:artifact="urn:maven-artifact-ant">
<property name="it.workdir.version" value="3.0.x"/>
<target name="initTaskDefs">
@ -57,14 +57,14 @@ END SNIPPET: ant-bootstrap -->
</target>
<target name="init" depends="isMavenHomeSet">
<xmlproperty prefix="pom" file="pom.xml"/>
<xmlproperty prefix="pom" file="pom.xml"/>
<dirname file="${maven.home}" property="maven.home.dirname"/>
<!-- Initialize properties -->
<property name="maven.home.basename.expected" value="apache-maven-${pom.project.version}"/>
<property name="maven.home.effective" location="${maven.home.dirname}/${maven.home.basename.expected}"/>
<property name="maven.assembly" location="apache-maven/target/${maven.home.basename.expected}-bin.zip"/>
<property name="maven.repo.local" value="${user.home}/.m2/repository"/>
<property name="surefire.useFile" value="true"/>
<property name="surefire.useFile" value="true"/>
<echo>maven.home = ${maven.home.effective}</echo>
</target>
@ -72,45 +72,45 @@ END SNIPPET: ant-bootstrap -->
<delete dir="bootstrap"/>
</target>
<target name="pull" depends="init" unless="skip.pull">
<property name="verbose" value="false"/>
<target name="pull" depends="init" unless="skip.pull">
<property name="verbose" value="false"/>
<!-- Pull the dependencies that Maven needs to build -->
<copy file="pom.xml" tofile="dependencies.xml"/>
<replace file="${basedir}/dependencies.xml" token="&lt;!--start--&gt;" value="&lt;!--"/>
<replace file="${basedir}/dependencies.xml" token="&lt;!--end--&gt;" value="--&gt;"/>
<artifact:pom file="${basedir}/dependencies.xml" id="pom"/>
<artifact:pom file="${basedir}/dependencies.xml" id="pom"/>
<artifact:dependencies pathId="pom.pathid" filesetId="pom.fileset" verbose="${verbose}" useScope="compile">
<localRepository path="${maven.repo.local}"/>
<pom refid="pom"/>
</artifact:dependencies>
<pom refid="pom"/>
</artifact:dependencies>
<delete file="${basedir}/dependencies.xml"/>
<!-- Pull the dependencies for Modello -->
<artifact:dependencies pathId="modello.pathid" filesetId="modello.fileset" verbose="${verbose}">
<localRepository path="${maven.repo.local}"/>
<dependency groupId="org.codehaus.modello" artifactId="modello-maven-plugin" version="${pom.properties.modelloVersion}"/>
</artifact:dependencies>
<!-- Pull the dependencies for the MetadataGenerator CLI -->
<artifact:dependencies pathId="pmdg.pathid" filesetId="pmdg.fileset" verbose="${verbose}">
<localRepository path="${maven.repo.local}"/>
<localRepository path="${maven.repo.local}"/>
<dependency groupId="org.codehaus.plexus" artifactId="plexus-component-metadata" version="${pom.properties.plexusVersion}"/>
</artifact:dependencies>
</artifact:dependencies>
</target>
<target name="process-classes" depends="pull" description="generates plexus component metadata.">
<mkdir dir="${basedir}/bootstrap/target"/>
<mkdir dir="${basedir}/bootstrap/target/classes"/>
<path id="maven.classpath">
<pathelement location="bootstrap/target/classes"/>
<path refid="sources"/>
<path refid="sources"/>
<path refid="pom.pathid"/>
<path refid="pmdg.pathid"/>
</path>
<echo>Using plexus version ${pom.properties.plexusVersion}</echo>
<echo>Using plexus version ${pom.properties.plexusVersion}</echo>
<java fork="fork" classname="org.codehaus.plexus.metadata.PlexusMetadataGeneratorCli" failonerror="true">
<classpath refid="maven.classpath"/>
<!-- We need to generate component descriptors from the maven-artifact sources which use javadoc annotations. -->
@ -126,8 +126,8 @@ END SNIPPET: ant-bootstrap -->
<arg value="--output"/>
<arg value="${basedir}/bootstrap/target/classes/META-INF/plexus/components.xml"/>
</java>
</target>
</target>
<target name="generate-sources" depends="pull" description="generates Java sources from Modello mdo model files">
<mkdir dir="bootstrap/target"/>
<mkdir dir="bootstrap/target/generated-sources"/>
@ -139,12 +139,13 @@ END SNIPPET: ant-bootstrap -->
<sequential>
<java fork="fork" classname="org.codehaus.modello.ModelloCli" failonerror="true">
<classpath refid="modello.pathid"/>
<arg file="@{file}"/>
<arg value="@{mode}"/>
<arg file="bootstrap/target/generated-sources"/>
<arg value="@{version}"/>
<arg value="false"/>
<arg value="false"/>
<arg file="@{file}"/> <!-- model file -->
<arg value="@{mode}"/> <!-- output type -->
<arg file="bootstrap/target/generated-sources"/> <!-- output directory -->
<arg value="@{version}"/> <!-- model version -->
<arg value="false"/> <!-- package with version -->
<arg value="true"/> <!-- use Java 5 -->
<arg value="UTF-8"/> <!-- encoding -->
</java>
</sequential>
</macrodef>
@ -194,7 +195,7 @@ END SNIPPET: ant-bootstrap -->
<target name="maven-compile" depends="compile-boot,process-classes" description="compiles Maven using the bootstrap Maven, skipping automated tests">
<java fork="true" classname="org.apache.maven.cli.MavenCli" failonerror="true">
<classpath refid="maven.classpath"/>
<arg value="-e"/>
<arg value="-e"/>
<arg value="-B"/>
<arg value="clean"/>
<arg value="install"/>
@ -203,9 +204,9 @@ END SNIPPET: ant-bootstrap -->
</java>
</target>
<target name="maven-assembly" depends="maven-compile" description="generates the Maven installation assembly using the bootstrap Maven">
<target name="maven-assembly" depends="maven-compile" description="generates the Maven installation assembly using the bootstrap Maven">
<echo>
The new Maven distribution was created as part of the MAVEN-COMPILE step, above.
The new Maven distribution was created as part of the MAVEN-COMPILE step, above.
This goal just validates the presence of that distribution.
</echo>
<condition property="build.failed">
@ -228,7 +229,7 @@ END SNIPPET: ant-bootstrap -->
</fileset>
</chmod>
</target>
<target name="all" depends="clean-bootstrap,init,extract-assembly"/>
</project>

View File

@ -17,7 +17,10 @@ specific language governing permissions and limitations
under the License.
-->
<model>
<model xmlns="http://modello.codehaus.org/MODELLO/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://modello.codehaus.org/MODELLO/1.0.0 http://modello.codehaus.org/xsd/modello-1.0.0.xsd"
xml.namespace="http://maven.apache.org/METADATA/${version}"
xml.schemaLocation="http://maven.apache.org/xsd/metadata-${version}.xsd">
<id>repository-metadata</id>
<name>Metadata</name>
<description>Per-directory repository metadata.</description>
@ -127,7 +130,7 @@ under the License.
v.getVersions().add( version );
}
}
if ( "null".equals( versioning.getLastUpdated() ) )
{
versioning.setLastUpdated( null );

View File

@ -19,8 +19,10 @@
under the License.
-->
<model xsd.namespace="http://maven.apache.org/SETTINGS/1.0.0"
xsd.target-namespace="http://maven.apache.org/SETTINGS/1.0.0">
<model xmlns="http://modello.codehaus.org/MODELLO/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://modello.codehaus.org/MODELLO/1.0.0 http://modello.codehaus.org/xsd/modello-1.0.0.xsd"
xml.namespace="http://maven.apache.org/SETTINGS/${version}"
xml.schemaLocation="http://maven.apache.org/xsd/settings-${version}.xsd">
<id>settings</id>
<name>Settings</name>
<description>
@ -393,9 +395,9 @@
return profileMap;
}
//[MNG-3954] :: this is required for the release plugin
private RuntimeInfo runtimeInfo;
public void setRuntimeInfo( RuntimeInfo runtimeInfo )
@ -411,7 +413,7 @@
}
return runtimeInfo;
}
]]>
</code>
</codeSegment>

View File

@ -9,9 +9,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@ -20,10 +20,13 @@
under the License.
-->
<!--
*** NOTE: If you add a new lifecycle or phase, be sure to update the codeSegments! ***
<!--
*** NOTE: If you add a new lifecycle or phase, be sure to update the codeSegments! ***
-->
<model>
<model xmlns="http://modello.codehaus.org/MODELLO/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://modello.codehaus.org/MODELLO/1.0.0 http://modello.codehaus.org/xsd/modello-1.0.0.xsd"
xml.namespace="http://maven.apache.org/MAVEN_LIFECYCLE/${version}"
xml.schemaLocation="http://maven.apache.org/xsd/maven-lifecycle-${version}.xsd">
<id>build-lifecycle</id>
<name>LifecycleBindings</name>
<description>Model for lifecycle specifications starting in Maven 2.1</description>
@ -81,22 +84,22 @@
public java.util.List getBindingList()
{
java.util.List lifecycles = new java.util.ArrayList();
if ( getCleanBinding() != null )
{
lifecycles.add( getCleanBinding() );
}
if ( getBuildBinding() != null )
{
lifecycles.add( getBuildBinding() );
}
if ( getSiteBinding() != null )
{
lifecycles.add( getSiteBinding() );
}
return java.util.Collections.unmodifiableList( lifecycles );
}
]]></code>
@ -115,17 +118,17 @@
{
throw new UnsupportedOperationException( "Unsupported in base-class." );
}
public java.util.LinkedHashMap getOrderedPhaseMapping()
{
throw new UnsupportedOperationException( "Unsupported in base-class." );
}
public java.util.List getPhasesInOrder()
{
throw new UnsupportedOperationException( "Unsupported in base-class." );
}
public java.util.List getPhaseNamesInOrder()
{
throw new UnsupportedOperationException( "Unsupported in base-class." );
@ -172,22 +175,22 @@
{
return "clean";
}
public java.util.LinkedHashMap getOrderedPhaseMapping()
{
java.util.LinkedHashMap phases = new java.util.LinkedHashMap();
phases.put( "pre-clean", getPreClean() );
phases.put( "clean", getClean() );
phases.put( "post-clean", getPostClean() );
return phases;
}
public java.util.List getPhasesInOrder()
{
return new java.util.ArrayList( getOrderedPhaseMapping().values() );
}
public java.util.List getPhaseNamesInOrder()
{
return new java.util.ArrayList( getOrderedPhaseMapping().keySet() );
@ -394,7 +397,7 @@
{
return "build";
}
public java.util.LinkedHashMap getOrderedPhaseMapping()
{
java.util.LinkedHashMap phases = new java.util.LinkedHashMap();
@ -421,15 +424,15 @@
phases.put( "verify", getVerify() );
phases.put( "install", getInstall() );
phases.put( "deploy", getDeploy() );
return phases;
}
public java.util.List getPhasesInOrder()
{
return new java.util.ArrayList( getOrderedPhaseMapping().values() );
}
public java.util.List getPhaseNamesInOrder()
{
return new java.util.ArrayList( getOrderedPhaseMapping().keySet() );
@ -484,7 +487,7 @@
{
return "site";
}
public java.util.LinkedHashMap getOrderedPhaseMapping()
{
java.util.LinkedHashMap map = new java.util.LinkedHashMap();
@ -492,15 +495,15 @@
map.put( "site", getSite() );
map.put( "post-site", getPostSite() );
map.put( "site-deploy", getSiteDeploy() );
return map;
}
public java.util.List getPhasesInOrder()
{
return new java.util.ArrayList( getOrderedPhaseMapping().values() );
}
public java.util.List getPhaseNamesInOrder()
{
return new java.util.ArrayList( getOrderedPhaseMapping().keySet() );
@ -530,7 +533,7 @@
<code><![CDATA[
private String name;
private LifecycleBinding lifecycleBinding;
/**
* Get the name of this phase.
*/
@ -538,7 +541,7 @@
{
return name;
}
/**
* Get the LifecycleBinding instance to which this Phase belongs.
*/
@ -546,7 +549,7 @@
{
return lifecycleBinding;
}
/**
* Set the name of this phase, and the Lifecycle instance to which is belongs.
*/
@ -554,7 +557,7 @@
{
this.name = phaseName;
this.lifecycleBinding = lifecycleBinding;
java.util.List bindings = getBindings();
if ( bindings != null )
{
@ -632,21 +635,21 @@
<code><![CDATA[
/** origin marker for mojos referenced directly by the user or embedded-mode consumer. */
public static final String DIRECT_INVOCATION_ORIGIN = "Direct invocation";
/** origin marker for single (non-lifecycle) mojos referenced by a forked-execution annotation in another mojo. */
public static final String FORKED_DIRECT_REFERENCE_ORIGIN = "Direct forking reference";
/** origin marker for mojos bound to the lifecycle through POM configuration (not packaging defaults). */
public static final String POM_ORIGIN = "POM";
/** origin marker for mojos bound to the lifecycle by a standard (or default) lifecycle mapping. */
public static final String LIFECYCLE_MAPPING_ORIGIN = "Lifecycle mapping";
/** origin marker for mojos injected into the lifecycle by Maven, to manage lifecycle state. */
public static final String INTERNAL_ORIGIN = "Maven internal state-management";
private String origin;
/**
* Return the origin marker set for this MojoBinding, or null. This will give a general idea of where this
* binding came from.
@ -655,16 +658,16 @@
{
return origin;
}
public void setOrigin( String origin )
{
this.origin = origin;
}
private String originDescription;
/**
* Return specific information about where exactly this binding came from, if it's available.
* Return specific information about where exactly this binding came from, if it's available.
* This might be used to record the specific forking mojo or the lifecycle
* overlay name that included this mojo, for instance.
*/
@ -672,14 +675,14 @@
{
return originDescription;
}
public void setOriginDescription( String originDescription )
{
this.originDescription = originDescription;
}
private Phase phase;
/**
* Get the Phase instance to which this MojoBinding is bound. NOTE: In
* some cases, the phase name may not be known, or may not exist (as in the
@ -689,7 +692,7 @@
{
return phase;
}
/**
* Set the Phase instance to which this MojoBinding is bound.
*/

View File

@ -43,7 +43,10 @@
| definition of these types
|
-->
<model xsd.namespace="http://maven.apache.org/POM/4.0.0" xsd.target-namespace="http://maven.apache.org/POM/4.0.0">
<model xmlns="http://modello.codehaus.org/MODELLO/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://modello.codehaus.org/MODELLO/1.0.0 http://modello.codehaus.org/xsd/modello-1.0.0.xsd"
xml.namespace="http://maven.apache.org/POM/${version}"
xml.schemaLocation="http://maven.apache.org/xsd/maven-${version}.xsd">
<id>maven</id>
<name>Maven</name>
<description>
@ -103,7 +106,7 @@
<!-- Parent Model -->
<!-- ====================================================================== -->
<field>
<field xdoc.separator="blank">
<name>extend</name>
<version>3.0.0</version>
<description>
@ -117,7 +120,7 @@
</description>
<type>String</type>
</field>
<field>
<field xdoc.separator="blank">
<name>parent</name>
<version>4.0.0</version>
<description>The location of the parent project, if one exists. Values from the parent
@ -132,7 +135,7 @@
<!-- groupId/artifactId/Version/Packaging -->
<!-- ====================================================================== -->
<field>
<field xdoc.separator="blank">
<name>groupId</name>
<version>3.0.0+</version>
<required>true</required>
@ -212,7 +215,7 @@
<!-- Elements which describe a project -->
<!-- ====================================================================== -->
<field>
<field xdoc.separator="blank">
<name>name</name>
<version>3.0.0+</version>
<required>true</required>
@ -312,7 +315,7 @@
<multiplicity>*</multiplicity>
</association>
</field>
<field>
<field xdoc.separator="blank">
<name>mailingLists</name>
<version>3.0.0+</version>
<description>Contains information about a project's mailing lists.</description>
@ -321,7 +324,7 @@
<multiplicity>*</multiplicity>
</association>
</field>
<field>
<field xdoc.separator="blank">
<name>developers</name>
<version>3.0.0+</version>
<description>Describes the committers of a project.</description>
@ -344,13 +347,13 @@
<!-- Issue Tracking -->
<!-- ====================================================================== -->
<field>
<field xdoc.separator="blank">
<name>issueTrackingUrl</name>
<version>3.0.0</version>
<description>The URL of the project's issue tracking system.</description>
<type>String</type>
</field>
<field>
<field xdoc.separator="blank">
<name>issueManagement</name>
<version>4.0.0</version>
<description>The project's issue management system information.</description>
@ -363,7 +366,7 @@
<!-- SCM -->
<!-- ====================================================================== -->
<field>
<field xdoc.separator="blank">
<name>branches</name>
<version>3.0.0</version>
<description>
@ -493,7 +496,7 @@
<!-- Build prerequisites -->
<!-- ====================================================================== -->
<field>
<field xdoc.separator="blank">
<name>prerequisites</name>
<version>4.0.0</version>
<description>Describes the prerequisites in the build environment for this project.</description>
@ -506,7 +509,7 @@
<!-- Build -->
<!-- ====================================================================== -->
<field>
<field xdoc.separator="blank">
<name>build</name>
<version>3.0.0+</version>
<required>true</required>
@ -520,7 +523,7 @@
<!-- Profiles -->
<!-- ====================================================================== -->
<field>
<field xdoc.separator="blank">
<name>profiles</name>
<version>4.0.0</version>
<description>A listing of project-local build profiles which will modify the build process
@ -603,7 +606,7 @@
<type>DistributionManagement</type>
</association>
</field>
<field>
<field xdoc.separator="blank">
<name>modules</name>
<version>4.0.0</version>
<description>The modules (sometimes called subprojects) to build as a part of this
@ -613,7 +616,7 @@
<multiplicity>*</multiplicity>
</association>
</field>
<field>
<field xdoc.separator="blank">
<name>repositories</name>
<version>4.0.0</version>
<description>The lists of the remote repositories for discovering dependencies and
@ -633,7 +636,7 @@
<multiplicity>*</multiplicity>
</association>
</field>
<field>
<field xdoc.separator="blank">
<name>dependencies</name>
<version>3.0.0+</version>
<description>
@ -652,7 +655,7 @@
<multiplicity>*</multiplicity>
</association>
</field>
<field>
<field xdoc.separator="blank">
<name>reports</name>
<version>4.0.0</version>
<description>
@ -677,7 +680,7 @@
<type>Reporting</type>
</association>
</field>
<field>
<field xdoc.separator="blank">
<name>dependencyManagement</name>
<version>4.0.0</version>
<required>false</required>
@ -690,7 +693,7 @@
<type>DependencyManagement</type>
</association>
</field>
<field>
<field xdoc.separator="blank">
<name>properties</name>
<version>4.0.0</version>
<description>

View File

@ -17,7 +17,10 @@ specific language governing permissions and limitations
under the License.
-->
<model>
<model xmlns="http://modello.codehaus.org/MODELLO/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://modello.codehaus.org/MODELLO/1.0.0 http://modello.codehaus.org/xsd/modello-1.0.0.xsd"
xml.namespace="http://maven.apache.org/LIFECYCLE/${version}"
xml.schemaLocation="http://maven.apache.org/xsd/lifecycle-${version}.xsd">
<id>lifecycle-mappings</id>
<name>LifecycleMappings</name>
<description><![CDATA[
@ -35,10 +38,10 @@ under the License.
<version>1.0.0</version>
<description>Root element of the lifecycle.xml file.</description>
<fields>
<field xml.listStyle="flat">
<field>
<name>lifecycles</name>
<version>1.0.0</version>
<association>
<association xml.itemsStyle="flat">
<type>Lifecycle</type>
<multiplicity>*</multiplicity>
</association>

View File

@ -17,8 +17,10 @@ specific language governing permissions and limitations
under the License.
-->
<model xsd.namespace="http://maven.apache.org/PROFILES/1.0.0"
xsd.target-namespace="http://maven.apache.org/PROFILES/1.0.0">
<model xmlns="http://modello.codehaus.org/MODELLO/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://modello.codehaus.org/MODELLO/1.0.0 http://modello.codehaus.org/xsd/modello-1.0.0.xsd"
xml.namespace="http://maven.apache.org/PROFILES/${version}"
xml.schemaLocation="http://maven.apache.org/xsd/profiles-${version}.xsd">
<id>profiles</id>
<name>Profiles</name>
<description><![CDATA[
@ -41,7 +43,7 @@ under the License.
<name>profiles</name>
<version>1.0.0</version>
<description><![CDATA[
Configuration of build profiles for adjusting the build
Configuration of build profiles for adjusting the build
according to environmental parameters
]]></description>
<association>
@ -67,7 +69,7 @@ under the License.
<name>Profile</name>
<version>1.0.0</version>
<description><![CDATA[
Modifications to the build process which is keyed on some
Modifications to the build process which is keyed on some
sort of environmental parameter.
]]></description>
<fields>
@ -316,7 +318,7 @@ under the License.
<name>ActivationProperty</name>
<version>1.0.0</version>
<description><![CDATA[
This is the property specification used to activate a profile. If the value field is empty,
This is the property specification used to activate a profile. If the value field is empty,
then the existence of the named property will activate the profile, otherwise it does a case-sensitive
match against the property value as well.
]]></description>
@ -341,7 +343,7 @@ under the License.
<version>1.0.0</version>
<description><![CDATA[
This is the file specification used to activate a profile. The missing value will be a the location
of a file that needs to exist, and if it doesn't the profile must run. On the other hand exists will test
of a file that needs to exist, and if it doesn't the profile must run. On the other hand exists will test
for the existence of the file and if it is there will run the profile.
]]></description>
<fields>

View File

@ -19,8 +19,10 @@
under the License.
-->
<model xsd.namespace="http://maven.apache.org/TOOLCHAINS/1.0.0"
xsd.target-namespace="http://maven.apache.org/TOOLCHAINS/1.0.0">
<model xmlns="http://modello.codehaus.org/MODELLO/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://modello.codehaus.org/MODELLO/1.0.0 http://modello.codehaus.org/xsd/modello-1.0.0.xsd"
xml.namespace="http://maven.apache.org/TOOLCHAINS/${version}"
xml.schemaLocation="http://maven.apache.org/xsd/toolchains-${version}.xsd">
<id>maven-toolchains</id>
<name>MavenToolchains</name>
<description><![CDATA[
@ -41,11 +43,11 @@
]]></description>
<version>1.0.0+</version>
<fields>
<field xml.listStyle="flat">
<field>
<name>toolchains</name>
<version>1.0.0+</version>
<description><![CDATA[The toolchain definition.]]></description>
<association>
<association xml.itemsStyle="flat">
<type>ToolchainModel</type>
<multiplicity>*</multiplicity>
</association>

View File

@ -61,7 +61,7 @@ under the License.
<woodstoxVersion>3.2.6</woodstoxVersion>
<modelloVersion>1.0.1-SNAPSHOT</modelloVersion>
<jxpathVersion>1.3</jxpathVersion>
</properties>
</properties>
<issueManagement>
<system>jira</system>
<url>http://jira.codehaus.org/browse/MNG</url>
@ -442,8 +442,8 @@ under the License.
<artifactId>plexus-sec-dispatcher</artifactId>
<version>${securityDispatcherVersion}</version>
</dependency>
<!-- Mercury test dependencies -->
<dependency>
<groupId>org.apache.maven.mercury</groupId>