Skip to content

Commit d37924a

Browse files
Upgrade spring boot version - build react-webapp, build authentication-service
1 parent 116e590 commit d37924a

File tree

2 files changed

+9
-53
lines changed

2 files changed

+9
-53
lines changed

docker/docker-compose.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ services:
5454
# - MANAGEMENT_HEALTH_REDIS_ENABLED=false
5555
# - COM_MICROSERVICE_AUTHENTICATION_JWT_KEY_VALUE=
5656
# - COM_MICROSERVICE_AUTHENTICATION_JWT_KEY_STORE=file:/www.spendingbetter.com.jks
57-
# - COM_MICROSERVICE_AUTHENTICATION_JWT_KEY_STORE_PASSWORD=${
57+
# - COM_MICROSERVICE_AUTHENTICATION_JWT_KEY_STORE_PASSWORD=${CERT_PASSWORD}
5858
# - COM_MICROSERVICE_AUTHENTICATION_JWT_KEY_ALIAS=spendingbetter
5959
- SPRING_SECURITY_OAUTH2_RESOURCESERVER_JWT_JWK_SET_URI=http://localhost:9999/.well-known/jwks.json
6060
# - SPRING_CLOUD_GATEWAY_GLOBAL_CORS_ADD_TO_SIMPLE_URL_HANDLER_MAPPING=true
@@ -93,7 +93,7 @@ services:
9393
- COM_MICROSERVICE_AUTHENTICATION_REDIS_ENABLED=true
9494
# - COM_MICROSERVICE_AUTHENTICATION_JWT_KEY_VALUE=
9595
# - COM_MICROSERVICE_AUTHENTICATION_JWT_KEY_STORE=file:/www.spendingbetter.com.jks
96-
# - COM_MICROSERVICE_AUTHENTICATION_JWT_KEY_STORE_PASSWORD=${
96+
# - COM_MICROSERVICE_AUTHENTICATION_JWT_KEY_STORE_PASSWORD=${CERT_PASSWORD}
9797
# - COM_MICROSERVICE_AUTHENTICATION_JWT_KEY_ALIAS=spendingbetter
9898
depends_on:
9999
- service-discovery
@@ -233,10 +233,10 @@ services:
233233
- JAVA_OPTS=--enable-preview
234234
- SPRING_MAIN_ALLOW_BEAN_DEFINITION_OVERRIDING=true
235235
- LOGGING_LEVEL_ORG_APACHE_COYOTE_HTTP11=trace
236-
- COM_MICROSERVICE_AUTHENTICATION_JWT_KEY_VALUE=
237-
- com.microservice.authentication.jwt.publicKeyStore=file:/www.spendingbetter.com.pub
238-
- COM_MICROSERVICE_AUTHENTICATION_JWT_KEY_STORE_PASSWORD=${
239-
- COM_MICROSERVICE_AUTHENTICATION_JWT_KEY_ALIAS=spendingbetter
236+
# - COM_MICROSERVICE_AUTHENTICATION_JWT_KEY_VALUE=
237+
# - com.microservice.authentication.jwt.publicKeyStore=file:/www.spendingbetter.com.pub
238+
# - COM_MICROSERVICE_AUTHENTICATION_JWT_KEY_STORE_PASSWORD=${CERT_PASSWORD}
239+
# - COM_MICROSERVICE_AUTHENTICATION_JWT_KEY_ALIAS=spendingbetter
240240
depends_on:
241241
- service-discovery
242242
- mongodb-datasource
@@ -247,7 +247,7 @@ services:
247247
- 8082:8082
248248
volumes:
249249
- ./docker-entrypoint.sh:/docker-entrypoint.sh
250-
- /Users/rodrigo/Downloads/ssl/old/www.spendingbetter.com.pub:/www.spendingbetter.com.pub
250+
# - /Users/rodrigo/Downloads/ssl/old/www.spendingbetter.com.pub:/www.spendingbetter.com.pub
251251
# command: sh ./docker-entrypoint.sh service-discovery:8500
252252
networks:
253253
net:

pom.xml

Lines changed: 2 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>org.springframework.boot</groupId>
77
<artifactId>spring-boot-starter-parent</artifactId>
8-
<version>3.4.0</version>
8+
<version>3.4.3</version>
99
<relativePath/> <!-- lookup parent from repository -->
1010
</parent>
1111
<groupId>com.springboot</groupId>
@@ -20,7 +20,7 @@
2020
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
2121
<java.version>21</java.version>
2222
<mapstruct.version>1.6.2</mapstruct.version>
23-
<spring-cloud.version>2024.0.0-RC1</spring-cloud.version>
23+
<spring-cloud.version>2024.0.0</spring-cloud.version>
2424
<docker.image.name>${project.artifactId}</docker.image.name>
2525
<docker.image.from>openjdk:21-jdk</docker.image.from>
2626
<!-- Not working on mac m1 -->
@@ -57,14 +57,6 @@
5757
<scope>import</scope>
5858
</dependency>
5959

60-
<dependency>
61-
<groupId>org.springframework.cloud</groupId>
62-
<artifactId>spring-cloud-sleuth-otel-dependencies</artifactId>
63-
<version>1.1.0</version>
64-
<scope>import</scope>
65-
<type>pom</type>
66-
</dependency>
67-
6860
<dependency>
6961
<groupId>org.mapstruct</groupId>
7062
<artifactId>mapstruct</artifactId>
@@ -77,47 +69,11 @@
7769
<version>${mapstruct.version}</version>
7870
</dependency>
7971

80-
<!--
81-
<dependency>
82-
<groupId>org.springframework.experimental</groupId>
83-
<artifactId>spring-native</artifactId>
84-
<version>${spring-native.version}</version>
85-
</dependency>
86-
-->
87-
88-
<!--
89-
<dependency>
90-
<groupId>org.springframework.data</groupId>
91-
<artifactId>spring-data-commons</artifactId>
92-
<version>2.7.3-SNAPSHOT</version>
93-
</dependency>
94-
-->
95-
96-
<dependency>
97-
<groupId>com.github.rodrigorodrigues</groupId>
98-
<artifactId>spring-data-commons-2.7.X</artifactId>
99-
<version>2.7.3</version>
100-
</dependency>
101-
102-
<!--<dependency>
103-
<groupId>org.springframework.data</groupId>
104-
<artifactId>spring-data-commons</artifactId>
105-
<version>3.4.0-SNAPSHOT</version>
106-
</dependency>-->
10772
<dependency>
10873
<groupId>com.github.rodrigorodrigues</groupId>
10974
<artifactId>spring-data-commons</artifactId>
11075
<version>3.5.0-SNAPSHOT</version>
11176
</dependency>
112-
113-
<!--
114-
<dependency>
115-
<groupId>io.github.rwinch.webauthn</groupId>
116-
<artifactId>spring-security-webauthn</artifactId>
117-
<version>0.0.1-SNAPSHOT</version>
118-
</dependency>
119-
-->
120-
12177
</dependencies>
12278
</dependencyManagement>
12379

0 commit comments

Comments
 (0)