SpringCloud/spring-cloud-release-tools
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed invalid check

Browse Source
This commit is contained in:
Marcin Grzejszczak
2017-10-24 13:00:03 +02:00
parent 092a8d545d
commit 11f274a3cd
2 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
spring-cloud-release-tools-core/src/main/java/org/springframework/cloud/release/internal/gradle/GradleUpdater.java
View File

@@ -138,16 +138,10 @@ public class GradleUpdater {
private boolean pathIgnored(File file) {
String path = file.getPath();
return bumpingToRelease() &&
return assertSnapshots &&
this.properties.getGradle().getIgnoredGradleRegex().stream().anyMatch(path::matches);
}
private boolean bumpingToRelease() {
ProjectVersion version = this.projects
.forName(this.versionFromScRelease.projectName);
return version.isRelease() || version.isServiceRelease();
}
private String asString(Path path) {
try {
return new String(Files.readAllBytes(path));

2
spring-cloud-release-tools-core/src/main/java/org/springframework/cloud/release/internal/pom/ProjectPomUpdater.java
View File

@@ -149,7 +149,7 @@ public class ProjectPomUpdater {
private boolean pathIgnored(File file) {
String path = file.getPath();
return this.snapshotVersion &&
return this.assertSnapshots &&
this.properties.getPom().getIgnoredPomRegex().stream().anyMatch(path::matches);
}