Merge branch 'master' of https://github.com/eugenp/tutorials into task/BAEL-20665

# Conflicts:
#	core-java-modules/core-java-jndi/pom.xml

maven-all/compiler-plugin-java-9/pom.xml

@@ -12,13 +12,19 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.8.0</version>
+                <version>${compiler.plugin.version}</version>
                 <configuration>
-                    <source>9</source>
-                    <target>9</target>
+                    <source>${source.version}</source>
+                    <target>${target.version}</target>
                 </configuration>
             </plugin>
         </plugins>
     </build>
 
+    <properties>
+        <compiler.plugin.version>3.8.0</compiler.plugin.version>
+        <source.version>9</source.version>
+        <target.version>9</target.version>
+	</properties>
+
 </project>

maven-all/maven-custom-plugin/usage-example/pom.xml

@@ -8,16 +8,21 @@
     <version>0.0.1-SNAPSHOT</version>
     <packaging>pom</packaging>
 
+    <properties>
+        <commons.lang3.version>3.9</commons.lang3.version>
+        <junit.version>4.12</junit.version>
+	</properties>
+
     <dependencies>
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
-            <version>3.9</version>
+            <version>${commons.lang3.version}</version>
         </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.12</version>
+            <version>${junit.version}</version>
             <scope>test</scope>
         </dependency>
     </dependencies>

maven-all/maven-war-plugin/pom.xml

@@ -14,7 +14,7 @@
             <plugin>
                 <artifactId>maven-war-plugin</artifactId>
                 <!-- Update maven war plugin to 3.1.0 or higher -->
-                <version>3.1.0</version>
+                <version>${war.plugin.version}</version>
                 <configuration>
                     <!-- Set failOnMissingWebXml configuration for maven war plugin -->
                     <failOnMissingWebXml>false</failOnMissingWebXml>
@@ -26,6 +26,7 @@
     <!-- Set failOnMissingWebXml as false in properties section -->
     <properties>
         <failOnMissingWebXml>false</failOnMissingWebXml>
+        <war.plugin.version>3.1.0</war.plugin.version>
     </properties>
 
 </project>

maven-all/versions-maven-plugin/pom.xml

@@ -12,19 +12,19 @@
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
-            <version>2.3</version>
+            <version>${commons.io.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-collections4</artifactId>
-            <version>4.0</version>
+            <version>${commons.collections4.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
-            <version>3.0</version>
+            <version>${commons.lang3.version}</version>
         </dependency>
 
         <dependency>
@@ -36,7 +36,7 @@
         <dependency>
             <groupId>commons-beanutils</groupId>
             <artifactId>commons-beanutils</artifactId>
-            <version>1.9.1</version>
+            <version>${commons.beanutils.version}</version>
         </dependency>
     </dependencies>
 
@@ -45,7 +45,7 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>versions-maven-plugin</artifactId>
-                <version>2.7</version>
+                <version>${versions.plugin.version}</version>
                 <configuration>
                     <excludes>
                         <exclude>org.apache.commons:commons-collections4</exclude>
@@ -71,6 +71,11 @@
 
     <properties>
         <commons-compress-version>1.15</commons-compress-version>
+        <commons.io.version>2.3</commons.io.version>
+        <versions.plugin.version>2.7</versions.plugin.version>
+        <commons.beanutils.version>1.9.1</commons.beanutils.version>
+        <commons.lang3.version>3.0</commons.lang3.version>
+        <commons.collections4.version>4.0</commons.collections4.version>
     </properties>
 
 </project>