Merge branch 'master' into dependabot/docker/kubernetes/monitoring/te…

…st/ab/alpine-3.14.2
yurake · Oct 13, 2021 · 675d2d6 · 675d2d6
2 parents a62fcf9 + bf8c6a5
commit 675d2d6
Show file tree

Hide file tree

Showing 10 changed files with 44 additions and 44 deletions.
diff --git a/.github/workflows/java-ci.yml b/.github/workflows/java-ci.yml
@@ -21,7 +21,7 @@ jobs:
       - name: Check out Git repository
         uses: actions/checkout@v2.3.4
       - name: Setup GraalVM
-        uses: DeLaGuardo/setup-graalvm@4.0
+        uses: DeLaGuardo/setup-graalvm@5.0
         with:
           graalvm: "21.0.0.2"
           java: "java11"
@@ -86,7 +86,7 @@ jobs:
       - name: Check out Git repository
         uses: actions/checkout@v2
       - name: Setup GraalVM
-        uses: DeLaGuardo/setup-graalvm@4.0
+        uses: DeLaGuardo/setup-graalvm@5.0
         with:
           graalvm: "21.0.0.2"
           java: "java11"
@@ -152,7 +152,7 @@ jobs:
       - name: Check out Git repository
         uses: actions/checkout@v2
       - name: Setup GraalVM
-        uses: DeLaGuardo/setup-graalvm@4.0
+        uses: DeLaGuardo/setup-graalvm@5.0
         with:
           graalvm: "21.0.0.2"
           java: "java11"
@@ -218,7 +218,7 @@ jobs:
       - name: Check out Git repository
         uses: actions/checkout@v2
       - name: Setup GraalVM
-        uses: DeLaGuardo/setup-graalvm@4.0
+        uses: DeLaGuardo/setup-graalvm@5.0
         with:
           graalvm: "21.0.0.2"
           java: "java11"
@@ -288,7 +288,7 @@ jobs:
       - name: Check out Git repository
         uses: actions/checkout@v2
       - name: Setup GraalVM
-        uses: DeLaGuardo/setup-graalvm@4.0
+        uses: DeLaGuardo/setup-graalvm@5.0
         with:
           graalvm: "21.0.0.2"
           java: "java11"
@@ -354,7 +354,7 @@ jobs:
       - name: Check out Git repository
         uses: actions/checkout@v2
       - name: Setup GraalVM
-        uses: DeLaGuardo/setup-graalvm@4.0
+        uses: DeLaGuardo/setup-graalvm@5.0
         with:
           graalvm: "21.0.0.2"
           java: "java11"
@@ -420,7 +420,7 @@ jobs:
       - name: Check out Git repository
         uses: actions/checkout@v2
       - name: Setup GraalVM
-        uses: DeLaGuardo/setup-graalvm@4.0
+        uses: DeLaGuardo/setup-graalvm@5.0
         with:
           graalvm: "21.0.0.2"
           java: "java11"
@@ -486,7 +486,7 @@ jobs:
       - name: Check out Git repository
         uses: actions/checkout@v2
       - name: Setup GraalVM
-        uses: DeLaGuardo/setup-graalvm@4.0
+        uses: DeLaGuardo/setup-graalvm@5.0
         with:
           graalvm: "21.0.0.2"
           java: "java11"
@@ -552,7 +552,7 @@ jobs:
       - name: Check out Git repository
         uses: actions/checkout@v2
       - name: Setup GraalVM
-        uses: DeLaGuardo/setup-graalvm@4.0
+        uses: DeLaGuardo/setup-graalvm@5.0
         with:
           graalvm: "21.0.0.2"
           java: "java11"
@@ -618,7 +618,7 @@ jobs:
       - name: Check out Git repository
         uses: actions/checkout@v2
       - name: Setup GraalVM
-        uses: DeLaGuardo/setup-graalvm@4.0
+        uses: DeLaGuardo/setup-graalvm@5.0
         with:
           graalvm: "21.0.0.2"
           java: "java11"
@@ -684,7 +684,7 @@ jobs:
       - name: Check out Git repository
         uses: actions/checkout@v2
       - name: Setup GraalVM
-        uses: DeLaGuardo/setup-graalvm@4.0
+        uses: DeLaGuardo/setup-graalvm@5.0
         with:
           graalvm: "21.0.0.2"
           java: "java11"
@@ -750,7 +750,7 @@ jobs:
       - name: Check out Git repository
         uses: actions/checkout@v2
       - name: Setup GraalVM
-        uses: DeLaGuardo/setup-graalvm@4.0
+        uses: DeLaGuardo/setup-graalvm@5.0
         with:
           graalvm: "21.0.0.2"
           java: "java11"
@@ -816,7 +816,7 @@ jobs:
       - name: Check out Git repository
         uses: actions/checkout@v2
       - name: Setup GraalVM
-        uses: DeLaGuardo/setup-graalvm@4.0
+        uses: DeLaGuardo/setup-graalvm@5.0
         with:
           graalvm: "21.0.0.2"
           java: "java11"
@@ -882,7 +882,7 @@ jobs:
       - name: Check out Git repository
         uses: actions/checkout@v2
       - name: Setup GraalVM
-        uses: DeLaGuardo/setup-graalvm@4.0
+        uses: DeLaGuardo/setup-graalvm@5.0
         with:
           graalvm: "21.0.0.2"
           java: "java11"
@@ -948,7 +948,7 @@ jobs:
       - name: Check out Git repository
         uses: actions/checkout@v2
       - name: Setup GraalVM
-        uses: DeLaGuardo/setup-graalvm@4.0
+        uses: DeLaGuardo/setup-graalvm@5.0
         with:
           graalvm: "21.0.0.2"
           java: "java11"
@@ -1013,7 +1013,7 @@ jobs:
       - name: Check out Git repository
         uses: actions/checkout@v2
       - name: Setup GraalVM
-        uses: DeLaGuardo/setup-graalvm@4.0
+        uses: DeLaGuardo/setup-graalvm@5.0
         with:
           graalvm: "21.0.0.2"
           java: "java11"
@@ -1079,7 +1079,7 @@ jobs:
       - name: Check out Git repository
         uses: actions/checkout@v2
       - name: Setup GraalVM
-        uses: DeLaGuardo/setup-graalvm@4.0
+        uses: DeLaGuardo/setup-graalvm@5.0
         with:
           graalvm: "21.0.0.2"
           java: "java11"
@@ -1145,7 +1145,7 @@ jobs:
       - name: Check out Git repository
         uses: actions/checkout@v2
       - name: Setup GraalVM
-        uses: DeLaGuardo/setup-graalvm@4.0
+        uses: DeLaGuardo/setup-graalvm@5.0
         with:
           graalvm: "21.0.0.2"
           java: "java11"
@@ -1211,7 +1211,7 @@ jobs:
       - name: Check out Git repository
         uses: actions/checkout@v2
       - name: Setup GraalVM
-        uses: DeLaGuardo/setup-graalvm@4.0
+        uses: DeLaGuardo/setup-graalvm@5.0
         with:
           graalvm: "21.0.0.2"
           java: "java11"
@@ -1277,7 +1277,7 @@ jobs:
       - name: Check out Git repository
         uses: actions/checkout@v2
       - name: Setup GraalVM
-        uses: DeLaGuardo/setup-graalvm@4.0
+        uses: DeLaGuardo/setup-graalvm@5.0
         with:
           graalvm: "21.0.0.2"
           java: "java11"
@@ -1327,7 +1327,7 @@ jobs:
       - name: Check out Git repository
         uses: actions/checkout@v2
       - name: Setup GraalVM
-        uses: DeLaGuardo/setup-graalvm@4.0
+        uses: DeLaGuardo/setup-graalvm@5.0
         with:
           graalvm: "21.0.0.2"
           java: "java11"
@@ -1392,7 +1392,7 @@ jobs:
       - name: Check out Git repository
         uses: actions/checkout@v2
       - name: Setup GraalVM
-        uses: DeLaGuardo/setup-graalvm@4.0
+        uses: DeLaGuardo/setup-graalvm@5.0
         with:
           graalvm: "21.0.0.2"
           java: "java11"
@@ -1460,7 +1460,7 @@ jobs:
       - name: Check out Git repository
         uses: actions/checkout@v2
       - name: Setup GraalVM
-        uses: DeLaGuardo/setup-graalvm@4.0
+        uses: DeLaGuardo/setup-graalvm@5.0
         with:
           graalvm: "21.0.0.2"
           java: "java11"

diff --git a/application/consumer-rabbitmq-quarkus/pom.xml b/application/consumer-rabbitmq-quarkus/pom.xml
@@ -12,7 +12,7 @@
 	<groupId>webapp.3tier.k8s</groupId>
 	<artifactId>consumer-rabbitmq-quarkus</artifactId>
 	<properties>
-		<amqp-client.version>5.12.0</amqp-client.version>
+		<amqp-client.version>5.13.1</amqp-client.version>
 		<rabbitmq-mock.version>1.1.1</rabbitmq-mock.version>
 	</properties>
 	<dependencies>

diff --git a/application/jaxrs-rabbitmq-quarkus/pom.xml b/application/jaxrs-rabbitmq-quarkus/pom.xml
@@ -12,7 +12,7 @@
 	<groupId>webapp.3tier.k8s</groupId>
 	<artifactId>jaxrs-rabbitmq-quarkus</artifactId>
 	<properties>
-		<amqp-client.version>5.12.0</amqp-client.version>
+		<amqp-client.version>5.13.1</amqp-client.version>
 		<rabbitmq-mock.version>1.1.1</rabbitmq-mock.version>
 	</properties>
 	<dependencies>

diff --git a/application/jaxrs-redis-quarkus/pom.xml b/application/jaxrs-redis-quarkus/pom.xml
@@ -12,7 +12,7 @@
 	<groupId>webapp.3tier.k8s</groupId>
 	<artifactId>jaxrs-redis-quarkus</artifactId>
 	<properties>
-		<jedis.version>3.6.1</jedis.version>
+		<jedis.version>3.7.0</jedis.version>
 		<jedis-mock.version>0.1.22</jedis-mock.version>
 	</properties>
 	<dependencies>

diff --git a/application/redis-mysql-helidon/pom.xml b/application/redis-mysql-helidon/pom.xml
@@ -24,11 +24,11 @@
 
 	<properties>
 		<mainClass>webapp.tier.events.TaskServiceMain</mainClass>
-		<jedis.version>3.6.1</jedis.version>
+		<jedis.version>3.7.0</jedis.version>
 		<mysql.version>8.0.26</mysql.version>
 		<jacoco-maven-plugin.version>0.8.7</jacoco-maven-plugin.version>
 		<jedis-mock.version>0.1.22</jedis-mock.version>
-		<mockito.junit.jupiter>3.11.1</mockito.junit.jupiter>
+		<mockito.junit.jupiter>3.12.4</mockito.junit.jupiter>
 	</properties>
 
 	<dependencies>

diff --git a/application/web-java-openliberty/pom.xml b/application/web-java-openliberty/pom.xml
@@ -15,8 +15,8 @@
 
 		<slf4j-log4j12.version>1.7.32</slf4j-log4j12.version>
 		<hazelcast.version>4.2.2</hazelcast.version>
-		<jedis.version>3.6.1</jedis.version>
-		<amqp-client.version>5.12.0</amqp-client.version>
+		<jedis.version>3.7.0</jedis.version>
+		<amqp-client.version>5.13.1</amqp-client.version>
 		<memcached-Java-Client.version>3.0.2</memcached-Java-Client.version>
 		<rabbitmq-jms.version>2.3.0</rabbitmq-jms.version>
 
@@ -33,7 +33,7 @@
 			<dependency>
 				<groupId>org.testcontainers</groupId>
 				<artifactId>testcontainers-bom</artifactId>
-				<version>1.15.3</version>
+				<version>1.16.0</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
@@ -97,7 +97,7 @@
 		<dependency>
 			<groupId>org.junit.jupiter</groupId>
 			<artifactId>junit-jupiter</artifactId>
-			<version>5.7.2</version>
+			<version>5.8.1</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
@@ -133,19 +133,19 @@
 		<dependency>
 			<groupId>org.junit.jupiter</groupId>
 			<artifactId>junit-jupiter-api</artifactId>
-			<version>5.7.2</version>
+			<version>5.8.1</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.junit.jupiter</groupId>
 			<artifactId>junit-jupiter-engine</artifactId>
-			<version>5.7.2</version>
+			<version>5.8.1</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.mockito</groupId>
 			<artifactId>mockito-core</artifactId>
-			<version>3.11.1</version>
+			<version>3.12.4</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
@@ -174,7 +174,7 @@
 			<plugin>
 				<groupId>io.openliberty.tools</groupId>
 				<artifactId>liberty-maven-plugin</artifactId>
-				<version>3.3.4</version>
+				<version>3.4</version>
 			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>

diff --git a/kubernetes/monitoring/grafana/grafana-deployment.yaml b/kubernetes/monitoring/grafana/grafana-deployment.yaml
@@ -19,7 +19,7 @@ spec:
     spec:
       containers:
         - name: grafana
-          image: grafana/grafana:8.0.4
+          image: grafana/grafana:8.2.1
           imagePullPolicy: Always
           ports:
             - containerPort: 3000

diff --git a/kubernetes/monitoring/jenkins/Dockerfile b/kubernetes/monitoring/jenkins/Dockerfile
@@ -1,15 +1,15 @@
-FROM jenkins/jenkins:2.299-alpine
+FROM jenkins/jenkins:2.315-alpine
 ARG BUILD_DATE
 ARG VCS_REF
 
 # renovate: datasource=repology depName=alpine_3_12/tzdata versioning=loose
-ENV TZDATA_VERSION="2021a-r0"
+ENV TZDATA_VERSION="2021c-r0"
 # renovate: datasource=repology depName=alpine_3_12/gcc versioning=loose
-ENV GCC_VERSION="10.2.1_pre1-r3"
+ENV GCC_VERSION="10.3.1_git20210424-r2"
 # renovate: datasource=repology depName=alpine_3_12/docker versioning=loose
-ENV DOCKER_VERSION="20.10.3-r1"
+ENV DOCKER_VERSION="20.10.9-r0"
 # renovate: datasource=repology depName=alpine_3_12/python3 versioning=loose
-ENV PYTHON3_VERSION="3.8.10-r0"
+ENV PYTHON3_VERSION="3.9.5-r1"
 # renovate: datasource=repology depName=alpine_3_12/gnuplot versioning=loose
 ENV GUNPLOT_VERSION="5.4.1-r0"
 

diff --git a/kubernetes/monitoring/test/ab/Dockerfile b/kubernetes/monitoring/test/ab/Dockerfile
@@ -3,7 +3,7 @@ ARG BUILD_DATE
 ARG VCS_REF
 
 # renovate: datasource=repology depName=alpine_3_12/apache2-utils versioning=loose
-ENV APACHE2_UTILS_VERSION="2.4.48-r0"
+ENV APACHE2_UTILS_VERSION="2.4.51-r0"
 
 LABEL org.label-schema.build-date=$BUILD_DATE org.label-schema.vcs-ref=$VCS_REF \
     org.label-schema.vcs-url="https://github.com/yurake/k8s-3tier-webapp"

diff --git a/kubernetes/rabbitmq/Dockerfile b/kubernetes/rabbitmq/Dockerfile
@@ -3,7 +3,7 @@ ARG BUILD_DATE
 ARG VCS_REF
 
 # renovate: datasource=repology depName=alpine_3_12/tzdata versioning=loose
-ENV TZDATA_VERSION="2021a-r0"
+ENV TZDATA_VERSION="2021c-r0"
 
 LABEL org.label-schema.build-date=$BUILD_DATE org.label-schema.vcs-ref=$VCS_REF \
     org.label-schema.vcs-url="https://github.com/yurake/k8s-3tier-webapp"