Added system props by default

This commit is contained in:
Marcin Grzejszczak
2018-10-15 21:12:48 +02:00
parent 25d57b1cee
commit 5c51015c84
3 changed files with 23 additions and 3 deletions

View File

@@ -291,12 +291,12 @@ public class ReleaserProperties {
/**
* Command to be executed to build the project
*/
private String buildCommand = "./mvnw clean install -B -Pdocs";
private String buildCommand = "./mvnw clean install -B -Pdocs {{systemProps}}";
/**
* Command to be executed to deploy a built project
*/
private String deployCommand = "./mvnw deploy -DskipTests -B -Pfast,deploy";
private String deployCommand = "./mvnw deploy -DskipTests -B -Pfast,deploy {{systemProps}}";
/**
* Command to be executed to publish documentation. If present "{{version}}" will be replaced by the

View File

@@ -1,6 +1,7 @@
package org.springframework.cloud.release.internal.spring;
import java.io.File;
import java.net.URISyntaxException;
import java.util.HashMap;
import java.util.Map;
@@ -17,16 +18,31 @@ import org.springframework.context.ApplicationContext;
public class ReleaserPropertiesUpdaterTests {
ApplicationContext context = BDDMockito.mock(ApplicationContext.class);
File relaserUpdater;
public ReleaserPropertiesUpdaterTests() throws URISyntaxException {
this.relaserUpdater = new File(ReleaserPropertiesUpdaterTests.class
.getResource("/projects/releaser-updater/").toURI());
}
@Test public void should_update_properties() {
ReleaserProperties original = originalReleaserProperties();
Aware aware = new Aware();
BDDMockito.given(this.context.getBeansOfType(BDDMockito.any(Class.class)))
.willReturn(beansOfType(aware));
ReleaserPropertiesUpdater updater = new ReleaserPropertiesUpdater(this.context);
updater.updateProperties(new ReleaserProperties(), new File("."));
ReleaserProperties props = updater
.updateProperties(original, this.relaserUpdater);
BDDAssertions.then(aware.properties).isNotNull();
BDDAssertions.then(props.getMaven().getSystemProperties()).isEqualTo("-Dfoo=bar");
}
ReleaserProperties originalReleaserProperties() {
ReleaserProperties props = new ReleaserProperties();
props.getMaven().setSystemProperties("-Dfoo=bar");
return props;
}
private Map<String, Object> beansOfType(Aware aware) {

View File

@@ -0,0 +1,4 @@
releaser.maven.buildCommand: ./scripts/noIntegration.sh
releaser.gradle.gradlePropsSubstitution:
verifierVersion: spring-cloud-contract
bootVersion: spring-boot