Skip to content

Commit

Permalink
Update custom code to be consistent with Jhipster module model
Browse files Browse the repository at this point in the history
  • Loading branch information
RamiSouai committed Nov 15, 2023
1 parent 5b39c75 commit 7b5f74f
Show file tree
Hide file tree
Showing 67 changed files with 2,132 additions and 82,417 deletions.
5 changes: 0 additions & 5 deletions .husky/pre-commit

This file was deleted.

3 changes: 3 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"java.configuration.updateBuildConfiguration": "automatic"
}
16 changes: 8 additions & 8 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -76,35 +76,35 @@ generate-all: generate-app generate-jdl generate-ci-cd ## Generate everything.

.PHONY: start-keycloak
start-keycloak: ## Start the Keycloak container for authentication.
docker-compose -f $(COMPOSE_FILES)/keycloak.yml up -d
docker compose -f $(COMPOSE_FILES)/keycloak.yml up -d
$(TOOLS_DIR)/wait-for-container.sh \
'Keycloak' \
$(COMPOSE_FILES)/keycloak.yml \
'Admin console listening on'

.PHONY: stop-keycloak
stop-keycloak: ## Stop the Keycloak container.
docker-compose -f $(COMPOSE_FILES)/keycloak.yml down || true
docker compose -f $(COMPOSE_FILES)/keycloak.yml down || true

.PHONY: start-postgres
start-postgres: ## Start the PostgreSQL container.
docker-compose -f $(COMPOSE_FILES)/postgresql.yml up -d
docker compose -f $(COMPOSE_FILES)/postgresql.yml up -d

.PHONY: stop-postgres
stop-postgres: ## Stop the PostgreSQL container.
docker-compose -f $(COMPOSE_FILES)/postgresql.yml down || true
docker compose -f $(COMPOSE_FILES)/postgresql.yml down || true

.PHONY: start-registry
start-registry: start-keycloak ## Start the JHipster Registry container
docker-compose -f $(COMPOSE_FILES)/jhipster-registry.yml up -d
docker compose -f $(COMPOSE_FILES)/jhipster-registry.yml up -d
$(TOOLS_DIR)/wait-for-container.sh \
'JHipster Registry' \
$(COMPOSE_FILES)/jhipster-registry.yml \
"Application 'jhipster-registry' is running!"

.PHONY: stop-registry
stop-registry: ## Stop the JHipster Registry container
docker-compose -f $(COMPOSE_FILES)/jhipster-registry.yml down || true
docker compose -f $(COMPOSE_FILES)/jhipster-registry.yml down || true

.PHONY: start-backend
start-backend: start-keycloak ## Start the application backend in dev mode.
Expand Down Expand Up @@ -149,12 +149,12 @@ sonar: ## Run Sonarqube analysis.
.PHONY: start-local-sonar
start-local-sonar: ## Start local dev Sonarqube server.
# https://www.jhipster.tech/code-quality/
docker-compose -f $(COMPOSE_FILES)/sonar.yml up -d
docker compose -f $(COMPOSE_FILES)/sonar.yml up -d

.PHONY: stop-local-sonar
stop-local-sonar: ## Stop local dev Sonarqube server.
# https://www.jhipster.tech/code-quality/
docker-compose -f $(COMPOSE_FILES)/sonar.yml down
docker compose -f $(COMPOSE_FILES)/sonar.yml down

.PHONEY: test-backend
test-backend: ## Run backend tests.
Expand Down
3 changes: 2 additions & 1 deletion angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@
"path": "./build/angular/",
"environment": "all"
},
"packageManager": "npm"
"packageManager": "npm",
"analytics": false
}
}
2 changes: 2 additions & 0 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,8 @@ dependencies {
// Openapi generator uses javax namespace for now https://github.com/OpenAPITools/openapi-generator/pull/13593
implementation "javax.annotation:javax.annotation-api:1.3.2"
implementation "javax.validation:validation-api:2.0.1.Final"
implementation 'javax.persistence:javax.persistence-api:2.2'
compileOnly 'javax.servlet:javax.servlet-api:4.0.1'
implementation "com.github.ben-manes.caffeine:caffeine"
annotationProcessor "org.hibernate.orm:hibernate-jpamodelgen:${hibernateVersion}"
implementation "org.hibernate.orm:hibernate-core"
Expand Down
Loading

0 comments on commit 7b5f74f

Please sign in to comment.