diff --git a/docs/extending-repositories.md b/docs/extending-repositories.md index d30ecef12c..f1c58a6ac1 100644 --- a/docs/extending-repositories.md +++ b/docs/extending-repositories.md @@ -54,8 +54,8 @@ end | Variable | Description | | -------- | ----------- | -| `{default.repository.root}` | The common root for all repositories. Currently defaults to `http://download.pivotal.io.s3.amazonaws.com`. -| `{platform}` | The platform that the application is running on. Currently detects `mountainlion`, `precise`, and `trusty`. +| `{default.repository.root}` | The common root for all repositories. Currently defaults to `https://java-buildpack.cloudfoundry.org`. +| `{platform}` | The platform that the application is running on. Currently detects `bionic`. | `{architecture}` | The architecture of the system as returned by Ruby. The value is typically one of `x86_64` or `x86`. ## Configuration @@ -95,5 +95,5 @@ In addition to declaring a specific versions to use, you can also specify a boun [`config/repository.yml`]: ../config/repository.yml [`JavaBuildpack::Repository::ConfiguredItem`]: ../lib/java_buildpack/repository/configured_item.rb [Configuration and Extension]: ../README.md#configuration-and-extension -[example]: http://download.pivotal.io.s3.amazonaws.com/openjdk/trusty/x86_64/index.yml +[example]: https://java-buildpack.cloudfoundry.org/openjdk/bionic/x86_64/index.yml diff --git a/docs/framework-google_stackdriver_debugger.md b/docs/framework-google_stackdriver_debugger.md index 63f911614c..adf4bca22a 100644 --- a/docs/framework-google_stackdriver_debugger.md +++ b/docs/framework-google_stackdriver_debugger.md @@ -39,5 +39,5 @@ The framework can be configured by modifying the [`config/google_stackdriver_deb [`config/google_stackdriver_debugger.yml`]: ../config/google_stackdriver_debugger.yml [Google Stackdriver Debugger Service]: https://cloud.google.com/debugger/ [repositories]: extending-repositories.md -[this listing]: http://download.pivotal.io.s3.amazonaws.com/google-stackdriver-debugger/trusty/x86_64/index.yml +[this listing]: https://java-buildpack.cloudfoundry.org/google-stackdriver-debugger/bionic/x86_64/index.yml [version syntax]: extending-repositories.md#version-syntax-and-ordering diff --git a/docs/framework-google_stackdriver_profiler.md b/docs/framework-google_stackdriver_profiler.md index d290f3b491..bbc174efaa 100644 --- a/docs/framework-google_stackdriver_profiler.md +++ b/docs/framework-google_stackdriver_profiler.md @@ -39,5 +39,5 @@ The framework can be configured by modifying the [`config/google_stackdriver_pro [`config/google_stackdriver_profiler.yml`]: ../config/google_stackdriver_profiler.yml [Google Stackdriver Profiler Service]: https://cloud.google.com/profiler/ [repositories]: extending-repositories.md -[this listing]: http://download.pivotal.io.s3.amazonaws.com/google-stackdriver-profiler/trusty/x86_64/index.yml +[this listing]: https://java-buildpack.cloudfoundry.org/google-stackdriver-profiler/bionic/x86_64/index.yml [version syntax]: extending-repositories.md#version-syntax-and-ordering diff --git a/docs/framework-your_kit_profiler.md b/docs/framework-your_kit_profiler.md index 5792b51915..45d98685a2 100644 --- a/docs/framework-your_kit_profiler.md +++ b/docs/framework-your_kit_profiler.md @@ -24,7 +24,7 @@ The framework can be configured by creating or modifying the [`config/your_kit_p | `enabled` | Whether to enable the YourKit Profiler | `port` | The port that the YourKit Profiler will listen on. Defaults to `10001`. | `repository_root` | The URL of the YourKit Profiler repository index ([details][repositories]). -| `version` | The version of the YourKit Profiler to use. Candidate versions can be found in the listings for [mountainlion][], [precise][], and [trusty][]. +| `version` | The version of the YourKit Profiler to use. Candidate versions can be found in the listings for [bionic][]. ## Creating SSH Tunnel After starting an application with the YourKit Profiler enabled, an SSH tunnel must be created to the container. To create that SSH container, execute the following command: @@ -40,9 +40,7 @@ Once the SSH tunnel has been created, your YourKit Profiler should connect to `l ![YourKit Configuration](framework-your_kit_profiler.png) [`config/your_kit_profiler.yml`]: ../config/your_kit_profiler.yml +[bionic]: https://download.run.pivotal.io/your-kit/bioni/x86_64/index.yml [Configuration and Extension]: ../README.md#configuration-and-extension -[mountainlion]: http://download.pivotal.io.s3.amazonaws.com/your-kit/mountainlion/x86_64/index.yml -[precise]: http://download.pivotal.io.s3.amazonaws.com/your-kit/precise/x86_64/index.yml [repositories]: extending-repositories.md -[trusty]: http://download.pivotal.io.s3.amazonaws.com/your-kit/trusty/x86_64/index.yml [version syntax]: extending-repositories.md#version-syntax-and-ordering diff --git a/docs/jre-open_jdk_jre.md b/docs/jre-open_jdk_jre.md index 0115bc8dc6..050de39b28 100644 --- a/docs/jre-open_jdk_jre.md +++ b/docs/jre-open_jdk_jre.md @@ -25,9 +25,9 @@ The JRE can be configured by modifying the [`config/open_jdk_jre.yml`][] file in | Name | Description | ---- | ----------- | `jre.repository_root` | The URL of the OpenJDK repository index ([details][repositories]). -| `jre.version` | The version of Java runtime to use. Candidate versions can be found in the listings for [mountainlion][], [trusty][] and [bionic][]. Note: version 1.8.0 and higher require the `memory_sizes` and `memory_heuristics` mappings to specify `metaspace` rather than `permgen`. +| `jre.version` | The version of Java runtime to use. Candidate versions can be found in the listings for [bionic][]. Note: version 1.8.0 and higher require the `memory_sizes` and `memory_heuristics` mappings to specify `metaspace` rather than `permgen`. | `jvmkill.repository_root` | The URL of the `jvmkill` repository index ([details][repositories]). -| `jvmkill.version` | The version of `jvmkill` to use. Candidate versions can be found in the listings for [mountainlion][jvmkill-mountainlion] and [trusty][jvmkill-trusty]. +| `jvmkill.version` | The version of `jvmkill` to use. Candidate versions can be found in the listings for [bionic][jvmkill-bionic]. | `memory_calculator` | Memory calculator defaults, described below under "Memory". ### Additional Resources @@ -152,15 +152,12 @@ JVM Memory Configuration: -XX:MaxDirectMemorySize=10M -XX:MaxMetaspaceSize=99199 ``` [`config/open_jdk_jre.yml`]: ../config/open_jdk_jre.yml +[bionic]: https://java-buildpack.cloudfoundry.org/openjdk/bionic/x86_64/index.yml [Configuration and Extension]: ../README.md#configuration-and-extension [Java Buildpack Memory Calculator]: https://github.com/cloudfoundry/java-buildpack-memory-calculator -[jvmkill-mountainlion]: http://download.pivotal.io.s3.amazonaws.com/jvmkill/mountainlion/x86_64/index.yml -[jvmkill-trusty]: http://download.pivotal.io.s3.amazonaws.com/jvmkill/trusty/x86_64/index.yml +[jvmkill-bionic]: https://java-buildpack.cloudfoundry.org/jvmkill/bionic/x86_64/index.yml [Memory Calculator's README]: https://github.com/cloudfoundry/java-buildpack-memory-calculator -[mountainlion]: http://download.pivotal.io.s3.amazonaws.com/openjdk/mountainlion/x86_64/index.yml [OpenJDK]: http://openjdk.java.net [repositories]: extending-repositories.md -[trusty]: http://download.pivotal.io.s3.amazonaws.com/openjdk/trusty/x86_64/index.yml [version syntax]: extending-repositories.md#version-syntax-and-ordering [Volume Service]: https://docs.cloudfoundry.org/devguide/services/using-vol-services.html -[bionic]: http://download.pivotal.io.s3.amazonaws.com/openjdk/bionic/x86_64/index.yml diff --git a/docs/jre-oracle_jre.md b/docs/jre-oracle_jre.md index dd1d8cc98b..012a278465 100644 --- a/docs/jre-oracle_jre.md +++ b/docs/jre-oracle_jre.md @@ -43,7 +43,7 @@ To use Oracle JRE instead of OpenJDK without forking java-buildpack, set environ | `jre.repository_root` | The URL of the Oracle repository index ([details][repositories]). | `jre.version` | The version of Java runtime to use. Candidate versions can be found in the the repository that you have created to house the JREs. Note: version 1.8.0 and higher require the `memory_sizes` and `memory_heuristics` mappings to specify `metaspace` rather than `permgen`. | `jvmkill.repository_root` | The URL of the `jvmkill` repository index ([details][repositories]). -| `jvmkill.version` | The version of `jvmkill` to use. Candidate versions can be found in the listings for [mountainlion][jvmkill-mountainlion] and [trusty][jvmkill-trusty]. +| `jvmkill.version` | The version of `jvmkill` to use. Candidate versions can be found in the listings for [bionic][jvmkill-bionic]. | `memory_calculator` | Memory calculator defaults, described below under "Memory". ### Additional Resources @@ -171,8 +171,7 @@ JVM Memory Configuration: -XX:MaxDirectMemorySize=10M -XX:MaxMetaspaceSize=99199 [`config/oracle_jre.yml`]: ../config/oracle_jre.yml [Configuration and Extension]: ../README.md#configuration-and-extension [Java Buildpack Memory Calculator]: https://github.com/cloudfoundry/java-buildpack-memory-calculator -[jvmkill-mountainlion]: http://download.pivotal.io.s3.amazonaws.com/jvmkill/mountainlion/x86_64/index.yml -[jvmkill-trusty]: http://download.pivotal.io.s3.amazonaws.com/jvmkill/trusty/x86_64/index.yml +[jvmkill-bionic]: https://java-buildpack.cloudfoundry.org/jvmkill/bionic/x86_64/index.yml [Memory Calculator's README]: https://github.com/cloudfoundry/java-buildpack-memory-calculator [OpenJDK JRE]: jre-open_jdk_jre.md [Oracle]: http://www.oracle.com/technetwork/java/index.html diff --git a/docs/jre-sap_machine_jre.md b/docs/jre-sap_machine_jre.md index fd4bbe66d0..b91c9c4827 100644 --- a/docs/jre-sap_machine_jre.md +++ b/docs/jre-sap_machine_jre.md @@ -31,9 +31,9 @@ To use SapMachine JRE instead of OpenJDK without forking java-buildpack, set env | Name | Description | ---- | ----------- | `jre.repository_root` | The URL of the SapMachine repository index ([details][repositories]). -| `jre.version` | The version of Java runtime to use. Candidate versions can be found in the listings for [mountainlion][] and [trusty][]. Note: version 1.8.0 and higher require the `memory_sizes` and `memory_heuristics` mappings to specify `metaspace` rather than `permgen`. +| `jre.version` | The version of Java runtime to use. Candidate versions can be found in the listings for [bionic][]. Note: version 1.8.0 and higher require the `memory_sizes` and `memory_heuristics` mappings to specify `metaspace` rather than `permgen`. | `jvmkill.repository_root` | The URL of the `jvmkill` repository index ([details][repositories]). -| `jvmkill.version` | The version of `jvmkill` to use. Candidate versions can be found in the listings for [mountainlion][jvmkill-mountainlion] and [trusty][jvmkill-trusty]. +| `jvmkill.version` | The version of `jvmkill` to use. Candidate versions can be found in the listings for [bionic][jvmkill-bionic]. | `memory_calculator` | Memory calculator defaults, described below under "Memory". ### Additional Resources @@ -154,14 +154,12 @@ JVM Memory Configuration: -XX:MaxDirectMemorySize=10M -XX:MaxMetaspaceSize=99199 ``` [`config/sap_machine_jre.yml`]: ../config/sap_machine_jre.yml +[bionic]: https://java-buildpack.cloudfoundry.org/openjdk/bionic/x86_64/index.yml [Configuration and Extension]: ../README.md#configuration-and-extension [Java Buildpack Memory Calculator]: https://github.com/cloudfoundry/java-buildpack-memory-calculator -[jvmkill-mountainlion]: http://download.pivotal.io.s3.amazonaws.com/jvmkill/mountainlion/x86_64/index.yml -[jvmkill-trusty]: http://download.pivotal.io.s3.amazonaws.com/jvmkill/trusty/x86_64/index.yml +[jvmkill-bionic]: https://java-buildpack.cloudfoundry.org/jvmkill/bionic/x86_64/index.yml [Memory Calculator's README]: https://github.com/cloudfoundry/java-buildpack-memory-calculator -[mountainlion]: http://download.pivotal.io.s3.amazonaws.com/openjdk/mountainlion/x86_64/index.yml -[SapMachine]: https://sapmachine.io [repositories]: extending-repositories.md -[trusty]: http://download.pivotal.io.s3.amazonaws.com/openjdk/trusty/x86_64/index.yml +[SapMachine]: https://sapmachine.io [version syntax]: extending-repositories.md#version-syntax-and-ordering [Volume Service]: https://docs.cloudfoundry.org/devguide/services/using-vol-services.html diff --git a/docs/jre-zulu_jre.md b/docs/jre-zulu_jre.md index 7ff4c44fe7..3952679f6a 100644 --- a/docs/jre-zulu_jre.md +++ b/docs/jre-zulu_jre.md @@ -34,7 +34,7 @@ To use Zulu JRE instead of OpenJDK without forking java-buildpack, set environme | `jre.repository_root` | The URL of the Zulu repository index ([details][repositories]). | `jre.version` | The version of Java runtime to use. Note: version 1.8.0 and higher require the `memory_sizes` and `memory_heuristics` mappings to specify `metaspace` rather than `permgen`. | `jvmkill.repository_root` | The URL of the `jvmkill` repository index ([details][repositories]). -| `jvmkill.version` | The version of `jvmkill` to use. Candidate versions can be found in the listings for [mountainlion][jvmkill-mountainlion] and [trusty][jvmkill-trusty]. +| `jvmkill.version` | The version of `jvmkill` to use. Candidate versions can be found in the listings for [bionic][jvmkill-bionic]. | `memory_calculator` | Memory calculator defaults, described below under "Memory". ### Additional Resources @@ -163,8 +163,7 @@ JVM Memory Configuration: -XX:MaxDirectMemorySize=10M -XX:MaxMetaspaceSize=99199 [Azul Zulu]: https://www.azul.com/products/zulu/ [Configuration and Extension]: ../README.md#configuration-and-extension [Java Buildpack Memory Calculator]: https://github.com/cloudfoundry/java-buildpack-memory-calculator -[jvmkill-mountainlion]: http://download.pivotal.io.s3.amazonaws.com/jvmkill/mountainlion/x86_64/index.yml -[jvmkill-trusty]: http://download.pivotal.io.s3.amazonaws.com/jvmkill/trusty/x86_64/index.yml +[jvmkill-bionic]: https://java-buildpack.cloudfoundry.org/jvmkill/bionic/x86_64/index.yml [Memory Calculator's README]: https://github.com/cloudfoundry/java-buildpack-memory-calculator [repositories]: extending-repositories.md [version syntax]: extending-repositories.md#version-syntax-and-ordering diff --git a/rakelib/package.rb b/rakelib/package.rb index 2f10ade1e1..f449cc8d7d 100644 --- a/rakelib/package.rb +++ b/rakelib/package.rb @@ -33,7 +33,7 @@ def self.version BUILDPACK_VERSION = JavaBuildpack::BuildpackVersion.new(false).freeze - PLATFORMS = %w[bionic trusty].freeze + PLATFORMS = %w[bionic].freeze STAGING_DIR = "#{BUILD_DIR}/staging"