Skip to content

Commit

Permalink
Fixup version numbers following release
Browse files Browse the repository at this point in the history
  • Loading branch information
snicoll committed Jun 8, 2017
1 parent 05d4d02 commit aa08399
Show file tree
Hide file tree
Showing 10 changed files with 19 additions and 22 deletions.
7 changes: 3 additions & 4 deletions spring-boot-dependencies/pom.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<?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">
<?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">
<modelVersion>4.0.0</modelVersion>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
Expand Down Expand Up @@ -2522,7 +2521,7 @@
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<version>1.5.4.BUILD-SNAPSHOT</version>
<version>1.5.5.BUILD-SNAPSHOT</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand Down Expand Up @@ -2743,4 +2742,4 @@
<id>integration-test</id>
</profile>
</profiles>
</project>
</project>
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
buildscript {
ext {
springBootVersion = '1.5.4.BUILD-SNAPSHOT'
springBootVersion = '1.5.5.BUILD-SNAPSHOT'
}
repositories {
// NOTE: You should declare only repositories that you need here
Expand Down
2 changes: 1 addition & 1 deletion spring-boot-samples/spring-boot-sample-ant/build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
actual jars). Run with '$ java -jar target/*.jar'.
</description>

<property name="spring-boot.version" value="1.5.4.BUILD-SNAPSHOT" />
<property name="spring-boot.version" value="1.5.5.BUILD-SNAPSHOT" />
<property name="lib.dir" location="${basedir}/target/lib" />
<property name="start-class" value="sample.ant.SampleAntApplication" />

Expand Down
11 changes: 5 additions & 6 deletions spring-boot-samples/spring-boot-sample-ant/pom.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<?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">
<?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">
<!-- This POM is just to trigger the Ant/Ivy sample from Maven and to test -->
<modelVersion>4.0.0</modelVersion>
<parent>
Expand Down Expand Up @@ -62,8 +61,8 @@
<phase>package</phase>
<configuration>
<target>
<property name="build.compiler" value="extJavac" />
<ant dir="${basedir}" />
<property name="build.compiler" value="extJavac"/>
<ant dir="${basedir}"/>
</target>
</configuration>
<goals>
Expand All @@ -85,7 +84,7 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-antlib</artifactId>
<version>1.5.4.BUILD-SNAPSHOT</version>
<version>1.5.5.BUILD-SNAPSHOT</version>
</dependency>
</dependencies>
</plugin>
Expand All @@ -103,4 +102,4 @@
</plugin>
</plugins>
</build>
</project>
</project>
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
buildscript {
ext {
springBootVersion = '1.5.4.BUILD-SNAPSHOT'
springBootVersion = '1.5.5.BUILD-SNAPSHOT'
}
repositories {
// NOTE: You should declare only repositories that you need here
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
buildscript {
ext {
springBootVersion = '1.5.4.BUILD-SNAPSHOT'
springBootVersion = '1.5.5.BUILD-SNAPSHOT'
}
repositories {
// NOTE: You should declare only repositories that you need here
Expand Down
2 changes: 1 addition & 1 deletion spring-boot-samples/spring-boot-sample-simple/build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
buildscript {
ext {
springBootVersion = '1.5.4.BUILD-SNAPSHOT'
springBootVersion = '1.5.5.BUILD-SNAPSHOT'
}
repositories {
// NOTE: You should declare only repositories that you need here
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
buildscript {
ext {
springBootVersion = '1.5.4.BUILD-SNAPSHOT'
springBootVersion = '1.5.5.BUILD-SNAPSHOT'
}
repositories {
// NOTE: You should declare only repositories that you need here
Expand Down
2 changes: 1 addition & 1 deletion spring-boot-samples/spring-boot-sample-web-ui/build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
buildscript {
ext {
springBootVersion = '1.5.4.BUILD-SNAPSHOT'
springBootVersion = '1.5.5.BUILD-SNAPSHOT'
springLoadedVersion = '1.2.4.RELEASE'
}
repositories {
Expand Down
9 changes: 4 additions & 5 deletions spring-boot-starters/spring-boot-starter-parent/pom.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<?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">
<?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">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.springframework.boot</groupId>
Expand Down Expand Up @@ -172,7 +171,7 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<version>1.5.4.BUILD-SNAPSHOT</version>
<version>1.5.5.BUILD-SNAPSHOT</version>
</dependency>
</dependencies>
<configuration>
Expand Down Expand Up @@ -206,7 +205,7 @@
<transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
<resource>META-INF/spring.schemas</resource>
</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">
<mainClass>${start-class}</mainClass>
</transformer>
Expand All @@ -218,4 +217,4 @@
</plugins>
</pluginManagement>
</build>
</project>
</project>

0 comments on commit aa08399

Please sign in to comment.