diff --git a/generator/pom.xml b/generator/pom.xml index faef04f..264fd41 100644 --- a/generator/pom.xml +++ b/generator/pom.xml @@ -66,8 +66,8 @@ limitations under the License. org.jboss.weld.se - weld-se - 2.3.0.Final + weld-se-core + 3.1.9.Final org.slf4j diff --git a/sdk/.rubocop.yml b/sdk/.rubocop.yml index bf6bb31..c979e16 100644 --- a/sdk/.rubocop.yml +++ b/sdk/.rubocop.yml @@ -69,7 +69,7 @@ Style/DateTime: # to itself. Rubocop doesn't like these tests, but we want them anyhow, # so we exclude that spec. # -Lint/UselessComparison: +Lint/BinaryOperatorWithIdenticalOperands: Exclude: - 'spec/type_spec.rb' Style/NilComparison: @@ -95,3 +95,21 @@ AllCops: - 'lib/ovirtsdk4/version.rb' - 'pkg/**/*' - 'tmp/**/*' + +# +# This things used to work fine before upgrading Rubocop, and we don't want +# to address them now. At some point we should remove these lines, check the +# result and fix the code accordingly. +# +Style/RedundantFileExtensionInRequire: + Enabled: False +Style/OptionalBooleanParameter: + Enabled: False +Naming/VariableNumber: + Enabled: False +Style/AccessorGrouping: + Enabled: False +Style/SingleArgumentDig: + Enabled: False +Style/ZeroLengthPredicate: + Enabled: False diff --git a/sdk/examples/vm_backup.rb b/sdk/examples/vm_backup.rb index b5a004e..54bce5b 100755 --- a/sdk/examples/vm_backup.rb +++ b/sdk/examples/vm_backup.rb @@ -60,7 +60,7 @@ system_service = connection.system_service # Get the reference to the service that we will use to send events to the audit log: -events_service = system_service.events_service() +events_service = system_service.events_service # In order to send events we need to also send unique integer ids. These should usually come from an external # database, but in this example we # will just generate them from the current time in seconds since Jan 1st 1970. diff --git a/sdk/ovirt-engine-sdk.gemspec b/sdk/ovirt-engine-sdk.gemspec index 90d52ab..27f9e64 100644 --- a/sdk/ovirt-engine-sdk.gemspec +++ b/sdk/ovirt-engine-sdk.gemspec @@ -39,10 +39,11 @@ Gem::Specification.new do |spec| spec.required_ruby_version = '>= 2.5' # Build time dependencies: - spec.add_development_dependency('rake', '~> 12.3') - spec.add_development_dependency('rake-compiler', '~> 1.0') + spec.add_development_dependency('rake', '~> 13.1') + spec.add_development_dependency('rake-compiler', '~> 1.2') spec.add_development_dependency('rspec', '~> 3.7') - spec.add_development_dependency('rubocop', '0.79.0') + spec.add_development_dependency('rubocop', '1.60.2') + spec.add_development_dependency('webrick', '~> 1.8') spec.add_development_dependency('yard', '~> 0.9', '>= 0.9.12') # Run time dependencies: