diff --git a/annotation/pom.xml b/annotation/pom.xml index 7cb2f0097f261ceae50fd698664c157f37876fd4..b1bee9ff1fadfd6def4552f1e2f4fba3b0e1c8ce 100644 --- a/annotation/pom.xml +++ b/annotation/pom.xml @@ -83,6 +83,41 @@ <groupId>uk.ac.ebi.chebi.webapps.chebiWS.client</groupId> <artifactId>chebiWS-client</artifactId> <version>${chebi-ws.version}</version> + <exclusions> + <exclusion> + <groupId>com.sun.xml.ws</groupId> + <artifactId>jaxws-rt</artifactId> + </exclusion> + <exclusion> + <groupId>com.sun.xml.ws</groupId> + <artifactId>jaxws-api</artifactId> + </exclusion> + <exclusion> + <groupId>com.sun.xml.ws</groupId> + <artifactId>jaxws-tools</artifactId> + </exclusion> + </exclusions> + </dependency> + + <!-- https://mvnrepository.com/artifact/com.sun.xml.ws/jaxws-rt --> + <dependency> + <groupId>com.sun.xml.ws</groupId> + <artifactId>jaxws-rt</artifactId> + <version>${jaxws.version}</version> + <type>pom</type> + </dependency> + <!-- https://mvnrepository.com/artifact/javax.xml.ws/jaxws-api --> + <dependency> + <groupId>javax.xml.ws</groupId> + <artifactId>jaxws-api</artifactId> + <version>${jaxws.version}</version> + </dependency> + <!-- https://mvnrepository.com/artifact/com.sun.xml.ws/jaxws-tools --> + <dependency> + <groupId>com.sun.xml.ws</groupId> + <artifactId>jaxws-tools</artifactId> + <version>${jaxws.version}</version> + <type>pom</type> </dependency> <!-- Spring --> diff --git a/converter-sbml/pom.xml b/converter-sbml/pom.xml index c540e49ed44dc3876be6c8bf9f5b69c29ad5b333..8e52c36a03da554e1779acd7b481e9479ed8d3ff 100644 --- a/converter-sbml/pom.xml +++ b/converter-sbml/pom.xml @@ -76,7 +76,7 @@ <dependency> <groupId>org.sbml.jsbml</groupId> <artifactId>jsbml</artifactId> - <version>1.3.1</version> + <version>1.4</version> <!-- for now we use lower version of log4j and this one introduce some problem with tomcat loggin --> <exclusions> diff --git a/pom.xml b/pom.xml index 5701dfb1f80e96c7f95be22c8e593d6269c70dbc..56d5fa07b5ab90f7a6b329bf1bc73caf0ce37ede 100644 --- a/pom.xml +++ b/pom.xml @@ -59,6 +59,8 @@ <gson.version>2.2.2</gson.version> <chebi-ws.version>2.3.2</chebi-ws.version> + + <jaxws.version>2.2.7</jaxws.version> <miriam-lib.version>1.1.5</miriam-lib.version> diff --git a/rest-api/pom.xml b/rest-api/pom.xml index a25a71c338deb8980a50c6e2950d830f2252dcec..73b07f7da2b3aa38ea0b9aa4a78ff2f493ddf114 100644 --- a/rest-api/pom.xml +++ b/rest-api/pom.xml @@ -20,15 +20,10 @@ <version>1.0</version> </dependency> - <dependency> - <groupId>lcsb.mapviewer</groupId> - <artifactId>service</artifactId> - <version>1.0</version> - </dependency> <dependency> <groupId>lcsb.mapviewer</groupId> - <artifactId>converter-sbml</artifactId> + <artifactId>service</artifactId> <version>1.0</version> </dependency> diff --git a/rest-api/src/test/java/lcsb/mapviewer/api/convert/ConvertRestImplTest.java b/rest-api/src/test/java/lcsb/mapviewer/api/convert/ConvertRestImplTest.java index 31d3b00610bec3010712309b902f185e5f8bab4a..b7ef5478ca4827822c5a15c22680968e1ee177c9 100644 --- a/rest-api/src/test/java/lcsb/mapviewer/api/convert/ConvertRestImplTest.java +++ b/rest-api/src/test/java/lcsb/mapviewer/api/convert/ConvertRestImplTest.java @@ -18,7 +18,7 @@ import lcsb.mapviewer.converter.IConverter; import lcsb.mapviewer.converter.model.sbml.SbmlParser; import lcsb.mapviewer.model.map.model.Model; -public class ConvertRestImplTest extends RestTestFunctions { +public class ConvertRestImplTest { @SuppressWarnings("unused") private Logger logger = Logger.getLogger(ConvertRestImplTest.class); @@ -44,7 +44,7 @@ public class ConvertRestImplTest extends RestTestFunctions { try { IConverter converter = new SbmlParser(); - Model model = converter.createModel(new ConverterParams().filename("testFiles/example1.xml")); + Model model = converter.createModel(new ConverterParams().filename("testFiles/convert/sample-sbml.xml")); model.setName(null); converter.exportModelToFile(model, "tmp.xml"); diff --git a/service/pom.xml b/service/pom.xml index f80ec93ad194b0539355a3b82708891388aabd25..d761cfe1e982c1619f04169fa1cb6ec6f2da4c8a 100644 --- a/service/pom.xml +++ b/service/pom.xml @@ -65,6 +65,14 @@ <version>1.0</version> </dependency> + <!-- dependency from the SBML parser --> + <dependency> + <groupId>lcsb.mapviewer</groupId> + <artifactId>converter-sbml</artifactId> + <version>1.0</version> + </dependency> + + <!-- Log4J --> <dependency> <groupId>log4j</groupId>