Bump uaa to v74.31.0 and manually specify version

alphagov · Feb 2, 2021 · ddbfd3d · ddbfd3d
1 parent 8d42759
commit ddbfd3d
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +1,3 @@
 [submodule "src/uaa"]
 	path = src/uaa
-	url = https://github.com/cloudfoundry/uaa.git
+	url = https://github.com/alphagov/paas-uaa.git
diff --git a/packages/uaa/pre_packaging b/packages/uaa/pre_packaging
@@ -25,6 +25,7 @@ export PATH=$JAVA_HOME/bin:$PATH
 
 #build cloud foundry UAA war
 cd ${BUILD_DIR}/uaa
+export UAA_VERSION=v74.31.0
 GIT_DIR=$(find $RELEASE_DIR -path "*/modules/src/uaa") ./gradlew :clean :assemble --max-workers=4 -Pversion=${UAA_VERSION}
 cp uaa/build/libs/cloudfoundry-identity-uaa-${UAA_VERSION}.war ${BUILD_DIR}/uaa/cloudfoundry-identity-uaa.war
 cp statsd/build/libs/cloudfoundry-identity-statsd-${UAA_VERSION}.war ${BUILD_DIR}/uaa/cloudfoundry-identity-statsd.war
@@ -55,4 +56,3 @@ rm -f ${BUILD_DIR}/uaa/README.md
 rm -f ${BUILD_DIR}/uaa/settings.gradle
 rm -f ${BUILD_DIR}/uaa/shared_versions.gradle
 rm -rf ${BUILD_DIR}/uaa/uaa
-
diff --git a/src/uaa b/src/uaa
+1 −1		k8s/templates/values/image.yml
+13 −0		server/src/main/java/org/cloudfoundry/identity/uaa/codestore/ExpiringCodeStore.java
+19 −0		server/src/main/java/org/cloudfoundry/identity/uaa/codestore/JdbcExpiringCodeStore.java
+5 −6		server/src/main/java/org/cloudfoundry/identity/uaa/invitations/InvitationsController.java
+13 −0		server/src/test/java/org/cloudfoundry/identity/uaa/codestore/ExpiringCodeStoreTests.java
+15 −0		server/src/test/java/org/cloudfoundry/identity/uaa/codestore/InMemoryExpiringCodeStore.java
+9 −14		server/src/test/java/org/cloudfoundry/identity/uaa/invitations/InvitationsControllerTest.java
+4 −3		uaa/src/test/java/org/cloudfoundry/identity/uaa/login/InvitationsServiceMockMvcTests.java