Merge pull request #355 from i-on-project/release/2021-final

fixes release version

Author: xploitedd

.docker/compose_ci.yaml

@@ -11,6 +11,7 @@ services:
       environment:
         - JDBC_DATABASE_URL=jdbc:postgresql://db:5432/core?user=bob&password=changeit
         - ION_CORE_SECRET_KEY=t8abumA3JBJrd7q0LuN3nSzKGBfslOYb
+        - FLYWAY_LOCATIONS=classpath:migrations,classpath:test_migrations
     db:
       image: postgres:13-alpine
       container_name: core-db-container

.docker/compose_run.yaml

@@ -14,6 +14,7 @@ services:
         - JDBC_DATABASE_URL=jdbc:postgresql://db:5432/core?user=bob&password=changeit
         - ION_CORE_SECRET_KEY=t8abumA3JBJrd7q0LuN3nSzKGBfslOYb
         - ION_CORE_BASE_URL=http://localhost:10023
+        - FLYWAY_LOCATIONS=classpath:migrations,classpath:test_migrations
     db:
       image: postgres:13-alpine
       container_name: core-db-container

jvm/src/test/resources/test_migrations/V1.2__Add_Test_Data.sql jvm/src/main/resources/test_migrations/V1.2__Add_Test_Data.sql

@@ -6,6 +6,6 @@ core.secret-key-password=changeit
 ingestion.institution_folder=${INTEGRATION_INSTITUTION:pt.ipl.isel}
 ingestion.repository_remote=${INTEGRATION_REPOSITORY_REMOTE:https://github.com/i-on-project/integration-data}
 ingestion.repository_remote_branch=${INTEGRATION_REPOSITORY_REMOTE_BRANCH:master}
-spring.flyway.locations=${FLYWAY_LOCATIONS:classpath:migrations,classpath:test_migrations}
+spring.flyway.locations=${FLYWAY_TEST_LOCATIONS:classpath:migrations,classpath:test_migrations}
 spring.flyway.enabled=true
 spring.profiles.active=test