Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions util/maven/project.go
Original file line number Diff line number Diff line change
Expand Up @@ -329,3 +329,18 @@ func (p *Project) InterpolateRepositories() error {

return nil
}

// InterpolateDependencies resolves placeholders in dependency metadata with best effort.
// Unlike Interpolate, dependencies with unresolved placeholders are preserved rather than dropped.
func (p *Project) InterpolateDependencies() error {
properties, err := p.propertyMap()
if err != nil {
return err
}

for i := range p.Dependencies {
p.Dependencies[i].interpolate(properties)
}

return nil
}
61 changes: 61 additions & 0 deletions util/maven/project_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -895,3 +895,64 @@ func TestInterpolateRepositories(t *testing.T) {
t.Errorf("interpolate repositories then interpolate:\n(-got, +want):\n%s", diff)
}
}

func TestInterpolateDependencies(t *testing.T) {
proj := Project{
ProjectKey: ProjectKey{
GroupID: "com.example",
ArtifactID: "basic",
Version: "1.2.3",
},
Properties: Properties{
Properties: []Property{
{Name: "dep.version", Value: "1.0.0"},
},
},
Dependencies: []Dependency{{
GroupID: "org.example",
ArtifactID: "valid-property-version",
Version: "${dep.version}",
}, {
GroupID: "org.example",
ArtifactID: "invalid-property-version",
Version: "${invalid.version}",
}, {
GroupID: "org.example",
ArtifactID: "hardcoded-version",
Version: "3.0.0",
}},
}

want := Project{
ProjectKey: ProjectKey{
GroupID: "com.example",
ArtifactID: "basic",
Version: "1.2.3",
},
Properties: Properties{
Properties: []Property{
{Name: "dep.version", Value: "1.0.0"},
},
},
Dependencies: []Dependency{{
GroupID: "org.example",
ArtifactID: "valid-property-version",
Version: "1.0.0",
}, {
GroupID: "org.example",
ArtifactID: "invalid-property-version",
Version: "${invalid.version}",
}, {
GroupID: "org.example",
ArtifactID: "hardcoded-version",
Version: "3.0.0",
}},
}

if err := proj.InterpolateDependencies(); err != nil {
t.Fatalf("InterpolateDependencies() err = %v, want nil", err)
}
if diff := cmp.Diff(proj, want); diff != "" {
t.Errorf("interpolate dependencies:\n(-got, +want):\n%s", diff)
}
}
Loading