summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Andreas Benkard <code@mail.matthias.benkard.de>2023-01-12 19:33:23 +0100
committerMatthias Andreas Benkard <code@mail.matthias.benkard.de>2023-01-12 19:33:23 +0100
commit50f0f7a67241bac251db32fc1a1744f4cd766fc5 (patch)
treef1882584900f9702078292bd3a8f1f5ae463b100
parent6fcb44a9a68e07d0ef4d64fbbfb86347a279ff75 (diff)
parent93e7d9ecef79bf4319a6ee5ef0ae666dd99ec17e (diff)
Merge remote-tracking branch 'gitlab/master'
Change-Id: I2e20b9ab54f24911aca5e5c76bd4efa721c2396a
-rw-r--r--.gitlab-ci.yml24
-rw-r--r--pom.xml2
-rw-r--r--renovate.json5
3 files changed, 29 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
new file mode 100644
index 0000000..3f0dba2
--- /dev/null
+++ b/.gitlab-ci.yml
@@ -0,0 +1,24 @@
+stages:
+ - check
+
+image: maven:3-openjdk-17
+
+verify:
+ stage: check
+ script:
+ - mvn verify
+
+sast:
+ stage: check
+
+cache:
+ key: $CI_JOB_NAME
+ paths:
+ - .m2/repository
+
+variables:
+ MAVEN_OPTS: "-Dmaven.repo.local=.m2/repository"
+ MAVEN_CLI_OPTS: "--batch-mode --errors"
+
+include:
+ - template: Security/SAST.gitlab-ci.yml
diff --git a/pom.xml b/pom.xml
index 2c85c28..f67b7d9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -72,7 +72,7 @@ SPDX-License-Identifier: LGPL-3.0-or-later
<spotless-plugin.version>2.29.0</spotless-plugin.version>
<surefire-plugin.version>3.0.0-M7</surefire-plugin.version>
- <quarkus.version>2.15.1.Final</quarkus.version>
+ <quarkus.version>2.15.3.Final</quarkus.version>
</properties>
<distributionManagement>
diff --git a/renovate.json b/renovate.json
index f59f762..c031064 100644
--- a/renovate.json
+++ b/renovate.json
@@ -1,3 +1,6 @@
{ "$schema": "https://docs.renovatebot.com/renovate-schema.json"
-, "extends": ["local>benkard/.github:renovate-config"]
+, "extends":
+ [ "local>mulk/renovate-config"
+ , ":automergeMinor"
+ ]
}