Ignore project's version property when resolving properties in a bom

Closes gh-315
spring-gradle-plugins · Mar 18, 2022 · 358c8d9 · mjustin · Mar 19, 2022 · wilkinsona
1 parent 4eaceff
commit 358c8d9
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/...java/io/spring/gradle/dependencymanagement/internal/properties/ProjectPropertySource.java b/...java/io/spring/gradle/dependencymanagement/internal/properties/ProjectPropertySource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2017 the original author or authors.
+ * Copyright 2014-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -39,6 +39,9 @@ public ProjectPropertySource(Project project) {
 
     @Override
     public String getProperty(String name) {
+        if ("version".equals(name)) {
+            return null;
+        }
         if (this.project.hasProperty(name)) {
             Object property = this.project.property(name);
             if (property != null) {

diff --git a/...o/spring/gradle/dependencymanagement/internal/properties/ProjectPropertySourceSpec.groovy b/...o/spring/gradle/dependencymanagement/internal/properties/ProjectPropertySourceSpec.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2018 the original author or authors.
+ * Copyright 2014-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -66,4 +66,13 @@ public class ProjectPropertySourceSpec extends Specification {
         property == null
     }
 
+    def 'Null is returned when project has null property'() {
+        given: 'A project'
+        project.version = '1.2.3'
+        when: 'The version property is retrieved'
+        def property = this.propertySource.getProperty("version")
+        then: 'The property is null'
+        property == null
+    }
+
 }