DELTASPIKE-1481 upgrade to Apache parent 35 and fix asciidoc

We had a very old asciidoc-maven-plugin. I had to fix a bit in the
configuration and also update our ancient ruby scripts because
newer Ruby doesn't allow to modify constants.

Author: struberg

documentation/src/main/asciidoc/bean-validation.adoc

@@ -48,7 +48,7 @@
     <url>http://deltaspike.apache.org</url>
 
     <properties>
-        <asciidoctor.version>1.5.8</asciidoctor.version>
+        <asciidoctor.version>2.2.6</asciidoctor.version>
         <version.deltaspike.latest.stable>2.0.0</version.deltaspike.latest.stable>
         <version.deltaspike.latest.snapshot>2.0.1-SNAPSHOT</version.deltaspike.latest.snapshot>
         <svn.scmPubCheckoutDirectory>${project.build.directory}/co-site</svn.scmPubCheckoutDirectory>
@@ -88,7 +88,6 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-scm-publish-plugin</artifactId>
-                    <version>1.1</version>
                     <configuration>
                         <content>${project.reporting.outputDirectory}</content>
                         <pubScmUrl>scm:svn:${svn.scmPubUrl}</pubScmUrl>
@@ -107,28 +106,30 @@
                     <configuration>
                         <sourceDirectory>src/main/asciidoc</sourceDirectory>
                         <outputDirectory>${project.reporting.outputDirectory}</outputDirectory>
-                        <sourceHighlighter>coderay</sourceHighlighter>
-                        <backend>html</backend>
-                        <templateDir>../template</templateDir>
+                        <backend>html5</backend>
                         <eruby>erb</eruby>
                         <preserveDirectories>true</preserveDirectories>
+                        <templateDirs>
+                            <templateDir>../template</templateDir>
+                        </templateDirs>
+                        <relativeBaseDir>true</relativeBaseDir>
                         <attributes>
                             <toc>true</toc>
                             <icons>font</icons>
                             <latestStable>${version.deltaspike.latest.stable}</latestStable>
                             <latestSnapshot>${version.deltaspike.latest.snapshot}</latestSnapshot>
+                            <sourceHighlighter>coderay</sourceHighlighter>
+                            <imagesdir>./images</imagesdir>
                         </attributes>
                     </configuration>
                 </plugin>
             </plugins>
         </pluginManagement>
 
         <plugins>
-            <!-- we need to tweak the maven-release-plugin for GIT -->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-release-plugin</artifactId>
-                <version>2.5.1</version>
                 <configuration>
                     <pushChanges>false</pushChanges>
                     <localCheckout>true</localCheckout>

pom.xml

@@ -169,32 +169,32 @@
     <div class="row-fluid">
 
         <%
-           MODULEDEPS = 'moduledeps' unless defined? MODULEDEPS
-           MODULECONF = 'moduleconf' unless defined? MODULECONF
-           MODULEBASE = 'modulebase' unless defined? MODULEBASE
-           CONF_LINK = "https://github.com/apache/deltaspike/blob/master/deltaspike/%{base}/%{proj}/src/main/java/%{fqn}.java" unless defined? CONF_LINK
+           $moduleDeps = 'moduledeps' unless defined? $moduleDeps
+           $moduleConf = 'moduleconf' unless defined? $moduleConf
+           $moduleBase = 'modulebase' unless defined? $moduleBase
+           $conf_link = "https://github.com/apache/deltaspike/blob/master/deltaspike/%{base}/%{proj}/src/main/java/%{fqn}.java" unless defined? $conf_link
 
            # module dependencies
            def dep_name(short_name)
              short_name.tr('-', ' ').capitalize
            end
 
            def has_deps?
-             if attributes.has_key?(MODULEDEPS) && !(attributes[MODULEDEPS].empty?)
-               attributes[MODULEDEPS].split(%r{\s*,\s*}).size > 0
+             if attributes.has_key?($moduleDeps) && !(attributes[$moduleDeps].empty?)
+               attributes[$moduleDeps].split(%r{\s*,\s*}).size > 0
              else
                false
              end
            end
 
            def deps_list()
-             attributes[MODULEDEPS].split(%r{\s*,\s*})
+             attributes[$moduleDeps].split(%r{\s*,\s*})
            end
 
            # module configuration
            def module_base()
-             if attributes.has_key?(MODULEBASE) && !(attributes[MODULEBASE].empty?)
-               attributes[MODULEBASE]
+             if attributes.has_key?($moduleBase) && !(attributes[$moduleBase].empty?)
+               attributes[$moduleBase]
              else
                'modules/' + attributes['docname']
              end
@@ -205,19 +205,19 @@
            end
 
            def conf_link(in_fqn)
-             CONF_LINK % { base: module_base(), proj: in_fqn.split(':')[0], fqn: in_fqn.split(':')[1].tr('.', '/') }
+             $conf_link % { base: module_base(), proj: in_fqn.split(':')[0], fqn: in_fqn.split(':')[1].tr('.', '/') }
            end
 
            def has_conf?
-             if attributes.has_key?(MODULECONF) && !(attributes[MODULECONF].empty?)
-               attributes[MODULECONF].split(%r{\s*,\s*}).size > 0
+             if attributes.has_key?($moduleConf) && !(attributes[$moduleConf].empty?)
+               attributes[$moduleConf].split(%r{\s*,\s*}).size > 0
              else
                false
              end
            end
 
            def conf_list()
-             attributes[MODULECONF].split(%r{\s*,\s*})
+             attributes[$moduleConf].split(%r{\s*,\s*})
            end
         %>
 
@@ -260,7 +260,7 @@
                 </div>
                 <% if is_toc? then %>
                     <div class="fallback-toc">
-                        <%= converter.convert_with_options @document, 'outline', :toclevels => 4 %>
+                        <%= converter.convert @document, 'outline', :toclevels => 4 %>
                     </div>
                 <% end %>
             </div>