VM - Tomcat updated to version 10.1.20 (#2662)

* VM - Tomcat updated to version 10.1.20

* OSPO added

* OSPO added

* OSPO -  added licenses and source-source to the image

vm/chef/cookbooks/tomcat/attributes/default.rb

@@ -1,4 +1,4 @@
-# Copyright 2023 Google LLC
+# Copyright 2024 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -12,8 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-default['tomcat']['version'] = '10.1.7'
-default['tomcat']['sha256'] = 'e19c290cbd7c374ae7ae7d3fc9d931eac0c6ff34f619c3c37260336e73376267'
+default['tomcat']['version'] = '10.1.20'
+default['tomcat']['sha256'] = '8427c5509f14e482940a015f3f60de20342d3d72c8dea9982a4d7112cb71a6ee'
 
 default['tomcat']['app']['install_dir'] = '/opt/tomcat'
 

vm/chef/cookbooks/tomcat/metadata.rb

@@ -1,4 +1,4 @@
-# Copyright 2018 Google LLC
+# Copyright 2024 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,5 +15,6 @@
 name 'tomcat'
 depends 'apache2'
 depends 'c2d-config'
+depends 'c2d-shared'
 depends 'openjdk11'
 supports 'debian'

vm/chef/cookbooks/tomcat/recipes/default.rb

@@ -1,4 +1,4 @@
-# Copyright 2023 Google LLC
+# Copyright 2024 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -24,6 +24,7 @@
 include_recipe 'apache2::rm-index'
 include_recipe 'apache2::security-config'
 include_recipe 'openjdk11'
+include_recipe 'tomcat::ospo'
 
 apt_update do
   action :update