Merge branch '4019-version-manifest-information' into 'master'

Specify display_version for sofware without proper version string

Closes #4019

See merge request gitlab-org/omnibus-gitlab!4622

Gemfile

@@ -2,7 +2,7 @@ source 'https://rubygems.org'
 require_relative "lib/gitlab/version"
-omnibus_gem_version = Gitlab::Version.new('omnibus', "7.0.10.01")
+omnibus_gem_version = Gitlab::Version.new('omnibus', "7.0.10.02")
 # Note that omnibus is from a fork with additional gitlab changes.  You can
 # check what they are with the following comparison link:

Gemfile.lock

 GIT
   remote: https://dev.gitlab.org/gitlab/omnibus.git
-  revision: 81221aa3b263e717f5fcb57959aa9c8425126d29
-  tag: 7.0.10.01
+  revision: c33184c00a1774f8350f0f1d8cbce35b99a82fd1
+  tag: 7.0.10.02
   specs:
     omnibus (7.0.10)
       aws-sdk-s3 (~> 1)

changelogs/unreleased/4019-version-manifest-information.yml

+---
+title: Specify display_version for sofware without proper version string
+merge_request: 4622
+author:
+type: added

config/software/cacerts.rb

@@ -23,6 +23,7 @@ skip_transitive_dependency_licensing true
 # Date of the file is in a comment at the start, or in the changelog
 default_version '2020.01.01'
+display_version version.tr('.', '')
 version '2020.01.01' do
   source md5: 'c726ae88fd600aa26df1d30f42b51fec'

config/software/curl.rb

@@ -19,6 +19,7 @@ name 'curl'
 version = Gitlab::Version.new('curl', 'curl-7_59_0')
 default_version version.print(false)
+display_version version.print(false).delete_prefix('curl-').tr('_', '.')
 # Runtime dependency
 dependency 'zlib'

config/software/krb5.rb

@@ -20,6 +20,7 @@ name 'krb5'
 version = Gitlab::Version.new('krb5', 'krb5-1.17')
 default_version version.print(false)
+display_version version.print(false).delete_prefix('krb5-')
 license 'MIT'
 license_file 'NOTICE'

config/software/libicu.rb

@@ -21,6 +21,7 @@ name 'libicu'
 version = Gitlab::Version.new('libicu', 'release-57-1')
 default_version version.print(false)
+display_version version.print(false).delete_prefix('release-').tr('-', '.')
 source git: version.remote

config/software/libre2.rb

@@ -20,6 +20,7 @@ name 'libre2'
 version = Gitlab::Version.new('libre2', '2016-02-01')
 default_version version.print(false)
+display_version version.print(false).tr('-', '')
 license 'BSD'
 license_file 'LICENSE'

config/software/omnibus-ctl.rb

@@ -15,10 +15,9 @@
 #
 name 'omnibus-ctl'
-# Commit SHA of v0.6.0 is used because the tag is not pushed to the upstream
-# repo.  Change it to v0.6.0 when that happens.
-version = Gitlab::Version.new('omnibus-ctl', '1b96ac486636cac987e5b464810bb3ff673a93fe')
+version = Gitlab::Version.new('omnibus-ctl', 'v0.6.0')
 default_version version.print(false)
+display_version version.print(false)
 license 'Apache-2.0'
 license_file 'LICENSE'

config/software/openssl.rb

@@ -26,6 +26,7 @@ dependency 'cacerts'
 version = Gitlab::Version.new('openssl', 'OpenSSL_1_1_1g')
 default_version version.print(false)
+display_version version.print(false).delete_prefix('OpenSSL_').tr('_', '.')
 source git: version.remote

config/software/registry.rb

@@ -22,6 +22,7 @@ name 'registry'
 version = Gitlab::Version.new('registry', 'v2.10.1-gitlab')
 default_version version.print(false)
+display_version version.print(false).delete_suffix('-gitlab')
 license 'Apache-2.0'
 license_file 'LICENSE'