aboutsummaryrefslogtreecommitdiff
path: root/id/server/idserverlib/pom.xml
diff options
context:
space:
mode:
authorThomas Lenz <tlenz@iaik.tugraz.at>2014-05-09 12:31:39 +0200
committerThomas Lenz <tlenz@iaik.tugraz.at>2014-05-09 12:31:39 +0200
commit408246a7cd0f8931f224d9d4d8e4469ab7bc6a21 (patch)
tree9726e6807e9cc0ca4b7603068f314a31a14349d1 /id/server/idserverlib/pom.xml
parentbb06ad890498e2428c3f4268ae2f732a0f75bd77 (diff)
parent719b06ae04a8d96bf24268a4e25a0cd7b0768e95 (diff)
downloadmoa-id-spss-408246a7cd0f8931f224d9d4d8e4469ab7bc6a21.tar.gz
moa-id-spss-408246a7cd0f8931f224d9d4d8e4469ab7bc6a21.tar.bz2
moa-id-spss-408246a7cd0f8931f224d9d4d8e4469ab7bc6a21.zip
merge SSO interfederation into Snapshot branch
Conflicts: id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditOAAction.java id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/AuthenticationRequest.java id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/MandateRetrievalRequest.java
Diffstat (limited to 'id/server/idserverlib/pom.xml')
-rw-r--r--id/server/idserverlib/pom.xml23
1 files changed, 22 insertions, 1 deletions
diff --git a/id/server/idserverlib/pom.xml b/id/server/idserverlib/pom.xml
index 285a5da9c..5ce26814a 100644
--- a/id/server/idserverlib/pom.xml
+++ b/id/server/idserverlib/pom.xml
@@ -3,12 +3,13 @@
<parent>
<groupId>MOA.id</groupId>
<artifactId>moa-id</artifactId>
- <version>2.0.1</version>
+ <version>2.0.x</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>MOA.id.server</groupId>
<artifactId>moa-id-lib</artifactId>
+ <version>${moa-id-version}</version>
<packaging>jar</packaging>
<name>MOA ID API</name>
@@ -270,7 +271,26 @@
</dependencies>
<build>
+ <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-compiler-plugin</artifactId>
@@ -339,6 +359,7 @@
</executions>
</plugin>
</plugins>
+ </pluginManagement>
</build>
</project>