From 7e926effef7fb81c3c78352b144565b6cfc715f0 Mon Sep 17 00:00:00 2001
From: jomu <jomu@711a9084-f618-47a6-a783-754c49204487>
Date: Thu, 20 Mar 2014 11:32:37 +0000
Subject: [PATCH] migrated to Java 8

---
 configuration/pom.xml                         | 15 -----
 .../shared/configuration/Configuration.java   |  4 +-
 jeeutil/pom.xml                               | 14 -----
 network/pom.xml                               | 23 +++-----
 pom.xml                                       | 58 ++++++++++++++++---
 util/pom.xml                                  | 15 -----
 6 files changed, 62 insertions(+), 67 deletions(-)

diff --git a/configuration/pom.xml b/configuration/pom.xml
index bb9c671..debb8f0 100644
--- a/configuration/pom.xml
+++ b/configuration/pom.xml
@@ -15,20 +15,6 @@
 
     <name>shared-configuration</name>
     <url>http://maven.apache.org</url>
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>2.3.2</version>
-                <configuration>
-                    <source>1.7</source>
-                    <target>1.7</target>
-                    <showDeprecation>true</showDeprecation>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
@@ -37,7 +23,6 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.10</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/configuration/src/main/java/de/muehlencord/shared/configuration/Configuration.java b/configuration/src/main/java/de/muehlencord/shared/configuration/Configuration.java
index 8a43e27..a55cfcf 100644
--- a/configuration/src/main/java/de/muehlencord/shared/configuration/Configuration.java
+++ b/configuration/src/main/java/de/muehlencord/shared/configuration/Configuration.java
@@ -2,7 +2,9 @@ package de.muehlencord.shared.configuration;
 
 /**
  *
- * @author jomu
+ * @param <T> the type of the parameter
+ * @param <V> the value of the parameter - must be the same class as the type class of the parameter
+ * @author joern@muehlencord.de
  */
 public interface Configuration<T, V extends T> {
 
diff --git a/jeeutil/pom.xml b/jeeutil/pom.xml
index a180a7b..859bfe0 100644
--- a/jeeutil/pom.xml
+++ b/jeeutil/pom.xml
@@ -23,32 +23,18 @@
         <dependency>
             <groupId>log4j</groupId>
             <artifactId>log4j</artifactId>
-            <version>1.2.17</version>
             <type>jar</type>
             <scope>compile</scope>            
         </dependency>
         <dependency>
             <groupId>javax</groupId>
             <artifactId>javaee-api</artifactId>
-            <version>6.0</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>
 
     <build>
         <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>2.3.2</version>
-                <configuration>
-                    <source>1.7</source>
-                    <target>1.7</target>
-                    <compilerArguments>
-                        <endorseddirs>${endorsed.dir}</endorseddirs>
-                    </compilerArguments>
-                </configuration>
-            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-ejb-plugin</artifactId>
diff --git a/network/pom.xml b/network/pom.xml
index 6454725..8fd1633 100644
--- a/network/pom.xml
+++ b/network/pom.xml
@@ -26,16 +26,15 @@
     
     <build>
         <finalName>${project.artifactId}</finalName>
-        <plugins>
+        <plugins>            
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>2.5.1</version>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>2.16</version>
                 <configuration>
-                    <source>1.7</source>
-                    <target>1.7</target>
+                    <skipTests>true</skipTests>
                 </configuration>
-            </plugin>
+            </plugin>            
         </plugins>
     </build>    
 
@@ -43,34 +42,29 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.10</version>
             <type>jar</type>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>com.enterprisedt</groupId>
             <artifactId>edtFTPj</artifactId>
-            <version>1.5.3</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>log4j</groupId>
             <artifactId>log4j</artifactId>
-            <version>1.2.17</version>
             <scope>provided</scope>
         </dependency>
         
         <dependency>
             <groupId>de.muehlencord.shared</groupId>
-            <artifactId>shared-util</artifactId>
-            <version>1.0-SNAPSHOT</version>
+            <artifactId>shared-util</artifactId>            
             <type>jar</type>
         </dependency>
         
         <dependency>
             <groupId>javax.mail</groupId>
-            <artifactId>mail</artifactId>
-            <version>1.4.5</version>
+            <artifactId>mail</artifactId>            
             <type>jar</type>
             <scope>compile</scope>            
         </dependency>
@@ -78,8 +72,7 @@
         <dependency>
             <groupId>commons-net</groupId>
             <artifactId>commons-net</artifactId>
-            <scope>compile</scope>          
-            <version>3.2</version>
+            <scope>compile</scope>
         </dependency>         
     </dependencies>
 </project>
diff --git a/pom.xml b/pom.xml
index b310cf9..992a1e3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,15 +20,13 @@
             <dependency>
                 <groupId>junit</groupId>
                 <artifactId>junit</artifactId>
-                <version>4.10</version>
-                <scope>test</scope>
+                <version>4.11</version>                
             </dependency>       
             
             <dependency>
                 <groupId>commons-codec</groupId>
                 <artifactId>commons-codec</artifactId>
-                <version>1.4</version>
-                <type>jar</type>
+                <version>1.6</version>                
             </dependency>                      
                                                             
             <dependency>
@@ -40,9 +38,55 @@
             <dependency>
                 <groupId>log4j</groupId>
                 <artifactId>log4j</artifactId>
-                <version>1.2.17</version>
-                <type>jar</type>
-            </dependency>            
+                <version>1.2.17</version>                
+            </dependency>  
+            
+            <dependency>
+                <groupId>javax.mail</groupId>
+                <artifactId>mail</artifactId>
+                <version>1.4.7</version>                                            
+            </dependency>                                
+            
+            <dependency>
+                <groupId>javax</groupId>
+                <artifactId>javaee-api</artifactId>
+                <version>6.0</version>
+            </dependency>
+            
+            
+            <dependency>
+                <groupId>com.enterprisedt</groupId>
+                <artifactId>edtFTPj</artifactId>
+                <version>1.5.3</version>
+            </dependency>     
+            
+            <dependency>
+                <groupId>commons-net</groupId>
+                <artifactId>commons-net</artifactId>
+                <version>3.2</version>
+            </dependency>                     
+            
+            <dependency>
+                <groupId>de.muehlencord.shared</groupId>
+                <artifactId>shared-util</artifactId>                            
+                <version>${project.version}</version>
+            </dependency>                           
         </dependencies>
     </dependencyManagement>
+    
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>2.5.1</version>
+                <configuration>
+                    <source>1.8</source>
+                    <target>1.8</target>
+                    <showDeprecation>true</showDeprecation>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+    
 </project>
\ No newline at end of file
diff --git a/util/pom.xml b/util/pom.xml
index 6896ca4..af489a2 100644
--- a/util/pom.xml
+++ b/util/pom.xml
@@ -15,19 +15,6 @@
     
             
     <url>http://maven.apache.org</url>
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>2.3.2</version>
-                <configuration>
-                    <source>1.7</source>
-                    <target>1.7</target>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
@@ -36,13 +23,11 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.10</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>log4j</groupId>
             <artifactId>log4j</artifactId>
-            <version>1.2.17</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>