openwebbeans-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rmannibu...@apache.org
Subject svn commit: r1855377 - in /openwebbeans/meecrowave/trunk/meecrowave-doc/src/main: java/org/apache/meecrowave/doc/generator/GradleConfiguration.java jbake/templates/footer.gsp jbake/templates/header.gsp
Date Wed, 13 Mar 2019 08:31:25 GMT
Author: rmannibucau
Date: Wed Mar 13 08:31:25 2019
New Revision: 1855377

URL: http://svn.apache.org/viewvc?rev=1855377&view=rev
Log:
small tweaks of the highlight.js setup in our theme and better default rendering for gradle
options

Modified:
    openwebbeans/meecrowave/trunk/meecrowave-doc/src/main/java/org/apache/meecrowave/doc/generator/GradleConfiguration.java
    openwebbeans/meecrowave/trunk/meecrowave-doc/src/main/jbake/templates/footer.gsp
    openwebbeans/meecrowave/trunk/meecrowave-doc/src/main/jbake/templates/header.gsp

Modified: openwebbeans/meecrowave/trunk/meecrowave-doc/src/main/java/org/apache/meecrowave/doc/generator/GradleConfiguration.java
URL: http://svn.apache.org/viewvc/openwebbeans/meecrowave/trunk/meecrowave-doc/src/main/java/org/apache/meecrowave/doc/generator/GradleConfiguration.java?rev=1855377&r1=1855376&r2=1855377&view=diff
==============================================================================
--- openwebbeans/meecrowave/trunk/meecrowave-doc/src/main/java/org/apache/meecrowave/doc/generator/GradleConfiguration.java
(original)
+++ openwebbeans/meecrowave/trunk/meecrowave-doc/src/main/java/org/apache/meecrowave/doc/generator/GradleConfiguration.java
Wed Mar 13 08:31:25 2019
@@ -19,6 +19,7 @@
 package org.apache.meecrowave.doc.generator;
 
 import static java.util.Comparator.comparing;
+import static java.util.Optional.ofNullable;
 import static java.util.stream.Collectors.joining;
 
 import java.lang.reflect.Field;
@@ -43,7 +44,7 @@ public class GradleConfiguration extends
     private String toLine(final Field opt) {
         opt.setAccessible(true);
         try {
-            return '|' + opt.getName() + '|' + opt.get(defaults) + '|' + findDescription(opt.getName());
+            return '|' + opt.getName() + '|' + ofNullable(opt.get(defaults)).orElse("-")
+ '|' + findDescription(opt.getName());
         } catch (final IllegalAccessException e) {
             throw new IllegalStateException(e);
         }

Modified: openwebbeans/meecrowave/trunk/meecrowave-doc/src/main/jbake/templates/footer.gsp
URL: http://svn.apache.org/viewvc/openwebbeans/meecrowave/trunk/meecrowave-doc/src/main/jbake/templates/footer.gsp?rev=1855377&r1=1855376&r2=1855377&view=diff
==============================================================================
--- openwebbeans/meecrowave/trunk/meecrowave-doc/src/main/jbake/templates/footer.gsp (original)
+++ openwebbeans/meecrowave/trunk/meecrowave-doc/src/main/jbake/templates/footer.gsp Wed Mar
13 08:31:25 2019
@@ -19,7 +19,11 @@
     <script type="text/javascript" src="/meecrowave/assets/plugins/jquery-1.12.3.min.js"></script>
     <script type="text/javascript" src="/meecrowave/assets/plugins/bootstrap/js/bootstrap.min.js"></script>
     <script type="text/javascript" src="/meecrowave/assets/plugins/jquery-match-height/jquery.matchHeight-min.js"></script>
-    <script type="text/javascript" src="//cdnjs.cloudflare.com/ajax/libs/highlight.js/9.9.0/highlight.min.js"></script>
+    <script src="//cdnjs.cloudflare.com/ajax/libs/highlight.js/9.15.6/highlight.min.js"
integrity="sha256-aYTdUrn6Ow1DDgh5JTc3aDGnnju48y/1c8s1dgkYPQ8=" crossorigin="anonymous"></script>
+    <script src="//cdnjs.cloudflare.com/ajax/libs/highlight.js/9.15.6/languages/java.min.js"
integrity="sha256-21Z1xKC/FsaqN9z9jIER9xiX4XbV5buFEVdkZvsfBIc=" crossorigin="anonymous"></script>
+    <script src="//cdnjs.cloudflare.com/ajax/libs/highlight.js/9.15.6/languages/groovy.min.js"
integrity="sha256-0B+Ps1zCncLC5JIOQ+MtIhI/UhbJkYbxWsJowD3c+tk=" crossorigin="anonymous"></script>
+    <script src="//cdnjs.cloudflare.com/ajax/libs/highlight.js/9.15.6/languages/shell.min.js"
integrity="sha256-nwOM3xEc6CFfrPNDN1upX+5ynjWKAXsg+bW63SSzte0=" crossorigin="anonymous"></script>
+    <script src="//cdnjs.cloudflare.com/ajax/libs/highlight.js/9.15.6/languages/bash.min.js"
integrity="sha256-zXrlim8wsIvcEFjsD3THiAfTvtPZifqx8q0rxegiWQc=" crossorigin="anonymous"></script>
     <script type="text/javascript" src="/meecrowave/assets/js/main.js?version=1"></script>
 
 </body>

Modified: openwebbeans/meecrowave/trunk/meecrowave-doc/src/main/jbake/templates/header.gsp
URL: http://svn.apache.org/viewvc/openwebbeans/meecrowave/trunk/meecrowave-doc/src/main/jbake/templates/header.gsp?rev=1855377&r1=1855376&r2=1855377&view=diff
==============================================================================
--- openwebbeans/meecrowave/trunk/meecrowave-doc/src/main/jbake/templates/header.gsp (original)
+++ openwebbeans/meecrowave/trunk/meecrowave-doc/src/main/jbake/templates/header.gsp Wed Mar
13 08:31:25 2019
@@ -18,7 +18,7 @@
     <link rel="stylesheet" href="/meecrowave/assets/plugins/font-awesome/css/font-awesome.min.css">
     <link rel="stylesheet" href="/meecrowave/assets/plugins/elegant_font/css/style.css?version=1">
     <!-- highlighting -->
-    <link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/highlight.js/9.9.0/styles/idea.min.css">
+    <link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/highlight.js/9.15.6/styles/idea.min.css"
integrity="sha256-rYB1c4yTU5UJB//rod7DtBo1JM6HAme/9Vd+VesFG2U=" crossorigin="anonymous" />
 
     <!-- Theme CSS -->
     <link id="theme-style" rel="stylesheet" href="/meecrowave/assets/css/styles.css">



Mime
View raw message