Merge remote-tracking branch 'origin/master' into HEAD
Change-Id: Ibe388266370d7456cf5e3888c4a7cd19c9d8c2fc
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/jgvariant-parent/pom.xml b/jgvariant-parent/pom.xml
index bfe8c98..cd9e243 100644
--- a/jgvariant-parent/pom.xml
+++ b/jgvariant-parent/pom.xml
@@ -73,8 +73,8 @@
<error-prone-support.version>0.6.0</error-prone-support.version>
<google-java-format.version>1.15.0</google-java-format.version>
<inject-resources.version>0.3.2</inject-resources.version>
- <jetbrains-annotations.version>23.1.0</jetbrains-annotations.version>
- <junit-jupiter.version>5.9.1</junit-jupiter.version>
+ <jetbrains-annotations.version>24.0.0</jetbrains-annotations.version>
+ <junit-jupiter.version>5.9.2</junit-jupiter.version>
<nullaway.version>0.10.6</nullaway.version>
<xz.version>1.9</xz.version>
</properties>
diff --git a/renovate.json b/renovate.json
index f59f762..09e3ef5 100644
--- a/renovate.json
+++ b/renovate.json
@@ -1,3 +1,3 @@
{ "$schema": "https://docs.renovatebot.com/renovate-schema.json"
-, "extends": ["local>benkard/.github:renovate-config"]
+, "extends": ["local>mulk/renovate-config"]
}