solve conflict

ebi-pf-team · Nov 15, 2024 · 0da6084 · 0da6084
2 parents 3953261 + c5eb90c
commit 0da6084
Show file tree

Hide file tree

Showing 19 changed files with 46 additions and 46 deletions.
diff --git a/README.md b/README.md
@@ -1,5 +1,5 @@
 [![Build](https://github.com/ebi-pf-team/interproscan/actions/workflows/build-test.yml/badge.svg)](https://github.com/ebi-pf-team/interproscan/actions/workflows/build-test.yml)
-[![Docker Image Version (tag)](https://img.shields.io/docker/v/interpro/interproscan/5.70-102.0)](https://hub.docker.com/r/interpro/interproscan)
+[![Docker Image Version (tag)](https://img.shields.io/docker/v/interpro/interproscan/5.71-102.0)](https://hub.docker.com/r/interpro/interproscan)
 
 # InterProScan
 

diff --git a/core/business/pom.xml b/core/business/pom.xml
@@ -5,13 +5,13 @@
     <parent>
         <groupId>uk.ac.ebi.interpro.scan</groupId>
         <artifactId>interproscan</artifactId>
-        <version>5.70-102.0</version>
+        <version>5.71-102.0</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>interproscan-business</artifactId>
-    <version>5.70-102.0</version>
+    <version>5.71-102.0</version>
 
     <packaging>jar</packaging>
     <name>InterProScan Business Logic</name>
@@ -35,14 +35,14 @@
         <dependency>
             <groupId>uk.ac.ebi.interpro.scan</groupId>
             <artifactId>interproscan-persistence</artifactId>
-            <version>5.70-102.0</version>
+            <version>5.71-102.0</version>
         </dependency>
 
 
         <dependency>
             <groupId>uk.ac.ebi.interpro.scan</groupId>
             <artifactId>precalc-match-client</artifactId>
-            <version>5.70-102.0</version>
+            <version>5.71-102.0</version>
         </dependency>
 
         <dependency>

diff --git a/core/generic-jpa-dao/pom.xml b/core/generic-jpa-dao/pom.xml
@@ -5,13 +5,13 @@
     <parent>
         <groupId>uk.ac.ebi.interpro.scan</groupId>
         <artifactId>interproscan</artifactId>
-        <version>5.70-102.0</version>
+        <version>5.71-102.0</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>generic-jpa-dao</artifactId>
-    <version>5.70-102.0</version>
+    <version>5.71-102.0</version>
 
     <packaging>jar</packaging>
 
@@ -37,7 +37,7 @@
         <dependency>
             <groupId>uk.ac.ebi.interpro.scan</groupId>
             <artifactId>interproscan-util</artifactId>
-            <version>5.70-102.0</version>
+            <version>5.71-102.0</version>
         </dependency>
 
         <!-- Hibernate -->

diff --git a/core/io/pom.xml b/core/io/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>interproscan</artifactId>
         <groupId>uk.ac.ebi.interpro.scan</groupId>
-        <version>5.70-102.0</version>
+        <version>5.71-102.0</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
@@ -14,21 +14,21 @@
     <packaging>jar</packaging>
 
     <name>InterProScan IO</name>
-    <version>5.70-102.0</version>
+    <version>5.71-102.0</version>
     <description>InterProScan IO</description>
     <url>http://www.ebi.ac.uk/interpro/</url>
 
     <dependencies>
         <dependency>
             <groupId>uk.ac.ebi.interpro.scan</groupId>
             <artifactId>interproscan-util</artifactId>
-            <version>5.70-102.0</version>
+            <version>5.71-102.0</version>
         </dependency>
 
         <dependency>
             <groupId>uk.ac.ebi.interpro.scan</groupId>
             <artifactId>interproscan-model</artifactId>
-            <version>5.70-102.0</version>
+            <version>5.71-102.0</version>
         </dependency>
 
         <dependency>

diff --git a/core/jms-implementation/pom.xml b/core/jms-implementation/pom.xml
@@ -5,12 +5,12 @@
     <parent>
         <groupId>uk.ac.ebi.interpro.scan</groupId>
         <artifactId>interproscan</artifactId>
-        <version>5.70-102.0</version>
+        <version>5.71-102.0</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>jms-implementation</artifactId>
-    <version>5.70-102.0</version>
+    <version>5.71-102.0</version>
 
     <packaging>jar</packaging>
 
@@ -53,7 +53,7 @@
         <dependency>
             <groupId>uk.ac.ebi.interpro.scan</groupId>
             <artifactId>interproscan-management</artifactId>
-            <version>5.70-102.0</version>
+            <version>5.71-102.0</version>
         </dependency>
 
         <dependency>

diff --git a/core/jms-implementation/src/main/java/uk/ac/ebi/interpro/scan/jms/main/Run.java b/core/jms-implementation/src/main/java/uk/ac/ebi/interpro/scan/jms/main/Run.java
@@ -141,7 +141,7 @@ public static void main(String[] args) {
 
             ArrayList<String> analysesHelpInformation = new ArrayList<>();
 
-            String i5Version = "5.70-102.0";
+            String i5Version = "5.71-102.0";
             String i5BuildType = "64-Bit";
 
             if (parsedCommandLine.hasOption(I5Option.VERSION.getLongOpt())) {

diff --git a/core/jms-implementation/support-mini-x86-32/work/template/interpro.zip b/core/jms-implementation/support-mini-x86-32/work/template/interpro.zip
diff --git a/core/management/pom.xml b/core/management/pom.xml
@@ -5,13 +5,13 @@
     <parent>
         <groupId>uk.ac.ebi.interpro.scan</groupId>
         <artifactId>interproscan</artifactId>
-        <version>5.70-102.0</version>
+        <version>5.71-102.0</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>interproscan-management</artifactId>
-    <version>5.70-102.0</version>
+    <version>5.71-102.0</version>
 
     <packaging>jar</packaging>
 
@@ -36,13 +36,13 @@
         <dependency>
             <groupId>uk.ac.ebi.interpro.scan</groupId>
             <artifactId>interproscan-util</artifactId>
-            <version>5.70-102.0</version>
+            <version>5.71-102.0</version>
         </dependency>
 
         <dependency>
             <groupId>uk.ac.ebi.interpro.scan</groupId>
             <artifactId>interproscan-web</artifactId>
-            <version>5.70-102.0</version>
+            <version>5.71-102.0</version>
         </dependency>
         <!--
         === All dependencies below here are TEST scope only. ===

diff --git a/core/model/pom.xml b/core/model/pom.xml
@@ -5,13 +5,13 @@
     <parent>
         <groupId>uk.ac.ebi.interpro.scan</groupId>
         <artifactId>interproscan</artifactId>
-        <version>5.70-102.0</version>
+        <version>5.71-102.0</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>interproscan-model</artifactId>
-    <version>5.70-102.0</version>
+    <version>5.71-102.0</version>
 
     <packaging>jar</packaging>
 
@@ -209,7 +209,7 @@
         <dependency>
             <groupId>uk.ac.ebi.interpro.scan</groupId>
             <artifactId>generic-jpa-dao</artifactId>
-            <version>5.70-102.0</version>
+            <version>5.71-102.0</version>
             <scope>test</scope>
         </dependency>
 

diff --git a/core/persistence/pom.xml b/core/persistence/pom.xml
@@ -5,13 +5,13 @@
     <parent>
         <groupId>uk.ac.ebi.interpro.scan</groupId>
         <artifactId>interproscan</artifactId>
-        <version>5.70-102.0</version>
+        <version>5.71-102.0</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>interproscan-persistence</artifactId>
-    <version>5.70-102.0</version>
+    <version>5.71-102.0</version>
 
     <packaging>jar</packaging>
 
@@ -37,19 +37,19 @@
         <dependency>
             <groupId>uk.ac.ebi.interpro.scan</groupId>
             <artifactId>interproscan-model</artifactId>
-            <version>5.70-102.0</version>
+            <version>5.71-102.0</version>
         </dependency>
 
         <dependency>
             <groupId>uk.ac.ebi.interpro.scan</groupId>
             <artifactId>interproscan-io</artifactId>
-            <version>5.70-102.0</version>
+            <version>5.71-102.0</version>
         </dependency>
 
         <dependency>
             <groupId>uk.ac.ebi.interpro.scan</groupId>
             <artifactId>generic-jpa-dao</artifactId>
-            <version>5.70-102.0</version>
+            <version>5.71-102.0</version>
         </dependency>
 
         <dependency>

diff --git a/core/pom.xml b/core/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>uk.ac.ebi.interpro.scan</groupId>
     <artifactId>interproscan</artifactId>
-    <version>5.70-102.0</version>
+    <version>5.71-102.0</version>
 
     <packaging>pom</packaging>
     <name>InterProScan</name>

diff --git a/core/precalcmatches/berkeley/pom.xml b/core/precalcmatches/berkeley/pom.xml
@@ -5,12 +5,12 @@
     <parent>
         <artifactId>precalcmatches</artifactId>
         <groupId>uk.ac.ebi.interpro.scan</groupId>
-        <version>5.70-102.0</version>
+        <version>5.71-102.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>berkeley</artifactId>
-    <version>5.70-102.0</version>
+    <version>5.71-102.0</version>
 
     <name>Precalculated Match Lookup - BerkeleyDB</name>
 

diff --git a/core/precalcmatches/pom.xml b/core/precalcmatches/pom.xml
@@ -5,12 +5,12 @@
     <parent>
         <artifactId>interproscan</artifactId>
         <groupId>uk.ac.ebi.interpro.scan</groupId>
-        <version>5.70-102.0</version>
+        <version>5.71-102.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>precalcmatches</artifactId>
-    <version>5.70-102.0</version>
+    <version>5.71-102.0</version>
 
     <packaging>pom</packaging>
 
@@ -43,7 +43,7 @@
         <dependency>
             <groupId>uk.ac.ebi.interpro.scan</groupId>
             <artifactId>interproscan-persistence</artifactId>
-            <version>5.70-102.0</version>
+            <version>5.71-102.0</version>
         </dependency>
 
         <dependency>

diff --git a/core/precalcmatches/precalc-match-client/pom.xml b/core/precalcmatches/precalc-match-client/pom.xml
@@ -5,12 +5,12 @@
     <parent>
         <artifactId>precalcmatches</artifactId>
         <groupId>uk.ac.ebi.interpro.scan</groupId>
-        <version>5.70-102.0</version>
+        <version>5.71-102.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>precalc-match-client</artifactId>
-    <version>5.70-102.0</version>
+    <version>5.71-102.0</version>
 
     <name>Precalculated Match Lookup - Client</name>
 
@@ -19,7 +19,7 @@
         <dependency>
             <artifactId>berkeley</artifactId>
             <groupId>uk.ac.ebi.interpro.scan</groupId>
-            <version>5.70-102.0</version>
+            <version>5.71-102.0</version>
         </dependency>
 
         <dependency>

diff --git a/core/precalcmatches/server/pom.xml b/core/precalcmatches/server/pom.xml
@@ -5,12 +5,12 @@
     <parent>
         <artifactId>precalcmatches</artifactId>
         <groupId>uk.ac.ebi.interpro.scan</groupId>
-        <version>5.70-102.0</version>
+        <version>5.71-102.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>server</artifactId>
-    <version>5.70-102.0</version>
+    <version>5.71-102.0</version>
     <name>interpro-match-lookup</name>
     <!--<name>Precalculated Match Lookup - Server</name>-->
     <packaging>war</packaging>
@@ -32,7 +32,7 @@
         <dependency>
             <groupId>uk.ac.ebi.interpro.scan</groupId>
             <artifactId>berkeley</artifactId>
-            <version>5.70-102.0</version>
+            <version>5.71-102.0</version>
             <exclusions>
                 <!--Exclude transitive dependency to surefire -->
                 <exclusion>

diff --git a/core/precalcmatches/server/src/main/resources/i5_match_lookup_splash_screen.jpg b/core/precalcmatches/server/src/main/resources/i5_match_lookup_splash_screen.jpg
diff --git a/core/precalcmatches/server/src/main/resources/i5_match_lookup_splash_screen.xcf b/core/precalcmatches/server/src/main/resources/i5_match_lookup_splash_screen.xcf
diff --git a/core/util/pom.xml b/core/util/pom.xml
@@ -5,13 +5,13 @@
     <parent>
         <groupId>uk.ac.ebi.interpro.scan</groupId>
         <artifactId>interproscan</artifactId>
-        <version>5.70-102.0</version>
+        <version>5.71-102.0</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>interproscan-util</artifactId>
-    <version>5.70-102.0</version>
+    <version>5.71-102.0</version>
 
     <packaging>jar</packaging>
 

diff --git a/core/web/pom.xml b/core/web/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>interproscan</artifactId>
         <groupId>uk.ac.ebi.interpro.scan</groupId>
-        <version>5.70-102.0</version>
+        <version>5.71-102.0</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
@@ -15,7 +15,7 @@
     <packaging>jar</packaging>
 
     <name>InterProScan Web</name>
-    <version>5.70-102.0</version>
+    <version>5.71-102.0</version>
     <description>InterProScan Web</description>
     <url>http://www.ebi.ac.uk/interpro/</url>
 
@@ -28,12 +28,12 @@
         <dependency>
             <groupId>uk.ac.ebi.interpro.scan</groupId>
             <artifactId>interproscan-model</artifactId>
-            <version>5.70-102.0</version>
+            <version>5.71-102.0</version>
         </dependency>
         <dependency>
             <groupId>uk.ac.ebi.interpro.scan</groupId>
             <artifactId>interproscan-business</artifactId>
-            <version>5.70-102.0</version>
+            <version>5.71-102.0</version>
         </dependency>
 
         <!--  Spring -->