From dffbc5cbfa0ff32ef49f4839e2bfd38fd79f3128 Mon Sep 17 00:00:00 2001
From: DOHA <dohae243@gmail.com>
Date: Tue, 13 Dec 2016 14:22:52 +0200
Subject: [PATCH] upgrade and cleanup

---
 couchbase-sdk/pom.xml       | 21 +++++++++++----------
 dozer/pom.xml               | 20 ++++++++++++++------
 ejb/ejb-client/pom.xml      |  6 ++++++
 ejb/ejb-remote/pom.xml      |  9 +++++++--
 ejb/pom.xml                 | 15 +++++++++++----
 enterprise-patterns/pom.xml |  6 +++++-
 feign/pom.xml               | 33 +++++++++++++++++++++------------
 7 files changed, 75 insertions(+), 35 deletions(-)

diff --git a/couchbase-sdk/pom.xml b/couchbase-sdk/pom.xml
index b7b3d1788f..6462cfb57a 100644
--- a/couchbase-sdk/pom.xml
+++ b/couchbase-sdk/pom.xml
@@ -79,10 +79,10 @@
 		<plugins>
 			<plugin>
 				<artifactId>maven-compiler-plugin</artifactId>
-				<version>2.3.2</version>
+				<version>${maven-compiler-plugin.version}</version>
 				<configuration>
-					<source>1.7</source>
-					<target>1.7</target>
+					<source>${java.version}</source>
+					<target>${java.version}</target>
 				</configuration>
 			</plugin>
 			<plugin>
@@ -100,14 +100,15 @@
 	</build>
 
 	<properties>
-		<java.version>1.7</java.version>
+		<java.version>1.8</java.version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<couchbase.client.version>2.2.6</couchbase.client.version>
-		<spring-framework.version>4.2.4.RELEASE</spring-framework.version>
-		<logback.version>1.1.3</logback.version>
-		<org.slf4j.version>1.7.12</org.slf4j.version>
-		<junit.version>4.11</junit.version>
-		<commons-lang3.version>3.4</commons-lang3.version>
+		<couchbase.client.version>2.3.6</couchbase.client.version>
+		<spring-framework.version>4.3.4.RELEASE</spring-framework.version>
+		<logback.version>1.1.7</logback.version>
+		<org.slf4j.version>1.7.21</org.slf4j.version>
+		<junit.version>4.12</junit.version>
+		<commons-lang3.version>3.5</commons-lang3.version>
+		<maven-compiler-plugin.version>3.6.0</maven-compiler-plugin.version>
         <maven-surefire-plugin.version>2.19.1</maven-surefire-plugin.version>
 	</properties>
 
diff --git a/dozer/pom.xml b/dozer/pom.xml
index 35ac2394a6..363285f619 100644
--- a/dozer/pom.xml
+++ b/dozer/pom.xml
@@ -13,7 +13,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.3</version>
+                <version>${maven-compiler-plugin.version}</version>
                 <configuration>
                     <source>7</source>
                     <target>7</target>
@@ -26,33 +26,41 @@
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
-            <version>1.7.5</version>
+            <version>${slf4j.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>jcl-over-slf4j</artifactId>
-            <version>1.7.5</version>
+            <version>${slf4j.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
-            <version>3.2.1</version>
+            <version>${commons-lang3.version}</version>
         </dependency>
 
         <dependency>
             <groupId>net.sf.dozer</groupId>
             <artifactId>dozer</artifactId>
-            <version>5.5.1</version>
+            <version>${dozer.version}</version>
         </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.3</version>
+            <version>${junit.version}</version>
             <scope>test</scope>
         </dependency>
 
     </dependencies>
     
+    <properties>
+        <slf4j.version>1.7.21</slf4j.version>
+        <commons-lang3.version>3.5</commons-lang3.version>
+        <dozer.version>5.5.1</dozer.version>
+        <junit.version>4.12</junit.version>
+        <maven-compiler-plugin.version>3.6.0</maven-compiler-plugin.version>
+    </properties>
+    
 </project>
diff --git a/ejb/ejb-client/pom.xml b/ejb/ejb-client/pom.xml
index 6ece63572d..84656b40c5 100755
--- a/ejb/ejb-client/pom.xml
+++ b/ejb/ejb-client/pom.xml
@@ -44,4 +44,10 @@
             </plugin>
         </plugins>
     </build>
+    
+    <properties>
+        <junit.version>4.12</junit.version>
+        <maven-surefire-plugin.version>2.19.1</maven-surefire-plugin.version>
+        
+    </properties>
 </project>
\ No newline at end of file
diff --git a/ejb/ejb-remote/pom.xml b/ejb/ejb-remote/pom.xml
index d102edd8e3..601ad69447 100755
--- a/ejb/ejb-remote/pom.xml
+++ b/ejb/ejb-remote/pom.xml
@@ -15,7 +15,7 @@
 		 <dependency>
         <groupId>javax</groupId>
         <artifactId>javaee-api</artifactId>
-        <version>7.0</version>
+        <version>${javaee-api.version}</version>
         <scope>provided</scope>
     </dependency>
 	</dependencies>
@@ -25,7 +25,7 @@
 			<plugin>
 				<groupId>org.wildfly.plugins</groupId>
 				<artifactId>wildfly-maven-plugin</artifactId>
-				<version>1.1.0.Alpha5</version>
+				<version>${wildfly-maven-plugin.version}</version>
 				<configuration>
 					<hostname>127.0.0.1</hostname>
 					<port>9990</port>
@@ -37,4 +37,9 @@
 		</plugins>
 		<!-- <finalName>ejb-remote</finalName> -->
 	</build>
+	
+	<properties>
+        <javaee-api.version>7.0</javaee-api.version>
+        <wildfly-maven-plugin.version>1.1.0.Beta1</wildfly-maven-plugin.version>
+    </properties>
 </project>
\ No newline at end of file
diff --git a/ejb/pom.xml b/ejb/pom.xml
index 8176de7936..7676165b8b 100755
--- a/ejb/pom.xml
+++ b/ejb/pom.xml
@@ -38,14 +38,14 @@
 			<dependency>
 				<groupId>javax</groupId>
 				<artifactId>javaee-api</artifactId>
-				<version>7.0</version>
+				<version>${javaee-api.version}</version>
 				<scope>provided</scope>
 			</dependency>
 
 			<dependency>
 				<groupId>org.wildfly</groupId>
 				<artifactId>wildfly-ejb-client-bom</artifactId>
-				<version>10.1.0.Final</version>
+				<version>${wildfly.version}</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
@@ -57,7 +57,7 @@
 			<plugins>
 				<plugin>
 					<artifactId>maven-compiler-plugin</artifactId>
-					<version>3.1</version>
+					<version>${maven-compiler-plugin.version}</version>
 					<configuration>
 						<source>1.8</source>
 						<target>1.8</target>
@@ -66,7 +66,7 @@
 
 				<plugin>
 					<artifactId>maven-ejb-plugin</artifactId>
-					<version>2.4</version>
+					<version>${maven-ejb-plugin.version}</version>
 					<configuration>
 						<ejbVersion>3.2</ejbVersion>
 					</configuration>
@@ -79,4 +79,11 @@
 		<module>ejb-remote</module>
 		<module>ejb-client</module>
 	</modules>
+	
+	<properties>
+	    <javaee-api.version>7.0</javaee-api.version>
+	    <wildfly.version>10.1.0.Final</wildfly.version>
+        <maven-compiler-plugin.version>3.6.0</maven-compiler-plugin.version>
+        <maven-ejb-plugin.version>2.5.1</maven-ejb-plugin.version>        	   
+	</properties>
 </project>
\ No newline at end of file
diff --git a/enterprise-patterns/pom.xml b/enterprise-patterns/pom.xml
index 036a61c44a..763227e45b 100644
--- a/enterprise-patterns/pom.xml
+++ b/enterprise-patterns/pom.xml
@@ -23,7 +23,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-compiler-plugin</artifactId>
-                    <version>3.5.1</version>
+                    <version>${maven-compiler-plugin.version}</version>
                     <configuration>
                         <source>1.8</source>
                         <target>1.8</target>
@@ -32,4 +32,8 @@
             </plugins>
         </pluginManagement>
     </build>
+    
+    <properties>
+        <maven-compiler-plugin.version>3.6.0</maven-compiler-plugin.version>
+    </properties>
 </project>
diff --git a/feign/pom.xml b/feign/pom.xml
index af61883f1b..721fa76682 100644
--- a/feign/pom.xml
+++ b/feign/pom.xml
@@ -16,54 +16,62 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <feign.version>9.4.0</feign.version>
+        <slf4j.version>1.7.21</slf4j.version>
+        <log4j.version>2.7</log4j.version>
+        <lombok.version>1.16.12</lombok.version>
+        <junit.version>4.12</junit.version>
+        <maven-compiler-plugin.version>3.6.0</maven-compiler-plugin.version>
+        <maven-surefire-plugin.version>2.19.1</maven-surefire-plugin.version>
+        <spring-boot-maven-plugin.version>1.4.2.RELEASE</spring-boot-maven-plugin.version>
     </properties>
 
     <dependencies>
         <dependency>
             <groupId>io.github.openfeign</groupId>
             <artifactId>feign-core</artifactId>
-            <version>9.3.1</version>
+            <version>${feign.version}</version>
         </dependency>
         <dependency>
             <groupId>io.github.openfeign</groupId>
             <artifactId>feign-okhttp</artifactId>
-            <version>9.3.1</version>
+            <version>${feign.version}</version>
         </dependency>
         <dependency>
             <groupId>io.github.openfeign</groupId>
             <artifactId>feign-gson</artifactId>
-            <version>9.3.1</version>
+            <version>${feign.version}</version>
         </dependency>
         <dependency>
             <groupId>io.github.openfeign</groupId>
             <artifactId>feign-slf4j</artifactId>
-            <version>9.3.1</version>
+            <version>${feign.version}</version>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
-            <version>1.7.21</version>
+            <version>${slf4j.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-core</artifactId>
-            <version>2.6.2</version>
+            <version>${log4j.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-slf4j-impl</artifactId>
-            <version>2.6.2</version>
+            <version>${log4j.version}</version>
         </dependency>
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <version>1.16.10</version>
+            <version>${lombok.version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.12</version>
+            <version>${junit.version}</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
@@ -74,7 +82,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-compiler-plugin</artifactId>
-                    <version>3.5.1</version>
+                    <version>${maven-compiler-plugin.version}</version>
                     <configuration>
                         <source>1.8</source>
                         <target>1.8</target>
@@ -83,7 +91,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-surefire-plugin</artifactId>
-                    <version>2.19.1</version>
+                    <version>${maven-surefire-plugin.version}</version>
                     <configuration>
                         <skipTests>true</skipTests>
                     </configuration>
@@ -91,9 +99,10 @@
                 <plugin>
                     <groupId>org.springframework.boot</groupId>
                     <artifactId>spring-boot-maven-plugin</artifactId>
-                    <version>1.4.0.RELEASE</version>
+                    <version>${spring-boot-maven-plugin.version}</version>
                 </plugin>
             </plugins>
         </pluginManagement>
     </build>
+
 </project>