Skip to content

Commit 4992dbc

Browse files
committed
#1196 - Prepare 2.4 GA (2020.0.0).
1 parent c2834b7 commit 4992dbc

File tree

1 file changed

+8
-14
lines changed

1 file changed

+8
-14
lines changed

parent/pom.xml

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
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 https://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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
43

54
<!--
65
@@ -135,7 +134,7 @@
135134
<javax-annotation-api>1.3.2</javax-annotation-api>
136135

137136
<!-- Used in asciidoc reference documentation -->
138-
<releasetrain>2020.0.0-SNAPSHOT</releasetrain>
137+
<releasetrain>2020.0.0</releasetrain>
139138

140139
<!-- To be overridden by individual modules -->
141140
<java-module-name/>
@@ -179,8 +178,7 @@
179178

180179
<module name="io.spring.nohttp.checkstyle.check.NoHttpCheck">
181180
<!-- XML requires double escaping, config gets XML-processed twice -->
182-
<property name="allowlist"
183-
value="http://www\.querydsl\.com.*&amp;#10;http://www\.prowaveconsulting\.com.*&amp;#10;http://www\.scispike\.com.*&amp;#10;http://.*.icu-project\.org.*"/>
181+
<property name="allowlist" value="http://www\.querydsl\.com.*&amp;#10;http://www\.prowaveconsulting\.com.*&amp;#10;http://www\.scispike\.com.*&amp;#10;http://.*.icu-project\.org.*"/>
184182
</module>
185183
</module>
186184
</checkstyleRules>
@@ -338,7 +336,7 @@
338336
<dependency>
339337
<groupId>org.springframework.data.build</groupId>
340338
<artifactId>spring-data-build-resources</artifactId>
341-
<version>2.4.0-SNAPSHOT</version>
339+
<version>2.4.0</version>
342340
<type>zip</type>
343341
<optional>true</optional>
344342
</dependency>
@@ -438,8 +436,7 @@
438436
<copy failonerror="false" todir="${generated-asciidoc-sources.directory}/">
439437
<fileset dir="${project.root}/src/main/asciidoc" includes="**/*.adoc"/>
440438
</copy>
441-
<copy failonerror="false"
442-
todir="${generated-asciidoc-sources.directory}/images/">
439+
<copy failonerror="false" todir="${generated-asciidoc-sources.directory}/images/">
443440
<fileset dir="${project.root}/src/main/asciidoc/images"/>
444441
</copy>
445442

@@ -463,8 +460,7 @@
463460
<target>
464461

465462
<!-- Copy files for the single-file HTML version -->
466-
<copy failonerror="false"
467-
todir="${project.root}/target/site/reference/html/images">
463+
<copy failonerror="false" todir="${project.root}/target/site/reference/html/images">
468464
<fileset dir="${generated-docs.directory}/images"/>
469465
</copy>
470466

@@ -488,12 +484,10 @@
488484
</copy>
489485

490486
<!-- Copy and rename the Epub file -->
491-
<copy failonerror="false" file="${generated-docs.directory}/index.pdf"
492-
tofile="${project.root}/target/site/reference/pdf/${dist.id}-reference.pdf"/>
487+
<copy failonerror="false" file="${generated-docs.directory}/index.pdf" tofile="${project.root}/target/site/reference/pdf/${dist.id}-reference.pdf"/>
493488

494489
<!-- Copy and rename the PDF file -->
495-
<copy failonerror="false" file="${generated-docs.directory}/index.epub"
496-
tofile="${project.root}/target/site/reference/epub/${dist.id}-reference.epub"/>
490+
<copy failonerror="false" file="${generated-docs.directory}/index.epub" tofile="${project.root}/target/site/reference/epub/${dist.id}-reference.epub"/>
497491

498492
</target>
499493
</configuration>

0 commit comments

Comments
 (0)