diff options
| author | Florian Reimair <florian.reimair@iaik.tugraz.at> | 2015-08-11 14:30:07 +0200 | 
|---|---|---|
| committer | Florian Reimair <florian.reimair@iaik.tugraz.at> | 2015-08-11 14:30:07 +0200 | 
| commit | 04381eb4e2d67ced539b34747403bb06cdf36c53 (patch) | |
| tree | b5513c0ccf37f201810ecea4a7af5c21dec60739 /id/server | |
| parent | 7d6f5207275778350bff8f23087fe1c905210e2b (diff) | |
| download | moa-id-spss-04381eb4e2d67ced539b34747403bb06cdf36c53.tar.gz moa-id-spss-04381eb4e2d67ced539b34747403bb06cdf36c53.tar.bz2 moa-id-spss-04381eb4e2d67ced539b34747403bb06cdf36c53.zip | |
poms
Diffstat (limited to 'id/server')
| -rw-r--r-- | id/server/stork2-commons/pom.xml | 26 | ||||
| -rw-r--r-- | id/server/stork2-saml-engine/pom.xml | 39 | 
2 files changed, 9 insertions, 56 deletions
| diff --git a/id/server/stork2-commons/pom.xml b/id/server/stork2-commons/pom.xml index c4eea5152..3bc3dae77 100644 --- a/id/server/stork2-commons/pom.xml +++ b/id/server/stork2-commons/pom.xml @@ -12,8 +12,7 @@  	<name>Stork Commons</name>  	<properties>  		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> -		<stork.version>1.4.0</stork.version> -		<opensaml.version>2.6.3</opensaml.version> +		<stork.version>1.5.1</stork.version>  	</properties>  	<version>${stork.version}</version>    <description> @@ -56,7 +55,6 @@  		<dependency>  			<groupId>org.opensaml</groupId>  			<artifactId>opensaml</artifactId> -			<version>${opensaml.version}</version>  			<exclusions>  				<exclusion>  				    <groupId>org.slf4j</groupId> @@ -86,7 +84,6 @@  		<dependency>  			<groupId>javax.servlet</groupId>  			<artifactId>servlet-api</artifactId> -			<version>2.5</version>  			<scope>provided</scope>  		</dependency> @@ -136,27 +133,6 @@  			</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-javadoc-plugin</artifactId> diff --git a/id/server/stork2-saml-engine/pom.xml b/id/server/stork2-saml-engine/pom.xml index 590e8f4c3..4effa9d1c 100644 --- a/id/server/stork2-saml-engine/pom.xml +++ b/id/server/stork2-saml-engine/pom.xml @@ -16,8 +16,7 @@  		<saml.version>1.5.1</saml.version>
  		<samlspec.version>0.5.2</samlspec.version>
  		<samlspecacept.version>0.5.1</samlspecacept.version>
 -		<commons.version>1.4.0</commons.version>
 -		<opensaml.version>2.6.2</opensaml.version>
 +		<commons.version>1.5.1</commons.version>
  		<timestamp>${maven.build.timestamp}</timestamp>
  		<repositoryPath>${basedir}/../../../repository</repositoryPath>
  	</properties>
 @@ -50,11 +49,16 @@  			<artifactId>Commons</artifactId>
  			<version>${commons.version}</version>
  		</dependency>
 +		
 +		<dependency>
 +			<groupId>org.opensaml</groupId>
 +			<artifactId>xmltooling</artifactId>
 +        </dependency>
 +		
  		<dependency>
  			<groupId>org.opensaml</groupId>
  			<artifactId>opensaml</artifactId>
 -			<version>${opensaml.version}</version>
  			<exclusions>
  				<exclusion>
  					<groupId>org.slf4j</groupId>
 @@ -83,11 +87,6 @@  			</exclusions>
  		</dependency>
 -        <dependency>
 -            <groupId>org.opensaml</groupId>
 -            <artifactId>xmltooling</artifactId>
 -            </dependency>
 -
  		<dependency>
  			<groupId>org.slf4j</groupId>
  			<artifactId>slf4j-api</artifactId>
 @@ -101,10 +100,9 @@  			<groupId>org.slf4j</groupId>
  			<artifactId>jcl-over-slf4j</artifactId>
  		</dependency>
 -<!-- 		<dependency>
 +<!--		<dependency>
  			<groupId>org.slf4j</groupId>
  			<artifactId>log4j-over-slf4j</artifactId>
 -			<version>1.7.6</version>
  		</dependency> -->
  		<dependency>
  			<groupId>org.slf4j</groupId>
 @@ -148,30 +146,9 @@  						<skip>true</skip>
  					</configuration>
  				</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-source-plugin</artifactId>
 | 
