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

Merge branch '1.2.x'

This commit is contained in:
Andy Wilkinson 2016-01-12 10:17:21 +00:00
parent e4e9a71753 6117b6c5c8
commit 2aff82bb64
6 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spring-boot-actuator-docs/pom.xml
View File

@ -174,13 +174,13 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId> <artifactId>maven-jar-plugin</artifactId>
<configuration> <configuration>
<includes> <includes>
<include>**/*.html</include> <include>**/*.html</include>
<include>**/*.png</include> <include>**/*.png</include>
</includes> </includes>
</configuration> </configuration>
</plugin> </plugin>
</plugins> </plugins>
<pluginManagement> <pluginManagement>
<plugins> <plugins>

2
spring-boot-deployment-tests/spring-boot-deployment-test-tomee/pom.xml
View File

@ -35,7 +35,7 @@
<exclusion> <exclusion>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-validation</artifactId> <artifactId>spring-boot-starter-validation</artifactId>
</exclusion> </exclusion>
</exclusions> </exclusions>
</dependency> </dependency>
<dependency> <dependency>

2
spring-boot-deployment-tests/spring-boot-deployment-test-wildfly/pom.xml
View File

@ -34,7 +34,7 @@
<exclusion> <exclusion>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-validation</artifactId> <artifactId>spring-boot-starter-validation</artifactId>
</exclusion> </exclusion>
</exclusions> </exclusions>
</dependency> </dependency>
<dependency> <dependency>

42
spring-boot-parent/pom.xml
View File

@ -415,27 +415,27 @@
<ignore /> <ignore />
</action> </action>
</pluginExecution> </pluginExecution>
<pluginExecution> <pluginExecution>
<pluginExecutionFilter> <pluginExecutionFilter>
<groupId> <groupId>
org.apache.maven.plugins org.apache.maven.plugins
</groupId> </groupId>
<artifactId> <artifactId>
maven-invoker-plugin maven-invoker-plugin
</artifactId> </artifactId>
<versionRange> <versionRange>
[1.0.0,) [1.0.0,)
</versionRange> </versionRange>
<goals> <goals>
<goal> <goal>
install install
</goal> </goal>
</goals> </goals>
</pluginExecutionFilter> </pluginExecutionFilter>
<action> <action>
<ignore /> <ignore />
</action> </action>
</pluginExecution> </pluginExecution>
</pluginExecutions> </pluginExecutions>
</lifecycleMappingMetadata> </lifecycleMappingMetadata>
</configuration> </configuration>

8
spring-boot-samples/spring-boot-sample-data-cassandra/pom.xml
View File

@ -33,10 +33,10 @@
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.cassandraunit</groupId> <groupId>org.cassandraunit</groupId>
<artifactId>cassandra-unit-spring</artifactId> <artifactId>cassandra-unit-spring</artifactId>
<version>2.1.9.2</version> <version>2.1.9.2</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
</dependencies> </dependencies>
<build> <build>

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

@ -6,9 +6,9 @@
<artifactId>executable-war</artifactId> <artifactId>executable-war</artifactId>
<version>0.0.1.BUILD-SNAPSHOT</version> <version>0.0.1.BUILD-SNAPSHOT</version>
<packaging>war</packaging> <packaging>war</packaging>
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties> </properties>
<build> <build>
<plugins> <plugins>
<plugin> <plugin>