From b9f5a7e0c734c706f531f3961448a306be62511b Mon Sep 17 00:00:00 2001 From: Emily Casey Date: Mon, 25 Jan 2021 17:27:05 -0500 Subject: [PATCH 1/3] v4.36 Release --- config/app_dynamics_agent.yml | 8 ++++--- config/azure_application_insights_agent.yml | 2 +- config/client_certificate_mapper.yml | 2 +- config/container_customizer.yml | 2 +- config/container_security_provider.yml | 6 +++--- config/contrast_security_agent.yml | 2 +- config/dynatrace_appmon_agent.yml | 4 ++-- config/elastic_apm_agent.yml | 2 +- config/google_stackdriver_debugger.yml | 6 +++--- config/google_stackdriver_profiler.yml | 6 +++--- config/groovy.yml | 2 +- config/introscope_agent.yml | 2 +- config/jacoco_agent.yml | 2 +- config/java_memory_assistant.yml | 23 ++++++++++----------- config/jprofiler_profiler.yml | 2 +- config/jrebel_agent.yml | 2 +- config/luna_security_provider.yml | 2 +- config/maria_db_jdbc.yml | 2 +- config/metric_writer.yml | 2 +- config/new_relic_agent.yml | 2 +- config/open_jdk_jre.yml | 10 ++++----- config/postgresql_jdbc.yml | 2 +- config/protect_app_security_provider.yml | 2 +- config/riverbed_appinternals_agent.yml | 2 +- config/sky_walking_agent.yml | 5 +++-- config/spring_auto_reconfiguration.yml | 2 +- config/spring_boot_cli.yml | 2 +- config/takipi_agent.yml | 4 ++-- config/tomcat.yml | 16 +++++++------- config/version.yml | 2 ++ config/your_kit_profiler.yml | 2 +- 31 files changed, 67 insertions(+), 63 deletions(-) create mode 100644 config/version.yml diff --git a/config/app_dynamics_agent.yml b/config/app_dynamics_agent.yml index 69b2b1f9f4..174adcb6c3 100644 --- a/config/app_dynamics_agent.yml +++ b/config/app_dynamics_agent.yml @@ -15,9 +15,11 @@ # Configuration for the AppDynamics framework --- -version: + +version: 21.1.0_31582 repository_root: https://packages.appdynamics.com/java -default_application_name: $(jq -r -n "$VCAP_APPLICATION | .space_name + \":\" + .application_name | @sh") -default_node_name: $(jq -r -n "\"$APPD_CF_NODE_PREFIX\" + ($VCAP_APPLICATION | .application_name) + \":$CF_INSTANCE_INDEX\"") +default_application_name: $(jq -r -n "$VCAP_APPLICATION | .space_name + \":\" + .application_name + | @sh") +default_node_name: $(jq -r -n "\"$APPD_CF_NODE_PREFIX\" + ($VCAP_APPLICATION | .application_name) + + \":$CF_INSTANCE_INDEX\"") default_tier_name: default_unique_host_name: $(jq -r -n "$VCAP_APPLICATION | .application_id + \":$CF_INSTANCE_INDEX\"") diff --git a/config/azure_application_insights_agent.yml b/config/azure_application_insights_agent.yml index 1827271bcd..2af2fc3355 100644 --- a/config/azure_application_insights_agent.yml +++ b/config/azure_application_insights_agent.yml @@ -15,5 +15,5 @@ # Configuration for the Azure Application Insights framework. --- -version: 2.+ +version: 2.6.2 repository_root: https://java-buildpack.cloudfoundry.org/azure-application-insights diff --git a/config/client_certificate_mapper.yml b/config/client_certificate_mapper.yml index a306eaba03..dfcfa40062 100644 --- a/config/client_certificate_mapper.yml +++ b/config/client_certificate_mapper.yml @@ -15,5 +15,5 @@ # Container security provider configuration --- -version: 1.+ +version: 1.11.0_RELEASE repository_root: "{default.repository.root}/client-certificate-mapper" diff --git a/config/container_customizer.yml b/config/container_customizer.yml index cfa6e00b5b..419e92c6c0 100644 --- a/config/container_customizer.yml +++ b/config/container_customizer.yml @@ -15,5 +15,5 @@ # Configuration for the Container Customizer framework --- -version: 2.+ +version: 2.6.0_RELEASE repository_root: "{default.repository.root}/container-customizer" diff --git a/config/container_security_provider.yml b/config/container_security_provider.yml index f4d88d84fe..a91a83d657 100644 --- a/config/container_security_provider.yml +++ b/config/container_security_provider.yml @@ -15,7 +15,7 @@ # Container security provider configuration --- -version: 1.+ +version: 1.18.0_RELEASE repository_root: "{default.repository.root}/container-security-provider" -key_manager_enabled: -trust_manager_enabled: +key_manager_enabled: +trust_manager_enabled: diff --git a/config/contrast_security_agent.yml b/config/contrast_security_agent.yml index 51d0495a14..6b5e29a918 100644 --- a/config/contrast_security_agent.yml +++ b/config/contrast_security_agent.yml @@ -15,5 +15,5 @@ # Configuration for the ContrastSecurity framework --- -version: 3.+ +version: 3.8.0_18457 repository_root: https://download.run.pivotal.io/contrast-security diff --git a/config/dynatrace_appmon_agent.yml b/config/dynatrace_appmon_agent.yml index 79126c66a3..b9e54329af 100644 --- a/config/dynatrace_appmon_agent.yml +++ b/config/dynatrace_appmon_agent.yml @@ -15,6 +15,6 @@ # Configuration for the Dynatrace framework --- -version: 7.1.0_+ +version: 7.1.0_1803 repository_root: https://files.dynatrace.com/downloads/appmon/cloudfoundry/buildpack/java -default_agent_name: +default_agent_name: diff --git a/config/elastic_apm_agent.yml b/config/elastic_apm_agent.yml index e9db8ffcf9..633facc8eb 100644 --- a/config/elastic_apm_agent.yml +++ b/config/elastic_apm_agent.yml @@ -15,5 +15,5 @@ # Configuration for the Elastic Apm Agent framework --- -version: 1.+ +version: 1.20.0 repository_root: https://raw.githubusercontent.com/elastic/apm-agent-java/master/cloudfoundry diff --git a/config/google_stackdriver_debugger.yml b/config/google_stackdriver_debugger.yml index 8c4a521661..5955eac683 100644 --- a/config/google_stackdriver_debugger.yml +++ b/config/google_stackdriver_debugger.yml @@ -15,7 +15,7 @@ # Configuration for the Groovy container --- -version: 2.+ +version: 2.26.0 repository_root: "{default.repository.root}/google-stackdriver-debugger/{platform}/{architecture}" -application_name: -application_version: +application_name: +application_version: diff --git a/config/google_stackdriver_profiler.yml b/config/google_stackdriver_profiler.yml index 470051e04e..ea505da809 100644 --- a/config/google_stackdriver_profiler.yml +++ b/config/google_stackdriver_profiler.yml @@ -15,7 +15,7 @@ # Configuration for the Groovy container --- -version: 0.+ +version: 0.1.0 repository_root: "{default.repository.root}/google-stackdriver-profiler/{platform}/{architecture}" -application_name: -application_version: +application_name: +application_version: diff --git a/config/groovy.yml b/config/groovy.yml index bd697ccd6e..c6a591f0c1 100644 --- a/config/groovy.yml +++ b/config/groovy.yml @@ -15,5 +15,5 @@ # Configuration for the Groovy container --- -version: 2.5.+ +version: 2.5.9 repository_root: "{default.repository.root}/groovy" diff --git a/config/introscope_agent.yml b/config/introscope_agent.yml index 781cd17aaf..dcb36c39b2 100644 --- a/config/introscope_agent.yml +++ b/config/introscope_agent.yml @@ -15,6 +15,6 @@ # Configuration for the CA Wily framework --- -version: 20.+ +version: 20.11.0_20 repository_root: https://ca.bintray.com/apm-agents default_agent_name: $(jq -r -n "$VCAP_APPLICATION | .application_name") diff --git a/config/jacoco_agent.yml b/config/jacoco_agent.yml index d26b0bec05..13518cd666 100644 --- a/config/jacoco_agent.yml +++ b/config/jacoco_agent.yml @@ -15,5 +15,5 @@ # Configuration for the JaCoco Agent framework --- -version: 0.+ +version: 0.8.6 repository_root: "{default.repository.root}/jacoco" diff --git a/config/java_memory_assistant.yml b/config/java_memory_assistant.yml index 9f4c874933..6684d7153d 100644 --- a/config/java_memory_assistant.yml +++ b/config/java_memory_assistant.yml @@ -15,27 +15,26 @@ --- enabled: false agent: - version: 0.+ + version: 0.5.0 repository_root: https://raw.githubusercontent.com/SAP/java-memory-assistant/repository - heap_dump_folder: + heap_dump_folder: check_interval: 5s max_frequency: 1/1m - log_level: + log_level: thresholds: - heap: - code_cache: - metaspace: - perm_gen: - compressed_class: - eden: - survivor: + heap: + code_cache: + metaspace: + perm_gen: + compressed_class: + eden: + survivor: old_gen: ">600MB" tenured_gen: code_heap.non_nmethods: code_heap.non_profiled_nmethods: code_heap.profiled_nmethods: - clean_up: - version: 0.+ + version: 0.1.0 repository_root: https://raw.githubusercontent.com/SAP/java-memory-assistant-tools/repository-cu max_dump_count: 1 diff --git a/config/jprofiler_profiler.yml b/config/jprofiler_profiler.yml index 953b0cca0b..03d00402df 100644 --- a/config/jprofiler_profiler.yml +++ b/config/jprofiler_profiler.yml @@ -15,7 +15,7 @@ # JMX configuration --- -version: 11.+ +version: 11.1.4 repository_root: https://download.run.pivotal.io/jprofiler enabled: false nowait: true diff --git a/config/jrebel_agent.yml b/config/jrebel_agent.yml index fd197b69eb..7308181a28 100644 --- a/config/jrebel_agent.yml +++ b/config/jrebel_agent.yml @@ -15,6 +15,6 @@ # Configuration for the JRebel framework --- -version: + +version: 2021.1.0 repository_root: https://dl.zeroturnaround.com/jrebel enabled: true diff --git a/config/luna_security_provider.yml b/config/luna_security_provider.yml index 352b8265eb..7d452c5d3c 100644 --- a/config/luna_security_provider.yml +++ b/config/luna_security_provider.yml @@ -15,7 +15,7 @@ # Configuration for the Luna Security Provider framework --- -version: 7.+ +version: 7.4.0 repository_root: https://files.cf-hsm.io/luna-installer ha_logging_enabled: true logging_enabled: false diff --git a/config/maria_db_jdbc.yml b/config/maria_db_jdbc.yml index d13bf8d749..dbcc5a59fe 100644 --- a/config/maria_db_jdbc.yml +++ b/config/maria_db_jdbc.yml @@ -15,5 +15,5 @@ # Configuration for the MariaDB JDBC framework --- -version: 2.+ +version: 2.7.1 repository_root: "{default.repository.root}/mariadb-jdbc" diff --git a/config/metric_writer.yml b/config/metric_writer.yml index 7d833ef384..f4dd143db3 100644 --- a/config/metric_writer.yml +++ b/config/metric_writer.yml @@ -15,6 +15,6 @@ # Metric Writer configuration --- -version: 3.+ +version: 3.4.0_RELEASE repository_root: "{default.repository.root}/metric-writer" enabled: false diff --git a/config/new_relic_agent.yml b/config/new_relic_agent.yml index e431d0be13..3a999aeba9 100644 --- a/config/new_relic_agent.yml +++ b/config/new_relic_agent.yml @@ -15,7 +15,7 @@ # Configuration for the New Relic framework --- -version: + +version: 6.3.0 repository_root: https://download.run.pivotal.io/new-relic extensions: version: 1.+ diff --git a/config/open_jdk_jre.yml b/config/open_jdk_jre.yml index 29947ec635..c6f31b5497 100644 --- a/config/open_jdk_jre.yml +++ b/config/open_jdk_jre.yml @@ -17,14 +17,14 @@ # If Java 7 is required, permgen will be used instead of metaspace. Please see the documentation for more detail. --- jre: - version: 1.8.0_+ + version: 1.8.0_282 repository_root: "{default.repository.root}/openjdk/{platform}/{architecture}" jvmkill_agent: - version: 1.+ + version: 1.16.0_RELEASE repository_root: "{default.repository.root}/jvmkill/{platform}/{architecture}" memory_calculator: - version: 3.+ + version: 3.13.0_RELEASE repository_root: "{default.repository.root}/memory-calculator/{platform}/{architecture}" - class_count: - headroom: + class_count: + headroom: stack_threads: 250 diff --git a/config/postgresql_jdbc.yml b/config/postgresql_jdbc.yml index 2238a6ba0c..1f3e67e15d 100644 --- a/config/postgresql_jdbc.yml +++ b/config/postgresql_jdbc.yml @@ -15,5 +15,5 @@ # Configuration for the Postgresql JDBC framework --- -version: 42.+ +version: 42.2.18 repository_root: "{default.repository.root}/postgresql-jdbc" diff --git a/config/protect_app_security_provider.yml b/config/protect_app_security_provider.yml index 2f65c2475d..2cdede3493 100644 --- a/config/protect_app_security_provider.yml +++ b/config/protect_app_security_provider.yml @@ -15,5 +15,5 @@ # Configuration for the ProtectApp Security Provider framework --- -version: 8.+ +version: 8.4.0 repository_root: https://files.cf-hsm.io/protectapp-installer diff --git a/config/riverbed_appinternals_agent.yml b/config/riverbed_appinternals_agent.yml index c628c5ba8a..2596d5db2b 100644 --- a/config/riverbed_appinternals_agent.yml +++ b/config/riverbed_appinternals_agent.yml @@ -15,6 +15,6 @@ # Configuration for the riverbed appinternals agent framework --- -version: 11.+ +version: 11.7.1_BL521 repository_root: https://pcf-instrumentation-download.steelcentral.net/ rvbd_moniker: $(jq -r -n "$VCAP_APPLICATION | .application_name") diff --git a/config/sky_walking_agent.yml b/config/sky_walking_agent.yml index 7ca9923f7d..3b2763daba 100644 --- a/config/sky_walking_agent.yml +++ b/config/sky_walking_agent.yml @@ -15,6 +15,7 @@ # Configuration for the Sky Walking framework. --- -version: 6.+ +version: 6.6.0 repository_root: https://java-buildpack.cloudfoundry.org/sky-walking -default_application_name: $(jq -r -n "$VCAP_APPLICATION | .space_name + \":\" + .application_name | @sh") +default_application_name: $(jq -r -n "$VCAP_APPLICATION | .space_name + \":\" + .application_name + | @sh") diff --git a/config/spring_auto_reconfiguration.yml b/config/spring_auto_reconfiguration.yml index 14e976bff7..c4fc456efa 100644 --- a/config/spring_auto_reconfiguration.yml +++ b/config/spring_auto_reconfiguration.yml @@ -17,6 +17,6 @@ # Note that the repository is shared with the Play Auto Reconfiguration framework and should be kept in step to # avoid conflicts. --- -version: 2.+ +version: 2.11.0_RELEASE repository_root: "{default.repository.root}/auto-reconfiguration" enabled: true diff --git a/config/spring_boot_cli.yml b/config/spring_boot_cli.yml index 54d4c8c5bd..44eca2664f 100644 --- a/config/spring_boot_cli.yml +++ b/config/spring_boot_cli.yml @@ -17,5 +17,5 @@ # Note that the repository is shared with the Play Auto Reconfiguration framework and should be kept in step to # avoid conflicts. --- -version: 2.+ +version: 2.4.2 repository_root: "{default.repository.root}/spring-boot-cli" diff --git a/config/takipi_agent.yml b/config/takipi_agent.yml index dd8407034e..ec24dea660 100644 --- a/config/takipi_agent.yml +++ b/config/takipi_agent.yml @@ -15,7 +15,7 @@ # Configuration for the Takipi framework --- -version: 4.+ +version: 4.49.1 repository_root: https://get.takipi.com/cloudfoundry node_name_prefix: node -application_name: +application_name: diff --git a/config/tomcat.yml b/config/tomcat.yml index 5c9aefc730..ceead351b6 100644 --- a/config/tomcat.yml +++ b/config/tomcat.yml @@ -16,29 +16,29 @@ # Configuration for the Tomcat container --- tomcat: - version: 9.+ + version: 9.0.41 repository_root: "{default.repository.root}/tomcat" - context_path: + context_path: external_configuration_enabled: false external_configuration: version: 1.+ - repository_root: + repository_root: lifecycle_support: - version: 3.+ + version: 3.3.0_RELEASE repository_root: "{default.repository.root}/tomcat-lifecycle-support" logging_support: - version: 3.+ + version: 3.3.0_RELEASE repository_root: "{default.repository.root}/tomcat-logging-support" access_logging_support: - version: 3.+ + version: 3.3.0_RELEASE repository_root: "{default.repository.root}/tomcat-access-logging-support" access_logging: disabled redis_store: - version: 1.+ + version: 1.3.6_RELEASE repository_root: "{default.repository.root}/redis-store" database: 0 timeout: 2000 connection_pool_size: 2 geode_store: - version: 1.13.+ + version: 1.13.0 repository_root: https://java-buildpack-tomcat-gemfire-store.s3-us-west-2.amazonaws.com diff --git a/config/version.yml b/config/version.yml new file mode 100644 index 0000000000..83d04d63d7 --- /dev/null +++ b/config/version.yml @@ -0,0 +1,2 @@ +--- +version: v4.36 diff --git a/config/your_kit_profiler.yml b/config/your_kit_profiler.yml index 261bdbda91..576b87eb91 100644 --- a/config/your_kit_profiler.yml +++ b/config/your_kit_profiler.yml @@ -15,7 +15,7 @@ # JMX configuration --- -version: + +version: 2020.9.419 repository_root: https://download.run.pivotal.io/your-kit/{platform}/{architecture} enabled: false port: 10001 From bee6da6af38b737cfb866c8b39291716bb7d31e0 Mon Sep 17 00:00:00 2001 From: suse-cf-ci-bot Date: Mon, 25 Jan 2021 22:34:30 +0000 Subject: [PATCH 2/3] Currently required SUSE changes --- lib/java_buildpack/repository/repository_index.rb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/java_buildpack/repository/repository_index.rb b/lib/java_buildpack/repository/repository_index.rb index 06b226dec5..01fe0aca84 100644 --- a/lib/java_buildpack/repository/repository_index.rb +++ b/lib/java_buildpack/repository/repository_index.rb @@ -91,6 +91,9 @@ def platform 'mountainlion' elsif !`which lsb_release 2> /dev/null`.empty? `lsb_release -cs`.strip + # Treat openSUSE and SLE stacks as supported + elsif File.exist?('/etc/os-release') && File.read('/etc/os-release') =~ /SUSE/ + 'bionic' else raise 'Unable to determine platform' end From b3612bee2a3a951dd0f10321d270357d4734898e Mon Sep 17 00:00:00 2001 From: suse-cf-ci-bot Date: Mon, 25 Jan 2021 23:03:39 +0000 Subject: [PATCH 3/3] Add SUSE config/version.yml --- config/version.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/config/version.yml b/config/version.yml index 83d04d63d7..57ecbffd89 100644 --- a/config/version.yml +++ b/config/version.yml @@ -1,2 +1,4 @@ --- -version: v4.36 +hash: 8c6fb63f +remote: git@github.com:SUSE/cf-java-buildpack.git +version: v4.36.0.1