Skip to content

Commit f28e7ff

Browse files
author
Ivan Franchin
committed
project upgrade
- upgrade to java 17; - upgrade to spring-boot 2.7.2; - upgrade to mapstruct 1.5.2.Final; - upgrade to maven distributionUrl 3.8.6; - upgrade to cassandra docker image 4.0.5; - upgrade to vault docker image 1.11.2; - upgrade to consul docker image 1.13.0; - rename groupId to com.ivanfranchin; - convert some classes to records; - update READMEs.
1 parent 15adc91 commit f28e7ff

File tree

82 files changed

+204
-240
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

82 files changed

+204
-240
lines changed

‎.mvn/wrapper/maven-wrapper.properties‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.4/apache-maven-3.8.4-bin.zip
2-
wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar
1+
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.6/apache-maven-3.8.6-bin.zip
2+
wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar

‎README.md‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,14 @@ In order to solve this problem, I have implemented some solutions for applicatio
1212

1313
## Examples
1414

15-
- ### [spring-cloud-vault-approle-mysql](https://github.com/ivangfr/springboot-vault-examples/tree/master/spring-cloud-vault-approle-mysql#springboot-vault-examples) **(with lease rotation)**
16-
- ### [spring-cloud-vault-approle-cassandra](https://github.com/ivangfr/springboot-vault-examples/tree/master/spring-cloud-vault-approle-cassandra#springboot-vault-examples)
17-
- ### [spring-vault-approle-mysql](https://github.com/ivangfr/springboot-vault-examples/tree/master/spring-vault-approle-mysql#springboot-vault-examples) **(with lease rotation)**
18-
- ### [spring-vault-approle-multi-datasources-mysql](https://github.com/ivangfr/springboot-vault-examples/tree/master/spring-vault-approle-multi-datasources-mysql#springboot-vault-examples) **(with lease rotation)**
15+
- ### [spring-cloud-vault-approle-mysql](https://github.com/ivangfr/springboot-vault-examples/tree/master/spring-cloud-vault-approle-mysql) **(with lease rotation)**
16+
- ### [spring-cloud-vault-approle-cassandra](https://github.com/ivangfr/springboot-vault-examples/tree/master/spring-cloud-vault-approle-cassandra)
17+
- ### [spring-vault-approle-mysql](https://github.com/ivangfr/springboot-vault-examples/tree/master/spring-vault-approle-mysql) **(with lease rotation)**
18+
- ### [spring-vault-approle-multi-datasources-mysql](https://github.com/ivangfr/springboot-vault-examples/tree/master/spring-vault-approle-multi-datasources-mysql) **(with lease rotation)**
1919

2020
## Prerequisites
2121

22-
- [`Java 11+`](https://www.oracle.com/java/technologies/downloads/#java11)
22+
- [`Java 17+`](https://www.oracle.com/java/technologies/downloads/#java17)
2323
- [`Docker`](https://www.docker.com/)
2424
- [`Docker-Compose`](https://docs.docker.com/compose/install/)
2525

‎docker/cassandra/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM cassandra:4.0.4
1+
FROM cassandra:4.0.5
22

33
RUN echo "authenticator: PasswordAuthenticator" >> /etc/cassandra/cassandra.yaml
44
RUN echo "authorizer: org.apache.cassandra.auth.CassandraAuthorizer" >> /etc/cassandra/cassandra.yaml

‎init-environment.sh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
source scripts/my-functions.sh
44

55
MYSQL_VERSION="8.0.29"
6-
CASSANDRA_VERSION="4.0.4"
7-
VAULT_VERSION="1.10.3"
8-
CONSUL_VERSION="1.12.1"
6+
CASSANDRA_VERSION="4.0.5"
7+
VAULT_VERSION="1.11.2"
8+
CONSUL_VERSION="1.13.0"
99

1010
echo
1111
echo "Starting environment"

‎pom.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,20 @@
55
<parent>
66
<groupId>org.springframework.boot</groupId>
77
<artifactId>spring-boot-starter-parent</artifactId>
8-
<version>2.7.0</version>
8+
<version>2.7.2</version>
99
<relativePath/> <!-- lookup parent from repository -->
1010
</parent>
1111

12-
<groupId>com.mycompany</groupId>
12+
<groupId>com.ivanfranchin</groupId>
1313
<artifactId>springboot-vault-examples</artifactId>
1414
<version>1.0.0</version>
1515
<packaging>pom</packaging>
1616
<name>springboot-vault-examples</name>
1717
<description>Demo project for Spring Boot</description>
1818

1919
<properties>
20-
<java.version>11</java.version>
21-
<org.mapstruct.version>1.4.2.Final</org.mapstruct.version>
20+
<java.version>17</java.version>
21+
<org.mapstruct.version>1.5.2.Final</org.mapstruct.version>
2222
<lombok-mapstruct-binding.version>0.2.0</lombok-mapstruct-binding.version>
2323
<springdoc-openapi.version>1.6.9</springdoc-openapi.version>
2424
<jib-maven-plugin.version>3.2.1</jib-maven-plugin.version>

‎spring-cloud-vault-approle-cassandra/README.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,13 +56,13 @@ Before running this example, make sure the environment is initialized (see [Init
5656

5757
## Using book-service
5858

59-
You can access `book-service` Swagger website at http://localhost:9081/swagger-ui.html
59+
You can access `book-service` Swagger website at http://localhost:9081/swagger-ui/index.html
6060

6161
## Useful Links & Commands
6262

6363
- **Vault**
6464

65-
> **Note:** In order to run some commands, you must have [`jq`](https://stedolan.github.io/jq) installed in your machine
65+
> **Note**: In order to run some commands, you must have [`jq`](https://stedolan.github.io/jq) installed in your machine
6666
6767
- Open a new terminal
6868

@@ -147,7 +147,7 @@ You can access `book-service` Swagger website at http://localhost:9081/swagger-u
147147
## Shutdown
148148
149149
- Go to the terminal where the application is running and pressing `Ctrl+C`
150-
- Stop the services present in `docker-compose.yml` as explained in [Shutdown](https://github.com/ivangfr/springboot-vault-examples#shutdown) section of the main README
150+
- Stop the services present in `docker-compose.yml` as explained in [Shutdown Environment](https://github.com/ivangfr/springboot-vault-examples#shutdown-environment) section of the main README
151151
152152
## Cleanup
153153

‎spring-cloud-vault-approle-cassandra/book-service/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
44
<modelVersion>4.0.0</modelVersion>
55
<parent>
6-
<groupId>com.mycompany</groupId>
6+
<groupId>com.ivanfranchin</groupId>
77
<artifactId>springboot-vault-examples</artifactId>
88
<version>1.0.0</version>
99
<relativePath>../../pom.xml</relativePath>

spring-cloud-vault-approle-cassandra/book-service/src/main/java/com/mycompany/bookservice/BookServiceApplication.java renamed to spring-cloud-vault-approle-cassandra/book-service/src/main/java/com/ivanfranchin/bookservice/BookServiceApplication.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.mycompany.bookservice;
1+
package com.ivanfranchin.bookservice;
22

33
import org.springframework.boot.SpringApplication;
44
import org.springframework.boot.autoconfigure.SpringBootApplication;

spring-cloud-vault-approle-cassandra/book-service/src/main/java/com/mycompany/bookservice/config/CassandraConfig.java renamed to spring-cloud-vault-approle-cassandra/book-service/src/main/java/com/ivanfranchin/bookservice/config/CassandraConfig.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.mycompany.bookservice.config;
1+
package com.ivanfranchin.bookservice.config;
22

33
import org.springframework.beans.factory.annotation.Value;
44
import org.springframework.context.annotation.Bean;
@@ -32,7 +32,7 @@ public class CassandraConfig {
3232
private String password;
3333

3434
@Bean
35-
CqlSessionFactoryBean session() {
35+
public CqlSessionFactoryBean session() {
3636
CqlSessionFactoryBean session = new CqlSessionFactoryBean();
3737
session.setContactPoints(contactPoints);
3838
session.setPort(port);

spring-cloud-vault-approle-cassandra/book-service/src/main/java/com/mycompany/bookservice/config/SwaggerConfig.java renamed to spring-cloud-vault-approle-cassandra/book-service/src/main/java/com/ivanfranchin/bookservice/config/SwaggerConfig.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.mycompany.bookservice.config;
1+
package com.ivanfranchin.bookservice.config;
22

33
import io.swagger.v3.oas.models.Components;
44
import io.swagger.v3.oas.models.OpenAPI;

0 commit comments

Comments
 (0)