Merge pull request #2808 from justinstoller/SERVER-3264

(SERVER-3264) Add stdlib gems that JRuby now installs as part of their build process

Author: donoghuc

dev-setup

@@ -20,6 +20,13 @@ do
   gem_list+=("$gem_name:$gem_version")
 done < ./resources/ext/build-scripts/jruby-gem-list.txt
 
+while read LINE
+do
+  gem_name=$(echo $LINE |awk '{print $1}')
+  gem_version=$(echo $LINE |awk '{print $2}')
+  gem_list+=("$gem_name:$gem_version")
+done < ./resources/ext/build-scripts/jruby-stdlib-gem-list.txt
+
 echo "Installing vendored gems to '${VENDORED_GEMS_HOME}'"
 lein gem install --install-dir "${VENDORED_GEMS_HOME}" --no-document "${gem_list[@]}"
 

dev/install-test-gems.sh

@@ -11,5 +11,12 @@ do
   gem_list+=("$gem_name:$gem_version")
 done < ./resources/ext/build-scripts/jruby-gem-list.txt
 
+while read LINE
+do
+  gem_name=$(echo $LINE |awk '{print $1}')
+  gem_version=$(echo $LINE |awk '{print $2}')
+  gem_list+=("$gem_name:$gem_version")
+done < ./resources/ext/build-scripts/jruby-stdlib-gem-list.txt
+
 echo "Installing vendored gems to '${VENDORED_GEMS_HOME}'"
 $LEIN gem install --install-dir "${VENDORED_GEMS_HOME}" --no-document "${gem_list[@]}"

resources/ext/build-scripts/install-vendored-gems.sh

@@ -33,6 +33,13 @@ echo "jruby-puppet: { gem-home: ${DESTDIR}/opt/puppetlabs/server/data/puppetserv
 
 install_gems "${DIR}/jruby-gem-list.txt"
 
+echo "Installing JRuby Standard Library gems"
+cat "${DIR}/jruby-stdlib-gem-list.txt"
+
+echo "jruby-puppet: { gem-home: ${DESTDIR}/opt/puppetlabs/server/data/puppetserver/vendored-jruby-gems }" > jruby.conf
+
+install_gems "${DIR}/jruby-stdlib-gem-list.txt"
+
 # We need to ignore dependencies to prevent puppetserver-ca from being installed
 # with facter2 (from gem dependency resolution) and facter3 (from puppet-agent packages)
 # If puppetserver ever loses its dependency on puppet-agent or if puppet-agent ever loses

resources/ext/build-scripts/jruby-stdlib-gem-list.txt

@@ -0,0 +1,12 @@
+matrix 0.4.2
+minitest 5.15.0
+net-ftp 0.1.3
+net-imap 0.2.3
+net-pop 0.1.1
+net-smtp 0.3.1
+power_assert 2.0.1
+prime 0.1.2
+rake 13.0.6
+rexml 3.2.5
+rss 0.2.9
+test-unit 3.5.3