killbill 3.2.4 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5d80b160cae829b2ae91a6b4f855c1c9ba32c245
-  data.tar.gz: 82d8f22ef535dc276de788d2cd1824855ea8d394
+  metadata.gz: 2b31bab8d27ebb9b8c3db3a90679c41bdccc8503
+  data.tar.gz: 69c4ff0995b68063b3cd424c19ead1c5a918bf26
 SHA512:
-  metadata.gz: 657b255d6384163a553f11fbd08587c30e32f4c661d2b825ffa343d00cb9ef2cf032803a074c7462c6fb39ec75ce508eb4ae9d74fcbafb4a5de7eea9a94296e2
-  data.tar.gz: f03c8efa2fceb92d1f27eba7b9fca205549ec7e2b00b483e75288938d75c4ab1bb92533ddd5889e0f11fa2b7af83b47b4ac3bd0ca0d8c5e833efdcc8c4d2dbff
+  metadata.gz: e11d3d7fa11e6c45f8b5c7d325f55f891dcac8ba71dbff26e1a3fab7c2d7313e9982478917675929eb20d4f83a66ecd1cab3bc6ac9a7c3ccef1c68ffe0758e59
+  data.tar.gz: 25274635b4306545df67c42a63245e31d15de9fa77c4261359ddcc1df23d3c1b025bb87e4a23648048888020099c018e087d36b312b35c9c56c959679ac4fb8b

data/.gitignore

@@ -18,8 +18,6 @@ _yardoc
 doc/
 
 .jbundler
-Jarfile.lock
-Gemfile.lock
 *.swp
 .idea
 test.db

data/.travis.yml

@@ -1,22 +1,43 @@
 language: ruby
 
+sudo: false
+cache:
+  bundler: true
+  directories:
+    - $HOME/.m2
+
+before_script:
+  - mysql -uroot -e 'create database killbill_test;'
+
 notifications:
   email:
     - kill-bill-commits@googlegroups.com
 
+env:
+  global:
+    - JRUBY_OPTS='-J-Xmx1024M'
+  matrix:
+    # Need MySQL 5.6 - see https://github.com/travis-ci/travis-ci/issues/1986
+    #- AR_ADAPTER='mariadb' AR_USERNAME='root' AR_PASSWORD='' AR_DATABASE='killbill_test'
+    - AR_ADAPTER='sqlite3' AR_DATABASE='test.db'
+
 rvm:
-  - jruby-1.7.16
+  - jruby-1.7.20
   - jruby-20mode # latest 1.7.x
   - jruby-head
 
+gemfile:
+  - Gemfile
+  - Gemfile.head
+
 jdk:
-  - openjdk6
   - openjdk7
   - oraclejdk7
+  - oraclejdk8
 
 matrix:
   allow_failures:
     - rvm: jruby-head
-  exclude:
-    - rvm: jruby-head
-      jdk: openjdk6
+    - jdk: oraclejdk8
+    - gemfile: Gemfile.head
+  fast_finish: true

data/Gemfile

@@ -1,3 +1,3 @@
-source "http://rubygems.org"
+source "https://rubygems.org"
 
 gemspec

data/Gemfile.head

@@ -0,0 +1,5 @@
+source 'https://rubygems.org'
+
+gemspec
+
+gem 'activemerchant', :github => 'Shopify/active_merchant', :ref => 'HEAD'

data/Gemfile.lock

@@ -0,0 +1,125 @@
+PATH
+  remote: .
+  specs:
+    killbill (4.0.0)
+      rack (>= 1.5.2)
+      sinatra (~> 1.3.4)
+      typhoeus (~> 0.6.9)
+      tzinfo (~> 1.2.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actionpack (4.1.10)
+      actionview (= 4.1.10)
+      activesupport (= 4.1.10)
+      rack (~> 1.5.2)
+      rack-test (~> 0.6.2)
+    actionview (4.1.10)
+      activesupport (= 4.1.10)
+      builder (~> 3.1)
+      erubis (~> 2.7.0)
+    active_utils (3.0.0)
+      activesupport (>= 3.2)
+      i18n
+    activemerchant (1.48.0)
+      activesupport (>= 3.2.14, < 5.0.0)
+      builder (>= 2.1.2, < 4.0.0)
+      i18n (>= 0.6.9)
+      nokogiri (~> 1.4)
+    activemodel (4.1.10)
+      activesupport (= 4.1.10)
+      builder (~> 3.1)
+    activerecord (4.1.10)
+      activemodel (= 4.1.10)
+      activesupport (= 4.1.10)
+      arel (~> 5.0.0)
+    activerecord-bogacs (0.3.0)
+      thread_safe (~> 0.3)
+    activerecord-jdbc-adapter (1.3.16)
+      activerecord (>= 2.2)
+    activesupport (4.1.10)
+      i18n (~> 0.6, >= 0.6.9)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.1)
+      tzinfo (~> 1.1)
+    arel (5.0.1.20140414130214)
+    builder (3.2.2)
+    diff-lcs (1.1.3)
+    erubis (2.7.0)
+    ethon (0.7.3)
+      ffi (>= 1.3.0)
+    ffi (1.9.8-java)
+    i18n (0.7.0)
+    jbundler (0.4.3)
+      maven-tools (~> 0.32.1)
+      ruby-maven (~> 3.0.4)
+    jdbc-mariadb (1.1.8)
+    jdbc-sqlite3 (3.8.7)
+    json (1.8.2-java)
+    maven-tools (0.32.5)
+    minitest (5.6.1)
+    monetize (1.1.0)
+      money (~> 6.5.0)
+    money (6.5.1)
+      i18n (>= 0.6.4, <= 0.7.0)
+    nokogiri (1.6.6.2-java)
+    offsite_payments (2.1.0)
+      actionpack (>= 3.2.20, < 5.0.0)
+      active_utils (~> 3.0.0)
+      activesupport (>= 3.2.14, < 5.0.0)
+      builder (>= 2.1.2, < 4.0.0)
+      i18n (~> 0.5)
+      money (>= 5.0.0, < 7.0.0)
+      nokogiri (~> 1.4)
+    rack (1.5.3)
+    rack-protection (1.5.3)
+      rack
+    rack-test (0.6.3)
+      rack (>= 1.0)
+    rake (10.4.2)
+    rspec (2.12.0)
+      rspec-core (~> 2.12.0)
+      rspec-expectations (~> 2.12.0)
+      rspec-mocks (~> 2.12.0)
+    rspec-core (2.12.2)
+    rspec-expectations (2.12.1)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.12.2)
+    ruby-maven (3.0.4.1.4)
+      maven-tools (~> 0.32.3)
+      thor (>= 0.14.6, < 2.0)
+    sinatra (1.3.6)
+      rack (~> 1.4)
+      rack-protection (~> 1.3)
+      tilt (~> 1.3, >= 1.3.3)
+    thor (0.19.1)
+    thread_safe (0.3.5-java)
+    tilt (1.4.1)
+    typhoeus (0.6.9)
+      ethon (>= 0.7.1)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
+
+PLATFORMS
+  java
+
+DEPENDENCIES
+  actionpack (~> 4.1.0)
+  actionview (~> 4.1.0)
+  activemerchant (~> 1.48.0)
+  activerecord (~> 4.1.0)
+  activerecord-bogacs (~> 0.3)
+  activerecord-jdbc-adapter (~> 1.3)
+  jbundler (~> 0.4.3)
+  jdbc-mariadb (~> 1.1.8)
+  jdbc-sqlite3 (~> 3.7)
+  killbill!
+  monetize (~> 1.1.0)
+  money (~> 6.5.1)
+  offsite_payments (~> 2.1.0)
+  rake (>= 10.0.0)
+  rspec (~> 2.12.0)
+  thor (~> 0.19.1)
+  thread_safe (~> 0.3.4)

data/Jarfile

@@ -1,9 +1,9 @@
-jar 'org.kill-bill.billing:killbill-api', '0.12.4'
-jar 'org.kill-bill.billing.plugin:killbill-plugin-api-notification', '0.8.3'
-jar 'org.kill-bill.billing.plugin:killbill-plugin-api-payment', '0.8.3'
-jar 'org.kill-bill.billing.plugin:killbill-plugin-api-currency', '0.8.3'
-jar 'org.kill-bill.billing.plugin:killbill-plugin-api-retry', '0.8.3'
-jar 'org.kill-bill.billing.plugin:killbill-plugin-api-invoice', '0.8.3'
-jar 'org.kill-bill.billing:killbill-util:tests', '0.13.4'
-jar 'org.mockito:mockito-all', '1.9.0'
-jar 'javax.servlet:javax.servlet-api', '3.0.1'
+jar 'org.kill-bill.billing:killbill-api', '0.14'
+jar 'org.kill-bill.billing.plugin:killbill-plugin-api-currency', '0.9'
+jar 'org.kill-bill.billing.plugin:killbill-plugin-api-invoice', '0.9'
+jar 'org.kill-bill.billing.plugin:killbill-plugin-api-notification', '0.9'
+jar 'org.kill-bill.billing.plugin:killbill-plugin-api-payment', '0.9'
+jar 'org.kill-bill.billing.plugin:killbill-plugin-api-routing', '0.9'
+jar 'org.kill-bill.billing:killbill-util:tests', '0.13.7'
+jar 'org.mockito:mockito-all', '1.10.19'
+jar 'javax.servlet:javax.servlet-api', '3.1.0'

data/Jarfile.lock

@@ -0,0 +1,54 @@
+org.kill-bill.billing:killbill-api:jar:0.14
+com.fasterxml.jackson.core:jackson-annotations:jar:2.4.3
+joda-time:joda-time:jar:2.3
+org.kill-bill.billing.plugin:killbill-plugin-api-currency:jar:0.9
+org.kill-bill.billing.plugin:killbill-plugin-api-invoice:jar:0.9
+org.kill-bill.billing.plugin:killbill-plugin-api-notification:jar:0.9
+org.kill-bill.billing.plugin:killbill-plugin-api-payment:jar:0.9
+org.kill-bill.billing.plugin:killbill-plugin-api-routing:jar:0.9
+org.kill-bill.billing:killbill-util:jar:tests:0.13.7
+com.fasterxml.jackson.core:jackson-databind:jar:2.4.3
+com.fasterxml.jackson.core:jackson-core:jar:2.4.3
+com.fasterxml.jackson.dataformat:jackson-dataformat-csv:jar:2.4.3
+com.fasterxml.jackson.datatype:jackson-datatype-joda:jar:2.4.3
+com.samskivert:jmustache:jar:1.5
+io.dropwizard.metrics:metrics-core:jar:3.1.1
+io.dropwizard.metrics:metrics-ehcache:jar:3.1.1
+net.sf.ehcache:ehcache:jar:2.9.1
+org.antlr:stringtemplate:jar:3.2.1
+antlr:antlr:jar:2.7.7
+org.apache.commons:commons-email:jar:1.2
+javax.mail:mail:jar:1.4.1
+javax.activation:activation:jar:1.1
+org.apache.shiro:shiro-core:jar:1.2.3
+commons-beanutils:commons-beanutils:jar:1.8.3
+org.apache.shiro:shiro-ehcache:jar:1.2.3
+org.apache.shiro:shiro-guice:jar:1.2.3
+com.google.guava:guava:jar:r09
+com.google.inject:guice:jar:3.0
+aopalliance:aopalliance:jar:1.0
+com.google.inject.extensions:guice-multibindings:jar:3.0
+org.jdbi:jdbi:jar:2.62
+org.joda:joda-money:jar:0.9
+org.kill-bill.billing:killbill-internal-api:jar:0.13.7
+org.kill-bill.billing:killbill-platform-api:jar:0.2
+org.kill-bill.billing:killbill-platform-base:jar:0.2
+com.google.code.findbugs:annotations:jar:3.0.0
+org.bgee.log4jdbc-log4j2:log4jdbc-log4j2-jdbc4:jar:1.16
+org.kill-bill.billing:killbill-platform-osgi-api:jar:0.2
+org.osgi:org.osgi.core:jar:5.0.0
+org.kill-bill.commons:killbill-clock:jar:0.3
+org.kill-bill.commons:killbill-concurrent:jar:0.3
+org.kill-bill.commons:killbill-embeddeddb-common:jar:0.3
+org.kill-bill.commons:killbill-jdbi:jar:0.3
+com.h2database:h2:jar:1.4.186
+javax.inject:javax.inject:jar:1
+org.kill-bill.commons:killbill-locker:jar:0.3
+org.kill-bill.commons:killbill-queue:jar:0.3
+org.kill-bill.commons:killbill-xmlloader:jar:0.3
+org.skife.config:config-magic:jar:0.14
+org.slf4j:jcl-over-slf4j:jar:1.7.12
+org.slf4j:slf4j-api:jar:1.7.12
+org.weakref:jmxutils:jar:1.12
+org.mockito:mockito-all:jar:1.10.19
+javax.servlet:javax.servlet-api:jar:3.1.0

data/NEWS

@@ -1,3 +1,6 @@
+4.0.0
+    Initial release for Kill Bill 0.14.x
+
 3.2.2
     Logger performance improvement
     Initial support for invoice plugins

data/README.md

@@ -208,3 +208,16 @@ For quick testing of your plugin, you can use the `deploy` task:
 To debug packaging issues, pass `true` as the third (optional) parameter:
 
     rake killbill:deploy[false,/path/to/bundles,true]
+
+
+Development
+-----------
+
+To run unit and remote tests:
+
+    rake
+    rake test:remote:spec
+
+To change the database driver:
+
+    AR_ADAPTER=mariadb AR_USERNAME=root AR_PASSWORD=root AR_DATABASE=kbtest rake

data/VERSION

@@ -1 +1 @@
-3.2.4
+4.0.0

data/generators/active_merchant/templates/.gitignore.rb

@@ -22,9 +22,6 @@ doc/
 
 .DS_Store
 
-# Build directory
-killbill-<%= identifier %>/
-
 # Testing database
 test.db
 
@@ -34,3 +31,5 @@ target
 pom.xml.asc
 
 .idea/
+
+Gemfile.head.lock

data/generators/active_merchant/templates/.travis.yml.rb

@@ -1,19 +1,38 @@
 language: ruby
 
+sudo: false
+cache: bundler
+
+script: 'bundle exec rake test:spec test:remote:spec'
+
 notifications:
   email:
     - kill-bill-commits@googlegroups.com
 
+env:
+  global:
+    - JRUBY_OPTS='-J-Xmx1024M'
+
 rvm:
-  - jruby-19mode
-  - jruby-20mode
+  - jruby-1.7.20
+  - jruby-20mode # latest 1.7.x
   - jruby-head
 
+gemfile:
+  - Gemfile
+  - Gemfile.head
+
 jdk:
-  - openjdk6
   - openjdk7
   - oraclejdk7
+  - oraclejdk8
 
 matrix:
   allow_failures:
     - rvm: jruby-head
+    - jdk: oraclejdk8
+    - gemfile: Gemfile.head
+  fast_finish: true
+
+after_success:
+  - '[ "${TRAVIS_PULL_REQUEST}" = "false" ] && echo "<settings><servers><server><id>sonatype-nexus-snapshots</id><username>\${env.OSSRH_USER}</username><password>\${env.OSSRH_PASS}</password></server></servers></settings>" > ~/settings.xml && MVN="mvn --settings $HOME/settings.xml" NO_RELEASE=1 travis_retry travis_wait bash release.sh | egrep -v "Download|Install|Upload" ; rm -f ~/settings.xml'

data/generators/active_merchant/templates/Gemfile.head.rb

@@ -0,0 +1,5 @@
+source 'https://rubygems.org'
+
+gemspec
+
+gem 'killbill', :github => 'killbill/killbill-plugin-framework-ruby', :ref => 'HEAD'

data/generators/active_merchant/templates/Gemfile.rb

@@ -1,3 +1,3 @@
-source 'http://rubygems.org'
+source 'https://rubygems.org'
 
 gemspec

data/generators/active_merchant/templates/Jarfile.rb

@@ -1,8 +1,9 @@
-jar 'org.kill-bill.billing:killbill-api', '0.10.2'
-jar 'org.kill-bill.billing.plugin:killbill-plugin-api-notification', '0.8.2'
-jar 'org.kill-bill.billing.plugin:killbill-plugin-api-payment', '0.8.2'
-jar 'org.kill-bill.billing.plugin:killbill-plugin-api-currency', '0.8.2'
-jar 'org.kill-bill.billing.plugin:killbill-plugin-api-retry', '0.8.1'
-jar 'org.kill-bill.billing.plugin:killbill-plugin-api-invoice', '0.8.2'
-jar 'org.kill-bill.billing:killbill-util:tests', '0.12.1'
-jar 'javax.servlet:javax.servlet-api', '3.0.1'
+jar 'org.kill-bill.billing:killbill-api', '0.14'
+jar 'org.kill-bill.billing.plugin:killbill-plugin-api-currency', '0.9'
+jar 'org.kill-bill.billing.plugin:killbill-plugin-api-invoice', '0.9'
+jar 'org.kill-bill.billing.plugin:killbill-plugin-api-notification', '0.9'
+jar 'org.kill-bill.billing.plugin:killbill-plugin-api-payment', '0.9'
+jar 'org.kill-bill.billing.plugin:killbill-plugin-api-routing', '0.9'
+jar 'org.kill-bill.billing:killbill-util:tests', '0.13.7'
+jar 'org.mockito:mockito-all', '1.10.19'
+jar 'javax.servlet:javax.servlet-api', '3.1.0'

data/generators/active_merchant/templates/LICENSE.rb

@@ -186,7 +186,7 @@ Apache License
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2014 The Billing Project, LLC
+   Copyright 2015 The Billing Project, LLC
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
@@ -198,4 +198,4 @@ Apache License
    distributed under the License is distributed on an "AS IS" BASIS,
    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
    See the License for the specific language governing permissions and
-   limitations under the License.
+   limitations under the License.

data/generators/active_merchant/templates/config.yml.rb

@@ -2,16 +2,26 @@
   :test: true
 
 :database:
+# SQLite (development)
   :adapter: sqlite3
   :database: test.db
 # For MySQL
-#  :adapter: 'jdbcmysql'
+#  :adapter: mysql
 #  :username: 'killbill'
 #  :password: 'killbill'
-#  :driver: 'com.mysql.jdbc.Driver'
-#  :url: 'jdbc:mysql://127.0.0.1:3306/killbill'
+#  :database: 'killbill' # or set the URL :
+#  #:url: jdbc:mysql://127.0.0.1:3306/killbill
+#  :driver: org.mariadb.jdbc.Driver # as in KB
+#  :pool: 30 # AR's default is max 5 connections
 # In Kill Bill
-#  :adapter: 'jdbcmysql'
+#  :adapter: mysql
 #  :jndi: 'killbill/osgi/jdbc'
-#  :connection_alive_sql: 'select 1'
-#  :pool: 250
+#  :pool: false # false-pool (JNDI pool's max)
+#  # uncomment if pool does not support JDBC4 :
+#  #:connection_alive_sql: 'select 1'
+#  # MySQL adapter #configure_connection defaults :
+#  #    @@SESSION.sql_auto_is_null = 0,
+#  #    @@SESSION.wait_timeout = 2147483,
+#  #    @@SESSION.sql_mode = 'STRICT_ALL_TABLES'
+#  # ... can be disabled (on AR-JDBC 1.4) using :
+#  :configure_connection: false