Skip to content

Commit 45bb95b

Browse files
committed
Updates Angular and Spring 4.1.0
1 parent 6201bd9 commit 45bb95b

71 files changed

Lines changed: 245 additions & 415 deletions

File tree

Some content is hidden

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

Makefile

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@ local: no-test
1010
no-test:
1111
mvn clean install -DskipTests
1212
docker:
13-
docker-compose up -d --build --remove-orphans
13+
docker compose up -d --build --remove-orphans
1414
docker-clean:
15-
docker-compose rm -svf
15+
docker compose rm -svf
1616
docker-databases: stop local
1717
docker build ./docker-psql/. -t postgres-image
1818
docker run --name postgres-standalone -e POSTGRES_USER=postgres -e POSTGRES_PASSWORD=admin -e POSTGRES_MULTIPLE_DATABASES=vsa -p 5432:5432 -d postgres-image
1919
docker-clean-build-start: docker-clean no-test docker
2020
docker-action:
21-
docker-compose -f docker-compose.yml up -d --build --remove-orphans
21+
docker compose -f docker-compose.yml up -d --build --remove-orphans
2222
build-images:
2323
docker build concert-demos-rest-service-mvc/. -t concert-demos-rest-service-mvc
2424
docker build concert-demos-rest-service-webflux/. -t concert-demos-rest-service-webflux
@@ -46,22 +46,22 @@ update: remove-lock-files
4646
audit:
4747
cd concert-demos-gui && npm audit fix && yarn
4848
dcup-light:
49-
docker-compose up -d postgres
49+
docker compose up -d postgres
5050
dcup: dcd
51-
docker-compose up -d --build --remove-orphans
51+
docker compose up -d --build --remove-orphans
5252
make concerts-wait
5353
dcd: dc-migration
54-
docker-compose down
54+
docker compose down
5555
concerts-wait:
5656
bash concerts_wait.sh
5757
dcup-full: dcd docker-clean-build-start concerts-wait
5858
dcup-full-action: dcd docker-clean no-test docker-action concerts-wait
5959
log-mvc:
60-
docker-compose logs -f mvc
60+
docker compose logs -f mvc
6161
log-webflux:
62-
docker-compose logs -f webflux
62+
docker compose logs -f webflux
6363
log-postgres:
64-
docker-compose logs -f postgres
64+
docker compose logs -f postgres
6565
cypress-open:
6666
cd e2e && yarn && npm run cypress:open:electron
6767
cypress-electron:

Readme.md

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
---
44

55
[![Generic badge](https://img.shields.io/static/v1.svg?label=GitHub&message=Concert%20Demos%20🎸%20&color=informational)](https://github.com/jesperancinha/concert-demos-root)
6-
[![GitHub release](https://img.shields.io/github/release-pre/jesperancinha/concert-demos-root.svg)](#)
6+
![GitHub release](https://img.shields.io/github/release-pre/jesperancinha/concert-demos-root.svg)
77
[![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)
88

99
[![CircleCI](https://circleci.com/gh/jesperancinha/concert-demos-root.svg?style=svg)](https://circleci.com/gh/jesperancinha/concert-demos-root)
@@ -12,16 +12,15 @@
1212
[![concert-demos-root-e2e](https://github.com/jesperancinha/concert-demos-root/actions/workflows/concert-demos-root-e2e.yml/badge.svg)](https://github.com/jesperancinha/concert-demos-root/actions/workflows/concert-demos-root-e2e.yml)
1313

1414
[![Codacy Badge](https://api.codacy.com/project/badge/Grade/0ddf4a0b338e4644b416824298e33127)](https://www.codacy.com/manual/jofisaes/concert-demos-root?utm_source=github.com&utm_medium=referral&utm_content=jesperancinha/concert-demos-root&utm_campaign=Badge_Grade)
15-
[![codebeat badge](https://codebeat.co/badges/c36571eb-ca0f-4abe-9af2-c66ffc3a4002)](https://codebeat.co/projects/github.qkg1.top-jesperancinha-concert-demos-root-master)
1615
[![Known Vulnerabilities](https://snyk.io/test/github/jesperancinha/concert-demos-root/badge.svg)](https://snyk.io/test/github/jesperancinha/concert-demos-root)
1716

1817
[![Codacy Badge](https://app.codacy.com/project/badge/Coverage/0ddf4a0b338e4644b416824298e33127)](https://www.codacy.com/gh/jesperancinha/concert-demos-root/dashboard?utm_source=github.com&utm_medium=referral&utm_content=jesperancinha/concert-demos-root&utm_campaign=Badge_Coverage)
1918
[![codecov](https://codecov.io/gh/jesperancinha/concert-demos-root/branch/master/graph/badge.svg?token=4bVCCk2Ydj)](https://codecov.io/gh/jesperancinha/concert-demos-root)
2019
[![Coverage Status](https://coveralls.io/repos/github/jesperancinha/concert-demos-root/badge.svg?branch=master)](https://coveralls.io/github/jesperancinha/concert-demos-root?branch=master)
2120

22-
[![GitHub language count](https://img.shields.io/github/languages/count/jesperancinha/concert-demos-root.svg)](#)
23-
[![GitHub top language](https://img.shields.io/github/languages/top/jesperancinha/concert-demos-root.svg)](#)
24-
[![GitHub top language](https://img.shields.io/github/languages/code-size/jesperancinha/concert-demos-root.svg)](#)
21+
![GitHub language count](https://img.shields.io/github/languages/count/jesperancinha/concert-demos-root.svg)
22+
![GitHub top language](https://img.shields.io/github/languages/top/jesperancinha/concert-demos-root.svg)
23+
![GitHub top language](https://img.shields.io/github/languages/code-size/jesperancinha/concert-demos-root.svg)
2524

2625
## Technologies used
2726

@@ -121,17 +120,17 @@ You can make tests for this application using the Swagger UI at:
121120
## Java version
122121

123122
```bash
124-
sdk install 17-open
125-
sdk use 17-open
123+
sdk install java 25-open
124+
sdk use java 25-open
126125
```
127126

128127
## Coverage report Graphs
129128

130-
<div align="center">
129+
<div style="text-align: center;">
131130
<img width="30%" src="https://codecov.io/gh/jesperancinha/concert-demos-root/branch/master/graphs/sunburst.svg" alt=""/>
132131
<img width="30%" src="https://codecov.io/gh/jesperancinha/concert-demos-root/branch/master/graphs/tree.svg" alt=""/>
133132
</div>
134-
<div align="center">
133+
<div style="text-align: center;">
135134
<img width="60%" src="https://codecov.io/gh/jesperancinha/concert-demos-root/branch/master/graphs/icicle.svg" alt=""/>
136135
</div>
137136

build.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ docker-machine env dev
66

77
eval $(docker-machine env dev)
88

9-
docker-compose down
9+
docker compose down
1010

1111
mvn clean install
1212

@@ -15,4 +15,4 @@ mvn clean install
1515
#yarn build
1616
#cd ..
1717

18-
docker-compose up -d --build --remove-orphans
18+
docker compose up -d --build --remove-orphans

concert-demos-data/pom.xml

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -91,21 +91,6 @@
9191
</dependency>
9292
</dependencies>
9393
</plugin>
94-
<plugin>
95-
<groupId>org.apache.maven.plugins</groupId>
96-
<artifactId>maven-compiler-plugin</artifactId>
97-
<version>${maven-compiler-plugin.version}</version>
98-
<configuration>
99-
<source>${maven-compiler-plugin.source}</source>
100-
<target>${maven-compiler-plugin.target}</target>
101-
</configuration>
102-
</plugin>
103-
<plugin>
104-
<groupId>org.apache.maven.plugins</groupId>
105-
<artifactId>maven-surefire-plugin</artifactId>
106-
<version>${maven-surefire-plugin.version}</version>
107-
</plugin>
108-
10994
</plugins>
11095
</build>
11196

concert-demos-data/src/main/kotlin/org/jesperancinha/concerts/data/ConcertDto.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ data class ConcertDto(
77
val name: String,
88
val location: String,
99
val date: String,
10-
val listingDtos: MutableList<ListingDto?>? = mutableListOf(),
10+
val listingDtos: MutableList<ListingDto> = mutableListOf(),
1111
) {
1212

1313
override fun equals(other: Any?): Boolean {

concert-demos-data/src/main/kotlin/org/jesperancinha/concerts/data/ListingDto.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ data class ListingDto(
66
val id: Long? = null,
77
val artistDto: ArtistDto,
88
val referenceMusicDto: MusicDto,
9-
val musicDtos: MutableList<MusicDto?>,
9+
val musicDtos: MutableList<MusicDto>,
1010
) {
1111

1212
override fun equals(other: Any?): Boolean {
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
junit.jupiter.execution.parallel.enabled = true
2+
junit.jupiter.execution.parallel.config.fixed.parallelism = 4
3+
junit.jupiter.execution.parallel.config.dynamic.factor = 4.0
4+
junit.jupiter.execution.parallel.mode.default = concurrent
5+
junit.jupiter.execution.parallel.mode.classes.default = concurrent

concert-demos-gui/.angular/cache/21.2.19/concert-demos-gui/.tsbuildinfo

Lines changed: 1 addition & 0 deletions
Large diffs are not rendered by default.
Binary file not shown.
Binary file not shown.

0 commit comments

Comments
 (0)