From b1f596cc941e5e8c98ed240c7f635929a54fcd56 Mon Sep 17 00:00:00 2001
From: Mahmoud Ben Hassine <mbenhassine@vmware.com>
Date: Tue, 15 Dec 2020 20:47:31 +0100
Subject: [PATCH] Re-organize dependencies

---
 pom.xml                   | 10 ++++++++--
 spring-batch-docs/pom.xml | 11 ++++++-----
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/pom.xml b/pom.xml
index aa7402337..9e4441f64 100644
--- a/pom.xml
+++ b/pom.xml
@@ -107,12 +107,15 @@
 		<jettison.version>1.2</jettison.version>
 
 		<!-- samples dependencies -->
-		<hibernate-entitymanager.version>5.4.24.Final
-		</hibernate-entitymanager.version>
+		<hibernate-entitymanager.version>5.4.24.Final</hibernate-entitymanager.version>
 		<spring-rabbit.version>2.3.1</spring-rabbit.version>
 		<quartz.version>2.3.2</quartz.version>
 		<prometheus_pushgateway.version>0.9.0</prometheus_pushgateway.version>
 		<groovy.version>2.5.13</groovy.version>
+		
+		<!-- documentation dependencies -->
+		<spring-doc-resources.version>0.2.5</spring-doc-resources.version>
+		<asciidoctorj-pdf.version>1.5.3</asciidoctorj-pdf.version>
 
 		<!-- plugin versions -->
 		<maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
@@ -124,6 +127,9 @@
 		<flatten-maven-plugin.version>1.2.5</flatten-maven-plugin.version>
 		<maven-gpg-plugin.version>1.6</maven-gpg-plugin.version>
 		<maven-deploy-plugin.version>2.7</maven-deploy-plugin.version>
+		<asciidoctor-maven-plugin.version>2.1.0</asciidoctor-maven-plugin.version>
+		<maven-assembly-plugin.version>3.3.0</maven-assembly-plugin.version>
+		<maven-dependency-plugin.version>3.1.2</maven-dependency-plugin.version>
 	</properties>
 
 	<build>
diff --git a/spring-batch-docs/pom.xml b/spring-batch-docs/pom.xml
index d16d20dce..6c34d2266 100644
--- a/spring-batch-docs/pom.xml
+++ b/spring-batch-docs/pom.xml
@@ -14,7 +14,7 @@
         <dependency>
             <groupId>io.spring.docresources</groupId>
             <artifactId>spring-doc-resources</artifactId>
-            <version>0.2.5</version>
+            <version>${spring-doc-resources.version}</version>
             <type>zip</type>
         </dependency>
     </dependencies>
@@ -24,6 +24,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-dependency-plugin</artifactId>
+                <version>${maven-dependency-plugin.version}</version>
                 <executions>
                     <execution>
                         <id>unpack-resources</id>
@@ -44,12 +45,12 @@
             <plugin>
                 <groupId>org.asciidoctor</groupId>
                 <artifactId>asciidoctor-maven-plugin</artifactId>
-                <version>2.1.0</version>
+                <version>${asciidoctor-maven-plugin.version}</version>
                 <dependencies>
                     <dependency>
                         <groupId>org.asciidoctor</groupId>
                         <artifactId>asciidoctorj-pdf</artifactId>
-                        <version>1.5.3</version>
+                        <version>${asciidoctorj-pdf.version}</version>
                     </dependency>
                 </dependencies>
                 <configuration>
@@ -66,7 +67,6 @@
                         <configuration>
                             <backend>html5</backend>
                             <doctype>book</doctype>
-                            <sourceHighlighter>highlight.js</sourceHighlighter>
                             <attributes>
                                 <docinfo>shared</docinfo>
                                 <stylesdir>css/</stylesdir>
@@ -74,6 +74,7 @@
                                 <linkcss>true</linkcss>
                                 <icons>font</icons>
                                 <sectanchors/>
+                                <source-highlighter>highlight.js</source-highlighter>
                                 <highlightjsdir>js/highlight</highlightjsdir>
                                 <highlightjs-theme>github</highlightjs-theme>
                                 <idprefix/>
@@ -110,7 +111,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-assembly-plugin</artifactId>
-                <version>3.3.0</version>
+                <version>${maven-assembly-plugin.version}</version>
                 <configuration>
                     <descriptors>
                         <descriptor>src/assembly/docs.xml</descriptor>