Merge branch 'DEVELOP_BE' of ssh://172.18.22.160:29418/oK/PlannedGridMeasures/mics-backend into DEVELOP_BE
diff --git a/pom.xml b/pom.xml
index e1837c9..cdc20cb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -328,6 +328,11 @@
<version>${asciidoctor-maven-plugin-version}</version>
<dependencies>
<dependency>
+ <groupId>org.jruby</groupId>
+ <artifactId>jruby-complete</artifactId>
+ <version>${jruby-complete-version}</version>
+ </dependency>
+ <dependency>
<groupId>org.asciidoctor</groupId>
<artifactId>asciidoctorj-pdf</artifactId>
<version>${asciidoctorj-pdf-version}</version>
@@ -343,7 +348,7 @@
<version>${asciidoctorj-diagram-versions}</version>
</dependency>
</dependencies>
- <configuration>
+ <configuration>
<sourceDirectory>src/main/asciidoc</sourceDirectory>
<requires>
<require>asciidoctor-diagram</require>
@@ -354,8 +359,7 @@
</attributes>
</configuration>
<executions>
-
- <execution>
+ <execution>
<id>output-html</id>
<phase>generate-resources</phase>
<goals>
@@ -370,10 +374,9 @@
<sourceHighlighter>coderay</sourceHighlighter>
<backend>html</backend>
<doctype>book</doctype>
- <imagesDir>./images</imagesDir>
</configuration>
</execution>
- <!--execution>
+ <execution>
<id>output-pdf</id>
<phase>generate-resources</phase>
<goals>
@@ -388,7 +391,6 @@
<sourceHighlighter>coderay</sourceHighlighter>
<backend>pdf</backend>
<doctype>book</doctype>
- <imagesDir>./images</imagesDir>
<attributes>
<icons>font</icons>
<pagenums />
@@ -397,7 +399,7 @@
<idseparator>-</idseparator>
</attributes>
</configuration>
- </execution-->
+ </execution>
</executions>
</plugin>
<plugin>
