Skip to content

Commit

Permalink
Merge pull request #348 from jmarrero/wlp17001
Browse files Browse the repository at this point in the history
Update Liberty runtime version and license
  • Loading branch information
opiethehokie authored Mar 14, 2017
2 parents 15157e5 + 4ae576a commit 2b8ed60
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,6 @@ bundle install --gemfile Gemfile.rubymine-debug
[tuning options]: docs/tuning.md
[java main push]: docs/java-main.md

[Liberty-License]: https://public.dhe.ibm.com/ibmdl/export/pub/software/websphere/wasdev/downloads/wlp/16.0.0.4/lafiles/runtime/en.html
[Liberty-License]: https://public.dhe.ibm.com/ibmdl/export/pub/software/websphere/wasdev/downloads/wlp/17.0.0.1/lafiles/runtime/en.html
[JVM-License]: http://www14.software.ibm.com/cgi-bin/weblap/lap.pl?la_formnum=&li_formnum=L-PMAA-A3Z8P2&title=IBM%AE+SDK%2C+Java%99+Technology+Edition%2C+Version+8.0&l=en
[manifest documentation]: http://docs.cloudfoundry.org/devguide/deploy-apps/manifest.html
2 changes: 1 addition & 1 deletion config/liberty.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
# Configuration for the Liberty container
---
repository_root: "https://public.dhe.ibm.com/ibmdl/export/pub/software/websphere/wasdev/downloads/wlp/"
version: 16.+
version: 17.+
type: webProfile7
minify: false
app_state: true
Expand Down
2 changes: 1 addition & 1 deletion spec/bin/compile_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
end

before(:each) do
ENV.update('IBM_JVM_LICENSE' => 'L-PMAA-A3Z8P2', 'IBM_LIBERTY_LICENSE' => 'L-SWIS-AE3RTG', 'USER_AGENT' => 'RSpec-Test')
ENV.update('IBM_JVM_LICENSE' => 'L-PMAA-A3Z8P2', 'IBM_LIBERTY_LICENSE' => 'L-SWIS-AEPPZP', 'USER_AGENT' => 'RSpec-Test')
end

after(:each) do
Expand Down
2 changes: 1 addition & 1 deletion spec/fixtures/env/IBM_LIBERTY_LICENSE
Original file line number Diff line number Diff line change
@@ -1 +1 @@
L-SWIS-AE3RTG
L-SWIS-AEPPZP

0 comments on commit 2b8ed60

Please sign in to comment.