problems with eIDAS dependencies

7 files changed, 24 insertions, 342 deletions

diff --git a/id/server/modules/moa-id-module-eIDAS/pom.xml b/id/server/modules/moa-id-module-eIDAS/pom.xml
index 31e42b6c2..9e95301bd 100644
--- a/id/server/modules/moa-id-module-eIDAS/pom.xml
+++ b/id/server/modules/moa-id-module-eIDAS/pom.xml
@@ -13,7 +13,10 @@
 		<repositoryPath>${basedir}/../../../../repository</repositoryPath>
 		
 		<eidas-commons.version>eidas.1.0</eidas-commons.version>
-		<eidas-saml-engine.version>eidas.1.0</eidas-saml-engine.version>		
+		<eidas-saml-engine.version>eidas.1.0</eidas-saml-engine.version>
+		<eidas-encryption.version>eidas.1.0</eidas-encryption.version>
+		<eidas-configmodule.version>eidas.1.0</eidas-configmodule.version>
+				
 	</properties>
   
       <profiles>
@@ -69,6 +72,18 @@
                 </exclusion>
             </exclusions>
 		</dependency>
+	
+		<dependency>
+			<groupId>eu.eidas</groupId>
+  		<artifactId>eidas-configmodule</artifactId>
+  		<version>${eidas-configmodule.version}</version>
+		</dependency>
+
+		<dependency>
+			<groupId>eu.eidas</groupId>
+			<artifactId>eidas-encryption</artifactId>
+  		<version>${eidas-encryption.version}</version>
+		</dependency>
 
 		<!-- eidas SAML Engine -->
 		<dependency> 
diff --git a/repository/MOA/spss/server/moa-spss-lib/2.0.5-RC1/moa-spss-lib-2.0.5-RC1.pom b/repository/MOA/spss/server/moa-spss-lib/2.0.5-RC1/moa-spss-lib-2.0.5-RC1.pom
deleted file mode 100644
index c4eff0765..000000000
--- a/repository/MOA/spss/server/moa-spss-lib/2.0.5-RC1/moa-spss-lib-2.0.5-RC1.pom
+++ /dev/null
@@ -1,333 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<parent>
-		<groupId>MOA.spss</groupId>
-		<artifactId>moa-spss</artifactId>
-		<version>2.0.x</version>
-	</parent>
-
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>MOA.spss.server</groupId>
-	<artifactId>moa-spss-lib</artifactId>
-	<packaging>jar</packaging>
-	<version>${moa-spss-version}</version>
-	<name>MOA SP/SS API</name>
-
-	<properties>
-		<repositoryPath>${basedir}/../../../repository</repositoryPath>
-	</properties>
-
-	<dependencies>
-		<dependency>
-			<groupId>axis</groupId>
-			<artifactId>axis</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.axis</groupId>
-			<artifactId>axis-jaxrpc</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.axis</groupId>
-			<artifactId>axis-saaj</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>axis</groupId>
-			<artifactId>axis-wsdl4j</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>commons-discovery</groupId>
-			<artifactId>commons-discovery</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>commons-logging</groupId>
-			<artifactId>commons-logging</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>javax.activation</groupId>
-			<artifactId>activation</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>javax.mail</groupId>
-			<artifactId>mail</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>log4j</groupId>
-			<artifactId>log4j</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.postgresql</groupId>
-			<artifactId>postgresql</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>javax.servlet</groupId>
-			<artifactId>servlet-api</artifactId>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>xalan-bin-dist</groupId>
-			<artifactId>xalan</artifactId>
-			<!-- <scope>provided</scope> -->
-		</dependency>
-		<dependency>
-			<groupId>xerces</groupId>
-			<artifactId>xercesImpl</artifactId>
-			<!-- <scope>provided</scope> -->
-		</dependency>
-		<dependency>
-			<groupId>xalan-bin-dist</groupId>
-			<artifactId>xml-apis</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>xalan-bin-dist</groupId>
-			<artifactId>serializer</artifactId>
-			<!-- <scope>provided</scope> -->
-		</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_jce_full</artifactId>
-			<scope>compile</scope>
-		</dependency>
-		<dependency>
-			<groupId>iaik.prod</groupId>
-			<artifactId>iaik_ecc</artifactId>
-			<scope>compile</scope>
-		</dependency>
-		<dependency>
-			<groupId>iaik.prod</groupId>
-			<artifactId>iaik_cms</artifactId>
-			<scope>runtime</scope>
-		</dependency>
-		<dependency>
-			<groupId>iaik.prod</groupId>
-			<artifactId>iaik_Pkcs11Provider</artifactId>
-			<scope>runtime</scope>
-		</dependency>
-		<dependency>
-			<groupId>iaik.prod</groupId>
-			<artifactId>iaik_Pkcs11Wrapper</artifactId>
-			<scope>runtime</scope>
-		</dependency>
-		<dependency>
-			<groupId>iaik.prod</groupId>
-			<artifactId>iaik_Pkcs11Wrapper</artifactId>
-			<classifier>win32</classifier>
-			<type>dll</type>
-			<scope>runtime</scope>
-			<optional>true</optional>
-		</dependency>
-		<!--dependency>
-			<groupId>MOA</groupId>
-			<artifactId>moa-common</artifactId>
-			<type>jar</type>
-		</dependency-->
-<!--
-        <dependency>
-            <groupId>MOA</groupId>
-            <artifactId>moa-common</artifactId>
-            <type>compile</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-tools</artifactId>
-			<scope>test</scope>
-		</dependency-->
-		
-		<dependency>
-			<groupId>iaik</groupId>
-			<artifactId>iaik_tsl</artifactId>
-			<exclusions>
-				<exclusion>
-					<artifactId>iaik_pki_module</artifactId>
-					<groupId>iaik</groupId>
-				</exclusion>
-				<exclusion>
-					<artifactId>iaik_ecc_signed</artifactId>
-					<groupId>iaik</groupId>
-				</exclusion>
-				<exclusion>
-					<artifactId>iaik_jce_eval_signed</artifactId>
-					<groupId>iaik</groupId>
-				</exclusion>
-			</exclusions>			
-		</dependency>
-		
-		<dependency>
-			<groupId>com.sun.xml.bind</groupId>
-			<artifactId>jaxb-impl</artifactId>
-			<version>2.2.11</version>
-		</dependency>
-		
-		<dependency>
-			<groupId>com.sun.xml.bind</groupId>
-			<artifactId>jaxb-core</artifactId>
-			<version>2.2.11</version>
-		</dependency>
-				
-<!-- 		<dependency>
-			<groupId>iaik</groupId>
-			<artifactId>iaik_util</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>iaik</groupId>
-			<artifactId>iaik_xsect_eval</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>javax.xml.bind</groupId>
-    		<artifactId>jaxb-api</artifactId>
-  		</dependency>
-		<dependency>
-			<groupId>com.sun.xml.bind</groupId>
-			<artifactId>jaxb-impl</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.xerial</groupId>
-		  	<artifactId>sqlite-jdbc</artifactId>
-  		</dependency>
-		<dependency>
-			<groupId>iaik</groupId>
-		  	<artifactId>iaik_jsse</artifactId>
-  		</dependency> -->
-		
-		 
-		 
-    
-	</dependencies>
-    <build>
-        <plugins>
-<!--         		<plugin>
-            		<groupId>org.codehaus.mojo</groupId>
-            		<artifactId>properties-maven-plugin</artifactId>
-            		<version>1.0-alpha-2</version>
-            		<executions>
-                		<execution>
-                    		<phase>initialize</phase>
-                    		<goals>
-                        		<goal>read-project-properties</goal>
-                    		</goals>
-                    		<configuration>
-    	                   		<files>
-		                            <file>${basedir}/../../../moa-id.properties</file>
-      		                  </files>
-          		          </configuration>
-              		  </execution>
-            		</executions>
-        		</plugin> -->
-
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-jar-plugin</artifactId>
-				<configuration>
-					<archive>
-						<addMavenDescriptor>false</addMavenDescriptor>
-					</archive>
-					<executions>
-						<execution>
-							<goals>
-								<goal>test-jar</goal>
-							</goals>
-						</execution>
-					</executions>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-javadoc-plugin</artifactId>
-				<version>2.9.1</version>
-				<configuration>
-					<quiet>true</quiet>
-					<author>false</author>
-					<version>false</version>
-					<use>true</use>
-					<failOnError>false</failOnError>
-					<excludePackageNames>at.gv.egovernment.moa.spss.server.*;at.gv.egovernment.moa.spss.api.impl.*;at.gv.egovernment.moa.spss.impl.*</excludePackageNames>
-					<tags>
-						<tag>
-							<name>pre</name>
-							<placement>a</placement>
-							<head>Preconditions:</head>
-						</tag>
-						<tag>
-							<name>post</name>
-							<placement>a</placement>
-							<head>Postconditions:</head>
-						</tag>
-					</tags>
-					<groups>
-						<group>
-							<title>API Factory and Services</title>
-							<packages>at.gv.egovernment.moa.spss.api</packages>
-						</group>
-						<group>
-							<title>Exceptions</title>
-							<packages>at.gv.egovernment.moa.spss</packages>
-						</group>
-						<group>
-							<title>API Objects for Signature Creation</title>
-							<packages>at.gv.egovernment.moa.spss.api.xmlsign</packages>
-						</group>
-						<group>
-							<title>API Objects for CMS Signature Verification</title>
-							<packages>at.gv.egovernment.moa.spss.api.cmsverify</packages>
-						</group>
-						<group>
-							<title>API Objects for XML Signature Verification</title>
-							<packages>at.gv.egovernment.moa.spss.api.xmlverify</packages>
-						</group>
-						<group>
-							<title>Common API Objects</title>
-							<packages>at.gv.egovernment.moa.spss.api.common</packages>
-						</group>
-						<group>
-							<title>Builders and Parsers to convert API Objects to and from XML</title>
-							<packages>at.gv.egovernment.moa.spss.api.xmlbind</packages>
-						</group>
-						<group>
-							<title>Utilities</title>
-							<packages>at.gv.egovernment.moa.util</packages>
-							<packages>at.gv.egovernment.moa.spss.util</packages>
-						</group>
-						<group>
-							<title>Logging</title>
-							<packages>at.gv.egovernment.moa.logging</packages>
-						</group>
-					</groups>
-					<links>
-						<link>http://docs.oracle.com/javase/7/docs/api/</link>
-						<link>http://logging.apache.org/log4j/docs/api/</link>
-					</links>
-					<target>1.7</target>
-				</configuration>
-				<executions>
-					<execution>
-						<id>generate-javadoc</id>
-						<phase>package</phase>
-						<goals>
-							<goal>jar</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
-
-</project>
diff --git a/repository/eu/eidas/eidas-commons/eidas.1.0/eidas-commons-eidas.1.0.pom b/repository/eu/eidas/eidas-commons/eidas.1.0/eidas-commons-eidas.1.0.pom
index ceb0b4dcb..2b2f3f39e 100644
--- a/repository/eu/eidas/eidas-commons/eidas.1.0/eidas-commons-eidas.1.0.pom
+++ b/repository/eu/eidas/eidas-commons/eidas.1.0/eidas-commons-eidas.1.0.pom
@@ -11,8 +11,8 @@
     <parent>
         <groupId>eu.eidas</groupId>
         <artifactId>eidas-parent</artifactId>
-        <version>eidas</version>
-        <relativePath>../EIDAS-Parent/pom.xml</relativePath>
+        <version>eidas-1.0</version>
+        <relativePath>../../eidas-parent/eidas-1.0/pom.xml</relativePath>
     </parent>
 	<version>${project.version}</version>
   <description>
diff --git a/repository/eu/eidas/eidas-configmodule/eidas.1.0/eidas-configmodule-eidas.1.0.pom b/repository/eu/eidas/eidas-configmodule/eidas.1.0/eidas-configmodule-eidas.1.0.pom
index cf9691046..00a2ec564 100644
--- a/repository/eu/eidas/eidas-configmodule/eidas.1.0/eidas-configmodule-eidas.1.0.pom
+++ b/repository/eu/eidas/eidas-configmodule/eidas.1.0/eidas-configmodule-eidas.1.0.pom
@@ -14,8 +14,8 @@
     <parent>
         <groupId>eu.eidas</groupId>
         <artifactId>eidas-parent</artifactId>
-        <version>eidas</version>
-        <relativePath>../EIDAS-Parent/pom.xml</relativePath>
+        <version>eidas-1.0</version>
+        <relativePath>../../eidas-parent/eidas-1.0/pom.xml</relativePath>
     </parent>
     <version>${project.version}</version>
   <dependencies>
diff --git a/repository/eu/eidas/eidas-encryption/eidas.1.0/eidas-encryption-eidas.1.0.pom b/repository/eu/eidas/eidas-encryption/eidas.1.0/eidas-encryption-eidas.1.0.pom
index e0c1da99c..52652e8dd 100644
--- a/repository/eu/eidas/eidas-encryption/eidas.1.0/eidas-encryption-eidas.1.0.pom
+++ b/repository/eu/eidas/eidas-encryption/eidas.1.0/eidas-encryption-eidas.1.0.pom
@@ -19,8 +19,8 @@
     <parent>
         <groupId>eu.eidas</groupId>
         <artifactId>eidas-parent</artifactId>
-        <version>eidas</version>
-        <relativePath>../EIDAS-Parent/pom.xml</relativePath>
+        <version>eidas-1.0</version>
+        <relativePath>../../eidas-parent/eidas-1.0/pom.xml</relativePath>
     </parent>
 
 
diff --git a/repository/eu/eidas/eidas-parent/eidas/eidas-parent-eidas.pom b/repository/eu/eidas/eidas-parent/eidas-1.0/eidas-parent-eidas-1.0.pom
index f5652b63f..f5652b63f 100644
--- a/repository/eu/eidas/eidas-parent/eidas/eidas-parent-eidas.pom
+++ b/repository/eu/eidas/eidas-parent/eidas-1.0/eidas-parent-eidas-1.0.pom
diff --git a/repository/eu/eidas/saml-engine/eidas.1.0/saml-engine-eidas.1.0.pom b/repository/eu/eidas/saml-engine/eidas.1.0/saml-engine-eidas.1.0.pom
index c243709f8..0d7d905e1 100644
--- a/repository/eu/eidas/saml-engine/eidas.1.0/saml-engine-eidas.1.0.pom
+++ b/repository/eu/eidas/saml-engine/eidas.1.0/saml-engine-eidas.1.0.pom
@@ -15,8 +15,8 @@
     <parent>
         <groupId>eu.eidas</groupId>
         <artifactId>eidas-parent</artifactId>
-        <version>eidas</version>
-        <relativePath>../EIDAS-Parent/pom.xml</relativePath>
+        <version>eidas-1.0</version>
+        <relativePath>../../eidas-parent/eidas-1.0/pom.xml</relativePath>
     </parent>
 
 	<repositories>