Skip to content

Commit 6f9bb23

Browse files
author
Phillip Webb
committed
Revert "Next development version"
This reverts commit b67bb70.
1 parent b67bb70 commit 6f9bb23

File tree

68 files changed

+119
-105
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

68 files changed

+119
-105
lines changed

‎pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<modelVersion>4.0.0</modelVersion>
44
<groupId>org.springframework.boot</groupId>
55
<artifactId>spring-boot-build</artifactId>
6-
<version>1.0.1.BUILD-SNAPSHOT</version>
6+
<version>1.0.0.BUILD-SNAPSHOT</version>
77
<packaging>pom</packaging>
88
<prerequisites>
99
<maven>3.0.0</maven>

‎spring-boot-actuator/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>org.springframework.boot</groupId>
66
<artifactId>spring-boot-parent</artifactId>
7-
<version>1.0.1.BUILD-SNAPSHOT</version>
7+
<version>1.0.0.BUILD-SNAPSHOT</version>
88
<relativePath>../spring-boot-parent</relativePath>
99
</parent>
1010
<artifactId>spring-boot-actuator</artifactId>

‎spring-boot-autoconfigure/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>org.springframework.boot</groupId>
66
<artifactId>spring-boot-parent</artifactId>
7-
<version>1.0.1.BUILD-SNAPSHOT</version>
7+
<version>1.0.0.BUILD-SNAPSHOT</version>
88
<relativePath>../spring-boot-parent</relativePath>
99
</parent>
1010
<artifactId>spring-boot-autoconfigure</artifactId>

‎spring-boot-cli/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>org.springframework.boot</groupId>
66
<artifactId>spring-boot-parent</artifactId>
7-
<version>1.0.1.BUILD-SNAPSHOT</version>
7+
<version>1.0.0.BUILD-SNAPSHOT</version>
88
<relativePath>../spring-boot-parent</relativePath>
99
</parent>
1010
<artifactId>spring-boot-cli</artifactId>

‎spring-boot-dependencies/pom.xml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<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">
2+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
34
<modelVersion>4.0.0</modelVersion>
45
<groupId>org.springframework.boot</groupId>
56
<artifactId>spring-boot-dependencies</artifactId>
6-
<version>1.0.1.BUILD-SNAPSHOT</version>
7+
<version>1.0.0.BUILD-SNAPSHOT</version>
78
<packaging>pom</packaging>
89
<properties>
910
<activemq.version>5.7.0</activemq.version>

‎spring-boot-docs/pom.xml

Lines changed: 22 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<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">
2+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
34
<modelVersion>4.0.0</modelVersion>
45
<parent>
56
<groupId>org.springframework.boot</groupId>
67
<artifactId>spring-boot-parent</artifactId>
7-
<version>1.0.1.BUILD-SNAPSHOT</version>
8+
<version>1.0.0.BUILD-SNAPSHOT</version>
89
<relativePath>../spring-boot-parent</relativePath>
910
</parent>
1011
<artifactId>spring-boot-docs</artifactId>
@@ -191,7 +192,8 @@
191192
<include name="**/*.pdf" />
192193
</fileset>
193194
</copy>
194-
<move file="${basedir}/target/contents/reference/pdf/index.pdf" tofile="${basedir}/target/contents/reference/pdf/spring-boot-reference.pdf" />
195+
<move file="${basedir}/target/contents/reference/pdf/index.pdf"
196+
tofile="${basedir}/target/contents/reference/pdf/spring-boot-reference.pdf" />
195197
</postProcess>
196198
</configuration>
197199
</execution>
@@ -210,7 +212,8 @@
210212
<include name="**/*.epub" />
211213
</fileset>
212214
</copy>
213-
<move file="${basedir}/target/contents/reference/epub/index.epub" tofile="${basedir}/target/contents/reference/epub/spring-boot-reference.epub" />
215+
<move file="${basedir}/target/contents/reference/epub/index.epub"
216+
tofile="${basedir}/target/contents/reference/epub/spring-boot-reference.epub" />
214217
</postProcess>
215218
</configuration>
216219
</execution>
@@ -251,8 +254,11 @@
251254
</goals>
252255
<configuration>
253256
<target>
254-
<zip destfile="${project.build.directory}/${project.name}-${project.version}.zip">
255-
<zipfileset src="${project.build.directory}/${project.name}-${project.version}-javadoc.jar" prefix="api" />
257+
<zip
258+
destfile="${project.build.directory}/${project.name}-${project.version}.zip">
259+
<zipfileset
260+
src="${project.build.directory}/${project.name}-${project.version}-javadoc.jar"
261+
prefix="api" />
256262
<fileset dir="${project.build.directory}/contents" />
257263
</zip>
258264
</target>
@@ -270,15 +276,20 @@
270276
<taskdef resource="net/sf/antcontrib/antcontrib.properties" />
271277
<taskdef name="stringutil" classname="ise.antelope.tasks.StringUtilTask" />
272278
<var name="version-type" value="${project.version}" />
273-
<propertyregex property="version-type" override="true" input="${version-type}" regexp=".*\.(.*)" replace="\1" />
274-
<propertyregex property="version-type" override="true" input="${version-type}" regexp="(M)\d+" replace="MILESTONE" />
275-
<propertyregex property="version-type" override="true" input="${version-type}" regexp="(RC)\d+" replace="MILESTONE" />
276-
<propertyregex property="version-type" override="true" input="${version-type}" regexp="BUILD-(.*)" replace="SNAPSHOT" />
279+
<propertyregex property="version-type" override="true"
280+
input="${version-type}" regexp=".*\.(.*)" replace="\1" />
281+
<propertyregex property="version-type" override="true"
282+
input="${version-type}" regexp="(M)\d+" replace="MILESTONE" />
283+
<propertyregex property="version-type" override="true"
284+
input="${version-type}" regexp="(RC)\d+" replace="MILESTONE" />
285+
<propertyregex property="version-type" override="true"
286+
input="${version-type}" regexp="BUILD-(.*)" replace="SNAPSHOT" />
277287
<stringutil string="${version-type}" property="spring-boot-repo">
278288
<lowercase />
279289
</stringutil>
280290
<var name="github-tag" value="v${project.version}" />
281-
<propertyregex property="github-tag" override="true" input="${github-tag}" regexp=".*SNAPSHOT" replace="master" />
291+
<propertyregex property="github-tag" override="true"
292+
input="${github-tag}" regexp=".*SNAPSHOT" replace="master" />
282293
</target>
283294
</configuration>
284295
</execution>

‎spring-boot-full-build/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<modelVersion>4.0.0</modelVersion>
44
<groupId>org.springframework.boot</groupId>
55
<artifactId>spring-boot-full-build</artifactId>
6-
<version>1.0.1.BUILD-SNAPSHOT</version>
6+
<version>1.0.0.BUILD-SNAPSHOT</version>
77
<packaging>pom</packaging>
88
<modules>
99
<module>../</module>

‎spring-boot-integration-tests/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>org.springframework.boot</groupId>
66
<artifactId>spring-boot-parent</artifactId>
7-
<version>1.0.1.BUILD-SNAPSHOT</version>
7+
<version>1.0.0.BUILD-SNAPSHOT</version>
88
<relativePath>../spring-boot-parent</relativePath>
99
</parent>
1010
<artifactId>spring-boot-integration-tests</artifactId>

‎spring-boot-parent/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>org.springframework.boot</groupId>
66
<artifactId>spring-boot-dependencies</artifactId>
7-
<version>1.0.1.BUILD-SNAPSHOT</version>
7+
<version>1.0.0.BUILD-SNAPSHOT</version>
88
<relativePath>../spring-boot-dependencies</relativePath>
99
</parent>
1010
<artifactId>spring-boot-parent</artifactId>

‎spring-boot-samples/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>org.springframework.boot</groupId>
66
<artifactId>spring-boot-starter-parent</artifactId>
7-
<version>1.0.1.BUILD-SNAPSHOT</version>
7+
<version>1.0.0.BUILD-SNAPSHOT</version>
88
<relativePath>../spring-boot-starters/spring-boot-starter-parent</relativePath>
99
</parent>
1010
<artifactId>spring-boot-samples</artifactId>

0 commit comments

Comments
 (0)