Skip to content

Commit

Permalink
[OC-49258] uprev mysql connector (#281)
Browse files Browse the repository at this point in the history
* chore(pom): uprev mysql connector

* chore(jenkinsfile): add build

* chore(pom): uprev maven-compiler-plugin

* chore(jenkinsfile): build on java8

* chore(jenkinsfile): build on ubuntu 20.04

* chore(gemfile): add rails

* chore(gemfile): update lockfile

* chore(gemfile): pin net-imap

* chore(gemfile): uprev deps

* chore(gemfile): pin sprockets

* chore(jenkinsfile): test with mysql

* chore(gemfile): remove deps

let's see if we can use the deps from the mysql lockfile instead

* chore(gemfile): update source

* chore(gemfile): pin bigdecimal

* chore(gemfile): uprev database_1 deps

* chore(jenkinsfile): use db creds

* chore(gemfile): uprev database_2 deps
  • Loading branch information
johnjelinek authored Feb 23, 2024
1 parent cbe48f8 commit 37c20c9
Show file tree
Hide file tree
Showing 10 changed files with 194 additions and 138 deletions.
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
source 'http://rubygems.org'
source 'https://public-gems.liveramp.net'

gem 'activesupport', '~> 4.2.8'
gem 'bigdecimal', '1.3.5'
Expand Down
32 changes: 16 additions & 16 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,31 +1,31 @@
GEM
remote: http://rubygems.org/
remote: https://public-gems.liveramp.net/
specs:
activesupport (4.2.11.3)
i18n (~> 0.7)
minitest (~> 5.1)
thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
bigdecimal (1.3.5)
concurrent-ruby (1.0.5)
diff-lcs (1.3)
concurrent-ruby (1.2.3)
diff-lcs (1.5.1)
fattr (2.4.0)
i18n (0.9.1)
i18n (0.9.5)
concurrent-ruby (~> 1.0)
minitest (5.18.0)
rspec (3.7.0)
rspec-core (~> 3.7.0)
rspec-expectations (~> 3.7.0)
rspec-mocks (~> 3.7.0)
rspec-core (3.7.1)
rspec-support (~> 3.7.0)
rspec-expectations (3.7.0)
minitest (5.22.2)
rspec (3.13.0)
rspec-core (~> 3.13.0)
rspec-expectations (~> 3.13.0)
rspec-mocks (~> 3.13.0)
rspec-core (3.13.0)
rspec-support (~> 3.13.0)
rspec-expectations (3.13.0)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.7.0)
rspec-mocks (3.7.0)
rspec-support (~> 3.13.0)
rspec-mocks (3.13.0)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.7.0)
rspec-support (3.7.1)
rspec-support (~> 3.13.0)
rspec-support (3.13.0)
thread_safe (0.3.6)
tzinfo (1.2.11)
thread_safe (~> 0.1)
Expand Down
9 changes: 9 additions & 0 deletions Jenkinsfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
@Library('liveramp-base@v2') _

mvnBuildPipeline {
agentLabel = 'ubuntu-2004'
environment {
JAVA_HOME = '/usr/lib/jvm/java-8-openjdk-amd64'
}
mavenPropertiesOverride = '-Dmaven.test.failure.ignore=false -Ddb.user=$HUDSON_DB_USER -Ddb.pass=$HUDSON_DB_PASS -Pmysql'
}
4 changes: 2 additions & 2 deletions jack-mysql/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@
</dependency>

<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<groupId>com.mysql</groupId>
<artifactId>mysql-connector-j</artifactId>
</dependency>

</dependencies>
Expand Down
4 changes: 2 additions & 2 deletions jack-test/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,8 @@
</dependency>

<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<groupId>com.mysql</groupId>
<artifactId>mysql-connector-j</artifactId>
</dependency>

<dependency>
Expand Down
129 changes: 75 additions & 54 deletions jack-test/test/test_project/database_1/Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,106 +1,127 @@
GEM
remote: http://rubygems.org/
remote: https://public-gems.liveramp.net/
specs:
actionmailer (4.2.10)
actionpack (= 4.2.10)
actionview (= 4.2.10)
activejob (= 4.2.10)
actionmailer (4.2.11.3)
actionpack (= 4.2.11.3)
actionview (= 4.2.11.3)
activejob (= 4.2.11.3)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 1.0, >= 1.0.5)
actionpack (4.2.10)
actionview (= 4.2.10)
activesupport (= 4.2.10)
actionpack (4.2.11.3)
actionview (= 4.2.11.3)
activesupport (= 4.2.11.3)
rack (~> 1.6)
rack-test (~> 0.6.2)
rails-dom-testing (~> 1.0, >= 1.0.5)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
actionview (4.2.10)
activesupport (= 4.2.10)
actionview (4.2.11.3)
activesupport (= 4.2.11.3)
builder (~> 3.1)
erubis (~> 2.7.0)
rails-dom-testing (~> 1.0, >= 1.0.5)
rails-html-sanitizer (~> 1.0, >= 1.0.3)
activejob (4.2.10)
activesupport (= 4.2.10)
activejob (4.2.11.3)
activesupport (= 4.2.11.3)
globalid (>= 0.3.0)
activemodel (4.2.10)
activesupport (= 4.2.10)
activemodel (4.2.11.3)
activesupport (= 4.2.11.3)
builder (~> 3.1)
activerecord (4.2.10)
activemodel (= 4.2.10)
activesupport (= 4.2.10)
activerecord (4.2.11.3)
activemodel (= 4.2.11.3)
activesupport (= 4.2.11.3)
arel (~> 6.0)
activesupport (4.2.10)
activesupport (4.2.11.3)
i18n (~> 0.7)
minitest (~> 5.1)
thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
arel (6.0.4)
builder (3.2.3)
concurrent-ruby (1.0.5)
crass (1.0.4)
bigdecimal (1.3.5)
builder (3.2.4)
concurrent-ruby (1.2.3)
crass (1.0.6)
date (3.3.4)
erubis (2.7.0)
globalid (0.4.1)
globalid (0.4.2)
activesupport (>= 4.2.0)
i18n (0.9.5)
concurrent-ruby (~> 1.0)
loofah (2.2.2)
loofah (2.22.0)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
mail (2.7.0)
nokogiri (>= 1.12.0)
mail (2.8.1)
mini_mime (>= 0.1.1)
mini_mime (1.0.0)
mini_portile2 (2.3.0)
minitest (5.11.3)
mysql2 (0.4.10)
nokogiri (1.8.2)
mini_portile2 (~> 2.3.0)
rack (1.6.10)
net-imap
net-pop
net-smtp
mini_mime (1.1.5)
mini_portile2 (2.8.5)
minitest (5.22.2)
mysql2 (0.5.6)
net-imap (0.3.7)
date
net-protocol
net-pop (0.1.2)
net-protocol
net-protocol (0.2.2)
timeout
net-smtp (0.4.0.1)
net-protocol
nokogiri (1.15.5)
mini_portile2 (~> 2.8.2)
racc (~> 1.4)
racc (1.7.3)
rack (1.6.13)
rack-test (0.6.3)
rack (>= 1.0)
rails (4.2.10)
actionmailer (= 4.2.10)
actionpack (= 4.2.10)
actionview (= 4.2.10)
activejob (= 4.2.10)
activemodel (= 4.2.10)
activerecord (= 4.2.10)
activesupport (= 4.2.10)
rails (4.2.11.3)
actionmailer (= 4.2.11.3)
actionpack (= 4.2.11.3)
actionview (= 4.2.11.3)
activejob (= 4.2.11.3)
activemodel (= 4.2.11.3)
activerecord (= 4.2.11.3)
activesupport (= 4.2.11.3)
bundler (>= 1.3.0, < 2.0)
railties (= 4.2.10)
railties (= 4.2.11.3)
sprockets-rails
rails-deprecated_sanitizer (1.0.3)
rails-deprecated_sanitizer (1.0.4)
activesupport (>= 4.2.0.alpha)
rails-dom-testing (1.0.9)
activesupport (>= 4.2.0, < 5.0)
nokogiri (~> 1.6)
rails-deprecated_sanitizer (>= 1.0.1)
rails-html-sanitizer (1.0.4)
loofah (~> 2.2, >= 2.2.2)
railties (4.2.10)
actionpack (= 4.2.10)
activesupport (= 4.2.10)
rails-html-sanitizer (1.6.0)
loofah (~> 2.21)
nokogiri (~> 1.14)
railties (4.2.11.3)
actionpack (= 4.2.11.3)
activesupport (= 4.2.11.3)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rake (12.3.1)
sprockets (3.7.1)
rake (13.1.0)
sprockets (3.7.2)
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
sprockets-rails (3.2.1)
sprockets-rails (3.2.2)
actionpack (>= 4.0)
activesupport (>= 4.0)
sprockets (>= 3.0.0)
thor (0.20.0)
thor (1.3.0)
thread_safe (0.3.6)
tzinfo (1.2.5)
timeout (0.4.1)
tzinfo (1.2.11)
thread_safe (~> 0.1)

PLATFORMS
ruby

DEPENDENCIES
mysql2 (~> 0.4.2)
bigdecimal (= 1.3.5)
mysql2 (~> 0.5.6)
net-imap (~> 0.3.7)
rails (~> 4.2.10)
sprockets (~> 3.7)

BUNDLED WITH
1.16.1
1.17.3
7 changes: 5 additions & 2 deletions jack-test/test/test_project/database_1/Gemfile.mysql
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
source 'http://rubygems.org'
source 'https://public-gems.liveramp.net'

gem 'bigdecimal', '1.3.5'
gem 'net-imap', '~> 0.3.7'
gem 'rails', '~> 4.2.10'
gem 'sprockets', '~> 3.7'

# Bundle edge Rails instead:
# gem 'rails', :git => 'git://github.com/rails/rails.git'

gem 'mysql2', '~> 0.4.2'
gem 'mysql2', '~> 0.5.6'

# Use unicorn as the web server
# gem 'unicorn'
Expand Down
Loading

0 comments on commit 37c20c9

Please sign in to comment.