Showing with 114 additions and 91 deletions.
  1. +1 −0 .gitignore
  2. +7 −4 config/app_dynamics_agent.yml
  3. +1 −1 config/azure_application_insights_agent.yml
  4. +3 −3 config/client_certificate_mapper.yml
  5. +1 −1 config/container_customizer.yml
  6. +3 −3 config/container_security_provider.yml
  7. +1 −1 config/contrast_security_agent.yml
  8. +1 −1 config/datadog_javaagent.yml
  9. +1 −1 config/elastic_apm_agent.yml
  10. +3 −3 config/google_stackdriver_profiler.yml
  11. +1 −1 config/groovy.yml
  12. +1 −1 config/introscope_agent.yml
  13. +1 −1 config/jacoco_agent.yml
  14. +1 −1 config/java_cf_env.yml
  15. +11 −12 config/java_memory_assistant.yml
  16. +1 −1 config/jprofiler_profiler.yml
  17. +1 −1 config/jrebel_agent.yml
  18. +1 −1 config/luna_security_provider.yml
  19. +1 −1 config/maria_db_jdbc.yml
  20. +1 −1 config/metric_writer.yml
  21. +1 −1 config/new_relic_agent.yml
  22. +7 −7 config/open_jdk_jre.yml
  23. +1 −1 config/open_telemetry_javaagent.yml
  24. +1 −1 config/packaging.yml
  25. +1 −1 config/postgresql_jdbc.yml
  26. +1 −1 config/riverbed_appinternals_agent.yml
  27. +1 −1 config/ruby.yml
  28. +1 −1 config/sealights_agent.yml
  29. +3 −2 config/sky_walking_agent.yml
  30. +1 −2 config/splunk_otel_java_agent.yml
  31. +1 −1 config/spring_auto_reconfiguration.yml
  32. +1 −1 config/spring_boot_cli.yml
  33. +2 −2 config/takipi_agent.yml
  34. +7 −9 config/tomcat.yml
  35. +2 −0 config/version.yml
  36. +1 −1 config/your_kit_profiler.yml
  37. +1 −1 docs/framework-java-cfenv.md
  38. +21 −17 docs/framework-splunk_otel_java_agent.md
  39. +2 −2 lib/java_buildpack/framework/java_cf_env.rb
  40. +8 −0 lib/java_buildpack/util/spring_boot_utils.rb
  41. +2 −0 spec/fixtures/framework_java_not_spring_boot3/META-INF/MANIFEST.MF
  42. 0 spec/fixtures/framework_java_not_spring_boot3/WEB-INF/lib/spring-boot-3.2.3.RELEASE.jar
  43. +6 −0 spec/java_buildpack/framework/java_cfenv_spec.rb
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
.idea/tasks.xml
.idea/workspace.xml
.yardoc
.DS_Store
build/
doc
.envrc
11 changes: 7 additions & 4 deletions config/app_dynamics_agent.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,12 @@

# Configuration for the AppDynamics framework
---
version: +
version: 24.2.0_35552
repository_root: "{default.repository.root}/appdynamics"
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\" | @sh")
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\" | @sh")
default_tier_name:
default_unique_host_name: $(jq -r -n "$VCAP_APPLICATION | .application_id + \":$CF_INSTANCE_INDEX\" | @sh")
default_unique_host_name: $(jq -r -n "$VCAP_APPLICATION | .application_id + \":$CF_INSTANCE_INDEX\"
| @sh")
2 changes: 1 addition & 1 deletion config/azure_application_insights_agent.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@

# Configuration for the Azure Application Insights framework.
---
version: 3.+
version: 3.5.0
repository_root: "{default.repository.root}/azure-application-insights"
6 changes: 3 additions & 3 deletions config/client_certificate_mapper.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

# Container security provider configuration
---
version: 2.+
version: 2.0.1
version_lines:
- 2.+
repository_root: "{default.repository.root}/client-certificate-mapper"
- 2.+
repository_root: "{default.repository.root}/client-certificate-mapper"
2 changes: 1 addition & 1 deletion config/container_customizer.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@

# Configuration for the Container Customizer framework
---
version: 2.+
version: 2.6.0_RELEASE
repository_root: "{default.repository.root}/container-customizer"
6 changes: 3 additions & 3 deletions config/container_security_provider.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

# Container security provider configuration
---
version: 1.+
version: 1.20.0_RELEASE
repository_root: "{default.repository.root}/container-security-provider"
key_manager_enabled:
trust_manager_enabled:
key_manager_enabled:
trust_manager_enabled:
2 changes: 1 addition & 1 deletion config/contrast_security_agent.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@

# Configuration for the ContrastSecurity framework
---
version: 6.+
version: 6.2.1
repository_root: https://download.run.pivotal.io/contrast-security
2 changes: 1 addition & 1 deletion config/datadog_javaagent.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@

# Configuration for the Datadog APM Javaagent
---
version: +
version: 1.31.0
repository_root: https://raw.githubusercontent.com/datadog/dd-trace-java/cloudfoundry/
2 changes: 1 addition & 1 deletion config/elastic_apm_agent.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@

# Configuration for the Elastic Apm Agent framework
---
version: 1.+
version: 1.48.0
repository_root: https://raw.githubusercontent.com/elastic/apm-agent-java/master/cloudfoundry
6 changes: 3 additions & 3 deletions config/google_stackdriver_profiler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
2 changes: 1 addition & 1 deletion config/groovy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@

# Configuration for the Groovy container
---
version: 2.5.+
version: 2.5.23
repository_root: "{default.repository.root}/groovy"
2 changes: 1 addition & 1 deletion config/introscope_agent.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@

# Configuration for the CA Wily framework
---
version: +
version: 24.2.1_7
repository_root: https://packages.broadcom.com/artifactory/apm-agents
default_agent_name: $(jq -r -n "$VCAP_APPLICATION | .application_name")
2 changes: 1 addition & 1 deletion config/jacoco_agent.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@

# Configuration for the JaCoco Agent framework
---
version: 0.+
version: 0.8.11
repository_root: "{default.repository.root}/jacoco"
2 changes: 1 addition & 1 deletion config/java_cf_env.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@
# See https://github.com/pivotal-cf/java-cfenv for library information

---
version: 3.+
version: 3.1.5
repository_root: "{default.repository.root}/java-cfenv"
enabled: true
23 changes: 11 additions & 12 deletions config/java_memory_assistant.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion config/jprofiler_profiler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

# JMX configuration
---
version: 13.+
version: 13.0.7
repository_root: https://download.run.pivotal.io/jprofiler
enabled: false
nowait: true
Expand Down
2 changes: 1 addition & 1 deletion config/jrebel_agent.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@

# Configuration for the JRebel framework
---
version: +
version: 2024.1.1
repository_root: https://dl.zeroturnaround.com/jrebel
enabled: true
2 changes: 1 addition & 1 deletion config/luna_security_provider.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

# Configuration for the Luna Security Provider framework
---
version: 7.+
version: 7.4.0
repository_root: "{default.repository.root}/luna-security-provider"
ha_logging_enabled: true
logging_enabled: false
Expand Down
2 changes: 1 addition & 1 deletion config/maria_db_jdbc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@

# Configuration for the MariaDB JDBC framework
---
version: 2.+
version: 2.7.9
repository_root: "{default.repository.root}/mariadb-jdbc"
2 changes: 1 addition & 1 deletion config/metric_writer.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@

# Metric Writer configuration
---
version: 3.+
version: 3.5.0_RELEASE
repository_root: "{default.repository.root}/metric-writer"
enabled: false
2 changes: 1 addition & 1 deletion config/new_relic_agent.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

# Configuration for the New Relic framework
---
version: +
version: 8.9.1
repository_root: https://download.run.pivotal.io/new-relic
extensions:
version: 1.+
Expand Down
14 changes: 7 additions & 7 deletions config/open_jdk_jre.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,18 +16,18 @@
# Configuration for JRE repositories keyed by vendor
---
jre:
version: 1.8.0_+
version: 1.8.0_402
version_lines:
- 1.8.0_+
- 11.+
- 17.+
- 21.+
- 1.8.0_402
- 11.0.22_12
- 17.0.10_13
- 21.0.2_14
repository_root: "{default.repository.root}/openjdk/{platform}/{architecture}"
jvmkill_agent:
version: 1.+
version: 1.17.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:
Expand Down
2 changes: 1 addition & 1 deletion config/open_telemetry_javaagent.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@

# Configuration for the OpenTelemetry Javaagent
---
version: +
version: 2.1.0
repository_root: https://raw.githubusercontent.com/open-telemetry/opentelemetry-java-instrumentation/cloudfoundry/
2 changes: 1 addition & 1 deletion config/packaging.yml
Original file line number Diff line number Diff line change
Expand Up @@ -200,4 +200,4 @@ tomcat:

your_kit_profiler:
name: YourKit Profiler
release_notes: '[Release Notes](https://www.yourkit.com/download/yjp_2023_5_builds.jsp)'
release_notes: '[Release Notes](https://www.yourkit.com/download/yjp_2023_9_builds.jsp)'
2 changes: 1 addition & 1 deletion config/postgresql_jdbc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@

# Configuration for the Postgresql JDBC framework
---
version: 42.+
version: 42.7.2
repository_root: "{default.repository.root}/postgresql-jdbc"
2 changes: 1 addition & 1 deletion config/riverbed_appinternals_agent.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@

# Configuration for the riverbed appinternals agent framework
---
version: 11.+
version: 11.8.5_BL527
repository_root: https://pcf-instrumentation-download.steelcentral.net/
rvbd_moniker: $(jq -r -n "$VCAP_APPLICATION | .application_name")
2 changes: 1 addition & 1 deletion config/ruby.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@

# Configuration for Ruby
---
version: 3.1.+
version: 3.1.3
repository_root: https://raw.githubusercontent.com/cloudfoundry/ruby-buildpack/master/java-index
2 changes: 1 addition & 1 deletion config/sealights_agent.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

# Configuration for the SeaLights Agent framework
---
version: +
version: 4.0.2459
repository_root: https://agents.sealights.co/pcf
build_session_id:
lab_id:
Expand Down
5 changes: 3 additions & 2 deletions config/sky_walking_agent.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@

# Configuration for the Sky Walking framework.
---
version: +
version: 8.16.0
repository_root: "{default.repository.root}/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")
3 changes: 1 addition & 2 deletions config/splunk_otel_java_agent.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,5 @@
# Configuration for the Splunk Distribution of OpenTelemetry Java Instrumentation
# See https://github.com/signalfx/splunk-otel-java for more information
---
version: +
version: 1.30.3
repository_root: https://raw.githubusercontent.com/signalfx/splunk-otel-java/main/deployments/cloudfoundry/

2 changes: 1 addition & 1 deletion config/spring_auto_reconfiguration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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.12.0_RELEASE
repository_root: "{default.repository.root}/auto-reconfiguration"
enabled: true
2 changes: 1 addition & 1 deletion config/spring_boot_cli.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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.7.18
repository_root: "{default.repository.root}/spring-boot-cli"
4 changes: 2 additions & 2 deletions config/takipi_agent.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

# Configuration for the Takipi framework
---
version: 4.+
version: 4.73.3
repository_root: https://get.takipi.com/cloudfoundry
node_name_prefix: node
application_name:
application_name:
16 changes: 7 additions & 9 deletions config/tomcat.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,31 +16,29 @@
# Configuration for the Tomcat container
---
tomcat:
version: 9.+
version: 9.0.86
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.4.0_RELEASE
repository_root: "{default.repository.root}/tomcat-lifecycle-support"
logging_support:
version: 3.+
version: 3.4.0_RELEASE
repository_root: "{default.repository.root}/tomcat-logging-support"
access_logging_support:
version: 3.+
version: 3.4.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:
# The version of Geode Store must be less than or equal to your Tanzu Gemfire for VMs version to ensure compatibility.
# The Geode Store version is pinned to 1.12.4 to be compatible with the most commonly used versions of Tanzu Gemfire for VMs.
version: 1.14.9
repository_root: https://java-buildpack-tomcat-gemfire-store.s3-us-west-2.amazonaws.com
2 changes: 2 additions & 0 deletions config/version.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
---
version: v4.67.0
2 changes: 1 addition & 1 deletion config/your_kit_profiler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

# JMX configuration
---
version: +
version: 2023.9.109
repository_root: https://download.run.pivotal.io/your-kit/{platform}/{architecture}
enabled: false
port: 10001
Expand Down
2 changes: 1 addition & 1 deletion docs/framework-java-cfenv.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ It also sets the 'cloud' profile for Spring Boot applications, as the Spring Aut
<table>
<tr>
<td><strong>Detection Criterion</strong></td>
<td>Existence of a <tt>spring-boot-3*.jar</tt> file in the application directory or a `Spring-Boot-Version: 3.*` manifest entry</td>
<td>Existence of a `Spring-Boot-Version: 3.*` manifest entry</td>
<td>No existing `java-cfenv` library found</td>
</tr>
<tr>
Expand Down
Loading