Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
Thibault Helsmoortel committed Jan 20, 2020
2 parents d7a34c4 + 494abf6 commit fd30ea3
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 5 deletions.
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,10 @@
<description>Utilities enabling programmatic checks on Spring profiles.</description>

<properties>
<spring.boot.version>2.2.2.RELEASE</spring.boot.version>
<spring.boot.version>2.2.3.RELEASE</spring.boot.version>
<lombok.version>1.18.10</lombok.version>

<spring.test.version>5.2.2.RELEASE</spring.test.version>
<spring.test.version>5.2.3.RELEASE</spring.test.version>
<junit.jupiter.version>5.5.2</junit.jupiter.version>
<junit.platform.commons.version>1.5.2</junit.platform.commons.version>
<maven.compiler.plugin.version>3.8.1</maven.compiler.plugin.version>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,18 +23,15 @@
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.core.env.Environment;
import org.springframework.test.context.ActiveProfiles;
import org.springframework.test.context.junit.jupiter.SpringExtension;

/**
* @author Thibault Helsmoortel
*/
@ActiveProfiles({"test", "myTestProfile"})
@ExtendWith(SpringExtension.class)
@SpringBootTest(classes = SpringProfileUtils.class)
class SpringProfileUtilsTest {

Expand Down

0 comments on commit fd30ea3

Please sign in to comment.