root
/
spring-boot
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Fixup version numbers following release

Browse Source
pull/7654/merge
Phillip Webb 7 years ago
parent 6414b42335
commit 09a64bc841
10 changed files with 19 additions and 22 deletions
Show Stats Download Patch File Download Diff File

7
spring-boot-dependencies/pom.xml
Unescape Escape View File

@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId> <artifactId>spring-boot-dependencies</artifactId>
@ -2812,7 +2811,7 @@
<plugin> <plugin>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId> <artifactId>spring-boot-maven-plugin</artifactId>
<version>1.5.10.BUILD-SNAPSHOT</version> <version>1.5.11.BUILD-SNAPSHOT</version>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
@ -3033,4 +3032,4 @@
<id>integration-test</id> <id>integration-test</id>
</profile> </profile>
</profiles> </profiles>
</project> </project>

2
spring-boot-samples/spring-boot-sample-actuator/build.gradle
Unescape Escape View File

@ -1,6 +1,6 @@
buildscript { buildscript {
ext { ext {
springBootVersion = '1.5.10.BUILD-SNAPSHOT' springBootVersion = '1.5.11.BUILD-SNAPSHOT'
} }
repositories { repositories {
// NOTE: You should declare only repositories that you need here // NOTE: You should declare only repositories that you need here

2
spring-boot-samples/spring-boot-sample-ant/build.xml
Unescape Escape View File

@ -11,7 +11,7 @@
actual jars). Run with '$ java -jar target/*.jar'. actual jars). Run with '$ java -jar target/*.jar'.
</description> </description>
<property name="spring-boot.version" value="1.5.10.BUILD-SNAPSHOT" /> <property name="spring-boot.version" value="1.5.11.BUILD-SNAPSHOT" />
<property name="lib.dir" location="${basedir}/target/lib" /> <property name="lib.dir" location="${basedir}/target/lib" />
<property name="start-class" value="sample.ant.SampleAntApplication" /> <property name="start-class" value="sample.ant.SampleAntApplication" />

11
spring-boot-samples/spring-boot-sample-ant/pom.xml
Unescape Escape View File

@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<!-- This POM is just to trigger the Ant/Ivy sample from Maven and to test --> <!-- This POM is just to trigger the Ant/Ivy sample from Maven and to test -->
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
@ -62,8 +61,8 @@
<phase>package</phase> <phase>package</phase>
<configuration> <configuration>
<target> <target>
<property name="build.compiler" value="extJavac" /> <property name="build.compiler" value="extJavac"/>
<ant dir="${basedir}" /> <ant dir="${basedir}"/>
</target> </target>
</configuration> </configuration>
<goals> <goals>
@ -85,7 +84,7 @@
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-antlib</artifactId> <artifactId>spring-boot-antlib</artifactId>
<version>1.5.10.BUILD-SNAPSHOT</version> <version>1.5.11.BUILD-SNAPSHOT</version>
</dependency> </dependency>
</dependencies> </dependencies>
</plugin> </plugin>
@ -103,4 +102,4 @@
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
</project> </project>

2
spring-boot-samples/spring-boot-sample-logback/build.gradle
Unescape Escape View File

@ -1,6 +1,6 @@
buildscript { buildscript {
ext { ext {
springBootVersion = '1.5.10.BUILD-SNAPSHOT' springBootVersion = '1.5.11.BUILD-SNAPSHOT'
} }
repositories { repositories {
// NOTE: You should declare only repositories that you need here // NOTE: You should declare only repositories that you need here

2
spring-boot-samples/spring-boot-sample-profile/build.gradle
Unescape Escape View File

@ -1,6 +1,6 @@
buildscript { buildscript {
ext { ext {
springBootVersion = '1.5.10.BUILD-SNAPSHOT' springBootVersion = '1.5.11.BUILD-SNAPSHOT'
} }
repositories { repositories {
// NOTE: You should declare only repositories that you need here // NOTE: You should declare only repositories that you need here

2
spring-boot-samples/spring-boot-sample-simple/build.gradle
Unescape Escape View File

@ -1,6 +1,6 @@
buildscript { buildscript {
ext { ext {
springBootVersion = '1.5.10.BUILD-SNAPSHOT' springBootVersion = '1.5.11.BUILD-SNAPSHOT'
} }
repositories { repositories {
// NOTE: You should declare only repositories that you need here // NOTE: You should declare only repositories that you need here

2
spring-boot-samples/spring-boot-sample-web-static/build.gradle
Unescape Escape View File

@ -1,6 +1,6 @@
buildscript { buildscript {
ext { ext {
springBootVersion = '1.5.10.BUILD-SNAPSHOT' springBootVersion = '1.5.11.BUILD-SNAPSHOT'
} }
repositories { repositories {
// NOTE: You should declare only repositories that you need here // NOTE: You should declare only repositories that you need here

2
spring-boot-samples/spring-boot-sample-web-ui/build.gradle
Unescape Escape View File

@ -1,6 +1,6 @@
buildscript { buildscript {
ext { ext {
springBootVersion = '1.5.10.BUILD-SNAPSHOT' springBootVersion = '1.5.11.BUILD-SNAPSHOT'
springLoadedVersion = '1.2.4.RELEASE' springLoadedVersion = '1.2.4.RELEASE'
} }
repositories { repositories {

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

@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
@ -172,7 +171,7 @@
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId> <artifactId>spring-boot-maven-plugin</artifactId>
<version>1.5.10.BUILD-SNAPSHOT</version> <version>1.5.11.BUILD-SNAPSHOT</version>
</dependency> </dependency>
</dependencies> </dependencies>
<configuration> <configuration>
@ -206,7 +205,7 @@
<transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer"> <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
<resource>META-INF/spring.schemas</resource> <resource>META-INF/spring.schemas</resource>
</transformer> </transformer>
<transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" /> <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer"> <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
<mainClass>${start-class}</mainClass> <mainClass>${start-class}</mainClass>
</transformer> </transformer>
@ -218,4 +217,4 @@
</plugins> </plugins>
</pluginManagement> </pluginManagement>
</build> </build>
</project> </project>
Write Preview
Loading…
Cancel
Save