diff options
| author | Thomas Lenz <tlenz@iaik.tugraz.at> | 2015-08-27 12:07:52 +0200 |
|---|---|---|
| committer | Thomas Lenz <tlenz@iaik.tugraz.at> | 2015-08-27 12:07:52 +0200 |
| commit | 1051a42329a603821f415383343d253724d4cd65 (patch) | |
| tree | f8a0b6e8445b7034dfe38d6ba3a61f1429a75a6e /id/server/stork2-saml-engine/pom.xml | |
| parent | bb1b12ac5b240629e16ea1c7a50891e99f4adc14 (diff) | |
| parent | eb0cf88708f3d689c2cb6bb0dbf83dd290bee887 (diff) | |
| download | moa-id-spss-1051a42329a603821f415383343d253724d4cd65.tar.gz moa-id-spss-1051a42329a603821f415383343d253724d4cd65.tar.bz2 moa-id-spss-1051a42329a603821f415383343d253724d4cd65.zip | |
Merge STORK-SAML-Engine 1.5.1 and STORK-Commons 1.5.1
Conflicts:
id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/AttributeProviderFactory.java
id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/validator/CustomAttributeQueryValidator.java
id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/validator/MultipleAssertionResponseValidator.java
Diffstat (limited to 'id/server/stork2-saml-engine/pom.xml')
| -rw-r--r-- | id/server/stork2-saml-engine/pom.xml | 48 |
1 files changed, 10 insertions, 38 deletions
diff --git a/id/server/stork2-saml-engine/pom.xml b/id/server/stork2-saml-engine/pom.xml index 36df747e4..ee4a61f3a 100644 --- a/id/server/stork2-saml-engine/pom.xml +++ b/id/server/stork2-saml-engine/pom.xml @@ -13,11 +13,10 @@ <name>STORKSAMLEngine</name>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <saml.version>1.4.0</saml.version>
+ <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>
@@ -48,14 +47,14 @@ <dependency>
<groupId>eu.stork</groupId>
<artifactId>Commons</artifactId>
- <version>${commons.version}</version>
-<!-- <exclusions>
- <exclusion>
- <groupId>org.bouncycastle</groupId>
- <artifactId>bcprov-jdk16</artifactId>
- </exclusion>
- </exclusions> -->
+ <version>1.5.1</version>
</dependency>
+
+ <dependency>
+ <groupId>org.opensaml</groupId>
+ <artifactId>xmltooling</artifactId>
+ </dependency>
+
<dependency>
<groupId>org.opensaml</groupId>
@@ -88,11 +87,6 @@ </exclusions>
</dependency>
- <dependency>
- <groupId>org.opensaml</groupId>
- <artifactId>xmltooling</artifactId>
- </dependency>
-
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
@@ -106,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>
@@ -153,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>
|