summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Andreas Benkard <code@mail.matthias.benkard.de>2023-03-24 10:52:59 +0100
committerGitHub <noreply@github.com>2023-03-24 10:52:59 +0100
commit69574ef3633171e1797a97186513cb26dc51a3fc (patch)
treedde8aac6c77ac91a46ec1a6299a684ed79981a92
parent0c4bbce114364c4af10fe1d05cf2157434150f23 (diff)
parentd979a7a028bfc543ef4d2d524b541db2ec4849c9 (diff)
Merge branch 'master' into jakarta-json
-rw-r--r--.gitlab-ci.yml24
-rw-r--r--pom.xml10
-rw-r--r--renovate.json5
3 files changed, 33 insertions, 6 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 9ac0105..f5dcd18 100644
--- a/pom.xml
+++ b/pom.xml
@@ -60,17 +60,17 @@ SPDX-License-Identifier: LGPL-3.0-or-later
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- <compiler-plugin.version>3.10.1</compiler-plugin.version>
+ <compiler-plugin.version>3.11.0</compiler-plugin.version>
<failsafe-plugin.version>${surefire-plugin.version}</failsafe-plugin.version>
- <flatten-plugin.version>1.3.0</flatten-plugin.version>
+ <flatten-plugin.version>1.4.0</flatten-plugin.version>
<google-java-format.version>1.15.0</google-java-format.version>
<jar-plugin.version>3.3.0</jar-plugin.version>
<maven-gpg-plugin.version>3.0.1</maven-gpg-plugin.version>
- <maven-javadoc-plugin.version>3.4.1</maven-javadoc-plugin.version>
+ <maven-javadoc-plugin.version>3.5.0</maven-javadoc-plugin.version>
<maven-source-plugin.version>3.2.1</maven-source-plugin.version>
<nexus-staging-plugin.version>1.6.13</nexus-staging-plugin.version>
- <spotless-plugin.version>2.29.0</spotless-plugin.version>
- <surefire-plugin.version>3.0.0-M7</surefire-plugin.version>
+ <spotless-plugin.version>2.35.0</spotless-plugin.version>
+ <surefire-plugin.version>3.0.0</surefire-plugin.version>
<quarkus.version>3.0.0.Beta1</quarkus.version>
</properties>
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"
+ ]
}