Skip to content

Commit

Permalink
Merge branch 'master' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
@matthiasblum
matthiasblum committed Jul 2, 2024
2 parents e1df2b2 + 82dcd94 commit a7dac11
Show file tree
Hide file tree
Showing 24 changed files with 51 additions and 51 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ FROM ubuntu:20.04

LABEL authors="Laise Florentino ([email protected]), Matthias Blum ([email protected])"

ARG VERSION=5.66-98.0
ARG VERSION=5.68-100.0
ENV TZ=Europe/London

RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && \
Expand Down
8 changes: 4 additions & 4 deletions core/business/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@
<parent>
<groupId>uk.ac.ebi.interpro.scan</groupId>
<artifactId>interproscan</artifactId>
<version>5.66-98.0</version>
<version>5.68-100.0</version>
</parent>

<modelVersion>4.0.0</modelVersion>

<artifactId>interproscan-business</artifactId>
<version>5.66-98.0</version>
<version>5.68-100.0</version>

<packaging>jar</packaging>
<name>InterProScan Business Logic</name>
Expand All @@ -35,14 +35,14 @@
<dependency>
<groupId>uk.ac.ebi.interpro.scan</groupId>
<artifactId>interproscan-persistence</artifactId>
<version>5.66-98.0</version>
<version>5.68-100.0</version>
</dependency>


<dependency>
<groupId>uk.ac.ebi.interpro.scan</groupId>
<artifactId>precalc-match-client</artifactId>
<version>5.66-98.0</version>
<version>5.68-100.0</version>
</dependency>

<dependency>
Expand Down
6 changes: 3 additions & 3 deletions core/generic-jpa-dao/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@
<parent>
<groupId>uk.ac.ebi.interpro.scan</groupId>
<artifactId>interproscan</artifactId>
<version>5.66-98.0</version>
<version>5.68-100.0</version>
</parent>

<modelVersion>4.0.0</modelVersion>

<artifactId>generic-jpa-dao</artifactId>
<version>5.66-98.0</version>
<version>5.68-100.0</version>

<packaging>jar</packaging>

Expand All @@ -37,7 +37,7 @@
<dependency>
<groupId>uk.ac.ebi.interpro.scan</groupId>
<artifactId>interproscan-util</artifactId>
<version>5.66-98.0</version>
<version>5.68-100.0</version>
</dependency>

<!-- Hibernate -->
Expand Down
8 changes: 4 additions & 4 deletions core/io/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>interproscan</artifactId>
<groupId>uk.ac.ebi.interpro.scan</groupId>
<version>5.66-98.0</version>
<version>5.68-100.0</version>
</parent>

<modelVersion>4.0.0</modelVersion>
Expand All @@ -14,21 +14,21 @@
<packaging>jar</packaging>

<name>InterProScan IO</name>
<version>5.66-98.0</version>
<version>5.68-100.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.66-98.0</version>
<version>5.68-100.0</version>
</dependency>

<dependency>
<groupId>uk.ac.ebi.interpro.scan</groupId>
<artifactId>interproscan-model</artifactId>
<version>5.66-98.0</version>
<version>5.68-100.0</version>
</dependency>

<dependency>
Expand Down
6 changes: 3 additions & 3 deletions core/jms-implementation/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
<parent>
<groupId>uk.ac.ebi.interpro.scan</groupId>
<artifactId>interproscan</artifactId>
<version>5.66-98.0</version>
<version>5.68-100.0</version>
</parent>

<modelVersion>4.0.0</modelVersion>
<artifactId>jms-implementation</artifactId>
<version>5.66-98.0</version>
<version>5.68-100.0</version>

<packaging>jar</packaging>

Expand Down Expand Up @@ -53,7 +53,7 @@
<dependency>
<groupId>uk.ac.ebi.interpro.scan</groupId>
<artifactId>interproscan-management</artifactId>
<version>5.66-98.0</version>
<version>5.68-100.0</version>
</dependency>

<dependency>
Expand Down
2 changes: 1 addition & 1 deletion core/jms-implementation/src/main/java/uk/ac/ebi/interpro/scan/jms/main/Run.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ public static void main(String[] args) {

ArrayList<String> analysesHelpInformation = new ArrayList<>();

String i5Version = "5.66-98.0";
String i5Version = "5.68-100.0";
String i5BuildType = "64-Bit";

if (parsedCommandLine.hasOption(I5Option.VERSION.getLongOpt())) {
Expand Down
2 changes: 1 addition & 1 deletion core/jms-implementation/support-mini-x86-32/work/kvs/idb/domains.json
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion core/jms-implementation/support-mini-x86-32/work/kvs/idb/goterms.ipr.json
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion core/jms-implementation/support-mini-x86-32/work/kvs/idb/goterms.json
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion core/jms-implementation/support-mini-x86-32/work/kvs/idb/pathways.ipr.json
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion core/jms-implementation/support-mini-x86-32/work/kvs/idb/pathways.json
View file

Large diffs are not rendered by default.

Binary file modified core/jms-implementation/support-mini-x86-32/work/template/interpro.zip
View file
Binary file not shown.
8 changes: 4 additions & 4 deletions core/management/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@
<parent>
<groupId>uk.ac.ebi.interpro.scan</groupId>
<artifactId>interproscan</artifactId>
<version>5.66-98.0</version>
<version>5.68-100.0</version>
</parent>

<modelVersion>4.0.0</modelVersion>

<artifactId>interproscan-management</artifactId>
<version>5.66-98.0</version>
<version>5.68-100.0</version>

<packaging>jar</packaging>

Expand All @@ -36,13 +36,13 @@
<dependency>
<groupId>uk.ac.ebi.interpro.scan</groupId>
<artifactId>interproscan-util</artifactId>
<version>5.66-98.0</version>
<version>5.68-100.0</version>
</dependency>

<dependency>
<groupId>uk.ac.ebi.interpro.scan</groupId>
<artifactId>interproscan-web</artifactId>
<version>5.66-98.0</version>
<version>5.68-100.0</version>
</dependency>
<!--
=== All dependencies below here are TEST scope only. ===
Expand Down
6 changes: 3 additions & 3 deletions core/model/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@
<parent>
<groupId>uk.ac.ebi.interpro.scan</groupId>
<artifactId>interproscan</artifactId>
<version>5.66-98.0</version>
<version>5.68-100.0</version>
</parent>

<modelVersion>4.0.0</modelVersion>

<artifactId>interproscan-model</artifactId>
<version>5.66-98.0</version>
<version>5.68-100.0</version>

<packaging>jar</packaging>

Expand Down Expand Up @@ -209,7 +209,7 @@
<dependency>
<groupId>uk.ac.ebi.interpro.scan</groupId>
<artifactId>generic-jpa-dao</artifactId>
<version>5.66-98.0</version>
<version>5.68-100.0</version>
<scope>test</scope>
</dependency>

Expand Down
10 changes: 5 additions & 5 deletions core/persistence/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@
<parent>
<groupId>uk.ac.ebi.interpro.scan</groupId>
<artifactId>interproscan</artifactId>
<version>5.66-98.0</version>
<version>5.68-100.0</version>
</parent>

<modelVersion>4.0.0</modelVersion>

<artifactId>interproscan-persistence</artifactId>
<version>5.66-98.0</version>
<version>5.68-100.0</version>

<packaging>jar</packaging>

Expand All @@ -37,19 +37,19 @@
<dependency>
<groupId>uk.ac.ebi.interpro.scan</groupId>
<artifactId>interproscan-model</artifactId>
<version>5.66-98.0</version>
<version>5.68-100.0</version>
</dependency>

<dependency>
<groupId>uk.ac.ebi.interpro.scan</groupId>
<artifactId>interproscan-io</artifactId>
<version>5.66-98.0</version>
<version>5.68-100.0</version>
</dependency>

<dependency>
<groupId>uk.ac.ebi.interpro.scan</groupId>
<artifactId>generic-jpa-dao</artifactId>
<version>5.66-98.0</version>
<version>5.68-100.0</version>
</dependency>

<dependency>
Expand Down
2 changes: 1 addition & 1 deletion core/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<groupId>uk.ac.ebi.interpro.scan</groupId>
<artifactId>interproscan</artifactId>
<version>5.66-98.0</version>
<version>5.68-100.0</version>

<packaging>pom</packaging>
<name>InterProScan</name>
Expand Down
4 changes: 2 additions & 2 deletions core/precalcmatches/berkeley/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
<parent>
<artifactId>precalcmatches</artifactId>
<groupId>uk.ac.ebi.interpro.scan</groupId>
<version>5.66-98.0</version>
<version>5.68-100.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>

<artifactId>berkeley</artifactId>
<version>5.66-98.0</version>
<version>5.68-100.0</version>

<name>Precalculated Match Lookup - BerkeleyDB</name>

Expand Down
6 changes: 3 additions & 3 deletions core/precalcmatches/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
<parent>
<artifactId>interproscan</artifactId>
<groupId>uk.ac.ebi.interpro.scan</groupId>
<version>5.66-98.0</version>
<version>5.68-100.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>

<artifactId>precalcmatches</artifactId>
<version>5.66-98.0</version>
<version>5.68-100.0</version>

<packaging>pom</packaging>

Expand Down Expand Up @@ -43,7 +43,7 @@
<dependency>
<groupId>uk.ac.ebi.interpro.scan</groupId>
<artifactId>interproscan-persistence</artifactId>
<version>5.66-98.0</version>
<version>5.68-100.0</version>
</dependency>

<dependency>
Expand Down
6 changes: 3 additions & 3 deletions core/precalcmatches/precalc-match-client/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
<parent>
<artifactId>precalcmatches</artifactId>
<groupId>uk.ac.ebi.interpro.scan</groupId>
<version>5.66-98.0</version>
<version>5.68-100.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>

<artifactId>precalc-match-client</artifactId>
<version>5.66-98.0</version>
<version>5.68-100.0</version>

<name>Precalculated Match Lookup - Client</name>

Expand All @@ -19,7 +19,7 @@
<dependency>
<artifactId>berkeley</artifactId>
<groupId>uk.ac.ebi.interpro.scan</groupId>
<version>5.66-98.0</version>
<version>5.68-100.0</version>
</dependency>

<dependency>
Expand Down
6 changes: 3 additions & 3 deletions core/precalcmatches/server/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
<parent>
<artifactId>precalcmatches</artifactId>
<groupId>uk.ac.ebi.interpro.scan</groupId>
<version>5.66-98.0</version>
<version>5.68-100.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>

<artifactId>server</artifactId>
<version>5.66-98.0</version>
<version>5.68-100.0</version>
<name>interpro-match-lookup</name>
<!--<name>Precalculated Match Lookup - Server</name>-->
<packaging>war</packaging>
Expand All @@ -32,7 +32,7 @@
<dependency>
<groupId>uk.ac.ebi.interpro.scan</groupId>
<artifactId>berkeley</artifactId>
<version>5.66-98.0</version>
<version>5.68-100.0</version>
<exclusions>
<!--Exclude transitive dependency to surefire -->
<exclusion>
Expand Down
Binary file modified core/precalcmatches/server/src/main/resources/i5_match_lookup_splash_screen.jpg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified core/precalcmatches/server/src/main/resources/i5_match_lookup_splash_screen.xcf
View file
Binary file not shown.
4 changes: 2 additions & 2 deletions core/util/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@
<parent>
<groupId>uk.ac.ebi.interpro.scan</groupId>
<artifactId>interproscan</artifactId>
<version>5.66-98.0</version>
<version>5.68-100.0</version>
</parent>

<modelVersion>4.0.0</modelVersion>

<artifactId>interproscan-util</artifactId>
<version>5.66-98.0</version>
<version>5.68-100.0</version>

<packaging>jar</packaging>

Expand Down
8 changes: 4 additions & 4 deletions core/web/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>interproscan</artifactId>
<groupId>uk.ac.ebi.interpro.scan</groupId>
<version>5.66-98.0</version>
<version>5.68-100.0</version>
</parent>

<modelVersion>4.0.0</modelVersion>
Expand All @@ -15,7 +15,7 @@
<packaging>jar</packaging>

<name>InterProScan Web</name>
<version>5.66-98.0</version>
<version>5.68-100.0</version>
<description>InterProScan Web</description>
<url>http://www.ebi.ac.uk/interpro/</url>

Expand All @@ -28,12 +28,12 @@
<dependency>
<groupId>uk.ac.ebi.interpro.scan</groupId>
<artifactId>interproscan-model</artifactId>
<version>5.66-98.0</version>
<version>5.68-100.0</version>
</dependency>
<dependency>
<groupId>uk.ac.ebi.interpro.scan</groupId>
<artifactId>interproscan-business</artifactId>
<version>5.66-98.0</version>
<version>5.68-100.0</version>
</dependency>

<!-- Spring -->
Expand Down

0 comments on commit a7dac11

Please sign in to comment.