Skip to content

Commit 4c81feb

Browse files
nebhalenebhale
committed
Application and Droplet abstractions
This major change codifies the use of the Application and Droplet abstractions. These abstractions ensure visibility constraints and standard treatment of paths across all components. The changes here are compatibility breaking and will be documented in the commit that follows.
1 parent 1344acc commit 4c81feb

146 files changed

Lines changed: 2809 additions & 2433 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.idea/dictionaries/bhale.xml‎

Lines changed: 9 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎bin/compile‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,6 @@ require 'java_buildpack/buildpack'
2323

2424
build_dir = ARGV[0]
2525

26-
JavaBuildpack::Buildpack.drive_buildpack_with_logger(build_dir, 'Compile failed with exception %s') { |buildpack| buildpack.compile }
26+
JavaBuildpack::Buildpack.with_buildpack(build_dir, 'Compile failed with exception %s') do |buildpack|
27+
buildpack.compile
28+
end

‎bin/detect‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,9 @@ require 'java_buildpack/buildpack'
2323

2424
build_dir = ARGV[0]
2525

26-
components = JavaBuildpack::Buildpack.drive_buildpack_with_logger(build_dir, 'Detect failed with exception %s') { |buildpack| buildpack.detect }.compact
26+
components = JavaBuildpack::Buildpack.with_buildpack(build_dir, 'Detect failed with exception %s') do |buildpack|
27+
buildpack.detect
28+
end.compact
2729

2830
if components.empty?
2931
abort

‎bin/release‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,8 @@ require 'java_buildpack/buildpack'
2323

2424
build_dir = ARGV[0]
2525

26-
puts JavaBuildpack::Buildpack.drive_buildpack_with_logger(build_dir, 'Release failed with exception %s') { |buildpack| buildpack.release }
26+
output = JavaBuildpack::Buildpack.with_buildpack(build_dir, 'Release failed with exception %s') do |buildpack|
27+
buildpack.release
28+
end
29+
30+
puts output

config/appdynamics.yml renamed to config/app_dynamics_agent.yml

File renamed without changes.

‎config/components.yml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,19 +17,19 @@
1717
---
1818
containers:
1919
- "JavaBuildpack::Container::Groovy"
20-
- "JavaBuildpack::Container::Main"
21-
- "JavaBuildpack::Container::Play"
22-
- "JavaBuildpack::Container::SpringBootCli"
20+
- "JavaBuildpack::Container::JavaMain"
21+
- "JavaBuildpack::Container::PlayFramework"
22+
- "JavaBuildpack::Container::SpringBootCLI"
2323
- "JavaBuildpack::Container::Tomcat"
2424
jres:
25-
- "JavaBuildpack::Jre::OpenJdk"
25+
- "JavaBuildpack::Jre::OpenJDK"
2626
frameworks:
27-
- "JavaBuildpack::Framework::AppDynamics"
27+
- "JavaBuildpack::Framework::AppDynamicsAgent"
2828
- "JavaBuildpack::Framework::JavaOpts"
29-
- "JavaBuildpack::Framework::MariaDbJdbc"
30-
- "JavaBuildpack::Framework::NewRelic"
29+
- "JavaBuildpack::Framework::MariaDbJDBC"
30+
- "JavaBuildpack::Framework::NewRelicAgent"
3131
- "JavaBuildpack::Framework::SpringInsight"
3232
- "JavaBuildpack::Framework::PlayAutoReconfiguration"
33-
- "JavaBuildpack::Framework::PlayJpaPlugin"
34-
- "JavaBuildpack::Framework::PostgresqlJdbc"
33+
- "JavaBuildpack::Framework::PlayJPAPlugin"
34+
- "JavaBuildpack::Framework::PostgresqlJDBC"
3535
- "JavaBuildpack::Framework::SpringAutoReconfiguration"

‎config/javaopts.yml‎

Lines changed: 0 additions & 17 deletions
This file was deleted.

config/mariadbjdbc.yml renamed to config/maria_db_jdbc.yml

File renamed without changes.

config/newrelic.yml renamed to config/new_relic_agent.yml

File renamed without changes.

config/openjdk.yml renamed to config/open_jdk.yml

File renamed without changes.

0 commit comments

Comments
 (0)