Skip to content

Commit

Permalink
First release candidate for BioSamples version 5.2.20
Browse files Browse the repository at this point in the history
  • Loading branch information
dipayan1985 committed Oct 30, 2023
1 parent 2dde98e commit 3cc280e
Show file tree
Hide file tree
Showing 61 changed files with 202 additions and 202 deletions.
2 changes: 1 addition & 1 deletion agents/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<parent>
<groupId>uk.ac.ebi.biosamples</groupId>
<artifactId>biosamples</artifactId>
<version>5.2.21-SNAPSHOT</version>
<version>5.2.20-RC1</version>
</parent>

<modules>
Expand Down
10 changes: 5 additions & 5 deletions agents/solr/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,30 +7,30 @@
<parent>
<groupId>uk.ac.ebi.biosamples</groupId>
<artifactId>biosamples</artifactId>
<version>5.2.21-SNAPSHOT</version>
<version>5.2.20-RC1</version>
<relativePath>../../</relativePath>
</parent>

<dependencies>
<dependency>
<groupId>uk.ac.ebi.biosamples</groupId>
<artifactId>properties</artifactId>
<version>5.2.21-SNAPSHOT</version>
<version>5.2.20-RC1</version>
</dependency>
<dependency>
<groupId>uk.ac.ebi.biosamples</groupId>
<artifactId>models-solr</artifactId>
<version>5.2.21-SNAPSHOT</version>
<version>5.2.20-RC1</version>
</dependency>
<dependency>
<groupId>uk.ac.ebi.biosamples</groupId>
<artifactId>messaging</artifactId>
<version>5.2.21-SNAPSHOT</version>
<version>5.2.20-RC1</version>
</dependency>
<dependency>
<groupId>uk.ac.ebi.biosamples</groupId>
<artifactId>utils-ols</artifactId>
<version>5.2.21-SNAPSHOT</version>
<version>5.2.20-RC1</version>
</dependency>

<dependency>
Expand Down
12 changes: 6 additions & 6 deletions agents/uploadworkers/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@
<parent>
<groupId>uk.ac.ebi.biosamples</groupId>
<artifactId>biosamples</artifactId>
<version>5.2.21-SNAPSHOT</version>
<version>5.2.20-RC1</version>
<relativePath>../../</relativePath>
</parent>

<dependencies>
<dependency>
<groupId>uk.ac.ebi.biosamples</groupId>
<artifactId>biosamples-spring-boot-starter</artifactId>
<version>5.2.21-SNAPSHOT</version>
<version>5.2.20-RC1</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
Expand All @@ -33,22 +33,22 @@
<dependency>
<groupId>uk.ac.ebi.biosamples</groupId>
<artifactId>properties</artifactId>
<version>5.2.21-SNAPSHOT</version>
<version>5.2.20-RC1</version>
</dependency>
<dependency>
<groupId>uk.ac.ebi.biosamples</groupId>
<artifactId>utils-webapp</artifactId>
<version>5.2.21-SNAPSHOT</version>
<version>5.2.20-RC1</version>
</dependency>
<dependency>
<groupId>uk.ac.ebi.biosamples</groupId>
<artifactId>messaging</artifactId>
<version>5.2.21-SNAPSHOT</version>
<version>5.2.20-RC1</version>
</dependency>
<dependency>
<groupId>uk.ac.ebi.biosamples</groupId>
<artifactId>models-mongo</artifactId>
<version>5.2.21-SNAPSHOT</version>
<version>5.2.20-RC1</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
Expand Down
8 changes: 4 additions & 4 deletions client/client/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,25 +21,25 @@
<parent>
<groupId>uk.ac.ebi.biosamples</groupId>
<artifactId>biosamples</artifactId>
<version>5.2.21-SNAPSHOT</version>
<version>5.2.20-RC1</version>
<relativePath>../../</relativePath>
</parent>

<dependencies>
<dependency>
<groupId>uk.ac.ebi.biosamples</groupId>
<artifactId>models-core</artifactId>
<version>5.2.21-SNAPSHOT</version>
<version>5.2.20-RC1</version>
</dependency>
<dependency>
<groupId>uk.ac.ebi.biosamples</groupId>
<artifactId>properties</artifactId>
<version>5.2.21-SNAPSHOT</version>
<version>5.2.20-RC1</version>
</dependency>
<dependency>
<groupId>uk.ac.ebi.biosamples</groupId>
<artifactId>utils-thread</artifactId>
<version>5.2.21-SNAPSHOT</version>
<version>5.2.20-RC1</version>
</dependency>
<dependency>
<groupId>org.springframework.hateoas</groupId>
Expand Down
2 changes: 1 addition & 1 deletion client/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<parent>
<groupId>uk.ac.ebi.biosamples</groupId>
<artifactId>biosamples</artifactId>
<version>5.2.21-SNAPSHOT</version>
<version>5.2.20-RC1</version>
<relativePath>../</relativePath>
</parent>

Expand Down
4 changes: 2 additions & 2 deletions client/starter/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

<groupId>uk.ac.ebi.biosamples</groupId>
<artifactId>biosamples-spring-boot-starter</artifactId>
<version>5.2.21-SNAPSHOT</version>
<version>5.2.20-RC1</version>

<packaging>jar</packaging>

Expand All @@ -17,7 +17,7 @@
<dependency>
<groupId>uk.ac.ebi.biosamples</groupId>
<artifactId>client</artifactId>
<version>5.2.21-SNAPSHOT</version>
<version>5.2.20-RC1</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
Expand Down
6 changes: 3 additions & 3 deletions commons/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>uk.ac.ebi.biosamples</groupId>
<artifactId>biosamples</artifactId>
<version>5.2.21-SNAPSHOT</version>
<version>5.2.20-RC1</version>
</parent>

<properties>
Expand All @@ -24,12 +24,12 @@
<dependency>
<groupId>uk.ac.ebi.biosamples</groupId>
<artifactId>models-mongo</artifactId>
<version>5.2.21-SNAPSHOT</version>
<version>5.2.20-RC1</version>
</dependency>
<dependency>
<groupId>uk.ac.ebi.biosamples</groupId>
<artifactId>models-core</artifactId>
<version>5.2.21-SNAPSHOT</version>
<version>5.2.20-RC1</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
Expand Down
2 changes: 1 addition & 1 deletion docker-agents.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/bash
set -e

docker-compose run --rm --service-ports biosamples-agents-solr java -jar agents-solr-5.2.21-SNAPSHOT.jar
docker-compose run --rm --service-ports biosamples-agents-solr java -jar agents-solr-5.2.20-RC1.jar
echo "Successfully runned agents"
26 changes: 13 additions & 13 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ services:
command:
- java
- -jar
- webapps-core-5.2.21-SNAPSHOT.war
- webapps-core-5.2.20-RC1.war
environment:
- env=local
#AAP certificate
Expand Down Expand Up @@ -107,7 +107,7 @@ services:
command:
- java
- -jar
- webapps-core-v2-5.2.21-SNAPSHOT.jar
- webapps-core-v2-5.2.20-RC1.jar
environment:
#AAP certificate
- jwt.certificate=public.explore.der
Expand Down Expand Up @@ -187,7 +187,7 @@ services:
command:
- java
- -jar
- agents-solr-5.2.21-SNAPSHOT.jar
- agents-solr-5.2.20-RC1.jar
environment:
- SPRING_RABBITMQ_HOST=rabbitmq
- SPRING_RABBITMQ_PUBLISHER-CONFIRMS=true
Expand All @@ -212,7 +212,7 @@ services:
command:
- java
- -jar
- agents-uploadworkers-5.2.21-SNAPSHOT.jar
- agents-uploadworkers-5.2.20-RC1.jar
environment:
#AAP certificate
- jwt.certificate=public.explore.der
Expand Down Expand Up @@ -241,7 +241,7 @@ services:
command:
- java
- -jar
- pipelines-ena-5.2.21-SNAPSHOT.jar
- pipelines-ena-5.2.20-RC1.jar
environment:
- BIOSAMPLES_CLIENT_URI=http://biosamples-webapps-core:8080/biosamples
- LOGGING_FILE=/logs/pipelines-ena.log
Expand All @@ -256,7 +256,7 @@ services:
command:
- java
- -jar
- pipelines-ncbi-5.2.21-SNAPSHOT.jar
- pipelines-ncbi-5.2.20-RC1.jar
environment:
- BIOSAMPLES_CLIENT_URI=http://biosamples-webapps-core:8080/biosamples
- LOGGING_FILE=/logs/pipelines-ncbi.log
Expand All @@ -271,7 +271,7 @@ services:
command:
- java
- -jar
- pipelines-accession-5.2.21-SNAPSHOT.jar
- pipelines-accession-5.2.20-RC1.jar
environment:
- BIOSAMPLES_CLIENT_URI=http://biosamples-webapps-core:8080/biosamples
- LOGGING_FILE=/logs/pipelines-accession.log
Expand All @@ -286,7 +286,7 @@ services:
command:
- java
- -jar
- pipelines-copydown-5.2.21-SNAPSHOT.jar
- pipelines-copydown-5.2.20-RC1.jar
environment:
- BIOSAMPLES_CLIENT_URI=http://biosamples-webapps-core:8080/biosamples
- LOGGING_FILE=/logs/pipelines-copydown.log
Expand All @@ -301,7 +301,7 @@ services:
command:
- java
- -jar
- pipelines-curation-5.2.21-SNAPSHOT.jar
- pipelines-curation-5.2.20-RC1.jar
environment:
- BIOSAMPLES_CLIENT_URI=http://biosamples-webapps-core:8080/biosamples
- LOGGING_FILE=/logs/pipelines-curation.log
Expand All @@ -318,7 +318,7 @@ services:
command:
- java
- -jar
- pipelines-zooma-5.2.21-SNAPSHOT.jar
- pipelines-zooma-5.2.20-RC1.jar
environment:
- BIOSAMPLES_CLIENT_URI=http://biosamples-webapps-core:8080/biosamples
- LOGGING_FILE=/logs/pipelines-zooma.log
Expand All @@ -335,7 +335,7 @@ services:
command:
- java
- -jar
- pipelines-reindex-5.2.21-SNAPSHOT.jar
- pipelines-reindex-5.2.20-RC1.jar
environment:
- BIOSAMPLES_CLIENT_URI=http://biosamples-webapps-core:8080/biosamples
- LOGGING_FILE=/logs/pipelines-reindex.log
Expand All @@ -353,7 +353,7 @@ services:
command:
- java
- -jar
- pipelines-export-5.2.21-SNAPSHOT.jar
- pipelines-export-5.2.20-RC1.jar
- --gzip
- /export/export.json.gzip
environment:
Expand All @@ -371,7 +371,7 @@ services:
command:
- java
- -jar
- integration-5.2.21-SNAPSHOT.jar
- integration-5.2.20-RC1.jar
environment:
- BIOSAMPLES_CLIENT_URI=http://biosamples-webapps-core:8080/biosamples
- BIOSAMPLES_CLIENT_URI_V2=http://biosamples-webapps-core-v2:8080/biosamples/v2
Expand Down
2 changes: 1 addition & 1 deletion docker-integration.big.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ ARGS=--spring.profiles.active=big
for X in 1 2 3 4 5
do
#java -jar integration/target/integration-4.0.0-SNAPSHOT.jar --phase=$X $ARGS $@
docker-compose run --rm --service-ports biosamples-integration java -jar integration-5.2.21-SNAPSHOT.jar --phase=$X $ARGS $@
docker-compose run --rm --service-ports biosamples-integration java -jar integration-5.2.20-RC1.jar --phase=$X $ARGS $@
sleep 10 #solr is configured to commit every 5 seconds

done
Expand Down
2 changes: 1 addition & 1 deletion docker-integration.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ do
echo "=================================== STARTING INTEGRATION TESTS PHASE-"$X "====================================="
echo "============================================================================================================"
#java -jar integration/target/integration-4.0.0-SNAPSHOT.jar --phase=$X $ARGS $@
docker-compose run --rm --service-ports biosamples-integration java -jar integration-5.2.21-SNAPSHOT.jar --phase=$X $ARGS $@
docker-compose run --rm --service-ports biosamples-integration java -jar integration-5.2.20-RC1.jar --phase=$X $ARGS $@
sleep 10 #solr is configured to commit every 5 seconds

done
Expand Down
2 changes: 1 addition & 1 deletion docker-test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ docker-compose up -d biosamples-agents-solr

for X in "$@"
do
docker-compose run --rm --service-ports biosamples-integration java -jar integration-5.2.21-SNAPSHOT.jar --phase=$X $ARGS $@
docker-compose run --rm --service-ports biosamples-integration java -jar integration-5.2.20-RC1.jar --phase=$X $ARGS $@
sleep 30 #solr is configured to commit every 5 seconds

done
Expand Down
10 changes: 5 additions & 5 deletions integration/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,25 +6,25 @@
<parent>
<groupId>uk.ac.ebi.biosamples</groupId>
<artifactId>biosamples</artifactId>
<version>5.2.21-SNAPSHOT</version>
<version>5.2.20-RC1</version>
<relativePath>../</relativePath>
</parent>

<dependencies>
<dependency>
<groupId>uk.ac.ebi.biosamples</groupId>
<artifactId>biosamples-spring-boot-starter</artifactId>
<version>5.2.21-SNAPSHOT</version>
<version>5.2.20-RC1</version>
</dependency>
<dependency>
<groupId>uk.ac.ebi.biosamples</groupId>
<artifactId>models-sitemap</artifactId>
<version>5.2.21-SNAPSHOT</version>
<version>5.2.20-RC1</version>
</dependency>
<dependency>
<groupId>uk.ac.ebi.biosamples</groupId>
<artifactId>models-jsonld</artifactId>
<version>5.2.21-SNAPSHOT</version>
<version>5.2.20-RC1</version>
</dependency>
<dependency>
<groupId>org.springframework.hateoas</groupId>
Expand Down Expand Up @@ -78,7 +78,7 @@
<dependency>
<groupId>uk.ac.ebi.biosamples</groupId>
<artifactId>models-neo4j</artifactId>
<version>5.2.21-SNAPSHOT</version>
<version>5.2.20-RC1</version>
<scope>compile</scope>
</dependency>
<dependency>
Expand Down
4 changes: 2 additions & 2 deletions messaging/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@
<parent>
<groupId>uk.ac.ebi.biosamples</groupId>
<artifactId>biosamples</artifactId>
<version>5.2.21-SNAPSHOT</version>
<version>5.2.20-RC1</version>
</parent>

<dependencies>
<dependency>
<groupId>uk.ac.ebi.biosamples</groupId>
<artifactId>models-core</artifactId>
<version>5.2.21-SNAPSHOT</version>
<version>5.2.20-RC1</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
Expand Down
2 changes: 1 addition & 1 deletion models/common/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<parent>
<groupId>uk.ac.ebi.biosamples</groupId>
<artifactId>biosamples</artifactId>
<version>5.2.21-SNAPSHOT</version>
<version>5.2.20-RC1</version>
<relativePath>../../</relativePath>
</parent>

Expand Down
Loading

0 comments on commit 3cc280e

Please sign in to comment.