diff --git a/Vagrantfile b/Vagrantfile index 7d30b93..4668f34 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -1,21 +1,19 @@ # -*- mode: ruby -*- # vi: set ft=ruby : +JRUBY_VERSION = "jruby-1.7" + Vagrant.configure(2) do |config| config.vm.define "debian" do |deb| - deb.vm.box = 'debian/jessie64' + deb.vm.box = 'debian/stretch64' deb.vm.synced_folder '.', '/vagrant', type: :virtualbox deb.vm.provision 'shell', inline: <<-EOP - echo "deb http://ftp.debian.org/debian jessie-backports main" | tee --append /etc/apt/sources.list > /dev/null - sed -i 's/main/main contrib non-free/g' /etc/apt/sources.list apt-get update - apt-get remove openjdk-7-jre-headless -y -q - apt-get install -t jessie-backports openjdk-8-jre ca-certificates-java - apt-get install git curl -y -q - gpg --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 - curl -sSL https://get.rvm.io | bash -s stable --ruby=jruby-1.7 + apt-get install openjdk-8-jre ca-certificates-java git curl -y -q + curl -sSL https://rvm.io/mpapis.asc | sudo gpg --import - + curl -sSL https://get.rvm.io | bash -s stable --ruby=#{JRUBY_VERSION} usermod -a -G rvm vagrant EOP end @@ -28,8 +26,8 @@ Vagrant.configure(2) do |config| centos.vm.provision 'shell', inline: <<-EOP yum update yum install java-1.7.0-openjdk - gpg2 --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 - curl -sSL https://get.rvm.io | bash -s stable --ruby=jruby-1.7 + curl -sSL https://rvm.io/mpapis.asc | sudo gpg --import - + curl -sSL https://get.rvm.io | bash -s stable --ruby=#{JRUBY_VERSION} usermod -a -G rvm vagrant EOP end diff --git a/logstash-output-jdbc.gemspec b/logstash-output-jdbc.gemspec index bd8ef48..ad8ee48 100644 --- a/logstash-output-jdbc.gemspec +++ b/logstash-output-jdbc.gemspec @@ -1,6 +1,6 @@ Gem::Specification.new do |s| s.name = 'logstash-output-jdbc' - s.version = '5.2.1' + s.version = '5.3.0.rc1' s.licenses = ['Apache License (2.0)'] s.summary = 'This plugin allows you to output to SQL, via JDBC' s.description = "This gem is a logstash plugin required to be installed on top of the Logstash core pipeline using $LS_HOME/bin/logstash-plugin install 'logstash-output-jdbc'. This gem is not a stand-alone program" @@ -26,8 +26,8 @@ Gem::Specification.new do |s| s.add_runtime_dependency 'stud' s.add_runtime_dependency 'logstash-codec-plain' - s.requirements << "jar 'com.zaxxer:HikariCP', '2.6.1'" - s.requirements << "jar 'org.apache.logging.log4j:log4j-slf4j-impl', '2.6.2'" + s.requirements << "jar 'com.zaxxer:HikariCP', '2.7.2'" + s.requirements << "jar 'org.apache.logging.log4j:log4j-slf4j-impl', '2.9.1'" s.add_development_dependency 'jar-dependencies' s.add_development_dependency 'ruby-maven', '~> 3.3'