Merge tag 'v74.16.0' into bump-to-74.16.0

alphagov · Apr 15, 2020 · 8d81211 · 8d81211
2 parents d0dcff3 + 93b063a
commit 8d81211
Show file tree

Hide file tree

Showing 18 changed files with 169 additions and 36 deletions.
diff --git a/.final_builds/jobs/uaa/index.yml b/.final_builds/jobs/uaa/index.yml
@@ -119,6 +119,10 @@ builds:
     version: 59b8ae98c84496c98b9733342a0b6c8bc3167e60
     blobstore_id: 4ef32373-dc31-4219-41cc-486ce1a6fba8
     sha1: af7f78b04b3ba150b36f04ed2be168b8151822d8
+  613e1c42c2b62160752d79642181f8dd29aa3fff:
+    version: 613e1c42c2b62160752d79642181f8dd29aa3fff
+    blobstore_id: 32ccfa57-961d-4d58-7f30-0c1ead3555c6
+    sha1: b3964a58ac1746f7cda1794d5d20df7ee89bc3b9
   66fe0204991582bbeea5a58c2f3fa0a44c1fb7fe:
     version: 66fe0204991582bbeea5a58c2f3fa0a44c1fb7fe
     blobstore_id: 76b2b73a-f179-4f8c-b9f1-33c883b872e6
@@ -147,6 +151,10 @@ builds:
     version: 85f1aea89ff278b2b3b384e60458246c898a8b19
     blobstore_id: 5eecc64a-3f10-4bcf-9790-9393e552315a
     sha1: 98538ccc0a8d5a2a7560c8a8ccf100ddd466180a
+  882f089b5b713cc315d257413945db13da85f93c:
+    version: 882f089b5b713cc315d257413945db13da85f93c
+    blobstore_id: 724acfff-4a3a-4b90-70bb-1fe0a5b06632
+    sha1: 69661239022da9bd7ab88687fdec0803b094d2dd
   90ccc56d7b424b8a2945dab16720317178c621b3:
     version: 90ccc56d7b424b8a2945dab16720317178c621b3
     blobstore_id: 42391d52-954e-4251-821a-c44a952c6499

diff --git a/.final_builds/packages/uaa/index.yml b/.final_builds/packages/uaa/index.yml
@@ -91,6 +91,10 @@ builds:
     version: 256cfc2c9b3e3abff87ae11cdc23ea2ac756cc9b
     blobstore_id: 7343a262-2293-49af-6fc1-7ccbd0390586
     sha1: ae6812d5c0fed8c10ce05e863509c54b33037f7d
+  259c1868cfba370eb0e5ddf1a563d7e2828f6257:
+    version: 259c1868cfba370eb0e5ddf1a563d7e2828f6257
+    blobstore_id: 0ab6a1be-8b8f-4a27-6a94-49dce6d4069f
+    sha1: 8d0b8dc413aa56113cbe58ac6b06ed697273e939
   25a0ba85fbce687bdd88349e36241184912a3294:
     version: 25a0ba85fbce687bdd88349e36241184912a3294
     blobstore_id: adc01241-e104-4fb2-965c-29f895546b24
@@ -123,6 +127,10 @@ builds:
     version: 2ef57c16e449e44995244f41db29ebdc2bfd6219
     blobstore_id: 843f5766-b9a6-4cb9-acaf-32492d07ac2e
     sha1: bc93ee401d83c29aa1e3a0d8987fcbe675c9779f
+  303d583067cf5dad9c643086060bf0a10904d66b:
+    version: 303d583067cf5dad9c643086060bf0a10904d66b
+    blobstore_id: 848a60b1-c871-4399-71d4-9c4628b1a99f
+    sha1: 9eb263d2af2b6b8ca3ae9bc87d645d2df05d8c77
   3093a3b038bab9d80bfcd2463c14432b44c0290e:
     version: 3093a3b038bab9d80bfcd2463c14432b44c0290e
     blobstore_id: d74feb2b-9739-4fe5-aa9d-9df1754b82e9
@@ -203,6 +211,10 @@ builds:
     version: 4421c15cc1339b0d1398414bdc8f6ab8375785b6
     blobstore_id: 89779969-d1fe-4b46-8689-e55f064e3268
     sha1: a36771de34e7c141d7e4ed002f11b525cbf678da
+  491f05b1e64c578b65d1d6111423ca31ce336d07:
+    version: 491f05b1e64c578b65d1d6111423ca31ce336d07
+    blobstore_id: 7902b222-0f03-4e4b-7e6d-c526d75b2bb1
+    sha1: 4f2ba2ff0f88ccef5f3966557d26b0a9484fee64
   4a062234a4a03f172fb68a0bfe4eec4b2d7619a2:
     version: 4a062234a4a03f172fb68a0bfe4eec4b2d7619a2
     blobstore_id: afdba6e1-121a-41e3-60e2-cec4434a9834

diff --git a/Gemfile b/Gemfile
@@ -1,7 +1,7 @@
 source 'https://rubygems.org'
 gem 'rspec'
 gem 'rake'
-gem 'nokogiri', '1.10.7'
+gem 'nokogiri', '1.10.9'
 gem 'activesupport'
 gem 'bosh-template'
 

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,39 +1,39 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.0.2.1)
+    activesupport (6.0.2.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
       zeitwerk (~> 2.2)
     bosh-template (2.2.1)
       semi_semantic (~> 1.2.0)
-    byebug (9.1.0)
+    byebug (11.1.1)
     coderay (1.1.2)
-    concurrent-ruby (1.1.5)
+    concurrent-ruby (1.1.6)
     diff-lcs (1.3)
     i18n (1.8.2)
       concurrent-ruby (~> 1.0)
-    method_source (0.9.2)
+    method_source (1.0.0)
     mini_portile2 (2.4.0)
     minitest (5.14.0)
-    nokogiri (1.10.7)
+    nokogiri (1.10.9)
       mini_portile2 (~> 2.4.0)
-    pry (0.12.2)
-      coderay (~> 1.1.0)
-      method_source (~> 0.9.0)
-    pry-byebug (3.5.0)
-      byebug (~> 9.1)
-      pry (~> 0.10)
+    pry (0.13.0)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    pry-byebug (3.9.0)
+      byebug (~> 11.0)
+      pry (~> 0.13.0)
     rake (13.0.1)
     rspec (3.9.0)
       rspec-core (~> 3.9.0)
       rspec-expectations (~> 3.9.0)
       rspec-mocks (~> 3.9.0)
     rspec-core (3.9.1)
       rspec-support (~> 3.9.1)
-    rspec-expectations (3.9.0)
+    rspec-expectations (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
     rspec-mocks (3.9.1)
@@ -44,15 +44,15 @@ GEM
     thread_safe (0.3.6)
     tzinfo (1.2.6)
       thread_safe (~> 0.1)
-    zeitwerk (2.2.2)
+    zeitwerk (2.3.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   activesupport
   bosh-template
-  nokogiri (= 1.10.7)
+  nokogiri (= 1.10.9)
   pry-byebug
   rake
   rspec

diff --git a/config/blobs.yml b/config/blobs.yml
@@ -1,12 +1,12 @@
-openjdk/openjdk-11.0.4_11-x86_64-trusty.tar.gz:
-  size: 195187242
-  object_id: 818deb54-a1fd-4e95-76c7-e32449d8b739
-  sha: 3e51fc95c556aad87a1b136ca23cb2dea617482a
-uaa/apache-tomcat-9.0.30.tar.gz:
-  size: 11026056
-  object_id: 0556fdf6-9a6a-4d4f-4967-c6787df4452c
-  sha: 3cccf4398f5a77f15403a408c75558220194bfeb
+openjdk/openjdk-11.0.6_10.tar.gz:
+  size: 197198464
+  object_id: 2d6fba2b-c8c7-475c-4116-1a344ea31183
+  sha: sha256:330d19a2eaa07ed02757d7a785a77bab49f5ee710ea03b4ee2fa220ddd0feffc
+uaa/apache-tomcat-9.0.33.tar.gz:
+  size: 11027411
+  object_id: e8af2dcb-123e-455a-7681-2c6774b0923e
+  sha: 1a35cd54a73a451a6e68b5de9ceb9876a51945c7
 uaa/newrelic.jar:
-  size: 12062390
-  object_id: 9e1e36f9-5ec3-4b4f-5388-50f03dba8d8b
-  sha: sha256:8eb64e4241e2d514b6b828e0214d9c7a8fc795ac67c1eff6be924055286115e0
+  size: 11035182
+  object_id: 44e67ed5-fa1b-442a-4df4-0501be146543
+  sha: sha256:5071c7d2c930c065baa05c6d13f013000f7c5d72393d507ef6e5843d8145c6d5
diff --git a/jobs/uaa/templates/bin/uaa b/jobs/uaa/templates/bin/uaa
@@ -19,7 +19,7 @@ KEYSTORE_OPTS="-Djavax.net.ssl.trustStore=$KEYSTORE -Djavax.net.ssl.trustStoreTy
 log "Keystore configured to: $KEYSTORE"
 
 export PATH="/var/vcap/packages/uaa/jdk/bin:$PATH"
-export JAVA_OPTS="-Djava.security.egd=file:/dev/./urandom -DPID=$$ -Dnetworkaddress.cache.ttl=0 $HTTP_PROXY_JAVA_OPTIONS $NEWRELIC_OPTS $KEYSTORE_OPTS"
+export JAVA_OPTS="-Djava.security.egd=file:/dev/./urandom -DPID=$$ -Dnetworkaddress.cache.ttl=0 $HTTP_PROXY_JAVA_OPTIONS $NEWRELIC_OPTS $KEYSTORE_OPTS -Dlog4j.configurationFile=/var/vcap/jobs/uaa/config/log4j2.properties"
 
 log "Calling Tomcat start up command"
 /var/vcap/packages/uaa/tomcat/bin/catalina.sh run &

diff --git a/packages/uaa/packaging b/packages/uaa/packaging
@@ -3,7 +3,8 @@
 set -e -x
 
 cd ${BOSH_INSTALL_TARGET}
-mkdir jdk && tar zxvf ${BOSH_COMPILE_TARGET}/openjdk/openjdk-*-x86_64-trusty.tar.gz -C jdk
+mkdir jdk
+tar zxvf ${BOSH_COMPILE_TARGET}/openjdk/openjdk-*.tar.gz -C jdk --strip 1
 if [[ $? != 0 ]] ; then
   echo "Cannot unpack JDK"
   exit 1

diff --git a/packages/uaa/pre_packaging b/packages/uaa/pre_packaging
@@ -11,7 +11,7 @@ export PATH=$PATH:/bin:/usr/bin
 if [ `uname` = "Linux" ]; then
   mkdir java
   cd java
-  tar zxvf ../openjdk/openjdk-*-x86_64-trusty.tar.gz
+  tar zxvf ../openjdk/openjdk-*.tar.gz --strip 1
   export JAVA_HOME=${BUILD_DIR}/java
 else
   if [ ! -d $JAVA_HOME ]; then

diff --git a/packages/uaa/spec b/packages/uaa/spec
@@ -3,4 +3,4 @@ name: uaa
 dependencies:
 files:
 - uaa/**/*
-- openjdk/openjdk-*-x86_64-trusty.tar.gz
+- openjdk/openjdk-*.tar.gz
diff --git a/releases/uaa/index.yml b/releases/uaa/index.yml
@@ -33,6 +33,8 @@ builds:
     version: "45.8"
   19afaa3b-f75a-45cb-abd3-1c869b1f3051:
     version: "27"
+  1a7cde07-f9db-42aa-48a9-ddd6088aeafb:
+    version: 74.14.0
   1af909c9-a385-457d-aa04-4d7fe37bd776:
     version: "11.3"
   1e1622c0-9b89-4ee6-8e67-607fc059492a:
@@ -125,6 +127,8 @@ builds:
     version: "51"
   5a72cf2b-d13a-48ab-b992-b7fc37a1385b:
     version: "22"
+  5c269805-665e-409b-5056-a6aac78bd9e0:
+    version: 74.15.0
   5d29c8b6-ed3c-4382-7b61-7bf3db031dca:
     version: 74.6.0
   5e7caaa1-d84d-4056-b8e1-fd20caac6fda:
@@ -153,6 +157,8 @@ builds:
     version: "13.11"
   6f20f5e0-a5a5-4304-8a43-4270fb911121:
     version: "52.8"
+  6f415a8e-796b-4837-7db5-a7ce62b7da2d:
+    version: 74.16.0
   6fc07a36-e2f6-496d-b1cb-2e079066b13a:
     version: "9"
   71eacb66-ee2a-47ed-a8b1-484e1ef5dc03:

diff --git a/releases/uaa/uaa-74.14.0.yml b/releases/uaa/uaa-74.14.0.yml
@@ -0,0 +1,23 @@
+name: uaa
+version: 74.14.0
+commit_hash: 1caeecd
+uncommitted_changes: false
+jobs:
+- name: bbr-uaadb
+  version: 76e6e982b567749002f5a0409f1545d606ccf99b
+  fingerprint: 76e6e982b567749002f5a0409f1545d606ccf99b
+  sha1: aa2d8e2716e5c78df5236c7570da08c0361652a9
+- name: uaa
+  version: 882f089b5b713cc315d257413945db13da85f93c
+  fingerprint: 882f089b5b713cc315d257413945db13da85f93c
+  sha1: 69661239022da9bd7ab88687fdec0803b094d2dd
+packages:
+- name: uaa
+  version: 491f05b1e64c578b65d1d6111423ca31ce336d07
+  fingerprint: 491f05b1e64c578b65d1d6111423ca31ce336d07
+  sha1: 4f2ba2ff0f88ccef5f3966557d26b0a9484fee64
+  dependencies: []
+license:
+  version: 43aff6a01f4ba508f9cb013dcec9c612287e6c57
+  fingerprint: 43aff6a01f4ba508f9cb013dcec9c612287e6c57
+  sha1: 18461c918f686ee6cf8a3f777a2bbc2837e5fa96
diff --git a/releases/uaa/uaa-74.15.0.yml b/releases/uaa/uaa-74.15.0.yml
@@ -0,0 +1,23 @@
+name: uaa
+version: 74.15.0
+commit_hash: f5ebd7d
+uncommitted_changes: false
+jobs:
+- name: bbr-uaadb
+  version: 76e6e982b567749002f5a0409f1545d606ccf99b
+  fingerprint: 76e6e982b567749002f5a0409f1545d606ccf99b
+  sha1: aa2d8e2716e5c78df5236c7570da08c0361652a9
+- name: uaa
+  version: 613e1c42c2b62160752d79642181f8dd29aa3fff
+  fingerprint: 613e1c42c2b62160752d79642181f8dd29aa3fff
+  sha1: b3964a58ac1746f7cda1794d5d20df7ee89bc3b9
+packages:
+- name: uaa
+  version: 303d583067cf5dad9c643086060bf0a10904d66b
+  fingerprint: 303d583067cf5dad9c643086060bf0a10904d66b
+  sha1: 9eb263d2af2b6b8ca3ae9bc87d645d2df05d8c77
+  dependencies: []
+license:
+  version: 43aff6a01f4ba508f9cb013dcec9c612287e6c57
+  fingerprint: 43aff6a01f4ba508f9cb013dcec9c612287e6c57
+  sha1: 18461c918f686ee6cf8a3f777a2bbc2837e5fa96
diff --git a/releases/uaa/uaa-74.16.0.yml b/releases/uaa/uaa-74.16.0.yml
@@ -0,0 +1,23 @@
+name: uaa
+version: 74.16.0
+commit_hash: 05c4109
+uncommitted_changes: false
+jobs:
+- name: bbr-uaadb
+  version: 76e6e982b567749002f5a0409f1545d606ccf99b
+  fingerprint: 76e6e982b567749002f5a0409f1545d606ccf99b
+  sha1: aa2d8e2716e5c78df5236c7570da08c0361652a9
+- name: uaa
+  version: 613e1c42c2b62160752d79642181f8dd29aa3fff
+  fingerprint: 613e1c42c2b62160752d79642181f8dd29aa3fff
+  sha1: b3964a58ac1746f7cda1794d5d20df7ee89bc3b9
+packages:
+- name: uaa
+  version: 259c1868cfba370eb0e5ddf1a563d7e2828f6257
+  fingerprint: 259c1868cfba370eb0e5ddf1a563d7e2828f6257
+  sha1: 8d0b8dc413aa56113cbe58ac6b06ed697273e939
+  dependencies: []
+license:
+  version: 43aff6a01f4ba508f9cb013dcec9c612287e6c57
+  fingerprint: 43aff6a01f4ba508f9cb013dcec9c612287e6c57
+  sha1: 18461c918f686ee6cf8a3f777a2bbc2837e5fa96
diff --git a/scripts/recreate-uaa-release.sh b/scripts/recreate-uaa-release.sh
@@ -4,6 +4,6 @@ set -xeu
 
 pushd /root/uaa-release
     mkdir -p tmp
-    bosh create-release --force --tarball=tmp/uaa-dev-release.tgz
+    UAA_VERSION=0.0.0 bosh create-release --force --tarball=tmp/uaa-dev-release.tgz
     bosh upload-release tmp/uaa-dev-release.tgz
 popd
diff --git a/scripts/run-locally.sh b/scripts/run-locally.sh
@@ -4,7 +4,7 @@ set -xeu
 
 pushd ~/workspace/uaa-release
     mkdir -p tmp
-    bosh create-release --force --tarball=tmp/uaa-dev-release.tgz
+    UAA_VERSION=0.0.0 bosh create-release --force --tarball=tmp/uaa-dev-release.tgz
 popd
 
 DOCKER_HOST_VM_NAME=uaareleaseacceptancetests

diff --git a/src/acceptance_tests/go.mod b/src/acceptance_tests/go.mod
@@ -6,14 +6,14 @@ require (
 	code.cloudfoundry.org/clock v0.0.0-20180518195852-02e53af36e6c // indirect
 	github.com/bmatcuk/doublestar v1.1.5 // indirect
 	github.com/charlievieth/fs v0.0.0-20170613215519-7dc373669fa1 // indirect
-	github.com/cloudfoundry/bosh-cli v6.1.1+incompatible
+	github.com/cloudfoundry/bosh-cli v6.2.1+incompatible
 	github.com/cloudfoundry/bosh-utils v0.0.0-20190921100139-64e3370c6fb0
 	github.com/cloudfoundry/go-socks5 v0.0.0-20180221174514-54f73bdb8a8e // indirect
 	github.com/cloudfoundry/socks5-proxy v0.2.0 // indirect
 	github.com/cppforlife/go-semi-semantic v0.0.0-20160921010311-576b6af77ae4 // indirect
 	github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d // indirect
-	github.com/onsi/ginkgo v1.11.0
-	github.com/onsi/gomega v1.8.1
+	github.com/onsi/ginkgo v1.12.0
+	github.com/onsi/gomega v1.9.0
 	github.com/pivotal-cf/paraphernalia v0.0.0-20180203224945-a64ae2051c20 // indirect
 	github.com/square/certstrap v1.2.0 // indirect
 	github.com/stretchr/testify v1.4.0 // indirect