diff --git a/logicaldoc-core/src/test/java/com/logicaldoc/core/AbstractCoreTestCase.java b/logicaldoc-core/src/test/java/com/logicaldoc/core/AbstractCoreTestCase.java index d776a81a2..65b74fcd2 100644 --- a/logicaldoc-core/src/test/java/com/logicaldoc/core/AbstractCoreTestCase.java +++ b/logicaldoc-core/src/test/java/com/logicaldoc/core/AbstractCoreTestCase.java @@ -6,6 +6,8 @@ import java.sql.SQLException; import org.junit.Before; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.logicaldoc.core.store.Storer; import com.logicaldoc.util.Context; @@ -24,6 +26,8 @@ */ public abstract class AbstractCoreTestCase extends AbstractTestCase { + protected static Logger log = LoggerFactory.getLogger(AbstractCoreTestCase.class); + @Before @Override public void setUp() throws FileNotFoundException, IOException, SQLException { @@ -46,7 +50,11 @@ private void prepareStore() throws IOException { // Store the file of document 1 FileUtil.copyResource("/Digital_Day.pdf", new File(storePath + "/1/doc/1.0")); - FileUtil.copyResource("/Digital_Day.pdf", new File(storePath + "/1/doc/1.0-conversion.pdf")); + try { + FileUtil.copyResource("/Digital_Day.pdf", new File(storePath + "/1/doc/1.0-conversion.pdf")); + } catch (Exception e) { + log.warn(e.getMessage(), e); + } // Store the file of document 3 FileUtil.copyResource("/small.pdf", new File(storePath + "/3/doc/1.3")); diff --git a/logicaldoc-webservicedoc/pom.xml b/logicaldoc-webservicedoc/pom.xml index 55f6126ed..73bd51df9 100644 --- a/logicaldoc-webservicedoc/pom.xml +++ b/logicaldoc-webservicedoc/pom.xml @@ -1,223 +1,240 @@ - - 4.0.0 - - com.logicaldoc - logicaldoc - 8.9.0 - - logicaldoc-webservicedoc - logicaldoc-webservicedoc - jar - - 4.13.2 - 2.1.6 - - - - com.logicaldoc - logicaldoc-core - ${project.version} - provided - - - com.logicaldoc - logicaldoc-util - ${project.version} - provided - - - com.logicaldoc - logicaldoc-webservice - ${project.version} - provided - - - org.apache.cxf - cxf-rt-frontend-jaxrs - - - org.apache.cxf - cxf-rt-frontend-jaxws - - - org.apache.cxf - cxf-rt-rs-service-description - - - org.apache.cxf - cxf-rt-rs-client - - - org.apache.cxf - cxf-rt-transports-http - - - - org.apache.cxf - cxf-rt-rs-service-description-openapi-v3 - 3.5.3 - - - org.apache.cxf - cxf-rt-rs-service-description-swagger-ui - 3.5.3 - - - org.apache.cxf - cxf-rt-rs-service-description-common-openapi - 3.5.3 - - - net.sf.jpf - jpf-boot - provided - - - net.sf.jpf - jpf - provided - - - junit - junit - test - - - javax.servlet - servlet-api - provided - - - org.slf4j - slf4j-api - provided - - - org.apache.logging.log4j - log4j-slf4j-impl - provided - - - javax.activation - activation - provided - - - - io.swagger.core.v3 - swagger-jaxrs2 - ${cxf.swagger.v3.version} - - - javax.xml.bind - jaxb-api - - - - - org.webjars - swagger-ui - ${cxf.swagger.ui.version} - - - com.fasterxml.jackson.jaxrs - jackson-jaxrs-json-provider - - - com.fasterxml.jackson.core - jackson-core - - - com.fasterxml.jackson.core - jackson-databind - - - com.fasterxml.jackson.core - jackson-annotations - - - + + + org.apache.cxf + cxf-rt-rs-service-description-openapi-v3 + 3.5.3 + + + org.apache.cxf + cxf-rt-rs-service-description-swagger-ui + 3.5.3 + + + org.apache.cxf + cxf-rt-rs-service-description-common-openapi + 3.5.3 + + + net.sf.jpf + jpf-boot + provided + + + net.sf.jpf + jpf + provided + + + junit + junit + test + + + javax.servlet + servlet-api + provided + + + org.slf4j + slf4j-api + provided + + + org.apache.logging.log4j + log4j-slf4j-impl + provided + + + javax.activation + activation + provided + + + + io.swagger.core.v3 + swagger-jaxrs2 + ${cxf.swagger.v3.version} + + + javax.xml.bind + jaxb-api + + + + + org.webjars + swagger-ui + ${cxf.swagger.ui.version} + + + com.fasterxml.jackson.jaxrs + jackson-jaxrs-json-provider + + + com.fasterxml.jackson.core + jackson-core + + + com.fasterxml.jackson.core + jackson-databind + + + com.fasterxml.jackson.core + jackson-annotations + + + - - javax.ws.rs - javax.ws.rs-api - 2.1.1 - - - org.apache.commons - commons-lang3 - 3.5 - - - org.apache.ws.xmlschema - xmlschema-core - 2.2.1 - - - org.reflections - reflections - 0.9.10 - - - javax.validation - validation-api - 1.1.0.Final - + + javax.ws.rs + javax.ws.rs-api + 2.1.1 + + + org.apache.commons + commons-lang3 + 3.5 + + + org.apache.ws.xmlschema + xmlschema-core + 2.2.1 + + + org.reflections + reflections + 0.9.10 + + + javax.validation + validation-api + 1.1.0.Final + com.sun.mail javax.mail - - - - - - org.apache.maven.plugins - maven-dependency-plugin - - - org.apache.maven.plugins - maven-assembly-plugin - - - src/main/assembly/assemblyplugin.xml - - - - - make-assembly - package - - single - - - - - - org.apache.maven.plugins - maven-antrun-plugin - - - package - package - - run - - - - - - - - - - - - - - - - + + + org.springframework + spring-context-support + provided + + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + org.apache.maven.plugins + maven-assembly-plugin + + + src/main/assembly/assemblyplugin.xml + + + + + make-assembly + package + + single + + + + + + org.apache.maven.plugins + maven-antrun-plugin + + + package + package + + run + + + + + + + + + + + + + + + +