diff options
Diffstat (limited to 'id/server/idserverlib')
| -rw-r--r-- | id/server/idserverlib/pom.xml | 230 | 
1 files changed, 49 insertions, 181 deletions
| diff --git a/id/server/idserverlib/pom.xml b/id/server/idserverlib/pom.xml index 445de36ee..9975fee54 100644 --- a/id/server/idserverlib/pom.xml +++ b/id/server/idserverlib/pom.xml @@ -61,18 +61,25 @@      <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>
 @@ -84,60 +91,32 @@              <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>eu.stork</groupId>
 -            <artifactId>SamlEngine</artifactId>
 -            <version>1.5.1</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>
 +			</dependency>
 +  
 +  		<dependency>
 +				<groupId>jakarta-regexp</groupId>
 +				<artifactId>jakarta-regexp</artifactId>
 +				<version>1.4</version>
 +			</dependency>
 +  
  		   <dependency>
              <groupId>at.gv.util</groupId>
              <artifactId>egovutils</artifactId>
 @@ -166,6 +145,10 @@                  	<artifactId>jaxb-core</artifactId>
                  	<groupId>com.sun.xml.bind</groupId>
                  </exclusion>
 +                <exclusion>
 +                	<artifactId>xml-apis</artifactId>
 +                	<groupId>xml-apis</groupId>
 +                </exclusion>
              </exclusions>
          </dependency>
 @@ -183,6 +166,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>
 @@ -201,83 +189,6 @@  			<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>
 @@ -318,33 +229,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>
 @@ -390,23 +275,6 @@  		</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>
 -        -->
 -
  		<!-- the core, which includes Streaming API, shared low-level abstractions (but NOT data-binding) -->
  		<dependency>
  			<groupId>com.fasterxml.jackson.core</groupId>
 | 
