Skip to content

Commit 3f4b57b

Browse files
committed
Update to spring boot 3.2.3
1 parent c3de743 commit 3f4b57b

33 files changed

+410
-788
lines changed

.dockerignore

Lines changed: 0 additions & 11 deletions
This file was deleted.

.env_local

Lines changed: 0 additions & 1 deletion
This file was deleted.

.flavour/addons/5312342e1090dcada42c6df91138706c9f6a0d0b3c372016fef2c8c1527a0afe

Lines changed: 0 additions & 6 deletions
This file was deleted.

.gitignore

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
HELP.md
2+
.gradle
3+
build/
4+
!gradle/wrapper/gradle-wrapper.jar
5+
!**/src/main/**/build/
6+
!**/src/test/**/build/
7+
8+
### STS ###
9+
.apt_generated
10+
.classpath
11+
.factorypath
12+
.project
13+
.settings
14+
.springBeans
15+
.sts4-cache
16+
bin/
17+
!**/src/main/**/bin/
18+
!**/src/test/**/bin/
19+
20+
### IntelliJ IDEA ###
21+
.idea
22+
*.iws
23+
*.iml
24+
*.ipr
25+
out/
26+
!**/src/main/**/out/
27+
!**/src/test/**/out/
28+
29+
### NetBeans ###
30+
/nbproject/private/
31+
/nbbuild/
32+
/dist/
33+
/nbdist/
34+
/.nb-gradle/
35+
36+
### VS Code ###
37+
.vscode/

CHANGELOG.md

Lines changed: 0 additions & 10 deletions
This file was deleted.

CODE_OF_CONDUCT.md

Lines changed: 9 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,19 @@
11
# Code of Conduct
22

3-
In this open-source project, our aim is to foster a welcoming and inclusive environment. We expect all contributors
4-
and participants interact with each other with courtesy, respect and kindness.
3+
## Welcome to Our Open-Source Community
54

6-
We will not tolerate abuse or harassment of any kind.
5+
This collaborative project strives to create an inclusive and welcoming environment. We value all contributors' and participants' interactions that reflect courtesy, respect, and kindness.
76

8-
In the event of a concern about behaviour, please contact the maintainers of the project:
7+
We have a zero-tolerance policy for any form of abuse or harassment.
98

10-
* Dennis Schwertel <dennis.swchwertel@divio.com>
9+
If you have concerns about behaviour, please reach out to Divio at info@divio.com.
1110

12-
Reports will be taken seriously and treated in confidence. If necessary, the maintainers will act to exclude
13-
individuals from participating in this and other projects.
11+
Reports will be treated confidentially and taken seriously. The project maintainers may take appropriate action, including exclusion from participation in this and other projects, if necessary.
1412

13+
## Guidelines for Code Review
1514

16-
## Code review
15+
Code review is a crucial but sometimes challenging process for contributors and reviewers. It involves constructive critique, and improvements are often needed before accepting contributions.
1716

18-
Code review can be a frustrating process for both contributors and reviewers, with many opportunities for mutual
19-
misunderstanding.
17+
We expect contributors to recognize that all aspects of their submissions, including code and underlying ideas, will be carefully reviewed.
2018

21-
We expect participants who submit contributions for review to understand and accept that all contributions to the
22-
project, including code and the ideas behind it, will be reviewed carefully. Often review will include critique and
23-
criticism, and will almost always require improvements or other changes before contributions can be accepted.
24-
25-
We also expect reviewers to communicate sensitively and respectfully.
26-
27-
This is in line with a shared aim for the success of the project.
19+
Reviewers are encouraged to provide feedback sensitively and respectfully, aligning with our shared goal for the project's success.

CONTRIBUTING.md

Lines changed: 14 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,26 @@
1-
# How to contribute to the project
1+
# Contributing to the Project
22

3-
Thanks for contributing, welcome aboard.
3+
Thank you for contributing! We appreciate your involvement in making this project better. Before you start, please familiarize yourself with our [Code of Conduct](./CODE_OF_CONDUCT.md).
44

5-
Please see our [CODE OF CONDUCT](./CODE_OF_CONDUCT.md) for our code of conduct.
5+
## Submitting Proposals
66

7+
Proposals can be submitted through:
78

8-
## Submitting proposals
9+
- [Pull Requests](https://github.com/divio/getting-started-with-java-spring-boot/pulls)
10+
- [Issues](https://github.com/divio/getting-started-with-java-spring-boot/issues)
911

10-
Please provide proposals as
11-
[pull requests](https://github.com/flavours/getting-started-with-spring-boot/pulls)
12-
or
13-
[issues](https://github.com/flavours/getting-started-with-spring-boot/issues) as appropriate.
12+
## Pull Requests and Branches
1413

14+
When making pull requests, adhere to the following:
1515

16-
## Pull requests and branches
16+
- Submit from a properly named new branch.
17+
- Target the `main` branch.
1718

18-
Please make pull requests:
19-
20-
* from an appropriately-named new branch
21-
* to the ``main`` branch
22-
23-
See:
24-
25-
* [how to make pull requests](https://help.github.com/articles/using-pull-requests/)
26-
* [how to manage branches](https://help.github.com/articles/creating-and-deleting-branches-within-your-repository/)
19+
Learn more:
2720

21+
- [How to make pull requests](https://help.github.com/articles/using-pull-requests/)
22+
- [Managing branches](https://help.github.com/articles/creating-and-deleting-branches-within-your-repository/)
2823

2924
### Whitespace
3025

31-
Do not use trailing whitespace (spaces or tabs at the end of a line). They are often not visible, and can cause silent
32-
problems and misleading unexpected changes. For example, some editors quietly delete them by default.
26+
Avoid trailing whitespace (spaces or tabs at the end of a line). They might be invisible and lead to silent issues or unexpected changes. Some editors may silently delete them by default.

Dockerfile

Lines changed: 8 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,10 @@
1-
FROM adoptopenjdk:11.0.6_10-jdk-hotspot as build
2-
WORKDIR /project
3-
COPY gradlew ./
4-
RUN chmod +x ./gradlew
5-
COPY ./gradle ./gradle
6-
RUN ./gradlew --no-daemon --version --quiet # Download gradle binaries
7-
COPY build.gradle settings.gradle app.flavour* ./
8-
COPY ./.flavour ./.flavour
9-
COPY ./src ./src
10-
RUN ./gradlew --no-daemon --quiet build
1+
FROM eclipse-temurin:21-jdk-alpine
112

12-
FROM adoptopenjdk:11.0.6_10-jre-hotspot
133
WORKDIR /app
14-
RUN echo "#!/bin/sh" > /usr/local/bin/start && chmod +x /usr/local/bin/start
15-
COPY migrate.sh /app/migrate.sh
16-
COPY --from=build /project/build/libs/app.jar .
17-
COPY ./scripts ./scripts
18-
RUN chmod +x ./scripts/run_prod.sh
19-
EXPOSE 8080
20-
CMD [ "/app/scripts/run_prod.sh" ]
4+
5+
COPY . .
6+
RUN ./gradlew build
7+
8+
EXPOSE 80
9+
10+
CMD ["./gradlew", "bootRun"]

Dockerfile.local

Lines changed: 0 additions & 12 deletions
This file was deleted.

0 commit comments

Comments
 (0)