Skip to content
This repository has been archived by the owner on May 16, 2024. It is now read-only.

Update #cf-update to use new JDK 1.8.0_100+ #8

Merged
merged 155 commits into from
Mar 6, 2017
Merged

Conversation

jacktams
Copy link

Changes:

  • Merged latest upstream changes from Cloudfoundry.
  • Update to use 1.8.0_12+ versions of JDK.
  • AWS repository was updated to include the new Server JRE for these versions.
  • Tweaked buildpack to support Server JRE, when updating cacerts.
  • Added Unlimited JCE for JRE/JDK 8.
  • Switched to latest Tomcat 7 versions.

Tested:

  • Currently in use with Datalayer V2 DTM pipelines.

nebhale and others added 30 commits February 11, 2016 14:35
This change updates the copyright statements to 2016.
This change adds a framework that provides a Java trust store containing the
certificates trusted by the container's operating system.  This feature is
disabled by default, as it requires around 45 seconds to process the 173
default certificates.

[#76531562]
This change updates the versions of Ruby that the buildpack is tested
against.
This change updates some more copyright headers that were missed the first
time around.
Previously the empty placeholder repository root in the Tomcat configuration
was causing problems packaging the build.  This change updates the
configuration to eliminate that invalid repository.

[#114694789]
Previously, the only way to determine a Spring Boot application was to inspect
the filesystem looking for a specific JAR file.  This change will make the
first check the parsing of the application's manifest which should improve
performance.

[#114795971]
This change updates the documentation with some sage advice.

[resolves cloudfoundry#276]
Previously Spring Boot applications were provided with additional libs via a
classpath declaration.  Work done on Spring Boot 1.4 make this stop working.
The new solution is to symlink the libs to one of the lib directories in the
application.

[#114796053]
This change causes Spring Boot additional libs to be symlinked to BOOT-INF if
it exists.

[#114796085]
This change updates the Spring Boot lib directory detection algorithm to read
from the manifest if an entry is provided.

[#114796139]
This commit updates the version range used for YourKit dependencies to use 2016 releases.
This change updates some more of the codebase with an updated copyright 
statement.
This change updates the buildpack to use Ruby 2.2.4 as it's default during
development.  **NOTE** this does not affect its compatibility with 1.9.3 which
will be ensured with continued testing.
This change adds scripts for unit testing the repository
This change makes some additional improvements to the unit-test task.
This change updates the docker image declaration for the CI tasks.
This change fixes the unit-test script
nebhale and others added 24 commits January 25, 2017 10:40
Previously, the Trust Store Builder only added certificates from the
container.  This would break compatibility for anyone currently using the
JRE's built in trust store to get certificates into the system.  This change
adds support for getting certificates out of the JRE's cacerts as well.

[resolves cloudfoundry#372]
Previously the packaging task expected that the permissions on the checked out
source repository respected what was under source control and that those
permissions were carried over to the copy.  Since this cannot be dependend on,
this change enforces permissions after copy.

[resolves cloudfoundry#304]
A previous change removed the code for an example that modified memory
heuristics without removing the reference to it in the prose.  This change
reinstates that example and polishes the other examples to be consistent.

[resolves cloudfoundry#301]
This change updates the configuration file to set ha_mode_standby in the
configuration file.  It does this because using the EKM provided in Cloud
Foundry shouldn't randomize HA connections.
@jacktams jacktams requested a review from LeoK80 February 13, 2017 15:18
@@ -20,7 +20,7 @@
# e.g. repository_root: "http://example.com/oracle-jre/{platform}/{architecture}"
---
jre:
version: 1.8.0_+
version: 1.8.0_12+
Copy link

Choose a reason for hiding this comment

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

What happens with this when it reaches version 130 or higher?

Copy link
Author

Choose a reason for hiding this comment

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

We'll have to update it sadly, the matcher the build pack is using isn't that great. I am going to put it as a note in the docs for getting the jre/jdks in our AWS bucket.

Copy link

@LeoK80 LeoK80 Feb 24, 2017

Choose a reason for hiding this comment

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

based on the regex in function 'def micro_and_qualifiers(s)' in file 'tokenized_version.rb' I think the original 1.8.0_+ should work no matter how many digits the qualifier is. Having specified the repo to our own will give it a limited amount of options to choose from that we control.

Copy link
Author

Choose a reason for hiding this comment

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

I haven't tested this but I don't think the qualifier is the issue, its the ordering/sorting. 1.8.0_101 is sorted before 1.8.0_121 as its using naive sorting.

So whilst 1.8.0_1+ does work, I don't think it sorts properly. So from {1.8.0_101,1.8.0_121} gives you u101 and not u121.

I'll try to confirm if I get time.

@@ -41,7 +41,7 @@ Please carefully follow the whitespace and formatting conventions already presen
## Add Apache license header to all new classes
```ruby
# Cloud Foundry Java Buildpack
# Copyright 2013-2015 the original author or authors.
# Copyright 2013-2016 the original author or authors.
Copy link

Choose a reason for hiding this comment

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

should this be 2017 now?

Copy link
Author

Choose a reason for hiding this comment

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

yeah, but its all upstream change, so I would rather just sync it up with them when the change is made ;)

@LeoK80
Copy link

LeoK80 commented Mar 6, 2017

LGTM

@jacktams jacktams merged commit 8cc3499 into cf-update Mar 6, 2017
@jacktams jacktams deleted the jdk-update branch October 6, 2017 14:32
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.