diff options
| author | Thomas Lenz <tlenz@iaik.tugraz.at> | 2014-02-03 15:38:24 +0100 |
|---|---|---|
| committer | Thomas Lenz <tlenz@iaik.tugraz.at> | 2014-02-03 15:38:24 +0100 |
| commit | ef35deb727190363d17d693d10f27171787cc92c (patch) | |
| tree | 92f4a4c6133147716328f93b86239d5dd8fcc629 /id/server/stork2-saml-engine/pom.xml | |
| parent | 4333fd60c637f2a739e3db17d00f61c68c465a8e (diff) | |
| download | moa-id-spss-ef35deb727190363d17d693d10f27171787cc92c.tar.gz moa-id-spss-ef35deb727190363d17d693d10f27171787cc92c.tar.bz2 moa-id-spss-ef35deb727190363d17d693d10f27171787cc92c.zip | |
Solve some merge problems
Diffstat (limited to 'id/server/stork2-saml-engine/pom.xml')
| -rw-r--r-- | id/server/stork2-saml-engine/pom.xml | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/id/server/stork2-saml-engine/pom.xml b/id/server/stork2-saml-engine/pom.xml index 6be0472a7..b002471db 100644 --- a/id/server/stork2-saml-engine/pom.xml +++ b/id/server/stork2-saml-engine/pom.xml @@ -1,5 +1,11 @@ <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">
+ <parent>
+ <groupId>MOA.id</groupId>
+ <artifactId>moa-id</artifactId>
+ <version>1.9.98-SNAPSHOT</version>
+ </parent>
+
<modelVersion>4.0.0</modelVersion>
<groupId>eu.stork</groupId>
<artifactId>SamlEngine</artifactId>
|