Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Maint/295 maintenance align banner configuration with refarch templates #297

Merged
merged 3 commits into from
Nov 29, 2024
Merged

Maint/295 maintenance align banner configuration with refarch templates #297

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8a5fa4c
:wrench: Updated banner configuration for gateway
devtobi Nov 29, 2024
2e3f1dc
:wrench: Updated banner configuration for s3-integration-service
devtobi Nov 29, 2024
8ea5dfb
Merge branch 'main' into maint/295-maintenance-align-banner-configura…
devtobi Nov 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions refarch-gateway/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<maven.compiler.release>${java.version}</maven.compiler.release>

<!-- Core Frameworks -->
<spring-cloud.version>2023.0.4</spring-cloud.version>
<spring-cloud-dependencies.version>2023.0.4</spring-cloud-dependencies.version>

<!-- Logging -->
<logstash-logback-encoder.version>8.0</logstash-logback-encoder.version>
Expand Down Expand Up @@ -57,7 +57,7 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dependencies</artifactId>
<version>${spring-cloud.version}</version>
<version>${spring-cloud-dependencies.version}</version>
devtobi marked this conversation as resolved.
Show resolved Hide resolved
<type>pom</type>
<scope>import</scope>
</dependency>
Expand Down
12 changes: 8 additions & 4 deletions refarch-gateway/src/main/resources/application.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
spring:
application.name: '@project.artifactId@'
application.name: @project.artifactId@
banner.location: banner.txt
main:
web-application-type: reactive
Expand Down Expand Up @@ -57,8 +57,12 @@ management:

info:
application:
name: ${spring.application.name}
version: '@project.version@'
name: @project.artifactId@
version: @project.version@
description: @project.description@
build:
java.version: @java.version@
spring-cloud.version: @spring-cloud-dependencies.version@
devtobi marked this conversation as resolved.
Show resolved Hide resolved

config:
map5xxto400: true
map5xxto400: true
devtobi marked this conversation as resolved.
Show resolved Hide resolved
16 changes: 11 additions & 5 deletions refarch-gateway/src/main/resources/banner.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,13 @@
---------------------------------------------------------------------------------------------------------------------------------------------------
RefArch-Gateway
https://github.com/it-at-m/refarch
${spring.application.name}

Application Name : ${spring.application.name} (v${info.application.version})
Spring Boot Version : ${spring-boot.formatted-version}
---------------------------------------------------------------------------------------------------------------------------------------------------
Application Version : ${info.application.version}
Java Version : ${info.build.java.version}
Spring Boot Version : ${spring-boot.version}
Spring Cloud Version: ${info.build.spring-cloud.version}
About : ${info.application.description}

This project is based on the reference architecture of it@M maintained under https://github.com/it-at-m/refarch.
Do you have suggestions for improvement? Please take a look at https://github.com/it-at-m/refarch/issues/new/choose to open an issue.
If you want to provide a PR please take a look at our Contribution Guidelines.
---------------------------------------------------------------------------------------------------------------------------------------------------
devtobi marked this conversation as resolved.
Show resolved Hide resolved
4 changes: 2 additions & 2 deletions refarch-integrations/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
<maven.compiler.release>${java.version}</maven.compiler.release>

<!-- Core Frameworks -->
<spring-cloud.version>2023.0.4</spring-cloud.version>
<spring-cloud-dependencies.version>2023.0.4</spring-cloud-dependencies.version>

<!-- Logging -->
<logstash-logback-encoder.version>8.0</logstash-logback-encoder.version>
Expand Down Expand Up @@ -65,7 +65,7 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dependencies</artifactId>
<version>${spring-cloud.version}</version>
<version>${spring-cloud-dependencies.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand Down
1 change: 1 addition & 0 deletions ...ch-s3-integration/refarch-s3-integration-rest/refarch-s3-integration-rest-service/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@

<artifactId>refarch-s3-integration-rest-service</artifactId>
<name>refarch-s3-integration-rest-service</name>
<description>Integration for CRUD operations on a s3 storage</description>

<properties>
<commons-io.version>2.18.0</commons-io.version>
Expand Down
7 changes: 5 additions & 2 deletions ...3-integration-rest/refarch-s3-integration-rest-service/src/main/resources/application.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
info:
application:
name: '@project.artifactId@'
version: '@project.version@'
name: @project.artifactId@
version: @project.version@
description: @project.description@
build:
java.version: @java.version@
devtobi marked this conversation as resolved.
Show resolved Hide resolved

spring:
application:
Expand Down
13 changes: 9 additions & 4 deletions ...rch-s3-integration-rest/refarch-s3-integration-rest-service/src/main/resources/banner.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
---------------------------------------------------------------------------------------------------------------------------------------------------
RefArch-S3-Integration
https://github.com/it-at-m/refarch
${spring.application.name}

Application Name : ${spring.application.name} (v${info.application.version})
Spring Boot Version : ${spring-boot.formatted-version}
Application Version : ${info.application.version}
Java Version : ${info.build.java.version}
Spring Boot Version : ${spring-boot.version}
About : ${info.application.description}

This project is based on the reference architecture of it@M maintained under https://github.com/it-at-m/refarch.
devtobi marked this conversation as resolved.
Show resolved Hide resolved
Do you have suggestions for improvement? Please take a look at https://github.com/it-at-m/refarch/issues/new/choose to open an issue.
If you want to provide a PR please take a look at our Contribution Guidelines.
devtobi marked this conversation as resolved.
Show resolved Hide resolved
---------------------------------------------------------------------------------------------------------------------------------------------------