Skip to content

Commit

Permalink
perf($muscle-and-fitness-server): define basePackage by groupId; devt…
Browse files Browse the repository at this point in the history
…ools switch

BREAKING CHANGE: define basePackage by groupId; devtools switch
  • Loading branch information
johnnymillergh committed Dec 14, 2020
1 parent e67a840 commit e8a86b1
Show file tree
Hide file tree
Showing 45 changed files with 103 additions and 70 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ spring:
max-idle: 10
max-wait: -1ms
min-idle: 0
devtools:
add-properties: true

logging:
# Configure logging level for SFTP/JSCH
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,6 @@ spring:
url: jdbc:mysql://localhost:3306/muscle_and_fitness?useSSL=true&useUnicode=true
username: root
password: jm@mysql
devtools:
restart:
enabled: true
redis:
database: 0
host: localhost
Expand All @@ -28,6 +25,8 @@ spring:
max-idle: 10
max-wait: -1ms
min-idle: 0
devtools:
add-properties: true

logging:
# Configure logging level for SFTP/JSCH
Expand Down
2 changes: 2 additions & 0 deletions api-portal/src/main/resources/application-production.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ spring:
max-idle: 10
max-wait: -1ms
min-idle: 0
devtools:
add-properties: false

logging:
# Configure logging level for SFTP/JSCH
Expand Down
2 changes: 2 additions & 0 deletions api-portal/src/main/resources/application-stage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ spring:
max-idle: 10
max-wait: -1ms
min-idle: 0
devtools:
add-properties: false

logging:
# Configure logging level for SFTP/JSCH
Expand Down
2 changes: 2 additions & 0 deletions api-portal/src/main/resources/application-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ spring:
max-idle: 10
max-wait: -1ms
min-idle: 0
devtools:
add-properties: false

logging:
# Configure logging level for SFTP/JSCH
Expand Down
2 changes: 1 addition & 1 deletion api-portal/src/main/resources/application.yml
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ logging:

project:
property:
base-package: com.jmsoftware.maf.maf.apiportal
base-package: @project.groupId@
context-path:
group-id: @project.groupId@
project-parent-artifact-id: @project.parent.artifactId@
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ spring:
max-idle: 10
max-wait: -1ms
min-idle: 0
devtools:
add-properties: true

logging:
# Configure logging level for SFTP/JSCH
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,6 @@ spring:
url: jdbc:mysql://localhost:3306/muscle_and_fitness?useSSL=true&useUnicode=true
username: root
password: jm@mysql
devtools:
restart:
enabled: true
redis:
database: 0
host: localhost
Expand All @@ -28,6 +25,8 @@ spring:
max-idle: 10
max-wait: -1ms
min-idle: 0
devtools:
add-properties: true

logging:
# Configure logging level for SFTP/JSCH
Expand Down
2 changes: 2 additions & 0 deletions auth-center/src/main/resources/application-production.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ spring:
max-idle: 10
max-wait: -1ms
min-idle: 0
devtools:
add-properties: false

logging:
# Configure logging level for SFTP/JSCH
Expand Down
2 changes: 2 additions & 0 deletions auth-center/src/main/resources/application-stage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ spring:
max-idle: 10
max-wait: -1ms
min-idle: 0
devtools:
add-properties: false

logging:
# Configure logging level for SFTP/JSCH
Expand Down
2 changes: 2 additions & 0 deletions auth-center/src/main/resources/application-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ spring:
max-idle: 10
max-wait: -1ms
min-idle: 0
devtools:
add-properties: false

logging:
# Configure logging level for SFTP/JSCH
Expand Down
2 changes: 1 addition & 1 deletion auth-center/src/main/resources/application.yml
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ logging:

project:
property:
base-package: com.jmsoftware.maf.authcenter
base-package: @project.groupId@
context-path:
group-id: @project.groupId@
project-parent-artifact-id: @project.parent.artifactId@
Expand Down
2 changes: 1 addition & 1 deletion docker/.env
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# TAG must be corresponding with the version tag in pom.xml, need to modify it when new version releases
TAG=0.0.1
TAG=0.0.2-SNAPSHOT
14 changes: 7 additions & 7 deletions docker/docker-compose.development-docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ services:
volumes:
- ~/docker-file-mapping/maf.logs:/logs
environment:
JAVA_TOOL_OPTIONS: -Xms128m -Xmx128m -Dspring.profiles.active=development-local
JAVA_TOOL_OPTIONS: -Xms128m -Xmx128m -Dspring.profiles.active=development-docker
TZ: Asia/Hong_Kong
networks:
muscle_and_fitness_network:
Expand All @@ -175,7 +175,7 @@ services:
volumes:
- ~/docker-file-mapping/maf.logs:/logs
environment:
JAVA_TOOL_OPTIONS: -Xms128m -Xmx128m -Dspring.profiles.active=development-local
JAVA_TOOL_OPTIONS: -Xms128m -Xmx128m -Dspring.profiles.active=development-docker
TZ: Asia/Hong_Kong
networks:
muscle_and_fitness_network:
Expand All @@ -196,7 +196,7 @@ services:
volumes:
- ~/docker-file-mapping/maf.logs:/logs
environment:
JAVA_TOOL_OPTIONS: -Xms128m -Xmx128m -Dspring.profiles.active=development-local
JAVA_TOOL_OPTIONS: -Xms128m -Xmx128m -Dspring.profiles.active=development-docker
TZ: Asia/Hong_Kong
networks:
muscle_and_fitness_network:
Expand All @@ -218,7 +218,7 @@ services:
volumes:
- ~/docker-file-mapping/maf.logs:/logs
environment:
JAVA_TOOL_OPTIONS: -Xms128m -Xmx128m -Dspring.profiles.active=development-local
JAVA_TOOL_OPTIONS: -Xms128m -Xmx128m -Dspring.profiles.active=development-docker
TZ: Asia/Hong_Kong
networks:
muscle_and_fitness_network:
Expand All @@ -235,7 +235,7 @@ services:
volumes:
- ~/docker-file-mapping/maf.logs:/logs
environment:
JAVA_TOOL_OPTIONS: -Xms128m -Xmx128m -Dspring.profiles.active=development-local
JAVA_TOOL_OPTIONS: -Xms128m -Xmx128m -Dspring.profiles.active=development-docker
TZ: Asia/Hong_Kong
networks:
muscle_and_fitness_network:
Expand All @@ -252,7 +252,7 @@ services:
volumes:
- ~/docker-file-mapping/maf.logs:/logs
environment:
JAVA_TOOL_OPTIONS: -Xms128m -Xmx128m -Dspring.profiles.active=development-local
JAVA_TOOL_OPTIONS: -Xms128m -Xmx128m -Dspring.profiles.active=development-docker
TZ: Asia/Hong_Kong
networks:
muscle_and_fitness_network:
Expand All @@ -272,7 +272,7 @@ services:
volumes:
- ~/docker-file-mapping/maf.logs:/logs
environment:
JAVA_TOOL_OPTIONS: -Xms128m -Xmx128m -Dspring.profiles.active=development-local
JAVA_TOOL_OPTIONS: -Xms128m -Xmx128m -Dspring.profiles.active=development-docker
TZ: Asia/Hong_Kong
networks:
muscle_and_fitness_network:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ spring:
url: jdbc:mysql://maf.mysql.dev:3306/muscle_and_fitness?useSSL=true&useUnicode=true
username: root
password: jm@mysql
devtools:
add-properties: true

logging:
# Configure logging level for SFTP/JSCH
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,7 @@ spring:
username: root
password: jm@mysql
devtools:
restart:
enabled: true
add-properties: true

logging:
# Configure logging level for SFTP/JSCH
Expand Down
2 changes: 2 additions & 0 deletions exercise-mis/src/main/resources/application-production.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ spring:
url: jdbc:mysql://maf.mysql.production:3306/muscle_and_fitness?useSSL=true&useUnicode=true
username: root
password: jm@mysql
devtools:
add-properties: false

logging:
# Configure logging level for SFTP/JSCH
Expand Down
2 changes: 2 additions & 0 deletions exercise-mis/src/main/resources/application-stage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ spring:
url: jdbc:mysql://maf.mysql.stage:3306/muscle_and_fitness?useSSL=true&useUnicode=true
username: root
password: jm@mysql
devtools:
add-properties: false

logging:
# Configure logging level for SFTP/JSCH
Expand Down
2 changes: 2 additions & 0 deletions exercise-mis/src/main/resources/application-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ spring:
url: jdbc:mysql://maf.mysql.test:3306/muscle_and_fitness?useSSL=true&useUnicode=true
username: root
password: jm@mysql
devtools:
add-properties: false

logging:
# Configure logging level for SFTP/JSCH
Expand Down
2 changes: 1 addition & 1 deletion exercise-mis/src/main/resources/application.yml
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ logging:

project:
property:
base-package: com.jmsoftware.maf.exercisemis
base-package: @project.groupId@
context-path:
group-id: @project.groupId@
project-parent-artifact-id: @project.parent.artifactId@
Expand Down
2 changes: 2 additions & 0 deletions gateway/src/main/resources/application-development-docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ eureka:
spring:
zipkin:
base-url: http://maf.open-zipkin.dev:9411
devtools:
add-properties: true

custom:
configuration:
Expand Down
2 changes: 2 additions & 0 deletions gateway/src/main/resources/application-development-local.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ eureka:
spring:
zipkin:
base-url: http://localhost:9411
devtools:
add-properties: true

custom:
configuration:
Expand Down
2 changes: 2 additions & 0 deletions gateway/src/main/resources/application-production.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ eureka:
spring:
zipkin:
base-url: http://maf.open-zipkin.production:9411
devtools:
add-properties: false

custom:
configuration:
Expand Down
2 changes: 2 additions & 0 deletions gateway/src/main/resources/application-stage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ eureka:
spring:
zipkin:
base-url: http://maf.open-zipkin.stage:9411
devtools:
add-properties: false

custom:
configuration:
Expand Down
2 changes: 2 additions & 0 deletions gateway/src/main/resources/application-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ eureka:
spring:
zipkin:
base-url: http://maf.open-zipkin.test:9411
devtools:
add-properties: false

custom:
configuration:
Expand Down
2 changes: 1 addition & 1 deletion gateway/src/main/resources/application.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ logging:

project:
property:
base-package: com.jmsoftware.maf.gateway
base-package: @project.groupId@
context-path:
group-id: @project.groupId@
project-parent-artifact-id: @project.parent.artifactId@
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ spring:
url: jdbc:mysql://maf.mysql.dev:3306/muscle_and_fitness?useSSL=true&useUnicode=true
username: root
password: jm@mysql
devtools:
add-properties: true

logging:
# Configure logging level for SFTP/JSCH
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,7 @@ spring:
username: root
password: jm@mysql
devtools:
restart:
enabled: true
add-properties: true

logging:
# Configure logging level for SFTP/JSCH
Expand Down
2 changes: 2 additions & 0 deletions muscle-mis/src/main/resources/application-production.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ spring:
url: jdbc:mysql://maf.mysql.production:3306/muscle_and_fitness?useSSL=true&useUnicode=true
username: root
password: jm@mysql
devtools:
add-properties: false

logging:
# Configure logging level for SFTP/JSCH
Expand Down
2 changes: 2 additions & 0 deletions muscle-mis/src/main/resources/application-stage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ spring:
url: jdbc:mysql://maf.mysql.stage:3306/muscle_and_fitness?useSSL=true&useUnicode=true
username: root
password: jm@mysql
devtools:
add-properties: false

logging:
# Configure logging level for SFTP/JSCH
Expand Down
2 changes: 2 additions & 0 deletions muscle-mis/src/main/resources/application-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ spring:
url: jdbc:mysql://maf.mysql.test:3306/muscle_and_fitness?useSSL=true&useUnicode=true
username: root
password: jm@mysql
devtools:
add-properties: false

logging:
# Configure logging level for SFTP/JSCH
Expand Down
2 changes: 1 addition & 1 deletion muscle-mis/src/main/resources/application.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ logging:

project:
property:
base-package: com.jmsoftware.maf.musclemis
base-package: @project.groupId@
context-path:
group-id: @project.groupId@
project-parent-artifact-id: @project.parent.artifactId@
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
spring:
devtools:
add-properties: true

eureka:
client:
service-url:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
spring:
devtools:
add-properties: true

eureka:
client:
service-url:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
spring:
devtools:
add-properties: false

eureka:
client:
service-url:
Expand Down
4 changes: 4 additions & 0 deletions service-registry/src/main/resources/application-stage.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
spring:
devtools:
add-properties: false

eureka:
client:
service-url:
Expand Down
4 changes: 4 additions & 0 deletions service-registry/src/main/resources/application-test.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
spring:
devtools:
add-properties: false

eureka:
client:
service-url:
Expand Down
Loading

0 comments on commit e8a86b1

Please sign in to comment.