Merge tag 'MOA-ID-3.1.0' into development_preview

JoinUp Release

1 files changed, 82 insertions, 198 deletions

diff --git a/id/server/idserverlib/pom.xml b/id/server/idserverlib/pom.xml
index afc432628..fb6ba1bc6 100644
--- a/id/server/idserverlib/pom.xml
+++ b/id/server/idserverlib/pom.xml
@@ -30,20 +30,15 @@
 		<dependency>

 			<groupId>org.testng</groupId>

 			<artifactId>testng</artifactId>

-			<version>6.1.1</version>

+			<version>6.9.10</version>

 			<scope>test</scope>

 		</dependency>

-	<dependency>

-		<groupId>eu.stork</groupId>

-		<artifactId>oasis-dss-api</artifactId>

-		<version>1.0.0-RELEASE</version>

-		<exclusions>

-			<exclusion>

-				<groupId>org.apache.commons</groupId>

-				<artifactId>commons-io</artifactId>

-			</exclusion>

-		</exclusions>

-	</dependency>

+		    

+    <dependency>

+			<groupId>com.google.guava</groupId>

+			<artifactId>guava</artifactId>

+			<version>19.0</version>

+		</dependency>

     

     <dependency>

     	<groupId>at.gv.egiz.components</groupId>

@@ -58,20 +53,37 @@
     </dependency>

     

     <dependency>

+    	<groupId>at.gv.egiz.components</groupId>

+    	<artifactId>egiz-spring-api</artifactId>

+    	<version>0.1</version>

+    </dependency>

+    

+    <dependency>

+    	<groupId>MOA.id.server</groupId>

+  		<artifactId>moa-id-frontend-resources</artifactId>

+    </dependency>

+    <dependency>

     		<groupId>MOA.id.server</groupId>

     		<artifactId>moa-id-commons</artifactId>

-<!--     		<exclusions>

-    			<exclusion>

-    				<artifactId>hyperjaxb3-ejb-runtime</artifactId>

-    				<groupId>org.jvnet.hyperjaxb3</groupId>

-    			</exclusion>

-    		</exclusions> -->

+    </dependency>

+    

+    <dependency>

+    		<groupId>MOA.id.server</groupId>

+    		<artifactId>moa-id-commons</artifactId>

+    		<type>test-jar</type>

+				<scope>test</scope>

     </dependency>

 

         <dependency>

             <groupId>org.hibernate</groupId>

             <artifactId>hibernate-core</artifactId>

             <version>${hibernate.version}</version>

+            <exclusions>

+            	<exclusion>

+            		<artifactId>xml-apis</artifactId>

+            		<groupId>xml-apis</groupId>

+            	</exclusion>

+            </exclusions>

         </dependency>

         <dependency>

             <groupId>org.hibernate</groupId>

@@ -83,55 +95,33 @@
             <artifactId>hibernate-entitymanager</artifactId>

             <version>${hibernate.version}</version>

         </dependency>

-

-    

-<!--         <dependency>

-            <groupId>eu.stork</groupId>

-            <artifactId>Commons</artifactId>

-            <version>1.4.0</version>

-        </dependency> -->

-

-

-		<dependency>

-			<groupId>MOA</groupId>

-			<artifactId>moa-common</artifactId>

-			<type>jar</type>

-		</dependency>

-

-		<dependency>

-			<groupId>MOA</groupId>

-			<artifactId>moa-common</artifactId>

-			<type>test-jar</type>

-			<scope>test</scope>

-		</dependency>

-		<dependency>

-			<groupId>MOA.spss.server</groupId>

-			<artifactId>moa-spss-lib</artifactId>

-			<exclusions>

-				<exclusion>

-					<artifactId>iaik_pki_module</artifactId>

-					<groupId>iaik</groupId>

-				</exclusion>

-				<exclusion>

-					<groupId>javax.servlet</groupId>

-					<artifactId>servlet-api</artifactId>

-				</exclusion>

-				<exclusion>

-					<artifactId>axis-wsdl4j</artifactId>

-					<groupId>axis</groupId>

-				</exclusion>

-				<exclusion>

-					<artifactId>jaxb-impl</artifactId>

-					<groupId>com.sun.xml.bind</groupId>

-				</exclusion>

-			</exclusions>

-		</dependency>

-		<dependency>

-			<groupId>axis</groupId>

-			<artifactId>axis</artifactId>

-		</dependency>

-		

-

+	

+			<dependency>

+				<groupId>MOA.id</groupId>

+  			<artifactId>moa-spss-container</artifactId>

+  			<exclusions>

+					<exclusion>

+						<artifactId>iaik_pki_module</artifactId>

+						<groupId>iaik</groupId>

+					</exclusion>

+					<exclusion>

+						<groupId>commons-logging</groupId>

+						<artifactId>commons-logging</artifactId>

+					</exclusion>

+					<exclusion>

+						<artifactId>axis-wsdl4j</artifactId>

+						<groupId>axis</groupId>

+					</exclusion>

+				</exclusions>

+  			<type>pom</type>

+			</dependency>

+  

+  		<dependency>

+				<groupId>jakarta-regexp</groupId>

+				<artifactId>jakarta-regexp</artifactId>

+				<version>1.4</version>

+			</dependency>

+  

 		   <dependency>

             <groupId>at.gv.util</groupId>

             <artifactId>egovutils</artifactId>

@@ -160,6 +150,10 @@
                 	<artifactId>jaxb-core</artifactId>

                 	<groupId>com.sun.xml.bind</groupId>

                 </exclusion>

+                <exclusion>

+                	<artifactId>xml-apis</artifactId>

+                	<groupId>xml-apis</groupId>

+                </exclusion>

             </exclusions>

         </dependency>

 				

@@ -177,6 +171,11 @@
         	<artifactId>cxf-rt-transports-http</artifactId>

     	</dependency>

 		

+		<dependency>

+			<groupId>xalan-bin-dist</groupId>

+			<artifactId>xml-apis</artifactId>

+		</dependency>

+		

 		

 		<dependency>

 			<groupId>javax.xml.bind</groupId>

@@ -184,94 +183,17 @@
 		</dependency>

 		

 		<!-- Required for MOA-SPSS API access -->

-		<dependency>

+<!-- 		<dependency>

 			<groupId>com.sun.xml.rpc</groupId>

 			<artifactId>jaxrpc-impl</artifactId>

 			<version>1.1.3_01</version>

-		</dependency>

+		</dependency> -->

 		

 		

 		<dependency>

 			<groupId>javax.mail</groupId>

 			<artifactId>mail</artifactId>

 		</dependency>

-		<!--

-		<dependency>

-			<groupId>javax.servlet</groupId>

-			<artifactId>servlet-api</artifactId>

-			<scope>provided</scope>

-		</dependency>

-		-->

-		

-        <dependency>

-            <groupId>xalan-bin-dist</groupId>

-            <artifactId>xalan</artifactId>

-            <!-- should be provided by the container or jre -->

-            <scope>provided</scope>

-            <exclusions>

-            	<exclusion>

-            		<artifactId>serializer</artifactId>

-            		<groupId>xalan</groupId>

-            	</exclusion>

-            </exclusions>

-        </dependency>

-        <dependency>

-            <groupId>xerces</groupId>

-            <artifactId>xercesImpl</artifactId>

-            <!-- should be provided by the container or jre -->

-            <scope>provided</scope>

-        </dependency>

-        <dependency>

-            <groupId>xalan-bin-dist</groupId>

-            <artifactId>xml-apis</artifactId>

-            <!-- should be provided by the container or jre -->

-            <scope>provided</scope>

-        </dependency>

-        <dependency>

-            <groupId>xalan-bin-dist</groupId>

-            <artifactId>serializer</artifactId>

-            <!-- should be provided by the container or jre -->

-            <scope>provided</scope>

-        </dependency>

-        <dependency>

-            <groupId>iaik.prod</groupId>

-            <artifactId>iaik_jce_full</artifactId>

-            <!-- should be in the ext directory of the jre -->

-            <scope>provided</scope>

-        </dependency>

-        <dependency>

-            <groupId>iaik.prod</groupId>

-            <artifactId>iaik_ecc</artifactId>

-            <!-- should be in the ext directory of the jre -->

-            <scope>provided</scope>

-        </dependency>

-

-

-<!--         <dependency>

-            <groupId>org.slf4j</groupId>

-            <artifactId>slf4j-api</artifactId>

-            <version>1.7.7</version>

-        </dependency> -->

-<!--         <dependency>

-            <groupId>org.slf4j</groupId>

-            <artifactId>slf4j-simple</artifactId>

-            <version>1.7.6</version>

-        </dependency> -->

-<!--         <dependency>

-            <groupId>org.slf4j</groupId>

-            <artifactId>jcl-over-slf4j</artifactId>

-            <version>1.7.6</version>

-        </dependency> -->

-<!--          <dependency>

-            <groupId>org.slf4j</groupId>

-            <artifactId>log4j-over-slf4j</artifactId>

-            <version>1.7.6</version>

-        </dependency> -->

-<!--         <dependency>

-            <groupId>org.slf4j</groupId>

-            <artifactId>jul-to-slf4j</artifactId>

-            <version>1.7.6</version>

-        </dependency> -->

 

 		<dependency>

 			<groupId>org.easymock</groupId>

@@ -283,12 +205,12 @@
 			<artifactId>unitils-core</artifactId>

 			<scope>test</scope>

 		</dependency>

-		<dependency>

+<!-- 		<dependency>

 			<groupId>MOA</groupId>

 			<artifactId>moa-common</artifactId>

 			<type>test-jar</type>

 			<scope>test</scope>

-		</dependency>

+		</dependency> -->

  		<dependency>

 			<groupId>commons-logging</groupId>

 			<artifactId>commons-logging</artifactId>

@@ -312,33 +234,7 @@
 		<dependency>

 			<groupId>httpsclient</groupId>

 			<artifactId>httpsclient</artifactId>

-		</dependency>

-		<dependency>

-			<groupId>iaik.prod</groupId>

-			<artifactId>iaik_moa</artifactId>

-		</dependency>

-		<dependency>

-			<groupId>iaik.prod</groupId>

-			<artifactId>iaik_ixsil</artifactId>

-		</dependency>

-		<dependency>

-			<groupId>iaik.prod</groupId>

-			<artifactId>iaik_X509TrustManager</artifactId>

-		</dependency>

-		<!-- <dependency> <groupId>iaik</groupId> <artifactId>moa</artifactId> 

-			<version>1.28</version> </dependency> -->

-<!-- 		<dependency>

-			<groupId>edu.internet2.middleware</groupId>

-			<artifactId>shibboleth-common</artifactId>

-			<version>1.4.0</version>

-			<exclusions>

-				<exclusion>

-					<artifactId>logback-classic</artifactId>

-					<groupId>ch.qos.logback</groupId>

-				</exclusion>

-			</exclusions>

-		</dependency> -->

-		

+		</dependency>		

 	<dependency>

   		<groupId>org.opensaml</groupId>

   		<artifactId>opensaml</artifactId>

@@ -382,24 +278,12 @@
 				<groupId>org.bouncycastle</groupId>

 			</exclusion>

 		</exclusions>

-	</dependency>  		

-

-<!-- 	<dependency>

-			<groupId>regexp</groupId>

-			<artifactId>regexp</artifactId>

-		</dependency> -->

-		

-		<!-- <dependency> <groupId>commons-httpclient</groupId> <artifactId>commons-httpclient</artifactId> 

-			</dependency> -->

-		<!-- <dependency> <groupId>at.gv.egovernment.moa.id</groupId> <artifactId>mandate-validate</artifactId> 

-			<version>1.1</version> </dependency> -->

-        <!--

-        <dependency>

-			<groupId>commons-lang</groupId>

-			<artifactId>commons-lang</artifactId>

-			<version>2.6</version>

-		</dependency>

-        -->

+	</dependency>

+	<dependency>

+	    <groupId>org.apache.santuario</groupId>

+	    <artifactId>xmlsec</artifactId>

+	    <version>2.0.5</version>

+	</dependency>

 

 		<!-- the core, which includes Streaming API, shared low-level abstractions (but NOT data-binding) -->

 		<dependency>

@@ -434,7 +318,7 @@
 		<dependency>

 			<groupId>com.h2database</groupId>

 			<artifactId>h2</artifactId>

-			<version>1.4.178</version>

+			<version>1.4.191</version>

 			<scope>test</scope>

 		</dependency>

 

@@ -467,11 +351,11 @@
 		</dependency> -->

 		

 

-        <dependency>

+<!--         <dependency>

             <groupId>eu.stork</groupId>

             <artifactId>SamlEngine</artifactId>

             <version>1.5.1</version>

-        </dependency>

+        </dependency> -->

 

 

 		<!-- spring -->

@@ -608,11 +492,11 @@
 						<artifactId>surefire-junit47</artifactId>

 						<version>${surefire.version}</version>

 					</dependency>

-					<dependency>

+<!-- 					<dependency>

 						<groupId>org.apache.maven.surefire</groupId>

 						<artifactId>surefire-testng</artifactId>

 						<version>${surefire.version}</version>

-					</dependency>

+					</dependency> -->

 				</dependencies>

 			</plugin>