Bumps Vagrant env. Bumps jar deps. Bumps version number, ready for tagging after tests

This commit is contained in:
Karl Southern 2017-11-08 13:45:29 +00:00
parent 7a2996e985
commit f48c12a8da
2 changed files with 11 additions and 13 deletions

18
Vagrantfile vendored
View File

@ -1,21 +1,19 @@
# -*- mode: ruby -*- # -*- mode: ruby -*-
# vi: set ft=ruby : # vi: set ft=ruby :
JRUBY_VERSION = "jruby-1.7"
Vagrant.configure(2) do |config| Vagrant.configure(2) do |config|
config.vm.define "debian" do |deb| 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.synced_folder '.', '/vagrant', type: :virtualbox
deb.vm.provision 'shell', inline: <<-EOP 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 update
apt-get remove openjdk-7-jre-headless -y -q apt-get install openjdk-8-jre ca-certificates-java git curl -y -q
apt-get install -t jessie-backports openjdk-8-jre ca-certificates-java curl -sSL https://rvm.io/mpapis.asc | sudo gpg --import -
apt-get install git curl -y -q curl -sSL https://get.rvm.io | bash -s stable --ruby=#{JRUBY_VERSION}
gpg --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3
curl -sSL https://get.rvm.io | bash -s stable --ruby=jruby-1.7
usermod -a -G rvm vagrant usermod -a -G rvm vagrant
EOP EOP
end end
@ -28,8 +26,8 @@ Vagrant.configure(2) do |config|
centos.vm.provision 'shell', inline: <<-EOP centos.vm.provision 'shell', inline: <<-EOP
yum update yum update
yum install java-1.7.0-openjdk yum install java-1.7.0-openjdk
gpg2 --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 curl -sSL https://rvm.io/mpapis.asc | sudo gpg --import -
curl -sSL https://get.rvm.io | bash -s stable --ruby=jruby-1.7 curl -sSL https://get.rvm.io | bash -s stable --ruby=#{JRUBY_VERSION}
usermod -a -G rvm vagrant usermod -a -G rvm vagrant
EOP EOP
end end

View File

@ -1,6 +1,6 @@
Gem::Specification.new do |s| Gem::Specification.new do |s|
s.name = 'logstash-output-jdbc' s.name = 'logstash-output-jdbc'
s.version = '5.2.1' s.version = '5.3.0.rc1'
s.licenses = ['Apache License (2.0)'] s.licenses = ['Apache License (2.0)']
s.summary = 'This plugin allows you to output to SQL, via JDBC' 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" 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 'stud'
s.add_runtime_dependency 'logstash-codec-plain' s.add_runtime_dependency 'logstash-codec-plain'
s.requirements << "jar 'com.zaxxer:HikariCP', '2.6.1'" s.requirements << "jar 'com.zaxxer:HikariCP', '2.7.2'"
s.requirements << "jar 'org.apache.logging.log4j:log4j-slf4j-impl', '2.6.2'" s.requirements << "jar 'org.apache.logging.log4j:log4j-slf4j-impl', '2.9.1'"
s.add_development_dependency 'jar-dependencies' s.add_development_dependency 'jar-dependencies'
s.add_development_dependency 'ruby-maven', '~> 3.3' s.add_development_dependency 'ruby-maven', '~> 3.3'