Skip to content

Commit 45f7d1b

Browse files
committed
CDR-2076 - replace floating images
1 parent f60587e commit 45f7d1b

5 files changed

Lines changed: 8 additions & 4 deletions

File tree

application/pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,7 @@
154154
<mainClass>org.ehrbase.migration.application.MigrationTool</mainClass>
155155
<image>
156156
<name>${image.name}:${image.tag}</name>
157+
<builder>paketobuildpacks/builder-noble-java-tiny:0.0.69</builder>
157158
<env>
158159
<BP_DEBUG_ENABLED>true</BP_DEBUG_ENABLED>
159160
</env>

application/src/test/java/org/ehrbase/migration/application/MigrationToolIT.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,7 @@ public static class Initializer implements ApplicationContextInitializer<Configu
101101
@Override
102102
public void initialize(ConfigurableApplicationContext configurableApplicationContext) {
103103
var values = TestPropertyValues.of(
104+
"spring.datasource.export.enable=true",
104105
"spring.datasource.export.url=jdbc:postgresql://%s:%d/ehrbase"
105106
.formatted(
106107
postgresOld.getHost(), postgresOld.getMappedPort(EHRbasePostgresOldContainer.PORT)),
@@ -152,7 +153,6 @@ public Optional<OPERATIONALTEMPLATE> find(String templateId) {
152153

153154
@Test
154155
void test() throws IOException {
155-
156156
String committer1Subject = "efb90305-f546-40aa-9c78-ba199a089cf6";
157157
DefaultRestClient restClient1 = setupRestClientWithInternalTemplateProvider(ehrbaseOld, committer1Subject);
158158

service/pom.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,9 @@
149149
</executions>
150150
<configuration>
151151
<skip>true</skip>
152+
<image>
153+
<builder>paketobuildpacks/builder-noble-java-tiny:0.0.69</builder>
154+
</image>
152155
</configuration>
153156
</plugin>
154157

service/src/main/java/org/ehrbase/migration/config/ExportDatasourceConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
import org.springframework.context.annotation.Configuration;
4141

4242
@Configuration
43-
@ConditionalOnProperty("spring.datasource.export.enable")
43+
@ConditionalOnProperty(name = "spring.datasource.export.enable", havingValue = "true")
4444
public class ExportDatasourceConfiguration {
4545

4646
@Bean

service/src/main/java/org/ehrbase/migration/exporter/ExportServiceConfiguration.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,15 @@
2121
import org.ehrbase.migration.exporter.v0.ExportServiceV0Imp;
2222
import org.jooq.DSLContext;
2323
import org.springframework.beans.factory.annotation.Qualifier;
24-
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
24+
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
2525
import org.springframework.context.annotation.Bean;
2626
import org.springframework.context.annotation.Configuration;
2727

2828
@Configuration
29+
@ConditionalOnProperty(name = "spring.datasource.export.enable", havingValue = "true")
2930
public class ExportServiceConfiguration {
3031

3132
@Bean
32-
@ConditionalOnBean(name = "exportDslContext")
3333
ExportService exportService(
3434
@Qualifier("exportDslContext") DSLContext context,
3535
ExportDatasourceConfiguration.TenantHandlingExportConnectionProvider connectionProvider) {

0 commit comments

Comments
 (0)