svn commit: r1847892 - in /ofbiz/ofbiz-framework/branches/release17.12: ./ build.gradle

Author: jleroux
Date: Sat Dec  1 12:36:27 2018
New Revision: 1847892

URL: http://svn.apache.org/viewvc?rev=1847892&view=rev
Log:
"Applied fix from trunk for revision: 1847890"
------------------------------------------------------------------------
r1847890 | jleroux | 2018-12-01 13:30:50 +0100 (sam. 01 déc. 2018) | 18 lignes

Fixed: Create a PoC for a documentation system for OFBiz based on Asciidoc
(OFBIZ-9873)

At r1831619 we committed a workaround to "turn off PDF in windows for now"

I have found a real solution for this bug which prevents to check PDF results in
Windows because the PDF were not generated there.

I found this solution at
https://github.com/asciidoctor/asciidoctorj-pdf/issues/8.
After reading https://github.com/asciidoctor/asciidoctor-pdf/issues/850 
I checked it also works on Linux.

It uses the last version of jruby-complete.

I guess the gradle-versions-plugin should be able to warn us when an upgrade of
jruby-complete is available like it does for junitReport.

------------------------------------------------------------------------

Modified:
    ofbiz/ofbiz-framework/branches/release17.12/   (props changed)
    ofbiz/ofbiz-framework/branches/release17.12/build.gradle

Propchange: ofbiz/ofbiz-framework/branches/release17.12/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Dec  1 12:36:27 2018
@@ -10,4 +10,4 @@
 /ofbiz/branches/json-integration-refactoring:1634077-1635900
 /ofbiz/branches/multitenant20100310:921280-927264
 /ofbiz/branches/release13.07:1547657
-/ofbiz/ofbiz-framework/trunk:1819499,1819598,1819800,1819805,1819811,1820038,1820262,1820374-1820375,1820441,1820457,1820644,1820658,1820790,1820823,1820949,1820966,1821012,1821036,1821112,1821115,1821144,1821186,1821219,1821226,1821230,1821386,1821613,1821628,1821965,1822125,1822310,1822377,1822383,1822393,1823467,1823562,1823876,1824314,1824316,1824732,1824803,1824847,1824855,1825192,1825211,1825216,1825233,1825450,1826374,1826502,1826592,1826671,1826674,1826805,1826938,1826997,1827439,1828255,1828316,1828346,1828424,1828512,1828514,1829690,1830936,1831074,1831078,1831234,1831608,1831831,1832577,1832662,1832756,1832800,1832944,1833173,1833211,1834181,1834191,1834736,1835235,1835887,1835891,1835953,1835964,1836144,1836871,1837857,1838032,1838256,1838381,1840189,1840199,1840828,1841657,1841662,1842372,1842921,1843225,1843893,1844943,1845418,1845420,1845466,1845544,1845552,1845558,1845933,1845995,1846097,1846107,1846214,1846594,1846632,1847398,1847670,1847715
+/ofbiz/ofbiz-framework/trunk:1819499,1819598,1819800,1819805,1819811,1820038,1820262,1820374-1820375,1820441,1820457,1820644,1820658,1820790,1820823,1820949,1820966,1821012,1821036,1821112,1821115,1821144,1821186,1821219,1821226,1821230,1821386,1821613,1821628,1821965,1822125,1822310,1822377,1822383,1822393,1823467,1823562,1823876,1824314,1824316,1824732,1824803,1824847,1824855,1825192,1825211,1825216,1825233,1825450,1826374,1826502,1826592,1826671,1826674,1826805,1826938,1826997,1827439,1828255,1828316,1828346,1828424,1828512,1828514,1829690,1830936,1831074,1831078,1831234,1831608,1831831,1832577,1832662,1832756,1832800,1832944,1833173,1833211,1834181,1834191,1834736,1835235,1835887,1835891,1835953,1835964,1836144,1836871,1837857,1838032,1838256,1838381,1840189,1840199,1840828,1841657,1841662,1842372,1842921,1843225,1843893,1844943,1845418,1845420,1845466,1845544,1845552,1845558,1845933,1845995,1846097,1846107,1846214,1846594,1846632,1847398,1847670,1847715,1847890

Modified: ofbiz/ofbiz-framework/branches/release17.12/build.gradle
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release17.12/build.gradle?rev=1847892&r1=1847891&r2=1847892&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/branches/release17.12/build.gradle (original)
+++ ofbiz/ofbiz-framework/branches/release17.12/build.gradle Sat Dec  1 12:36:27 2018
@@ -183,6 +183,9 @@ dependencies {
     // libs needed for junitreport
     junitReport 'junit:junit:4.12'
     junitReport 'org.apache.ant:ant-junit:1.9.7'
+    
+    // bug workaround - see OFBIZ-9873
+    asciidoctor 'org.jruby:jruby-complete:9.2.4.0'
 
     // local libs
     getDirectoryInActiveComponentsIfExists('lib').each { libDir ->
@@ -495,12 +498,7 @@ task createTenant(group: ofbizServer, de
 
 // ========== Documentation tasks ==========
 tasks.withType(AsciidoctorTask) { task ->
-    // bug workaround - see OFBIZ-9873
-    if (os.contains('windows')) {
-        backends 'html5'
-    } else {
-        backends 'html5', 'pdf'
-    }
+    backends 'html5', 'pdf'
     attributes \
         'doctype': 'book',
         'experimental': '',