MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

Maven: correctly configuring dependency paths for dated snapshot versions.

Browse Source
This commit is contained in:
Anton Makeev
2012-02-17 15:45:05 +01:00
parent 36a4f459d4
commit 2cf9aba56b
2 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/maven/maven-server-api/src/org/jetbrains/idea/maven/model/MavenArtifact.java
+2 -7
View File
@@ -29,7 +29,6 @@ public class MavenArtifact implements Serializable {
private final String myGroupId;
private final String myArtifactId;
private final String myVersion;
private final String myBaseVersion;
private final String myType;
private final String myClassifier;
@@ -57,8 +56,7 @@ public class MavenArtifact implements Serializable {
boolean stubbed) {
myGroupId = groupId;
myArtifactId = artifactId;
myVersion = version;
myBaseVersion = baseVersion;
myVersion = !StringUtil.isEmptyOrSpaces(baseVersion) ? baseVersion : version;
myType = type;
myClassifier = classifier;
myScope = scope;
@@ -249,8 +247,7 @@ public class MavenArtifact implements Serializable {
if (!StringUtil.isEmptyOrSpaces(myType) && !MavenConstants.TYPE_JAR.equals(myType)) MavenId.append(builder, myType);
if (!StringUtil.isEmptyOrSpaces(myClassifier)) MavenId.append(builder, myClassifier);
String version = !StringUtil.isEmptyOrSpaces(myBaseVersion) ? myBaseVersion : myVersion;
if (!StringUtil.isEmptyOrSpaces(version)) MavenId.append(builder, version);
MavenId.append(builder, myVersion);
return builder.toString();
}
@@ -270,7 +267,6 @@ public class MavenArtifact implements Serializable {
if (myGroupId != null ? !myGroupId.equals(that.myGroupId) : that.myGroupId != null) return false;
if (myArtifactId != null ? !myArtifactId.equals(that.myArtifactId) : that.myArtifactId != null) return false;
if (myVersion != null ? !myVersion.equals(that.myVersion) : that.myVersion != null) return false;
if (myBaseVersion != null ? !myBaseVersion.equals(that.myBaseVersion) : that.myBaseVersion != null) return false;
if (myType != null ? !myType.equals(that.myType) : that.myType != null) return false;
if (myClassifier != null ? !myClassifier.equals(that.myClassifier) : that.myClassifier != null) return false;
if (myScope != null ? !myScope.equals(that.myScope) : that.myScope != null) return false;
@@ -285,7 +281,6 @@ public class MavenArtifact implements Serializable {
int result = myGroupId != null ? myGroupId.hashCode() : 0;
result = 31 * result + (myArtifactId != null ? myArtifactId.hashCode() : 0);
result = 31 * result + (myVersion != null ? myVersion.hashCode() : 0);
result = 31 * result + (myBaseVersion != null ? myBaseVersion.hashCode() : 0);
result = 31 * result + (myType != null ? myType.hashCode() : 0);
result = 31 * result + (myClassifier != null ? myClassifier.hashCode() : 0);
result = 31 * result + (myScope != null ? myScope.hashCode() : 0);
plugins/maven/maven3-server-impl/src/org/jetbrains/idea/maven/server/MavenModelConverter.java
+2 -1
View File
@@ -200,7 +200,8 @@ public class MavenModelConverter {
}
public static MavenArtifact convertArtifact(Artifact artifact, File localRepository) {
return new MavenArtifact(artifact.getGroupId(), artifact.getArtifactId(),
return new MavenArtifact(artifact.getGroupId(),
artifact.getArtifactId(),
artifact.getVersion(),
artifact.getBaseVersion(),
artifact.getType(),