Merge remote-tracking branch 'origin/master' into develop

TIER · Jul 26, 2022 · 5f99cbd · 5f99cbd
2 parents 45df12c + 7e6aa39
commit 5f99cbd
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/build.gradle b/build.gradle
@@ -1,6 +1,6 @@
 plugins {
     id 'base'
-    id 'net.researchgate.release' version '2.6.0'
+    id 'net.researchgate.release' version '3.0.0'
     id 'com.github.breadmoirai.github-release' version '2.2.9'
 }
 
@@ -23,7 +23,8 @@ githubRelease {
 
 release {
     git {
-        pushToRemote = 'i2'
+        pushToRemote.set(project.'i2.git.remote')
+        requireBranch.set(project.'i2.git.branch')
     }
 }
 

diff --git a/gradle.properties b/gradle.properties
@@ -1,6 +1,6 @@
 name=shibui
 group=edu.internet2.tier.shibboleth.admin.ui
-version=1.11.0-SNAPSHOT
+version=1.12.0-SNAPSHOT
 
 ### library versions ###
 commonsCollections4Version=4.4
@@ -29,6 +29,8 @@ i2.github.token=
 i2.github.owner=TIER
 i2.github.repo=shib-idp-ui
 i2.github.apiEndpoint=https://github.internet2.edu/api/v3
+i2.git.remote=i2
+i2.git.branch=master
 
 ## NOTES
 # pac4j spring security 7.0.3 here uses the pac4j 5.4.3 core, thus differences in versions (they used use the same versions, now