diff options
| author | Thomas Lenz <tlenz@iaik.tugraz.at> | 2013-12-19 07:48:56 +0100 |
|---|---|---|
| committer | Thomas Lenz <tlenz@iaik.tugraz.at> | 2013-12-19 07:48:56 +0100 |
| commit | 6e01fbb21b23d187cdb169ef0be8dfc15fc6638f (patch) | |
| tree | d4ba735a5bd2f3f8e3e7f66372ccd5eef46e51fb /id/ConfigWebTool/pom.xml | |
| parent | ddd803e73a4519132ce2257c621b54d004f2235f (diff) | |
| parent | 351f8be591412e124b6d578c1afd3f72f3c25d8f (diff) | |
| download | moa-id-spss-6e01fbb21b23d187cdb169ef0be8dfc15fc6638f.tar.gz moa-id-spss-6e01fbb21b23d187cdb169ef0be8dfc15fc6638f.tar.bz2 moa-id-spss-6e01fbb21b23d187cdb169ef0be8dfc15fc6638f.zip | |
merge last changes to exthex.OAuth testrelease
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/auth/builder/StartAuthenticationBuilder.java
id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/AuthConfigurationProvider.java
Diffstat (limited to 'id/ConfigWebTool/pom.xml')
| -rw-r--r-- | id/ConfigWebTool/pom.xml | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/id/ConfigWebTool/pom.xml b/id/ConfigWebTool/pom.xml index dd56a6151..16eb9bc4f 100644 --- a/id/ConfigWebTool/pom.xml +++ b/id/ConfigWebTool/pom.xml @@ -2,13 +2,13 @@ <parent> <groupId>MOA</groupId> <artifactId>id</artifactId> - <version>1.9.96-SNAPSHOT</version> + <version>1.9.97-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>MOA.id</groupId> <artifactId>ConfigurationInterface</artifactId> - <version>0.9.5</version> + <version>0.9.6</version> <packaging>war</packaging> <name>MOA-ID 2.0 Configuration Tool</name> <description>Web based Configuration Tool for MOA-ID 2.x</description> @@ -34,12 +34,11 @@ <dependency> <groupId>MOA.id.server</groupId> <artifactId>moa-id-commons</artifactId> - <version>1.9.96-SNAPSHOT</version> + <version>1.9.97-SNAPSHOT</version> </dependency> <dependency> <groupId>MOA.id.server</groupId> <artifactId>moa-id-lib</artifactId> - <version>1.9.96-SNAPSHOT</version> </dependency> <dependency> |