From 0f71b02096118e3b6b27b524a7178b13f194e40f Mon Sep 17 00:00:00 2001
From: EliotRagueneau <eragueneau@ebi.ac.uk>
Date: Tue, 13 Jun 2023 14:55:09 +0100
Subject: [PATCH 1/2] :truck: Move up parent definition

---
 pom.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index 05d3f64..90ed1a6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,6 +2,11 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.reactome.maven</groupId>
+        <artifactId>reactome-parent</artifactId>
+        <version>1.0.3</version>
+    </parent>
 
     <groupId>org.reactome.server.tools</groupId>
     <artifactId>analysis-core</artifactId>
@@ -30,11 +35,6 @@
         </developer>
     </developers>
 
-    <parent>
-        <groupId>org.reactome.maven</groupId>
-        <artifactId>reactome-parent</artifactId>
-        <version>1.0.3</version>
-    </parent>
 
     <properties>
         <start.class>org.reactome.server.analysis.core.Main</start.class>

From 32ff0438d3e2e6db62f75b545fc128ce1bfb42a4 Mon Sep 17 00:00:00 2001
From: cqgong <cgong@ebi.ac.uk>
Date: Tue, 26 Mar 2024 16:59:18 +0000
Subject: [PATCH 2/2] :bug: fix null pointer exception when exporting species
 comparison analysis report

---
 .../core/result/external/ExternalAnalysisResult.java         | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/reactome/server/analysis/core/result/external/ExternalAnalysisResult.java b/src/main/java/org/reactome/server/analysis/core/result/external/ExternalAnalysisResult.java
index c6604d5..d034f40 100644
--- a/src/main/java/org/reactome/server/analysis/core/result/external/ExternalAnalysisResult.java
+++ b/src/main/java/org/reactome/server/analysis/core/result/external/ExternalAnalysisResult.java
@@ -35,7 +35,10 @@ public ExternalAnalysisResult(AnalysisStoredResult result, Integer version) {
             this.notFound.add(new ExternalIdentifier(ai));
         }
 
-        this.warnings = new ArrayList<>(result.getWarnings());
+        if (result.getWarnings() != null) {
+            this.warnings = new ArrayList<>(result.getWarnings());
+        }
+
     }
 
     public ExternalAnalysisSummary getSummary() {