diff options
| author | Thomas Lenz <tlenz@iaik.tugraz.at> | 2015-02-18 13:47:14 +0100 |
|---|---|---|
| committer | Thomas Lenz <tlenz@iaik.tugraz.at> | 2015-02-18 13:47:14 +0100 |
| commit | bf086cff8ef680b73ca0300147c3c3b70ab32ae0 (patch) | |
| tree | 1174cdc916982f5f879cde1fc587147a7dced63d /spss/handbook | |
| parent | 570527d48e3bf03444cdda08a4c1bcf8e7d4ff42 (diff) | |
| parent | 271e22add71f0260f5d421844a2171a09093f505 (diff) | |
| download | moa-id-spss-bf086cff8ef680b73ca0300147c3c3b70ab32ae0.tar.gz moa-id-spss-bf086cff8ef680b73ca0300147c3c3b70ab32ae0.tar.bz2 moa-id-spss-bf086cff8ef680b73ca0300147c3c3b70ab32ae0.zip | |
Merge branch 'datentechnik_modularization' into moa-id-2.2-merge
Conflicts:
id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/GenerateIFrameTemplateServlet.java
id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/AuthenticationManager.java
id/server/stork2-commons/pom.xml
id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/.svn/entries
id/server/stork2-commons/src/main/resources/.svn/entries
id/server/stork2-saml-engine/pom.xml
pom.xml
Diffstat (limited to 'spss/handbook')
| -rw-r--r-- | spss/handbook/clients/api/pom.xml | 1 | ||||
| -rw-r--r-- | spss/handbook/clients/pom.xml | 1 | ||||
| -rw-r--r-- | spss/handbook/clients/referencedData/pom.xml | 1 | ||||
| -rw-r--r-- | spss/handbook/clients/webservice/pom.xml | 2 |
4 files changed, 0 insertions, 5 deletions
diff --git a/spss/handbook/clients/api/pom.xml b/spss/handbook/clients/api/pom.xml index 581c29e56..0690b65e3 100644 --- a/spss/handbook/clients/api/pom.xml +++ b/spss/handbook/clients/api/pom.xml @@ -9,7 +9,6 @@ <groupId>MOA.spss.handbook</groupId>
<artifactId>moa-spss-handbook-apiClient</artifactId>
<packaging>jar</packaging>
- <version>2.0</version>
<name>MOA SP/SS Handbook API Client</name>
<properties>
diff --git a/spss/handbook/clients/pom.xml b/spss/handbook/clients/pom.xml index c104c6c3b..1dfa3d532 100644 --- a/spss/handbook/clients/pom.xml +++ b/spss/handbook/clients/pom.xml @@ -10,7 +10,6 @@ <groupId>MOA.spss.handbook.clients</groupId>
<artifactId>moa-spss-handbook-clients</artifactId>
<packaging>pom</packaging>
- <version>2.0</version>
<name>MOA SP/SS Handbook Clients</name>
<modules>
diff --git a/spss/handbook/clients/referencedData/pom.xml b/spss/handbook/clients/referencedData/pom.xml index 3a220fd4d..e9370cd44 100644 --- a/spss/handbook/clients/referencedData/pom.xml +++ b/spss/handbook/clients/referencedData/pom.xml @@ -10,7 +10,6 @@ <groupId>MOA.spss.handbook</groupId>
<artifactId>moa-spss-handbook-referencedData</artifactId>
<packaging>war</packaging>
- <version>2.0</version>
<name>MOA SP/SS Handbook Referenced Data</name>
<properties>
diff --git a/spss/handbook/clients/webservice/pom.xml b/spss/handbook/clients/webservice/pom.xml index 50850b592..9a98ce472 100644 --- a/spss/handbook/clients/webservice/pom.xml +++ b/spss/handbook/clients/webservice/pom.xml @@ -6,10 +6,8 @@ </parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>MOA.spss.handbook.clients</groupId>
<artifactId>moa-spss-handbook-webserviceClient</artifactId>
<packaging>jar</packaging>
- <version>2.0</version>
<name>MOA SP/SS Handbook WebService Client</name>
<properties>
|