This is an automated email from the ASF dual-hosted git repository.
ilgrosso pushed a commit to branch 2_1_X
in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/2_1_X by this push:
new b8a2782 Upgrading Swagger UI and asciidoctor-maven-plugin
b8a2782 is described below
commit b8a2782dad152af90bac5612f39bf2ab6819d820
Author: Francesco Chicchiriccò <[email protected]>
AuthorDate: Mon Jun 22 08:35:40 2020 +0200
Upgrading Swagger UI and asciidoctor-maven-plugin
---
pom.xml | 17 ++++++++++-------
src/main/asciidoc/getting-started/obtain.adoc | 6 +++---
2 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/pom.xml b/pom.xml
index 07ea91b..1c23603 100644
--- a/pom.xml
+++ b/pom.xml
@@ -458,7 +458,7 @@ under the License.
<log.directory>${project.build.directory}/log</log.directory>
<swagger-core.version>2.0.10</swagger-core.version>
- <swagger-ui.version>3.26.1</swagger-ui.version>
+ <swagger-ui.version>3.27.0</swagger-ui.version>
<guava.version>29.0-jre</guava.version>
<jquery.version>3.4.1</jquery.version>
@@ -2557,7 +2557,7 @@ under the License.
<plugin>
<groupId>org.asciidoctor</groupId>
<artifactId>asciidoctor-maven-plugin</artifactId>
- <version>1.6.0</version>
+ <version>2.0.0</version>
<dependencies>
<dependency>
<groupId>org.asciidoctor</groupId>
@@ -2567,7 +2567,6 @@ under the License.
</dependencies>
<configuration>
<doctype>book</doctype>
- <relativeBaseDir>true</relativeBaseDir>
<sourceHighlighter>highlightjs</sourceHighlighter>
<attributes>
<docVersion>${project.version}</docVersion>
@@ -2597,10 +2596,11 @@ under the License.
</goals>
<configuration>
<sourceDocumentName>getting-started/getting-started.adoc</sourceDocumentName>
+
<baseDir>${rootpom.basedir}/src/main/asciidoc/getting-started</baseDir>
<backend>html</backend>
- <imagesDir>./images</imagesDir>
<attributes>
<title>Apache Syncope ${project.version} - Getting
Started</title>
+ <imagesdir>images</imagesdir>
</attributes>
</configuration>
</execution>
@@ -2612,11 +2612,12 @@ under the License.
</goals>
<configuration>
<sourceDocumentName>getting-started/getting-started.adoc</sourceDocumentName>
+
<baseDir>${rootpom.basedir}/src/main/asciidoc/getting-started</baseDir>
<backend>pdf</backend>
- <imagesDir>${basedir}/src/main/asciidoc/images</imagesDir>
<attributes>
<pdf-stylesdir>${basedir}/src/main/asciidoc</pdf-stylesdir>
<pdf-style>syncope</pdf-style>
+ <imagesdir>${basedir}/src/main/asciidoc/images</imagesdir>
</attributes>
</configuration>
</execution>
@@ -2628,10 +2629,11 @@ under the License.
</goals>
<configuration>
<sourceDocumentName>reference-guide/reference-guide.adoc</sourceDocumentName>
+
<baseDir>${rootpom.basedir}/src/main/asciidoc/reference-guide</baseDir>
<backend>html</backend>
- <imagesDir>./images</imagesDir>
<attributes>
<title>Apache Syncope ${project.version} - Reference
Guide</title>
+ <imagesdir>images</imagesdir>
</attributes>
</configuration>
</execution>
@@ -2643,11 +2645,12 @@ under the License.
</goals>
<configuration>
<sourceDocumentName>reference-guide/reference-guide.adoc</sourceDocumentName>
+
<baseDir>${rootpom.basedir}/src/main/asciidoc/reference-guide</baseDir>
<backend>pdf</backend>
- <imagesDir>${basedir}/src/main/asciidoc/images</imagesDir>
<attributes>
<pdf-stylesdir>${basedir}/src/main/asciidoc</pdf-stylesdir>
<pdf-style>syncope</pdf-style>
+ <imagesdir>${basedir}/src/main/asciidoc/images</imagesdir>
</attributes>
</configuration>
</execution>
diff --git a/src/main/asciidoc/getting-started/obtain.adoc
b/src/main/asciidoc/getting-started/obtain.adoc
index 014eb6c..c649df1 100644
--- a/src/main/asciidoc/getting-started/obtain.adoc
+++ b/src/main/asciidoc/getting-started/obtain.adoc
@@ -298,7 +298,7 @@ https://docs.docker.com/compose/[Docker Compose^] or
https://kubernetes.io/[Kube
===== Core
-Apache Syncope Core, see <<a-bird-s-eye-view-on-the-architecture,above>> for
information.
+Apache Syncope Core, see <<a-birds-eye-view-on-the-architecture,above>> for
information.
Port exposed: `8080`.
@@ -318,7 +318,7 @@
http://openjpa.apache.org/builds/3.0.0/apache-openjpa/docs/ref_guide_event.html[
===== Console
-Apache Syncope Admin UI, see <<a-bird-s-eye-view-on-the-architecture,above>>
for information.
+Apache Syncope Admin UI, see <<a-birds-eye-view-on-the-architecture,above>>
for information.
Port exposed: `8080`.
@@ -330,7 +330,7 @@ Environment variables:
===== Enduser
-Apache Syncope Enduser UI, see <<a-bird-s-eye-view-on-the-architecture,above>>
for information.
+Apache Syncope Enduser UI, see <<a-birds-eye-view-on-the-architecture,above>>
for information.
Port exposed: `8080`.