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-commons/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-commons/pom.xml')
| -rw-r--r-- | id/server/stork2-commons/pom.xml | 51 |
1 files changed, 14 insertions, 37 deletions
diff --git a/id/server/stork2-commons/pom.xml b/id/server/stork2-commons/pom.xml index 1a8dfd786..a989ea946 100644 --- a/id/server/stork2-commons/pom.xml +++ b/id/server/stork2-commons/pom.xml @@ -12,14 +12,13 @@ <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> The STORKCommons library provides beans, Java Interfaces and utility classes to integrate PEPS and SAML Engine. </description> - + <repositories> <repository> <id>shibboleth.internet2.edu</id> @@ -34,7 +33,7 @@ <dependency> <groupId>joda-time</groupId> <artifactId>joda-time</artifactId> - <version>${jodatime.version}</version> + <version>2.3</version> </dependency> <!-- Log4J --> @@ -61,9 +60,15 @@ </exclusions> </dependency> + <!-- Bouncy Castle --> + <dependency> + <groupId>org.bouncycastle</groupId> + <artifactId>bcprov-jdk16</artifactId> + </dependency> + <dependency> - <groupId>org.opensaml</groupId> - <artifactId>opensaml</artifactId> + <groupId>org.opensaml</groupId> + <artifactId>opensaml</artifactId> <exclusions> <exclusion> <groupId>org.slf4j</groupId> @@ -88,18 +93,11 @@ </exclusions> </dependency> - <!-- Bouncy Castle --> - <dependency> - <groupId>org.bouncycastle</groupId> - <artifactId>bcprov-jdk16</artifactId> - </dependency> - <!-- Servlet API --> <!-- provided by Application Server --> <dependency> <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> - <version>2.5</version> <scope>provided</scope> </dependency> @@ -128,7 +126,6 @@ <configuration> <source>1.7</source> <target>1.7</target> - <encoding>UTF-8</encoding> </configuration> </plugin> <plugin> @@ -136,7 +133,7 @@ <artifactId>maven-surefire-plugin</artifactId> <configuration> <runOrder>reversealphabetical</runOrder> - <skip>false</skip> + <skip>true</skip> <includes> <runOrder>reversealphabetical</runOrder> <include>**/PEPSUtilTest.java</include> @@ -150,27 +147,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> @@ -178,8 +154,9 @@ <configuration> <links> <link>http://commons.apache.org/lang/api/</link> + <link>http://java.sun.com/j2se/1.6.0/docs/api/</link> <link>http://www.bouncycastle.org/docs/docs1.6/</link> - <link>http://docs.oracle.com/javase/7/docs/api/</link> + <link>http://docs.oracle.com/javase/6/docs/api/</link> </links> </configuration> </plugin> |