Commit c7a49dc9 authored by Piotr Gawron's avatar Piotr Gawron
Browse files

Merge branch '1139-not-all-celld-notes-are-displayed-in-project' into 'master'

Resolve "Not all CellD NOTES are displayed in project"

Closes #1139

See merge request minerva/core!1074
parents 6e4ce458 67e1e541
minerva (15.0.0~beta.1) stable; urgency=medium
* Bug fix: conflict on libraries caused some features to stop working in
production (like parsing text notes of species, regresion in
15.0.0~alpha.1, #1139)
-- Piotr Gawron <piotr.gawron@uni.lu> Wed, 26 Feb 2020 13:00:00 +0200
minerva (15.0.0~beta.0) stable; urgency=medium
* Feature removal: old connection to CTD is removed and replaced with
new Data-API interface that closely check license compliance
......
......@@ -95,6 +95,16 @@
<groupId>xml-apis</groupId>
<artifactId>xml-apis</artifactId>
</exclusion>
<!-- those two dependencies are causing #1139 when deployed on tomcat8
pacakge in ubuntu 16 -->
<exclusion>
<groupId>net.sf.saxon</groupId>
<artifactId>saxon</artifactId>
</exclusion>
<exclusion>
<groupId>net.sf.saxon</groupId>
<artifactId>saxon-dom</artifactId>
</exclusion>
</exclusions>
</dependency>
......
......@@ -8,6 +8,7 @@ import org.junit.runners.Suite.SuiteClasses;
@SuiteClasses({ CellDesigner2SbgnmlConversionTest.class,
CellDesignerToSbgnTest.class,
DbSerializationTest.class,
SbgnmlSerializationTest.class,
SbgnmlXmlExporterTest.class,
SbgnmlXmlParserTest.class,
SbgnmlXmlParserTest2.class,
......@@ -15,4 +16,3 @@ import org.junit.runners.Suite.SuiteClasses;
public class AllSbgnmlTests {
}
......@@ -500,9 +500,7 @@
<head>
<title/>
</head>
<body>description of S1
third line
</body>
<body></body>
</html>
</notes>
<annotation>
......@@ -565,23 +563,7 @@ third line
<head>
<title/>
</head>
<body>ymbol: CNC
Name: Carney complex, multiple neoplasia and lentiginosis
Description: RecName: Full=Sodium/calcium exchanger 1; AltName: Full=Na(+)/Ca(2+)-exchange protein 1; Flags: Precursor;
Previous Symbols:
Synonyms: CNC, NCX1
ghfjkghfdjkghkdf
fdghjkfdhgjkdfgjhdf
jdsfkljsdklfjsdf
sjdkfjsdklfjkl
dsjfkjl
sdfkkjfskldjfkls
Symbol: CNC
Name: Carney complex, multiple neoplasia and lentiginosis
Description: RecName: Full=Sodium/calcium exchanger 1; AltName: Full=Na(+)/Ca(2+)-exchange protein 1; Flags: Precursor;
Previous Symbols:
Synonyms: CNC, NCX1
</body>
<body></body>
</html>
</notes>
<annotation>
......@@ -815,8 +797,7 @@ Synonyms: CNC, NCX1
<head>
<title/>
</head>
<body>notes for reaction
</body>
<body></body>
</html>
</notes>
<annotation>
......@@ -943,8 +924,7 @@ Synonyms: CNC, NCX1
<head>
<title/>
</head>
<body>asd
</body>
<body></body>
</html>
</notes>
<annotation>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment