From 23ec566917fc47affe0f17f4df198446c9ec4ab7 Mon Sep 17 00:00:00 2001
From: "bhill6@wisc.edu" <bhill6@wisc.edu>
Date: Fri, 14 Oct 2022 09:38:00 -0500
Subject: [PATCH] Updated branch restriction on deploy job from trunk to main
---
.gitlab-ci.yml | 2 +-
pom.xml | 2 +-
uw-spring-security-config/pom.xml | 2 +-
uw-spring-security-core/pom.xml | 2 +-
uw-spring-security-sample-war/pom.xml | 2 +-
uw-spring-security-web/pom.xml | 2 +-
6 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e540d27..4da2eeb 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -69,7 +69,7 @@ spotbugs-sast:
deploy:
stage: deploy
only:
- - trunk
+ - main
script:
- env
- mvn $MAVEN_CLI_OPTS deploy -Pdeploy -X
diff --git a/pom.xml b/pom.xml
index 6f40d9b..a2b146b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>edu.wisc.uwss</groupId>
<artifactId>uw-spring-security</artifactId>
- <version>3.0.6</version>
+ <version>3.0.7</version>
<packaging>pom</packaging>
<name>UW Spring Security Parent</name>
<description>Parent project for module to integrate Spring Security with UW authentication mechanism.</description>
diff --git a/uw-spring-security-config/pom.xml b/uw-spring-security-config/pom.xml
index 4f6831f..df6ed62 100644
--- a/uw-spring-security-config/pom.xml
+++ b/uw-spring-security-config/pom.xml
@@ -3,7 +3,7 @@
<parent>
<groupId>edu.wisc.uwss</groupId>
<artifactId>uw-spring-security</artifactId>
- <version>3.0.6</version>
+ <version>3.0.7</version>
</parent>
<artifactId>uw-spring-security-config</artifactId>
<name>UW Spring Security Configuration</name>
diff --git a/uw-spring-security-core/pom.xml b/uw-spring-security-core/pom.xml
index 54451d8..499eb8f 100644
--- a/uw-spring-security-core/pom.xml
+++ b/uw-spring-security-core/pom.xml
@@ -3,7 +3,7 @@
<parent>
<groupId>edu.wisc.uwss</groupId>
<artifactId>uw-spring-security</artifactId>
- <version>3.0.6</version>
+ <version>3.0.7</version>
</parent>
<artifactId>uw-spring-security-core</artifactId>
<name>UW Spring Security Core</name>
diff --git a/uw-spring-security-sample-war/pom.xml b/uw-spring-security-sample-war/pom.xml
index 1c95220..3092d31 100644
--- a/uw-spring-security-sample-war/pom.xml
+++ b/uw-spring-security-sample-war/pom.xml
@@ -3,7 +3,7 @@
<parent>
<groupId>edu.wisc.uwss</groupId>
<artifactId>uw-spring-security</artifactId>
- <version>3.0.6</version>
+ <version>3.0.7</version>
</parent>
<artifactId>uw-spring-security-sample-war</artifactId>
<name>UW Spring Security Sample War</name>
diff --git a/uw-spring-security-web/pom.xml b/uw-spring-security-web/pom.xml
index 4373f93..942f824 100644
--- a/uw-spring-security-web/pom.xml
+++ b/uw-spring-security-web/pom.xml
@@ -15,7 +15,7 @@
<parent>
<groupId>edu.wisc.uwss</groupId>
<artifactId>uw-spring-security</artifactId>
- <version>3.0.6</version>
+ <version>3.0.7</version>
</parent>
<artifactId>uw-spring-security-web</artifactId>
<name>UW Spring Security Web</name>
--
GitLab