Skip to content

Commit 6682d84

Browse files
committed
chore: Add a pomProperty matcher in the dependencies.txt file
1 parent a42349b commit 6682d84

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

.github/scripts/test_dependency_compatibility.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@ function add_dependency_to_maven_command() {
3737
exit 1
3838
fi
3939
local full_dependency=$(echo "${dep_pair}" | cut -d'=' -f1 | tr -d '[:space:]')
40-
# The dependency can be in the format of {groupId}:{artifactId} or {artifactId}
41-
# We only want the artifactId
42-
local dependency=$(echo "${full_dependency}" | awk -F':' '{print $NF}')
40+
# The dependency can be in the format of {groupId}:{artifactId};{pomPropertyName}
41+
# We only want the pomPropertyName
42+
local dependency=$(echo "${full_dependency}" | awk -F';' '{print $NF}')
4343
local version=$(echo "${dep_pair}" | cut -d'=' -f2 | sed 's/^[[:space:]]*//;s/[[:space:]]*$//')
4444
MAVEN_COMMAND+=" -D${dependency}.version=${version}"
4545
}

renovate.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
{
1414
"customType": "regex",
1515
"managerFilePatterns": ["/dependencies\\.txt/"],
16-
"matchStrings": ["(?<depName>.*)=(?<currentValue>.*)\\n"],
16+
"matchStrings": ["(?<depName>.*);(?<unused>.*)=(?<currentValue>.*)"],
1717
"datasourceTemplate": "maven"
1818
},
1919
{

0 commit comments

Comments
 (0)