--- a/specs/stx-jv.rbspec	Sat Oct 29 23:54:12 2016 +0000
+++ b/specs/stx-jv.rbspec	Wed Nov 02 00:18:25 2016 +0000
@@ -204,48 +204,6 @@
   # Smalltalk/X IDE
   application 'stx:projects/smalltalk', :repository => :'bitbucket:janvrany', :branch => 'jv'
 
-  if (ENV['USER'] == 'builder') || ( ENV['USER'] == 'vranyj1')  || (ENV['USERNAME'] == 'builder') || ( ENV['USERNAME'] == 'vranyj1') then
-    repository :'mirror:swing' do
-      type :hg
-      url "https://swing.fit.cvut.cz/hg"    
-      separator '-'
-    end
-
-    stx_libjava_checkouter =
-         Proc.new do | pkg, build_dir |
-             repo = :'mirror:swing'
-             puts "Checking out #{pkg.name} from #{repo} (cache / staging repo)..."
-             checkout repo, pkg.directory, :branch => pkg.branch, :package => pkg, :separator => '-'
-             puts "Checking out #{pkg.name} from #{repo} (cache)...done"
-
-             File.open(build_dir / 'stx' / 'libjava' / '.hg' / 'hgrc' , 'w') do | f |
-                 f.puts "[paths]"
-                 f.puts "default = https://bitbucket.org/janvrany/stx-libjava"
-             end
-
-             repo = pkg.repository
-             puts "Checking out #{pkg.name} from #{repo}..."
-             update repo, pkg.directory, :branch => pkg.branch, :package => pkg, :separator => pkg._separator
-             puts "Checking out #{pkg.name} from #{repo}...done"
-         end
-
-     stx_libjava_updater =
-         Proc.new do | pkg, build_dir |
-             repo = :'mirror:swing'
-             puts "Updating #{pkg.name} from #{repo} (cache / staging repo)..."
-             update repo, pkg.directory, :branch => pkg.branch, :package => pkg, :separator => '-'
-             puts "Checking out #{pkg.name} from #{repo} (cache)...done"
-
-             repo = pkg.repository
-             puts "Checking out #{pkg.name} from #{repo}..."
-             update repo, pkg.directory, :branch => pkg.branch, :package => pkg, :separator => pkg._separator
-             puts "Checking out #{pkg.name} from #{repo}...done"
-         end
-
-
-     package "stx:libjava", :checkout => stx_libjava_checkouter, :update => stx_libjava_updater
-  end
-
   package 'stx:libscm', :repository => :'bitbucket:janvrany'
   package 'stx:libscm/common', :repository => :'bitbucket:janvrany'
   package 'stx:libscm/mercurial', :repository => :'bitbucket:janvrany'
@@ -258,6 +216,7 @@
   package 'stx:goodies/smaCC',:repository => :'bitbucket:janvrany'
   package 'stx:goodies/regression',:repository => :'bitbucket:janvrany', :branch => 'jv', :link => false
   package "stx:goodies/builder", :repository => :'bitbucket:janvrany',:branch => 'jv', :link => false
+  package "stx:goodies/builder/reports"
 
   # Define a "default" test suite, i.e., a set of tests that are run when
   # user does `rake test`.