Skip to content

Commit 577b9b0

Browse files
committed
test version from properties #466
1 parent ddbb807 commit 577b9b0

File tree

2 files changed

+12
-2
lines changed

2 files changed

+12
-2
lines changed

fj-doc-maven-plugin/src/main/java/org/fugerit/java/doc/project/facade/BasicVenusFacade.java

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,18 @@ private static String versionToCheck(String groupIdToCheck, String artifactIdToC
3636
for (Dependency dep : dependencies) {
3737
if (dep.getGroupId().equals(groupIdToCheck) &&
3838
dep.getArtifactId().equals(artifactIdToCheck)) {
39-
return dep.getVersion();
39+
String version = dep.getVersion();
40+
if (version != null && version.startsWith("${") && version.endsWith("}")) {
41+
String propertyKey = version.substring(2, version.length() - 1);
42+
return model.getProperties().getProperty(propertyKey);
43+
}
44+
return version;
4045
}
4146
}
4247
return null;
4348
}
4449

50+
4551
private static void addOrOverwrite( List<Dependency> deps, Dependency d ) {
4652
Iterator<Dependency> it = deps.iterator();
4753
while ( it.hasNext() ) {

fj-doc-maven-plugin/src/test/resources/ko2-pom/pom.xml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,10 @@
2323

2424
<url>https://www.fugerit.org/</url>
2525

26+
<properties>
27+
<fj-core-version>8.6.8</fj-core-version>
28+
</properties>
29+
2630
<build>
2731

2832
</build>
@@ -32,7 +36,7 @@
3236
<dependency>
3337
<groupId>org.fugerit.java</groupId>
3438
<artifactId>fj-core</artifactId>
35-
<version>8.6.8</version>
39+
<version>${fj-core-version}</version>
3640
</dependency>
3741

3842
</dependencies>

0 commit comments

Comments
 (0)