diff options
Diffstat (limited to 'id/server/moa-id-commons')
-rw-r--r-- | id/server/moa-id-commons/pom.xml | 16 | ||||
-rw-r--r-- | id/server/moa-id-commons/src/main/resources/config/moaid_config_2.0.xsd | 3 |
2 files changed, 13 insertions, 6 deletions
diff --git a/id/server/moa-id-commons/pom.xml b/id/server/moa-id-commons/pom.xml index a49f29bf3..9a4ad9243 100644 --- a/id/server/moa-id-commons/pom.xml +++ b/id/server/moa-id-commons/pom.xml @@ -3,7 +3,7 @@ <parent> <groupId>MOA.id</groupId> <artifactId>moa-id</artifactId> - <version>2.0-RC1</version> + <version>2.0-RC2</version> </parent> <artifactId>moa-id-commons</artifactId> <name>moa-id-commons</name> @@ -63,10 +63,16 @@ <version>0.5.6</version> </dependency> <dependency> - <groupId>org.jvnet.hyperjaxb3</groupId> - <artifactId>maven-hyperjaxb3-plugin</artifactId> - <version>0.5.6</version> -</dependency> + <groupId>org.jvnet.hyperjaxb3</groupId> + <artifactId>maven-hyperjaxb3-plugin</artifactId> + <version>0.5.6</version> + <exclusions> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + </exclusion> + </exclusions> + </dependency> <dependency> <groupId>mysql</groupId> <artifactId>mysql-connector-java</artifactId> diff --git a/id/server/moa-id-commons/src/main/resources/config/moaid_config_2.0.xsd b/id/server/moa-id-commons/src/main/resources/config/moaid_config_2.0.xsd index e6705dbb8..7d84cfce7 100644 --- a/id/server/moa-id-commons/src/main/resources/config/moaid_config_2.0.xsd +++ b/id/server/moa-id-commons/src/main/resources/config/moaid_config_2.0.xsd @@ -506,7 +506,8 @@ <xsd:element name="Mandates" minOccurs="0"> <xsd:complexType> <xsd:sequence> - <xsd:element name="Profiles" type="xsd:string"/> + <xsd:element name="Profiles" type="xsd:string"/> + <xsd:element name="ProfileName" type="xsd:string" minOccurs="0" maxOccurs="unbounded"></xsd:element> </xsd:sequence> </xsd:complexType> </xsd:element> |