diff options
30 files changed, 44 insertions, 38 deletions
diff --git a/id/ConfigWebTool/pom.xml b/id/ConfigWebTool/pom.xml index 7f503d533..d3fbe9899 100644 --- a/id/ConfigWebTool/pom.xml +++ b/id/ConfigWebTool/pom.xml @@ -3,7 +3,7 @@ <parent> <groupId>MOA</groupId> <artifactId>id</artifactId> - <version>3.x</version> + <version>4.0.1-snapshot</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/id/moa-id-webgui/pom.xml b/id/moa-id-webgui/pom.xml index a3b3675ef..718471e05 100644 --- a/id/moa-id-webgui/pom.xml +++ b/id/moa-id-webgui/pom.xml @@ -3,7 +3,7 @@ <parent> <groupId>MOA</groupId> <artifactId>id</artifactId> - <version>3.x</version> + <version>4.0.1-snapshot</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/id/moa-spss-container/pom.xml b/id/moa-spss-container/pom.xml index 992ace415..e8f71321e 100644 --- a/id/moa-spss-container/pom.xml +++ b/id/moa-spss-container/pom.xml @@ -3,11 +3,10 @@ <parent> <groupId>MOA</groupId> <artifactId>id</artifactId> - <version>3.x</version> + <version>4.0.1-snapshot</version> </parent> <groupId>MOA.id</groupId> <artifactId>moa-spss-container</artifactId> - <version>${moa-id-version}</version> <name>MOA-SPSS-Container-for-MOA-ID</name> <description>This module holds MOA-SPSS and all required library</description> diff --git a/id/oa/pom.xml b/id/oa/pom.xml index 07b84ed1b..4c5d16571 100644 --- a/id/oa/pom.xml +++ b/id/oa/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>MOA</groupId> <artifactId>id</artifactId> - <version>3.x</version> + <version>4.0.1-snapshot</version> </parent> <modelVersion>4.0.0</modelVersion> @@ -139,6 +139,19 @@ </exclusions> </dependency> + <dependency> + <groupId>org.bouncycastle</groupId> + <artifactId>bcpkix-jdk15on</artifactId> + <version>1.62</version> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.bouncycastle</groupId> + <artifactId>bcprov-jdk15on</artifactId> + <version>1.62</version> + </dependency> + </dependencies> </project> diff --git a/id/pom.xml b/id/pom.xml index 4aff9f373..c9b13276e 100644 --- a/id/pom.xml +++ b/id/pom.xml @@ -3,12 +3,11 @@ <parent> <groupId>MOA</groupId> <artifactId>MOA</artifactId> - <version>2.x</version> + <version>4.0.1-snapshot</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>id</artifactId> - <version>3.x</version> <packaging>pom</packaging> <name>MOA ID</name> diff --git a/id/server/auth-edu/pom.xml b/id/server/auth-edu/pom.xml index 984eee6e4..f662f11e3 100644 --- a/id/server/auth-edu/pom.xml +++ b/id/server/auth-edu/pom.xml @@ -2,7 +2,7 @@ <parent> <groupId>MOA.id</groupId> <artifactId>moa-id</artifactId> - <version>3.x</version> + <version>4.0.1-snapshot</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/id/server/auth-final/pom.xml b/id/server/auth-final/pom.xml index a18c986c2..f3705c1f7 100644 --- a/id/server/auth-final/pom.xml +++ b/id/server/auth-final/pom.xml @@ -2,7 +2,7 @@ <parent> <groupId>MOA.id</groupId> <artifactId>moa-id</artifactId> - <version>3.x</version> + <version>4.0.1-snapshot</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/id/server/idserverlib/pom.xml b/id/server/idserverlib/pom.xml index c921dacf8..ae70a6a7e 100644 --- a/id/server/idserverlib/pom.xml +++ b/id/server/idserverlib/pom.xml @@ -4,12 +4,11 @@ <parent>
<groupId>MOA.id</groupId>
<artifactId>moa-id</artifactId>
- <version>3.x</version>
+ <version>4.0.1-snapshot</version>
</parent>
<groupId>MOA.id.server</groupId>
<artifactId>moa-id-lib</artifactId>
- <version>${moa-id-version}</version>
<packaging>jar</packaging>
<name>MOA ID API</name>
diff --git a/id/server/moa-id-commons/pom.xml b/id/server/moa-id-commons/pom.xml index aef981013..86771932f 100644 --- a/id/server/moa-id-commons/pom.xml +++ b/id/server/moa-id-commons/pom.xml @@ -4,12 +4,11 @@ <parent> <groupId>MOA.id</groupId> <artifactId>moa-id</artifactId> - <version>3.x</version> + <version>4.0.1-snapshot</version> </parent> <artifactId>moa-id-commons</artifactId> <name>moa-id-commons</name> <groupId>MOA.id.server</groupId> - <version>${moa-id-version}</version> <profiles> <profile> diff --git a/id/server/moa-id-frontend-resources/pom.xml b/id/server/moa-id-frontend-resources/pom.xml index 4a960e359..39a7b2e47 100644 --- a/id/server/moa-id-frontend-resources/pom.xml +++ b/id/server/moa-id-frontend-resources/pom.xml @@ -3,12 +3,11 @@ <parent> <groupId>MOA.id</groupId> <artifactId>moa-id</artifactId> - <version>3.x</version> + <version>4.0.1-snapshot</version> </parent> <groupId>MOA.id.server</groupId> <artifactId>moa-id-frontend-resources</artifactId> - <version>${moa-id-version}</version> <packaging>jar</packaging> <name>MOA-ID-Auth FrontEnd-Resources</name> diff --git a/id/server/moa-id-jaxb_classes/pom.xml b/id/server/moa-id-jaxb_classes/pom.xml index 3d205bb06..1c1eb7121 100644 --- a/id/server/moa-id-jaxb_classes/pom.xml +++ b/id/server/moa-id-jaxb_classes/pom.xml @@ -3,7 +3,7 @@ <parent> <groupId>MOA.id</groupId> <artifactId>moa-id</artifactId> - <version>3.x</version> + <version>4.0.1-snapshot</version> </parent> <groupId>MOA.id.server</groupId> <artifactId>moa-id-jaxb_classes</artifactId> diff --git a/id/server/moa-id-spring-initializer/pom.xml b/id/server/moa-id-spring-initializer/pom.xml index 967a7cc7c..7e10ba2f6 100644 --- a/id/server/moa-id-spring-initializer/pom.xml +++ b/id/server/moa-id-spring-initializer/pom.xml @@ -3,12 +3,11 @@ <parent> <groupId>MOA.id</groupId> <artifactId>moa-id</artifactId> - <version>3.x</version> + <version>4.0.1-snapshot</version> </parent> <groupId>MOA.id.server</groupId> <artifactId>moa-id-spring-initializer</artifactId> - <version>${moa-id-version}</version> <packaging>jar</packaging> <name>MOA-ID Spring Initializer</name> diff --git a/id/server/modules/moa-id-modul-citizencard_authentication/pom.xml b/id/server/modules/moa-id-modul-citizencard_authentication/pom.xml index e5b38f9b6..74e7a963c 100644 --- a/id/server/modules/moa-id-modul-citizencard_authentication/pom.xml +++ b/id/server/modules/moa-id-modul-citizencard_authentication/pom.xml @@ -3,7 +3,7 @@ <parent> <groupId>MOA.id.server.modules</groupId> <artifactId>moa-id-modules</artifactId> - <version>${moa-id-version}</version> + <version>4.0.1-snapshot</version> </parent> <artifactId>moa-id-modul-citizencard_authentication</artifactId> diff --git a/id/server/modules/moa-id-module-AT_eIDAS_connector/pom.xml b/id/server/modules/moa-id-module-AT_eIDAS_connector/pom.xml index 481313035..2345d3bff 100644 --- a/id/server/modules/moa-id-module-AT_eIDAS_connector/pom.xml +++ b/id/server/modules/moa-id-module-AT_eIDAS_connector/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>MOA.id.server.modules</groupId> <artifactId>moa-id-modules</artifactId> - <version>${moa-id-version}</version> + <version>4.0.1-snapshot</version> </parent> <artifactId>moa-id-module-AT_eIDAS_connector</artifactId> <name>moa-id-module-AT_eIDAS_connector</name> diff --git a/id/server/modules/moa-id-module-E-ID_connector/pom.xml b/id/server/modules/moa-id-module-E-ID_connector/pom.xml index f945fa1d3..48723c8be 100644 --- a/id/server/modules/moa-id-module-E-ID_connector/pom.xml +++ b/id/server/modules/moa-id-module-E-ID_connector/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>MOA.id.server.modules</groupId> <artifactId>moa-id-modules</artifactId> - <version>${moa-id-version}</version> + <version>4.0.1-snapshot</version> </parent> <artifactId>moa-id-module-EID_connector</artifactId> <name>moa-id-module-E-ID_connector</name> diff --git a/id/server/modules/moa-id-module-bkaMobilaAuthSAML2Test/pom.xml b/id/server/modules/moa-id-module-bkaMobilaAuthSAML2Test/pom.xml index 0207eb6c9..882a2ad78 100644 --- a/id/server/modules/moa-id-module-bkaMobilaAuthSAML2Test/pom.xml +++ b/id/server/modules/moa-id-module-bkaMobilaAuthSAML2Test/pom.xml @@ -3,7 +3,7 @@ <parent> <groupId>MOA.id.server.modules</groupId> <artifactId>moa-id-modules</artifactId> - <version>${moa-id-version}</version> + <version>4.0.1-snapshot</version> </parent> <artifactId>moa-id-module-bkaMobilaAuthSAML2Test</artifactId> <description>BKA MobileAuth Test for SAML2 applications</description> diff --git a/id/server/modules/moa-id-module-eIDAS-v2/pom.xml b/id/server/modules/moa-id-module-eIDAS-v2/pom.xml index 2ad14a24f..e4e05a860 100644 --- a/id/server/modules/moa-id-module-eIDAS-v2/pom.xml +++ b/id/server/modules/moa-id-module-eIDAS-v2/pom.xml @@ -3,7 +3,7 @@ <parent> <groupId>MOA.id.server.modules</groupId> <artifactId>moa-id-modules</artifactId> - <version>${moa-id-version}</version> + <version>4.0.1-snapshot</version> </parent> <artifactId>moa-id-module-eIDAS-v2</artifactId> <name>MOA-ID eIDAS module v2</name> diff --git a/id/server/modules/moa-id-module-eIDAS/pom.xml b/id/server/modules/moa-id-module-eIDAS/pom.xml index 6dabb938e..199c6edb9 100644 --- a/id/server/modules/moa-id-module-eIDAS/pom.xml +++ b/id/server/modules/moa-id-module-eIDAS/pom.xml @@ -3,7 +3,7 @@ <parent> <groupId>MOA.id.server.modules</groupId> <artifactId>moa-id-modules</artifactId> - <version>${moa-id-version}</version> + <version>4.0.1-snapshot</version> </parent> <artifactId>moa-id-module-eIDAS</artifactId> <name>MOA-ID eIDAS Module</name> diff --git a/id/server/modules/moa-id-module-elga_mandate_service/pom.xml b/id/server/modules/moa-id-module-elga_mandate_service/pom.xml index 86cb4b1a7..6068c8d3d 100644 --- a/id/server/modules/moa-id-module-elga_mandate_service/pom.xml +++ b/id/server/modules/moa-id-module-elga_mandate_service/pom.xml @@ -3,7 +3,7 @@ <parent> <groupId>MOA.id.server.modules</groupId> <artifactId>moa-id-modules</artifactId> - <version>${moa-id-version}</version> + <version>4.0.1-snapshot</version> </parent> <artifactId>moa-id-module-elga_mandate_service</artifactId> <version>${moa-id-module-elga_mandate_client}</version> diff --git a/id/server/modules/moa-id-module-openID/pom.xml b/id/server/modules/moa-id-module-openID/pom.xml index 9a8dbb236..a501f555a 100644 --- a/id/server/modules/moa-id-module-openID/pom.xml +++ b/id/server/modules/moa-id-module-openID/pom.xml @@ -3,7 +3,7 @@ <parent> <groupId>MOA.id.server.modules</groupId> <artifactId>moa-id-modules</artifactId> - <version>${moa-id-version}</version> + <version>4.0.1-snapshot</version> </parent> <artifactId>moa-id-module-openID</artifactId> diff --git a/id/server/modules/moa-id-module-pvp2/pom.xml b/id/server/modules/moa-id-module-pvp2/pom.xml index 0a71e27ce..28de0c2a4 100644 --- a/id/server/modules/moa-id-module-pvp2/pom.xml +++ b/id/server/modules/moa-id-module-pvp2/pom.xml @@ -3,7 +3,7 @@ <parent> <groupId>MOA.id.server.modules</groupId> <artifactId>moa-id-modules</artifactId> - <version>${moa-id-version}</version> + <version>4.0.1-snapshot</version> </parent> <artifactId>moa-id-module-pvp2</artifactId> <name>PVP2 Module</name> diff --git a/id/server/modules/moa-id-module-sl20_authentication/pom.xml b/id/server/modules/moa-id-module-sl20_authentication/pom.xml index 6ad72adde..9a1151f25 100644 --- a/id/server/modules/moa-id-module-sl20_authentication/pom.xml +++ b/id/server/modules/moa-id-module-sl20_authentication/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>MOA.id.server.modules</groupId> <artifactId>moa-id-modules</artifactId> - <version>${moa-id-version}</version> + <version>4.0.1-snapshot</version> </parent> <artifactId>moa-id-module-sl20_authentication</artifactId> <name>moa-id-module-sl20_authentication</name> diff --git a/id/server/modules/moa-id-module-ssoTransfer/pom.xml b/id/server/modules/moa-id-module-ssoTransfer/pom.xml index b15d7dc85..bd945b0c9 100644 --- a/id/server/modules/moa-id-module-ssoTransfer/pom.xml +++ b/id/server/modules/moa-id-module-ssoTransfer/pom.xml @@ -3,7 +3,7 @@ <parent> <groupId>MOA.id.server.modules</groupId> <artifactId>moa-id-modules</artifactId> - <version>${moa-id-version}</version> + <version>4.0.1-snapshot</version> </parent> <artifactId>moa-id-module-ssoTransfer</artifactId> <name>MOA-ID_SSO_Transfer_modul</name> diff --git a/id/server/modules/moa-id-modules-federated_authentication/pom.xml b/id/server/modules/moa-id-modules-federated_authentication/pom.xml index 7e8ac86af..c3d8a970f 100644 --- a/id/server/modules/moa-id-modules-federated_authentication/pom.xml +++ b/id/server/modules/moa-id-modules-federated_authentication/pom.xml @@ -3,7 +3,7 @@ <parent> <groupId>MOA.id.server.modules</groupId> <artifactId>moa-id-modules</artifactId> - <version>${moa-id-version}</version> + <version>4.0.1-snapshot</version> </parent> <artifactId>moa-id-modules-federated_authentication</artifactId> <description>PVP2 ServiceProvider implementation for federated authentication</description> diff --git a/id/server/modules/moa-id-modules-saml1/pom.xml b/id/server/modules/moa-id-modules-saml1/pom.xml index 3a401d80e..66fe46900 100644 --- a/id/server/modules/moa-id-modules-saml1/pom.xml +++ b/id/server/modules/moa-id-modules-saml1/pom.xml @@ -3,7 +3,7 @@ <parent> <groupId>MOA.id.server.modules</groupId> <artifactId>moa-id-modules</artifactId> - <version>${moa-id-version}</version> + <version>4.0.1-snapshot</version> </parent> <artifactId>moa-id-module-saml1</artifactId> diff --git a/id/server/modules/module-monitoring/pom.xml b/id/server/modules/module-monitoring/pom.xml index 252d20000..99b5b091d 100644 --- a/id/server/modules/module-monitoring/pom.xml +++ b/id/server/modules/module-monitoring/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>MOA.id.server.modules</groupId> <artifactId>moa-id-modules</artifactId> - <version>${moa-id-version}</version> + <version>4.0.1-snapshot</version> </parent> <artifactId>moa-id-module-monitoring</artifactId> diff --git a/id/server/modules/pom.xml b/id/server/modules/pom.xml index 85dc122dd..80451c89a 100644 --- a/id/server/modules/pom.xml +++ b/id/server/modules/pom.xml @@ -5,12 +5,11 @@ <parent> <groupId>MOA.id</groupId> <artifactId>moa-id</artifactId> - <version>3.x</version> + <version>4.0.1-snapshot</version> </parent> <groupId>MOA.id.server.modules</groupId> <artifactId>moa-id-modules</artifactId> - <version>${moa-id-version}</version> <packaging>pom</packaging> <name>MOA ID-Modules</name> diff --git a/id/server/pom.xml b/id/server/pom.xml index 55bff295a..19b7a374e 100644 --- a/id/server/pom.xml +++ b/id/server/pom.xml @@ -4,7 +4,7 @@ <parent>
<groupId>MOA</groupId>
<artifactId>id</artifactId>
- <version>3.x</version>
+ <version>4.0.1-snapshot</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/id/server/proxy/pom.xml b/id/server/proxy/pom.xml index baef394a7..a672df2f6 100644 --- a/id/server/proxy/pom.xml +++ b/id/server/proxy/pom.xml @@ -2,7 +2,7 @@ <parent>
<groupId>MOA.id</groupId>
<artifactId>moa-id</artifactId>
- <version>2.x</version>
+ <version>4.0.1-snapshot</version>
</parent>
<properties>
@@ -4,7 +4,7 @@ <groupId>MOA</groupId> <artifactId>MOA</artifactId> <packaging>pom</packaging> - <version>2.x</version> + <version>4.0.1-snapshot</version> <name>MOA</name> <properties> @@ -26,7 +26,7 @@ <!-- =================================================================================== --> <egiz-spring-api.version>0.3</egiz-spring-api.version> - <egiz.eaaf.version>1.0.7</egiz.eaaf.version> + <egiz.eaaf.version>1.0.8</egiz.eaaf.version> <org.springframework.version>5.1.7.RELEASE</org.springframework.version> <org.springframework.data.spring-data-jpa>2.1.8.RELEASE</org.springframework.data.spring-data-jpa> <org.springframework.data.spring-data-redis>2.1.8.RELEASE</org.springframework.data.spring-data-redis> |