Browse Source

Merge branch '2.0.x'

pull/13358/merge
Andy Wilkinson 8 years ago
parent
commit
aee6aecfc2
  1. 2
      spring-boot-project/spring-boot-dependencies/pom.xml
  2. 3
      spring-boot-samples-invoker/pom.xml

2
spring-boot-project/spring-boot-dependencies/pom.xml

@ -196,7 +196,7 @@ @@ -196,7 +196,7 @@
<maven-enforcer-plugin.version>3.0.0-M1</maven-enforcer-plugin.version>
<maven-failsafe-plugin.version>2.21.0</maven-failsafe-plugin.version>
<maven-install-plugin.version>2.5.2</maven-install-plugin.version>
<maven-invoker-plugin.version>3.0.0</maven-invoker-plugin.version>
<maven-invoker-plugin.version>3.1.0</maven-invoker-plugin.version>
<maven-help-plugin.version>2.2</maven-help-plugin.version>
<maven-jar-plugin.version>3.0.2</maven-jar-plugin.version>
<maven-javadoc-plugin.version>3.0.0</maven-javadoc-plugin.version>

3
spring-boot-samples-invoker/pom.xml

@ -21,12 +21,9 @@ @@ -21,12 +21,9 @@
<!-- We use invoker so that the spring-boot-maven-plugin can be used -->
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-invoker-plugin</artifactId>
<!-- Downgrade due to https://issues.apache.org/jira/browse/MINVOKER-224 -->
<version>2.0.0</version>
<inherited>false</inherited>
<configuration>
<projectsDirectory>${main.basedir}/spring-boot-samples</projectsDirectory>
<cloneProjectsTo />
<skipInvocation>${skipTests}</skipInvocation>
<streamLogs>true</streamLogs>
<pomIncludes>

Loading…
Cancel
Save