diff --git a/bescheid-manager/src/main/java/de/ozgcloud/bescheid/smartdocuments/SmartDocumentsBescheidRemoteService.java b/bescheid-manager/src/main/java/de/ozgcloud/bescheid/smartdocuments/SmartDocumentsBescheidRemoteService.java index c17807722752411e5f0719b1e674911b814bbbab..f23cac9489d4c17821a943889bbe6f2b24a76760 100644 --- a/bescheid-manager/src/main/java/de/ozgcloud/bescheid/smartdocuments/SmartDocumentsBescheidRemoteService.java +++ b/bescheid-manager/src/main/java/de/ozgcloud/bescheid/smartdocuments/SmartDocumentsBescheidRemoteService.java @@ -4,6 +4,7 @@ import java.io.File; import java.util.Collection; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.http.MediaType; import org.springframework.stereotype.Service; @@ -34,6 +35,7 @@ import lombok.extern.log4j.Log4j2; class SmartDocumentsBescheidRemoteService implements BescheidRemoteService { @Autowired + @Qualifier("smartDocuments") private WebClient smartDocumentsWebClient; @Autowired diff --git a/bescheid-manager/src/main/java/de/ozgcloud/bescheid/smartdocuments/SmartDocumentsConfiguration.java b/bescheid-manager/src/main/java/de/ozgcloud/bescheid/smartdocuments/SmartDocumentsConfiguration.java index 82c54eb104f96fd7d5ffa0aeccff231a0e4220a3..17eff2b9a9d0f65e92d8cf5db9b2446394bb7497 100644 --- a/bescheid-manager/src/main/java/de/ozgcloud/bescheid/smartdocuments/SmartDocumentsConfiguration.java +++ b/bescheid-manager/src/main/java/de/ozgcloud/bescheid/smartdocuments/SmartDocumentsConfiguration.java @@ -7,10 +7,10 @@ import org.springframework.web.reactive.function.client.ExchangeFilterFunctions; import org.springframework.web.reactive.function.client.WebClient; @Configuration -@ConditionalOnProperty("ozgcloud.bescheid.smart-documents.url") class SmartDocumentsConfiguration { - @Bean + @Bean("smartDocuments") + @ConditionalOnProperty("ozgcloud.bescheid.smart-documents.url") WebClient smartDocumentsWebClient(SmartDocumentsProperties properties) { return WebClient.builder() .baseUrl(properties.getUrl()) diff --git a/bescheid-manager/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/bescheid-manager/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index 08abec6c597ed602bc6a36d5de3111b9a0d66a74..539db3df5fe335ab29e56648cc3f3ee374821b85 100644 --- a/bescheid-manager/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/bescheid-manager/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -6,15 +6,3 @@ net.devh.boot.grpc.client.autoconfigure.GrpcClientTraceAutoConfiguration net.devh.boot.grpc.client.autoconfigure.GrpcDiscoveryClientAutoConfiguration net.devh.boot.grpc.common.autoconfigure.GrpcCommonCodecAutoConfiguration net.devh.boot.grpc.common.autoconfigure.GrpcCommonTraceAutoConfiguration -net.devh.boot.grpc.server.autoconfigure.GrpcAdviceAutoConfiguration -net.devh.boot.grpc.server.autoconfigure.GrpcHealthServiceAutoConfiguration -net.devh.boot.grpc.server.autoconfigure.GrpcMetadataConsulConfiguration -net.devh.boot.grpc.server.autoconfigure.GrpcMetadataEurekaConfiguration -net.devh.boot.grpc.server.autoconfigure.GrpcMetadataNacosConfiguration -net.devh.boot.grpc.server.autoconfigure.GrpcMetadataZookeeperConfiguration -net.devh.boot.grpc.server.autoconfigure.GrpcReflectionServiceAutoConfiguration -net.devh.boot.grpc.server.autoconfigure.GrpcServerAutoConfiguration -net.devh.boot.grpc.server.autoconfigure.GrpcServerFactoryAutoConfiguration -net.devh.boot.grpc.server.autoconfigure.GrpcServerMetricAutoConfiguration -net.devh.boot.grpc.server.autoconfigure.GrpcServerSecurityAutoConfiguration -net.devh.boot.grpc.server.autoconfigure.GrpcServerTraceAutoConfiguration diff --git a/pluto-common/src/main/java/de/itvsh/ozg/pluto/PlutoServerApplication.java b/pluto-common/src/main/java/de/itvsh/ozg/pluto/PlutoServerApplication.java index 4036e250666ccbeddb5af67cfe7e873f68da09e0..f3ce9a20f1e522c2d4d4048f62a791613c65ccdb 100644 --- a/pluto-common/src/main/java/de/itvsh/ozg/pluto/PlutoServerApplication.java +++ b/pluto-common/src/main/java/de/itvsh/ozg/pluto/PlutoServerApplication.java @@ -61,4 +61,5 @@ public class PlutoServerApplication { DelegatingSecurityContextAsyncTaskExecutor delegatingTaskExecutor(AsyncTaskExecutor applicationTaskExecutor) { return new DelegatingSecurityContextAsyncTaskExecutor(applicationTaskExecutor); } + } \ No newline at end of file diff --git a/pluto-server/pom.xml b/pluto-server/pom.xml index e74157aa07e768e7a8d65e0dd29a52b123bf129a..a4cfe1ee3693d9a70fa00311845d8487e133f4e7 100644 --- a/pluto-server/pom.xml +++ b/pluto-server/pom.xml @@ -50,7 +50,7 @@ <kop.license.version>1.3.0</kop.license.version> <kop.zufi.api.version>0.5.0</kop.zufi.api.version> <user-manager-interface.version>1.11.0</user-manager-interface.version> - <bescheid-manager.version>1.2.0</bescheid-manager.version> + <bescheid-manager.version>1.3.0-SNAPSHOT</bescheid-manager.version> <zip.version>2.11.1</zip.version> <jsoup.version>1.15.3</jsoup.version> @@ -341,6 +341,13 @@ <artifactId>spring-boot-maven-plugin</artifactId> <configuration> <mainClass>de.itvsh.ozg.pluto.PlutoServerApplication</mainClass> + <image> + <builder>paketobuildpacks/builder-jammy-base</builder> + </image> + <profiles> + <profile>local</profile> + <profile>a12proc</profile> + </profiles> </configuration> </plugin>