Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions comparison.md
Original file line number Diff line number Diff line change
Expand Up @@ -180,11 +180,11 @@ The following frameworks were added since the initial migration:

#### Included in Default Manifest (3 JREs) ✅

| JRE | Ruby File | Go File | Versions Supported | Default | Status |
|-----|-----------|---------|-------------------|---------|--------|
| **OpenJDK** | `open_jdk_jre.rb` | `openjdk.go` | 8, 11, 17, 21, 23 | 17.x | ✅ Complete |
| **Zulu (Azul)** | `zulu_jre.rb` | `zulu.go` | 8, 11, 17 | 11.x | ✅ Complete |
| **SAP Machine** | `sap_machine_jre.rb` | `sapmachine.go` | 11, 17 | 17.x | ✅ Complete |
| JRE | Ruby File | Go File | Versions Supported | Default | Status |
|-----|-----------|---------|---------------------------------------------|---------|--------|
| **OpenJDK** | `open_jdk_jre.rb` | `openjdk.go` | 8, 11, 17, 21, 23 | 17.x | ✅ Complete |
| **Zulu (Azul)** | `zulu_jre.rb` | `zulu.go` | 8, 11, 17 | 11.x | ✅ Complete |
| **SAP Machine** | `sap_machine_jre.rb` | `sapmachine.go` | 11(ruby only), 17, 21(go only), 25(go only) | 21.x | ✅ Complete |

#### BYOL JREs - Require Custom Manifest (4 JREs) ✅

Expand Down
21 changes: 14 additions & 7 deletions manifest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ default_versions:
- name: zulu
version: 11.x
- name: sapmachine
version: 17.x
version: 21.x
- name: tomcat
version: 10.1.x
- name: tomcat-access-logging-support
Expand Down Expand Up @@ -259,16 +259,23 @@ dependencies:
# SAP Machine JRE versions
# Repository: https://github.com/SAP/SapMachine/releases
- name: sapmachine
version: 11.0.25
uri: https://github.com/SAP/SapMachine/releases/download/sapmachine-11.0.25/sapmachine-jre-11.0.25_linux-x64_bin.tar.gz
sha256: 10f3eb5b93c2c26f7c69a3690d5877b401b5ab24a6b1798fac5518beb1f1f839
version: 17.0.17
uri: https://github.com/SAP/SapMachine/releases/download/sapmachine-17.0.17/sapmachine-jre-17.0.17_linux-x64_bin.tar.gz
sha256: c45d572629c722b18a6254f7503a397dbfe474223afb3ac96ef462d27074f7a0
cf_stacks:
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For my understanding: Are these (exact) versions only for testing or will they have to be updated every time new SapMachine builds are made available?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@RealCLanger I think these are the versions that will be used productively and should be subject of regular update. Note that the current community java buildpack is the only one written in Ruby, all the rest community buildpacks follow the same structure, for example python buildpack. @ramonskie please correct me if wrong

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you are correct.
the pattern should be for each java-buildpack version should have x version. this way you can always revert if necessary. how the old java buildpack handled versioning was totally different from all the other buildpacks.
that said. we should create ci automation to update the versions regularly. we already do that for all the other buildpacks anyways. where currently prs will be created for reviews and for major version bumps a issue wil be created.
so it requires a bit more of manual work

- cflinuxfs4

- name: sapmachine
version: 17.0.13
uri: https://github.com/SAP/SapMachine/releases/download/sapmachine-17.0.13/sapmachine-jre-17.0.13_linux-x64_bin.tar.gz
sha256: b5f16befcb6415cfcf3bdb57b361c8eeca8176d494cd1e6c067cd56acec1afe6
version: 21.0.9
uri: https://github.com/SAP/SapMachine/releases/download/sapmachine-21.0.9/sapmachine-jre-21.0.9_linux-x64_bin.tar.gz
sha256: 4cc6b1501a2fe8ae0f106342b3c00eec00b7886ce9215760b611cc9975bd339b
cf_stacks:
- cflinuxfs4

- name: sapmachine
version: 25.0.1
uri: https://github.com/SAP/SapMachine/releases/download/sapmachine-25.0.1/sapmachine-jre-25.0.1_linux-x64_bin.tar.gz
sha256: 6bc007201b97214a3883e2da92dc80b2e5ae29378a7a77ab4077d74ccbfdfdbd
cf_stacks:
- cflinuxfs4

Expand Down
4 changes: 2 additions & 2 deletions src/integration/java_main_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ func testJavaMain(platform switchblade.Platform, fixtures string) func(*testing.
it("deploys with SAPMachine JRE from manifest", func() {
_, logs, err := platform.Deploy.
WithEnv(map[string]string{
"BP_JAVA_VERSION": "11",
"BP_JAVA_VERSION": "17",
"JBP_CONFIG_COMPONENTS": `{jres: ["JavaBuildpack::Jre::SapMachineJRE"]}`,
}).
Execute(name, filepath.Join(fixtures, "containers", "main"))
Expand All @@ -114,7 +114,7 @@ func testJavaMain(platform switchblade.Platform, fixtures string) func(*testing.
// Verify SAPMachine JRE was installed from manifest
Expect(logs.String()).To(ContainSubstring("Java Buildpack"))
Expect(logs.String()).To(ContainSubstring("Installing SAP Machine"))
Expect(logs.String()).To(ContainSubstring("11."))
Expect(logs.String()).To(ContainSubstring("17."))
})
})
}
Expand Down