killbill 6.3.0 → 6.4.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (8) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile.lock +1 -1
  3. data/Jarfile +8 -8
  4. data/Jarfile.lock +10 -8
  5. data/lib/killbill/creator.rb +2 -1
  6. data/lib/killbill/version.rb +1 -1
  7. data/spec/killbill/helpers/payment_plugin_spec.rb +4 -2
  8. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 0e5ab32c7c0c4c09d7d35412357a1681e06d93ee
4
- data.tar.gz: 3a4504821801197d1e2e86c8113ad0bd71761900
3
+ metadata.gz: 0da71c5d80956b2a56eafad070f3275dddae9df5
4
+ data.tar.gz: a2900072afa3bcee6403c5f83b2ee9a1e286e273
5
5
  SHA512:
6
- metadata.gz: 60a954bc28d6f88fce588c46a9e6721707cf7abdb969a212f38f2eb7d955706481ab81e6c3673e09de27b6983ffa838df4bdb1e03d98e523c02fb45c8b628a84
7
- data.tar.gz: 8ca9447f461b90e9c50ce3e7e814b7bbe1af5b5a1779b05353862e83e6eec06f15db45e0b4b88a48a93558adcd643de98dd1213e66febdb6a3ef24575a4016be
6
+ metadata.gz: c22c674c97a9170ad018dc07687bbec714089df58abe30f86ac0590afdd10f73abbe4bf8e40c71d43f086c7b601732e4a3dfe5e4ffaad61b7b9ad4a8be0745c4
7
+ data.tar.gz: f54666835a2f99b7789e44d08a0dd39bf3dac644c9edde4ac28eafca3a61fa01c299b3246cf9b747281f9a4bc73b097e2ea36eb544cdd734994b4648fc7f4c30
data/Gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- killbill (6.3.0)
4
+ killbill (6.4.0)
5
5
  rack (>= 1.5.2)
6
6
  sinatra (~> 1.3.4)
7
7
  typhoeus (~> 0.6.9)
data/Jarfile CHANGED
@@ -1,11 +1,11 @@
1
- jar 'org.kill-bill.billing:killbill-api', '0.26'
2
- jar 'org.kill-bill.billing.plugin:killbill-plugin-api-currency', '0.16'
3
- jar 'org.kill-bill.billing.plugin:killbill-plugin-api-invoice', '0.16'
4
- jar 'org.kill-bill.billing.plugin:killbill-plugin-api-notification', '0.16'
5
- jar 'org.kill-bill.billing.plugin:killbill-plugin-api-payment', '0.16'
6
- jar 'org.kill-bill.billing.plugin:killbill-plugin-api-control', '0.16'
7
- jar 'org.kill-bill.billing.plugin:killbill-plugin-api-catalog', '0.16'
8
- jar 'org.kill-bill.billing.plugin:killbill-plugin-api-entitlement', '0.16'
1
+ jar 'org.kill-bill.billing:killbill-api', '0.30'
2
+ jar 'org.kill-bill.billing.plugin:killbill-plugin-api-currency', '0.18'
3
+ jar 'org.kill-bill.billing.plugin:killbill-plugin-api-invoice', '0.18'
4
+ jar 'org.kill-bill.billing.plugin:killbill-plugin-api-notification', '0.18'
5
+ jar 'org.kill-bill.billing.plugin:killbill-plugin-api-payment', '0.18'
6
+ jar 'org.kill-bill.billing.plugin:killbill-plugin-api-control', '0.18'
7
+ jar 'org.kill-bill.billing.plugin:killbill-plugin-api-catalog', '0.18'
8
+ jar 'org.kill-bill.billing.plugin:killbill-plugin-api-entitlement', '0.18'
9
9
  jar 'org.kill-bill.billing:killbill-util:tests', '0.14.0'
10
10
  jar 'org.mockito:mockito-all', '1.10.19'
11
11
  jar 'javax.servlet:javax.servlet-api', '3.1.0'
data/Jarfile.lock CHANGED
@@ -1,13 +1,13 @@
1
- org.kill-bill.billing:killbill-api:jar:0.26
1
+ org.kill-bill.billing:killbill-api:jar:0.30
2
2
  com.fasterxml.jackson.core:jackson-annotations:jar:2.4.3
3
3
  joda-time:joda-time:jar:2.3
4
- org.kill-bill.billing.plugin:killbill-plugin-api-currency:jar:0.16
5
- org.kill-bill.billing.plugin:killbill-plugin-api-invoice:jar:0.16
6
- org.kill-bill.billing.plugin:killbill-plugin-api-notification:jar:0.16
7
- org.kill-bill.billing.plugin:killbill-plugin-api-payment:jar:0.16
8
- org.kill-bill.billing.plugin:killbill-plugin-api-control:jar:0.16
9
- org.kill-bill.billing.plugin:killbill-plugin-api-catalog:jar:0.16
10
- org.kill-bill.billing.plugin:killbill-plugin-api-entitlement:jar:0.16
4
+ org.kill-bill.billing.plugin:killbill-plugin-api-currency:jar:0.18
5
+ org.kill-bill.billing.plugin:killbill-plugin-api-invoice:jar:0.18
6
+ org.kill-bill.billing.plugin:killbill-plugin-api-notification:jar:0.18
7
+ org.kill-bill.billing.plugin:killbill-plugin-api-payment:jar:0.18
8
+ org.kill-bill.billing.plugin:killbill-plugin-api-control:jar:0.18
9
+ org.kill-bill.billing.plugin:killbill-plugin-api-catalog:jar:0.18
10
+ org.kill-bill.billing.plugin:killbill-plugin-api-entitlement:jar:0.18
11
11
  org.kill-bill.billing:killbill-util:jar:tests:0.14.0
12
12
  com.fasterxml.jackson.core:jackson-databind:jar:2.4.3
13
13
  com.fasterxml.jackson.core:jackson-core:jar:2.4.3
@@ -24,7 +24,9 @@ javax.mail:mail:jar:1.4.1
24
24
  javax.activation:activation:jar:1.1
25
25
  org.apache.shiro:shiro-core:jar:1.2.3
26
26
  commons-beanutils:commons-beanutils:jar:1.8.3
27
+ commons-logging:commons-logging:jar:1.1.1
27
28
  org.apache.shiro:shiro-ehcache:jar:1.2.3
29
+ net.sf.ehcache:ehcache-core:jar:2.5.0
28
30
  org.apache.shiro:shiro-guice:jar:1.2.3
29
31
  com.google.guava:guava:jar:r09
30
32
  com.google.inject:guice:jar:3.0
data/lib/killbill/creator.rb CHANGED
@@ -27,7 +27,8 @@ module Killbill
27
27
  plugin_delegate.plugin_name = extract_plugin_name(plugin_delegate.root)
28
28
 
29
29
  # At this point we removed everything from the map which is not API, so we can build the APIs
30
- kb_apis = KillbillApi.new(@target_class_name, services["kb_apis"])
30
+ # Note: services["kb_apis"] is never nil, except in tests
31
+ kb_apis = KillbillApi.new(@target_class_name, services["kb_apis"] || {})
31
32
  plugin_delegate.kb_apis = kb_apis
32
33
 
33
34
  plugin_delegate
data/lib/killbill/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Killbill
2
- VERSION = '6.3.0'
2
+ VERSION = '6.4.0'
3
3
  end
data/spec/killbill/helpers/payment_plugin_spec.rb CHANGED
@@ -366,8 +366,10 @@ describe Killbill::Plugin::ActiveMerchant::PaymentPlugin do
366
366
  with_plugin_yaml_config('test.yml', plugin_config) do |file|
367
367
  ze_jplugin = ::Killbill::Plugin::Api::PaymentPluginApi.new('DummyRecordingGatewayPlugin',
368
368
  {
369
- 'payment_api' => payment_api,
370
- 'tenant_user_api' => tenant_api,
369
+ 'kb_apis' => {
370
+ 'payment_api' => payment_api,
371
+ 'tenant_user_api' => tenant_api
372
+ },
371
373
  'logger' => logger,
372
374
  'conf_dir' => File.dirname(file),
373
375
  'root' => File.dirname(file)
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: killbill
3
3
  version: !ruby/object:Gem::Version
4
- version: 6.3.0
4
+ version: 6.4.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Kill Bill core team
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2015-12-11 00:00:00.000000000 Z
11
+ date: 2015-12-12 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: sinatra