diff --git a/pom.xml b/pom.xml index db18db2d939e909c5e3871e3927d52f472755d48..bae5ad390be3caae1a23b60f9d96cdf55a083c7d 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.openolat</groupId> <artifactId>openolat-lms</artifactId> - <version>10.3-SNAPSHOT</version> + <version>11.0-SNAPSHOT</version> <packaging>war</packaging> <name>OpenOLAT LMS</name> <url>http://www.openolat.org</url> @@ -1065,9 +1065,9 @@ </snapshots> </repository> <repository> - <id>maven2-repository.java.net</id> + <id>java.net-Public</id> <name>Java.net repository for Maven</name> - <url>https://maven.java.net/content/repositories/public</url> + <url>https://maven.java.net/content/groups/public/</url> <layout>default</layout> </repository> <repository> @@ -1088,6 +1088,16 @@ <enabled>true</enabled> <updatePolicy>daily</updatePolicy> </snapshots> + </repository> + <repository> + <id>www2.ph.ed.ac.uk</id> + <url>http://www2.ph.ed.ac.uk/maven2</url> + <snapshots> + <enabled>true</enabled> + </snapshots> + <releases> + <enabled>true</enabled> + </releases> </repository> <repository> <id>openolat-repo</id> @@ -1099,7 +1109,7 @@ <updatePolicy>never</updatePolicy> </releases> <snapshots> - <enabled>false</enabled> + <enabled>true</enabled> <updatePolicy>daily</updatePolicy> </snapshots> </repository> diff --git a/src/main/resources/serviceconfig/olat.properties b/src/main/resources/serviceconfig/olat.properties index cb2bb0b65b7058a1b9b4f627349749b055a983ba..f11bbf098717c34123b3c97146461f28d16f7448 100644 --- a/src/main/resources/serviceconfig/olat.properties +++ b/src/main/resources/serviceconfig/olat.properties @@ -990,8 +990,8 @@ ldap.learningResourceManagerRoleValue= # Build properties ##### application.name=OpenOLAT -build.version=10.3a -build.identifier=openolat103a-dev +build.version=11.0a +build.identifier=openolat110a-dev build.repo.revision=local-devel ##### diff --git a/src/test/java/org/olat/ims/qti21/model/xml/AssessmentItemPackageTest.java b/src/test/java/org/olat/ims/qti21/model/xml/AssessmentItemPackageTest.java index 5b186594ce8709833308c1e1bc5e470e066cab6f..d936b36381db79b24c370fca308250941c3005a2 100644 --- a/src/test/java/org/olat/ims/qti21/model/xml/AssessmentItemPackageTest.java +++ b/src/test/java/org/olat/ims/qti21/model/xml/AssessmentItemPackageTest.java @@ -329,7 +329,7 @@ public class AssessmentItemPackageTest { ResourceLocator fileResourceLocator = new PathResourceLocator(outputFile.toPath()); AssessmentObjectXmlLoader assessmentObjectXmlLoader = new AssessmentObjectXmlLoader(qtiXmlReader, fileResourceLocator); ItemValidationResult item = assessmentObjectXmlLoader.loadResolveAndValidateItem(outputFile.toURI()); - System.out.println("Has errors: " + item.hasErrors()); + System.out.println("Has errors: " + (item.getModelValidationErrors().size() > 0)); } private P getParagraph(QtiNode parent, String content) { diff --git a/src/test/java/org/olat/ims/qti21/model/xml/AssessmentTestPackageTest.java b/src/test/java/org/olat/ims/qti21/model/xml/AssessmentTestPackageTest.java index 64585c0434588305559a50d037279137a3e29ddf..c63c42215cba33440fa2f8e060bb5814154af9bf 100644 --- a/src/test/java/org/olat/ims/qti21/model/xml/AssessmentTestPackageTest.java +++ b/src/test/java/org/olat/ims/qti21/model/xml/AssessmentTestPackageTest.java @@ -167,10 +167,10 @@ public class AssessmentTestPackageTest { AssessmentObjectXmlLoader assessmentObjectXmlLoader = new AssessmentObjectXmlLoader(qtiXmlReader, fileResourceLocator); TestValidationResult test = assessmentObjectXmlLoader.loadResolveAndValidateTest(outputFile.toURI()); - System.out.println("Has errors: " + test.hasErrors()); - for(Notification notification: test.getErrors()) { + System.out.println("Has errors: " + (test.getModelValidationErrors().size() > 0)); + for(Notification notification: test.getModelValidationErrors()) { System.out.println(notification.getQtiNode() + " : " + notification.getMessage()); } - Assert.assertFalse(test.hasErrors()); + Assert.assertTrue(test.getModelValidationErrors().isEmpty()); } } \ No newline at end of file