GitHub-Spring
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Reinstate junit dependencies in starters

pull/10/head
Dave Syer 13 years ago
parent
22b1f25642
commit
3922a7f526
15 changed files with 63 additions and 15 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      spring-boot-samples/spring-boot-sample-actuator-ui/pom.xml
  2. 2
      spring-boot-samples/spring-boot-sample-actuator/pom.xml
  3. 2
      spring-boot-samples/spring-boot-sample-batch/pom.xml
  4. 2
      spring-boot-samples/spring-boot-sample-data-jpa/pom.xml
  5. 2
      spring-boot-samples/spring-boot-sample-integration/pom.xml
  6. 2
      spring-boot-samples/spring-boot-sample-jetty/pom.xml
  7. 2
      spring-boot-samples/spring-boot-sample-profile/pom.xml
  8. 2
      spring-boot-samples/spring-boot-sample-simple/pom.xml
  9. 2
      spring-boot-samples/spring-boot-sample-tomcat/pom.xml
  10. 2
      spring-boot-samples/spring-boot-sample-traditional/pom.xml
  11. 2
      spring-boot-samples/spring-boot-sample-web-static/pom.xml
  12. 2
      spring-boot-samples/spring-boot-sample-web-ui/pom.xml
  13. 2
      spring-boot-samples/spring-boot-sample-xml/pom.xml
  14. 26
      spring-boot-starters/spring-boot-starter-parent/pom.xml
  15. 26
      spring-boot-starters/src/main/parent/pom.xml

2
spring-boot-samples/spring-boot-sample-actuator-ui/pom.xml
Unescape View File

@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-samples</artifactId> <artifactId>spring-boot-starter-parent</artifactId>
<version>0.5.0.BUILD-SNAPSHOT</version> <version>0.5.0.BUILD-SNAPSHOT</version>
</parent> </parent>
<artifactId>spring-boot-sample-actuator-ui</artifactId> <artifactId>spring-boot-sample-actuator-ui</artifactId>

2
spring-boot-samples/spring-boot-sample-actuator/pom.xml
Unescape View File

@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-samples</artifactId> <artifactId>spring-boot-starter-parent</artifactId>
<version>0.5.0.BUILD-SNAPSHOT</version> <version>0.5.0.BUILD-SNAPSHOT</version>
</parent> </parent>
<artifactId>spring-boot-sample-actuator</artifactId> <artifactId>spring-boot-sample-actuator</artifactId>

2
spring-boot-samples/spring-boot-sample-batch/pom.xml
Unescape View File

@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-samples</artifactId> <artifactId>spring-boot-starter-parent</artifactId>
<version>0.5.0.BUILD-SNAPSHOT</version> <version>0.5.0.BUILD-SNAPSHOT</version>
</parent> </parent>
<artifactId>spring-boot-sample-batch</artifactId> <artifactId>spring-boot-sample-batch</artifactId>

2
spring-boot-samples/spring-boot-sample-data-jpa/pom.xml
Unescape View File

@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-samples</artifactId> <artifactId>spring-boot-starter-parent</artifactId>
<version>0.5.0.BUILD-SNAPSHOT</version> <version>0.5.0.BUILD-SNAPSHOT</version>
</parent> </parent>
<artifactId>spring-boot-sample-data-jpa</artifactId> <artifactId>spring-boot-sample-data-jpa</artifactId>

2
spring-boot-samples/spring-boot-sample-integration/pom.xml
Unescape View File

@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-samples</artifactId> <artifactId>spring-boot-starter-parent</artifactId>
<version>0.5.0.BUILD-SNAPSHOT</version> <version>0.5.0.BUILD-SNAPSHOT</version>
</parent> </parent>
<artifactId>spring-boot-sample-integration</artifactId> <artifactId>spring-boot-sample-integration</artifactId>

2
spring-boot-samples/spring-boot-sample-jetty/pom.xml
Unescape View File

@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-samples</artifactId> <artifactId>spring-boot-starter-parent</artifactId>
<version>0.5.0.BUILD-SNAPSHOT</version> <version>0.5.0.BUILD-SNAPSHOT</version>
</parent> </parent>
<artifactId>spring-boot-sample-jetty</artifactId> <artifactId>spring-boot-sample-jetty</artifactId>

2
spring-boot-samples/spring-boot-sample-profile/pom.xml
Unescape View File

@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-samples</artifactId> <artifactId>spring-boot-starter-parent</artifactId>
<version>0.5.0.BUILD-SNAPSHOT</version> <version>0.5.0.BUILD-SNAPSHOT</version>
</parent> </parent>
<artifactId>spring-boot-sample-profile</artifactId> <artifactId>spring-boot-sample-profile</artifactId>

2
spring-boot-samples/spring-boot-sample-simple/pom.xml
Unescape View File

@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-samples</artifactId> <artifactId>spring-boot-starter-parent</artifactId>
<version>0.5.0.BUILD-SNAPSHOT</version> <version>0.5.0.BUILD-SNAPSHOT</version>
</parent> </parent>
<artifactId>spring-boot-sample-simple</artifactId> <artifactId>spring-boot-sample-simple</artifactId>

2
spring-boot-samples/spring-boot-sample-tomcat/pom.xml
Unescape View File

@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-samples</artifactId> <artifactId>spring-boot-starter-parent</artifactId>
<version>0.5.0.BUILD-SNAPSHOT</version> <version>0.5.0.BUILD-SNAPSHOT</version>
</parent> </parent>
<artifactId>spring-boot-sample-tomcat</artifactId> <artifactId>spring-boot-sample-tomcat</artifactId>

2
spring-boot-samples/spring-boot-sample-traditional/pom.xml
Unescape View File

@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-samples</artifactId> <artifactId>spring-boot-starter-parent</artifactId>
<version>0.5.0.BUILD-SNAPSHOT</version> <version>0.5.0.BUILD-SNAPSHOT</version>
</parent> </parent>
<artifactId>spring-boot-sample-traditional</artifactId> <artifactId>spring-boot-sample-traditional</artifactId>

2
spring-boot-samples/spring-boot-sample-web-static/pom.xml
Unescape View File

@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-samples</artifactId> <artifactId>spring-boot-starter-parent</artifactId>
<version>0.5.0.BUILD-SNAPSHOT</version> <version>0.5.0.BUILD-SNAPSHOT</version>
</parent> </parent>
<artifactId>spring-boot-sample-web-static</artifactId> <artifactId>spring-boot-sample-web-static</artifactId>

2
spring-boot-samples/spring-boot-sample-web-ui/pom.xml
Unescape View File

@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-samples</artifactId> <artifactId>spring-boot-starter-parent</artifactId>
<version>0.5.0.BUILD-SNAPSHOT</version> <version>0.5.0.BUILD-SNAPSHOT</version>
</parent> </parent>
<artifactId>spring-boot-sample-web-ui</artifactId> <artifactId>spring-boot-sample-web-ui</artifactId>

2
spring-boot-samples/spring-boot-sample-xml/pom.xml
Unescape View File

@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-samples</artifactId> <artifactId>spring-boot-starter-parent</artifactId>
<version>0.5.0.BUILD-SNAPSHOT</version> <version>0.5.0.BUILD-SNAPSHOT</version>
</parent> </parent>
<artifactId>spring-boot-sample-xml</artifactId> <artifactId>spring-boot-sample-xml</artifactId>

26
spring-boot-starters/spring-boot-starter-parent/pom.xml
Unescape View File

@ -17,12 +17,13 @@
<packaging>pom</packaging> <packaging>pom</packaging>
<properties> <properties>
<spring.boot.version>0.5.0.BUILD-SNAPSHOT</spring.boot.version> <spring.boot.version>0.5.0.BUILD-SNAPSHOT</spring.boot.version>
<java.version>1.6</java.version>
</properties> </properties>
<dependencyManagement> <dependencyManagement>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-strap</artifactId> <artifactId>spring-boot</artifactId>
<version>${spring.boot.version}</version> <version>${spring.boot.version}</version>
</dependency> </dependency>
<dependency> <dependency>
@ -77,6 +78,29 @@
</dependency> </dependency>
</dependencies> </dependencies>
</dependencyManagement> </dependencyManagement>
<dependencies>
<!-- Generally Useful Test Dependencies -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-library</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
<build> <build>
<!-- Turn on filtering by default for application properties --> <!-- Turn on filtering by default for application properties -->
<resources> <resources>

26
spring-boot-starters/src/main/parent/pom.xml
Unescape View File

@ -17,12 +17,13 @@
<packaging>pom</packaging> <packaging>pom</packaging>
<properties> <properties>
<spring.boot.version>@{project.version}</spring.boot.version> <spring.boot.version>@{project.version}</spring.boot.version>
<java.version>1.6</java.version>
</properties> </properties>
<dependencyManagement> <dependencyManagement>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-strap</artifactId> <artifactId>spring-boot</artifactId>
<version>${spring.boot.version}</version> <version>${spring.boot.version}</version>
</dependency> </dependency>
<dependency> <dependency>
@ -77,6 +78,29 @@
</dependency> </dependency>
</dependencies> </dependencies>
</dependencyManagement> </dependencyManagement>
<dependencies>
<!-- Generally Useful Test Dependencies -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-library</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
<build> <build>
<!-- Turn on filtering by default for application properties --> <!-- Turn on filtering by default for application properties -->
<resources> <resources>

Write Preview
Loading…
Cancel
Save