mirror of https://github.com/apache/maven.git
o Added back <aspectSourceDirectory/> and <integrationUnitTestSourceDirectory/>
o Added CDATA notation to some code segments that were causing trouble. git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163601 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
17b770a2ab
commit
84c5379bd8
|
@ -588,7 +588,8 @@
|
||||||
<codeSegments>
|
<codeSegments>
|
||||||
<codeSegment>
|
<codeSegment>
|
||||||
<version>3.0.0</version>
|
<version>3.0.0</version>
|
||||||
<code>
|
<code><![CDATA[
|
||||||
|
|
||||||
public void setVersion(String version)
|
public void setVersion(String version)
|
||||||
{
|
{
|
||||||
this.currentVersion = version;
|
this.currentVersion = version;
|
||||||
|
@ -599,7 +600,7 @@
|
||||||
return currentVersion;
|
return currentVersion;
|
||||||
}
|
}
|
||||||
|
|
||||||
// We need this because we can't use package as a field name.
|
/* We need this because we can't use package as a field name.*/
|
||||||
public void setPackage(String packageName)
|
public void setPackage(String packageName)
|
||||||
{
|
{
|
||||||
this.packageName = packageName;
|
this.packageName = packageName;
|
||||||
|
@ -609,11 +610,11 @@
|
||||||
{
|
{
|
||||||
return packageName;
|
return packageName;
|
||||||
}
|
}
|
||||||
</code>
|
]]></code>
|
||||||
</codeSegment>
|
</codeSegment>
|
||||||
<codeSegment>
|
<codeSegment>
|
||||||
<version>4.0.0</version>
|
<version>4.0.0</version>
|
||||||
<code>
|
<code><![CDATA[
|
||||||
public String getId()
|
public String getId()
|
||||||
{
|
{
|
||||||
StringBuffer id = new StringBuffer();
|
StringBuffer id = new StringBuffer();
|
||||||
|
@ -628,7 +629,7 @@
|
||||||
|
|
||||||
return id.toString();
|
return id.toString();
|
||||||
}
|
}
|
||||||
</code>
|
]]></code>
|
||||||
</codeSegment>
|
</codeSegment>
|
||||||
</codeSegments>
|
</codeSegments>
|
||||||
</class>
|
</class>
|
||||||
|
@ -724,6 +725,29 @@
|
||||||
]]></description>
|
]]></description>
|
||||||
<type>String</type>
|
<type>String</type>
|
||||||
</field>
|
</field>
|
||||||
|
<field>
|
||||||
|
<name>aspectSourceDirectory</name>
|
||||||
|
<version>3.0.0</version>
|
||||||
|
<description><![CDATA[
|
||||||
|
This element specifies a directory containing Aspect
|
||||||
|
sources of the project. The generated build system will
|
||||||
|
compile the Aspects in this directory when the project is
|
||||||
|
built if Aspects have been enabled (see the
|
||||||
|
<a
|
||||||
|
href="plugins/aspectj/goals.html">Aspectj goals</a> document).
|
||||||
|
The path given is relative to the project descriptor.
|
||||||
|
]]></description>
|
||||||
|
<type>String</type>
|
||||||
|
</field>
|
||||||
|
<field>
|
||||||
|
<name>integrationUnitTestSourceDirectory</name>
|
||||||
|
<version>3.0.0</version>
|
||||||
|
<description><![CDATA[
|
||||||
|
This element specifies a directory containing integration test
|
||||||
|
sources of the project.
|
||||||
|
]]></description>
|
||||||
|
<type>String</type>
|
||||||
|
</field>
|
||||||
<field>
|
<field>
|
||||||
<name>sourceModifications</name>
|
<name>sourceModifications</name>
|
||||||
<version>3.0.0</version>
|
<version>3.0.0</version>
|
||||||
|
@ -1080,16 +1104,16 @@
|
||||||
<codeSegments>
|
<codeSegments>
|
||||||
<codeSegment>
|
<codeSegment>
|
||||||
<version>3.0.0+</version>
|
<version>3.0.0+</version>
|
||||||
<code>
|
<code><![CDATA[
|
||||||
public String toString()
|
public String toString()
|
||||||
{
|
{
|
||||||
return groupId + "/" + type + "s:" + artifactId + "-" + version;
|
return groupId + "/" + type + "s:" + artifactId + "-" + version;
|
||||||
}
|
}
|
||||||
</code>
|
]]></code>
|
||||||
</codeSegment>
|
</codeSegment>
|
||||||
<codeSegment>
|
<codeSegment>
|
||||||
<version>4.0.0</version>
|
<version>4.0.0</version>
|
||||||
<code>
|
<code><![CDATA[
|
||||||
public String getId()
|
public String getId()
|
||||||
{
|
{
|
||||||
return groupId + ":" + artifactId + ":" + type + ":" + version;
|
return groupId + ":" + artifactId + ":" + type + ":" + version;
|
||||||
|
@ -1099,7 +1123,7 @@
|
||||||
{
|
{
|
||||||
return groupId + ":" + artifactId + ":" + type;
|
return groupId + ":" + artifactId + ":" + type;
|
||||||
}
|
}
|
||||||
</code>
|
]]></code>
|
||||||
</codeSegment>
|
</codeSegment>
|
||||||
<codeSegment>
|
<codeSegment>
|
||||||
<version>3.0.0</version>
|
<version>3.0.0</version>
|
||||||
|
@ -1452,7 +1476,7 @@
|
||||||
<codeSegment>
|
<codeSegment>
|
||||||
<version>3.0.0+</version>
|
<version>3.0.0+</version>
|
||||||
<!-- @todo: should these be built somewhere so they are only created once, and can be modified? -->
|
<!-- @todo: should these be built somewhere so they are only created once, and can be modified? -->
|
||||||
<code>
|
<code><![CDATA[
|
||||||
public List getDefaultExcludes()
|
public List getDefaultExcludes()
|
||||||
{
|
{
|
||||||
List defaultExcludes = new ArrayList();
|
List defaultExcludes = new ArrayList();
|
||||||
|
@ -1480,9 +1504,10 @@
|
||||||
|
|
||||||
// Mac
|
// Mac
|
||||||
defaultExcludes.add( "**/.DS_Store" );
|
defaultExcludes.add( "**/.DS_Store" );
|
||||||
|
|
||||||
return defaultExcludes;
|
return defaultExcludes;
|
||||||
}
|
}
|
||||||
</code>
|
]]></code>
|
||||||
</codeSegment>
|
</codeSegment>
|
||||||
</codeSegments>
|
</codeSegments>
|
||||||
</class>
|
</class>
|
||||||
|
@ -1795,12 +1820,12 @@
|
||||||
<codeSegments>
|
<codeSegments>
|
||||||
<codeSegment>
|
<codeSegment>
|
||||||
<version>3.0.0</version>
|
<version>3.0.0</version>
|
||||||
<code>
|
<code><![CDATA[
|
||||||
public String toString()
|
public String toString()
|
||||||
{
|
{
|
||||||
return getId();
|
return getId();
|
||||||
}
|
}
|
||||||
</code>
|
]]></code>
|
||||||
</codeSegment>
|
</codeSegment>
|
||||||
</codeSegments>
|
</codeSegments>
|
||||||
</class>
|
</class>
|
||||||
|
@ -1841,7 +1866,7 @@
|
||||||
<codeSegments>
|
<codeSegments>
|
||||||
<codeSegment>
|
<codeSegment>
|
||||||
<version>4.0.0</version>
|
<version>4.0.0</version>
|
||||||
<code>
|
<code><![CDATA[
|
||||||
public boolean equals( Object obj )
|
public boolean equals( Object obj )
|
||||||
{
|
{
|
||||||
Repository other = ( Repository ) obj;
|
Repository other = ( Repository ) obj;
|
||||||
|
@ -1855,7 +1880,7 @@
|
||||||
|
|
||||||
return retValue;
|
return retValue;
|
||||||
}
|
}
|
||||||
</code>
|
]]></code>
|
||||||
</codeSegment>
|
</codeSegment>
|
||||||
</codeSegments>
|
</codeSegments>
|
||||||
</class>
|
</class>
|
||||||
|
|
Loading…
Reference in New Issue