Merge branch 'release/2021-beta-version'

i-on-project · Jun 30, 2021 · 4d0bb1a · 4d0bb1a
2 parents d4b34f5 + 4079c6b
commit 4d0bb1a
Show file tree

Hide file tree

Showing 3 changed files with 822 additions and 3 deletions.
diff --git a/jvm/src/main/kotlin/org/ionproject/core/ingestion/IngestionTask.kt b/jvm/src/main/kotlin/org/ionproject/core/ingestion/IngestionTask.kt
@@ -36,11 +36,11 @@ class IngestionTask(
     private val threadPool = Executors.newSingleThreadExecutor()
 
     private val academicYearsDir: File by lazy {
-        File(REPOSITORY_DIR_NAME + File.separator + institutionFolder + File.separator + ACADEMIC_YEARS)
+        File(repositoryDir.absolutePath + File.separator + institutionFolder + File.separator + ACADEMIC_YEARS)
     }
 
     private val programmesDir: File by lazy {
-        File(REPOSITORY_DIR_NAME + File.separator + institutionFolder + File.separator + PROGRAMMES)
+        File(repositoryDir.absolutePath + File.separator + institutionFolder + File.separator + PROGRAMMES)
     }
 
     @Scheduled(fixedRate = INGESTION_RATE)

diff --git a/jvm/src/main/resources/application.properties b/jvm/src/main/resources/application.properties
@@ -6,5 +6,5 @@ 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=classpath:migrations
+spring.flyway.locations=${FLYWAY_LOCATIONS:classpath:migrations}
 spring.flyway.enabled=true