Skip to content

Fix requested manually managed dependencies #432

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 15 commits into from
Sep 26, 2022
Merged

Fix requested manually managed dependencies #432

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
8434328
Updated test container dependency
ashakirin Aug 18, 2022
c6624e4
Revert "Updated test container dependency"
ashakirin Aug 18, 2022
597e140
Merge branch 'spring-projects-experimental:main' into main
sanagaraj-pivotal Aug 22, 2022
48e5f8e
Merge branch 'spring-projects-experimental:main' into main
sanagaraj-pivotal Aug 24, 2022
ba6da28
Merge branch 'spring-projects-experimental:main' into main
sanagaraj-pivotal Aug 25, 2022
4720e24
Merge branch 'spring-projects-experimental:main' into main
sanagaraj-pivotal Aug 26, 2022
2f9c293
Merge branch 'spring-projects-experimental:main' into main
ashakirin Sep 5, 2022
216fcb4
Merge branch 'spring-projects-experimental:main' into main
sanagaraj-pivotal Sep 6, 2022
e820dc1
Merge branch 'spring-projects-experimental:main' into main
ashakirin Sep 12, 2022
911ec76
Merge branch 'spring-projects-experimental:main' into main
sanagaraj-pivotal Sep 15, 2022
c0b7c78
Merge branch 'spring-projects-experimental:main' into main
ashakirin Sep 19, 2022
8f5deda
Updated manually managed dependencies check for getRequestedDependenc…
ashakirin Sep 21, 2022
c75f35a
Merge branch 'main' into 431-fix-requested-manually-managed-dependencies
fabapp2 Sep 23, 2022
7519622
Merge branch 'main' into 431-fix-requested-manually-managed-dependencies
fabapp2 Sep 23, 2022
996c2bb
Merge branch 'main' into 431-fix-requested-manually-managed-dependencies
fabapp2 Sep 23, 2022
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
2 changes: 1 addition & 1 deletion ...rg/springframework/sbm/boot/common/conditions/HasSpringBootDependencyManuallyManaged.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ public boolean evaluate(ProjectContext context) {
.stream()
.map(Module::getBuildFile)
.anyMatch(b -> {
boolean matchedInDependencies = b.getDeclaredDependencies()
boolean matchedInDependencies = b.getRequestedDependencies()
.stream()
.anyMatch(matchesSpringBootPattern());

Expand Down
92 changes: 59 additions & 33 deletions ...pringframework/sbm/boot/common/conditions/HasSpringBootDependencyManuallyManagedTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,41 +191,67 @@ public void conditionToBeTrueIfManagedDependencies() {
}

@Test
public void conditionToBeTrueIfVersionIsDefinedInProperty() {
public void conditionToBeTrueIfVersionIsDefinedInParentPom() {
ProjectContext projectContext = TestProjectContext.buildProjectContext()
.withMavenRootBuildFileSource("""
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>com.example</groupId>
<artifactId>explicit-deps-app</artifactId>
<version>0.0.1-SNAPSHOT</version>
<name>explicit-deps-app</name>
<description>explicit-deps-app</description>
<properties>
<spring-boot.version>2.7.1</spring-boot.version>
</properties>

<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
<version>${spring-boot.version}</version>
</dependency>
<dependency>
<groupId>io.dropwizard.metrics</groupId>
<artifactId>metrics-annotation</artifactId>
<version>4.2.8</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<version>2.7.3</version>
<scope>test</scope>
</dependency>
</dependencies>
</project>
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging>
<groupId>com.example</groupId>
<artifactId>parent-boot-upgrade-27_30</artifactId>
<version>0.0.1-SNAPSHOT</version>
<name>parent-boot-upgrade-27_30</name>
<description>parent-boot-upgrade-27_30</description>
<properties>
<java.version>17</java.version>
<spring-boot.version>2.7.3</spring-boot.version>
</properties>
<modules>
<module>component1</module>
</modules>
<repositories>
<repository>
<id>spring-milestone</id>
<url>https://repo.spring.io/milestone</url>
<snapshots>
<enabled>false</enabled>
</snapshots>
</repository>
</repositories>
</project>
""")
.withMavenBuildFileSource("component1/pom.xml", """
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.example</groupId>
<artifactId>parent-boot-upgrade-27_30</artifactId>
<version>0.0.1-SNAPSHOT</version>
</parent>
<groupId>com.example</groupId>
<artifactId>explicit-deps-app</artifactId>
<version>0.0.1-SNAPSHOT</version>
<name>explicit-deps-app</name>
<description>explicit-deps-app</description>

<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
<version>${spring-boot.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<version>${spring-boot.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
</project>
""")
.build();

Expand Down