Skip to content

Commit 25ce08f

Browse files
committed
增加版本判断
1 parent 68db7eb commit 25ce08f

File tree

2 files changed

+14
-9
lines changed

2 files changed

+14
-9
lines changed

fix/file_fix_maven.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,9 @@ func (p *mavenParams) getFixModelList(params FixParams, pomPathList []string) {
184184
for _, comp := range params.CompList {
185185
for _, pomPath := range pomPathList {
186186
list := GetFixModelList(filepath.Join(params.Dir, pomPath), pomPath, comp.CompName, comp.CompVersion, comp.MinFixVersion, p.propertyMap)
187-
p.fixModelList = append(p.fixModelList, list...)
187+
if len(list) > 0 {
188+
p.fixModelList = append(p.fixModelList, list...)
189+
}
188190

189191
}
190192
}

fix/xml_tools.go

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -83,15 +83,18 @@ func (l *ChildXMLListener) EnterElement(ctx *parser.ElementContext) {
8383

8484
if propertyModel, ok := l.modelMap[model.OldVersion]; ok {
8585
for _, m := range propertyModel {
86-
newModel := FixModel{
87-
Line: m.Line,
88-
OldVersion: model.OldVersion,
89-
NewVersion: l.newVersion,
90-
CompName: l.compName,
91-
PomPath: l.pomPath,
92-
relativePomPath: l.relativePomPath,
86+
if m.OldVersion == l.compVersion {
87+
newModel := FixModel{
88+
Line: m.Line,
89+
OldVersion: model.OldVersion,
90+
NewVersion: l.newVersion,
91+
CompName: l.compName,
92+
PomPath: l.pomPath,
93+
relativePomPath: l.relativePomPath,
94+
}
95+
l.fixModelList = append(l.fixModelList, newModel)
9396
}
94-
l.fixModelList = append(l.fixModelList, newModel)
97+
9598
}
9699
}
97100
} else {

0 commit comments

Comments
 (0)