diff --git a/account/pom.xml b/account/pom.xml index 26b7c09..5560927 100644 --- a/account/pom.xml +++ b/account/pom.xml @@ -83,7 +83,6 @@ org.apache.maven.plugins maven-ejb-plugin - 2.5.1 3.1 diff --git a/jeeutil/pom.xml b/jeeutil/pom.xml index fc09e1e..a56310a 100644 --- a/jeeutil/pom.xml +++ b/jeeutil/pom.xml @@ -33,7 +33,6 @@ org.primefaces primefaces - 6.0 jar provided @@ -49,7 +48,6 @@ org.apache.maven.plugins maven-ejb-plugin - 2.3 3.1 diff --git a/pdf/pom.xml b/pdf/pom.xml index 7204733..928a72a 100644 --- a/pdf/pom.xml +++ b/pdf/pom.xml @@ -21,12 +21,6 @@ junit test - - org.hamcrest - hamcrest-core - 1.3 - test - org.slf4j slf4j-api diff --git a/pdf/src/test/java/de/muehlencord/shared/pdf/test/GsonSerialisation.java b/pdf/src/test/java/de/muehlencord/shared/pdf/test/GsonSerialisation.java index 63a1bac..2282075 100644 --- a/pdf/src/test/java/de/muehlencord/shared/pdf/test/GsonSerialisation.java +++ b/pdf/src/test/java/de/muehlencord/shared/pdf/test/GsonSerialisation.java @@ -46,7 +46,7 @@ public class GsonSerialisation { System.out.println(jsonString); System.out.println("*******"); - Configuration cfg = new Configuration(Configuration.VERSION_2_3_24); + Configuration cfg = new Configuration(Configuration.VERSION_2_3_23); cfg.setDirectoryForTemplateLoading(new File(System.getProperty("java.io.tmpdir"))); cfg.setDefaultEncoding("UTF-8"); Template template = cfg.getTemplate("users.ftlh"); diff --git a/pdf/src/test/java/de/muehlencord/shared/pdf/test/PDFDocumentTest.java b/pdf/src/test/java/de/muehlencord/shared/pdf/test/PDFDocumentTest.java index 2a26f2e..98f7434 100644 --- a/pdf/src/test/java/de/muehlencord/shared/pdf/test/PDFDocumentTest.java +++ b/pdf/src/test/java/de/muehlencord/shared/pdf/test/PDFDocumentTest.java @@ -111,7 +111,7 @@ public class PDFDocumentTest { FileUtils.writeStringToFile(file, jsonString, "UTF-8"); // create pdf - Configuration cfg = new Configuration(Configuration.VERSION_2_3_24); + Configuration cfg = new Configuration(Configuration.VERSION_2_3_23); cfg.setDirectoryForTemplateLoading(new File(System.getProperty("java.io.tmpdir"))); cfg.setDefaultEncoding("UTF-8"); cfg.setTemplateExceptionHandler(TemplateExceptionHandler.RETHROW_HANDLER); diff --git a/pom.xml b/pom.xml index eb22ec1..630b069 100644 --- a/pom.xml +++ b/pom.xml @@ -133,15 +133,37 @@ org.apache.pdfbox pdfbox - 2.0.7 + 2.0.8 org.freemarker freemarker 2.3.23 - - - + + + org.primefaces + primefaces + 6.1 + + + com.sun.faces + jsf-api + 2.2.15 + provided + + + javax.el + javax.el-api + 3.0.0 + provided + + + + + de.muehlencord.shared + shared-util + ${project.version} + de.muehlencord.shared shared-util @@ -151,23 +173,46 @@ de.muehlencord.shared shared-jeeutil ${project.version} - - + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.7.0 + + ${maven.compiler.source} + ${maven.compiler.target} + true + + + + org.codehaus.mojo + jaxb2-maven-plugin + 2.3.1 + + + org.apache.maven.plugins + maven-ejb-plugin + 3.0.0 + + + org.codehaus.mojo + jaxws-maven-plugin + 2.5 + + + org.apache.maven.plugins maven-compiler-plugin - 3.7.0 - - ${maven.compiler.source} - ${maven.compiler.target} - true - diff --git a/sharepoint/api/pom.xml b/sharepoint/api/pom.xml index cff2706..48e4cb1 100644 --- a/sharepoint/api/pom.xml +++ b/sharepoint/api/pom.xml @@ -15,40 +15,10 @@ - - - - org.codehaus.mojo - properties-maven-plugin - 1.0-alpha-2 - - - set-additional-system-properties - - set-system-properties - - - - - - - javax.xml.accessExternalSchema - file,http - - - - - - - - org.jvnet.jax-ws-commons + org.codehaus.mojo jaxws-maven-plugin - 2.2 - ${project.build.directory}/generated-sources/jaxws-wsimport @@ -66,6 +36,11 @@ authentication.wsdl + + -Djavax.xml.accessExternalDTD=all + -Djavax.xml.accessExternalSchema=all + + true @@ -80,6 +55,11 @@ alerts.wsdl + + -Djavax.xml.accessExternalDTD=all + -Djavax.xml.accessExternalSchema=all + + true @@ -94,6 +74,11 @@ sites.wsdl + + -Djavax.xml.accessExternalDTD=all + -Djavax.xml.accessExternalSchema=all + + true @@ -108,6 +93,11 @@ webs.wsdl + + -Djavax.xml.accessExternalDTD=all + -Djavax.xml.accessExternalSchema=all + + true @@ -122,6 +112,11 @@ lists.wsdl + + -Djavax.xml.accessExternalDTD=all + -Djavax.xml.accessExternalSchema=all + + true @@ -136,6 +131,11 @@ search.wsdl + + -Djavax.xml.accessExternalDTD=all + -Djavax.xml.accessExternalSchema=all + + true @@ -150,6 +150,11 @@ usergroup.wsdl + + -Djavax.xml.accessExternalDTD=all + -Djavax.xml.accessExternalSchema=all + + true @@ -159,8 +164,6 @@ org.codehaus.mojo jaxb2-maven-plugin - 1.6 - false false @@ -175,19 +178,14 @@ xjc - - ${basedir}/src/main/resources/xsd - - batch.xsd de.muehlencord.shared.sharepoint.api.batch ${project.build.directory}/generated-sources/jaxb/ true - - ${basedir}/src/main/resources/jaxb - batch.xml - true + + ${basedir}/src/main/resources/xsd/batch.xsd + @@ -198,19 +196,15 @@ xjc - - ${basedir}/src/main/resources/xsd - - lists.xsd de.muehlencord.shared.sharepoint.api.lists ${project.build.directory}/generated-sources/jaxb/ true - - ${basedir}/src/main/resources/jaxb - lists.xml - true + + ${basedir}/src/main/resources/xsd/lists.xsd + + false @@ -221,19 +215,16 @@ xjc - - ${basedir}/src/main/resources/xsd - - usergroup.xsd de.muehlencord.shared.sharepoint.api.usergroup ${project.build.directory}/generated-sources/jaxb/ true - - ${basedir}/src/main/resources/jaxb - usergroup.xml true + + ${basedir}/src/main/resources/xsd/usergroup.xsd + + false @@ -251,9 +242,8 @@ commons-lang3 - ${project.groupId} + de.muehlencord.shared shared-util - ${project.version} org.slf4j diff --git a/sharepoint/api/src/main/java/de/muehlencord/shared/sharepoint/api/lists/SPBatch.java b/sharepoint/api/src/main/java/de/muehlencord/shared/sharepoint/api/lists/SPBatch.java index bdb260d..56efd94 100644 --- a/sharepoint/api/src/main/java/de/muehlencord/shared/sharepoint/api/lists/SPBatch.java +++ b/sharepoint/api/src/main/java/de/muehlencord/shared/sharepoint/api/lists/SPBatch.java @@ -25,8 +25,8 @@ public class SPBatch extends SPJaxbObject { return schemaList; } - public void addMethod(Method method) { - getValue().getMethods().add(method); + public void addMethod(Method method) { + getValue().getMethod().add(method); } } diff --git a/sharepoint/api/src/main/java/de/muehlencord/shared/sharepoint/api/lists/SPList.java b/sharepoint/api/src/main/java/de/muehlencord/shared/sharepoint/api/lists/SPList.java index 1ab2153..2ede649 100644 --- a/sharepoint/api/src/main/java/de/muehlencord/shared/sharepoint/api/lists/SPList.java +++ b/sharepoint/api/src/main/java/de/muehlencord/shared/sharepoint/api/lists/SPList.java @@ -152,7 +152,7 @@ public class SPList extends SPJaxbObject { return field; }). forEach((Field field) -> { - method.getFields().add(field); + method.getField().add(field); }); batch.addMethod(method); } @@ -220,7 +220,7 @@ public class SPList extends SPJaxbObject { } Fields fields = getValue().fields; - for (de.muehlencord.shared.sharepoint.api.lists.Field field : fields.getFields()) { + for (de.muehlencord.shared.sharepoint.api.lists.Field field : fields.getField()) { if (field.getDisplayName().equals(columnDisplayName)) { return field.getName(); } @@ -288,7 +288,7 @@ public class SPList extends SPJaxbObject { return field; }). forEach((Field field) -> { - method.getFields().add(field); + method.getField().add(field); }); batch.addMethod(method); } diff --git a/sharepoint/api/src/main/java/de/muehlencord/shared/sharepoint/api/lists/SPLists.java b/sharepoint/api/src/main/java/de/muehlencord/shared/sharepoint/api/lists/SPLists.java index cc6f92e..c5952d3 100644 --- a/sharepoint/api/src/main/java/de/muehlencord/shared/sharepoint/api/lists/SPLists.java +++ b/sharepoint/api/src/main/java/de/muehlencord/shared/sharepoint/api/lists/SPLists.java @@ -40,7 +40,7 @@ public class SPLists extends SPJaxbObject getListNames() throws NoSuchAlgorithmException, KeyManagementException, MalformedURLException, ParseException, JAXBException, SAXException { - if (this.getValue().lists == null) { + if (this.getValue().getList() == null) { getValueFromSharepoint(); } java.util.List returnList = new LinkedList<>(); - this.getValue().lists.stream(). + this.getValue().getList().stream(). forEach((currentList) -> { returnList.add(currentList.name); }); @@ -67,11 +67,11 @@ public class SPLists extends SPJaxbObject { } public List getFields() { - return getValue().getFields(); + return getValue().getField(); } } diff --git a/sharepoint/api/src/main/java/de/muehlencord/shared/sharepoint/api/usergroup/SPUsers.java b/sharepoint/api/src/main/java/de/muehlencord/shared/sharepoint/api/usergroup/SPUsers.java index 0225324..45ca33e 100644 --- a/sharepoint/api/src/main/java/de/muehlencord/shared/sharepoint/api/usergroup/SPUsers.java +++ b/sharepoint/api/src/main/java/de/muehlencord/shared/sharepoint/api/usergroup/SPUsers.java @@ -25,7 +25,7 @@ public class SPUsers extends SPJaxbObject { public List getEmailAddresses() { List returnList = new ArrayList<>(); - for (User user : getValue().users) { + for (User user : getValue().getUser()) { returnList.add (user.email); } diff --git a/shiro-faces/pom.xml b/shiro-faces/pom.xml index 80fa7a1..3084a17 100644 --- a/shiro-faces/pom.xml +++ b/shiro-faces/pom.xml @@ -12,12 +12,7 @@ 1.0-SNAPSHOT - - - 3.0.0 - 2.2.13 - - + org.apache.shiro @@ -27,13 +22,11 @@ com.sun.faces jsf-api - ${jsfapi.version} provided javax.el javax.el-api - ${elapi.version} provided