diff --git a/README.md b/README.md index acdcee3b7..a07f6d77b 100644 Binary files a/README.md and b/README.md differ diff --git a/local_compose_down.sh b/local_compose_down.sh index e45cda18f..32792e490 100755 --- a/local_compose_down.sh +++ b/local_compose_down.sh @@ -2,11 +2,11 @@ set -e -echo "Starting all docker containers..." -docker-compose -f docker-compose.local.yml down +echo "Stopping all docker containers..." +docker compose -f docker-compose.local.yml down echo "Pruning unused Docker images..." docker image prune -f -echo "Containers are up and running." -docker-compose ps -a +echo "Containers are down and not running." +docker compose ps -a diff --git a/local_compose_up.sh b/local_compose_up.sh index 67ef9d0ba..400861e57 100755 --- a/local_compose_up.sh +++ b/local_compose_up.sh @@ -14,10 +14,10 @@ if [ ! -d "redis_data_local" ]; then fi echo "Starting all docker containers..." -docker-compose -f docker-compose.local.yml up -d +docker compose -f docker-compose.local.yml up -d echo "Pruning unused Docker images..." docker image prune -f echo "Containers are up and running." -docker-compose ps -a +docker compose ps -a diff --git a/src/main/java/com/example/solidconnection/config/cors/CorsPropertiesConfig.java b/src/main/java/com/example/solidconnection/config/cors/CorsPropertiesConfig.java index 55e47bd90..68144d733 100644 --- a/src/main/java/com/example/solidconnection/config/cors/CorsPropertiesConfig.java +++ b/src/main/java/com/example/solidconnection/config/cors/CorsPropertiesConfig.java @@ -14,4 +14,4 @@ public class CorsPropertiesConfig { private List allowedOrigins; -} \ No newline at end of file +} diff --git a/src/main/java/com/example/solidconnection/siteuser/domain/SiteUser.java b/src/main/java/com/example/solidconnection/siteuser/domain/SiteUser.java index d548ff852..e518a5efb 100644 --- a/src/main/java/com/example/solidconnection/siteuser/domain/SiteUser.java +++ b/src/main/java/com/example/solidconnection/siteuser/domain/SiteUser.java @@ -85,7 +85,6 @@ public class SiteUser { @OneToMany(mappedBy = "siteUser", cascade = CascadeType.ALL, orphanRemoval = true) private List gpaScoreList = new ArrayList<>(); - public SiteUser( String email, String nickname,