diff --git a/Jenkinsfile b/Jenkinsfile index 5ff66e125d2d4c8387811384087d26a514b3f8cc..b5e12d24fe184584d5cb1708a8528057830d2c52 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -142,14 +142,17 @@ pipeline { tagAndPushDockerImage('formcycle-adapter', IMAGE_TAG) tagAndPushDockerImage('enterprise-adapter', IMAGE_TAG) + tagAndPushDockerImage('forwarder', IMAGE_TAG) if (env.BRANCH_NAME == 'main') { tagAndPushDockerImage('formcycle-adapter', 'snapshot-latest') tagAndPushDockerImage('enterprise-adapter', 'snapshot-latest') + tagAndPushDockerImage('forwarder', 'snapshot-latest') } else if (env.BRANCH_NAME == 'release') { tagAndPushDockerImage('formcycle-adapter', 'latest') tagAndPushDockerImage('enterprise-adapter', 'latest') + tagAndPushDockerImage('forwarder', 'latest') } } } diff --git a/enterprise-adapter/pom.xml b/enterprise-adapter/pom.xml index 9e3d45ca71353866d000766d98285e1c3ffd1c3c..109660c3b960721d328a4bf9f063f2096a1943d3 100644 --- a/enterprise-adapter/pom.xml +++ b/enterprise-adapter/pom.xml @@ -46,10 +46,6 @@ <groupId>de.ozgcloud.eingang</groupId> <artifactId>common</artifactId> </dependency> - <dependency> - <groupId>de.ozgcloud.eingang</groupId> - <artifactId>forwarder</artifactId> - </dependency> <dependency> <groupId>de.ozgcloud.eingang</groupId> <artifactId>semantik-adapter</artifactId> diff --git a/fim-adapter/pom.xml b/fim-adapter/pom.xml index bac8224638223a856ce59ded60f9c3f0c979935d..e672e58fb0e4946512ffaf08e1cd2d4e3d25f62e 100644 --- a/fim-adapter/pom.xml +++ b/fim-adapter/pom.xml @@ -45,10 +45,6 @@ <groupId>de.ozgcloud.eingang</groupId> <artifactId>semantik-adapter</artifactId> </dependency> - <dependency> - <groupId>de.ozgcloud.eingang</groupId> - <artifactId>forwarder</artifactId> - </dependency> <!--test --> <dependency> diff --git a/formcycle-adapter/pom.xml b/formcycle-adapter/pom.xml index 8c249502d8e536b98157712290503feaff6075fb..19cc12fb20a550332c39b186361e6359e5b73304 100644 --- a/formcycle-adapter/pom.xml +++ b/formcycle-adapter/pom.xml @@ -50,10 +50,6 @@ <dependencies> <!-- OZG-Cloud --> - <dependency> - <groupId>de.ozgcloud.eingang</groupId> - <artifactId>forwarder</artifactId> - </dependency> <dependency> <groupId>de.ozgcloud.vorgang</groupId> <artifactId>vorgang-manager-utils</artifactId> diff --git a/forwarder/pom.xml b/forwarder/pom.xml index 4fabecd6af1c23ce9d991e6c1db97a49c706da87..afd9753ee02bb549af50743b0b69725a63c7ff68 100644 --- a/forwarder/pom.xml +++ b/forwarder/pom.xml @@ -124,4 +124,30 @@ </plugin> </plugins> </build> + + <profiles> + <profile> + <id>ci-build</id> + <build> + <plugins> + <plugin> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-maven-plugin</artifactId> + <configuration> + <mainClass>de.ozgcloud.eingang.formcycle.FormcycleAdapterApplication</mainClass> + </configuration> + <executions> + <execution> + <id>build-image</id> + <phase>install</phase> + <goals> + <goal>build-image-no-fork</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + </profiles> </project> \ No newline at end of file diff --git a/forwarder/src/main/resources/application-local.yml b/forwarder/src/main/resources/application-local.yml new file mode 100644 index 0000000000000000000000000000000000000000..1a493ac915649ada101d24a2374ca06690101907 --- /dev/null +++ b/forwarder/src/main/resources/application-local.yml @@ -0,0 +1,21 @@ +logging: + config: classpath:log4j2-local.xml + +server: + port: 9293 + error: + include-stacktrace: always + +management: + server.port: 8084 + +ozgcloud: + adapter: + targetVorgangManagerName: local + fallbackStrategy: DENY + +grpc: + client: + vorgang-manager-local: + address: static://127.0.0.1:9090 + negotiationType: PLAINTEXT diff --git a/forwarder/src/main/resources/application.yml b/forwarder/src/main/resources/application.yml new file mode 100644 index 0000000000000000000000000000000000000000..3a1d31c3031982893ceca985e8d104d9982a97dc --- /dev/null +++ b/forwarder/src/main/resources/application.yml @@ -0,0 +1,31 @@ +logging: + level: + ROOT: WARN + '[de.ozgcloud]': INFO + +management: + server: + port: 8081 + health: + livenessState: + enabled: true + readinessState: + enabled: true + endpoint: + health: + group: + exploratory: + include: livenessState,readinessState,ping + show-details: always + probes: + enabled: true + prometheus: + enabled: true + endpoints: + web: + exposure: + include: health,prometheus + +ozgcloud: + adapter: + routingStrategy: SINGLE \ No newline at end of file