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

Merge branch '1.1.x'

pull/1862/merge
Andy Wilkinson 11 years ago
parent
504de8a7c8 322bdd62ef
commit
b99ffcc170
4 changed files with 5 additions and 5 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. 4
      spring-boot-dependencies/pom.xml
  2. 2
      spring-boot-tools/spring-boot-loader/src/it/executable-dir/pom.xml
  3. 2
      spring-boot-tools/spring-boot-loader/src/it/executable-jar/pom.xml
  4. 2
      spring-boot-tools/spring-boot-loader/src/it/executable-war/pom.xml

4
spring-boot-dependencies/pom.xml
Unescape View File

@ -1387,7 +1387,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId> <artifactId>maven-dependency-plugin</artifactId>
<version>2.8</version> <version>2.9</version>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
@ -1417,7 +1417,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId> <artifactId>maven-javadoc-plugin</artifactId>
<version>2.9.1</version> <version>2.10.1</version>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>

2
spring-boot-tools/spring-boot-loader/src/it/executable-dir/pom.xml
Unescape View File

@ -22,7 +22,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId> <artifactId>maven-dependency-plugin</artifactId>
<version>2.8</version> <version>2.9</version>
<executions> <executions>
<execution> <execution>
<id>unpack</id> <id>unpack</id>

2
spring-boot-tools/spring-boot-loader/src/it/executable-jar/pom.xml
Unescape View File

@ -22,7 +22,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId> <artifactId>maven-dependency-plugin</artifactId>
<version>2.8</version> <version>2.9</version>
<executions> <executions>
<execution> <execution>
<id>unpack</id> <id>unpack</id>

2
spring-boot-tools/spring-boot-loader/src/it/executable-war/pom.xml
Unescape View File

@ -39,7 +39,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId> <artifactId>maven-dependency-plugin</artifactId>
<version>2.8</version> <version>2.9</version>
<executions> <executions>
<execution> <execution>
<id>unpack</id> <id>unpack</id>

Write Preview
Loading…
Cancel
Save