diff options
| author | Thomas Lenz <tlenz@iaik.tugraz.at> | 2014-05-09 12:31:39 +0200 |
|---|---|---|
| committer | Thomas Lenz <tlenz@iaik.tugraz.at> | 2014-05-09 12:31:39 +0200 |
| commit | 408246a7cd0f8931f224d9d4d8e4469ab7bc6a21 (patch) | |
| tree | 9726e6807e9cc0ca4b7603068f314a31a14349d1 /pom.xml | |
| parent | bb06ad890498e2428c3f4268ae2f732a0f75bd77 (diff) | |
| parent | 719b06ae04a8d96bf24268a4e25a0cd7b0768e95 (diff) | |
| download | moa-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 'pom.xml')
| -rw-r--r-- | pom.xml | 44 |
1 files changed, 34 insertions, 10 deletions
@@ -4,12 +4,18 @@ <groupId>MOA</groupId>
<artifactId>MOA</artifactId>
<packaging>pom</packaging>
- <version>2.0.1</version>
+ <version>${moa-idspss-version}</version>
<name>MOA</name>
<properties>
<repositoryPath>${basedir}/repository</repositoryPath>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+
+ <moa-idspss-version>2.0.2</moa-idspss-version>
+ <moa-id-version>2.0.2-Snapshot</moa-id-version>
+ <moa-spss-version>2.0.1</moa-spss-version>
+ <configtool-version>1.0.2-Snapshot</configtool-version>
+ <demo-oa-version>2.0.1</demo-oa-version>
</properties>
<profiles>
@@ -51,15 +57,33 @@ </profiles>
<build>
+ <pluginManagement>
<plugins>
- <plugin>
+ <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-surefire-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
-
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
@@ -100,7 +124,7 @@ </configuration>
</plugin>
</plugins>
-
+ </pluginManagement>
</build>
<reporting>
@@ -216,38 +240,38 @@ <dependency>
<groupId>MOA</groupId>
<artifactId>moa-common</artifactId>
- <version>2.0.1</version>
+ <version>${moa-idspss-version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>MOA.id.server</groupId>
<artifactId>moa-id-lib</artifactId>
- <version>2.0.1</version>
+ <version>${moa-id-version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>MOA.id.server</groupId>
<artifactId>moa-id-commons</artifactId>
- <version>2.0.1</version>
+ <version>${moa-id-version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>MOA.spss.server</groupId>
<artifactId>moa-spss-lib</artifactId>
- <version>2.0.1</version>
+ <version>${moa-spss-version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>MOA</groupId>
<artifactId>moa-common</artifactId>
- <version>2.0.1</version>
+ <version>${moa-idspss-version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>MOA.spss.server</groupId>
<artifactId>moa-spss-tools</artifactId>
- <version>2.0.1</version>
+ <version>${moa-spss-version}</version>
<scope>test</scope>
</dependency>
<dependency>
|