From 49b125b12c908fd4297bc149ba9b540f47fe2c4d Mon Sep 17 00:00:00 2001
From: jomu <jomu@711a9084-f618-47a6-a783-754c49204487>
Date: Tue, 17 Nov 2015 22:07:04 +0000
Subject: [PATCH] optimized pom

---
 network/pom.xml         |  6 +----
 pom.xml                 | 52 +++++++++++++++++++++++++++++++----------
 security/pom.xml        |  5 +---
 sharepoint/api/pom.xml  | 15 +-----------
 sharepoint/mock/pom.xml |  2 ++
 util/pom.xml            |  4 ----
 6 files changed, 45 insertions(+), 39 deletions(-)

diff --git a/network/pom.xml b/network/pom.xml
index 19b96ad..48d3525 100644
--- a/network/pom.xml
+++ b/network/pom.xml
@@ -16,10 +16,6 @@
     </parent>
         
     <url>http://maven.apache.org</url>
-    <ciManagement>
-        <system>hudson</system>
-        <url>http://meta.muehlencord.intra:8080/jenkins/</url>
-    </ciManagement>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
@@ -30,7 +26,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.16</version>
+                <version>${maven-surefire-plugin.version}</version>
             </plugin>            
         </plugins>
     </build>    
diff --git a/pom.xml b/pom.xml
index 059c43e..bea2076 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,64 +15,92 @@
         <module>jeeutil</module>
     </modules>
     
+    <properties>
+        <!-- project setup -->
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.target>1.8</maven.compiler.target>    
+        
+        <!-- dependencies library version -->                
+        <junit.version>4.12</junit.version>
+        <commons-codec.version>1.10</commons-codec.version>
+        <commons-net.version>3.3</commons-net.version>
+        <commons-lang3.version>3.4</commons-lang3.version>
+        <log4j.version>2.4.1</log4j.version>
+        <javax-mail.version>1.4.7</javax-mail.version>
+        <javaee-api.version>7.0</javaee-api.version>
+        <edtFTPj.version>1.5.3</edtFTPj.version>
+        <scrypt.version>1.4.0</scrypt.version>
+        <bouncycastle.version>1.53</bouncycastle.version>
+        
+        <maven-compiler-plugin.version>3.3</maven-compiler-plugin.version>
+        <maven-ejb-plugin.version>2.5.1</maven-ejb-plugin.version>
+        <maven-surefire-plugin.version>2.19</maven-surefire-plugin.version>
+    </properties>
+    
     <dependencyManagement>
         <dependencies>
             
             <dependency>
                 <groupId>junit</groupId>
                 <artifactId>junit</artifactId>
-                <version>4.11</version>                
+                <version>${junit.version}</version>                
             </dependency>       
             
             <dependency>
                 <groupId>commons-codec</groupId>
                 <artifactId>commons-codec</artifactId>
-                <version>1.6</version>                
+                <version>${commons-codec.version}</version>                
             </dependency>               
             <dependency>
                 <groupId>commons-net</groupId>
                 <artifactId>commons-net</artifactId>
-                <version>3.3</version>
-            </dependency>                                                     
+                <version>${commons-net.version}</version>
+            </dependency>    
+            <dependency>
+                <groupId>org.apache.commons</groupId>
+                <artifactId>commons-lang3</artifactId>
+                <version>${commons-lang3.version}</version>
+            </dependency>                                                             
                                                                         
             <dependency>
                 <groupId>org.apache.logging.log4j</groupId>
                 <artifactId>log4j-api</artifactId>
-                <version>2.3</version>
+                <version>${log4j.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.logging.log4j</groupId>
                 <artifactId>log4j-core</artifactId>
-                <version>2.3</version>
+                <version>${log4j.version}</version>
             </dependency> 
             
             <dependency>
                 <groupId>javax.mail</groupId>
                 <artifactId>mail</artifactId>
-                <version>1.4.7</version>                                            
+                <version>${javax-mail.version}</version>                                            
             </dependency>                                
             
             <dependency>
                 <groupId>javax</groupId>
                 <artifactId>javaee-api</artifactId>
-                <version>6.0</version>
+                <version>${javaee-api.version}</version>
             </dependency>
                         
             <dependency>
                 <groupId>com.enterprisedt</groupId>
                 <artifactId>edtFTPj</artifactId>
-                <version>1.5.3</version>
+                <version>${edtFTPj.version}</version>
             </dependency>  
             
             <dependency>
                 <groupId>com.lambdaworks</groupId>
                 <artifactId>scrypt</artifactId>
-                <version>1.4.0</version>        
+                <version>${scrypt.version}</version>        
             </dependency>              
             <dependency>
                 <groupId>org.bouncycastle</groupId>
                 <artifactId>bcprov-jdk15on</artifactId>
-                <version>1.52</version>
+                <version>${bouncycastle.version}</version>
             </dependency>                  
                                           
             <dependency>
@@ -88,7 +116,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>2.5.1</version>
+                <version>${maven-compiler-plugin.version}</version>
                 <configuration>
                     <source>1.8</source>
                     <target>1.8</target>
diff --git a/security/pom.xml b/security/pom.xml
index c23b5a7..47d655f 100644
--- a/security/pom.xml
+++ b/security/pom.xml
@@ -15,10 +15,7 @@
     </parent>
       
     <url>http://maven.apache.org</url>
-    <ciManagement>
-        <system>hudson</system>
-        <url>http://meta.muehlencord.intra:8080/jenkins/</url>
-    </ciManagement>
+
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
diff --git a/sharepoint/api/pom.xml b/sharepoint/api/pom.xml
index c3c7edd..c39eb78 100644
--- a/sharepoint/api/pom.xml
+++ b/sharepoint/api/pom.xml
@@ -11,22 +11,10 @@
 
     <artifactId>api</artifactId>
     <packaging>jar</packaging>
-    <name>api</name>
+    <name>shared-sharepoint-api</name>
 
     <build>
         <plugins>
-            <!--            
-                        <plugin>
-                            <groupId>org.apache.maven.plugins</groupId>
-                            <artifactId>maven-compiler-plugin</artifactId>
-                            <version>3.0</version>
-                            <configuration>
-                                <source>1.8</source>
-                                <target>1.8</target>
-                            </configuration>
-                        </plugin>  
-            -->            
-
             <!-- project overall settings -->
             <plugin>
                 <!-- Ensure that usage of the maven-jaxb2-plugin is JDK 8 compatible in absence of a fix
@@ -261,7 +249,6 @@
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
-            <version>3.1</version>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
diff --git a/sharepoint/mock/pom.xml b/sharepoint/mock/pom.xml
index 751ca1b..bd2b365 100644
--- a/sharepoint/mock/pom.xml
+++ b/sharepoint/mock/pom.xml
@@ -9,4 +9,6 @@
     <groupId>de.muehlencord.shared.sharepoint</groupId>
     <artifactId>mock</artifactId>
     <packaging>jar</packaging>
+    
+    <name>shared-sharepoint-mock</name>
 </project>
\ No newline at end of file
diff --git a/util/pom.xml b/util/pom.xml
index e03459c..df11aac 100644
--- a/util/pom.xml
+++ b/util/pom.xml
@@ -37,8 +37,4 @@
     </dependencies>
     <name>shared-util</name>
     <artifactId>shared-util</artifactId>
-    <ciManagement>
-        <system>hudson</system>
-        <url>http://meta.muehlencord.intra:8080/jenkins/</url>
-    </ciManagement>
 </project>