Compare commits

31 Commits

Author SHA1 Message Date
8a5dada781 update super pom version and commons version 2024-10-24 21:08:53 +11:00
c2e75ef94d Update for next development version [skip ci] 2024-09-11 11:43:27 +00:00
35b45e3da4 Merge tag '1.0.8' into develop
Tag release
2024-09-11 11:43:25 +00:00
78dc349290 [RELEASE] 1.0.8
Some checks failed
RELEASE - Build and Publish Maven Artifact and Docker Image / Build Java Package and Publish (push) Has been cancelled
RELEASE - Build and Publish Maven Artifact and Docker Image / build-docker (linux/amd64) (push) Has been cancelled
RELEASE - Build and Publish Maven Artifact and Docker Image / build-docker (linux/arm64) (push) Has been cancelled
RELEASE - Build and Publish Maven Artifact and Docker Image / merge-docker (push) Has been cancelled
2024-09-11 11:43:25 +00:00
4ad93a4b7e Update versions for release 2024-09-11 11:43:00 +00:00
31a3e786cd Merge pull request #19 from 3dwardch3ng/develop
release
2024-09-11 21:42:31 +10:00
cd5ef6bf02 add springdoc config 2024-09-11 21:36:44 +10:00
917db3eafb update super pom version 2024-09-11 21:34:33 +10:00
4a89510fc8 add config server user creds 2024-09-11 21:31:41 +10:00
97b272d5c8 add commons security library 2024-09-11 21:12:33 +10:00
6ec906f156 Merge pull request #18 from 3dwardch3ng/renovate/actions-setup-java-4.x
chore(deps): update actions/setup-java action to v4.3.0
2024-09-10 16:25:59 +10:00
renovate[bot]
2ee6a3ffec chore(deps): update actions/setup-java action to v4.3.0 2024-09-09 16:32:58 +00:00
37f8d6a250 Revert "add GHA pipeline for sonarqube test"
This reverts commit e27ca00044.
2024-09-09 21:07:06 +10:00
e27ca00044 add GHA pipeline for sonarqube test 2024-09-09 21:06:03 +10:00
c746c8fb8a Revert "testing GHA pipelines"
Some checks failed
SNAPSHOT - Build and Publish Maven Artifact and Docker Image / Build Java Package and Publish (push) Has been cancelled
SNAPSHOT - Build and Publish Maven Artifact and Docker Image / build-docker (linux/amd64) (push) Has been cancelled
SNAPSHOT - Build and Publish Maven Artifact and Docker Image / build-docker (linux/arm64) (push) Has been cancelled
SNAPSHOT - Build and Publish Maven Artifact and Docker Image / merge-docker (push) Has been cancelled
This reverts commit 7ff7534d05.
2024-09-09 20:12:57 +10:00
b68460e499 Merge remote-tracking branch 'origin/develop' into develop 2024-09-09 20:09:45 +10:00
7ff7534d05 testing GHA pipelines 2024-09-09 20:09:38 +10:00
dce3bbd1fb Update for next development version [skip ci] 2024-09-09 02:05:32 +00:00
927519d8f2 [RELEASE] 1.0.7 2024-09-09 02:05:30 +00:00
382cc197e5 Merge tag '1.0.7' into develop
Tag release
2024-09-09 02:05:30 +00:00
e2a293036f Update versions for release 2024-09-09 02:05:05 +00:00
b890d81825 Merge pull request #16 from 3dwardch3ng/develop
release
2024-09-09 12:04:36 +10:00
6cbd571a5d Merge remote-tracking branch 'origin/develop' into develop 2024-09-09 12:00:04 +10:00
12bb51845b fixing liveness and readiness probes 2024-09-09 11:59:57 +10:00
47554d159f Update for next development version [skip ci] 2024-09-07 05:58:05 +00:00
99c06a23bf [RELEASE] 1.0.6 2024-09-07 05:58:03 +00:00
445a864408 Merge tag '1.0.6' into develop
Tag release
2024-09-07 05:58:03 +00:00
49621eded2 Update versions for release 2024-09-07 05:57:40 +00:00
4e8ba58cf7 Merge pull request #15 from 3dwardch3ng/develop
release
2024-09-07 15:57:13 +10:00
c436fb0e3b Merge pull request #14 from 3dwardch3ng/renovate/bitnami-java-17.x
chore(deps): update bitnami/java docker tag to v17.0.12-10-debian-12-r6
2024-09-07 15:54:11 +10:00
renovate[bot]
ed60a656da chore(deps): update bitnami/java docker tag to v17.0.12-10-debian-12-r6 2024-09-06 02:55:42 +00:00
5 changed files with 43 additions and 12 deletions

View File

@@ -26,7 +26,7 @@ jobs:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
with: with:
fetch-depth: 0 fetch-depth: 0
- uses: actions/setup-java@v4.2.2 - uses: actions/setup-java@v4.3.0
if: ${{ hashFiles('**/pom.xml') }} if: ${{ hashFiles('**/pom.xml') }}
with: with:
java-version: 17 java-version: 17
@@ -77,7 +77,7 @@ jobs:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
with: with:
fetch-depth: 0 fetch-depth: 0
- uses: actions/setup-java@v4.2.2 - uses: actions/setup-java@v4.3.0
if: ${{ hashFiles('**/pom.xml') }} if: ${{ hashFiles('**/pom.xml') }}
with: with:
java-version: 17 java-version: 17
@@ -162,7 +162,7 @@ jobs:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
with: with:
fetch-depth: 0 fetch-depth: 0
- uses: actions/setup-java@v4.2.2 - uses: actions/setup-java@v4.3.0
if: ${{ hashFiles('**/pom.xml') }} if: ${{ hashFiles('**/pom.xml') }}
with: with:
java-version: 17 java-version: 17

View File

@@ -26,7 +26,7 @@ jobs:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
with: with:
fetch-depth: 0 fetch-depth: 0
- uses: actions/setup-java@v4.2.2 - uses: actions/setup-java@v4.3.0
if: ${{ hashFiles('**/pom.xml') }} if: ${{ hashFiles('**/pom.xml') }}
with: with:
java-version: 17 java-version: 17
@@ -95,7 +95,7 @@ jobs:
with: with:
ref: main ref: main
fetch-depth: 1 fetch-depth: 1
- uses: actions/setup-java@v4.2.2 - uses: actions/setup-java@v4.3.0
if: ${{ hashFiles('**/pom.xml') }} if: ${{ hashFiles('**/pom.xml') }}
with: with:
java-version: 17 java-version: 17
@@ -181,7 +181,7 @@ jobs:
with: with:
ref: main ref: main
fetch-depth: 1 fetch-depth: 1
- uses: actions/setup-java@v4.2.2 - uses: actions/setup-java@v4.3.0
if: ${{ hashFiles('**/pom.xml') }} if: ${{ hashFiles('**/pom.xml') }}
with: with:
java-version: 17 java-version: 17

View File

@@ -1,4 +1,4 @@
FROM bitnami/java:17.0.12-10-debian-12-r4 AS builder FROM bitnami/java:17.0.12-10-debian-12-r6 AS builder
WORKDIR /opt WORKDIR /opt

18
pom.xml
View File

@@ -7,11 +7,11 @@
<parent> <parent>
<groupId>sydney.cheng</groupId> <groupId>sydney.cheng</groupId>
<artifactId>ec-super-pom</artifactId> <artifactId>ec-super-pom</artifactId>
<version>1.0.4</version> <version>1.0.7</version>
</parent> </parent>
<artifactId>ec-config-server</artifactId> <artifactId>ec-config-server</artifactId>
<version>1.0.6-SNAPSHOT</version> <version>1.0.9-SNAPSHOT</version>
<licenses> <licenses>
<license> <license>
@@ -42,6 +42,7 @@
<maven.compiler.target>17</maven.compiler.target> <maven.compiler.target>17</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<start-class>sydney.cheng.microservice.Application</start-class> <start-class>sydney.cheng.microservice.Application</start-class>
<ec-microservice-commons.version>1.0.1</ec-microservice-commons.version>
<!-- Sonar Properties --> <!-- Sonar Properties -->
<sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin> <sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
<sonar.dynamicAnalysis>reuseReports</sonar.dynamicAnalysis> <sonar.dynamicAnalysis>reuseReports</sonar.dynamicAnalysis>
@@ -54,8 +55,13 @@
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.springframework.cloud</groupId> <groupId>sydney.cheng</groupId>
<artifactId>spring-cloud-config-server</artifactId> <artifactId>ec-microservice-commons-swagger</artifactId>
<version>${ec-microservice-commons.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-actuator</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
@@ -65,6 +71,10 @@
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId> <artifactId>spring-boot-starter-web</artifactId>
</dependency> </dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-config-server</artifactId>
</dependency>
</dependencies> </dependencies>
<build> <build>

View File

@@ -20,6 +20,13 @@ management:
include: '*' include: '*'
health: health:
show-details: always show-details: always
probes:
enabled: true
health:
livenessstate:
enabled: true
readinessstate:
enabled: true
logging: logging:
file: file:
@@ -30,6 +37,12 @@ spring:
name: ${application.name} name: ${application.name}
profiles: profiles:
active: native active: native
security:
basic:
enabled: true
user:
name: ${CONFIG_SERVER_USERNAME:configuser}
password: ${CONFIG_SERVER_PASSWORD:configPass$1234}
cloud: cloud:
config: config:
server: server:
@@ -40,4 +53,12 @@ spring:
eureka: eureka:
client: client:
enabled: false enabled: false
springdoc:
swagger-ui:
path: /swagger-ui.html
displayRequestDuration: true
api-docs:
path: /api-docs
show-actuator: true