diff options
| author | Martin Bonato <mbonato@datentechnik-innovation.com> | 2015-04-09 11:40:03 +0200 | 
|---|---|---|
| committer | Thomas Lenz <tlenz@iaik.tugraz.at> | 2015-06-19 11:09:49 +0200 | 
| commit | dc2cefbb4565b11c0a34d9636b27d186cc5cdd0d (patch) | |
| tree | 692fcedf0e49842286eed21028ef873309e35a46 | |
| parent | cae3dae9af7192c041a2725dfa828e615344e3dc (diff) | |
| download | moa-id-spss-dc2cefbb4565b11c0a34d9636b27d186cc5cdd0d.tar.gz moa-id-spss-dc2cefbb4565b11c0a34d9636b27d186cc5cdd0d.tar.bz2 moa-id-spss-dc2cefbb4565b11c0a34d9636b27d186cc5cdd0d.zip | |
Fix spring dependencies.
| -rw-r--r-- | id/server/moa-id-commons/pom.xml | 6 | ||||
| -rw-r--r-- | id/server/pom.xml | 6 | ||||
| -rw-r--r-- | pom.xml | 1274 | 
3 files changed, 642 insertions, 644 deletions
| diff --git a/id/server/moa-id-commons/pom.xml b/id/server/moa-id-commons/pom.xml index e4a46238e..677b5b62e 100644 --- a/id/server/moa-id-commons/pom.xml +++ b/id/server/moa-id-commons/pom.xml @@ -131,7 +131,11 @@  		<dependency>  			<groupId>org.springframework</groupId> -			<artifactId>spring-orm</artifactId> +			<artifactId>spring-context</artifactId> +		</dependency> +		<dependency> +			<groupId>org.springframework</groupId> +			<artifactId>spring-tx</artifactId>  		</dependency>  	    <dependency> diff --git a/id/server/pom.xml b/id/server/pom.xml index 802ba73f7..9ce48bf60 100644 --- a/id/server/pom.xml +++ b/id/server/pom.xml @@ -84,6 +84,12 @@  			<dependency>
  				<groupId>org.springframework</groupId>
 +				<artifactId>spring-tx</artifactId>
 +				<version>${org.springframework.version}</version>
 +			</dependency>
 +
 +			<dependency>
 +				<groupId>org.springframework</groupId>
  				<artifactId>spring-webmvc</artifactId>
  				<version>${org.springframework.version}</version>
  			</dependency>
 @@ -1,26 +1,26 @@ -<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">
 -    <modelVersion>4.0.0</modelVersion>
 -    <groupId>MOA</groupId>
 -    <artifactId>MOA</artifactId>
 -    <packaging>pom</packaging>
 -    <version>2.x</version>
 -    <name>MOA</name>
 -
 -    <properties>
 -        <repositoryPath>${basedir}/repository</repositoryPath>
 -        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 -
 -		<!--
 -		<moa-commons-version>2.0.1</moa-commons-version>
 -		<moa-id-version>2.1.2</moa-id-version>
 -		<moa-id-proxy-version>2.0.0</moa-id-proxy-version>
 -		<moa-spss-version>2.0.3</moa-spss-version>
 -		<configtool-version>1.1.4</configtool-version>
 -		<demo-oa-version>2.0.2</demo-oa-version>
 -		<moa-commons-version>2.0.1</moa-commons-version>
 -		-->
 -		
 +<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"> +    <modelVersion>4.0.0</modelVersion> +    <groupId>MOA</groupId> +    <artifactId>MOA</artifactId> +    <packaging>pom</packaging> +    <version>2.x</version> +    <name>MOA</name> + +    <properties> +        <repositoryPath>${basedir}/repository</repositoryPath> +        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + +		<!-- +		<moa-commons-version>2.0.1</moa-commons-version> +		<moa-id-version>2.1.2</moa-id-version> +		<moa-id-proxy-version>2.0.0</moa-id-proxy-version> +		<moa-spss-version>2.0.3</moa-spss-version> +		<configtool-version>1.1.4</configtool-version> +		<demo-oa-version>2.0.2</demo-oa-version> +		<moa-commons-version>2.0.1</moa-commons-version> +		--> +		  			<!-- Project Version -->
  			<moa-commons-version>2.0.3</moa-commons-version>
  			<moa-id-version>2.2.1</moa-id-version>
 @@ -46,172 +46,171 @@  			<org.apache.commons.collections4.version>4.0</org.apache.commons.collections4.version>
  			<jodatime.version>2.7</jodatime.version>
 -	    <apache-cli-version>1.2</apache-cli-version>
 -	    <spring-orm-version>3.1.1.RELEASE</spring-orm-version>
 +	    <apache-cli-version>1.2</apache-cli-version> -    </properties>
 -
 -    <profiles>
 -        <profile>
 -            <id>default</id>
 -            <activation>
 -                <activeByDefault>true</activeByDefault>
 -                <property>
 -                    <name>default</name>
 -                </property>
 -            </activation>
 -            <modules>
 -                <module>common</module>
 -                <module>spss</module>
 -                <module>id</module>
 -            </modules>
 -            <repositories>
 -                <repository>
 -                    <id>local</id>
 -                    <name>local</name>
 -                    <url>file:${basedir}/../../../repository</url>
 -                </repository>
 -                <repository>
 -                    <id>hyberjaxb</id>
 -                    <url>http://repository.highsource.org/maven2/releases/</url>
 -                    <releases>
 -                        <enabled>false</enabled>
 -                    </releases>
 -                </repository>
 -                <repository>
 -                    <id>jboss</id>
 -                    <url>https://repository.jboss.org/nexus/content/repositories/central/</url>
 -                    <releases>
 -                        <enabled>true</enabled>
 -                    </releases>
 -                </repository>
 -            </repositories>
 -        </profile>
 -    </profiles>
 -    
 -    <build>
 -    	<pluginManagement>
 -    		<plugins>
 -    			<plugin>
 -    				<artifactId>maven-release-plugin</artifactId>
 -    				<version>2.5.1</version>
 -    			</plugin>
 -    		</plugins>
 -    	</pluginManagement>
 -        <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-surefire-plugin</artifactId>
 +    </properties> + +    <profiles> +        <profile> +            <id>default</id> +            <activation> +                <activeByDefault>true</activeByDefault> +                <property> +                    <name>default</name> +                </property> +            </activation> +            <modules> +                <module>common</module> +                <module>spss</module> +                <module>id</module> +            </modules> +            <repositories> +                <repository> +                    <id>local</id> +                    <name>local</name> +                    <url>file:${basedir}/../../../repository</url> +                </repository> +                <repository> +                    <id>hyberjaxb</id> +                    <url>http://repository.highsource.org/maven2/releases/</url> +                    <releases> +                        <enabled>false</enabled> +                    </releases> +                </repository> +                <repository> +                    <id>jboss</id> +                    <url>https://repository.jboss.org/nexus/content/repositories/central/</url> +                    <releases> +                        <enabled>true</enabled> +                    </releases> +                </repository> +            </repositories> +        </profile> +    </profiles> +     +    <build> +    	<pluginManagement> +    		<plugins> +    			<plugin> +    				<artifactId>maven-release-plugin</artifactId> +    				<version>2.5.1</version> +    			</plugin> +    		</plugins> +    	</pluginManagement> +        <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-surefire-plugin</artifactId>                  <version>${surefire.version}</version>
 -                <configuration>
 -                	<excludes>
 -                		<exclude>eu/stork/peps/test/simple/SimpleBaseTest.java</exclude>
 -                		<exclude>eu/stork/peps/test/simple/StorkAttrQueryRequestTest.java</exclude>
 -                		<exclude>eu/stork/peps/test/simple/StorkAttrQueryResponseTest.java</exclude>
 -                		<exclude>eu/stork/peps/test/simple/StorkAuthRequestTest.java</exclude>
 -                		<exclude>eu/stork/peps/test/simple/StorkLogoutRequestTest.java</exclude>
 -                		<exclude>eu/stork/peps/test/simple/StorkLogoutResponseTest.java</exclude>
 -                		<exclude>eu/stork/peps/test/simple/StorkNewResponseTest.java</exclude>
 -                		<exclude>eu/stork/peps/test/simple/StorkResponseTest.java</exclude>
 -                		<exclude>test/MOAIDTestCase.java</exclude>
 -                		<exclude>test/at/gv/egovernment/moa/MOATestCase.java</exclude>
 -                		<exclude>test/at/gv/egovernment/moa/id/UnitTestCase.java</exclude>
 -                		<exclude>test/at/gv/egovernment/moa/id/auth/MOAIDAuthInitialiserTest.java</exclude>
 -                		<exclude>test/at/gv/egovernment/moa/id/auth/builder/GetIdentityLinkFormBuilderTest.java</exclude>
 -                		<exclude>test/at/gv/egovernment/moa/id/auth/builder/InfoboxReadRequestBuilderTest.java</exclude>
 -                		<exclude>test/at/gv/egovernment/moa/id/auth/builder/PersonDataBuilderTest.java</exclude>
 -                		<exclude>test/at/gv/egovernment/moa/id/auth/builder/SAMLArtifactBuilderTest.java</exclude>
 -                		<exclude>test/at/gv/egovernment/moa/id/auth/builder/VerifyXMLSignatureRequestBuilderTest.java</exclude>
 -                		<exclude>test/at/gv/egovernment/moa/id/auth/invoke/IdentityLinkAssertionParserTest.java</exclude>
 -                		<exclude>test/at/gv/egovernment/moa/id/auth/invoke/MOASPSSTestCase.java</exclude>
 -                		<exclude>test/at/gv/egovernment/moa/id/auth/invoke/SignatureVerificationTest.java</exclude>
 -                		<exclude>test/at/gv/egovernment/moa/id/auth/oauth/CertTest.java</exclude>
 -                		<exclude>test/at/gv/egovernment/moa/id/auth/parser/IdentityLinkAssertionParserTest.java</exclude>
 -                		<exclude>test/at/gv/egovernment/moa/id/auth/parser/InfoboxReadResponseParserTest.java</exclude>
 -                		<exclude>test/at/gv/egovernment/moa/id/auth/parser/SAMLArtifactParserTest.java</exclude>
 -                		<exclude>test/at/gv/egovernment/moa/id/proxy/builder/SAMLArtifactBuilderTest.java</exclude>
 -                		<exclude>test/at/gv/egovernment/moa/id/proxy/builder/SAMLRequestBuilderTest.java</exclude>
 -                		<exclude>test/at/gv/egovernment/moa/id/proxy/parser/SAMLResponseParserTest.java</exclude>
 -                		<exclude>test/at/gv/egovernment/moa/spss/SPSSTestCase.java</exclude>
 -                		<exclude>test/at/gv/egovernment/moa/spss/api/xmlbind/CreateXMLSignatureRequestParserTest.java</exclude>
 -                		<exclude>test/at/gv/egovernment/moa/spss/api/xmlbind/TransformParserTest.java</exclude>
 -                		<exclude>test/at/gv/egovernment/moa/spss/api/xmlbind/VerifyCMSSignatureRequestParserTest.java</exclude>
 -                		<exclude>test/at/gv/egovernment/moa/spss/api/xmlbind/VerifyXMLSignatureRequestParserTest.java</exclude>
 -                		<exclude>test/at/gv/egovernment/moa/spss/server/iaik/config/ConfigurationDataImplTest.java</exclude>
 -                		<exclude>test/at/gv/egovernment/moa/spss/server/iaik/config/IaikConfiguratorTest.java</exclude>
 -                		<exclude>test/at/gv/egovernment/moa/spss/server/invoke/CMSSignatureVerificationInvokerTest.java</exclude>
 -                		<exclude>test/at/gv/egovernment/moa/spss/server/invoke/DataObjectFactoryTest.java</exclude>
 -                		<exclude>test/at/gv/egovernment/moa/spss/server/invoke/TransformationFactoryTest.java</exclude>
 -                		<exclude>test/at/gv/egovernment/moa/spss/server/invoke/XMLSignatureCreationInvokerTest.java</exclude>
 -                		<exclude>test/at/gv/egovernment/moa/spss/server/invoke/XMLSignatureVerificationInvokerTest.java</exclude>
 -                		<exclude>test/at/gv/egovernment/moa/spss/server/tools/CertToolTest.java</exclude>
 -                		<exclude>test/at/gv/egovernment/moa/util/DOMUtilsTest.java</exclude>
 -                		<exclude>test/at/gv/egovernment/moa/util/KeyStoreUtilsTest.java</exclude>
 -                		<exclude>test/at/gv/egovernment/moa/util/SSLUtilsTest.java</exclude>
 -                		<exclude>test/at/gv/egovernment/moa/util/URLDecoderTest.java</exclude>
 -                		<exclude>test/at/gv/egovernment/moa/util/URLEncoderTest.java</exclude>
 -                		<exclude>test/at/gv/egovernment/moa/util/XMLGrammarBuilderTest.java</exclude>
 -                		<exclude>test/at/gv/egovernment/moa/util/XPathUtilsTest.java</exclude>
 -                	</excludes>
 -                </configuration>
 -            </plugin>
 -            <plugin>
 -                <groupId>org.apache.maven.plugins</groupId>
 -                <artifactId>maven-compiler-plugin</artifactId>
 -                <configuration>
 -                    <verbose>false</verbose>
 -                    <fork>true</fork>
 -                    <executable>${env.BUILD_EXECUTEABLE}</executable>
 -                    <compilerVersion>${env.BUILD_VERSION}</compilerVersion>
 -                    <source>1.7</source>
 -                    <target>1.7</target>
 -                </configuration>
 -            </plugin>
 -            <plugin>
 -                <groupId>org.apache.maven.plugins</groupId>
 -                <artifactId>maven-jar-plugin</artifactId>
 -                <configuration>
 -                    <archive>
 -                        <manifest>
 -                            <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
 -                        </manifest>
 -                    </archive>
 -                </configuration>
 -            </plugin>
 -            <plugin>
 -                <inherited>false</inherited>
 -                <artifactId>maven-assembly-plugin</artifactId>
 -                <version>2.2-beta-1</version> 
 -                <!-- TODO Update Version 2.2-beta-1 for MOA-SPSS -->
 -                <configuration>
 -                    <finalName>moa</finalName>
 -                    <encoding>UTF-8</encoding>
 -                    <descriptors>
 -                        <descriptor>id/assembly-auth.xml</descriptor>
 -                        <descriptor>id/assembly-proxy.xml</descriptor>                         
 -                        <descriptor>spss/assembly.xml</descriptor>
 -                        <descriptor>spss/assembly-lib.xml</descriptor>
 -                    </descriptors>
 -                </configuration>
 -            </plugin>
 +                <configuration> +                	<excludes> +                		<exclude>eu/stork/peps/test/simple/SimpleBaseTest.java</exclude> +                		<exclude>eu/stork/peps/test/simple/StorkAttrQueryRequestTest.java</exclude> +                		<exclude>eu/stork/peps/test/simple/StorkAttrQueryResponseTest.java</exclude> +                		<exclude>eu/stork/peps/test/simple/StorkAuthRequestTest.java</exclude> +                		<exclude>eu/stork/peps/test/simple/StorkLogoutRequestTest.java</exclude> +                		<exclude>eu/stork/peps/test/simple/StorkLogoutResponseTest.java</exclude> +                		<exclude>eu/stork/peps/test/simple/StorkNewResponseTest.java</exclude> +                		<exclude>eu/stork/peps/test/simple/StorkResponseTest.java</exclude> +                		<exclude>test/MOAIDTestCase.java</exclude> +                		<exclude>test/at/gv/egovernment/moa/MOATestCase.java</exclude> +                		<exclude>test/at/gv/egovernment/moa/id/UnitTestCase.java</exclude> +                		<exclude>test/at/gv/egovernment/moa/id/auth/MOAIDAuthInitialiserTest.java</exclude> +                		<exclude>test/at/gv/egovernment/moa/id/auth/builder/GetIdentityLinkFormBuilderTest.java</exclude> +                		<exclude>test/at/gv/egovernment/moa/id/auth/builder/InfoboxReadRequestBuilderTest.java</exclude> +                		<exclude>test/at/gv/egovernment/moa/id/auth/builder/PersonDataBuilderTest.java</exclude> +                		<exclude>test/at/gv/egovernment/moa/id/auth/builder/SAMLArtifactBuilderTest.java</exclude> +                		<exclude>test/at/gv/egovernment/moa/id/auth/builder/VerifyXMLSignatureRequestBuilderTest.java</exclude> +                		<exclude>test/at/gv/egovernment/moa/id/auth/invoke/IdentityLinkAssertionParserTest.java</exclude> +                		<exclude>test/at/gv/egovernment/moa/id/auth/invoke/MOASPSSTestCase.java</exclude> +                		<exclude>test/at/gv/egovernment/moa/id/auth/invoke/SignatureVerificationTest.java</exclude> +                		<exclude>test/at/gv/egovernment/moa/id/auth/oauth/CertTest.java</exclude> +                		<exclude>test/at/gv/egovernment/moa/id/auth/parser/IdentityLinkAssertionParserTest.java</exclude> +                		<exclude>test/at/gv/egovernment/moa/id/auth/parser/InfoboxReadResponseParserTest.java</exclude> +                		<exclude>test/at/gv/egovernment/moa/id/auth/parser/SAMLArtifactParserTest.java</exclude> +                		<exclude>test/at/gv/egovernment/moa/id/proxy/builder/SAMLArtifactBuilderTest.java</exclude> +                		<exclude>test/at/gv/egovernment/moa/id/proxy/builder/SAMLRequestBuilderTest.java</exclude> +                		<exclude>test/at/gv/egovernment/moa/id/proxy/parser/SAMLResponseParserTest.java</exclude> +                		<exclude>test/at/gv/egovernment/moa/spss/SPSSTestCase.java</exclude> +                		<exclude>test/at/gv/egovernment/moa/spss/api/xmlbind/CreateXMLSignatureRequestParserTest.java</exclude> +                		<exclude>test/at/gv/egovernment/moa/spss/api/xmlbind/TransformParserTest.java</exclude> +                		<exclude>test/at/gv/egovernment/moa/spss/api/xmlbind/VerifyCMSSignatureRequestParserTest.java</exclude> +                		<exclude>test/at/gv/egovernment/moa/spss/api/xmlbind/VerifyXMLSignatureRequestParserTest.java</exclude> +                		<exclude>test/at/gv/egovernment/moa/spss/server/iaik/config/ConfigurationDataImplTest.java</exclude> +                		<exclude>test/at/gv/egovernment/moa/spss/server/iaik/config/IaikConfiguratorTest.java</exclude> +                		<exclude>test/at/gv/egovernment/moa/spss/server/invoke/CMSSignatureVerificationInvokerTest.java</exclude> +                		<exclude>test/at/gv/egovernment/moa/spss/server/invoke/DataObjectFactoryTest.java</exclude> +                		<exclude>test/at/gv/egovernment/moa/spss/server/invoke/TransformationFactoryTest.java</exclude> +                		<exclude>test/at/gv/egovernment/moa/spss/server/invoke/XMLSignatureCreationInvokerTest.java</exclude> +                		<exclude>test/at/gv/egovernment/moa/spss/server/invoke/XMLSignatureVerificationInvokerTest.java</exclude> +                		<exclude>test/at/gv/egovernment/moa/spss/server/tools/CertToolTest.java</exclude> +                		<exclude>test/at/gv/egovernment/moa/util/DOMUtilsTest.java</exclude> +                		<exclude>test/at/gv/egovernment/moa/util/KeyStoreUtilsTest.java</exclude> +                		<exclude>test/at/gv/egovernment/moa/util/SSLUtilsTest.java</exclude> +                		<exclude>test/at/gv/egovernment/moa/util/URLDecoderTest.java</exclude> +                		<exclude>test/at/gv/egovernment/moa/util/URLEncoderTest.java</exclude> +                		<exclude>test/at/gv/egovernment/moa/util/XMLGrammarBuilderTest.java</exclude> +                		<exclude>test/at/gv/egovernment/moa/util/XPathUtilsTest.java</exclude> +                	</excludes> +                </configuration> +            </plugin> +            <plugin> +                <groupId>org.apache.maven.plugins</groupId> +                <artifactId>maven-compiler-plugin</artifactId> +                <configuration> +                    <verbose>false</verbose> +                    <fork>true</fork> +                    <executable>${env.BUILD_EXECUTEABLE}</executable> +                    <compilerVersion>${env.BUILD_VERSION}</compilerVersion> +                    <source>1.7</source> +                    <target>1.7</target> +                </configuration> +            </plugin> +            <plugin> +                <groupId>org.apache.maven.plugins</groupId> +                <artifactId>maven-jar-plugin</artifactId> +                <configuration> +                    <archive> +                        <manifest> +                            <addDefaultImplementationEntries>true</addDefaultImplementationEntries> +                        </manifest> +                    </archive> +                </configuration> +            </plugin> +            <plugin> +                <inherited>false</inherited> +                <artifactId>maven-assembly-plugin</artifactId> +                <version>2.2-beta-1</version>  +                <!-- TODO Update Version 2.2-beta-1 for MOA-SPSS --> +                <configuration> +                    <finalName>moa</finalName> +                    <encoding>UTF-8</encoding> +                    <descriptors> +                        <descriptor>id/assembly-auth.xml</descriptor> +                        <descriptor>id/assembly-proxy.xml</descriptor>                          +                        <descriptor>spss/assembly.xml</descriptor> +                        <descriptor>spss/assembly-lib.xml</descriptor> +                    </descriptors> +                </configuration> +            </plugin>              		            <!-- Vulnerability checks -->
  <!--              <plugin>
 @@ -228,36 +227,36 @@                </executions>
              </plugin> -->
 -        </plugins>
 -        
 -    </build>
 -
 -    <reporting>
 -        <plugins>
 -            <plugin>
 -                <groupId>org.apache.maven.plugins</groupId>
 -                <artifactId>maven-javadoc-plugin</artifactId>
 -                <configuration>
 -                    <excludePackageNames>test.*</excludePackageNames>
 -                </configuration>
 -            </plugin>
 -        </plugins>
 -    </reporting>
 -
 -    <dependencyManagement>
 -        <dependencies>
 -
 -			<dependency>
 -  				<groupId>org.opensaml</groupId>
 -  				<artifactId>opensaml</artifactId>
 +        </plugins> +         +    </build> + +    <reporting> +        <plugins> +            <plugin> +                <groupId>org.apache.maven.plugins</groupId> +                <artifactId>maven-javadoc-plugin</artifactId> +                <configuration> +                    <excludePackageNames>test.*</excludePackageNames> +                </configuration> +            </plugin> +        </plugins> +    </reporting> + +    <dependencyManagement> +        <dependencies> + +			<dependency> +  				<groupId>org.opensaml</groupId> +  				<artifactId>opensaml</artifactId>    				<version>${opensaml.version}</version>
 -  			</dependency>  		
 -			<dependency>
 -				<groupId>org.opensaml</groupId>
 -				<artifactId>xmltooling</artifactId>
 +  			</dependency>  		 +			<dependency> +				<groupId>org.opensaml</groupId> +				<artifactId>xmltooling</artifactId>  				<version>${xmltooling.version}</version>
 -			</dependency>
 -
 +			</dependency> +      	<dependency>
          	<groupId>org.apache.cxf</groupId>
          	<artifactId>cxf-rt-frontend-jaxws</artifactId>
 @@ -268,7 +267,7 @@          	<artifactId>cxf-rt-transports-http</artifactId>
          	<version>${cxf.version}</version>
      	</dependency>
 -
 +          <dependency>
              <groupId>org.apache.struts</groupId>
 @@ -309,93 +308,93 @@  				</dependency>
 -            <dependency>
 -                <groupId>axis</groupId>
 -                <artifactId>axis</artifactId>
 -                <version>1.0_IAIK_1.2</version>                
 -                <scope>compile</scope>
 -            </dependency>
 -            <dependency>
 -               <groupId>org.apache.axis</groupId>
 -               <artifactId>axis-jaxrpc</artifactId>
 -               <version>1.4</version>
 -               <scope>compile</scope>
 -            </dependency>
 -            <dependency>
 -               <groupId>org.apache.axis</groupId>
 -               <artifactId>axis-saaj</artifactId>
 -               <version>1.4</version>
 -               <scope>compile</scope>
 -            </dependency>
 -            <dependency>
 -               <groupId>axis</groupId>
 -               <artifactId>axis-wsdl4j</artifactId>
 -               <version>1.5.1</version>
 -               <scope>compile</scope>
 -            </dependency>
 -            <dependency>
 -                <groupId>jaxen</groupId>
 -                <artifactId>jaxen</artifactId>
 -                <version>1.1.6</version>
 -            </dependency>
 -            <dependency>
 -                <groupId>saxpath</groupId>
 -                <artifactId>saxpath</artifactId>
 -                <version>1.0-FCS</version>
 -                <scope>compile</scope> 
 -            </dependency>
 -
 -            <dependency>
 -                <groupId>log4j</groupId>
 -                <artifactId>log4j</artifactId>
 -                <version>1.2.17</version>
 -                <scope>compile</scope>
 -            </dependency>
 -						<dependency>
 -							<groupId>org.postgresql</groupId>
 -							<artifactId>postgresql</artifactId>
 -							<version>9.3-1102-jdbc41</version>
 -						</dependency>
 -
 -            <dependency>
 -                <groupId>javax.mail</groupId>
 -                <artifactId>mail</artifactId>
 -                <version>1.4.7</version>
 -            </dependency>
 -            <dependency>
 -                <groupId>commons-fileupload</groupId>
 -                <artifactId>commons-fileupload</artifactId>
 -                <version>1.3.1</version>
 -            </dependency>
 -            <dependency>
 -               <groupId>commons-httpclient</groupId>
 -               <artifactId>commons-httpclient</artifactId>
 -               <version>3.1</version>
 -            </dependency>
 -            <dependency>
 +            <dependency> +                <groupId>axis</groupId> +                <artifactId>axis</artifactId> +                <version>1.0_IAIK_1.2</version>                 +                <scope>compile</scope> +            </dependency> +            <dependency> +               <groupId>org.apache.axis</groupId> +               <artifactId>axis-jaxrpc</artifactId> +               <version>1.4</version> +               <scope>compile</scope> +            </dependency> +            <dependency> +               <groupId>org.apache.axis</groupId> +               <artifactId>axis-saaj</artifactId> +               <version>1.4</version> +               <scope>compile</scope> +            </dependency> +            <dependency> +               <groupId>axis</groupId> +               <artifactId>axis-wsdl4j</artifactId> +               <version>1.5.1</version> +               <scope>compile</scope> +            </dependency> +            <dependency> +                <groupId>jaxen</groupId> +                <artifactId>jaxen</artifactId> +                <version>1.1.6</version> +            </dependency> +            <dependency> +                <groupId>saxpath</groupId> +                <artifactId>saxpath</artifactId> +                <version>1.0-FCS</version> +                <scope>compile</scope>  +            </dependency> + +            <dependency> +                <groupId>log4j</groupId> +                <artifactId>log4j</artifactId> +                <version>1.2.17</version> +                <scope>compile</scope> +            </dependency> +						<dependency> +							<groupId>org.postgresql</groupId> +							<artifactId>postgresql</artifactId> +							<version>9.3-1102-jdbc41</version> +						</dependency> + +            <dependency> +                <groupId>javax.mail</groupId> +                <artifactId>mail</artifactId> +                <version>1.4.7</version> +            </dependency> +            <dependency> +                <groupId>commons-fileupload</groupId> +                <artifactId>commons-fileupload</artifactId> +                <version>1.3.1</version> +            </dependency> +            <dependency> +               <groupId>commons-httpclient</groupId> +               <artifactId>commons-httpclient</artifactId> +               <version>3.1</version> +            </dependency> +            <dependency>  							 <groupId>org.apache.httpcomponents</groupId>
  							 <artifactId>httpclient</artifactId>
  							 <version>4.4.1</version>
  						</dependency>            
              <dependency>
 -                <groupId>dav4j</groupId>
 -                <artifactId>dav4j</artifactId>
 -                <version>0.1</version>
 -                <scope>compile</scope>
 -            </dependency>
 -            <dependency>
 -                <groupId>httpsclient</groupId>
 -                <artifactId>httpsclient</artifactId>
 -                <version>JSSE-1.0</version>
 -                <scope>compile</scope>
 -            </dependency>
 -<!--              <dependency>
 -                <groupId>regexp</groupId>
 -                <artifactId>regexp</artifactId>
 -                <version>1.3</version>
 -            </dependency> -->
 -
 -
 +                <groupId>dav4j</groupId> +                <artifactId>dav4j</artifactId> +                <version>0.1</version> +                <scope>compile</scope> +            </dependency> +            <dependency> +                <groupId>httpsclient</groupId> +                <artifactId>httpsclient</artifactId> +                <version>JSSE-1.0</version> +                <scope>compile</scope> +            </dependency> +<!--              <dependency> +                <groupId>regexp</groupId> +                <artifactId>regexp</artifactId> +                <version>1.3</version> +            </dependency> --> + +  						<dependency>
  							<groupId>org.bouncycastle</groupId>
  							<artifactId>bcprov-jdk16</artifactId>
 @@ -403,22 +402,22 @@  						</dependency>
              <dependency>
 -                <groupId>MOA</groupId>
 -                <artifactId>moa-common</artifactId>
 -                <version>${moa-commons-version}</version>
 -                <scope>compile</scope>
 -            </dependency>
 -            <dependency>
 -                <groupId>MOA.id.server</groupId>
 -                <artifactId>moa-id-lib</artifactId>
 -                <version>${moa-id-version}</version>
 -                <scope>compile</scope>
 -            </dependency>
 -            <dependency>
 -            	<groupId>MOA.id.server</groupId>
 -            	<artifactId>moa-id-commons</artifactId>
 -            	<version>${moa-id-version}</version>
 -              <scope>compile</scope>
 +                <groupId>MOA</groupId> +                <artifactId>moa-common</artifactId> +                <version>${moa-commons-version}</version> +                <scope>compile</scope> +            </dependency> +            <dependency> +                <groupId>MOA.id.server</groupId> +                <artifactId>moa-id-lib</artifactId> +                <version>${moa-id-version}</version> +                <scope>compile</scope> +            </dependency> +            <dependency> +            	<groupId>MOA.id.server</groupId> +            	<artifactId>moa-id-commons</artifactId> +            	<version>${moa-id-version}</version> +              <scope>compile</scope>          		</dependency>
  			<dependency>
  				<groupId>MOA.id.server.modules</groupId>
 @@ -431,271 +430,260 @@  				<version>${moa-id-version}</version>
  			</dependency>            
              <dependency>
 -                <groupId>MOA.spss.server</groupId>
 -                <artifactId>moa-spss-lib</artifactId>
 -                <version>${moa-spss-version}</version>
 -                <scope>compile</scope>
 -            </dependency>
 -            <dependency>
 -                <groupId>MOA</groupId>
 -                <artifactId>moa-common</artifactId>
 -                <version>${moa-commons-version}</version>
 -                <type>test-jar</type>
 -                <scope>test</scope>
 -            </dependency>
 -            <dependency>
 -                <groupId>MOA.spss.server</groupId>
 -                <artifactId>moa-spss-tools</artifactId>
 -                <version>${moa-spss-version}</version>
 -                <scope>test</scope>
 -             </dependency>
 -            <dependency>
 -                <groupId>junit</groupId>
 -                <artifactId>junit</artifactId>
 -                <version>3.8.2</version>
 -                <scope>test</scope>
 -            </dependency>
 -            <dependency>
 -                <groupId>commons-logging</groupId>
 -                <artifactId>commons-logging</artifactId>
 -                <version>1.2</version>
 -                <scope>compile</scope>
 -            </dependency>
 -            
 -            <dependency>
 -            	<groupId>javax.servlet</groupId>
 -				<artifactId>servlet-api</artifactId>
 -				<version>2.4</version> 
 -				<scope>provide</scope>                
 -            </dependency>
 -             <dependency>
 -                <groupId>javax.activation</groupId>
 -                <artifactId>activation</artifactId>
 -                <version>1.1.1</version>	
 -                <scope>compile</scope>
 -            </dependency>
 -            <dependency>
 -                <groupId>commons-discovery</groupId>
 -                <artifactId>commons-discovery</artifactId>
 -                <version>0.5</version>	
 -                <scope>compile</scope>
 -            </dependency>
 -            <!-- IAIK libraries -->
 -            <dependency>
 -                <groupId>iaik.prod</groupId>
 -                <artifactId>iaik_jce_full</artifactId>
 -                <!-- <version>4.0_MOA</version>-->
 -                <version>5.2</version>
 -                <scope>compile</scope>
 -            </dependency>
 -            <dependency>
 -                <groupId>iaik.prod</groupId>
 -                <artifactId>iaik_moa</artifactId>
 -                <version>1.51</version>
 -                <scope>compile</scope>
 -            </dependency>
 -            <dependency>
 -                <groupId>iaik.prod</groupId>
 -                <artifactId>iaik_cms</artifactId>
 -                <version>5.0</version>
 -                <scope>compile</scope>
 -            </dependency>
 -            <dependency>
 -                <groupId>iaik.prod</groupId>
 -                <artifactId>iaik_ecc</artifactId>
 -                <version>2.19</version>
 -                <scope>provided</scope>
 -            </dependency>
 -            <dependency>
 -                <groupId>iaik.prod</groupId>
 -                <artifactId>iaik_ixsil</artifactId>
 -                <version>1.2.2.5</version>
 -                <scope>compile</scope>
 -            </dependency>
 -            <dependency>
 -                <groupId>iaik.prod</groupId>
 -                <artifactId>iaik_X509TrustManager</artifactId>
 -                <version>0.3</version>
 -                <scope>compile</scope>
 -            </dependency>
 -            <dependency>
 -                <groupId>iaik.prod</groupId>
 -                <artifactId>iaik_Pkcs11Provider</artifactId>
 -                <version>1.2.4</version>
 -                <scope>runtime</scope>
 -            </dependency>
 -            <dependency>
 -                <groupId>iaik.prod</groupId>
 -                <artifactId>iaik_Pkcs11Wrapper</artifactId>
 -                <version>1.2.17</version>
 -                <scope>compile</scope>
 -            </dependency>
 -            <dependency>
 -                <groupId>iaik.prod</groupId>
 -                <artifactId>iaik_Pkcs11Wrapper</artifactId>
 -                <version>1.2.17</version>
 -                <classifier>win32</classifier>
 -                <type>dll</type>
 -                <scope>runtime</scope>
 -            </dependency>
 -            <dependency>
 -                <groupId>iaik.prod</groupId>
 -                <artifactId>iaik_Pkcs11Wrapper</artifactId>
 -                <version>1.2.17</version>
 -                <classifier>linux</classifier>
 -                <type>so</type>
 -                <scope>runtime</scope>
 -            </dependency>
 -            <dependency>
 -                <groupId>iaik.prod</groupId>
 -                <artifactId>iaik_Pkcs11Wrapper</artifactId>
 -                <version>1.2.17</version>
 -                <classifier>linux_x64</classifier>
 -                <type>so</type>
 -                <scope>runtime</scope>
 -            </dependency>
 -            <dependency>
 -                <groupId>iaik.prod</groupId>
 -                <artifactId>iaik_Pkcs11Wrapper</artifactId>
 -                <version>1.2.17</version>
 -                <classifier>solaris_sparc</classifier>
 -                <type>so</type>
 -                <scope>runtime</scope>
 -            </dependency>
 -            <dependency>
 -                <groupId>iaik.prod</groupId>
 -                <artifactId>iaik_Pkcs11Wrapper</artifactId>
 -                <version>1.2.17</version>
 -                <classifier>solaris_sparcv9</classifier>
 -                <type>so</type>
 -                <scope>runtime</scope>
 -            </dependency>
 -            <dependency>
 -                <groupId>iaik.prod</groupId>
 -                <artifactId>iaik_Pkcs11Wrapper</artifactId>
 -                <version>1.2.17</version>
 -                 <classifier>win64</classifier>
 -                <type>dll</type>
 -                <scope>runtime</scope>
 -            </dependency>
 -
 -		<dependency>
 -			<groupId>javax.xml.bind</groupId>
 -    		<artifactId>jaxb-api</artifactId>
 -    		<version>2.2.12</version>
 -		</dependency>
 -            
 -            <!--  TSL  -->
 -   <dependency>
 -			<groupId>iaik</groupId>
 -			<artifactId>iaik_tsl</artifactId>
 -			<version>1.1</version>
 -		</dependency>
 -		
 -<!-- 		<dependency>
 -			<groupId>iaik</groupId>
 -			<artifactId>iaik_util</artifactId>
 -			<version>0.23</version>
 -		</dependency>
 -		<dependency>
 -			<groupId>iaik</groupId>
 -			<artifactId>iaik_xsect_eval</artifactId>
 -			<version>1.1709142</version>
 -		</dependency>
 -		<dependency>
 -			<groupId>com.sun.xml.bind</groupId>
 -			<artifactId>jaxb-impl</artifactId>
 -			<version>2.2.7</version>
 -		</dependency>
 -		<dependency>
 -			<groupId>org.xerial</groupId>
 -		  	<artifactId>sqlite-jdbc</artifactId>
 -  			<version>3.7.8-SNAPSHOT</version>
 -		</dependency>
 -		<dependency>
 -			<groupId>iaik</groupId>
 -		  	<artifactId>iaik_jsse</artifactId>
 -  			<version>4.4</version>
 -		</dependency> -->
 -		
 -            <dependency>
 -                <groupId>xerces</groupId>
 -                <artifactId>xercesImpl</artifactId>
 -                <version>2.11.0</version>
 -                <scope>compile</scope>	
 -            </dependency>
 -            <!-- The xmlParserAPIs.jar of the official xalan distribution
 -                 and the one in the central repository differ. So, we
 -                 are going to include the official one in our own
 -                 distribution to prevent from problems with different
 -                 versions in the endorsed directory of the servlet container
 -                 or jre endorsed directory. -->
 -            <dependency>
 -                <groupId>xalan-bin-dist</groupId>
 -                <artifactId>xml-apis</artifactId>
 -                <version>2.11.0</version>
 -                <scope>runtime</scope>
 -            </dependency>
 -            <!-- The xalan.jar of the official xalan distribution
 -                 and the one in the central repository differ. So, we
 -                 are going to include the official one in our own
 -                 distribution to prevent from problems with different
 -                 versions in the endorsed directory of the servlet container
 -                 or jre endorsed directory. -->
 -            <dependency>
 -                <groupId>xalan-bin-dist</groupId>
 -                <artifactId>xalan</artifactId>
 -                <version>2.7.2</version>
 -                <scope>compile</scope><!-- for XPathAPI, Javadoc,...-->
 -            </dependency>
 -            <dependency>
 -                <groupId>xalan-bin-dist</groupId>
 -                <artifactId>serializer</artifactId>
 -                <version>2.7.2</version><!-- xalan version -->
 -                <scope>runtime</scope>
 -            </dependency>
 -            
 -			<dependency>
 -				<groupId>org.springframework</groupId>
 -				<artifactId>spring-webmvc</artifactId>
 -				<version>${org.springframework.version}</version>
 -			</dependency>
 +                <groupId>MOA.spss.server</groupId> +                <artifactId>moa-spss-lib</artifactId> +                <version>${moa-spss-version}</version> +                <scope>compile</scope> +            </dependency> +            <dependency> +                <groupId>MOA</groupId> +                <artifactId>moa-common</artifactId> +                <version>${moa-commons-version}</version> +                <type>test-jar</type> +                <scope>test</scope> +            </dependency> +            <dependency> +                <groupId>MOA.spss.server</groupId> +                <artifactId>moa-spss-tools</artifactId> +                <version>${moa-spss-version}</version> +                <scope>test</scope> +             </dependency> +            <dependency> +                <groupId>junit</groupId> +                <artifactId>junit</artifactId> +                <version>3.8.2</version> +                <scope>test</scope> +            </dependency> +            <dependency> +                <groupId>commons-logging</groupId> +                <artifactId>commons-logging</artifactId> +                <version>1.2</version> +                <scope>compile</scope> +            </dependency> +             +            <dependency> +            	<groupId>javax.servlet</groupId> +				<artifactId>servlet-api</artifactId> +				<version>2.4</version>  +				<scope>provide</scope>                 +            </dependency> +             <dependency> +                <groupId>javax.activation</groupId> +                <artifactId>activation</artifactId> +                <version>1.1.1</version>	 +                <scope>compile</scope> +            </dependency> +            <dependency> +                <groupId>commons-discovery</groupId> +                <artifactId>commons-discovery</artifactId> +                <version>0.5</version>	 +                <scope>compile</scope> +            </dependency> +            <!-- IAIK libraries --> +            <dependency> +                <groupId>iaik.prod</groupId> +                <artifactId>iaik_jce_full</artifactId> +                <!-- <version>4.0_MOA</version>--> +                <version>5.2</version> +                <scope>compile</scope> +            </dependency> +            <dependency> +                <groupId>iaik.prod</groupId> +                <artifactId>iaik_moa</artifactId> +                <version>1.51</version> +                <scope>compile</scope> +            </dependency> +            <dependency> +                <groupId>iaik.prod</groupId> +                <artifactId>iaik_cms</artifactId> +                <version>5.0</version> +                <scope>compile</scope> +            </dependency> +            <dependency> +                <groupId>iaik.prod</groupId> +                <artifactId>iaik_ecc</artifactId> +                <version>2.19</version> +                <scope>provided</scope> +            </dependency> +            <dependency> +                <groupId>iaik.prod</groupId> +                <artifactId>iaik_ixsil</artifactId> +                <version>1.2.2.5</version> +                <scope>compile</scope> +            </dependency> +            <dependency> +                <groupId>iaik.prod</groupId> +                <artifactId>iaik_X509TrustManager</artifactId> +                <version>0.3</version> +                <scope>compile</scope> +            </dependency> +            <dependency> +                <groupId>iaik.prod</groupId> +                <artifactId>iaik_Pkcs11Provider</artifactId> +                <version>1.2.4</version> +                <scope>runtime</scope> +            </dependency> +            <dependency> +                <groupId>iaik.prod</groupId> +                <artifactId>iaik_Pkcs11Wrapper</artifactId> +                <version>1.2.17</version> +                <scope>compile</scope> +            </dependency> +            <dependency> +                <groupId>iaik.prod</groupId> +                <artifactId>iaik_Pkcs11Wrapper</artifactId> +                <version>1.2.17</version> +                <classifier>win32</classifier> +                <type>dll</type> +                <scope>runtime</scope> +            </dependency> +            <dependency> +                <groupId>iaik.prod</groupId> +                <artifactId>iaik_Pkcs11Wrapper</artifactId> +                <version>1.2.17</version> +                <classifier>linux</classifier> +                <type>so</type> +                <scope>runtime</scope> +            </dependency> +            <dependency> +                <groupId>iaik.prod</groupId> +                <artifactId>iaik_Pkcs11Wrapper</artifactId> +                <version>1.2.17</version> +                <classifier>linux_x64</classifier> +                <type>so</type> +                <scope>runtime</scope> +            </dependency> +            <dependency> +                <groupId>iaik.prod</groupId> +                <artifactId>iaik_Pkcs11Wrapper</artifactId> +                <version>1.2.17</version> +                <classifier>solaris_sparc</classifier> +                <type>so</type> +                <scope>runtime</scope> +            </dependency> +            <dependency> +                <groupId>iaik.prod</groupId> +                <artifactId>iaik_Pkcs11Wrapper</artifactId> +                <version>1.2.17</version> +                <classifier>solaris_sparcv9</classifier> +                <type>so</type> +                <scope>runtime</scope> +            </dependency> +            <dependency> +                <groupId>iaik.prod</groupId> +                <artifactId>iaik_Pkcs11Wrapper</artifactId> +                <version>1.2.17</version> +                 <classifier>win64</classifier> +                <type>dll</type> +                <scope>runtime</scope> +            </dependency> + +		<dependency> +			<groupId>javax.xml.bind</groupId> +    		<artifactId>jaxb-api</artifactId> +    		<version>2.2.12</version> +		</dependency> +             +            <!--  TSL  --> +   <dependency> +			<groupId>iaik</groupId> +			<artifactId>iaik_tsl</artifactId> +			<version>1.1</version> +		</dependency> +		 +<!-- 		<dependency> +			<groupId>iaik</groupId> +			<artifactId>iaik_util</artifactId> +			<version>0.23</version> +		</dependency> +		<dependency> +			<groupId>iaik</groupId> +			<artifactId>iaik_xsect_eval</artifactId> +			<version>1.1709142</version> +		</dependency> +		<dependency> +			<groupId>com.sun.xml.bind</groupId> +			<artifactId>jaxb-impl</artifactId> +			<version>2.2.7</version> +		</dependency> +		<dependency> +			<groupId>org.xerial</groupId> +		  	<artifactId>sqlite-jdbc</artifactId> +  			<version>3.7.8-SNAPSHOT</version> +		</dependency> +		<dependency> +			<groupId>iaik</groupId> +		  	<artifactId>iaik_jsse</artifactId> +  			<version>4.4</version> +		</dependency> --> +		 +            <dependency> +                <groupId>xerces</groupId> +                <artifactId>xercesImpl</artifactId> +                <version>2.11.0</version> +                <scope>compile</scope>	 +            </dependency> +            <!-- The xmlParserAPIs.jar of the official xalan distribution +                 and the one in the central repository differ. So, we +                 are going to include the official one in our own +                 distribution to prevent from problems with different +                 versions in the endorsed directory of the servlet container +                 or jre endorsed directory. --> +            <dependency> +                <groupId>xalan-bin-dist</groupId> +                <artifactId>xml-apis</artifactId> +                <version>2.11.0</version> +                <scope>runtime</scope> +            </dependency> +            <!-- The xalan.jar of the official xalan distribution +                 and the one in the central repository differ. So, we +                 are going to include the official one in our own +                 distribution to prevent from problems with different +                 versions in the endorsed directory of the servlet container +                 or jre endorsed directory. --> +            <dependency> +                <groupId>xalan-bin-dist</groupId> +                <artifactId>xalan</artifactId> +                <version>2.7.2</version> +                <scope>compile</scope><!-- for XPathAPI, Javadoc,...--> +            </dependency> +            <dependency> +                <groupId>xalan-bin-dist</groupId> +                <artifactId>serializer</artifactId> +                <version>2.7.2</version><!-- xalan version --> +                <scope>runtime</scope> +            </dependency> +             +			<dependency> +				<groupId>org.springframework</groupId> +				<artifactId>spring-webmvc</artifactId> +				<version>${org.springframework.version}</version> +			</dependency>          </dependencies>
 -            <!-- the core, which includes Streaming API, shared low-level abstractions (but NOT data-binding) -->
 -            <dependency>
 -                <groupId>com.fasterxml.jackson.core</groupId>
 -                <artifactId>jackson-core</artifactId>
 -                <version>${jackson-version}</version>
 -			</dependency>
 -			<!-- databinding; ObjectMapper, JsonNode and related classes are here -->
 -			<dependency>
 -                <groupId>com.fasterxml.jackson.core</groupId>
 -                <artifactId>jackson-databind</artifactId>
 -                <version>${jackson-version}</version>
 -            </dependency>
 -            <dependency>
 -                <groupId>com.fasterxml.jackson.core</groupId>
 -                <artifactId>jackson-annotations</artifactId>
 -                <version>${jackson-version}</version>
 -            </dependency>
 -			<dependency>
 -				<groupId>org.springframework</groupId>
 -				<artifactId>spring-test</artifactId>
 -				<version>${spring-orm-version}</version>
 -				<scope>test</scope>
 -			</dependency>
 -			<dependency>
 -				<groupId>commons-cli</groupId>
 -				<artifactId>commons-cli</artifactId>
 -				<version>${apache-cli-version}</version>
 -			</dependency>
 -			
 -			<dependency>
 -				<groupId>org.springframework</groupId>
 -				<artifactId>spring-orm</artifactId>
 -				<version>${spring-orm-version}</version>
 -			</dependency>
 +            <!-- the core, which includes Streaming API, shared low-level abstractions (but NOT data-binding) --> +            <dependency> +                <groupId>com.fasterxml.jackson.core</groupId> +                <artifactId>jackson-core</artifactId> +                <version>${jackson-version}</version> +			</dependency> +			<!-- databinding; ObjectMapper, JsonNode and related classes are here --> +			<dependency> +                <groupId>com.fasterxml.jackson.core</groupId> +                <artifactId>jackson-databind</artifactId> +                <version>${jackson-version}</version> +            </dependency> +            <dependency> +                <groupId>com.fasterxml.jackson.core</groupId> +                <artifactId>jackson-annotations</artifactId> +                <version>${jackson-version}</version> +            </dependency> +			<dependency> +				<groupId>commons-cli</groupId> +				<artifactId>commons-cli</artifactId> +				<version>${apache-cli-version}</version> +			</dependency> +			  			<dependency>
  				<groupId>org.easymock</groupId>
 @@ -707,69 +695,69 @@  				<artifactId>unitils-core</artifactId>
  				<version>3.4.2</version>
  			</dependency>
 -        </dependencies>
 -    </dependencyManagement>
 -
 -    <dependencies>
 -        <dependency>
 -            <groupId>iaik.prod</groupId>
 -            <artifactId>iaik_Pkcs11Wrapper</artifactId>
 -            <classifier>win32</classifier>
 -            <type>dll</type>
 -            <scope>runtime</scope>
 -        </dependency>
 -        <dependency>
 -            <groupId>iaik.prod</groupId>
 -            <artifactId>iaik_Pkcs11Wrapper</artifactId>
 -            <classifier>linux</classifier>
 -            <type>so</type>
 -            <scope>runtime</scope>
 -        </dependency>
 -        <dependency>
 -            <groupId>iaik.prod</groupId>
 -            <artifactId>iaik_Pkcs11Wrapper</artifactId>
 -            <classifier>linux_x64</classifier>
 -            <type>so</type>
 -            <scope>runtime</scope>
 -        </dependency>
 -        <dependency>
 -            <groupId>iaik.prod</groupId>
 -            <artifactId>iaik_Pkcs11Wrapper</artifactId>
 -            <classifier>solaris_sparc</classifier>
 -            <type>so</type>
 -            <scope>runtime</scope>
 -        </dependency>
 -        <dependency>
 -            <groupId>iaik.prod</groupId>
 -            <artifactId>iaik_Pkcs11Wrapper</artifactId>
 -            <classifier>solaris_sparcv9</classifier>
 -            <type>so</type>
 -            <scope>runtime</scope>
 -        </dependency>
 -        <dependency>
 -            <groupId>iaik.prod</groupId>
 -            <artifactId>iaik_Pkcs11Wrapper</artifactId>
 -            <classifier>win64</classifier>
 -            <type>dll</type>
 -            <scope>runtime</scope>
 -        </dependency>
 -        <dependency>
 -            <groupId>commons-io</groupId>
 -            <artifactId>commons-io</artifactId>
 -            <version>2.4</version>
 -        </dependency>
 -
 -    </dependencies>
 -
 -    <repositories>
 -        <repository>
 -            <id>MOA</id>
 -            <name>MOA Dependencies</name>
 -            <!--releases>
 -                <enabled>false</enabled>
 -                </releases-->
 -            <layout>default</layout>
 -            <url>file://${repositoryPath}</url>
 -        </repository>
 -    </repositories>
 -</project>
 +        </dependencies> +    </dependencyManagement> + +    <dependencies> +        <dependency> +            <groupId>iaik.prod</groupId> +            <artifactId>iaik_Pkcs11Wrapper</artifactId> +            <classifier>win32</classifier> +            <type>dll</type> +            <scope>runtime</scope> +        </dependency> +        <dependency> +            <groupId>iaik.prod</groupId> +            <artifactId>iaik_Pkcs11Wrapper</artifactId> +            <classifier>linux</classifier> +            <type>so</type> +            <scope>runtime</scope> +        </dependency> +        <dependency> +            <groupId>iaik.prod</groupId> +            <artifactId>iaik_Pkcs11Wrapper</artifactId> +            <classifier>linux_x64</classifier> +            <type>so</type> +            <scope>runtime</scope> +        </dependency> +        <dependency> +            <groupId>iaik.prod</groupId> +            <artifactId>iaik_Pkcs11Wrapper</artifactId> +            <classifier>solaris_sparc</classifier> +            <type>so</type> +            <scope>runtime</scope> +        </dependency> +        <dependency> +            <groupId>iaik.prod</groupId> +            <artifactId>iaik_Pkcs11Wrapper</artifactId> +            <classifier>solaris_sparcv9</classifier> +            <type>so</type> +            <scope>runtime</scope> +        </dependency> +        <dependency> +            <groupId>iaik.prod</groupId> +            <artifactId>iaik_Pkcs11Wrapper</artifactId> +            <classifier>win64</classifier> +            <type>dll</type> +            <scope>runtime</scope> +        </dependency> +        <dependency> +            <groupId>commons-io</groupId> +            <artifactId>commons-io</artifactId> +            <version>2.4</version> +        </dependency> + +    </dependencies> + +    <repositories> +        <repository> +            <id>MOA</id> +            <name>MOA Dependencies</name> +            <!--releases> +                <enabled>false</enabled> +                </releases--> +            <layout>default</layout> +            <url>file://${repositoryPath}</url> +        </repository> +    </repositories> +</project> | 
