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 /id/ConfigWebTool/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 'id/ConfigWebTool/pom.xml')
| -rw-r--r-- | id/ConfigWebTool/pom.xml | 39 |
1 files changed, 30 insertions, 9 deletions
diff --git a/id/ConfigWebTool/pom.xml b/id/ConfigWebTool/pom.xml index 57aa5c794..aaadb1969 100644 --- a/id/ConfigWebTool/pom.xml +++ b/id/ConfigWebTool/pom.xml @@ -3,13 +3,13 @@ <parent> <groupId>MOA</groupId> <artifactId>id</artifactId> - <version>2.0.1</version> + <version>2.0.x</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>MOA.id</groupId> <artifactId>moa-id-configuration</artifactId> - <version>1.0.1</version> + <version>${configtool-version}</version> <packaging>war</packaging> <name>MOA-ID 2.0 Configuration Tool</name> <description>Web based Configuration Tool for MOA-ID 2.x</description> @@ -73,7 +73,6 @@ <dependency> <groupId>MOA.id.server</groupId> <artifactId>moa-id-lib</artifactId> - <!-- <version>1.9.98-SNAPSHOT</version> --> <exclusions> <exclusion> <groupId>*</groupId> @@ -142,20 +141,42 @@ </dependencies> <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-war-plugin</artifactId> <version>2.4</version> <configuration> <archive> <manifestEntries> - <version>${project.version}</version> + <version>${configtool-version}</version> </manifestEntries> - </archive> - </configuration> -</plugin> - </plugins> + </archive> + </configuration> + </plugin> + </plugins> + </pluginManagement> </build> </project> |