Skip to content
Snippets Groups Projects
Commit 936fc3a8 authored by bhill6@wisc.edu's avatar bhill6@wisc.edu
Browse files

Merge branch 'update_deployment_job' into 'main'

Updated branch restriction on deploy job from trunk to main

See merge request !37
parents 7a43b6b8 23ec5669
No related branches found
No related tags found
1 merge request!37Updated branch restriction on deploy job from trunk to main
Pipeline #138322 passed
...@@ -69,7 +69,7 @@ spotbugs-sast: ...@@ -69,7 +69,7 @@ spotbugs-sast:
deploy: deploy:
stage: deploy stage: deploy
only: only:
- trunk - main
script: script:
- env - env
- mvn $MAVEN_CLI_OPTS deploy -Pdeploy -X - mvn $MAVEN_CLI_OPTS deploy -Pdeploy -X
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>edu.wisc.uwss</groupId> <groupId>edu.wisc.uwss</groupId>
<artifactId>uw-spring-security</artifactId> <artifactId>uw-spring-security</artifactId>
<version>3.0.6</version> <version>3.0.7</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>UW Spring Security Parent</name> <name>UW Spring Security Parent</name>
<description>Parent project for module to integrate Spring Security with UW authentication mechanism.</description> <description>Parent project for module to integrate Spring Security with UW authentication mechanism.</description>
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<parent> <parent>
<groupId>edu.wisc.uwss</groupId> <groupId>edu.wisc.uwss</groupId>
<artifactId>uw-spring-security</artifactId> <artifactId>uw-spring-security</artifactId>
<version>3.0.6</version> <version>3.0.7</version>
</parent> </parent>
<artifactId>uw-spring-security-config</artifactId> <artifactId>uw-spring-security-config</artifactId>
<name>UW Spring Security Configuration</name> <name>UW Spring Security Configuration</name>
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<parent> <parent>
<groupId>edu.wisc.uwss</groupId> <groupId>edu.wisc.uwss</groupId>
<artifactId>uw-spring-security</artifactId> <artifactId>uw-spring-security</artifactId>
<version>3.0.6</version> <version>3.0.7</version>
</parent> </parent>
<artifactId>uw-spring-security-core</artifactId> <artifactId>uw-spring-security-core</artifactId>
<name>UW Spring Security Core</name> <name>UW Spring Security Core</name>
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<parent> <parent>
<groupId>edu.wisc.uwss</groupId> <groupId>edu.wisc.uwss</groupId>
<artifactId>uw-spring-security</artifactId> <artifactId>uw-spring-security</artifactId>
<version>3.0.6</version> <version>3.0.7</version>
</parent> </parent>
<artifactId>uw-spring-security-sample-war</artifactId> <artifactId>uw-spring-security-sample-war</artifactId>
<name>UW Spring Security Sample War</name> <name>UW Spring Security Sample War</name>
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
<parent> <parent>
<groupId>edu.wisc.uwss</groupId> <groupId>edu.wisc.uwss</groupId>
<artifactId>uw-spring-security</artifactId> <artifactId>uw-spring-security</artifactId>
<version>3.0.6</version> <version>3.0.7</version>
</parent> </parent>
<artifactId>uw-spring-security-web</artifactId> <artifactId>uw-spring-security-web</artifactId>
<name>UW Spring Security Web</name> <name>UW Spring Security Web</name>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment