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

Ignoring SNAPSHOT word inside comments; fixes gh-80

Browse Source
This commit is contained in:
Marcin Grzejszczak
2018-06-15 14:25:35 +02:00
parent afd644efc4
commit 3d902c6d8a
3 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -17,7 +17,6 @@ package org.springframework.cloud.release.internal.pom;
import java.io.File;
import java.io.IOException;
import java.lang.invoke.MethodHandles;
import java.nio.file.FileVisitResult;
import java.nio.file.Files;
import java.nio.file.Path;
@@ -25,11 +24,8 @@ import java.nio.file.SimpleFileVisitor;
import java.nio.file.attribute.BasicFileAttributes;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.util.Scanner;
import org.apache.maven.model.Model;
import org.codehaus.plexus.util.xml.Xpp3Dom;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.cloud.release.internal.ReleaserProperties;
@@ -40,8 +36,10 @@ import org.springframework.cloud.release.internal.git.ProjectGitHandler;
*/
public class ProjectPomUpdater {
private static final List<String> IGNORED_SNAPSHOT_LINE_CHECKS = Arrays.asList(
"replace="
private static final List<String> IGNORED_SNAPSHOT_LINE_PATTERNS = Arrays.asList(
"^.*replace=.*$",
// issue [#80]
"^[\\s]*<!--.*-->.*$"
);
private static final Logger log = LoggerFactory.getLogger(ProjectPomUpdater.class);
@@ -145,7 +143,7 @@ public class ProjectPomUpdater {
String line = scanner.nextLine();
lineNumber++;
boolean containsSnapshot = line.contains("SNAPSHOT") &&
IGNORED_SNAPSHOT_LINE_CHECKS.stream().noneMatch(line::contains);
IGNORED_SNAPSHOT_LINE_PATTERNS.stream().noneMatch(line::matches);
if (containsSnapshot) {
throw new IllegalStateException("The file [" + path + "] contains a SNAPSHOT "
+ "version for a non snapshot release in line number [" + lineNumber + "]\n\n" + line);

2
spring-cloud-release-tools-core/src/test/java/org/springframework/cloud/release/internal/PomUpdateAcceptanceTests.java
View File

@@ -67,7 +67,7 @@ public class PomUpdateAcceptanceTests {
}
@Test
public void should_update_fail_when_after_updating_a_release_version_there_still_is_a_snapshot_version() throws Exception {
public void should_not_fail_when_after_updating_a_release_version_there_still_is_a_snapshot_version() throws Exception {
ReleaserProperties releaserProperties = branchReleaserProperties();
ProjectPomUpdater projectPomUpdater = new ProjectPomUpdater(releaserProperties);
Projects projects = projectPomUpdater.retrieveVersionsFromSCRelease();

9
spring-cloud-release-tools-core/src/test/resources/projects/spring-cloud-sleuth-with-unmatched-property/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin-stream/pom.xml
View File

@@ -39,6 +39,15 @@
<sonar.skip>true</sonar.skip>
</properties>
<!-- BUILD-SNAPSHOT -->
<!--BUILD-SNAPSHOT-->
<!-- SNAPSHOT -->
<!--SNAPSHOT-->
<!-- BUILD-SNAPSHOT -->
<!--BUILD-SNAPSHOT-->
<!-- SNAPSHOT -->
<!--SNAPSHOT-->
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>