root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #10240 from eddumelendez:update_junit_jupiter_ga 

* pr/10240:
  Polish "Provide dependency management for JUnit Jupiter"
  Provide dependency management for JUnit Jupiter
This commit is contained in:
Stephane Nicoll 2017-09-11 20:22:09 +02:00
parent e6811de4ac 1dc08fdda2
commit c41cfab749
2 changed files with 33 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
spring-boot-dependencies/pom.xml
View File

@ -124,6 +124,8 @@
<jstl.version>1.2</jstl.version> <jstl.version>1.2</jstl.version>
<jtds.version>1.3.1</jtds.version> <jtds.version>1.3.1</jtds.version>
<junit.version>4.12</junit.version> <junit.version>4.12</junit.version>
<junit-jupiter.version>5.0.0</junit-jupiter.version>
<junit-platform.version>1.0.0</junit-platform.version>
<lettuce.version>5.0.0.RC2</lettuce.version> <lettuce.version>5.0.0.RC2</lettuce.version>
<liquibase.version>3.5.3</liquibase.version> <liquibase.version>3.5.3</liquibase.version>
<log4j2.version>2.9.0</log4j2.version> <log4j2.version>2.9.0</log4j2.version>
@ -931,6 +933,26 @@
<artifactId>junit</artifactId> <artifactId>junit</artifactId>
<version>${junit.version}</version> <version>${junit.version}</version>
</dependency> </dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<version>${junit-jupiter.version}</version>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
<version>${junit-jupiter.version}</version>
</dependency>
<dependency>
<groupId>org.junit.platform</groupId>
<artifactId>junit-platform-engine</artifactId>
<version>${junit-platform.version}</version>
</dependency>
<dependency>
<groupId>org.junit.platform</groupId>
<artifactId>junit-platform-launcher</artifactId>
<version>${junit-platform.version}</version>
</dependency>
<dependency> <dependency>
<groupId>mysql</groupId> <groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId> <artifactId>mysql-connector-java</artifactId>

20
spring-boot-samples/spring-boot-sample-junit-jupiter/pom.xml
View File

@ -19,8 +19,6 @@
</organization> </organization>
<properties> <properties>
<main.basedir>${basedir}/../..</main.basedir> <main.basedir>${basedir}/../..</main.basedir>
<junit.jupiter.version>5.0.0-M6</junit.jupiter.version>
<junit.platform.version>1.0.0-M6</junit.platform.version>
</properties> </properties>
<dependencies> <dependencies>
@ -40,10 +38,19 @@
</exclusion> </exclusion>
</exclusions> </exclusions>
</dependency> </dependency>
<dependency>
<groupId>org.junit.platform</groupId>
<artifactId>junit-platform-launcher</artifactId>
<scope>test</scope>
</dependency>
<dependency> <dependency>
<groupId>org.junit.jupiter</groupId> <groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId> <artifactId>junit-jupiter-api</artifactId>
<version>${junit.jupiter.version}</version> <scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
</dependencies> </dependencies>
@ -61,12 +68,7 @@
<dependency> <dependency>
<groupId>org.junit.platform</groupId> <groupId>org.junit.platform</groupId>
<artifactId>junit-platform-surefire-provider</artifactId> <artifactId>junit-platform-surefire-provider</artifactId>
<version>${junit.platform.version}</version> <version>${junit-platform.version}</version>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
<version>${junit.jupiter.version}</version>
</dependency> </dependency>
</dependencies> </dependencies>
</plugin> </plugin>