diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml index e32723892f..48eede57c8 100644 --- a/.idea/inspectionProfiles/Project_Default.xml +++ b/.idea/inspectionProfiles/Project_Default.xml @@ -1,7 +1,7 @@ \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index ee819f1d8b..acd064c15c 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -4,5 +4,5 @@ - + \ No newline at end of file diff --git a/.rubocop.yml b/.rubocop.yml index 9fe2b8978e..88ddc6301a 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -7,6 +7,7 @@ AllCops: - 'rakelib/**/*' Exclude: - 'build/**/*' + - Gemfile # TODO: Remove when upgrading to any version after 0.48.1 Metrics/AbcSize: Max: 22 Metrics/BlockLength: @@ -45,6 +46,8 @@ Style/EmptyLinesAroundClassBody: Enabled: false Style/EmptyLinesAroundModuleBody: Enabled: false +Style/IndentHeredoc: # TODO: Remove when dropping 2.2.x support + Enabled: false Style/MethodMissing: Enabled: false Style/MultilineOperationIndentation: diff --git a/.ruby-version b/.ruby-version index bda8fbec15..5bc1cc43d4 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -2.2.6 +2.2.7 diff --git a/Gemfile.lock b/Gemfile.lock index 229ae31083..4260ce570b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,7 @@ GEM remote: https://rubygems.org/ specs: - addressable (2.5.0) + addressable (2.5.1) public_suffix (~> 2.0, >= 2.0.2) ast (2.3.0) crack (0.4.3) @@ -12,7 +12,8 @@ GEM ast (~> 2.2) powerpack (0.1.1) public_suffix (2.0.5) - rainbow (2.2.1) + rainbow (2.2.2) + rake rake (12.0.0) redcarpet (3.4.0) rspec (3.5.0) @@ -28,24 +29,24 @@ GEM diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.5.0) rspec-support (3.5.0) - rubocop (0.47.1) + rubocop (0.48.1) parser (>= 2.3.3.1, < 3.0) powerpack (~> 0.1) rainbow (>= 1.99.1, < 3.0) ruby-progressbar (~> 1.7) unicode-display_width (~> 1.0, >= 1.0.1) - rubocop-rspec (1.12.0) + rubocop-rspec (1.15.0) rubocop (>= 0.42.0) ruby-progressbar (1.8.1) rubyzip (1.2.1) safe_yaml (1.0.4) tee (1.0.0) - unicode-display_width (1.1.3) - webmock (2.3.2) + unicode-display_width (1.2.1) + webmock (3.0.1) addressable (>= 2.3.6) crack (>= 0.3.2) hashdiff - yard (0.9.8) + yard (0.9.9) PLATFORMS ruby @@ -62,4 +63,4 @@ DEPENDENCIES yard BUNDLED WITH - 1.14.5 + 1.14.6 diff --git a/Rakefile b/Rakefile index 8d163f9c06..cfce5f0dcc 100644 --- a/Rakefile +++ b/Rakefile @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # @@ -42,4 +41,4 @@ Package::StageBuildpackTask.new(Dir['bin/**/*', 'config/**/*', 'lib/**/*', 'reso .reject { |f| File.directory? f }) Package::PackageTask.new -task default: %w(rubocop check_api_doc spec) +task default: %w[rubocop check_api_doc spec] diff --git a/bin/compile b/bin/compile index f2577ff24b..eb481cfe9e 100755 --- a/bin/compile +++ b/bin/compile @@ -1,5 +1,4 @@ #!/usr/bin/env ruby -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/bin/detect b/bin/detect index 56193192f4..9f4dd76d50 100755 --- a/bin/detect +++ b/bin/detect @@ -1,5 +1,4 @@ #!/usr/bin/env ruby -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/bin/release b/bin/release index 97e84b7c36..9b9dad0427 100755 --- a/bin/release +++ b/bin/release @@ -1,5 +1,4 @@ #!/usr/bin/env ruby -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/java-buildpack.iml b/java-buildpack.iml index a67d4ab86d..857eeecdf5 100644 --- a/java-buildpack.iml +++ b/java-buildpack.iml @@ -265,34 +265,34 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/lib/java_buildpack.rb b/lib/java_buildpack.rb index dfefdcadc0..e74cba26c4 100644 --- a/lib/java_buildpack.rb +++ b/lib/java_buildpack.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/lib/java_buildpack/buildpack.rb b/lib/java_buildpack/buildpack.rb index 6970646f7b..4373d14dd6 100644 --- a/lib/java_buildpack/buildpack.rb +++ b/lib/java_buildpack/buildpack.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/lib/java_buildpack/buildpack_version.rb b/lib/java_buildpack/buildpack_version.rb index c9d42fc6c4..cab64e96c7 100644 --- a/lib/java_buildpack/buildpack_version.rb +++ b/lib/java_buildpack/buildpack_version.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/lib/java_buildpack/component.rb b/lib/java_buildpack/component.rb index 5f60f1af67..8a409fcaff 100644 --- a/lib/java_buildpack/component.rb +++ b/lib/java_buildpack/component.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/lib/java_buildpack/component/additional_libraries.rb b/lib/java_buildpack/component/additional_libraries.rb index 7b1c96fb30..08307d0abd 100644 --- a/lib/java_buildpack/component/additional_libraries.rb +++ b/lib/java_buildpack/component/additional_libraries.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/lib/java_buildpack/component/application.rb b/lib/java_buildpack/component/application.rb index 5cd5d1f0f1..8f1867eb03 100644 --- a/lib/java_buildpack/component/application.rb +++ b/lib/java_buildpack/component/application.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/lib/java_buildpack/component/base_component.rb b/lib/java_buildpack/component/base_component.rb index 1d8e5ebb23..719f231ce5 100644 --- a/lib/java_buildpack/component/base_component.rb +++ b/lib/java_buildpack/component/base_component.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/lib/java_buildpack/component/droplet.rb b/lib/java_buildpack/component/droplet.rb index c5174d6415..b47a89e74d 100644 --- a/lib/java_buildpack/component/droplet.rb +++ b/lib/java_buildpack/component/droplet.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/lib/java_buildpack/component/environment_variables.rb b/lib/java_buildpack/component/environment_variables.rb index 38fca4b920..9a1da704a1 100644 --- a/lib/java_buildpack/component/environment_variables.rb +++ b/lib/java_buildpack/component/environment_variables.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/lib/java_buildpack/component/immutable_java_home.rb b/lib/java_buildpack/component/immutable_java_home.rb index 07b2226636..f281cee47b 100644 --- a/lib/java_buildpack/component/immutable_java_home.rb +++ b/lib/java_buildpack/component/immutable_java_home.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/lib/java_buildpack/component/java_opts.rb b/lib/java_buildpack/component/java_opts.rb index d51996677b..ab85d586fc 100644 --- a/lib/java_buildpack/component/java_opts.rb +++ b/lib/java_buildpack/component/java_opts.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/lib/java_buildpack/component/modular_component.rb b/lib/java_buildpack/component/modular_component.rb index ecef3f5b0b..c738ee916a 100644 --- a/lib/java_buildpack/component/modular_component.rb +++ b/lib/java_buildpack/component/modular_component.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/lib/java_buildpack/component/mutable_java_home.rb b/lib/java_buildpack/component/mutable_java_home.rb index c9e89b7b05..1df795e875 100644 --- a/lib/java_buildpack/component/mutable_java_home.rb +++ b/lib/java_buildpack/component/mutable_java_home.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/lib/java_buildpack/component/services.rb b/lib/java_buildpack/component/services.rb index b5728b1cf1..af77a462fb 100644 --- a/lib/java_buildpack/component/services.rb +++ b/lib/java_buildpack/component/services.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/lib/java_buildpack/component/versioned_dependency_component.rb b/lib/java_buildpack/component/versioned_dependency_component.rb index 935cd183b5..796043d991 100644 --- a/lib/java_buildpack/component/versioned_dependency_component.rb +++ b/lib/java_buildpack/component/versioned_dependency_component.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/lib/java_buildpack/container.rb b/lib/java_buildpack/container.rb index 81d9316842..9fc8136888 100644 --- a/lib/java_buildpack/container.rb +++ b/lib/java_buildpack/container.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/lib/java_buildpack/container/dist_zip.rb b/lib/java_buildpack/container/dist_zip.rb index 4822e872fa..34546db5fa 100644 --- a/lib/java_buildpack/container/dist_zip.rb +++ b/lib/java_buildpack/container/dist_zip.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/lib/java_buildpack/container/dist_zip_like.rb b/lib/java_buildpack/container/dist_zip_like.rb index 9f35b4af43..599169b425 100644 --- a/lib/java_buildpack/container/dist_zip_like.rb +++ b/lib/java_buildpack/container/dist_zip_like.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/lib/java_buildpack/container/groovy.rb b/lib/java_buildpack/container/groovy.rb index 5b11f75775..e02189dd90 100644 --- a/lib/java_buildpack/container/groovy.rb +++ b/lib/java_buildpack/container/groovy.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/lib/java_buildpack/container/java_main.rb b/lib/java_buildpack/container/java_main.rb index bf9e2f7a42..dd14d95383 100644 --- a/lib/java_buildpack/container/java_main.rb +++ b/lib/java_buildpack/container/java_main.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/lib/java_buildpack/container/play_framework.rb b/lib/java_buildpack/container/play_framework.rb index 85117b9b72..4639b9d277 100644 --- a/lib/java_buildpack/container/play_framework.rb +++ b/lib/java_buildpack/container/play_framework.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/lib/java_buildpack/container/ratpack.rb b/lib/java_buildpack/container/ratpack.rb index 6d17366b1f..4ac829ca99 100644 --- a/lib/java_buildpack/container/ratpack.rb +++ b/lib/java_buildpack/container/ratpack.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/lib/java_buildpack/container/spring_boot.rb b/lib/java_buildpack/container/spring_boot.rb index 2ce4b12f34..074b13b4e8 100644 --- a/lib/java_buildpack/container/spring_boot.rb +++ b/lib/java_buildpack/container/spring_boot.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/lib/java_buildpack/container/spring_boot_cli.rb b/lib/java_buildpack/container/spring_boot_cli.rb index a529c32216..2b745b3ba3 100644 --- a/lib/java_buildpack/container/spring_boot_cli.rb +++ b/lib/java_buildpack/container/spring_boot_cli.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/lib/java_buildpack/container/tomcat.rb b/lib/java_buildpack/container/tomcat.rb index f4a1fbb703..e81475b89a 100644 --- a/lib/java_buildpack/container/tomcat.rb +++ b/lib/java_buildpack/container/tomcat.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/lib/java_buildpack/container/tomcat/tomcat_access_logging_support.rb b/lib/java_buildpack/container/tomcat/tomcat_access_logging_support.rb index 7ac7df0403..94fe74a60c 100644 --- a/lib/java_buildpack/container/tomcat/tomcat_access_logging_support.rb +++ b/lib/java_buildpack/container/tomcat/tomcat_access_logging_support.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/lib/java_buildpack/container/tomcat/tomcat_external_configuration.rb b/lib/java_buildpack/container/tomcat/tomcat_external_configuration.rb index 8ad5492058..8f33a1f7c7 100644 --- a/lib/java_buildpack/container/tomcat/tomcat_external_configuration.rb +++ b/lib/java_buildpack/container/tomcat/tomcat_external_configuration.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/lib/java_buildpack/container/tomcat/tomcat_insight_support.rb b/lib/java_buildpack/container/tomcat/tomcat_insight_support.rb index 6c306e185b..bae6e8c787 100644 --- a/lib/java_buildpack/container/tomcat/tomcat_insight_support.rb +++ b/lib/java_buildpack/container/tomcat/tomcat_insight_support.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/lib/java_buildpack/container/tomcat/tomcat_instance.rb b/lib/java_buildpack/container/tomcat/tomcat_instance.rb index 90b2af251d..1406f53a46 100644 --- a/lib/java_buildpack/container/tomcat/tomcat_instance.rb +++ b/lib/java_buildpack/container/tomcat/tomcat_instance.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/lib/java_buildpack/container/tomcat/tomcat_lifecycle_support.rb b/lib/java_buildpack/container/tomcat/tomcat_lifecycle_support.rb index b86d12e6d6..156a64ed67 100644 --- a/lib/java_buildpack/container/tomcat/tomcat_lifecycle_support.rb +++ b/lib/java_buildpack/container/tomcat/tomcat_lifecycle_support.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/lib/java_buildpack/container/tomcat/tomcat_logging_support.rb b/lib/java_buildpack/container/tomcat/tomcat_logging_support.rb index 2490a4f1dc..393fb1d380 100644 --- a/lib/java_buildpack/container/tomcat/tomcat_logging_support.rb +++ b/lib/java_buildpack/container/tomcat/tomcat_logging_support.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/lib/java_buildpack/container/tomcat/tomcat_redis_store.rb b/lib/java_buildpack/container/tomcat/tomcat_redis_store.rb index 830bbc990d..a1eb8a74da 100644 --- a/lib/java_buildpack/container/tomcat/tomcat_redis_store.rb +++ b/lib/java_buildpack/container/tomcat/tomcat_redis_store.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/lib/java_buildpack/container/tomcat/tomcat_utils.rb b/lib/java_buildpack/container/tomcat/tomcat_utils.rb index 7f09c62081..732dd9aebc 100644 --- a/lib/java_buildpack/container/tomcat/tomcat_utils.rb +++ b/lib/java_buildpack/container/tomcat/tomcat_utils.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/lib/java_buildpack/framework.rb b/lib/java_buildpack/framework.rb index 6e85a805bb..24cc162ef1 100644 --- a/lib/java_buildpack/framework.rb +++ b/lib/java_buildpack/framework.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/lib/java_buildpack/framework/app_dynamics_agent.rb b/lib/java_buildpack/framework/app_dynamics_agent.rb index 58e76c2f88..c39b317510 100644 --- a/lib/java_buildpack/framework/app_dynamics_agent.rb +++ b/lib/java_buildpack/framework/app_dynamics_agent.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/lib/java_buildpack/framework/container_certificate_trust_store.rb b/lib/java_buildpack/framework/container_certificate_trust_store.rb index b0f172970c..97d5915af7 100644 --- a/lib/java_buildpack/framework/container_certificate_trust_store.rb +++ b/lib/java_buildpack/framework/container_certificate_trust_store.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/lib/java_buildpack/framework/container_customizer.rb b/lib/java_buildpack/framework/container_customizer.rb index fb6717f60a..1d50596a98 100644 --- a/lib/java_buildpack/framework/container_customizer.rb +++ b/lib/java_buildpack/framework/container_customizer.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/lib/java_buildpack/framework/debug.rb b/lib/java_buildpack/framework/debug.rb index 36915a6746..9d236036dc 100644 --- a/lib/java_buildpack/framework/debug.rb +++ b/lib/java_buildpack/framework/debug.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/lib/java_buildpack/framework/dyadic_ekm_security_provider.rb b/lib/java_buildpack/framework/dyadic_ekm_security_provider.rb index 99370ddff8..a768a8a1ce 100644 --- a/lib/java_buildpack/framework/dyadic_ekm_security_provider.rb +++ b/lib/java_buildpack/framework/dyadic_ekm_security_provider.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/lib/java_buildpack/framework/dynatrace_appmon_agent.rb b/lib/java_buildpack/framework/dynatrace_appmon_agent.rb index e0895460dc..a8a2034273 100644 --- a/lib/java_buildpack/framework/dynatrace_appmon_agent.rb +++ b/lib/java_buildpack/framework/dynatrace_appmon_agent.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/lib/java_buildpack/framework/dynatrace_one_agent.rb b/lib/java_buildpack/framework/dynatrace_one_agent.rb index 8e88f47c77..0f19f131b1 100644 --- a/lib/java_buildpack/framework/dynatrace_one_agent.rb +++ b/lib/java_buildpack/framework/dynatrace_one_agent.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/lib/java_buildpack/framework/google_stackdriver_debugger.rb b/lib/java_buildpack/framework/google_stackdriver_debugger.rb index 7a0fc1252f..0045462420 100644 --- a/lib/java_buildpack/framework/google_stackdriver_debugger.rb +++ b/lib/java_buildpack/framework/google_stackdriver_debugger.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/lib/java_buildpack/framework/introscope_agent.rb b/lib/java_buildpack/framework/introscope_agent.rb index 6b9e89ba6a..a92c479836 100644 --- a/lib/java_buildpack/framework/introscope_agent.rb +++ b/lib/java_buildpack/framework/introscope_agent.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/lib/java_buildpack/framework/java_opts.rb b/lib/java_buildpack/framework/java_opts.rb index efa15c433f..c72a911360 100644 --- a/lib/java_buildpack/framework/java_opts.rb +++ b/lib/java_buildpack/framework/java_opts.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/lib/java_buildpack/framework/jmx.rb b/lib/java_buildpack/framework/jmx.rb index b798f1a6cd..d2fa86d12d 100644 --- a/lib/java_buildpack/framework/jmx.rb +++ b/lib/java_buildpack/framework/jmx.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/lib/java_buildpack/framework/jrebel_agent.rb b/lib/java_buildpack/framework/jrebel_agent.rb index 5e599a2015..9e7a4b9049 100644 --- a/lib/java_buildpack/framework/jrebel_agent.rb +++ b/lib/java_buildpack/framework/jrebel_agent.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/lib/java_buildpack/framework/luna_security_provider.rb b/lib/java_buildpack/framework/luna_security_provider.rb index b506585eba..8864d6b31b 100644 --- a/lib/java_buildpack/framework/luna_security_provider.rb +++ b/lib/java_buildpack/framework/luna_security_provider.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/lib/java_buildpack/framework/maria_db_jdbc.rb b/lib/java_buildpack/framework/maria_db_jdbc.rb index 7bc33b7784..ad4f8f5ebb 100644 --- a/lib/java_buildpack/framework/maria_db_jdbc.rb +++ b/lib/java_buildpack/framework/maria_db_jdbc.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # @@ -45,7 +44,7 @@ def supports? private def driver? - %w(mariadb-java-client*.jar mysql-connector-java*.jar).any? do |candidate| + %w[mariadb-java-client*.jar mysql-connector-java*.jar].any? do |candidate| (@application.root + '**' + candidate).glob.any? end end diff --git a/lib/java_buildpack/framework/new_relic_agent.rb b/lib/java_buildpack/framework/new_relic_agent.rb index 1a4039ce50..477db07e0a 100644 --- a/lib/java_buildpack/framework/new_relic_agent.rb +++ b/lib/java_buildpack/framework/new_relic_agent.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/lib/java_buildpack/framework/play_framework_auto_reconfiguration.rb b/lib/java_buildpack/framework/play_framework_auto_reconfiguration.rb index 9bc04aedca..6437d54d69 100644 --- a/lib/java_buildpack/framework/play_framework_auto_reconfiguration.rb +++ b/lib/java_buildpack/framework/play_framework_auto_reconfiguration.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/lib/java_buildpack/framework/play_framework_jpa_plugin.rb b/lib/java_buildpack/framework/play_framework_jpa_plugin.rb index c0b8c10466..0da10eee5a 100644 --- a/lib/java_buildpack/framework/play_framework_jpa_plugin.rb +++ b/lib/java_buildpack/framework/play_framework_jpa_plugin.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/lib/java_buildpack/framework/postgresql_jdbc.rb b/lib/java_buildpack/framework/postgresql_jdbc.rb index a26a884a39..cb03a38aab 100644 --- a/lib/java_buildpack/framework/postgresql_jdbc.rb +++ b/lib/java_buildpack/framework/postgresql_jdbc.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/lib/java_buildpack/framework/protect_app_security_provider.rb b/lib/java_buildpack/framework/protect_app_security_provider.rb index ce0c2fd5ed..4e308bacbd 100644 --- a/lib/java_buildpack/framework/protect_app_security_provider.rb +++ b/lib/java_buildpack/framework/protect_app_security_provider.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2016 the original author or authors. # diff --git a/lib/java_buildpack/framework/spring_auto_reconfiguration.rb b/lib/java_buildpack/framework/spring_auto_reconfiguration.rb index 3bcccfb9ba..164ab2bb7b 100644 --- a/lib/java_buildpack/framework/spring_auto_reconfiguration.rb +++ b/lib/java_buildpack/framework/spring_auto_reconfiguration.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/lib/java_buildpack/framework/spring_auto_reconfiguration/web_xml_modifier.rb b/lib/java_buildpack/framework/spring_auto_reconfiguration/web_xml_modifier.rb index e12c1ac35d..7fd9928a2c 100644 --- a/lib/java_buildpack/framework/spring_auto_reconfiguration/web_xml_modifier.rb +++ b/lib/java_buildpack/framework/spring_auto_reconfiguration/web_xml_modifier.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # @@ -66,11 +65,11 @@ def to_s private - CONTEXT_INITIALIZER_ADDITIONAL = %w( + CONTEXT_INITIALIZER_ADDITIONAL = %w[ org.cloudfoundry.reconfiguration.spring.CloudProfileApplicationContextInitializer org.cloudfoundry.reconfiguration.spring.CloudPropertySourceApplicationContextInitializer org.cloudfoundry.reconfiguration.spring.CloudAutoReconfigurationApplicationContextInitializer - ).freeze + ].freeze CONTEXT_INITIALIZER_CLASSES = 'contextInitializerClasses'.freeze diff --git a/lib/java_buildpack/framework/spring_insight.rb b/lib/java_buildpack/framework/spring_insight.rb index 471b5da6be..4dbc081399 100644 --- a/lib/java_buildpack/framework/spring_insight.rb +++ b/lib/java_buildpack/framework/spring_insight.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/lib/java_buildpack/framework/your_kit_profiler.rb b/lib/java_buildpack/framework/your_kit_profiler.rb index 7471c73fc7..9f4f04659c 100644 --- a/lib/java_buildpack/framework/your_kit_profiler.rb +++ b/lib/java_buildpack/framework/your_kit_profiler.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/lib/java_buildpack/jre.rb b/lib/java_buildpack/jre.rb index c7c57e93de..6134708789 100644 --- a/lib/java_buildpack/jre.rb +++ b/lib/java_buildpack/jre.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/lib/java_buildpack/jre/open_jdk_jre.rb b/lib/java_buildpack/jre/open_jdk_jre.rb index 510e4e8c48..e7a9cf202e 100644 --- a/lib/java_buildpack/jre/open_jdk_jre.rb +++ b/lib/java_buildpack/jre/open_jdk_jre.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/lib/java_buildpack/jre/open_jdk_like.rb b/lib/java_buildpack/jre/open_jdk_like.rb index a8b48a3468..9f3f525238 100644 --- a/lib/java_buildpack/jre/open_jdk_like.rb +++ b/lib/java_buildpack/jre/open_jdk_like.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/lib/java_buildpack/jre/open_jdk_like_jre.rb b/lib/java_buildpack/jre/open_jdk_like_jre.rb index b6d907eb91..b4c7461d40 100644 --- a/lib/java_buildpack/jre/open_jdk_like_jre.rb +++ b/lib/java_buildpack/jre/open_jdk_like_jre.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/lib/java_buildpack/jre/open_jdk_like_memory_calculator.rb b/lib/java_buildpack/jre/open_jdk_like_memory_calculator.rb index 642243728e..6e83feb9a9 100644 --- a/lib/java_buildpack/jre/open_jdk_like_memory_calculator.rb +++ b/lib/java_buildpack/jre/open_jdk_like_memory_calculator.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/lib/java_buildpack/jre/oracle_jre.rb b/lib/java_buildpack/jre/oracle_jre.rb index b6c9de253c..90a2d9bdde 100644 --- a/lib/java_buildpack/jre/oracle_jre.rb +++ b/lib/java_buildpack/jre/oracle_jre.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/lib/java_buildpack/jre/zulu_jre.rb b/lib/java_buildpack/jre/zulu_jre.rb index 5b8464ac45..213a3544d5 100755 --- a/lib/java_buildpack/jre/zulu_jre.rb +++ b/lib/java_buildpack/jre/zulu_jre.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2016 the original author or authors. # diff --git a/lib/java_buildpack/logging.rb b/lib/java_buildpack/logging.rb index e489f9eeeb..af137d973b 100644 --- a/lib/java_buildpack/logging.rb +++ b/lib/java_buildpack/logging.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/lib/java_buildpack/logging/delegating_logger.rb b/lib/java_buildpack/logging/delegating_logger.rb index 5d3ff00b50..e7662689a9 100644 --- a/lib/java_buildpack/logging/delegating_logger.rb +++ b/lib/java_buildpack/logging/delegating_logger.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/lib/java_buildpack/logging/logger_factory.rb b/lib/java_buildpack/logging/logger_factory.rb index f4cedc9552..38895a7d8e 100644 --- a/lib/java_buildpack/logging/logger_factory.rb +++ b/lib/java_buildpack/logging/logger_factory.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/lib/java_buildpack/repository.rb b/lib/java_buildpack/repository.rb index 2dec8e9f37..34c68780dd 100644 --- a/lib/java_buildpack/repository.rb +++ b/lib/java_buildpack/repository.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/lib/java_buildpack/repository/configured_item.rb b/lib/java_buildpack/repository/configured_item.rb index a54784604e..9a5f08cf80 100644 --- a/lib/java_buildpack/repository/configured_item.rb +++ b/lib/java_buildpack/repository/configured_item.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/lib/java_buildpack/repository/repository_index.rb b/lib/java_buildpack/repository/repository_index.rb index 5c8e56860b..192b79d0cc 100644 --- a/lib/java_buildpack/repository/repository_index.rb +++ b/lib/java_buildpack/repository/repository_index.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/lib/java_buildpack/repository/version_resolver.rb b/lib/java_buildpack/repository/version_resolver.rb index a833e3863b..b8210312d2 100644 --- a/lib/java_buildpack/repository/version_resolver.rb +++ b/lib/java_buildpack/repository/version_resolver.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/lib/java_buildpack/util.rb b/lib/java_buildpack/util.rb index e1bde1fb5d..a01998ec31 100644 --- a/lib/java_buildpack/util.rb +++ b/lib/java_buildpack/util.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/lib/java_buildpack/util/cache.rb b/lib/java_buildpack/util/cache.rb index 56f2e1c60c..5192624ab3 100644 --- a/lib/java_buildpack/util/cache.rb +++ b/lib/java_buildpack/util/cache.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/lib/java_buildpack/util/cache/application_cache.rb b/lib/java_buildpack/util/cache/application_cache.rb index 57c7d0cae1..24d55f31c3 100644 --- a/lib/java_buildpack/util/cache/application_cache.rb +++ b/lib/java_buildpack/util/cache/application_cache.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/lib/java_buildpack/util/cache/cached_file.rb b/lib/java_buildpack/util/cache/cached_file.rb index 2ee16031af..966ed23b0d 100644 --- a/lib/java_buildpack/util/cache/cached_file.rb +++ b/lib/java_buildpack/util/cache/cached_file.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/lib/java_buildpack/util/cache/download_cache.rb b/lib/java_buildpack/util/cache/download_cache.rb index 121712800a..96fee72b1f 100644 --- a/lib/java_buildpack/util/cache/download_cache.rb +++ b/lib/java_buildpack/util/cache/download_cache.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # @@ -215,7 +214,7 @@ def client_authentication(http_options) end def compressed?(response) - %w(br compress deflate gzip x-gzip).include?(response['Content-Encoding']) + %w[br compress deflate gzip x-gzip].include?(response['Content-Encoding']) end def debug_ssl(http) diff --git a/lib/java_buildpack/util/cache/inferred_network_failure.rb b/lib/java_buildpack/util/cache/inferred_network_failure.rb index 9e4616675b..2623391c92 100644 --- a/lib/java_buildpack/util/cache/inferred_network_failure.rb +++ b/lib/java_buildpack/util/cache/inferred_network_failure.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/lib/java_buildpack/util/cache/internet_availability.rb b/lib/java_buildpack/util/cache/internet_availability.rb index 46ae640104..63ca075cc7 100644 --- a/lib/java_buildpack/util/cache/internet_availability.rb +++ b/lib/java_buildpack/util/cache/internet_availability.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/lib/java_buildpack/util/class_file_utils.rb b/lib/java_buildpack/util/class_file_utils.rb index b097f7ce4c..8014de2b25 100644 --- a/lib/java_buildpack/util/class_file_utils.rb +++ b/lib/java_buildpack/util/class_file_utils.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/lib/java_buildpack/util/configuration_utils.rb b/lib/java_buildpack/util/configuration_utils.rb index 27b0c8df55..a8fb66fe97 100644 --- a/lib/java_buildpack/util/configuration_utils.rb +++ b/lib/java_buildpack/util/configuration_utils.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/lib/java_buildpack/util/constantize.rb b/lib/java_buildpack/util/constantize.rb index 2ee6beb269..3bfd12b2e4 100644 --- a/lib/java_buildpack/util/constantize.rb +++ b/lib/java_buildpack/util/constantize.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/lib/java_buildpack/util/dash_case.rb b/lib/java_buildpack/util/dash_case.rb index 54c9e92952..8ed6bcfae0 100644 --- a/lib/java_buildpack/util/dash_case.rb +++ b/lib/java_buildpack/util/dash_case.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/lib/java_buildpack/util/file_enumerable.rb b/lib/java_buildpack/util/file_enumerable.rb index 0e76c74b13..8f1381717d 100644 --- a/lib/java_buildpack/util/file_enumerable.rb +++ b/lib/java_buildpack/util/file_enumerable.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/lib/java_buildpack/util/filtering_pathname.rb b/lib/java_buildpack/util/filtering_pathname.rb index 4ca55866c9..a136c98831 100644 --- a/lib/java_buildpack/util/filtering_pathname.rb +++ b/lib/java_buildpack/util/filtering_pathname.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # @@ -148,8 +147,8 @@ def glob(flags = 0) private - MUTATORS = [:chmod, :chown, :delete, :lchmod, :lchown, :make_link, :make_symlink, :mkdir, :mkpath, :rename, - :rmdir, :rmtree, :taint, :unlink, :untaint].to_set.freeze + MUTATORS = %i[chmod chown delete lchmod lchown make_link make_symlink mkdir mkpath rename rmdir rmtree taint + unlink untaint].to_set.freeze private_constant :MUTATORS diff --git a/lib/java_buildpack/util/find_single_directory.rb b/lib/java_buildpack/util/find_single_directory.rb index d1c4050650..be39a4a0b1 100644 --- a/lib/java_buildpack/util/find_single_directory.rb +++ b/lib/java_buildpack/util/find_single_directory.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/lib/java_buildpack/util/format_duration.rb b/lib/java_buildpack/util/format_duration.rb index 650a79cf05..9f9757d6ce 100644 --- a/lib/java_buildpack/util/format_duration.rb +++ b/lib/java_buildpack/util/format_duration.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/lib/java_buildpack/util/groovy_utils.rb b/lib/java_buildpack/util/groovy_utils.rb index c7aa0e3509..8095fc4dae 100644 --- a/lib/java_buildpack/util/groovy_utils.rb +++ b/lib/java_buildpack/util/groovy_utils.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/lib/java_buildpack/util/jar_finder.rb b/lib/java_buildpack/util/jar_finder.rb index 639d16292f..47ba294471 100644 --- a/lib/java_buildpack/util/jar_finder.rb +++ b/lib/java_buildpack/util/jar_finder.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/lib/java_buildpack/util/java_main_utils.rb b/lib/java_buildpack/util/java_main_utils.rb index 2a1ff2f4d7..b83e8e885c 100644 --- a/lib/java_buildpack/util/java_main_utils.rb +++ b/lib/java_buildpack/util/java_main_utils.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/lib/java_buildpack/util/play.rb b/lib/java_buildpack/util/play.rb index 222f693f67..c0aed22ee0 100644 --- a/lib/java_buildpack/util/play.rb +++ b/lib/java_buildpack/util/play.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/lib/java_buildpack/util/play/base.rb b/lib/java_buildpack/util/play/base.rb index 6993b2098a..8891e4311a 100644 --- a/lib/java_buildpack/util/play/base.rb +++ b/lib/java_buildpack/util/play/base.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/lib/java_buildpack/util/play/factory.rb b/lib/java_buildpack/util/play/factory.rb index a529b19fa3..8dc786c7ec 100644 --- a/lib/java_buildpack/util/play/factory.rb +++ b/lib/java_buildpack/util/play/factory.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/lib/java_buildpack/util/play/post22.rb b/lib/java_buildpack/util/play/post22.rb index f79273440a..723e2e0c76 100644 --- a/lib/java_buildpack/util/play/post22.rb +++ b/lib/java_buildpack/util/play/post22.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/lib/java_buildpack/util/play/post22_dist.rb b/lib/java_buildpack/util/play/post22_dist.rb index 8e6d5374c6..0c94ff8e8c 100644 --- a/lib/java_buildpack/util/play/post22_dist.rb +++ b/lib/java_buildpack/util/play/post22_dist.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/lib/java_buildpack/util/play/post22_staged.rb b/lib/java_buildpack/util/play/post22_staged.rb index e5607241ec..26089228fe 100644 --- a/lib/java_buildpack/util/play/post22_staged.rb +++ b/lib/java_buildpack/util/play/post22_staged.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/lib/java_buildpack/util/play/pre22.rb b/lib/java_buildpack/util/play/pre22.rb index a17441257e..56f7d01a36 100644 --- a/lib/java_buildpack/util/play/pre22.rb +++ b/lib/java_buildpack/util/play/pre22.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/lib/java_buildpack/util/play/pre22_dist.rb b/lib/java_buildpack/util/play/pre22_dist.rb index 5faa782416..0e74712629 100644 --- a/lib/java_buildpack/util/play/pre22_dist.rb +++ b/lib/java_buildpack/util/play/pre22_dist.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/lib/java_buildpack/util/play/pre22_staged.rb b/lib/java_buildpack/util/play/pre22_staged.rb index d2afa49183..0668d01ea8 100644 --- a/lib/java_buildpack/util/play/pre22_staged.rb +++ b/lib/java_buildpack/util/play/pre22_staged.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/lib/java_buildpack/util/properties.rb b/lib/java_buildpack/util/properties.rb index 001723e189..972945c300 100644 --- a/lib/java_buildpack/util/properties.rb +++ b/lib/java_buildpack/util/properties.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/lib/java_buildpack/util/qualify_path.rb b/lib/java_buildpack/util/qualify_path.rb index bec68ccbc7..e54b49b802 100644 --- a/lib/java_buildpack/util/qualify_path.rb +++ b/lib/java_buildpack/util/qualify_path.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/lib/java_buildpack/util/ratpack_utils.rb b/lib/java_buildpack/util/ratpack_utils.rb index 69381b7a8d..594a33595e 100644 --- a/lib/java_buildpack/util/ratpack_utils.rb +++ b/lib/java_buildpack/util/ratpack_utils.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/lib/java_buildpack/util/sanitizer.rb b/lib/java_buildpack/util/sanitizer.rb index b12fa48bd9..932986d7cd 100644 --- a/lib/java_buildpack/util/sanitizer.rb +++ b/lib/java_buildpack/util/sanitizer.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/lib/java_buildpack/util/shell.rb b/lib/java_buildpack/util/shell.rb index 470f1f3d51..326f5c8fc3 100644 --- a/lib/java_buildpack/util/shell.rb +++ b/lib/java_buildpack/util/shell.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/lib/java_buildpack/util/snake_case.rb b/lib/java_buildpack/util/snake_case.rb index 7aa60a7b91..008a8e1df8 100644 --- a/lib/java_buildpack/util/snake_case.rb +++ b/lib/java_buildpack/util/snake_case.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/lib/java_buildpack/util/space_case.rb b/lib/java_buildpack/util/space_case.rb index bfb65e0bfd..85d204f56c 100644 --- a/lib/java_buildpack/util/space_case.rb +++ b/lib/java_buildpack/util/space_case.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/lib/java_buildpack/util/spring_boot_utils.rb b/lib/java_buildpack/util/spring_boot_utils.rb index 528ef05c12..b668a9aad2 100644 --- a/lib/java_buildpack/util/spring_boot_utils.rb +++ b/lib/java_buildpack/util/spring_boot_utils.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/lib/java_buildpack/util/start_script.rb b/lib/java_buildpack/util/start_script.rb index f58b52c0b2..b1f22da79f 100644 --- a/lib/java_buildpack/util/start_script.rb +++ b/lib/java_buildpack/util/start_script.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/lib/java_buildpack/util/to_b.rb b/lib/java_buildpack/util/to_b.rb index c9f6512efd..1b54c33a59 100644 --- a/lib/java_buildpack/util/to_b.rb +++ b/lib/java_buildpack/util/to_b.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/lib/java_buildpack/util/tokenized_version.rb b/lib/java_buildpack/util/tokenized_version.rb index 109c9f158b..bd6483f320 100644 --- a/lib/java_buildpack/util/tokenized_version.rb +++ b/lib/java_buildpack/util/tokenized_version.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/rakelib/dependency_cache_task.rb b/rakelib/dependency_cache_task.rb index 3d8dc8bd97..312cd36dd0 100644 --- a/rakelib/dependency_cache_task.rb +++ b/rakelib/dependency_cache_task.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/rakelib/package.rb b/rakelib/package.rb index c52a7dbf55..c0f4d27dc2 100644 --- a/rakelib/package.rb +++ b/rakelib/package.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # @@ -26,13 +25,13 @@ def self.version BUILDPACK_VERSION.version || 'unknown' end - ARCHITECTURES = %w(x86_64).freeze + ARCHITECTURES = %w[x86_64].freeze BUILD_DIR = 'build'.freeze BUILDPACK_VERSION = JavaBuildpack::BuildpackVersion.new(false).freeze - PLATFORMS = %w(mountainlion trusty).freeze + PLATFORMS = %w[mountainlion trusty].freeze STAGING_DIR = "#{BUILD_DIR}/staging".freeze diff --git a/rakelib/package_task.rb b/rakelib/package_task.rb index 353b7197ef..22907dc2c1 100644 --- a/rakelib/package_task.rb +++ b/rakelib/package_task.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/rakelib/stage_buildpack_task.rb b/rakelib/stage_buildpack_task.rb index ed130572e0..f01c5969f6 100644 --- a/rakelib/stage_buildpack_task.rb +++ b/rakelib/stage_buildpack_task.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/resources/open_jdk_jre/bin/killjava.sh b/resources/open_jdk_jre/bin/killjava.sh index 106730238f..c83fe389d1 100755 --- a/resources/open_jdk_jre/bin/killjava.sh +++ b/resources/open_jdk_jre/bin/killjava.sh @@ -1,5 +1,4 @@ #!/usr/bin/env bash -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/resources/oracle_jre/bin/killjava.sh b/resources/oracle_jre/bin/killjava.sh index 106730238f..c83fe389d1 100755 --- a/resources/oracle_jre/bin/killjava.sh +++ b/resources/oracle_jre/bin/killjava.sh @@ -1,5 +1,4 @@ #!/usr/bin/env bash -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/resources/zulu_jre/bin/killjava.sh b/resources/zulu_jre/bin/killjava.sh index 5a25454560..12facf5ecb 100755 --- a/resources/zulu_jre/bin/killjava.sh +++ b/resources/zulu_jre/bin/killjava.sh @@ -1,5 +1,4 @@ #!/usr/bin/env bash -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright (c) 2013-2017 the original author or authors. # diff --git a/spec/application_helper.rb b/spec/application_helper.rb index 44c53c3b2a..df7f4aca51 100644 --- a/spec/application_helper.rb +++ b/spec/application_helper.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/spec/bin/compile_spec.rb b/spec/bin/compile_spec.rb index 1be6c427a0..3e10209234 100644 --- a/spec/bin/compile_spec.rb +++ b/spec/bin/compile_spec.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/spec/bin/detect_spec.rb b/spec/bin/detect_spec.rb index b21f23afea..05ca3aaf40 100644 --- a/spec/bin/detect_spec.rb +++ b/spec/bin/detect_spec.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/spec/bin/release_spec.rb b/spec/bin/release_spec.rb index 38cea57f2c..2441956bbf 100644 --- a/spec/bin/release_spec.rb +++ b/spec/bin/release_spec.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/spec/component_helper.rb b/spec/component_helper.rb index 1bd2d4515d..0e7b76fb9f 100644 --- a/spec/component_helper.rb +++ b/spec/component_helper.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/spec/console_helper.rb b/spec/console_helper.rb index 0d674c3505..5c5c6b289c 100644 --- a/spec/console_helper.rb +++ b/spec/console_helper.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/spec/droplet_helper.rb b/spec/droplet_helper.rb index bf28bbfe5b..df38e9e923 100644 --- a/spec/droplet_helper.rb +++ b/spec/droplet_helper.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # @@ -43,19 +42,19 @@ let(:sandbox) { droplet.sandbox } let(:java_home) do - delegate = instance_double('MutableJavaHome', root: app_dir + '.test-java-home', version: %w(1 7 55 u60)) + delegate = instance_double('MutableJavaHome', root: app_dir + '.test-java-home', version: %w[1 7 55 u60]) JavaBuildpack::Component::ImmutableJavaHome.new delegate, app_dir end let(:environment_variables) do java_opts = JavaBuildpack::Component::EnvironmentVariables.new app_dir - java_opts.concat %w(test-var-2 test-var-1) + java_opts.concat %w[test-var-2 test-var-1] java_opts end let(:java_opts) do java_opts = JavaBuildpack::Component::JavaOpts.new app_dir - java_opts.concat %w(test-opt-2 test-opt-1) + java_opts.concat %w[test-opt-2 test-opt-1] java_opts end diff --git a/spec/fixtures/integration_long_detect_tag/lib/java_buildpack/container/long_detect_tags.rb b/spec/fixtures/integration_long_detect_tag/lib/java_buildpack/container/long_detect_tags.rb index a1a134493c..d4964d7e2e 100644 --- a/spec/fixtures/integration_long_detect_tag/lib/java_buildpack/container/long_detect_tags.rb +++ b/spec/fixtures/integration_long_detect_tag/lib/java_buildpack/container/long_detect_tags.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/spec/integration_helper.rb b/spec/integration_helper.rb index d54723921b..56dc793a71 100644 --- a/spec/integration_helper.rb +++ b/spec/integration_helper.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # @@ -32,7 +31,7 @@ end before do |example| - %w(bin config lib resources).each { |dir| FileUtils.cp_r dir, buildpack_dir } + %w[bin config lib resources].each { |dir| FileUtils.cp_r dir, buildpack_dir } buildpack_fixture = example.metadata[:buildpack_fixture] FileUtils.cp_r "spec/fixtures/#{buildpack_fixture.chomp}/.", buildpack_dir if buildpack_fixture diff --git a/spec/internet_availability_helper.rb b/spec/internet_availability_helper.rb index ffc9ec5f89..a033165b29 100644 --- a/spec/internet_availability_helper.rb +++ b/spec/internet_availability_helper.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/spec/java_buildpack/buildpack_spec.rb b/spec/java_buildpack/buildpack_spec.rb index 8c9e0b6e49..0c6deb0661 100644 --- a/spec/java_buildpack/buildpack_spec.rb +++ b/spec/java_buildpack/buildpack_spec.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/spec/java_buildpack/buildpack_version_spec.rb b/spec/java_buildpack/buildpack_version_spec.rb index dde6924168..d917f177a3 100644 --- a/spec/java_buildpack/buildpack_version_spec.rb +++ b/spec/java_buildpack/buildpack_version_spec.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/spec/java_buildpack/component/additional_libraries_spec.rb b/spec/java_buildpack/component/additional_libraries_spec.rb index 8c68b06751..36df0ffbda 100644 --- a/spec/java_buildpack/component/additional_libraries_spec.rb +++ b/spec/java_buildpack/component/additional_libraries_spec.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/spec/java_buildpack/component/application_spec.rb b/spec/java_buildpack/component/application_spec.rb index 0469a724a3..6978414c87 100644 --- a/spec/java_buildpack/component/application_spec.rb +++ b/spec/java_buildpack/component/application_spec.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/spec/java_buildpack/component/base_component_spec.rb b/spec/java_buildpack/component/base_component_spec.rb index 883fb91374..bebb65a858 100644 --- a/spec/java_buildpack/component/base_component_spec.rb +++ b/spec/java_buildpack/component/base_component_spec.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/spec/java_buildpack/component/droplet_spec.rb b/spec/java_buildpack/component/droplet_spec.rb index c779e4b8e8..d2e5171a6a 100644 --- a/spec/java_buildpack/component/droplet_spec.rb +++ b/spec/java_buildpack/component/droplet_spec.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/spec/java_buildpack/component/environment_variables_spec.rb b/spec/java_buildpack/component/environment_variables_spec.rb index 04f0ca2e90..7a8affd1bf 100644 --- a/spec/java_buildpack/component/environment_variables_spec.rb +++ b/spec/java_buildpack/component/environment_variables_spec.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/spec/java_buildpack/component/immutable_java_home_spec.rb b/spec/java_buildpack/component/immutable_java_home_spec.rb index 160c4cb4c5..048cc0f0bc 100644 --- a/spec/java_buildpack/component/immutable_java_home_spec.rb +++ b/spec/java_buildpack/component/immutable_java_home_spec.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # @@ -39,7 +38,7 @@ end it 'returns the delegate version' do - expect(immutable_java_home.version).to eq(%w(1 2 3 u04)) + expect(immutable_java_home.version).to eq(%w[1 2 3 u04]) end it 'returns the delegate Java 8 or later' do diff --git a/spec/java_buildpack/component/java_opts_spec.rb b/spec/java_buildpack/component/java_opts_spec.rb index 280d9f934d..674aee2f61 100644 --- a/spec/java_buildpack/component/java_opts_spec.rb +++ b/spec/java_buildpack/component/java_opts_spec.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/spec/java_buildpack/component/modular_component_spec.rb b/spec/java_buildpack/component/modular_component_spec.rb index 2aa17d7af3..bcb1a16e91 100644 --- a/spec/java_buildpack/component/modular_component_spec.rb +++ b/spec/java_buildpack/component/modular_component_spec.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/spec/java_buildpack/component/mutable_java_home_spec.rb b/spec/java_buildpack/component/mutable_java_home_spec.rb index 8c0a4d30d5..7b3d89ac40 100644 --- a/spec/java_buildpack/component/mutable_java_home_spec.rb +++ b/spec/java_buildpack/component/mutable_java_home_spec.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/spec/java_buildpack/component/services_spec.rb b/spec/java_buildpack/component/services_spec.rb index 75c377817c..7bf7926c3c 100644 --- a/spec/java_buildpack/component/services_spec.rb +++ b/spec/java_buildpack/component/services_spec.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # @@ -59,18 +58,18 @@ end it 'returns true from one_service? if there is a matching service with one required group credentials' do - expect(services.one_service?('test-tag', %w(uri other))).to be - expect(services.one_service?(/test-tag/, %w(uri other))).to be + expect(services.one_service?('test-tag', %w[uri other])).to be + expect(services.one_service?(/test-tag/, %w[uri other])).to be end it 'returns true from one_service? if there is a matching service with two required group credentials' do - expect(services.one_service?('test-tag', %w(h1 h2))).to be - expect(services.one_service?(/test-tag/, %w(h1 h2))).to be + expect(services.one_service?('test-tag', %w[h1 h2])).to be + expect(services.one_service?(/test-tag/, %w[h1 h2])).to be end it 'returns false from one_service? if there is a matching service with no required group credentials' do - expect(services.one_service?('test-tag', %w(foo bar))).not_to be - expect(services.one_service?(/test-tag/, %w(foo bar))).not_to be + expect(services.one_service?('test-tag', %w[foo bar])).not_to be + expect(services.one_service?(/test-tag/, %w[foo bar])).not_to be end it 'returns nil from find_service? if there is no service that matches' do diff --git a/spec/java_buildpack/component/versioned_dependency_component_spec.rb b/spec/java_buildpack/component/versioned_dependency_component_spec.rb index 699d386dc5..6eba9d6f04 100644 --- a/spec/java_buildpack/component/versioned_dependency_component_spec.rb +++ b/spec/java_buildpack/component/versioned_dependency_component_spec.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/spec/java_buildpack/container/dist_zip_like_spec.rb b/spec/java_buildpack/container/dist_zip_like_spec.rb index 5eb93f4b98..3d2a1657f3 100644 --- a/spec/java_buildpack/container/dist_zip_like_spec.rb +++ b/spec/java_buildpack/container/dist_zip_like_spec.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/spec/java_buildpack/container/dist_zip_spec.rb b/spec/java_buildpack/container/dist_zip_spec.rb index 3f706b8893..7feba8d203 100644 --- a/spec/java_buildpack/container/dist_zip_spec.rb +++ b/spec/java_buildpack/container/dist_zip_spec.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/spec/java_buildpack/container/groovy_spec.rb b/spec/java_buildpack/container/groovy_spec.rb index 27e4b725dc..e1f45ae2bc 100644 --- a/spec/java_buildpack/container/groovy_spec.rb +++ b/spec/java_buildpack/container/groovy_spec.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/spec/java_buildpack/container/java_main_spec.rb b/spec/java_buildpack/container/java_main_spec.rb index 1c22c8aa43..383a271a12 100644 --- a/spec/java_buildpack/container/java_main_spec.rb +++ b/spec/java_buildpack/container/java_main_spec.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/spec/java_buildpack/container/play_framework_spec.rb b/spec/java_buildpack/container/play_framework_spec.rb index fa3e18d199..b65f1f91a8 100644 --- a/spec/java_buildpack/container/play_framework_spec.rb +++ b/spec/java_buildpack/container/play_framework_spec.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/spec/java_buildpack/container/ratpack_spec.rb b/spec/java_buildpack/container/ratpack_spec.rb index 5b1b1b5d4c..67d12527c7 100644 --- a/spec/java_buildpack/container/ratpack_spec.rb +++ b/spec/java_buildpack/container/ratpack_spec.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/spec/java_buildpack/container/spring_boot_cli_spec.rb b/spec/java_buildpack/container/spring_boot_cli_spec.rb index c4a375b66d..f31eed64e4 100644 --- a/spec/java_buildpack/container/spring_boot_cli_spec.rb +++ b/spec/java_buildpack/container/spring_boot_cli_spec.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/spec/java_buildpack/container/spring_boot_spec.rb b/spec/java_buildpack/container/spring_boot_spec.rb index 125a01dff1..018253d7f0 100644 --- a/spec/java_buildpack/container/spring_boot_spec.rb +++ b/spec/java_buildpack/container/spring_boot_spec.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/spec/java_buildpack/container/tomcat/tomcat_access_logging_support_spec.rb b/spec/java_buildpack/container/tomcat/tomcat_access_logging_support_spec.rb index ee67999706..348327d2d3 100644 --- a/spec/java_buildpack/container/tomcat/tomcat_access_logging_support_spec.rb +++ b/spec/java_buildpack/container/tomcat/tomcat_access_logging_support_spec.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/spec/java_buildpack/container/tomcat/tomcat_external_configuration_spec.rb b/spec/java_buildpack/container/tomcat/tomcat_external_configuration_spec.rb index b84317c440..ac747917b1 100644 --- a/spec/java_buildpack/container/tomcat/tomcat_external_configuration_spec.rb +++ b/spec/java_buildpack/container/tomcat/tomcat_external_configuration_spec.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/spec/java_buildpack/container/tomcat/tomcat_insight_support_spec.rb b/spec/java_buildpack/container/tomcat/tomcat_insight_support_spec.rb index 5aa2f5da04..f2d00a960e 100644 --- a/spec/java_buildpack/container/tomcat/tomcat_insight_support_spec.rb +++ b/spec/java_buildpack/container/tomcat/tomcat_insight_support_spec.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/spec/java_buildpack/container/tomcat/tomcat_instance_spec.rb b/spec/java_buildpack/container/tomcat/tomcat_instance_spec.rb index e7e2869e7d..c41b36c0b1 100644 --- a/spec/java_buildpack/container/tomcat/tomcat_instance_spec.rb +++ b/spec/java_buildpack/container/tomcat/tomcat_instance_spec.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/spec/java_buildpack/container/tomcat/tomcat_lifecycle_support_spec.rb b/spec/java_buildpack/container/tomcat/tomcat_lifecycle_support_spec.rb index 8384631c24..c080303da2 100644 --- a/spec/java_buildpack/container/tomcat/tomcat_lifecycle_support_spec.rb +++ b/spec/java_buildpack/container/tomcat/tomcat_lifecycle_support_spec.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/spec/java_buildpack/container/tomcat/tomcat_logging_support_spec.rb b/spec/java_buildpack/container/tomcat/tomcat_logging_support_spec.rb index b65808f62c..9adc96b27c 100644 --- a/spec/java_buildpack/container/tomcat/tomcat_logging_support_spec.rb +++ b/spec/java_buildpack/container/tomcat/tomcat_logging_support_spec.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/spec/java_buildpack/container/tomcat/tomcat_redis_store_spec.rb b/spec/java_buildpack/container/tomcat/tomcat_redis_store_spec.rb index 5deef0db62..aaf2704c08 100644 --- a/spec/java_buildpack/container/tomcat/tomcat_redis_store_spec.rb +++ b/spec/java_buildpack/container/tomcat/tomcat_redis_store_spec.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # @@ -36,7 +35,7 @@ context do before do - allow(services).to receive(:one_service?).with(/session-replication/, %w(hostname host), 'port', 'password') + allow(services).to receive(:one_service?).with(/session-replication/, %w[hostname host], 'port', 'password') .and_return(true) allow(services).to receive(:find_service).and_return('credentials' => { 'hostname' => 'test-host', 'port' => 'test-port', @@ -71,7 +70,7 @@ context do before do - allow(services).to receive(:one_service?).with(/session-replication/, %w(hostname host), 'port', 'password') + allow(services).to receive(:one_service?).with(/session-replication/, %w[hostname host], 'port', 'password') .and_return(true) allow(services).to receive(:find_service).and_return('credentials' => { 'host' => 'test-host', 'port' => 'test-port', diff --git a/spec/java_buildpack/container/tomcat_spec.rb b/spec/java_buildpack/container/tomcat_spec.rb index 8b804b848b..ee65087d6c 100644 --- a/spec/java_buildpack/container/tomcat_spec.rb +++ b/spec/java_buildpack/container/tomcat_spec.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/spec/java_buildpack/framework/app_dynamics_agent_spec.rb b/spec/java_buildpack/framework/app_dynamics_agent_spec.rb index faac6f8dcb..1cc192e5f6 100644 --- a/spec/java_buildpack/framework/app_dynamics_agent_spec.rb +++ b/spec/java_buildpack/framework/app_dynamics_agent_spec.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/spec/java_buildpack/framework/container_certificate_trust_store_spec.rb b/spec/java_buildpack/framework/container_certificate_trust_store_spec.rb index c684ef2c5e..c1732d04a5 100644 --- a/spec/java_buildpack/framework/container_certificate_trust_store_spec.rb +++ b/spec/java_buildpack/framework/container_certificate_trust_store_spec.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/spec/java_buildpack/framework/container_customizer_spec.rb b/spec/java_buildpack/framework/container_customizer_spec.rb index 04654f06ba..37f53879a1 100644 --- a/spec/java_buildpack/framework/container_customizer_spec.rb +++ b/spec/java_buildpack/framework/container_customizer_spec.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/spec/java_buildpack/framework/debug_spec.rb b/spec/java_buildpack/framework/debug_spec.rb index f3f6653e5b..fd361165fe 100644 --- a/spec/java_buildpack/framework/debug_spec.rb +++ b/spec/java_buildpack/framework/debug_spec.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/spec/java_buildpack/framework/dyadic_ekm_security_provider_spec.rb b/spec/java_buildpack/framework/dyadic_ekm_security_provider_spec.rb index 10f305a021..fc2d8a165c 100644 --- a/spec/java_buildpack/framework/dyadic_ekm_security_provider_spec.rb +++ b/spec/java_buildpack/framework/dyadic_ekm_security_provider_spec.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/spec/java_buildpack/framework/dynatrace_appmon_agent_spec.rb b/spec/java_buildpack/framework/dynatrace_appmon_agent_spec.rb index 9409c163a6..f3475fa342 100644 --- a/spec/java_buildpack/framework/dynatrace_appmon_agent_spec.rb +++ b/spec/java_buildpack/framework/dynatrace_appmon_agent_spec.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/spec/java_buildpack/framework/dynatrace_one_agent_spec.rb b/spec/java_buildpack/framework/dynatrace_one_agent_spec.rb index c906487f9a..187e14a1c7 100644 --- a/spec/java_buildpack/framework/dynatrace_one_agent_spec.rb +++ b/spec/java_buildpack/framework/dynatrace_one_agent_spec.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # @@ -29,8 +28,8 @@ context do before do - allow(services).to receive(:one_service?).with(/ruxit|dynatrace/, %w(environmentid tenant), - %w(apitoken tenanttoken)).and_return(true) + allow(services).to receive(:one_service?).with(/ruxit|dynatrace/, %w[environmentid tenant], + %w[apitoken tenanttoken]).and_return(true) allow(services).to receive(:find_service).and_return('credentials' => { 'apitoken' => 'test-apitoken', 'tenant' => 'test-tenant', 'server' => 'test-server' }) diff --git a/spec/java_buildpack/framework/google_stackdriver_debugger_spec.rb b/spec/java_buildpack/framework/google_stackdriver_debugger_spec.rb index 94c4810824..d7b719b58d 100644 --- a/spec/java_buildpack/framework/google_stackdriver_debugger_spec.rb +++ b/spec/java_buildpack/framework/google_stackdriver_debugger_spec.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/spec/java_buildpack/framework/introscope_agent_spec.rb b/spec/java_buildpack/framework/introscope_agent_spec.rb index 3347a55583..958355f63e 100644 --- a/spec/java_buildpack/framework/introscope_agent_spec.rb +++ b/spec/java_buildpack/framework/introscope_agent_spec.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # @@ -27,7 +26,7 @@ let(:vcap_application) do { 'application_name' => 'test-application-name', - 'application_uris' => %w(test-application-uri-0 test-application-uri-1) } + 'application_uris' => %w[test-application-uri-0 test-application-uri-1] } end it 'does not detect without introscope-n/a service' do diff --git a/spec/java_buildpack/framework/java_opts_spec.rb b/spec/java_buildpack/framework/java_opts_spec.rb index 42f179ff6e..2a018052b5 100644 --- a/spec/java_buildpack/framework/java_opts_spec.rb +++ b/spec/java_buildpack/framework/java_opts_spec.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/spec/java_buildpack/framework/jmx_spec.rb b/spec/java_buildpack/framework/jmx_spec.rb index 6b7e270733..aec788dd68 100644 --- a/spec/java_buildpack/framework/jmx_spec.rb +++ b/spec/java_buildpack/framework/jmx_spec.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/spec/java_buildpack/framework/jrebel_agent_spec.rb b/spec/java_buildpack/framework/jrebel_agent_spec.rb index 9d043d755c..db4fc51c97 100644 --- a/spec/java_buildpack/framework/jrebel_agent_spec.rb +++ b/spec/java_buildpack/framework/jrebel_agent_spec.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/spec/java_buildpack/framework/luna_security_provider_spec.rb b/spec/java_buildpack/framework/luna_security_provider_spec.rb index 4d59eed273..9149308a2e 100644 --- a/spec/java_buildpack/framework/luna_security_provider_spec.rb +++ b/spec/java_buildpack/framework/luna_security_provider_spec.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # @@ -48,10 +47,10 @@ 'groups' => [ { 'label' => 'test-group-1', - 'members' => %w(test-group-1-member-1 test-group-1-member-2) + 'members' => %w[test-group-1-member-1 test-group-1-member-2] }, { 'label' => 'test-group-2', - 'members' => %w(test-group-2-member-1 test-group-2-member-2) + 'members' => %w[test-group-2-member-1 test-group-2-member-2] } ] } diff --git a/spec/java_buildpack/framework/maria_db_jdbc_spec.rb b/spec/java_buildpack/framework/maria_db_jdbc_spec.rb index 9d43cc7f72..c92cdbe371 100644 --- a/spec/java_buildpack/framework/maria_db_jdbc_spec.rb +++ b/spec/java_buildpack/framework/maria_db_jdbc_spec.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/spec/java_buildpack/framework/new_relic_agent_spec.rb b/spec/java_buildpack/framework/new_relic_agent_spec.rb index 5a00aa7b37..2f9c719f93 100644 --- a/spec/java_buildpack/framework/new_relic_agent_spec.rb +++ b/spec/java_buildpack/framework/new_relic_agent_spec.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # @@ -29,7 +28,7 @@ context do before do - allow(services).to receive(:one_service?).with(/newrelic/, %w(licenseKey license_key)).and_return(true) + allow(services).to receive(:one_service?).with(/newrelic/, %w[licenseKey license_key]).and_return(true) end it 'detects with newrelic-n/a service' do diff --git a/spec/java_buildpack/framework/play_framework_auto_reconfiguration_spec.rb b/spec/java_buildpack/framework/play_framework_auto_reconfiguration_spec.rb index 2ee6b1b7fa..df665e6959 100644 --- a/spec/java_buildpack/framework/play_framework_auto_reconfiguration_spec.rb +++ b/spec/java_buildpack/framework/play_framework_auto_reconfiguration_spec.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/spec/java_buildpack/framework/play_framework_jpa_plugin_spec.rb b/spec/java_buildpack/framework/play_framework_jpa_plugin_spec.rb index 8e85780d85..45e16d41e2 100644 --- a/spec/java_buildpack/framework/play_framework_jpa_plugin_spec.rb +++ b/spec/java_buildpack/framework/play_framework_jpa_plugin_spec.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/spec/java_buildpack/framework/postgresql_jdbc_spec.rb b/spec/java_buildpack/framework/postgresql_jdbc_spec.rb index f3c91b2b56..706bd6105a 100644 --- a/spec/java_buildpack/framework/postgresql_jdbc_spec.rb +++ b/spec/java_buildpack/framework/postgresql_jdbc_spec.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/spec/java_buildpack/framework/protect_app_security_provider_spec.rb b/spec/java_buildpack/framework/protect_app_security_provider_spec.rb index aa0bb2a7b6..1f534d49f6 100644 --- a/spec/java_buildpack/framework/protect_app_security_provider_spec.rb +++ b/spec/java_buildpack/framework/protect_app_security_provider_spec.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2016 the original author or authors. # diff --git a/spec/java_buildpack/framework/spring_auto_reconfiguration/web_xml_modifier_spec.rb b/spec/java_buildpack/framework/spring_auto_reconfiguration/web_xml_modifier_spec.rb index 1644ebfb4d..215aec9fd1 100644 --- a/spec/java_buildpack/framework/spring_auto_reconfiguration/web_xml_modifier_spec.rb +++ b/spec/java_buildpack/framework/spring_auto_reconfiguration/web_xml_modifier_spec.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/spec/java_buildpack/framework/spring_auto_reconfiguration_spec.rb b/spec/java_buildpack/framework/spring_auto_reconfiguration_spec.rb index 2a5df82fc3..1ea894f112 100644 --- a/spec/java_buildpack/framework/spring_auto_reconfiguration_spec.rb +++ b/spec/java_buildpack/framework/spring_auto_reconfiguration_spec.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/spec/java_buildpack/framework/spring_insight_spec.rb b/spec/java_buildpack/framework/spring_insight_spec.rb index 513ab09e33..678867652f 100644 --- a/spec/java_buildpack/framework/spring_insight_spec.rb +++ b/spec/java_buildpack/framework/spring_insight_spec.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/spec/java_buildpack/framework/your_kit_profiler_spec.rb b/spec/java_buildpack/framework/your_kit_profiler_spec.rb index 1724bc8616..55c63d5382 100644 --- a/spec/java_buildpack/framework/your_kit_profiler_spec.rb +++ b/spec/java_buildpack/framework/your_kit_profiler_spec.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/spec/java_buildpack/jre/open_jdk_like_jre_spec.rb b/spec/java_buildpack/jre/open_jdk_like_jre_spec.rb index 6c4252174b..de35084acf 100644 --- a/spec/java_buildpack/jre/open_jdk_like_jre_spec.rb +++ b/spec/java_buildpack/jre/open_jdk_like_jre_spec.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/spec/java_buildpack/jre/open_jdk_like_memory_calculator_spec.rb b/spec/java_buildpack/jre/open_jdk_like_memory_calculator_spec.rb index a0a8a77b11..934e3c58cb 100644 --- a/spec/java_buildpack/jre/open_jdk_like_memory_calculator_spec.rb +++ b/spec/java_buildpack/jre/open_jdk_like_memory_calculator_spec.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/spec/java_buildpack/jre/open_jdk_like_spec.rb b/spec/java_buildpack/jre/open_jdk_like_spec.rb index 66f5297218..1b054d39f1 100644 --- a/spec/java_buildpack/jre/open_jdk_like_spec.rb +++ b/spec/java_buildpack/jre/open_jdk_like_spec.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/spec/java_buildpack/logging/delegating_logger_spec.rb b/spec/java_buildpack/logging/delegating_logger_spec.rb index 0ad4d47799..73488f228c 100644 --- a/spec/java_buildpack/logging/delegating_logger_spec.rb +++ b/spec/java_buildpack/logging/delegating_logger_spec.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/spec/java_buildpack/logging/logger_factory_spec.rb b/spec/java_buildpack/logging/logger_factory_spec.rb index 825b7b75e1..6bede3ee72 100644 --- a/spec/java_buildpack/logging/logger_factory_spec.rb +++ b/spec/java_buildpack/logging/logger_factory_spec.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/spec/java_buildpack/repository/configured_item_spec.rb b/spec/java_buildpack/repository/configured_item_spec.rb index 89399c20d5..3e15952798 100644 --- a/spec/java_buildpack/repository/configured_item_spec.rb +++ b/spec/java_buildpack/repository/configured_item_spec.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/spec/java_buildpack/repository/repository_index_spec.rb b/spec/java_buildpack/repository/repository_index_spec.rb index ba7da86386..799b599b79 100644 --- a/spec/java_buildpack/repository/repository_index_spec.rb +++ b/spec/java_buildpack/repository/repository_index_spec.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # @@ -37,23 +36,23 @@ it 'loads index' do allow(application_cache).to receive(:get).with(%r{/test-uri/index\.yml}) .and_yield(Pathname.new('spec/fixtures/test-index.yml').open) - allow(JavaBuildpack::Repository::VersionResolver).to receive(:resolve).with('test-version', %w(resolved-version)) + allow(JavaBuildpack::Repository::VersionResolver).to receive(:resolve).with('test-version', %w[resolved-version]) .and_return('resolved-version') repository_index = described_class.new('{platform}/{architecture}/test-uri') - expect(repository_index.find_item('test-version')).to eq(%w(resolved-version resolved-uri)) + expect(repository_index.find_item('test-version')).to eq(%w[resolved-version resolved-uri]) end it 'copes with trailing slash in repository URI' do allow(application_cache).to receive(:get).with(%r{/test-uri/index\.yml}) .and_yield(Pathname.new('spec/fixtures/test-index.yml').open) - allow(JavaBuildpack::Repository::VersionResolver).to receive(:resolve).with('test-version', %w(resolved-version)) + allow(JavaBuildpack::Repository::VersionResolver).to receive(:resolve).with('test-version', %w[resolved-version]) .and_return('resolved-version') repository_index = described_class.new('{platform}/{architecture}/test-uri/') - expect(repository_index.find_item('test-version')).to eq(%w(resolved-version resolved-uri)) + expect(repository_index.find_item('test-version')).to eq(%w[resolved-version resolved-uri]) end it 'substitutes the default repository root' do diff --git a/spec/java_buildpack/repository/version_resolver_spec.rb b/spec/java_buildpack/repository/version_resolver_spec.rb index fc331f8ca7..afd62bf17a 100644 --- a/spec/java_buildpack/repository/version_resolver_spec.rb +++ b/spec/java_buildpack/repository/version_resolver_spec.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # @@ -23,7 +22,7 @@ include_context 'logging_helper' let(:versions) do - %w(1.6.0_26 1.6.0_27 1.6.0_112 1.6.0_102 1.6.0_45RELEASE 1.6.1_14 1.7.0_19 1.7.0_21 1.8.0_M-7 1.8.0_05 2.0.0 2.0.0a) + %w[1.6.0_26 1.6.0_27 1.6.0_112 1.6.0_102 1.6.0_45RELEASE 1.6.1_14 1.7.0_19 1.7.0_21 1.8.0_M-7 1.8.0_05 2.0.0 2.0.0a] end it 'resolves the default version if no candidate is supplied' do diff --git a/spec/java_buildpack/util/cache/application_cache_spec.rb b/spec/java_buildpack/util/cache/application_cache_spec.rb index 74cc0b0918..b8815a4432 100644 --- a/spec/java_buildpack/util/cache/application_cache_spec.rb +++ b/spec/java_buildpack/util/cache/application_cache_spec.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/spec/java_buildpack/util/cache/cached_file_spec.rb b/spec/java_buildpack/util/cache/cached_file_spec.rb index 18b7315928..e2dfd25f5e 100644 --- a/spec/java_buildpack/util/cache/cached_file_spec.rb +++ b/spec/java_buildpack/util/cache/cached_file_spec.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # @@ -27,7 +26,7 @@ let(:file_cache) { described_class.new(app_dir, 'http://foo-uri/', true) } it 'does not create any files on initialization' do - %w(cached etag last_modified).each { |extension| expect(cache_file(extension)).not_to exist } + %w[cached etag last_modified].each { |extension| expect(cache_file(extension)).not_to exist } end it 'creates cache_root if mutable' do @@ -77,13 +76,13 @@ it 'destroys all files' do file_cache.destroy - %w(cached etag last_modified).each { |extension| expect(cache_file(extension)).not_to exist } + %w[cached etag last_modified].each { |extension| expect(cache_file(extension)).not_to exist } end it 'does not destroy all files if immutable' do described_class.new(app_dir, 'http://foo-uri/', false).destroy - %w(cached etag last_modified).each { |extension| expect(cache_file(extension)).to exist } + %w[cached etag last_modified].each { |extension| expect(cache_file(extension)).to exist } end it 'calls the block with the content of the etag file' do diff --git a/spec/java_buildpack/util/cache/download_cache_spec.rb b/spec/java_buildpack/util/cache/download_cache_spec.rb index 0d3b9e0479..b418898974 100644 --- a/spec/java_buildpack/util/cache/download_cache_spec.rb +++ b/spec/java_buildpack/util/cache/download_cache_spec.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/spec/java_buildpack/util/cache/internet_availability_spec.rb b/spec/java_buildpack/util/cache/internet_availability_spec.rb index 610ee3ce63..a1d39af14b 100644 --- a/spec/java_buildpack/util/cache/internet_availability_spec.rb +++ b/spec/java_buildpack/util/cache/internet_availability_spec.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/spec/java_buildpack/util/cache/yield_file_with_content.rb b/spec/java_buildpack/util/cache/yield_file_with_content.rb index 530e79927d..49d29b9911 100644 --- a/spec/java_buildpack/util/cache/yield_file_with_content.rb +++ b/spec/java_buildpack/util/cache/yield_file_with_content.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/spec/java_buildpack/util/configuration_utils_spec.rb b/spec/java_buildpack/util/configuration_utils_spec.rb index 363664ca11..d81790049a 100644 --- a/spec/java_buildpack/util/configuration_utils_spec.rb +++ b/spec/java_buildpack/util/configuration_utils_spec.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/spec/java_buildpack/util/constantize_spec.rb b/spec/java_buildpack/util/constantize_spec.rb index f8ae33d2cf..9d11559e02 100644 --- a/spec/java_buildpack/util/constantize_spec.rb +++ b/spec/java_buildpack/util/constantize_spec.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/spec/java_buildpack/util/filtering_pathname_spec.rb b/spec/java_buildpack/util/filtering_pathname_spec.rb index a7fb7b66b6..10c8d622e8 100644 --- a/spec/java_buildpack/util/filtering_pathname_spec.rb +++ b/spec/java_buildpack/util/filtering_pathname_spec.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/spec/java_buildpack/util/format_duration_spec.rb b/spec/java_buildpack/util/format_duration_spec.rb index efde5470f8..a1a526ab5c 100644 --- a/spec/java_buildpack/util/format_duration_spec.rb +++ b/spec/java_buildpack/util/format_duration_spec.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/spec/java_buildpack/util/java_main_utils_spec.rb b/spec/java_buildpack/util/java_main_utils_spec.rb index 26af2eb7d6..08c8891c1e 100644 --- a/spec/java_buildpack/util/java_main_utils_spec.rb +++ b/spec/java_buildpack/util/java_main_utils_spec.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/spec/java_buildpack/util/play/base_spec.rb b/spec/java_buildpack/util/play/base_spec.rb index 29a173a51f..04ce456749 100644 --- a/spec/java_buildpack/util/play/base_spec.rb +++ b/spec/java_buildpack/util/play/base_spec.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/spec/java_buildpack/util/play/factory_spec.rb b/spec/java_buildpack/util/play/factory_spec.rb index 7ab1d2787e..db9c537fd0 100644 --- a/spec/java_buildpack/util/play/factory_spec.rb +++ b/spec/java_buildpack/util/play/factory_spec.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/spec/java_buildpack/util/play/post22_dist_spec.rb b/spec/java_buildpack/util/play/post22_dist_spec.rb index 33772ca3ce..153ff08849 100644 --- a/spec/java_buildpack/util/play/post22_dist_spec.rb +++ b/spec/java_buildpack/util/play/post22_dist_spec.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/spec/java_buildpack/util/play/post22_spec.rb b/spec/java_buildpack/util/play/post22_spec.rb index eb12924ba6..dd4bba51f3 100644 --- a/spec/java_buildpack/util/play/post22_spec.rb +++ b/spec/java_buildpack/util/play/post22_spec.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/spec/java_buildpack/util/play/post22_staged_spec.rb b/spec/java_buildpack/util/play/post22_staged_spec.rb index 4fe13d0778..6746b2e2ca 100644 --- a/spec/java_buildpack/util/play/post22_staged_spec.rb +++ b/spec/java_buildpack/util/play/post22_staged_spec.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/spec/java_buildpack/util/play/pre22_dist_spec.rb b/spec/java_buildpack/util/play/pre22_dist_spec.rb index 1c8a8c1936..8c59eb744e 100644 --- a/spec/java_buildpack/util/play/pre22_dist_spec.rb +++ b/spec/java_buildpack/util/play/pre22_dist_spec.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/spec/java_buildpack/util/play/pre22_spec.rb b/spec/java_buildpack/util/play/pre22_spec.rb index 4e6f41989d..12fe045d83 100644 --- a/spec/java_buildpack/util/play/pre22_spec.rb +++ b/spec/java_buildpack/util/play/pre22_spec.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/spec/java_buildpack/util/play/pre22_staged_spec.rb b/spec/java_buildpack/util/play/pre22_staged_spec.rb index 7d24e5bd7d..743a9b52da 100644 --- a/spec/java_buildpack/util/play/pre22_staged_spec.rb +++ b/spec/java_buildpack/util/play/pre22_staged_spec.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/spec/java_buildpack/util/properties_spec.rb b/spec/java_buildpack/util/properties_spec.rb index 644c7f1fca..a9fcb8e118 100644 --- a/spec/java_buildpack/util/properties_spec.rb +++ b/spec/java_buildpack/util/properties_spec.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/spec/java_buildpack/util/ratpack_utils_spec.rb b/spec/java_buildpack/util/ratpack_utils_spec.rb index 7feddf330c..1c7304d74d 100644 --- a/spec/java_buildpack/util/ratpack_utils_spec.rb +++ b/spec/java_buildpack/util/ratpack_utils_spec.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/spec/java_buildpack/util/sanitize_spec.rb b/spec/java_buildpack/util/sanitize_spec.rb index 7f00251cc8..1afec26699 100644 --- a/spec/java_buildpack/util/sanitize_spec.rb +++ b/spec/java_buildpack/util/sanitize_spec.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/spec/java_buildpack/util/shell_spec.rb b/spec/java_buildpack/util/shell_spec.rb index 71d0b8ddc0..f34b6067c4 100644 --- a/spec/java_buildpack/util/shell_spec.rb +++ b/spec/java_buildpack/util/shell_spec.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/spec/java_buildpack/util/spring_boot_utils_spec.rb b/spec/java_buildpack/util/spring_boot_utils_spec.rb index be62514baa..8911cfc33b 100644 --- a/spec/java_buildpack/util/spring_boot_utils_spec.rb +++ b/spec/java_buildpack/util/spring_boot_utils_spec.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/spec/java_buildpack/util/tokenized_version_spec.rb b/spec/java_buildpack/util/tokenized_version_spec.rb index 9b9b943c96..1e5f3fac21 100644 --- a/spec/java_buildpack/util/tokenized_version_spec.rb +++ b/spec/java_buildpack/util/tokenized_version_spec.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/spec/logging_helper.rb b/spec/logging_helper.rb index 6c8e09560a..cde1815ff1 100644 --- a/spec/logging_helper.rb +++ b/spec/logging_helper.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/spec/memory_limit_helper.rb b/spec/memory_limit_helper.rb index f42f6242fd..687537b083 100644 --- a/spec/memory_limit_helper.rb +++ b/spec/memory_limit_helper.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. # diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index bb3b4d5a99..dca5ec4181 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Cloud Foundry Java Buildpack # Copyright 2013-2017 the original author or authors. #