You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jv...@apache.org on 2009/02/18 21:05:03 UTC
svn commit: r745631 [2/2] - in /maven/components/branches/MNG-3932: ./
apache-maven/ maven-compat/src/main/java/org/apache/maven/artifact/
maven-compat/src/main/java/org/apache/maven/artifact/manager/
maven-compat/src/main/java/org/apache/maven/project...
Modified: maven/components/branches/MNG-3932/maven-mercury/src/test/java/org/apache/maven/mercury/MavenDependencyProcessorTest.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-3932/maven-mercury/src/test/java/org/apache/maven/mercury/MavenDependencyProcessorTest.java?rev=745631&r1=745630&r2=745631&view=diff
==============================================================================
--- maven/components/branches/MNG-3932/maven-mercury/src/test/java/org/apache/maven/mercury/MavenDependencyProcessorTest.java (original)
+++ maven/components/branches/MNG-3932/maven-mercury/src/test/java/org/apache/maven/mercury/MavenDependencyProcessorTest.java Wed Feb 18 20:04:26 2009
@@ -18,7 +18,7 @@
import org.apache.maven.mercury.repository.api.RepositoryReader;
import org.apache.maven.mercury.repository.local.m2.LocalRepositoryM2;
import org.apache.maven.mercury.repository.remote.m2.RemoteRepositoryM2;
-import org.apache.maven.mercury.spi.http.server.HttpTestServer;
+//import org.apache.maven.mercury.spi.http.server.HttpTestServer;
import org.apache.maven.mercury.transport.api.Server;
import org.apache.maven.mercury.util.FileUtil;
import org.junit.After;
@@ -48,7 +48,7 @@
static final String _remoteRepoUrlSufix = "/maven2";
- HttpTestServer _jetty;
+// HttpTestServer _jetty;
int _port;
@@ -70,9 +70,10 @@
_localRepo = new LocalRepositoryM2( "localRepo", _localRepoFile, dp );
_remoteRepoFile = new File( _remoteRepoDir );
- _jetty = new HttpTestServer( _remoteRepoFile, _remoteRepoUrlSufix );
- _jetty.start();
- _port = _jetty.getPort();
+// _jetty = new HttpTestServer( _remoteRepoFile, _remoteRepoUrlSufix );
+// FIXME 2009-02-12 Oleg: disabling not to mess with jetty server. Will move to Mercury ITs
+// _jetty.start();
+// _port = _jetty.getPort();
Server server = new Server( "testRemote", new URL(_remoteRepoUrlPrefix + _port + _remoteRepoUrlSufix) );
_remoteRepo = new RemoteRepositoryM2( server, dp );
@@ -92,19 +93,26 @@
public void tearDown()
throws Exception
{
- if( _jetty != null )
- {
- _jetty.stop();
- _jetty.destroy();
-
- System.out.println( "Jetty on :" + _port + " destroyed\n<========\n\n" );
- }
+// if( _jetty != null )
+// {
+// FIXME 2009-02-12 Oleg: disabling not to mess with jetty server. Will move to Mercury ITs
+// _jetty.stop();
+// _jetty.destroy();
+//
+// System.out.println( "Jetty on :" + _port + " destroyed\n<========\n\n" );
+// }
+ }
+
+ @Test
+ public void testDummy()
+ throws Exception
+ {
+
}
/**
* Test method for {@link org.apache.maven.mercury.MavenDependencyProcessor#getDependencies(org.apache.maven.mercury.artifact.ArtifactBasicMetadata, org.apache.maven.mercury.builder.api.MetadataReader, java.util.Map, java.util.Map)}.
*/
- @Test
public void testMavenVersion()
throws Exception
{
Modified: maven/components/branches/MNG-3932/maven-model/src/main/mdo/maven.mdo
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-3932/maven-model/src/main/mdo/maven.mdo?rev=745631&r1=745630&r2=745631&view=diff
==============================================================================
--- maven/components/branches/MNG-3932/maven-model/src/main/mdo/maven.mdo (original)
+++ maven/components/branches/MNG-3932/maven-model/src/main/mdo/maven.mdo Wed Feb 18 20:04:26 2009
@@ -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>
@@ -743,7 +746,7 @@
<version>4.0.0</version>
<code>
<![CDATA[
- java.util.Map pluginMap;
+ java.util.Map<String, Plugin> pluginMap;
/**
* Reset the <code>pluginsMap</code> field to <code>null</code>
@@ -757,14 +760,14 @@
* @return a Map of plugins field with <code>Plugins#getKey()</code> as key
* @see org.apache.maven.model.Plugin#getKey()
*/
- public synchronized java.util.Map getPluginsAsMap()
+ public synchronized java.util.Map<String, Plugin> getPluginsAsMap()
{
if ( pluginMap == null )
{
- pluginMap = new java.util.LinkedHashMap();
+ pluginMap = new java.util.LinkedHashMap<String, Plugin>();
if ( plugins != null )
{
- for ( java.util.Iterator it = plugins.iterator(); it.hasNext(); )
+ for ( java.util.Iterator<Plugin> it = plugins.iterator(); it.hasNext(); )
{
Plugin plugin = (Plugin) it.next();
pluginMap.put( plugin.getKey(), plugin );
@@ -2621,7 +2624,7 @@
<version>4.0.0</version>
<code>
<![CDATA[
- private java.util.Map executionMap = null;
+ private java.util.Map<String, PluginExecution> executionMap = null;
/**
* Reset the <code>executionMap</code> field to <code>null</code>
@@ -2635,14 +2638,14 @@
* @return a Map of executions field with <code>PluginExecution#getId()</code> as key
* @see org.apache.maven.model.PluginExecution#getId()
*/
- public java.util.Map getExecutionsAsMap()
+ public java.util.Map<String, PluginExecution> getExecutionsAsMap()
{
if ( executionMap == null )
{
- executionMap = new java.util.LinkedHashMap();
+ executionMap = new java.util.LinkedHashMap<String, PluginExecution>();
if ( getExecutions() != null )
{
- for ( java.util.Iterator i = getExecutions().iterator(); i.hasNext(); )
+ for ( java.util.Iterator<PluginExecution> i = getExecutions().iterator(); i.hasNext(); )
{
PluginExecution exec = (PluginExecution) i.next();
@@ -2832,7 +2835,7 @@
<version>4.0.0</version>
<code>
<![CDATA[
- java.util.Map reportPluginMap;
+ java.util.Map<String, ReportPlugin> reportPluginMap;
/**
* Reset the <code>reportPluginMap</code> field to <code>null</code>
@@ -2846,14 +2849,14 @@
* @return a Map of plugins field with <code>ReportPlugin#getKey()</code> as key
* @see org.apache.maven.model.ReportPlugin#getKey()
*/
- public synchronized java.util.Map getReportPluginsAsMap()
+ public synchronized java.util.Map<String, ReportPlugin> getReportPluginsAsMap()
{
if ( reportPluginMap == null )
{
- reportPluginMap = new java.util.LinkedHashMap();
+ reportPluginMap = new java.util.LinkedHashMap<String, ReportPlugin>();
if ( getPlugins() != null )
{
- for ( java.util.Iterator it = getPlugins().iterator(); it.hasNext(); )
+ for ( java.util.Iterator<ReportPlugin> it = getPlugins().iterator(); it.hasNext(); )
{
ReportPlugin reportPlugin = (ReportPlugin) it.next();
reportPluginMap.put( reportPlugin.getKey(), reportPlugin );
@@ -3179,7 +3182,7 @@
<version>4.0.0</version>
<code>
<![CDATA[
- private java.util.Map reportSetMap = null;
+ private java.util.Map<String, ReportSet> reportSetMap = null;
/**
* Reset the <code>reportSetMap</code> field to <code>null</code>
@@ -3193,14 +3196,14 @@
* @return a Map of reportSets field with <code>ReportSet#getId()</code> as key
* @see org.apache.maven.model.ReportSet#getId()
*/
- public java.util.Map getReportSetsAsMap()
+ public java.util.Map<String, ReportSet> getReportSetsAsMap()
{
if ( reportSetMap == null )
{
- reportSetMap = new java.util.LinkedHashMap();
+ reportSetMap = new java.util.LinkedHashMap<String, ReportSet>();
if ( getReportSets() != null )
{
- for ( java.util.Iterator i = getReportSets().iterator(); i.hasNext(); )
+ for ( java.util.Iterator<ReportSet> i = getReportSets().iterator(); i.hasNext(); )
{
ReportSet reportSet = (ReportSet) i.next();
reportSetMap.put( reportSet.getId(), reportSet );
Modified: maven/components/branches/MNG-3932/maven-plugin-api/src/main/mdo/lifecycle.mdo
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-3932/maven-plugin-api/src/main/mdo/lifecycle.mdo?rev=745631&r1=745630&r2=745631&view=diff
==============================================================================
--- maven/components/branches/MNG-3932/maven-plugin-api/src/main/mdo/lifecycle.mdo (original)
+++ maven/components/branches/MNG-3932/maven-plugin-api/src/main/mdo/lifecycle.mdo Wed Feb 18 20:04:26 2009
@@ -17,7 +17,10 @@
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 @@
<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>
Modified: maven/components/branches/MNG-3932/maven-project-builder/src/main/java/org/apache/maven/project/builder/PomTransformer.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-3932/maven-project-builder/src/main/java/org/apache/maven/project/builder/PomTransformer.java?rev=745631&r1=745630&r2=745631&view=diff
==============================================================================
--- maven/components/branches/MNG-3932/maven-project-builder/src/main/java/org/apache/maven/project/builder/PomTransformer.java (original)
+++ maven/components/branches/MNG-3932/maven-project-builder/src/main/java/org/apache/maven/project/builder/PomTransformer.java Wed Feb 18 20:04:26 2009
@@ -433,7 +433,7 @@
{
int index = props.indexOf(mp) + 1;
- if(index <= props.size() && mp.isParentOf(props.get(index)) && mp.getDepth() != props.get(index).getDepth()
+ if(index < props.size() && mp.isParentOf(props.get(index)) && mp.getDepth() != props.get(index).getDepth()
&& !props.get(index).getUri().contains("#property"))
{
p.add(new ModelProperty(mp.getUri(), null));
@@ -530,24 +530,27 @@
List clearedProperties = new ArrayList<ModelProperty>();
//Default Dependency Scope Rule
- ModelDataSource s = new DefaultModelDataSource( tmp, Arrays.asList( new ArtifactModelContainerFactory()) );
- for(ModelContainer mc : s.queryFor(ProjectUri.Dependencies.Dependency.xUri))
+ if(domainModelIndex == 0)
{
- boolean containsScope = false;
- for(ModelProperty mp :mc.getProperties())
- {
- if(mp.getUri().equals(ProjectUri.Dependencies.Dependency.scope)) {
- containsScope = true;
- break;
- }
- }
-
- if(!containsScope)
- {
- tmp.add(tmp.indexOf(mc.getProperties().get(0)) + 1, new ModelProperty(ProjectUri.Dependencies.Dependency.scope, "compile"));
- }
- }
+ ModelDataSource s = new DefaultModelDataSource( tmp, Arrays.asList( new ArtifactModelContainerFactory()) );
+ for(ModelContainer mc : s.queryFor(ProjectUri.Dependencies.Dependency.xUri))
+ {
+ boolean containsScope = false;
+ for(ModelProperty mp :mc.getProperties())
+ {
+ if(mp.getUri().equals(ProjectUri.Dependencies.Dependency.scope)) {
+ containsScope = true;
+ break;
+ }
+ }
+ if(!containsScope)
+ {
+ tmp.add(tmp.indexOf(mc.getProperties().get(0)) + 1, new ModelProperty(ProjectUri.Dependencies.Dependency.scope, "compile"));
+ }
+ }
+ }
+
//Remove Default Executions IDS (mng-3965)
List<ModelProperty> replace = new ArrayList<ModelProperty>();
for(ModelProperty mp : tmp)
Modified: maven/components/branches/MNG-3932/maven-project-builder/src/main/java/org/apache/maven/project/builder/ProjectUri.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-3932/maven-project-builder/src/main/java/org/apache/maven/project/builder/ProjectUri.java?rev=745631&r1=745630&r2=745631&view=diff
==============================================================================
--- maven/components/branches/MNG-3932/maven-project-builder/src/main/java/org/apache/maven/project/builder/ProjectUri.java (original)
+++ maven/components/branches/MNG-3932/maven-project-builder/src/main/java/org/apache/maven/project/builder/ProjectUri.java Wed Feb 18 20:04:26 2009
@@ -1002,7 +1002,7 @@
}
}
- public static String modules = "http://apache.org/maven/project/profiles#collection/profile/modules";
+ public static String modules = "http://apache.org/maven/project/profiles#collection/profile/modules#collection";
public static class Repositories
{
@@ -1113,7 +1113,7 @@
public static class Dependencies
{
- public static String xUri = "http://apache.org/maven/project/profiles#collection/profile/dependencies";
+ public static String xUri = "http://apache.org/maven/project/profiles#collection/profile/dependencies#collection";
public static class Dependency
{
@@ -1160,7 +1160,7 @@
}
public static String optional =
- "http://apache.org/maven/project/profiles#collection/profile/dependencies/dependency/optional";
+ "http://apache.org/maven/project/profiles#collection/profile/dependencies#collection/dependency/optional";
}
}
@@ -1179,49 +1179,49 @@
public static class Plugins
{
public static String xUri =
- "http://apache.org/maven/project/profiles#collection/profile/reporting/plugins";
+ "http://apache.org/maven/project/profiles#collection/profile/reporting/plugins#collection";
public static class Plugin
{
public static String xUri =
- "http://apache.org/maven/project/profiles#collection/profile/reporting/plugins/plugin";
+ "http://apache.org/maven/project/profiles#collection/profile/reporting/plugins#collection/plugin";
public static String groupId =
- "http://apache.org/maven/project/profiles#collection/profile/reporting/plugins/plugin/groupId";
+ "http://apache.org/maven/project/profiles#collection/profile/reporting/plugins#collection/plugin/groupId";
public static String artifactId =
- "http://apache.org/maven/project/profiles#collection/profile/reporting/plugins/plugin/artifactId";
+ "http://apache.org/maven/project/profiles#collection/profile/reporting/plugins#collection/plugin/artifactId";
public static String version =
- "http://apache.org/maven/project/profiles#collection/profile/reporting/plugins/plugin/version";
+ "http://apache.org/maven/project/profiles#collection/profile/reporting/plugins#collection/plugin/version";
public static String inherited =
- "http://apache.org/maven/project/profiles#collection/profile/reporting/plugins/plugin/inherited";
+ "http://apache.org/maven/project/profiles#collection/profile/reporting/plugins#collection/plugin/inherited";
public static String configuration =
- "http://apache.org/maven/project/profiles#collection/profile/reporting/plugins/plugin/configuration#set";
+ "http://apache.org/maven/project/profiles#collection/profile/reporting/plugins#collection/plugin/configuration#set";
public static class ReportSets
{
public static String xUri =
- "http://apache.org/maven/project/profiles#collection/profile/reporting/plugins/plugin/reportSets#collection";
+ "http://apache.org/maven/project/profiles#collection/profile/reporting/plugins#collection/plugin/reportSets#collection";
public static class ReportSet
{
public static String xUri =
- "http://apache.org/maven/project/profiles#collection/profile/reporting/plugins/plugin/reportSets#collection/reportSet";
+ "http://apache.org/maven/project/profiles#collection/profile/reporting/plugins#collection/plugin/reportSets#collection/reportSet";
public static String id =
- "http://apache.org/maven/project/profiles#collection/profile/reporting/plugins/plugin/reportSets#collection/reportSet/id";
+ "http://apache.org/maven/project/profiles#collection/profile/reporting/plugins#collection/plugin/reportSets#collection/reportSet/id";
public static String configuration =
- "http://apache.org/maven/project/profiles#collection/profile/reporting/plugins/plugin/reportSets#collection/reportSet/configuration#set";
+ "http://apache.org/maven/project/profiles#collection/profile/reporting/plugins#collection/plugin/reportSets#collection/reportSet/configuration#set";
public static String inherited =
- "http://apache.org/maven/project/profiles#collection/profile/reporting/plugins/plugin/reportSets#collection/reportSet/inherited";
+ "http://apache.org/maven/project/profiles#collection/profile/reporting/plugins#collection/plugin/reportSets#collection/reportSet/inherited";
public static String reports =
- "http://apache.org/maven/project/profiles#collection/profile/reporting/plugins/plugin/reportSets#collection/reportSet/reports";
+ "http://apache.org/maven/project/profiles#collection/profile/reporting/plugins#collection/plugin/reportSets#collection/reportSet/reports";
}
}
}
@@ -1375,7 +1375,7 @@
"http://apache.org/maven/project/profiles#collection/profile/distributionManagement/status";
}
- public static String properties = "http://apache.org/maven/project/profiles#collection/profile/properties";
+ public static String properties = "http://apache.org/maven/project/profiles#collection/profile/properties#collection";
}
}
Propchange: maven/components/branches/MNG-3932/maven-project-builder/src/main/resources/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 18 20:04:26 2009
@@ -3,4 +3,4 @@
/maven/components/branches/maven-2.0.x/maven-project/src/main/resources:679206,720042
/maven/components/branches/sisbell-plugin-manager/maven-project-builder/src/main/resources:738973-739966
/maven/components/sisbell-plugin-manager/maven-project-builder/src/main/resources:738757-738972
-/maven/components/trunk/maven-project-builder/src/main/resources:739772-740199,740316-741812,742231-742684
+/maven/components/trunk/maven-project-builder/src/main/resources:739772-740199,740316-741812,742231-742684,742726-745532
Propchange: maven/components/branches/MNG-3932/maven-project-builder/src/test/java/org/apache/maven/project/builder/EnforcerPomTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 18 20:04:26 2009
@@ -4,4 +4,4 @@
/maven/components/branches/sisbell-plugin-manager/maven-project-builder/src/test/java/org/apache/maven/project/builder/EnforcerPomTest.java:738973-739966
/maven/components/sisbell-plugin-manager/maven-project-builder/src/test/java/org/apache/maven/project/builder/EnforcerPomTest.java:738757-738972
/maven/components/trunk/maven-project-builder/src/test/java/EnforcerPomTest.java:688587-696625,696644-699681
-/maven/components/trunk/maven-project-builder/src/test/java/org/apache/maven/project/builder/EnforcerPomTest.java:739772-740199,740316-741812,742231-742684
+/maven/components/trunk/maven-project-builder/src/test/java/org/apache/maven/project/builder/EnforcerPomTest.java:739772-740199,740316-741812,742231-742684,742726-745532
Propchange: maven/components/branches/MNG-3932/maven-project/src/main/java/org/apache/maven/profiles/AlwaysOnActivation.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 18 20:04:26 2009
@@ -3,4 +3,4 @@
/maven/components/branches/maven-2.0.x/maven-profile/src/main/java/org/apache/maven/profiles/AlwaysOnActivation.java:679206
/maven/components/branches/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/profiles/AlwaysOnActivation.java:738973-739966
/maven/components/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/profiles/AlwaysOnActivation.java:738757-738972
-/maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/AlwaysOnActivation.java:739772-740199,740316-741812,742231-742684
+/maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/AlwaysOnActivation.java:739772-740199,740316-741812,742231-742684,742726-745532
Propchange: maven/components/branches/MNG-3932/maven-project/src/main/java/org/apache/maven/profiles/DefaultMavenProfilesBuilder.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 18 20:04:26 2009
@@ -3,4 +3,4 @@
/maven/components/branches/maven-2.0.x/maven-profile/src/main/java/org/apache/maven/profiles/DefaultMavenProfilesBuilder.java:679206
/maven/components/branches/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/profiles/DefaultMavenProfilesBuilder.java:738973-739966
/maven/components/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/profiles/DefaultMavenProfilesBuilder.java:738757-738972
-/maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/DefaultMavenProfilesBuilder.java:739772-740199,740316-741812,742231-742684
+/maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/DefaultMavenProfilesBuilder.java:739772-740199,740316-741812,742231-742684,742726-745532
Propchange: maven/components/branches/MNG-3932/maven-project/src/main/java/org/apache/maven/profiles/MavenProfilesBuilder.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 18 20:04:26 2009
@@ -3,4 +3,4 @@
/maven/components/branches/maven-2.0.x/maven-profile/src/main/java/org/apache/maven/profiles/MavenProfilesBuilder.java:679206
/maven/components/branches/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/profiles/MavenProfilesBuilder.java:738973-739966
/maven/components/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/profiles/MavenProfilesBuilder.java:738757-738972
-/maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/MavenProfilesBuilder.java:739772-740199,740316-741812,742231-742684
+/maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/MavenProfilesBuilder.java:739772-740199,740316-741812,742231-742684,742726-745532
Propchange: maven/components/branches/MNG-3932/maven-project/src/main/java/org/apache/maven/profiles/ProfilesConversionUtils.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 18 20:04:26 2009
@@ -3,4 +3,4 @@
/maven/components/branches/maven-2.0.x/maven-profile/src/main/java/org/apache/maven/profiles/ProfilesConversionUtils.java:679206
/maven/components/branches/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/profiles/ProfilesConversionUtils.java:738973-739966
/maven/components/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/profiles/ProfilesConversionUtils.java:738757-738972
-/maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/ProfilesConversionUtils.java:739772-740199,740316-741812,742231-742684
+/maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/ProfilesConversionUtils.java:739772-740199,740316-741812,742231-742684,742726-745532
Modified: maven/components/branches/MNG-3932/maven-project/src/main/java/org/apache/maven/profiles/build/DefaultProfileAdvisor.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-3932/maven-project/src/main/java/org/apache/maven/profiles/build/DefaultProfileAdvisor.java?rev=745631&r1=745630&r2=745631&view=diff
==============================================================================
--- maven/components/branches/MNG-3932/maven-project/src/main/java/org/apache/maven/profiles/build/DefaultProfileAdvisor.java (original)
+++ maven/components/branches/MNG-3932/maven-project/src/main/java/org/apache/maven/profiles/build/DefaultProfileAdvisor.java Wed Feb 18 20:04:26 2009
@@ -229,12 +229,15 @@
if ( root != null )
{
- List active = root.getActiveProfiles();
+ List<String> active = root.getActiveProfiles();
if ( ( active != null ) && !active.isEmpty() )
{
ProfileActivationContext ctx = profileManager.getProfileActivationContext();
- ctx.setExplicitlyActiveProfileIds( root.getActiveProfiles() );
+ for ( String profileId : active )
+ {
+ ctx.setActive( profileId );
+ }
}
for ( Iterator it = root.getProfiles().iterator(); it.hasNext(); )
Modified: maven/components/branches/MNG-3932/maven-project/src/main/java/org/apache/maven/project/MavenProject.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-3932/maven-project/src/main/java/org/apache/maven/project/MavenProject.java?rev=745631&r1=745630&r2=745631&view=diff
==============================================================================
--- maven/components/branches/MNG-3932/maven-project/src/main/java/org/apache/maven/project/MavenProject.java (original)
+++ maven/components/branches/MNG-3932/maven-project/src/main/java/org/apache/maven/project/MavenProject.java Wed Feb 18 20:04:26 2009
@@ -64,9 +64,11 @@
import org.apache.maven.model.Plugin;
import org.apache.maven.model.PluginManagement;
import org.apache.maven.model.Prerequisites;
+import org.apache.maven.model.Profile;
import org.apache.maven.model.ReportPlugin;
import org.apache.maven.model.ReportSet;
import org.apache.maven.model.Reporting;
+import org.apache.maven.model.Repository;
import org.apache.maven.model.Resource;
import org.apache.maven.model.Scm;
import org.apache.maven.model.io.xpp3.MavenXpp3Writer;
@@ -104,7 +106,7 @@
private File file;
- private Set artifacts;
+ private Set<Artifact> artifacts;
private Artifact parentArtifact;
@@ -112,54 +114,54 @@
private List<ArtifactRepository> remoteArtifactRepositories;
- private List collectedProjects = Collections.EMPTY_LIST;
+ private List<MavenProject> collectedProjects = Collections.emptyList();
private List<Artifact> attachedArtifacts;
private MavenProject executionProject;
- private List compileSourceRoots = new ArrayList();
+ private List<String> compileSourceRoots = new ArrayList<String>();
- private List testCompileSourceRoots = new ArrayList();
+ private List<String> testCompileSourceRoots = new ArrayList<String>();
- private List scriptSourceRoots = new ArrayList();
+ private List<String> scriptSourceRoots = new ArrayList<String>();
- private List pluginArtifactRepositories;
+ private List<ArtifactRepository> pluginArtifactRepositories;
private ArtifactRepository releaseArtifactRepository;
private ArtifactRepository snapshotArtifactRepository;
- private List activeProfiles = new ArrayList();
+ private List<Profile> activeProfiles = new ArrayList<Profile>();
- private Set dependencyArtifacts;
+ private Set<Artifact> dependencyArtifacts;
private Artifact artifact;
// calculated.
- private Map artifactMap;
+ private Map<String, Artifact> artifactMap;
private Model originalModel;
- private Map pluginArtifactMap;
+ private Map<String, Artifact> pluginArtifactMap;
- private Set reportArtifacts;
+ private Set<Artifact> reportArtifacts;
- private Map reportArtifactMap;
+ private Map<String, Artifact> reportArtifactMap;
- private Set extensionArtifacts;
+ private Set<Artifact> extensionArtifacts;
- private Map extensionArtifactMap;
+ private Map<String, Artifact> extensionArtifactMap;
- private Map managedVersionMap;
+ private Map<String, Artifact> managedVersionMap;
- private Map projectReferences = new HashMap();
+ private Map<String, MavenProject> projectReferences = new HashMap<String, MavenProject>();
private boolean executionRoot;
- private Map moduleAdjustments;
+ private Map<String, String> moduleAdjustments;
- private Stack previousExecutionProjects = new Stack();
+ private Stack<MavenProject> previousExecutionProjects = new Stack<MavenProject>();
//!! Components that need to be taken out of here
private ArtifactFactory artifactFactory;
@@ -250,7 +252,7 @@
try
{
- LinkedHashSet repoSet = new LinkedHashSet();
+ Set<Repository> repoSet = new LinkedHashSet<Repository>();
if ( ( model.getRepositories() != null ) && !model.getRepositories().isEmpty() )
{
repoSet.addAll( model.getRepositories() );
@@ -261,7 +263,7 @@
repoSet.addAll( model.getPluginRepositories() );
}
- setRemoteArtifactRepositories( mavenTools.buildArtifactRepositories( new ArrayList( repoSet ) ) );
+ setRemoteArtifactRepositories( mavenTools.buildArtifactRepositories( new ArrayList<Repository>( repoSet ) ) );
}
catch ( Exception e )
{
@@ -298,12 +300,12 @@
if ( moduleAdjustments == null )
{
- moduleAdjustments = new HashMap();
+ moduleAdjustments = new HashMap<String, String>();
- List modules = getModules();
+ List<String> modules = getModules();
if ( modules != null )
{
- for ( Iterator it = modules.iterator(); it.hasNext(); )
+ for ( Iterator<String> it = modules.iterator(); it.hasNext(); )
{
String modulePath = (String) it.next();
String moduleName = modulePath;
@@ -403,7 +405,7 @@
this.parent = parent;
}
- public void setRemoteArtifactRepositories( List remoteArtifactRepositories )
+ public void setRemoteArtifactRepositories( List<ArtifactRepository> remoteArtifactRepositories )
{
this.remoteArtifactRepositories = remoteArtifactRepositories;
}
@@ -441,12 +443,12 @@
}
}
- public void setDependencies( List dependencies )
+ public void setDependencies( List<Dependency> dependencies )
{
getModel().setDependencies( dependencies );
}
- public List getDependencies()
+ public List<Dependency> getDependencies()
{
return getModel().getDependencies();
}
@@ -505,29 +507,29 @@
}
}
- public List getCompileSourceRoots()
+ public List<String> getCompileSourceRoots()
{
return compileSourceRoots;
}
- public List getScriptSourceRoots()
+ public List<String> getScriptSourceRoots()
{
return scriptSourceRoots;
}
- public List getTestCompileSourceRoots()
+ public List<String> getTestCompileSourceRoots()
{
return testCompileSourceRoots;
}
- public List getCompileClasspathElements()
+ public List<String> getCompileClasspathElements()
throws DependencyResolutionRequiredException
{
- List list = new ArrayList( getArtifacts().size() );
+ List<String> list = new ArrayList<String>( getArtifacts().size() + 1 );
list.add( getBuild().getOutputDirectory() );
- for ( Iterator i = getArtifacts().iterator(); i.hasNext(); )
+ for ( Iterator<Artifact> i = getArtifacts().iterator(); i.hasNext(); )
{
Artifact a = (Artifact) i.next();
@@ -544,11 +546,11 @@
return list;
}
- public List getCompileArtifacts()
+ public List<Artifact> getCompileArtifacts()
{
- List list = new ArrayList( getArtifacts().size() );
+ List<Artifact> list = new ArrayList<Artifact>( getArtifacts().size() );
- for ( Iterator i = getArtifacts().iterator(); i.hasNext(); )
+ for ( Iterator<Artifact> i = getArtifacts().iterator(); i.hasNext(); )
{
Artifact a = (Artifact) i.next();
@@ -566,18 +568,18 @@
return list;
}
- public List getCompileDependencies()
+ public List<Dependency> getCompileDependencies()
{
- Set artifacts = getArtifacts();
+ Set<Artifact> artifacts = getArtifacts();
if ( ( artifacts == null ) || artifacts.isEmpty() )
{
- return Collections.EMPTY_LIST;
+ return Collections.emptyList();
}
- List list = new ArrayList( artifacts.size() );
+ List<Dependency> list = new ArrayList<Dependency>( artifacts.size() );
- for ( Iterator i = getArtifacts().iterator(); i.hasNext(); )
+ for ( Iterator<Artifact> i = getArtifacts().iterator(); i.hasNext(); )
{
Artifact a = (Artifact) i.next();
@@ -600,16 +602,16 @@
return list;
}
- public List getTestClasspathElements()
+ public List<String> getTestClasspathElements()
throws DependencyResolutionRequiredException
{
- List list = new ArrayList( getArtifacts().size() + 2 );
+ List<String> list = new ArrayList<String>( getArtifacts().size() + 2 );
list.add( getBuild().getTestOutputDirectory() );
list.add( getBuild().getOutputDirectory() );
- for ( Iterator i = getArtifacts().iterator(); i.hasNext(); )
+ for ( Iterator<Artifact> i = getArtifacts().iterator(); i.hasNext(); )
{
Artifact a = (Artifact) i.next();
@@ -626,11 +628,11 @@
return list;
}
- public List getTestArtifacts()
+ public List<Artifact> getTestArtifacts()
{
- List list = new ArrayList( getArtifacts().size() );
+ List<Artifact> list = new ArrayList<Artifact>( getArtifacts().size() );
- for ( Iterator i = getArtifacts().iterator(); i.hasNext(); )
+ for ( Iterator<Artifact> i = getArtifacts().iterator(); i.hasNext(); )
{
Artifact a = (Artifact) i.next();
@@ -643,18 +645,18 @@
return list;
}
- public List getTestDependencies()
+ public List<Dependency> getTestDependencies()
{
- Set artifacts = getArtifacts();
+ Set<Artifact> artifacts = getArtifacts();
if ( ( artifacts == null ) || artifacts.isEmpty() )
{
- return Collections.EMPTY_LIST;
+ return Collections.emptyList();
}
- List list = new ArrayList( artifacts.size() );
+ List<Dependency> list = new ArrayList<Dependency>( artifacts.size() );
- for ( Iterator i = getArtifacts().iterator(); i.hasNext(); )
+ for ( Iterator<Artifact> i = getArtifacts().iterator(); i.hasNext(); )
{
Artifact a = (Artifact) i.next();
@@ -672,14 +674,14 @@
return list;
}
- public List getRuntimeClasspathElements()
+ public List<String> getRuntimeClasspathElements()
throws DependencyResolutionRequiredException
{
- List list = new ArrayList( getArtifacts().size() + 1 );
+ List<String> list = new ArrayList<String>( getArtifacts().size() + 1 );
list.add( getBuild().getOutputDirectory() );
- for ( Iterator i = getArtifacts().iterator(); i.hasNext(); )
+ for ( Iterator<Artifact> i = getArtifacts().iterator(); i.hasNext(); )
{
Artifact a = (Artifact) i.next();
@@ -700,11 +702,11 @@
return list;
}
- public List getRuntimeArtifacts()
+ public List<Artifact> getRuntimeArtifacts()
{
- List list = new ArrayList( getArtifacts().size() );
+ List<Artifact> list = new ArrayList<Artifact>( getArtifacts().size() );
- for ( Iterator i = getArtifacts().iterator(); i.hasNext(); )
+ for ( Iterator<Artifact> i = getArtifacts().iterator(); i.hasNext(); )
{
Artifact a = (Artifact) i.next();
@@ -721,18 +723,18 @@
return list;
}
- public List getRuntimeDependencies()
+ public List<Dependency> getRuntimeDependencies()
{
- Set artifacts = getArtifacts();
+ Set<Artifact> artifacts = getArtifacts();
if ( ( artifacts == null ) || artifacts.isEmpty() )
{
- return Collections.EMPTY_LIST;
+ return Collections.emptyList();
}
- List list = new ArrayList( artifacts.size() );
+ List<Dependency> list = new ArrayList<Dependency>( artifacts.size() );
- for ( Iterator i = artifacts.iterator(); i.hasNext(); )
+ for ( Iterator<Artifact> i = artifacts.iterator(); i.hasNext(); )
{
Artifact a = (Artifact) i.next();
@@ -754,14 +756,14 @@
return list;
}
- public List getSystemClasspathElements()
+ public List<String> getSystemClasspathElements()
throws DependencyResolutionRequiredException
{
- List list = new ArrayList( getArtifacts().size() );
+ List<String> list = new ArrayList<String>( getArtifacts().size() );
list.add( getBuild().getOutputDirectory() );
- for ( Iterator i = getArtifacts().iterator(); i.hasNext(); )
+ for ( Iterator<Artifact> i = getArtifacts().iterator(); i.hasNext(); )
{
Artifact a = (Artifact) i.next();
@@ -777,11 +779,11 @@
return list;
}
- public List getSystemArtifacts()
+ public List<Artifact> getSystemArtifacts()
{
- List list = new ArrayList( getArtifacts().size() );
+ List<Artifact> list = new ArrayList<Artifact>( getArtifacts().size() );
- for ( Iterator i = getArtifacts().iterator(); i.hasNext(); )
+ for ( Iterator<Artifact> i = getArtifacts().iterator(); i.hasNext(); )
{
Artifact a = (Artifact) i.next();
@@ -798,18 +800,18 @@
return list;
}
- public List getSystemDependencies()
+ public List<Dependency> getSystemDependencies()
{
- Set artifacts = getArtifacts();
+ Set<Artifact> artifacts = getArtifacts();
if ( ( artifacts == null ) || artifacts.isEmpty() )
{
- return Collections.EMPTY_LIST;
+ return Collections.emptyList();
}
- List list = new ArrayList( artifacts.size() );
+ List<Dependency> list = new ArrayList<Dependency>( artifacts.size() );
- for ( Iterator i = getArtifacts().iterator(); i.hasNext(); )
+ for ( Iterator<Artifact> i = getArtifacts().iterator(); i.hasNext(); )
{
Artifact a = (Artifact) i.next();
@@ -1007,12 +1009,12 @@
return getModel().getScm();
}
- public void setMailingLists( List mailingLists )
+ public void setMailingLists( List<MailingList> mailingLists )
{
getModel().setMailingLists( mailingLists );
}
- public List getMailingLists()
+ public List<MailingList> getMailingLists()
{
return getModel().getMailingLists();
}
@@ -1022,12 +1024,12 @@
getModel().addMailingList( mailingList );
}
- public void setDevelopers( List developers )
+ public void setDevelopers( List<Developer> developers )
{
getModel().setDevelopers( developers );
}
- public List getDevelopers()
+ public List<Developer> getDevelopers()
{
return getModel().getDevelopers();
}
@@ -1037,12 +1039,12 @@
getModel().addDeveloper( developer );
}
- public void setContributors( List contributors )
+ public void setContributors( List<Contributor> contributors )
{
getModel().setContributors( contributors );
}
- public List getContributors()
+ public List<Contributor> getContributors()
{
return getModel().getContributors();
}
@@ -1062,12 +1064,12 @@
return getModelBuild();
}
- public List getResources()
+ public List<Resource> getResources()
{
return getBuild().getResources();
}
- public List getTestResources()
+ public List<Resource> getTestResources()
{
return getBuild().getTestResources();
}
@@ -1092,12 +1094,12 @@
return getModel().getReporting();
}
- public void setLicenses( List licenses )
+ public void setLicenses( List<License> licenses )
{
getModel().setLicenses( licenses );
}
- public List getLicenses()
+ public List<License> getLicenses()
{
return getModel().getLicenses();
}
@@ -1107,7 +1109,7 @@
getModel().addLicense( license );
}
- public void setArtifacts( Set artifacts )
+ public void setArtifacts( Set<Artifact> artifacts )
{
this.artifacts = artifacts;
@@ -1123,12 +1125,12 @@
* @return {@link Set} < {@link Artifact} >
* @see #getDependencyArtifacts() to get only direct dependencies
*/
- public Set getArtifacts()
+ public Set<Artifact> getArtifacts()
{
- return artifacts == null ? Collections.EMPTY_SET : artifacts;
+ return artifacts == null ? Collections.<Artifact> emptySet() : artifacts;
}
- public Map getArtifactMap()
+ public Map<String, Artifact> getArtifactMap()
{
if ( artifactMap == null )
{
@@ -1137,17 +1139,17 @@
return artifactMap;
}
- public Set getPluginArtifacts()
+ public Set<Artifact> getPluginArtifacts()
{
if ( pluginArtifacts != null )
{
return pluginArtifacts;
}
- pluginArtifacts = new HashSet();
+ pluginArtifacts = new HashSet<Artifact>();
if ( artifactFactory != null )
{
- List plugins = getBuildPlugins();
- for ( Iterator i = plugins.iterator(); i.hasNext(); )
+ List<Plugin> plugins = getBuildPlugins();
+ for ( Iterator<Plugin> i = plugins.iterator(); i.hasNext(); )
{
Plugin p = (Plugin) i.next();
@@ -1182,31 +1184,31 @@
return pluginArtifacts;
}
- public Map getPluginArtifactMap()
+ public Map<String, Artifact> getPluginArtifactMap()
{
pluginArtifactMap = ArtifactUtils.artifactMapByVersionlessId( getPluginArtifacts() );
return pluginArtifactMap;
}
- public void setReportArtifacts( Set reportArtifacts )
+ public void setReportArtifacts( Set<Artifact> reportArtifacts )
{
this.reportArtifacts = reportArtifacts;
reportArtifactMap = null;
}
- public Set getReportArtifacts()
+ public Set<Artifact> getReportArtifacts()
{
if( reportArtifacts != null )
{
return reportArtifacts;
}
- reportArtifacts = new HashSet();
- List reports = getReportPlugins();
+ reportArtifacts = new HashSet<Artifact>();
+ List<ReportPlugin> reports = getReportPlugins();
if ( reports != null )
{
- for ( Iterator i = reports.iterator(); i.hasNext(); )
+ for ( Iterator<ReportPlugin> i = reports.iterator(); i.hasNext(); )
{
ReportPlugin p = (ReportPlugin) i.next();
@@ -1241,7 +1243,7 @@
return reportArtifacts;
}
- public Map getReportArtifactMap()
+ public Map<String, Artifact> getReportArtifactMap()
{
if ( reportArtifactMap == null )
{
@@ -1251,24 +1253,24 @@
return reportArtifactMap;
}
- public void setExtensionArtifacts( Set extensionArtifacts )
+ public void setExtensionArtifacts( Set<Artifact> extensionArtifacts )
{
this.extensionArtifacts = extensionArtifacts;
extensionArtifactMap = null;
}
- public Set getExtensionArtifacts()
+ public Set<Artifact> getExtensionArtifacts()
{
if( extensionArtifacts != null )
{
return extensionArtifacts;
}
- extensionArtifacts = new HashSet();
- List extensions = getBuildExtensions();
+ extensionArtifacts = new HashSet<Artifact>();
+ List<Extension> extensions = getBuildExtensions();
if ( extensions != null )
{
- for ( Iterator i = extensions.iterator(); i.hasNext(); )
+ for ( Iterator<Extension> i = extensions.iterator(); i.hasNext(); )
{
Extension ext = (Extension) i.next();
@@ -1304,7 +1306,7 @@
return extensionArtifacts;
}
- public Map getExtensionArtifactMap()
+ public Map<String, Artifact> getExtensionArtifactMap()
{
if ( extensionArtifactMap == null )
{
@@ -1329,7 +1331,7 @@
return parentArtifact;
}
- public List getRepositories()
+ public List<Repository> getRepositories()
{
return getModel().getRepositories();
}
@@ -1338,26 +1340,26 @@
// Plugins
// ----------------------------------------------------------------------
- public List getReportPlugins()
+ public List<ReportPlugin> getReportPlugins()
{
if ( getModel().getReporting() == null )
{
- return Collections.EMPTY_LIST;
+ return Collections.emptyList();
}
return getModel().getReporting().getPlugins();
}
- public List getBuildPlugins()
+ public List<Plugin> getBuildPlugins()
{
if ( getModel().getBuild() == null )
{
- return Collections.EMPTY_LIST;
+ return Collections.emptyList();
}
return getModel().getBuild().getPlugins();
}
- public List getModules()
+ public List<String> getModules()
{
return getModel().getModules();
}
@@ -1409,7 +1411,7 @@
if ( pm != null )
{
- Map pmByKey = pm.getPluginsAsMap();
+ Map<String, Plugin> pmByKey = pm.getPluginsAsMap();
String pluginKey = plugin.getKey();
@@ -1422,17 +1424,17 @@
}
}
- public List getCollectedProjects()
+ public List<MavenProject> getCollectedProjects()
{
return collectedProjects;
}
- public void setCollectedProjects( List collectedProjects )
+ public void setCollectedProjects( List<MavenProject> collectedProjects )
{
this.collectedProjects = collectedProjects;
}
- public void setPluginArtifactRepositories( List pluginArtifactRepositories )
+ public void setPluginArtifactRepositories( List<ArtifactRepository> pluginArtifactRepositories )
{
this.pluginArtifactRepositories = pluginArtifactRepositories;
}
@@ -1441,7 +1443,7 @@
* @return a list of ArtifactRepository objects constructed
* from the Repository objects returned by getPluginRepositories.
*/
- public List getPluginArtifactRepositories()
+ public List<ArtifactRepository> getPluginArtifactRepositories()
{
return getRemoteArtifactRepositories();
}
@@ -1453,18 +1455,18 @@
: getReleaseArtifactRepository();
}
- public List getPluginRepositories()
+ public List<Repository> getPluginRepositories()
{
// return model.getPluginRepositories();
return getModel().getRepositories();
}
- public void setActiveProfiles( List activeProfiles )
+ public void setActiveProfiles( List<Profile> activeProfiles )
{
this.activeProfiles.addAll( activeProfiles );
}
- public List getActiveProfiles()
+ public List<Profile> getActiveProfiles()
{
return activeProfiles;
}
@@ -1472,7 +1474,7 @@
public void addAttachedArtifact( Artifact artifact )
throws DuplicateArtifactAttachmentException
{
- List attachedArtifacts = getAttachedArtifacts();
+ List<Artifact> attachedArtifacts = getAttachedArtifacts();
if ( attachedArtifacts.contains( artifact ) )
{
@@ -1507,7 +1509,7 @@
if ( getReportPlugins() != null )
{
- for ( Iterator iterator = getReportPlugins().iterator(); iterator.hasNext(); )
+ for ( Iterator<ReportPlugin> iterator = getReportPlugins().iterator(); iterator.hasNext(); )
{
ReportPlugin plugin = (ReportPlugin) iterator.next();
@@ -1563,12 +1565,12 @@
* @return {@link Set} < {@link Artifact} >
* @see #getArtifacts() to get all transitive dependencies
*/
- public Set getDependencyArtifacts()
+ public Set<Artifact> getDependencyArtifacts()
{
return dependencyArtifacts;
}
- public void setDependencyArtifacts( Set dependencyArtifacts )
+ public void setDependencyArtifacts( Set<Artifact> dependencyArtifacts )
{
this.dependencyArtifacts = dependencyArtifacts;
}
@@ -1593,29 +1595,29 @@
return originalModel;
}
- public void setManagedVersionMap( Map map )
+ public void setManagedVersionMap( Map<String, Artifact> map )
{
managedVersionMap = map;
}
- public Map getManagedVersionMap()
+ public Map<String, Artifact> getManagedVersionMap()
{
if ( managedVersionMap != null )
{
return managedVersionMap;
}
- Map map = null;
+ Map<String, Artifact> map = null;
if ( artifactFactory != null )
{
- List deps;
+ List<Dependency> deps;
DependencyManagement dependencyManagement = getDependencyManagement();
if ( ( dependencyManagement != null ) && ( ( deps = dependencyManagement.getDependencies() ) != null ) &&
( deps.size() > 0 ) )
{
map = new ManagedVersionMap( map );
- for ( Iterator i = dependencyManagement.getDependencies().iterator(); i.hasNext(); )
+ for ( Iterator<Dependency> i = dependencyManagement.getDependencies().iterator(); i.hasNext(); )
{
Dependency d = (Dependency) i.next();
@@ -1639,9 +1641,9 @@
if ( ( null != d.getExclusions() ) && !d.getExclusions().isEmpty() )
{
- List exclusions = new ArrayList();
+ List<String> exclusions = new ArrayList<String>();
- for ( Iterator j = d.getExclusions().iterator(); j.hasNext(); )
+ for ( Iterator<Exclusion> j = d.getExclusions().iterator(); j.hasNext(); )
{
Exclusion e = (Exclusion) j.next();
@@ -1661,13 +1663,13 @@
}
catch ( InvalidVersionSpecificationException e )
{
- map = Collections.EMPTY_MAP;
+ map = Collections.emptyMap();
}
}
}
else if ( map == null )
{
- map = Collections.EMPTY_MAP;
+ map = Collections.emptyMap();
}
}
managedVersionMap = map;
@@ -1699,12 +1701,12 @@
return getId().hashCode();
}
- public List getBuildExtensions()
+ public List<Extension> getBuildExtensions()
{
Build build = getBuild();
if ( ( build == null ) || ( build.getExtensions() == null ) )
{
- return Collections.EMPTY_LIST;
+ return Collections.emptyList();
}
else
{
@@ -1716,7 +1718,7 @@
* @return {@link Set} < {@link Artifact} >
* @todo the lazy initialisation of this makes me uneasy.
*/
- public Set createArtifacts( ArtifactFactory artifactFactory, String inheritedScope,
+ public Set<Artifact> createArtifacts( ArtifactFactory artifactFactory, String inheritedScope,
ArtifactFilter dependencyFilter )
throws InvalidDependencyVersionException
{
@@ -1743,12 +1745,12 @@
return getModel().getProperties();
}
- public List getFilters()
+ public List<String> getFilters()
{
return getBuild().getFilters();
}
- public Map getProjectReferences()
+ public Map<String, MavenProject> getProjectReferences()
{
return projectReferences;
}
@@ -1796,7 +1798,7 @@
}
}
- Iterator itr = ref.getAttachedArtifacts().iterator();
+ Iterator<Artifact> itr = ref.getAttachedArtifacts().iterator();
while ( itr.hasNext() )
{
Artifact attached = (Artifact) itr.next();
@@ -1904,22 +1906,22 @@
this.model = model;
}
- protected void setAttachedArtifacts( List attachedArtifacts )
+ protected void setAttachedArtifacts( List<Artifact> attachedArtifacts )
{
this.attachedArtifacts = attachedArtifacts;
}
- protected void setCompileSourceRoots( List compileSourceRoots )
+ protected void setCompileSourceRoots( List<String> compileSourceRoots )
{
this.compileSourceRoots = compileSourceRoots;
}
- protected void setTestCompileSourceRoots( List testCompileSourceRoots )
+ protected void setTestCompileSourceRoots( List<String> testCompileSourceRoots )
{
this.testCompileSourceRoots = testCompileSourceRoots;
}
- protected void setScriptSourceRoots( List scriptSourceRoots )
+ protected void setScriptSourceRoots( List<String> scriptSourceRoots )
{
this.scriptSourceRoots = scriptSourceRoots;
}
@@ -1994,23 +1996,23 @@
if ( project.getAttachedArtifacts() != null )
{
// clone properties modifyable by plugins in a forked lifecycle
- setAttachedArtifacts( new ArrayList( project.getAttachedArtifacts() ) );
+ setAttachedArtifacts( new ArrayList<Artifact>( project.getAttachedArtifacts() ) );
}
if ( project.getCompileSourceRoots() != null )
{
// clone source roots
- setCompileSourceRoots( ( new ArrayList( project.getCompileSourceRoots() ) ) );
+ setCompileSourceRoots( ( new ArrayList<String>( project.getCompileSourceRoots() ) ) );
}
if ( project.getTestCompileSourceRoots() != null )
{
- setTestCompileSourceRoots( ( new ArrayList( project.getTestCompileSourceRoots() ) ) );
+ setTestCompileSourceRoots( ( new ArrayList<String>( project.getTestCompileSourceRoots() ) ) );
}
if ( project.getScriptSourceRoots() != null )
{
- setScriptSourceRoots( ( new ArrayList( project.getScriptSourceRoots() ) ) );
+ setScriptSourceRoots( ( new ArrayList<String>( project.getScriptSourceRoots() ) ) );
}
setModel( project.getModel() );
@@ -2043,7 +2045,7 @@
}
}
- private void addArtifactPath( Artifact a, List list )
+ private void addArtifactPath( Artifact a, List<String> list )
throws DependencyResolutionRequiredException
{
String refId = getProjectReferenceId( a.getGroupId(), a.getArtifactId(), a.getVersion() );
Propchange: maven/components/branches/MNG-3932/maven-project/src/main/java/org/apache/maven/project/builder/DefaultPomArtifactResolver.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 18 20:04:26 2009
@@ -3,4 +3,4 @@
/maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/builder/PomArtifactResolver.java:679206,720042
/maven/components/branches/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/builder/DefaultPomArtifactResolver.java:738973-739966
/maven/components/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/builder/DefaultPomArtifactResolver.java:738757-738972
-/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/DefaultPomArtifactResolver.java:739772-740199,740316-741812,742231-742684
+/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/DefaultPomArtifactResolver.java:739772-740199,740316-741812,742231-742684,742726-745532
Modified: maven/components/branches/MNG-3932/maven-project/src/main/java/org/apache/maven/project/builder/PomClassicDomainModel.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-3932/maven-project/src/main/java/org/apache/maven/project/builder/PomClassicDomainModel.java?rev=745631&r1=745630&r2=745631&view=diff
==============================================================================
--- maven/components/branches/MNG-3932/maven-project/src/main/java/org/apache/maven/project/builder/PomClassicDomainModel.java (original)
+++ maven/components/branches/MNG-3932/maven-project/src/main/java/org/apache/maven/project/builder/PomClassicDomainModel.java Wed Feb 18 20:04:26 2009
@@ -306,7 +306,20 @@
s.add(ProjectUri.Reporting.Plugins.Plugin.ReportSets.xUri);
s.add(ProjectUri.Reporting.Plugins.Plugin.ReportSets.ReportSet.configuration);
s.add(ProjectUri.Build.Plugins.Plugin.Executions.Execution.configuration);
- s.add(ProjectUri.Profiles.Profile.Build.Plugins.Plugin.configuration);//TODO: More profile info
+ //TODO: More profile info
+ s.add(ProjectUri.Profiles.Profile.Build.PluginManagement.Plugins.Plugin.Executions.xUri);
+ s.add(ProjectUri.Profiles.Profile.DependencyManagement.Dependencies.Dependency.Exclusions.xUri);
+ s.add(ProjectUri.Profiles.Profile.Dependencies.Dependency.Exclusions.xUri);
+ s.add(ProjectUri.Profiles.Profile.Build.Plugins.Plugin.Executions.xUri);
+ s.add(ProjectUri.Profiles.Profile.Build.Plugins.Plugin.Executions.Execution.Goals.xURI);
+ s.add(ProjectUri.Profiles.Profile.Reporting.Plugins.Plugin.ReportSets.xUri);
+ s.add(ProjectUri.Profiles.Profile.Reporting.Plugins.Plugin.ReportSets.ReportSet.configuration);
+ s.add(ProjectUri.Profiles.Profile.Build.Plugins.Plugin.Executions.Execution.configuration);
+
+ s.add(ProjectUri.Profiles.Profile.modules);
+ s.add(ProjectUri.Profiles.Profile.Dependencies.xUri);
+ s.add(ProjectUri.Profiles.Profile.Build.Plugins.Plugin.configuration);
+
modelProperties = ModelMarshaller.marshallXmlToModelProperties(
getInputStream(), ProjectUri.baseUri, s );
}
Modified: maven/components/branches/MNG-3932/maven-project/src/main/java/org/apache/maven/project/builder/impl/DefaultProjectBuilder.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-3932/maven-project/src/main/java/org/apache/maven/project/builder/impl/DefaultProjectBuilder.java?rev=745631&r1=745630&r2=745631&view=diff
==============================================================================
--- maven/components/branches/MNG-3932/maven-project/src/main/java/org/apache/maven/project/builder/impl/DefaultProjectBuilder.java (original)
+++ maven/components/branches/MNG-3932/maven-project/src/main/java/org/apache/maven/project/builder/impl/DefaultProjectBuilder.java Wed Feb 18 20:04:26 2009
@@ -217,6 +217,7 @@
List<DomainModel> domainModels = new ArrayList<DomainModel>();
domainModels.add( domainModel );
+ //Process Profile on most specialized child model
ProfileContext profileContext = new ProfileContext(new DefaultModelDataSource(domainModel.getModelProperties(),
PomTransformer.MODEL_CONTAINER_FACTORIES), activeProfileIds, properties);
@@ -225,7 +226,7 @@
for(ModelContainer mc : profileContainers)
{
List<ModelProperty> transformed = new ArrayList<ModelProperty>();
- transformed.add(new ModelProperty(ProjectUri.xUri, null));
+ //transformed.add(new ModelProperty(ProjectUri.xUri, null));
for(ModelProperty mp : mc.getProperties())
{
if(mp.getUri().startsWith(ProjectUri.Profiles.Profile.xUri) && !mp.getUri().equals(ProjectUri.Profiles.Profile.id)
@@ -380,7 +381,8 @@
domainModels.add( parentDomainModel );
- ProfileContext profileContext = new ProfileContext(new DefaultModelDataSource(parentDomainModel.getModelProperties(),
+ //Process Profiles
+ ProfileContext profileContext = new ProfileContext(new DefaultModelDataSource(parentDomainModel.getModelProperties(),
PomTransformer.MODEL_CONTAINER_FACTORIES), activeProfileIds, properties);
Collection<ModelContainer> profileContainers = profileContext.getActiveProfiles();
@@ -445,7 +447,9 @@
PomClassicDomainModel parentDomainModel = new PomClassicDomainModel( parentFile );
parentDomainModel.setProjectDirectory( parentFile.getParentFile() );
- ProfileContext profileContext = new ProfileContext(new DefaultModelDataSource(parentDomainModel.getModelProperties(),
+
+ //Process Profiles
+ ProfileContext profileContext = new ProfileContext(new DefaultModelDataSource(parentDomainModel.getModelProperties(),
PomTransformer.MODEL_CONTAINER_FACTORIES), activeProfileIds, properties);
Collection<ModelContainer> profileContainers = profileContext.getActiveProfiles();
Propchange: maven/components/branches/MNG-3932/maven-project/src/main/mdo/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 18 20:04:26 2009
@@ -3,4 +3,4 @@
/maven/components/branches/maven-2.0.x/maven-profile/src/main/mdo:679206
/maven/components/branches/sisbell-plugin-manager/maven-project/src/main/mdo:738973-739966
/maven/components/sisbell-plugin-manager/maven-project/src/main/mdo:738757-738972
-/maven/components/trunk/maven-project/src/main/mdo:739772-740199,740316-741812,742231-742684
+/maven/components/trunk/maven-project/src/main/mdo:739772-740199,740316-741812,742231-742684,742726-745532
Modified: maven/components/branches/MNG-3932/maven-project/src/main/mdo/profiles.mdo
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-3932/maven-project/src/main/mdo/profiles.mdo?rev=745631&r1=745630&r2=745631&view=diff
==============================================================================
--- maven/components/branches/MNG-3932/maven-project/src/main/mdo/profiles.mdo (original)
+++ maven/components/branches/MNG-3932/maven-project/src/main/mdo/profiles.mdo Wed Feb 18 20:04:26 2009
@@ -17,8 +17,10 @@
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 @@
<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 @@
<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 @@
<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 @@
<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>
Modified: maven/components/branches/MNG-3932/maven-project/src/test/java/org/apache/maven/project/builder/PomConstructionTest.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-3932/maven-project/src/test/java/org/apache/maven/project/builder/PomConstructionTest.java?rev=745631&r1=745630&r2=745631&view=diff
==============================================================================
--- maven/components/branches/MNG-3932/maven-project/src/test/java/org/apache/maven/project/builder/PomConstructionTest.java (original)
+++ maven/components/branches/MNG-3932/maven-project/src/test/java/org/apache/maven/project/builder/PomConstructionTest.java Wed Feb 18 20:04:26 2009
@@ -830,7 +830,44 @@
assertEquals( "d", pom.getValue( "dependencies[4]/artifactId" ) );
}
//*/
+
+ /** MNG-4027
+ public void testProfileInjectedDependencies()
+ throws Exception
+ {
+ PomTestWrapper pom = buildPom( "profile-injected-dependencies" );
+ assertEquals( 4, ( (List<?>) pom.getValue( "dependencies" ) ).size() );
+ assertEquals( "a", pom.getValue( "dependencies[1]/artifactId" ) );
+ assertEquals( "c", pom.getValue( "dependencies[2]/artifactId" ) );
+ assertEquals( "b", pom.getValue( "dependencies[3]/artifactId" ) );
+ assertEquals( "d", pom.getValue( "dependencies[4]/artifactId" ) );
+ }
+ //*/
+
+ /** MNG-4034 */
+ public void testManagedProfileDependency()
+ throws Exception
+ {
+ PomTestWrapper pom = this.buildPomFromMavenProject( "managed-profile-dependency/sub", "maven-core-it" );
+ assertEquals( 1, ( (List<?>) pom.getValue( "dependencies" ) ).size() );
+ assertEquals( "org.apache.maven.its", pom.getValue( "dependencies[1]/groupId" ) );
+ assertEquals( "maven-core-it-support", pom.getValue( "dependencies[1]/artifactId" ) );
+ assertEquals( "1.3", pom.getValue( "dependencies[1]/version" ) );
+ assertEquals( "runtime", pom.getValue( "dependencies[1]/scope" ) );
+ assertEquals( 1, ( (List<?>) pom.getValue( "dependencies[1]/exclusions" ) ).size() );
+ assertEquals( "commons-lang", pom.getValue( "dependencies[1]/exclusions[1]/groupId" ) );
+ }
+ //*/
+
+ /** MNG-4040 */
+ public void testProfileModuleInheritance()
+ throws Exception
+ {
+ PomTestWrapper pom = this.buildPomFromMavenProject( "profile-module-inheritance/sub", "dist" );
+ assertEquals(0, ( (List<?>) pom.getValue( "modules" ) ).size());
+
+ }
private void assertPathWithNormalizedFileSeparators( Object value )
{
assertEquals( new File( value.toString() ).getPath(), value.toString() );
Propchange: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/managed-profile-dependency/
------------------------------------------------------------------------------
bugtraq:label = Enter issue ID:
Propchange: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/managed-profile-dependency/
------------------------------------------------------------------------------
bugtraq:message = Issue id: %BUGID%
Propchange: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/managed-profile-dependency/
------------------------------------------------------------------------------
bugtraq:number = false
Propchange: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/managed-profile-dependency/
------------------------------------------------------------------------------
bugtraq:url = http://jira.codehaus.org/browse/%BUGID%
Propchange: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/managed-profile-dependency/sub/
------------------------------------------------------------------------------
bugtraq:label = Enter issue ID:
Propchange: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/managed-profile-dependency/sub/
------------------------------------------------------------------------------
bugtraq:message = Issue id: %BUGID%
Propchange: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/managed-profile-dependency/sub/
------------------------------------------------------------------------------
bugtraq:number = false
Propchange: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/managed-profile-dependency/sub/
------------------------------------------------------------------------------
bugtraq:url = http://jira.codehaus.org/browse/%BUGID%
Propchange: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/profile-injected-dependencies/
------------------------------------------------------------------------------
svn:mergeinfo =
Modified: maven/components/branches/MNG-3932/maven-toolchain/src/main/mdo/toolchains.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-3932/maven-toolchain/src/main/mdo/toolchains.xml?rev=745631&r1=745630&r2=745631&view=diff
==============================================================================
--- maven/components/branches/MNG-3932/maven-toolchain/src/main/mdo/toolchains.xml (original)
+++ maven/components/branches/MNG-3932/maven-toolchain/src/main/mdo/toolchains.xml Wed Feb 18 20:04:26 2009
@@ -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>
Modified: maven/components/branches/MNG-3932/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-3932/pom.xml?rev=745631&r1=745630&r2=745631&view=diff
==============================================================================
--- maven/components/branches/MNG-3932/pom.xml (original)
+++ maven/components/branches/MNG-3932/pom.xml Wed Feb 18 20:04:26 2009
@@ -55,12 +55,13 @@
<plexusUtilsVersion>1.5.8</plexusUtilsVersion>
<wagonVersion>1.0-beta-4</wagonVersion>
<modelBuilderVersion>1.3</modelBuilderVersion>
- <mercuryVersion>1.0.0-alpha-2</mercuryVersion>
+ <mercuryVersion>1.0.0-alpha-4</mercuryVersion>
<mercuryMp3Version>1.0-alpha-1</mercuryMp3Version>
+ <securityDispatcherVersion>1.0-alpha-4-SNAPSHOT</securityDispatcherVersion>
<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>
@@ -184,6 +185,9 @@
<groupId>org.codehaus.modello</groupId>
<artifactId>modello-maven-plugin</artifactId>
<version>${modelloVersion}</version>
+ <configuration>
+ <useJava5>true</useJava5>
+ </configuration>
<executions>
<execution>
<id>site-docs</id>
@@ -411,12 +415,11 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>commons-jxpath</groupId>
- <artifactId>commons-jxpath</artifactId>
+ <dependency>
+ <groupId>commons-jxpath</groupId>
+ <artifactId>commons-jxpath</artifactId>
<version>${jxpathVersion}</version>
- </dependency>
-
+ </dependency>
<!-- Mercury -->
<dependency>
<groupId>org.apache.maven.mercury</groupId>
@@ -433,7 +436,13 @@
<artifactId>mercury-mp3-cli</artifactId>
<version>${mercuryMp3Version}</version>
</dependency>
-
+ <dependency>
+ <groupId>org.sonatype.plexus</groupId>
+ <artifactId>plexus-sec-dispatcher</artifactId>
+ <version>${securityDispatcherVersion}</version>
+ </dependency>
+
+
<!-- Mercury test dependencies -->
<dependency>
<groupId>org.apache.maven.mercury</groupId>