From 74e9b0a6ae25a604c3cee924620842f40bccb819 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guillermo=20Gonz=C3=A1lez=20de=20Ag=C3=BCero?= Date: Sat, 8 Sep 2018 14:14:06 +0200 Subject: [PATCH 1/2] Initial fixes for compiling the website --- Gemfile | 10 +++++----- README.asciidoc | 6 +++--- _ext/javadoc.rb | 5 ++++- _ext/pipeline.rb | 2 +- 4 files changed, 13 insertions(+), 10 deletions(-) diff --git a/Gemfile b/Gemfile index 5414607..8fc7541 100644 --- a/Gemfile +++ b/Gemfile @@ -29,12 +29,12 @@ source "https://rubygems.org" -ruby '1.9.3', :engine => 'jruby', :engine_version => '1.7.17' +ruby '1.9.3', :engine => 'jruby', :engine_version => '1.7.27' gem "awestruct", "0.5.5" -gem "slim" -gem "kramdown" +gem "slim", "2.1.0" +gem "kramdown", "1.4.1" gem "asciidoctor" gem "uglifier" gem "htmlcompressor" @@ -42,7 +42,7 @@ gem "coffee-script" gem "rest-client" gem "hpricot" -gem "git" +gem "git", "1.2.8" gem "bouncy-castle-java", :platforms => :jruby gem "therubyrhino", :platforms => :jruby @@ -50,5 +50,5 @@ gem "therubyracer", "0.10.1", :platforms => :ruby gem "jruby-openssl", :platforms => :jruby gem "rb-inotify", :platforms => [:ruby, :jruby] -gem "puma" +gem "puma", "2.10.2" gem "rspec", ">= 2.9" diff --git a/README.asciidoc b/README.asciidoc index a69fc3c..37dcd91 100644 --- a/README.asciidoc +++ b/README.asciidoc @@ -17,7 +17,7 @@ The website rely on running some Java code, e.g. JavaDoc, so we need to use JRub [source,console] ---- -rvm install jruby-1.7.9 +rvm install jruby-1.7.27 ---- NOTE: If the install aborts with messages regarding permission errors, try re executing with root permissions; "sudo rvm.." @@ -53,7 +53,7 @@ javaee-samples Create file *.ruby-version* in your favorite editor and add this as content: [source,ruby] ---- -jruby-1.7.9 +jruby-1.7.27 ---- At this point you can allow RVM to pickup the new environment settings by leaving the folder and re-entering. @@ -70,7 +70,7 @@ Run the next command to verify that the environment is picked up correctly: rvm info ---- -The first line should tell you something like *jruby-1.7.9@javaee-samples*. +The first line should tell you something like *jruby-1.7.27@javaee-samples*. Then on to the Awestruct bits! diff --git a/_ext/javadoc.rb b/_ext/javadoc.rb index 837b8cd..da737c2 100644 --- a/_ext/javadoc.rb +++ b/_ext/javadoc.rb @@ -7,6 +7,9 @@ module Java module Doc def self.parse(source_path, quiet = true, &block) + print '-----------------------------------------------------------:wq' + print ENV['JAVA_HOME'] + context = com.sun.tools.javac.util.Context.new options = com.sun.tools.javac.util.Options.instance context @@ -27,7 +30,7 @@ def self.parse(source_path, quiet = true, &block) com.sun.tools.javadoc.DocEnv.instance(context).silent = quiet - root = tool.getRootDocImpl('en', 'ascii', filter, empty, empty, options_list, false, sub_packages, empty, false, false, quiet) + root = tool.getRootDocImpl('en', 'ascii', filter, empty, options_list, false, sub_packages, empty, false, false, quiet) block.call(root) if block return root diff --git a/_ext/pipeline.rb b/_ext/pipeline.rb index d1e13e6..dc8857e 100644 --- a/_ext/pipeline.rb +++ b/_ext/pipeline.rb @@ -36,7 +36,7 @@ extension Awestruct::Extensions::Indexifier.new extension Awestruct::Extensions::Sitemap.new - extension Awestruct::Extensions::Jenkins::Jobs.new('https://javaee-support.ci.cloudbees.com/') + #extension Awestruct::Extensions::Jenkins::Jobs.new('https://javaee-support.ci.cloudbees.com/') # Must be after all other extensions that might populate identities extension Awestruct::Extensions::Identities::Cache.new From c8400d093d160763427daeb2eea4ea1fd01c4fd3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guillermo=20Gonz=C3=A1lez=20de=20Ag=C3=BCero?= Date: Sat, 8 Sep 2018 14:16:47 +0200 Subject: [PATCH 2/2] Fixes --- _ext/javadoc.rb | 3 --- _ext/pipeline.rb | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/_ext/javadoc.rb b/_ext/javadoc.rb index da737c2..635a715 100644 --- a/_ext/javadoc.rb +++ b/_ext/javadoc.rb @@ -7,9 +7,6 @@ module Java module Doc def self.parse(source_path, quiet = true, &block) - print '-----------------------------------------------------------:wq' - print ENV['JAVA_HOME'] - context = com.sun.tools.javac.util.Context.new options = com.sun.tools.javac.util.Options.instance context diff --git a/_ext/pipeline.rb b/_ext/pipeline.rb index dc8857e..d1e13e6 100644 --- a/_ext/pipeline.rb +++ b/_ext/pipeline.rb @@ -36,7 +36,7 @@ extension Awestruct::Extensions::Indexifier.new extension Awestruct::Extensions::Sitemap.new - #extension Awestruct::Extensions::Jenkins::Jobs.new('https://javaee-support.ci.cloudbees.com/') + extension Awestruct::Extensions::Jenkins::Jobs.new('https://javaee-support.ci.cloudbees.com/') # Must be after all other extensions that might populate identities extension Awestruct::Extensions::Identities::Cache.new