Revert "testing GHA pipelines"

This reverts commit 7ff7534d05.
Merge remote-tracking branch 'origin/develop' into develop
2024-09-09 20:12:57 +10:00 · 2024-09-09 20:09:45 +10:00 · 2024-09-09 20:09:38 +10:00 · 2024-09-09 02:05:32 +00:00 · 2024-09-09 02:05:30 +00:00 · 2024-09-09 02:05:30 +00:00
3 changed files with 15 additions and 4 deletions
--- a/2
+++ b/2
@@ -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
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
    </parent>
    <artifactId>ec-config-server</artifactId>
-    <version>1.0.6-SNAPSHOT</version>
+    <version>1.0.8-SNAPSHOT</version>
    <licenses>
        <license>
@@ -54,8 +54,8 @@
    <dependencies>
        <dependency>
-            <groupId>org.springframework.cloud</groupId>
+            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-cloud-config-server</artifactId>
+            <artifactId>spring-boot-starter-actuator</artifactId>
        </dependency>
        <dependency>
            <groupId>org.springframework.boot</groupId>
@@ -65,6 +65,10 @@
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-web</artifactId>
        </dependency>
        <dependency>
            <groupId>org.springframework.cloud</groupId>
            <artifactId>spring-cloud-config-server</artifactId>
        </dependency>
    </dependencies>
    <build>
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -20,6 +20,13 @@ management:
        include: '*'
    health:
      show-details: always
      probes:
        enabled: true
  health:
    livenessstate:
      enabled: true
    readinessstate:
      enabled: true
 logging:
  file:
Author	SHA1	Message	Date
Edward Cheng	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 Details SNAPSHOT - Build and Publish Maven Artifact and Docker Image / build-docker (linux/amd64) (push) Has been cancelled Details SNAPSHOT - Build and Publish Maven Artifact and Docker Image / build-docker (linux/arm64) (push) Has been cancelled Details SNAPSHOT - Build and Publish Maven Artifact and Docker Image / merge-docker (push) Has been cancelled Details This reverts commit `7ff7534d05`.	2024-09-09 20:12:57 +10:00
Edward Cheng	b68460e499	Merge remote-tracking branch 'origin/develop' into develop	2024-09-09 20:09:45 +10:00
Edward Cheng	7ff7534d05	testing GHA pipelines	2024-09-09 20:09:38 +10:00
3dwardch3ng	dce3bbd1fb	Update for next development version [skip ci]	2024-09-09 02:05:32 +00:00
3dwardch3ng	382cc197e5	Merge tag '1.0.7' into develop Tag release	2024-09-09 02:05:30 +00:00
3dwardch3ng	927519d8f2	[RELEASE] 1.0.7	2024-09-09 02:05:30 +00:00
3dwardch3ng	e2a293036f	Update versions for release	2024-09-09 02:05:05 +00:00
Edward Cheng	b890d81825	Merge pull request #16 from 3dwardch3ng/develop release	2024-09-09 12:04:36 +10:00
Edward Cheng	6cbd571a5d	Merge remote-tracking branch 'origin/develop' into develop	2024-09-09 12:00:04 +10:00
Edward Cheng	12bb51845b	fixing liveness and readiness probes	2024-09-09 11:59:57 +10:00
3dwardch3ng	47554d159f	Update for next development version [skip ci]	2024-09-07 05:58:05 +00:00
3dwardch3ng	99c06a23bf	[RELEASE] 1.0.6	2024-09-07 05:58:03 +00:00
3dwardch3ng	445a864408	Merge tag '1.0.6' into develop Tag release	2024-09-07 05:58:03 +00:00
3dwardch3ng	49621eded2	Update versions for release	2024-09-07 05:57:40 +00:00
Edward Cheng	4e8ba58cf7	Merge pull request #15 from 3dwardch3ng/develop release	2024-09-07 15:57:13 +10:00
Edward Cheng	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
`@@ -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`