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

Removed stream from train docs generation

Browse Source
This commit is contained in:
Marcin Grzejszczak
2020-06-10 10:04:54 +02:00
parent 68f43d31c5
commit bd86f0a59d
4 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/pom.xml
View File

@@ -8,7 +8,7 @@
<artifactId>spring-cloud-starter-build</artifactId>
<version>Hoxton.BUILD-SNAPSHOT</version>
</parent>
<packaging>pom</packaging>
<packaging>jar</packaging>
<name>Spring Cloud Starter Docs</name>
<description>Spring Cloud Docs</description>
<properties>

1
train-docs/src/main/java/org/springframework/cloud/internal/ArtifactFetcher.java
View File

@@ -112,6 +112,7 @@ class ArtifactFetcher {
}
else {
sourcesUrls.add(sourcesUrl + "v" + version + ".zip");
sourcesUrls.add(sourcesUrl + version + ".zip");
}
return sourcesUrls;
}

5
train-docs/src/main/java/org/springframework/cloud/internal/GenerateReleaseTrainDocs.java
View File

@@ -68,8 +68,11 @@ public class GenerateReleaseTrainDocs {
List<Project> mavenPropertiesToDocsProjects(File file) {
Model model = PomReader.readPom(file);
Properties properties = model.getProperties();
// Due to issues with Stream docs in Hoxton we just remove spring cloud stream
// from the docs
return properties.entrySet().stream()
.filter(e -> e.getKey().toString().endsWith(".version"))
.filter(e -> e.getKey().toString().endsWith(".version")
&& !e.getKey().toString().contains("spring-cloud-stream"))
.map(e -> new Project(e.getKey().toString().replace(".version", ""),
e.getValue().toString()))
.collect(Collectors.toCollection(LinkedList::new));

4
train-docs/src/test/java/org/springframework/cloud/internal/GenerateReleaseTrainDocsTests.java
View File

@@ -44,8 +44,8 @@ public class GenerateReleaseTrainDocsTests {
"spring-cloud-consul", "spring-cloud-contract", "spring-cloud-function",
"spring-cloud-gateway", "spring-cloud-kubernetes", "spring-cloud-netflix",
"spring-cloud-openfeign", "spring-cloud-security", "spring-cloud-sleuth",
"spring-cloud-stream", "spring-cloud-task", "spring-cloud-vault",
"spring-cloud-zookeeper", "spring-cloud-cli");
"spring-cloud-task", "spring-cloud-vault", "spring-cloud-zookeeper",
"spring-cloud-cli");
BDDAssertions.then(projects)
.contains(new Project("spring-cloud-bus", "1.2.3-SNAPSHOT"));
}