Merge branch 'development_preview' into 'master'

Development preview

See merge request egiz/moa-idspss!2

2 files changed, 416 insertions, 435 deletions

diff --git a/id/server/moa-id-commons/pom.xml b/id/server/moa-id-commons/pom.xml
index 980390298..545a9d953 100644
--- a/id/server/moa-id-commons/pom.xml
+++ b/id/server/moa-id-commons/pom.xml
@@ -1,274 +1,276 @@
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>MOA.id</groupId>
-        <artifactId>moa-id</artifactId>
-        <version>4.1.4</version>
-    </parent>
-    <artifactId>moa-id-commons</artifactId>
-    <name>moa-id-commons</name>
-    <groupId>MOA.id.server</groupId>
-
-    <profiles>
-        <profile>
-            <id>default</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <repositories>
-                <repository>
-                    <id>moaid_local</id>
-                    <name>local</name>
-                    <url>file:${basedir}/../../../repository</url>
-                </repository>
-               	<repository>
-					<id>shibboleth.internet2.edu</id>
-					<name>Internet2</name>
-					<url>https://apps.egiz.gv.at/shibboleth_nexus/</url>
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns="http://maven.apache.org/POM/4.0.0"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>MOA.id</groupId>
+		<artifactId>moa-id</artifactId>
+		<version>4.1.5</version>
+	</parent>
+	<artifactId>moa-id-commons</artifactId>
+	<name>moa-id-commons</name>
+	<groupId>MOA.id.server</groupId>
+
+	<profiles>
+		<profile>
+			<id>default</id>
+			<activation>
+				<activeByDefault>true</activeByDefault>
+			</activation>
+			<repositories>
+				<repository>
+					<id>moaid_local</id>
+					<name>local</name>
+					<url>file:${basedir}/../../../repository</url>
+				</repository>
+				<repository>
+					<id>jboss</id>
+					<url>https://repository.jboss.org/nexus/content/repositories/central/</url>
+					<releases>
+						<enabled>true</enabled>
+					</releases>
+				</repository>
+				<repository>
+					<id>egiz-commons</id>
+					<url>https://apps.egiz.gv.at/maven/</url>
+					<releases>
+						<enabled>true</enabled>
+					</releases>
+					<snapshots>
+						<enabled>false</enabled>
+					</snapshots>
+				</repository>
+				<repository>
+					<id>egiz-commons-snapshot</id>
+					<url>https://apps.egiz.gv.at/maven-snapshot/</url>
+					<releases>
+						<enabled>false</enabled>
+					</releases>
+					<snapshots>
+						<enabled>true</enabled>
+					</snapshots>
 				</repository>
-                <repository>
-                    <id>jboss</id>
-                    <url>https://repository.jboss.org/nexus/content/repositories/central/</url>
-                    <releases>
-                        <enabled>true</enabled>
-                    </releases>
-                </repository>
-        		<repository>
-          			<id>egiz-commons</id>
-          			<url>https://apps.egiz.gv.at/maven/</url>
-          			<releases>
-            			<enabled>true</enabled>
-          			</releases>
-          			<snapshots>
-          				<enabled>false</enabled>
-          			</snapshots>
-        		</repository>
-        		<repository>
-          			<id>egiz-commons-snapshot</id>
-          			<url>https://apps.egiz.gv.at/maven-snapshot/</url>
-          			<releases>
-            			<enabled>false</enabled>
-          			</releases>
-          			<snapshots>
-          				<enabled>true</enabled>
-          			</snapshots>
-          		</repository>
-            </repositories>
-        </profile>
-    </profiles>
-
-
-    <dependencies>
-    		<dependency>
-    			<groupId>at.gv.egiz.eaaf</groupId>
-  				<artifactId>eaaf_core_api</artifactId>
-    		</dependency>
-    		<dependency>
-    			<groupId>at.gv.egiz.eaaf</groupId>
-	  			<artifactId>eaaf-core</artifactId>
-    		</dependency>    
-    		<dependency>
-    			<groupId>MOA.id.server</groupId>
-    			<artifactId>moa-id-jaxb_classes</artifactId>
-    		</dependency>
-    		<dependency>
-    			 <groupId>at.gv.util</groupId>
-          		 <artifactId>egovutils</artifactId>
-           		<exclusions>
-           			<exclusion>
-           				<groupId>*</groupId>
-           				<artifactId>*</artifactId>
-           			</exclusion>
-           		</exclusions>
-    		</dependency>
-    
-       		<dependency>
-    			<groupId>org.opensaml</groupId>
-  				<artifactId>opensaml</artifactId>
-           		<exclusions>
-           			<exclusion>
-           				<groupId>*</groupId>
-           				<artifactId>*</artifactId>
-           			</exclusion>
-           		</exclusions>
-    		</dependency>
-    		<dependency> 
-				<groupId>org.opensaml</groupId>
-				<artifactId>openws</artifactId>
-				<exclusions>
-					<exclusion>
-						<groupId>*</groupId>
-           				<artifactId>*</artifactId>
-					</exclusion>
-				</exclusions>
-			</dependency>
-    
-    		<dependency>
-    			<groupId>org.apache.httpcomponents</groupId>
-    			<artifactId>httpclient</artifactId>
-				</dependency>
-    
-    		<dependency>
-    			<groupId>org.apache.httpcomponents</groupId>
-    			<artifactId>httpcore</artifactId>
-				</dependency>
-    
-    
-       <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-lang3</artifactId>
-        </dependency>
-    
-    		<dependency>
-	    		<groupId>at.gv.egiz.components</groupId>
-	    		<artifactId>egiz-configuration-api</artifactId>
-	    		<version>0.2</version>
-    		</dependency>
-    		<dependency>
-    			<groupId>at.gv.egiz.components</groupId>
-    			<artifactId>egiz-configuration-file</artifactId>
-    			<version>0.2</version>
-    		</dependency>        
-    
-    		<dependency>
-    			<groupId>at.gv.egiz.eaaf</groupId>
-	  			<artifactId>eaaf-core</artifactId>
-    		</dependency>
-    
-        <dependency>
-            <groupId>iaik.prod</groupId>
-            <artifactId>iaik_jce_full</artifactId>
-        </dependency>
-    
-    		<dependency>
-    			<groupId>MOA.id</groupId>
-					<artifactId>moa-spss-container</artifactId>
-					<version>${moa-id-version}</version>
-    		</dependency>
-        
-        <dependency>
-					<groupId>iaik.prod</groupId>
-					<artifactId>iaik_X509TrustManager</artifactId>
-				</dependency>
-				        
-        <dependency>
-            <groupId>joda-time</groupId>
-            <artifactId>joda-time</artifactId>
-            <version>${jodatime.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>jcl-over-slf4j</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>jul-to-slf4j</artifactId>
-        </dependency>
-        <dependency>
-						<groupId>org.slf4j</groupId>
-						<artifactId>slf4j-log4j12</artifactId>
-				</dependency>
-<!--         <dependency>
-            <groupId>log4j</groupId>
-            <artifactId>log4j</artifactId>
-        </dependency> -->
-<!--         <dependency>
-					<groupId>org.apache.logging.log4j</groupId>
-					<artifactId>log4j-core</artifactId>
-				</dependency> -->
-    
-    
-        <dependency>
-            <groupId>org.hibernate</groupId>
-            <artifactId>hibernate-core</artifactId>
-            <version>${hibernate.version}</version>
-        </dependency>        
-        <!--  dependency>
-            <groupId>org.hibernate</groupId>
-            <artifactId>hibernate-c3p0</artifactId>
-            <version>${hibernate.version}</version>
-        </dependency-->
-<!--         <dependency>
-            <groupId>org.hibernate</groupId>
-            <artifactId>hibernate-entitymanager</artifactId>
-            <version>${hibernate.version}</version>
-        </dependency> -->
-
-        <dependency>
-            <groupId>jaxen</groupId>
-            <artifactId>jaxen</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>saxpath</groupId>
-            <artifactId>saxpath</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>xalan-bin-dist</groupId>
-            <artifactId>xalan</artifactId>
-            <scope>compile</scope>
-            <optional>true</optional>
-        </dependency>
-        <dependency>
-            <groupId>xerces</groupId>
-            <artifactId>xercesImpl</artifactId>
-            <optional>true</optional>
-        </dependency>
-        <dependency>
-            <groupId>xalan-bin-dist</groupId>
-            <artifactId>xml-apis</artifactId>
-            <scope>compile</scope>
-            <optional>true</optional>
-        </dependency>
-        <dependency>
-            <groupId>xalan-bin-dist</groupId>
-            <artifactId>serializer</artifactId>
-            <scope>runtime</scope>
-            <optional>true</optional>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-lang3</artifactId>
-        </dependency>
-				<dependency>
-					<groupId>commons-httpclient</groupId>
-					<artifactId>commons-httpclient</artifactId>
-				</dependency>
-
-				<dependency>
-					<groupId>com.sun.xml.bind</groupId>
-					<artifactId>jaxb-xjc</artifactId>
-					<version>2.3.2</version>
-				</dependency>
-
-				<dependency>
-					<groupId>org.jvnet.jaxb2_commons</groupId>
-					<artifactId>jaxb2-commons-lang</artifactId>
-					<version>2.4</version>
-				</dependency>
-				
-				<dependency>
-					<groupId>org.jvnet.jaxb2_commons</groupId>
-					<artifactId>jaxb2-basics-runtime</artifactId>
-					<version>1.11.1</version>
-				</dependency>
-        
-        <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
-            <version>${mysql-connector.java}</version>
-        </dependency>
-        
+				<repository>
+					<id>MOA_web</id>
+					<name>MOA Dependencies weblocation</name>
+					<releases>
+						<enabled>true</enabled>
+						<checksumPolicy>ignore</checksumPolicy>
+					</releases>
+					<layout>default</layout>
+					<url>https://git.egiz.gv.at/EAAF-Components/plain/eaaf_modules/eaaf_module_moa-sig/repository</url>
+				</repository>
+				<repository>
+      				<id>shibboleth.internet2.edu</id>
+      				<name>Internet2</name>
+      				<url>https://build.shibboleth.net/nexus/content/groups/public/</url>
+    			</repository>
+			</repositories>
+		</profile>
+	</profiles>
+
+
+	<dependencies>
+		<dependency>
+			<groupId>at.gv.egiz.eaaf</groupId>
+			<artifactId>eaaf_core_api</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>at.gv.egiz.eaaf</groupId>
+			<artifactId>eaaf-core</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>MOA.id.server</groupId>
+			<artifactId>moa-id-jaxb_classes</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>at.gv.util</groupId>
+			<artifactId>egovutils</artifactId>
+			<exclusions>
+				<exclusion>
+					<groupId>*</groupId>
+					<artifactId>*</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+
+		<dependency>
+			<groupId>org.opensaml</groupId>
+			<artifactId>opensaml</artifactId>
+			<exclusions>
+				<exclusion>
+					<groupId>*</groupId>
+					<artifactId>*</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<dependency>
+			<groupId>org.opensaml</groupId>
+			<artifactId>openws</artifactId>
+			<exclusions>
+				<exclusion>
+					<groupId>*</groupId>
+					<artifactId>*</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+
+		<dependency>
+			<groupId>org.apache.httpcomponents</groupId>
+			<artifactId>httpclient</artifactId>
+		</dependency>
+
+		<dependency>
+			<groupId>org.apache.httpcomponents</groupId>
+			<artifactId>httpcore</artifactId>
+		</dependency>
+
+
+		<dependency>
+			<groupId>org.apache.commons</groupId>
+			<artifactId>commons-lang3</artifactId>
+		</dependency>
+
+		<dependency>
+			<groupId>at.gv.egiz.components</groupId>
+			<artifactId>egiz-configuration-api</artifactId>
+			<version>0.2</version>
+		</dependency>
+		<dependency>
+			<groupId>at.gv.egiz.components</groupId>
+			<artifactId>egiz-configuration-file</artifactId>
+			<version>0.2</version>
+		</dependency>
+
+		<dependency>
+			<groupId>at.gv.egiz.eaaf</groupId>
+			<artifactId>eaaf-core</artifactId>
+		</dependency>
+
+		<dependency>
+			<groupId>iaik.prod</groupId>
+			<artifactId>iaik_jce_full</artifactId>
+		</dependency>
+
+		<dependency>
+			<groupId>MOA.id</groupId>
+			<artifactId>moa-spss-container</artifactId>
+			<version>${moa-id-version}</version>
+		</dependency>
+
+		<dependency>
+			<groupId>iaik.prod</groupId>
+			<artifactId>iaik_X509TrustManager</artifactId>
+		</dependency>
+
+		<dependency>
+			<groupId>joda-time</groupId>
+			<artifactId>joda-time</artifactId>
+			<version>${jodatime.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-api</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>jcl-over-slf4j</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>jul-to-slf4j</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-log4j12</artifactId>
+		</dependency>
+		<!-- <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> 
+			</dependency> -->
+		<!-- <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-core</artifactId> 
+			</dependency> -->
+
+
+		<dependency>
+			<groupId>org.hibernate</groupId>
+			<artifactId>hibernate-core</artifactId>
+			<version>${hibernate.version}</version>
+		</dependency>
+		<!-- dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate-c3p0</artifactId> 
+			<version>${hibernate.version}</version> </dependency -->
+		<!-- <dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate-entitymanager</artifactId> 
+			<version>${hibernate.version}</version> </dependency> -->
+
+		<dependency>
+			<groupId>jaxen</groupId>
+			<artifactId>jaxen</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>saxpath</groupId>
+			<artifactId>saxpath</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>xalan-bin-dist</groupId>
+			<artifactId>xalan</artifactId>
+			<scope>compile</scope>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>xerces</groupId>
+			<artifactId>xercesImpl</artifactId>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>xalan-bin-dist</groupId>
+			<artifactId>xml-apis</artifactId>
+			<scope>compile</scope>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>xalan-bin-dist</groupId>
+			<artifactId>serializer</artifactId>
+			<scope>runtime</scope>
+			<optional>true</optional>
+		</dependency>
+
+		<dependency>
+			<groupId>org.apache.commons</groupId>
+			<artifactId>commons-lang3</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>commons-httpclient</groupId>
+			<artifactId>commons-httpclient</artifactId>
+		</dependency>
+
+		<dependency>
+			<groupId>com.sun.xml.bind</groupId>
+			<artifactId>jaxb-xjc</artifactId>
+			<version>2.3.2</version>
+		</dependency>
+
+		<dependency>
+			<groupId>org.jvnet.jaxb2_commons</groupId>
+			<artifactId>jaxb2-commons-lang</artifactId>
+			<version>2.4</version>
+		</dependency>
+
+		<dependency>
+			<groupId>org.jvnet.jaxb2_commons</groupId>
+			<artifactId>jaxb2-basics-runtime</artifactId>
+			<version>1.11.1</version>
+		</dependency>
+
+		<dependency>
+			<groupId>mysql</groupId>
+			<artifactId>mysql-connector-java</artifactId>
+			<version>${mysql-connector.java}</version>
+		</dependency>
+
 		<dependency>
 			<groupId>commons-cli</groupId>
 			<artifactId>commons-cli</artifactId>
 		</dependency>
-		
+
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-context</artifactId>
@@ -283,201 +285,180 @@
 			<version>${org.springframework.version}</version>
 		</dependency>
 		<dependency>
-    	<groupId>org.springframework.data</groupId>
-    	<artifactId>spring-data-jpa</artifactId>
-    	<version>${org.springframework.data.spring-data-jpa}</version>
+			<groupId>org.springframework.data</groupId>
+			<artifactId>spring-data-jpa</artifactId>
+			<version>${org.springframework.data.spring-data-jpa}</version>
 		</dependency>
-		
-		
-  	    <dependency>
+
+
+		<dependency>
 			<groupId>com.fasterxml.jackson.core</groupId>
 			<artifactId>jackson-databind</artifactId>
 		</dependency>
 		<dependency>
-		 	<groupId>com.fasterxml.jackson.core</groupId>
-      		<artifactId>jackson-annotations</artifactId>
+			<groupId>com.fasterxml.jackson.core</groupId>
+			<artifactId>jackson-annotations</artifactId>
 		</dependency>
-		
+
 		<dependency>
-    	<groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>test</scope>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<scope>test</scope>
 		</dependency>
 
 
-		<!-- for testing only ?  -->
+		<!-- for testing only ? -->
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-test</artifactId>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
-    		<groupId>cglib</groupId>
-    		<artifactId>cglib</artifactId>
-    		<version>2.2.2</version>
-    		<scope>test</scope>
+			<groupId>cglib</groupId>
+			<artifactId>cglib</artifactId>
+			<version>2.2.2</version>
+			<scope>test</scope>
 		</dependency>
-		    
+
 		<dependency>
 			<groupId>com.h2database</groupId>
 			<artifactId>h2</artifactId>
 			<version>1.4.191</version>
 			<scope>test</scope>
 		</dependency>
-		
+
 		<dependency>
 			<groupId>org.apache.commons</groupId>
 			<artifactId>commons-dbcp2</artifactId>
-			</dependency>
+		</dependency>
 
 		<dependency>
 			<groupId>org.apache.commons</groupId>
-			<artifactId>commons-collections4</artifactId>	
-		</dependency>
-
-		
-    </dependencies>
-
-    <build>
-    	<plugins>                 
-             <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.6.1</version>
-                <configuration>
-                    <source>1.7</source>
-                    <target>1.7</target>
-                    <encoding>UTF-8</encoding>
-                </configuration>
-            </plugin>
-             <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <version>3.0.2</version>
-                <configuration>
-                    <archive>
-                        <addMavenDescriptor>false</addMavenDescriptor>
-                    </archive>
-                </configuration>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>test-jar</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-
-<!-- CLI for 2.x to 3.x migragtion -->
-<!--   <plugin>
-    <groupId>org.apache.maven.plugins</groupId>
-    <artifactId>maven-jar-plugin</artifactId>
-    <version>2.4</version>
-    <configuration>
-      <archive>
-        <manifest>
-        <addClasspath>true</addClasspath>
-        <mainClass>at.gv.egovernment.moa.id.commons.config.MigrateConfiguration</mainClass>
-        <classpathPrefix>dependency-jars/</classpathPrefix>
-        </manifest>
-      </archive>
-    </configuration>
-  </plugin> -->
-  <plugin>
-    <groupId>org.apache.maven.plugins</groupId>
-    <artifactId>maven-dependency-plugin</artifactId>
-    <version>2.5.1</version>
-    <executions>
-      <execution>
-        <id>copy-dependencies</id>
-        <phase>package</phase>
-        <goals>
-            <goal>copy-dependencies</goal>
-        </goals>
-        <configuration>
-            <outputDirectory>
-               ${project.build.directory}/dependency-jars/
-            </outputDirectory>
-        </configuration>
-      </execution>
-    </executions>
-  </plugin>
-
-<!--             <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <configuration>
-                    <archive>
-                        <addMavenDescriptor>false</addMavenDescriptor>
-                    </archive>
-                </configuration>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>test-jar</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin> -->
-            <plugin>
-                <artifactId>maven-enforcer-plugin</artifactId>
-                <version>1.1.1</version>
-                <executions>
-                    <execution>
-                        <id>enforce-banned-dependencies</id>
-                        <goals>
-                            <goal>enforce</goal>
-                        </goals>
-                        <configuration>
-                            <rules>
-                                <bannedDependencies>
-                                    <searchTransitive>true</searchTransitive>
-                                    <excludes>
-                                        <!-- <exclude>commons-logging</exclude> -->
-                                        <exclude>org.slf4j:1.5*</exclude>
-                                        <exclude>org.slf4j:1.6*</exclude>
-                                        <!--   <exclude>org.springframework:2.*</exclude>
-                                           <exclude>org.springframework:3.0.*</exclude>     -->
-                                    </excludes>
-                                </bannedDependencies>
-                            </rules>
-                            <fail>true</fail>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-                  
-                <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
-                <plugin>
-                    <groupId>org.eclipse.m2e</groupId>
-                    <artifactId>lifecycle-mapping</artifactId>
-                    <version>1.0.0</version>
-                    <configuration>
-                        <lifecycleMappingMetadata>
-                            <pluginExecutions>
-                                <pluginExecution>
-                                    <pluginExecutionFilter>
-                                        <groupId>
-                                            org.jvnet.hyperjaxb3
-                                        </groupId>
-                                        <artifactId>
-                                            maven-hyperjaxb3-plugin
-                                        </artifactId>
-                                        <versionRange>
-                                            [0.5.6,)
-                                        </versionRange>
-                                        <goals>
-                                            <goal>generate</goal>
-                                        </goals>
-                                    </pluginExecutionFilter>
-                                    <action>
-                                        <ignore></ignore>
-                                    </action>
-                                </pluginExecution>
-                            </pluginExecutions>
-                        </lifecycleMappingMetadata>
-                    </configuration>
-                </plugin>
-            </plugins>
-    </build>
+			<artifactId>commons-collections4</artifactId>
+		</dependency>
+
+
+	</dependencies>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<version>3.6.1</version>
+				<configuration>
+					<source>1.7</source>
+					<target>1.7</target>
+					<encoding>UTF-8</encoding>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-jar-plugin</artifactId>
+				<version>3.0.2</version>
+				<configuration>
+					<archive>
+						<addMavenDescriptor>false</addMavenDescriptor>
+					</archive>
+				</configuration>
+				<executions>
+					<execution>
+						<goals>
+							<goal>test-jar</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+
+			<!-- CLI for 2.x to 3.x migragtion -->
+			<!-- <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> 
+				<version>2.4</version> <configuration> <archive> <manifest> <addClasspath>true</addClasspath> 
+				<mainClass>at.gv.egovernment.moa.id.commons.config.MigrateConfiguration</mainClass> 
+				<classpathPrefix>dependency-jars/</classpathPrefix> </manifest> </archive> 
+				</configuration> </plugin> -->
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-dependency-plugin</artifactId>
+				<version>2.5.1</version>
+				<executions>
+					<execution>
+						<id>copy-dependencies</id>
+						<phase>package</phase>
+						<goals>
+							<goal>copy-dependencies</goal>
+						</goals>
+						<configuration>
+							<outputDirectory>
+								${project.build.directory}/dependency-jars/
+							</outputDirectory>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+
+			<!-- <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> 
+				<configuration> <archive> <addMavenDescriptor>false</addMavenDescriptor> 
+				</archive> </configuration> <executions> <execution> <goals> <goal>test-jar</goal> 
+				</goals> </execution> </executions> </plugin> -->
+			<plugin>
+				<artifactId>maven-enforcer-plugin</artifactId>
+				<version>1.1.1</version>
+				<executions>
+					<execution>
+						<id>enforce-banned-dependencies</id>
+						<goals>
+							<goal>enforce</goal>
+						</goals>
+						<configuration>
+							<rules>
+								<bannedDependencies>
+									<searchTransitive>true</searchTransitive>
+									<excludes>
+										<!-- <exclude>commons-logging</exclude> -->
+										<exclude>org.slf4j:1.5*</exclude>
+										<exclude>org.slf4j:1.6*</exclude>
+										<!-- <exclude>org.springframework:2.*</exclude> <exclude>org.springframework:3.0.*</exclude> -->
+									</excludes>
+								</bannedDependencies>
+							</rules>
+							<fail>true</fail>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+
+			<!--This plugin's configuration is used to store Eclipse m2e settings 
+				only. It has no influence on the Maven build itself. -->
+			<plugin>
+				<groupId>org.eclipse.m2e</groupId>
+				<artifactId>lifecycle-mapping</artifactId>
+				<version>1.0.0</version>
+				<configuration>
+					<lifecycleMappingMetadata>
+						<pluginExecutions>
+							<pluginExecution>
+								<pluginExecutionFilter>
+									<groupId>
+										org.jvnet.hyperjaxb3
+									</groupId>
+									<artifactId>
+										maven-hyperjaxb3-plugin
+									</artifactId>
+									<versionRange>
+										[0.5.6,)
+									</versionRange>
+									<goals>
+										<goal>generate</goal>
+									</goals>
+								</pluginExecutionFilter>
+								<action>
+									<ignore />
+								</action>
+							</pluginExecution>
+						</pluginExecutions>
+					</lifecycleMappingMetadata>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
 </project>
diff --git a/id/server/moa-id-commons/src/test/java/test/at/gv/egovernment/moa/util/KeyStoreUtilsTest.java b/id/server/moa-id-commons/src/test/java/test/at/gv/egovernment/moa/util/KeyStoreUtilsTest.java
index 6d341b88b..1c7b1d202 100644
--- a/id/server/moa-id-commons/src/test/java/test/at/gv/egovernment/moa/util/KeyStoreUtilsTest.java
+++ b/id/server/moa-id-commons/src/test/java/test/at/gv/egovernment/moa/util/KeyStoreUtilsTest.java
@@ -50,7 +50,7 @@ public class KeyStoreUtilsTest extends TestCase {
   }
   
   protected void setUp() throws Exception {
-    Security.addProvider(new com.sun.net.ssl.internal.ssl.Provider());
+    //Security.addProvider(new com.sun.net.ssl.internal.ssl.Provider());
     new File(tmpDir).mkdirs();
   }
   protected void tearDown() throws Exception {