Skip to content

Commit 05ed7b3

Browse files
spring-buildsspring-builds
committed
Next development version
1 parent 5a4ac12 commit 05ed7b3

File tree

91 files changed

+165
-176
lines changed

Some content is hidden

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

91 files changed

+165
-176
lines changed

‎pom.xml‎

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
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"
3-
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" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
43
<modelVersion>4.0.0</modelVersion>
54
<groupId>org.springframework.boot</groupId>
65
<artifactId>spring-boot-build</artifactId>
7-
<version>1.1.0.BUILD-SNAPSHOT</version>
6+
<version>1.1.1.BUILD-SNAPSHOT</version>
87
<packaging>pom</packaging>
98
<name>Spring Boot Build</name>
109
<description>Spring Boot Build</description>
@@ -153,20 +152,20 @@
153152
<inherited>false</inherited>
154153
<configuration>
155154
<target>
156-
<taskdef resource="net/sf/antcontrib/antcontrib.properties"/>
157-
<taskdef name="stringutil" classname="ise.antelope.tasks.StringUtilTask"/>
158-
<var name="version-type" value="${project.version}"/>
159-
<propertyregex property="version-type" override="true" input="${version-type}" regexp=".*\.(.*)" replace="\1"/>
160-
<propertyregex property="version-type" override="true" input="${version-type}" regexp="(M)\d+" replace="MILESTONE"/>
161-
<propertyregex property="version-type" override="true" input="${version-type}" regexp="(RC)\d+" replace="MILESTONE"/>
162-
<propertyregex property="version-type" override="true" input="${version-type}" regexp="BUILD-(.*)" replace="SNAPSHOT"/>
155+
<taskdef resource="net/sf/antcontrib/antcontrib.properties" />
156+
<taskdef name="stringutil" classname="ise.antelope.tasks.StringUtilTask" />
157+
<var name="version-type" value="${project.version}" />
158+
<propertyregex property="version-type" override="true" input="${version-type}" regexp=".*\.(.*)" replace="\1" />
159+
<propertyregex property="version-type" override="true" input="${version-type}" regexp="(M)\d+" replace="MILESTONE" />
160+
<propertyregex property="version-type" override="true" input="${version-type}" regexp="(RC)\d+" replace="MILESTONE" />
161+
<propertyregex property="version-type" override="true" input="${version-type}" regexp="BUILD-(.*)" replace="SNAPSHOT" />
163162
<stringutil string="${version-type}" property="profile">
164-
<lowercase/>
163+
<lowercase />
165164
</stringutil>
166-
<echo message="Writing settings for ${profile} profile"/>
165+
<echo message="Writing settings for ${profile} profile" />
167166
<copy file=".settings-template.xml" tofile="settings.xml" overwrite="true">
168167
<filterset>
169-
<filter token="profile" value="${profile}"/>
168+
<filter token="profile" value="${profile}" />
170169
</filterset>
171170
</copy>
172171
</target>
@@ -181,7 +180,7 @@
181180
<inherited>false</inherited>
182181
<configuration>
183182
<target>
184-
<property name="sourceFile" value="spring-boot-dependencies/pom.xml"/>
183+
<property name="sourceFile" value="spring-boot-dependencies/pom.xml" />
185184
<xslt in="${sourceFile}" out="${sourceFile}.new" force="true">
186185
<style>
187186
<string><![CDATA[
@@ -204,9 +203,9 @@
204203
</string>
205204
</style>
206205
</xslt>
207-
<move file="${sourceFile}" tofile="${sourceFile}.old"/>
208-
<move file="${sourceFile}.new" tofile="${sourceFile}"/>
209-
<delete file="${sourceFile}.old"/>
206+
<move file="${sourceFile}" tofile="${sourceFile}.old" />
207+
<move file="${sourceFile}.new" tofile="${sourceFile}" />
208+
<delete file="${sourceFile}.old" />
210209
</target>
211210
</configuration>
212211
</execution>
@@ -248,7 +247,7 @@
248247
<include>${basedir}/spring-boot-samples/**/build.xml</include>
249248
</includes>
250249
<token>spring-boot\.version\"\s.*+</token>
251-
<value>spring-boot.version" value="${project.version}" /></value>
250+
<value>spring-boot.version" value="${project.version}" /&gt;</value>
252251
</configuration>
253252
</execution>
254253
</executions>

‎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.1.0.BUILD-SNAPSHOT</version>
7+
<version>1.1.1.BUILD-SNAPSHOT</version>
88
<relativePath>../spring-boot-parent</relativePath>
99
</parent>
1010
<artifactId>spring-boot-actuator</artifactId>

‎spring-boot-autoconfigure/pom.xml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +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"
3-
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" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
43
<modelVersion>4.0.0</modelVersion>
54
<parent>
65
<groupId>org.springframework.boot</groupId>
76
<artifactId>spring-boot-parent</artifactId>
8-
<version>1.1.0.BUILD-SNAPSHOT</version>
7+
<version>1.1.1.BUILD-SNAPSHOT</version>
98
<relativePath>../spring-boot-parent</relativePath>
109
</parent>
1110
<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.1.0.BUILD-SNAPSHOT</version>
7+
<version>1.1.1.BUILD-SNAPSHOT</version>
88
<relativePath>../spring-boot-parent</relativePath>
99
</parent>
1010
<artifactId>spring-boot-cli</artifactId>

‎spring-boot-dependencies/pom.xml‎

Lines changed: 44 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1-
<?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">
1+
<?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">
23
<modelVersion>4.0.0</modelVersion>
34
<groupId>org.springframework.boot</groupId>
45
<artifactId>spring-boot-dependencies</artifactId>
5-
<version>1.1.0.BUILD-SNAPSHOT</version>
6+
<version>1.1.1.BUILD-SNAPSHOT</version>
67
<packaging>pom</packaging>
78
<name>Spring Boot Dependencies</name>
89
<description>Spring Boot Dependencies</description>
@@ -128,43 +129,43 @@
128129
<dependency>
129130
<groupId>org.springframework.boot</groupId>
130131
<artifactId>spring-boot</artifactId>
131-
<version>1.1.0.BUILD-SNAPSHOT</version>
132+
<version>1.1.1.BUILD-SNAPSHOT</version>
132133
</dependency>
133134
<dependency>
134135
<groupId>org.springframework.boot</groupId>
135136
<artifactId>spring-boot</artifactId>
136137
<type>test-jar</type>
137-
<version>1.1.0.BUILD-SNAPSHOT</version>
138+
<version>1.1.1.BUILD-SNAPSHOT</version>
138139
</dependency>
139140
<dependency>
140141
<groupId>org.springframework.boot</groupId>
141142
<artifactId>spring-boot-actuator</artifactId>
142-
<version>1.1.0.BUILD-SNAPSHOT</version>
143+
<version>1.1.1.BUILD-SNAPSHOT</version>
143144
</dependency>
144145
<dependency>
145146
<groupId>org.springframework.boot</groupId>
146147
<artifactId>spring-boot-autoconfigure</artifactId>
147-
<version>1.1.0.BUILD-SNAPSHOT</version>
148+
<version>1.1.1.BUILD-SNAPSHOT</version>
148149
</dependency>
149150
<dependency>
150151
<groupId>org.springframework.boot</groupId>
151152
<artifactId>spring-boot-dependency-tools</artifactId>
152-
<version>1.1.0.BUILD-SNAPSHOT</version>
153+
<version>1.1.1.BUILD-SNAPSHOT</version>
153154
</dependency>
154155
<dependency>
155156
<groupId>org.springframework.boot</groupId>
156157
<artifactId>spring-boot-loader</artifactId>
157-
<version>1.1.0.BUILD-SNAPSHOT</version>
158+
<version>1.1.1.BUILD-SNAPSHOT</version>
158159
</dependency>
159160
<dependency>
160161
<groupId>org.springframework.boot</groupId>
161162
<artifactId>spring-boot-loader-tools</artifactId>
162-
<version>1.1.0.BUILD-SNAPSHOT</version>
163+
<version>1.1.1.BUILD-SNAPSHOT</version>
163164
</dependency>
164165
<dependency>
165166
<groupId>org.springframework.boot</groupId>
166167
<artifactId>spring-boot-starter</artifactId>
167-
<version>1.1.0.BUILD-SNAPSHOT</version>
168+
<version>1.1.1.BUILD-SNAPSHOT</version>
168169
<exclusions>
169170
<exclusion>
170171
<groupId>commons-logging</groupId>
@@ -175,132 +176,132 @@
175176
<dependency>
176177
<groupId>org.springframework.boot</groupId>
177178
<artifactId>spring-boot-starter-actuator</artifactId>
178-
<version>1.1.0.BUILD-SNAPSHOT</version>
179+
<version>1.1.1.BUILD-SNAPSHOT</version>
179180
</dependency>
180181
<dependency>
181182
<groupId>org.springframework.boot</groupId>
182183
<artifactId>spring-boot-starter-amqp</artifactId>
183-
<version>1.1.0.BUILD-SNAPSHOT</version>
184+
<version>1.1.1.BUILD-SNAPSHOT</version>
184185
</dependency>
185186
<dependency>
186187
<groupId>org.springframework.boot</groupId>
187188
<artifactId>spring-boot-starter-aop</artifactId>
188-
<version>1.1.0.BUILD-SNAPSHOT</version>
189+
<version>1.1.1.BUILD-SNAPSHOT</version>
189190
</dependency>
190191
<dependency>
191192
<groupId>org.springframework.boot</groupId>
192193
<artifactId>spring-boot-starter-batch</artifactId>
193-
<version>1.1.0.BUILD-SNAPSHOT</version>
194+
<version>1.1.1.BUILD-SNAPSHOT</version>
194195
</dependency>
195196
<dependency>
196197
<groupId>org.springframework.boot</groupId>
197198
<artifactId>spring-boot-starter-data-elasticsearch</artifactId>
198-
<version>1.1.0.BUILD-SNAPSHOT</version>
199+
<version>1.1.1.BUILD-SNAPSHOT</version>
199200
</dependency>
200201
<dependency>
201202
<groupId>org.springframework.boot</groupId>
202203
<artifactId>spring-boot-starter-data-gemfire</artifactId>
203-
<version>1.1.0.BUILD-SNAPSHOT</version>
204+
<version>1.1.1.BUILD-SNAPSHOT</version>
204205
</dependency>
205206
<dependency>
206207
<groupId>org.springframework.boot</groupId>
207208
<artifactId>spring-boot-starter-data-jpa</artifactId>
208-
<version>1.1.0.BUILD-SNAPSHOT</version>
209+
<version>1.1.1.BUILD-SNAPSHOT</version>
209210
</dependency>
210211
<dependency>
211212
<groupId>org.springframework.boot</groupId>
212213
<artifactId>spring-boot-starter-data-mongodb</artifactId>
213-
<version>1.1.0.BUILD-SNAPSHOT</version>
214+
<version>1.1.1.BUILD-SNAPSHOT</version>
214215
</dependency>
215216
<dependency>
216217
<groupId>org.springframework.boot</groupId>
217218
<artifactId>spring-boot-starter-data-rest</artifactId>
218-
<version>1.1.0.BUILD-SNAPSHOT</version>
219+
<version>1.1.1.BUILD-SNAPSHOT</version>
219220
</dependency>
220221
<dependency>
221222
<groupId>org.springframework.boot</groupId>
222223
<artifactId>spring-boot-starter-data-solr</artifactId>
223-
<version>1.1.0.BUILD-SNAPSHOT</version>
224+
<version>1.1.1.BUILD-SNAPSHOT</version>
224225
</dependency>
225226
<dependency>
226227
<groupId>org.springframework.boot</groupId>
227228
<artifactId>spring-boot-starter-freemarker</artifactId>
228-
<version>1.1.0.BUILD-SNAPSHOT</version>
229+
<version>1.1.1.BUILD-SNAPSHOT</version>
229230
</dependency>
230231
<dependency>
231232
<groupId>org.springframework.boot</groupId>
232233
<artifactId>spring-boot-starter-groovy-templates</artifactId>
233-
<version>1.1.0.BUILD-SNAPSHOT</version>
234+
<version>1.1.1.BUILD-SNAPSHOT</version>
234235
</dependency>
235236
<dependency>
236237
<groupId>org.springframework.boot</groupId>
237238
<artifactId>spring-boot-starter-hornetq</artifactId>
238-
<version>1.1.0.BUILD-SNAPSHOT</version>
239+
<version>1.1.1.BUILD-SNAPSHOT</version>
239240
</dependency>
240241
<dependency>
241242
<groupId>org.springframework.boot</groupId>
242243
<artifactId>spring-boot-starter-integration</artifactId>
243-
<version>1.1.0.BUILD-SNAPSHOT</version>
244+
<version>1.1.1.BUILD-SNAPSHOT</version>
244245
</dependency>
245246
<dependency>
246247
<groupId>org.springframework.boot</groupId>
247248
<artifactId>spring-boot-starter-jdbc</artifactId>
248-
<version>1.1.0.BUILD-SNAPSHOT</version>
249+
<version>1.1.1.BUILD-SNAPSHOT</version>
249250
</dependency>
250251
<dependency>
251252
<groupId>org.springframework.boot</groupId>
252253
<artifactId>spring-boot-starter-jetty</artifactId>
253-
<version>1.1.0.BUILD-SNAPSHOT</version>
254+
<version>1.1.1.BUILD-SNAPSHOT</version>
254255
</dependency>
255256
<dependency>
256257
<groupId>org.springframework.boot</groupId>
257258
<artifactId>spring-boot-starter-log4j</artifactId>
258-
<version>1.1.0.BUILD-SNAPSHOT</version>
259+
<version>1.1.1.BUILD-SNAPSHOT</version>
259260
</dependency>
260261
<dependency>
261262
<groupId>org.springframework.boot</groupId>
262263
<artifactId>spring-boot-starter-logging</artifactId>
263-
<version>1.1.0.BUILD-SNAPSHOT</version>
264+
<version>1.1.1.BUILD-SNAPSHOT</version>
264265
</dependency>
265266
<dependency>
266267
<groupId>org.springframework.boot</groupId>
267268
<artifactId>spring-boot-starter-mobile</artifactId>
268-
<version>1.1.0.BUILD-SNAPSHOT</version>
269+
<version>1.1.1.BUILD-SNAPSHOT</version>
269270
</dependency>
270271
<dependency>
271272
<groupId>org.springframework.boot</groupId>
272273
<artifactId>spring-boot-starter-redis</artifactId>
273-
<version>1.1.0.BUILD-SNAPSHOT</version>
274+
<version>1.1.1.BUILD-SNAPSHOT</version>
274275
</dependency>
275276
<dependency>
276277
<groupId>org.springframework.boot</groupId>
277278
<artifactId>spring-boot-starter-remote-shell</artifactId>
278-
<version>1.1.0.BUILD-SNAPSHOT</version>
279+
<version>1.1.1.BUILD-SNAPSHOT</version>
279280
</dependency>
280281
<dependency>
281282
<groupId>org.springframework.boot</groupId>
282283
<artifactId>spring-boot-starter-security</artifactId>
283-
<version>1.1.0.BUILD-SNAPSHOT</version>
284+
<version>1.1.1.BUILD-SNAPSHOT</version>
284285
</dependency>
285286
<dependency>
286287
<groupId>org.springframework.boot</groupId>
287288
<artifactId>spring-boot-starter-social-facebook</artifactId>
288-
<version>1.1.0.BUILD-SNAPSHOT</version>
289+
<version>1.1.1.BUILD-SNAPSHOT</version>
289290
</dependency>
290291
<dependency>
291292
<groupId>org.springframework.boot</groupId>
292293
<artifactId>spring-boot-starter-social-linkedin</artifactId>
293-
<version>1.1.0.BUILD-SNAPSHOT</version>
294+
<version>1.1.1.BUILD-SNAPSHOT</version>
294295
</dependency>
295296
<dependency>
296297
<groupId>org.springframework.boot</groupId>
297298
<artifactId>spring-boot-starter-social-twitter</artifactId>
298-
<version>1.1.0.BUILD-SNAPSHOT</version>
299+
<version>1.1.1.BUILD-SNAPSHOT</version>
299300
</dependency>
300301
<dependency>
301302
<groupId>org.springframework.boot</groupId>
302303
<artifactId>spring-boot-starter-test</artifactId>
303-
<version>1.1.0.BUILD-SNAPSHOT</version>
304+
<version>1.1.1.BUILD-SNAPSHOT</version>
304305
<exclusions>
305306
<exclusion>
306307
<groupId>commons-logging</groupId>
@@ -311,32 +312,32 @@
311312
<dependency>
312313
<groupId>org.springframework.boot</groupId>
313314
<artifactId>spring-boot-starter-thymeleaf</artifactId>
314-
<version>1.1.0.BUILD-SNAPSHOT</version>
315+
<version>1.1.1.BUILD-SNAPSHOT</version>
315316
</dependency>
316317
<dependency>
317318
<groupId>org.springframework.boot</groupId>
318319
<artifactId>spring-boot-starter-tomcat</artifactId>
319-
<version>1.1.0.BUILD-SNAPSHOT</version>
320+
<version>1.1.1.BUILD-SNAPSHOT</version>
320321
</dependency>
321322
<dependency>
322323
<groupId>org.springframework.boot</groupId>
323324
<artifactId>spring-boot-starter-velocity</artifactId>
324-
<version>1.1.0.BUILD-SNAPSHOT</version>
325+
<version>1.1.1.BUILD-SNAPSHOT</version>
325326
</dependency>
326327
<dependency>
327328
<groupId>org.springframework.boot</groupId>
328329
<artifactId>spring-boot-starter-web</artifactId>
329-
<version>1.1.0.BUILD-SNAPSHOT</version>
330+
<version>1.1.1.BUILD-SNAPSHOT</version>
330331
</dependency>
331332
<dependency>
332333
<groupId>org.springframework.boot</groupId>
333334
<artifactId>spring-boot-starter-websocket</artifactId>
334-
<version>1.1.0.BUILD-SNAPSHOT</version>
335+
<version>1.1.1.BUILD-SNAPSHOT</version>
335336
</dependency>
336337
<dependency>
337338
<groupId>org.springframework.boot</groupId>
338339
<artifactId>spring-boot-starter-ws</artifactId>
339-
<version>1.1.0.BUILD-SNAPSHOT</version>
340+
<version>1.1.1.BUILD-SNAPSHOT</version>
340341
</dependency>
341342

342343
<!-- Third Party -->
@@ -1283,4 +1284,4 @@
12831284
</plugins>
12841285
</pluginManagement>
12851286
</build>
1286-
</project>
1287+
</project>

‎spring-boot-docs/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.1.0.BUILD-SNAPSHOT</version>
7+
<version>1.1.1.BUILD-SNAPSHOT</version>
88
<relativePath>../spring-boot-parent</relativePath>
99
</parent>
1010
<artifactId>spring-boot-docs</artifactId>

‎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.1.0.BUILD-SNAPSHOT</version>
6+
<version>1.1.1.BUILD-SNAPSHOT</version>
77
<packaging>pom</packaging>
88
<name>Spring Boot Full Build</name>
99
<description>Spring Boot Full Build</description>

0 commit comments

Comments
 (0)