You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by be...@apache.org on 2008/12/17 23:35:11 UTC
svn commit: r727555 - in /maven/components/branches/maven-2.0.10-RC: ./
maven-model/src/main/mdo/ maven-model/src/test/ maven-model/src/test/java/
maven-model/src/test/java/org/ maven-model/src/test/java/org/apache/
maven-model/src/test/java/org/apache...
Author: bentmann
Date: Wed Dec 17 14:35:09 2008
New Revision: 727555
URL: http://svn.apache.org/viewvc?rev=727555&view=rev
Log:
[MNG-3921] Extensions are subject to NPEs in their hashCode() impl
o Merged from r727548
Added:
maven/components/branches/maven-2.0.10-RC/maven-model/src/test/
- copied from r727548, maven/components/branches/maven-2.0.x/maven-model/src/test/
maven/components/branches/maven-2.0.10-RC/maven-model/src/test/java/
- copied from r727548, maven/components/branches/maven-2.0.x/maven-model/src/test/java/
maven/components/branches/maven-2.0.10-RC/maven-model/src/test/java/org/
- copied from r727548, maven/components/branches/maven-2.0.x/maven-model/src/test/java/org/
maven/components/branches/maven-2.0.10-RC/maven-model/src/test/java/org/apache/
- copied from r727548, maven/components/branches/maven-2.0.x/maven-model/src/test/java/org/apache/
maven/components/branches/maven-2.0.10-RC/maven-model/src/test/java/org/apache/maven/
- copied from r727548, maven/components/branches/maven-2.0.x/maven-model/src/test/java/org/apache/maven/
maven/components/branches/maven-2.0.10-RC/maven-model/src/test/java/org/apache/maven/model/
- copied from r727548, maven/components/branches/maven-2.0.x/maven-model/src/test/java/org/apache/maven/model/
maven/components/branches/maven-2.0.10-RC/maven-model/src/test/java/org/apache/maven/model/ActivationFileTest.java
- copied unchanged from r727548, maven/components/branches/maven-2.0.x/maven-model/src/test/java/org/apache/maven/model/ActivationFileTest.java
maven/components/branches/maven-2.0.10-RC/maven-model/src/test/java/org/apache/maven/model/ActivationOSTest.java
- copied unchanged from r727548, maven/components/branches/maven-2.0.x/maven-model/src/test/java/org/apache/maven/model/ActivationOSTest.java
maven/components/branches/maven-2.0.10-RC/maven-model/src/test/java/org/apache/maven/model/ActivationPropertyTest.java
- copied unchanged from r727548, maven/components/branches/maven-2.0.x/maven-model/src/test/java/org/apache/maven/model/ActivationPropertyTest.java
maven/components/branches/maven-2.0.10-RC/maven-model/src/test/java/org/apache/maven/model/ActivationTest.java
- copied unchanged from r727548, maven/components/branches/maven-2.0.x/maven-model/src/test/java/org/apache/maven/model/ActivationTest.java
maven/components/branches/maven-2.0.10-RC/maven-model/src/test/java/org/apache/maven/model/BuildTest.java
- copied unchanged from r727548, maven/components/branches/maven-2.0.x/maven-model/src/test/java/org/apache/maven/model/BuildTest.java
maven/components/branches/maven-2.0.10-RC/maven-model/src/test/java/org/apache/maven/model/CiManagementTest.java
- copied unchanged from r727548, maven/components/branches/maven-2.0.x/maven-model/src/test/java/org/apache/maven/model/CiManagementTest.java
maven/components/branches/maven-2.0.10-RC/maven-model/src/test/java/org/apache/maven/model/ContributorTest.java
- copied unchanged from r727548, maven/components/branches/maven-2.0.x/maven-model/src/test/java/org/apache/maven/model/ContributorTest.java
maven/components/branches/maven-2.0.10-RC/maven-model/src/test/java/org/apache/maven/model/DependencyManagementTest.java
- copied unchanged from r727548, maven/components/branches/maven-2.0.x/maven-model/src/test/java/org/apache/maven/model/DependencyManagementTest.java
maven/components/branches/maven-2.0.10-RC/maven-model/src/test/java/org/apache/maven/model/DependencyTest.java
- copied unchanged from r727548, maven/components/branches/maven-2.0.x/maven-model/src/test/java/org/apache/maven/model/DependencyTest.java
maven/components/branches/maven-2.0.10-RC/maven-model/src/test/java/org/apache/maven/model/DeploymentRepositoryTest.java
- copied unchanged from r727548, maven/components/branches/maven-2.0.x/maven-model/src/test/java/org/apache/maven/model/DeploymentRepositoryTest.java
maven/components/branches/maven-2.0.10-RC/maven-model/src/test/java/org/apache/maven/model/DeveloperTest.java
- copied unchanged from r727548, maven/components/branches/maven-2.0.x/maven-model/src/test/java/org/apache/maven/model/DeveloperTest.java
maven/components/branches/maven-2.0.10-RC/maven-model/src/test/java/org/apache/maven/model/DistributionManagementTest.java
- copied unchanged from r727548, maven/components/branches/maven-2.0.x/maven-model/src/test/java/org/apache/maven/model/DistributionManagementTest.java
maven/components/branches/maven-2.0.10-RC/maven-model/src/test/java/org/apache/maven/model/ExclusionTest.java
- copied unchanged from r727548, maven/components/branches/maven-2.0.x/maven-model/src/test/java/org/apache/maven/model/ExclusionTest.java
maven/components/branches/maven-2.0.10-RC/maven-model/src/test/java/org/apache/maven/model/ExtensionTest.java
- copied unchanged from r727548, maven/components/branches/maven-2.0.x/maven-model/src/test/java/org/apache/maven/model/ExtensionTest.java
maven/components/branches/maven-2.0.10-RC/maven-model/src/test/java/org/apache/maven/model/IssueManagementTest.java
- copied unchanged from r727548, maven/components/branches/maven-2.0.x/maven-model/src/test/java/org/apache/maven/model/IssueManagementTest.java
maven/components/branches/maven-2.0.10-RC/maven-model/src/test/java/org/apache/maven/model/LicenseTest.java
- copied unchanged from r727548, maven/components/branches/maven-2.0.x/maven-model/src/test/java/org/apache/maven/model/LicenseTest.java
maven/components/branches/maven-2.0.10-RC/maven-model/src/test/java/org/apache/maven/model/MailingListTest.java
- copied unchanged from r727548, maven/components/branches/maven-2.0.x/maven-model/src/test/java/org/apache/maven/model/MailingListTest.java
maven/components/branches/maven-2.0.10-RC/maven-model/src/test/java/org/apache/maven/model/ModelTest.java
- copied unchanged from r727548, maven/components/branches/maven-2.0.x/maven-model/src/test/java/org/apache/maven/model/ModelTest.java
maven/components/branches/maven-2.0.10-RC/maven-model/src/test/java/org/apache/maven/model/NotifierTest.java
- copied unchanged from r727548, maven/components/branches/maven-2.0.x/maven-model/src/test/java/org/apache/maven/model/NotifierTest.java
maven/components/branches/maven-2.0.10-RC/maven-model/src/test/java/org/apache/maven/model/OrganizationTest.java
- copied unchanged from r727548, maven/components/branches/maven-2.0.x/maven-model/src/test/java/org/apache/maven/model/OrganizationTest.java
maven/components/branches/maven-2.0.10-RC/maven-model/src/test/java/org/apache/maven/model/ParentTest.java
- copied unchanged from r727548, maven/components/branches/maven-2.0.x/maven-model/src/test/java/org/apache/maven/model/ParentTest.java
maven/components/branches/maven-2.0.10-RC/maven-model/src/test/java/org/apache/maven/model/PluginConfigurationTest.java
- copied unchanged from r727548, maven/components/branches/maven-2.0.x/maven-model/src/test/java/org/apache/maven/model/PluginConfigurationTest.java
maven/components/branches/maven-2.0.10-RC/maven-model/src/test/java/org/apache/maven/model/PluginContainerTest.java
- copied unchanged from r727548, maven/components/branches/maven-2.0.x/maven-model/src/test/java/org/apache/maven/model/PluginContainerTest.java
maven/components/branches/maven-2.0.10-RC/maven-model/src/test/java/org/apache/maven/model/PluginExecutionTest.java
- copied unchanged from r727548, maven/components/branches/maven-2.0.x/maven-model/src/test/java/org/apache/maven/model/PluginExecutionTest.java
maven/components/branches/maven-2.0.10-RC/maven-model/src/test/java/org/apache/maven/model/PluginManagementTest.java
- copied unchanged from r727548, maven/components/branches/maven-2.0.x/maven-model/src/test/java/org/apache/maven/model/PluginManagementTest.java
maven/components/branches/maven-2.0.10-RC/maven-model/src/test/java/org/apache/maven/model/PluginTest.java
- copied unchanged from r727548, maven/components/branches/maven-2.0.x/maven-model/src/test/java/org/apache/maven/model/PluginTest.java
maven/components/branches/maven-2.0.10-RC/maven-model/src/test/java/org/apache/maven/model/PrerequisitesTest.java
- copied unchanged from r727548, maven/components/branches/maven-2.0.x/maven-model/src/test/java/org/apache/maven/model/PrerequisitesTest.java
maven/components/branches/maven-2.0.10-RC/maven-model/src/test/java/org/apache/maven/model/ProfileTest.java
- copied unchanged from r727548, maven/components/branches/maven-2.0.x/maven-model/src/test/java/org/apache/maven/model/ProfileTest.java
maven/components/branches/maven-2.0.10-RC/maven-model/src/test/java/org/apache/maven/model/RelocationTest.java
- copied unchanged from r727548, maven/components/branches/maven-2.0.x/maven-model/src/test/java/org/apache/maven/model/RelocationTest.java
maven/components/branches/maven-2.0.10-RC/maven-model/src/test/java/org/apache/maven/model/ReportPluginTest.java
- copied unchanged from r727548, maven/components/branches/maven-2.0.x/maven-model/src/test/java/org/apache/maven/model/ReportPluginTest.java
maven/components/branches/maven-2.0.10-RC/maven-model/src/test/java/org/apache/maven/model/ReportSetTest.java
- copied unchanged from r727548, maven/components/branches/maven-2.0.x/maven-model/src/test/java/org/apache/maven/model/ReportSetTest.java
maven/components/branches/maven-2.0.10-RC/maven-model/src/test/java/org/apache/maven/model/ReportingTest.java
- copied unchanged from r727548, maven/components/branches/maven-2.0.x/maven-model/src/test/java/org/apache/maven/model/ReportingTest.java
maven/components/branches/maven-2.0.10-RC/maven-model/src/test/java/org/apache/maven/model/RepositoryPolicyTest.java
- copied unchanged from r727548, maven/components/branches/maven-2.0.x/maven-model/src/test/java/org/apache/maven/model/RepositoryPolicyTest.java
maven/components/branches/maven-2.0.10-RC/maven-model/src/test/java/org/apache/maven/model/RepositoryTest.java
- copied unchanged from r727548, maven/components/branches/maven-2.0.x/maven-model/src/test/java/org/apache/maven/model/RepositoryTest.java
maven/components/branches/maven-2.0.10-RC/maven-model/src/test/java/org/apache/maven/model/ResourceTest.java
- copied unchanged from r727548, maven/components/branches/maven-2.0.x/maven-model/src/test/java/org/apache/maven/model/ResourceTest.java
maven/components/branches/maven-2.0.10-RC/maven-model/src/test/java/org/apache/maven/model/ScmTest.java
- copied unchanged from r727548, maven/components/branches/maven-2.0.x/maven-model/src/test/java/org/apache/maven/model/ScmTest.java
maven/components/branches/maven-2.0.10-RC/maven-model/src/test/java/org/apache/maven/model/SiteTest.java
- copied unchanged from r727548, maven/components/branches/maven-2.0.x/maven-model/src/test/java/org/apache/maven/model/SiteTest.java
Modified:
maven/components/branches/maven-2.0.10-RC/ (props changed)
maven/components/branches/maven-2.0.10-RC/maven-model/src/main/mdo/maven.mdo
Propchange: maven/components/branches/maven-2.0.10-RC/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 17 14:35:09 2008
@@ -1,2 +1,2 @@
-/maven/components/branches/maven-2.0.x:709032,709208,709241,725949,726541,727007
+/maven/components/branches/maven-2.0.x:709032,709208,709241,725949,726541,727007,727548
/maven/components/trunk:721902,726845
Modified: maven/components/branches/maven-2.0.10-RC/maven-model/src/main/mdo/maven.mdo
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.10-RC/maven-model/src/main/mdo/maven.mdo?rev=727555&r1=727554&r2=727555&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.10-RC/maven-model/src/main/mdo/maven.mdo (original)
+++ maven/components/branches/maven-2.0.10-RC/maven-model/src/main/mdo/maven.mdo Wed Dec 17 14:35:09 2008
@@ -3391,9 +3391,9 @@
public int hashCode()
{
int result = 17;
- result = 37 * result + getArtifactId() != null ? getArtifactId().hashCode() : 0;
- result = 37 * result + getGroupId() != null ? getGroupId().hashCode() : 0;
- result = 37 * result + getVersion() != null ? getVersion().hashCode() : 0;
+ result = 37 * result + ( getArtifactId() != null ? getArtifactId().hashCode() : 0 );
+ result = 37 * result + ( getGroupId() != null ? getGroupId().hashCode() : 0 );
+ result = 37 * result + ( getVersion() != null ? getVersion().hashCode() : 0 );
return result;
}
]]>