Hugo build

CHANGELOG.adoc

@@ -2473,7 +2473,7 @@ icon:plus[] UI: Add multi binary upload dialogue. Users can now upload multiple
 icon:plus[] UI: Binary fields can now be used as display fields. The filename is used as the display name for the node. link:https://github.com/gentics/mesh-ui/issues/11[#11]
 
 icon:plus[] UI: It is now possible to specify the URL to the front end of a system. This allows users to quickly go to the page that represents the node in the system.
-  See the default `mesh-ui-config.js` or the link:{{< relref "user-interface.asciidoc" >}}#_configuration[online documentation] for more details. link:https://github.com/gentics/mesh-ui/issues/14[#14]
+  See the default `mesh-ui-config.js` for more details. link:https://github.com/gentics/mesh-ui/issues/14[#14]
 
 icon:plus[] Upload: The upload handling code has been refactored in order to process the uploaded data in-parallel.
 

changelog/src/changelog/entries/2024/05/7791.SUP-16719.bugfix

@@ -1 +1 @@
-The library used to process webp images has been changed due to JVM errors when running in an alpine based image.
+The library used to process webp images has been changed due to JVM errors when running in an `alpine` based image.

changelog/src/changelog/entries/2024/06/7874.SUP-16917.bugfix

@@ -1 +1 @@
-Elasticsearch: An Elasticsearch Java Client has been updated to the version 1.1.2, containing the corrections to the connection failure processing mechanism. The Elasticsearch activity idle checking has been improved to be more proof of the unstable connections.
+Elasticsearch: An Elasticsearch Java Client has been updated to the version `1.1.2`, containing the corrections to the connection failure processing mechanism. The Elasticsearch activity idle checking has been improved to be more proof of the unstable connections.

doc/build/dockerBuild.sh

@@ -0,0 +1,40 @@
+#!/bin/bash
+
+BRANCH=$(git branch --show-current)
+SCRIPT=$(realpath $0)
+BASEDIR=$(dirname $SCRIPT)
+ROOT=$(realpath $BASEDIR/..)
+SRCCONTENTROOT=$ROOT/src/main/hugo
+CONTENTROOT=$ROOT/target/hugo
+HTMLROOT=$ROOT/target/html
+
+echo "Generating HTML out of: " $ROOT
+
+mkdir -p $CONTENTROOT
+mkdir -p $HTMLROOT
+cp -Rf $SRCCONTENTROOT/* $CONTENTROOT
+
+# Fetch examples
+EXAMPLEDIR=$CONTENTROOT/content/examples
+if [ -n $EXAMPLEDIR ] ; then
+  git clone --depth 1 --single-branch -- https://github.com/gentics/mesh-plugin-examples $EXAMPLEDIR
+fi
+
+# Fetch Mesh Enterprise, if available
+ENTERPRISEDIR=$ROOT/../../mesh-enterprise
+if [ -e $ENTERPRISEDIR ] ; then
+  cp -Rf $ENTERPRISEDIR/CHANGELOG.adoc $CONTENTROOT/content/docs/sql-changelog.asciidoc
+  cp -Rf $ENTERPRISEDIR/ENTERPRISE-CHANGELOG.adoc $CONTENTROOT/content/docs/enterprise-changelog.asciidoc
+  cp -Rf $ENTERPRISEDIR/changelog-2.adoc-include $CONTENTROOT/content/docs/sql-changelog-2.adoc-include
+  cp -Rf $ENTERPRISEDIR/changelog-3.adoc-include $CONTENTROOT/content/docs/enterprise-changelog-3.adoc-include
+fi
+
+# Copy parts in place
+cp -Rf $ROOT/src/main/docs/generated/api $CONTENTROOT/content/docs/api
+cp -Rf $ROOT/src/main/docs/generated/search $CONTENTROOT/content/docs/search
+cp -Rf $ROOT/src/main/docs/generated/models $CONTENTROOT/content/docs/examples/models
+cp -Rf $ROOT/src/main/docs/generated/tables $CONTENTROOT/content/docs/examples/tables
+cp -Rf $ROOT/../CHANGELOG.adoc $CONTENTROOT/content/docs/changelog.asciidoc
+cp -Rf $ROOT/../LTS-CHANGELOG.adoc $CONTENTROOT/content/docs/lts-changelog.asciidoc
+
+docker run -v $CONTENTROOT:/site -v $HTMLROOT:/site/docs --user 1000:1000 --rm gentics/hugo-asciidoctor /site/scripts/build.sh

doc/pom.xml

@@ -17,8 +17,7 @@
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<skip.raml2html>true</skip.raml2html>
-		<skip.doc.assembly>true</skip.doc.assembly>
+		<skip.doc.package>true</skip.doc.package>
 	</properties>
 
 	<dependencyManagement>
@@ -71,46 +70,6 @@
 			</resource>
 		</resources>
 		<plugins>
-			<plugin>
-				<artifactId>maven-resources-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>copy-apidocs</id>
-						<phase>validate</phase>
-						<goals>
-							<goal>copy-resources</goal>
-						</goals>
-						<configuration>
-							<outputDirectory>${basedir}/target/docs/apidocs</outputDirectory>
-							<resources>
-								<resource>
-									<directory>src/main/docs</directory>
-									<filtering>true</filtering>
-									<includes>
-										<include>*.html</include>
-									</includes>
-								</resource>
-							</resources>
-						</configuration>
-					</execution>
-					<execution>
-						<id>copy-asciidocs</id>
-						<phase>validate</phase>
-						<goals>
-							<goal>copy-resources</goal>
-						</goals>
-						<configuration>
-							<outputDirectory>${basedir}/target/docs/docs</outputDirectory>
-							<resources>
-								<resource>
-									<directory>src/main/docs</directory>
-									<filtering>true</filtering>
-								</resource>
-							</resources>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>exec-maven-plugin</artifactId>
@@ -149,24 +108,15 @@
 						</configuration>
 					</execution>
 					<execution>
-						<id>Generate HTML from RAML</id>
-						<!-- npm i -g [email protected] -->
+						<id>Generate HTML</id>
 						<goals>
 							<goal>exec</goal>
 						</goals>
-						<phase>process-resources</phase>
+						<phase>prepare-package</phase>
 						<configuration>
-							<skip>${skip.raml2html}</skip>
-							<executable>npx</executable>
-							<arguments>
-								<argument>[email protected]</argument>
-								<argument>-i</argument>
-								<argument>${basedir}/src/main/docs/generated/api/api-docs.raml</argument>
-								<argument>-o</argument>
-								<argument>${basedir}/target/docs/apidocs/index.html</argument>
-								<argument>-t</argument>
-								<argument>${basedir}/src/main/docs/nunjucks/template.nunjucks</argument>								
-							</arguments>
+							<skip>${skip.doc.package}</skip>
+							<executable>${basedir}/build/dockerBuild.sh</executable>
+							<successCodes>0,255</successCodes>
 						</configuration>
 					</execution>
 				</executions>
@@ -182,11 +132,25 @@
 							<goal>single</goal>
 						</goals>
 						<configuration>
-							<skipAssembly>${skip.doc.assembly}</skipAssembly>
+							<skipAssembly>${skip.doc.package}</skipAssembly>
+							<attach>true</attach>
+							<appendAssemblyId>true</appendAssemblyId>
+							<descriptors>
+								<descriptor>${project.basedir}/src/assembly/maven/doc-package.xml</descriptor>
+							</descriptors>
+						</configuration>
+					</execution>
+					<execution>
+						<id>src</id>
+						<phase>package</phase>
+						<goals>
+							<goal>single</goal>
+						</goals>
+						<configuration>
 							<attach>true</attach>
-							<appendAssemblyId>false</appendAssemblyId>
+							<appendAssemblyId>true</appendAssemblyId>
 							<descriptors>
-								<descriptor>${project.basedir}/src/assembly/doc-package.xml</descriptor>
+								<descriptor>${project.basedir}/src/assembly/maven/src-package.xml</descriptor>
 							</descriptors>
 						</configuration>
 					</execution>

doc/src/assembly/maven/doc-package.xml

@@ -0,0 +1,27 @@
+<assembly
+	xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
+	<id>doc</id>
+	<formats>
+		<format>zip</format>
+	</formats>
+	<fileSets>
+		<fileSet>
+			<directory>${basedir}/target/html</directory>
+			<outputDirectory>/mesh-docs</outputDirectory>
+			<includes>
+				<include>**</include>                
+			</includes>
+			<excludes>
+            	<exclude>categories/</exclude>
+           	<exclude>tags/</exclude>
+            	<exclude>index.html</exclude>
+				<exclude>**/*.adoc-include</exclude>
+				<exclude>**/*.adoc</exclude>
+				<exclude>**/*.asciidoc</exclude>
+			</excludes>
+		</fileSet>
+	</fileSets>
+	<includeBaseDirectory>false</includeBaseDirectory>
+</assembly>

doc/src/assembly/doc-package.xml → doc/src/assembly/maven/src-package.xml

@@ -2,25 +2,33 @@
 	xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
-	<id>doc</id>
+	<id>src</id>
 	<formats>
 		<format>zip</format>
 	</formats>
 	<fileSets>
 		<fileSet>
-			<directory>${basedir}/target/docs/docs/</directory>
+			<directory>${basedir}/src/main/docs</directory>
 			<outputDirectory>/docs</outputDirectory>
 			<includes>
 				<include>**</include>
 			</includes>
 		</fileSet>
-		<fileSet>
-			<directory>${basedir}/target/docs/apidocs/</directory>
-			<outputDirectory>/apidocs</outputDirectory>
+        <fileSet>
+			<directory>${basedir}/src/main/hugo/content</directory>
+			<outputDirectory>/hugo/content</outputDirectory>
 			<includes>
 				<include>**</include>
 			</includes>
 		</fileSet>
+		<fileSet>
+			<directory>${basedir}/..</directory>
+			<outputDirectory>/hugo/content</outputDirectory>
+			<includes>
+				<include>CHANGELOG.adoc</include>
+				<include>LTS-CHANGELOG.adoc</include>
+			</includes>
+		</fileSet>
 	</fileSets>
 	<includeBaseDirectory>false</includeBaseDirectory>
 </assembly>

doc/src/main/docs/generated/api/api-docs.raml

@@ -706,7 +706,7 @@ mediaType: application/json
                           "exclusive" : true,
                           "ignore" : [ {
                             "name" : "admin",
-                            "uuid" : "fb91c0d74a37488dbc8293f32b634550"
+                            "uuid" : "75a754663d3440238f7fe9f6b27a89a7"
                           } ]
                         }
             responses: 
@@ -1354,7 +1354,7 @@ mediaType: application/json
                           "exclusive" : true,
                           "ignore" : [ {
                             "name" : "admin",
-                            "uuid" : "bf3a540446b643dca936bc879a5872b7"
+                            "uuid" : "8663a57d45bb46a3ac1ebd5c36ce1bd8"
                           } ]
                         }
             responses: 
@@ -1893,7 +1893,7 @@ mediaType: application/json
                           "exclusive" : true,
                           "ignore" : [ {
                             "name" : "admin",
-                            "uuid" : "ad4e4506b3d34ba2a0012febdcfbadb6"
+                            "uuid" : "a8a0ec6df3384603bd4a69c72b38487c"
                           } ]
                         }
             responses: 
@@ -2868,7 +2868,7 @@ mediaType: application/json
                           "exclusive" : true,
                           "ignore" : [ {
                             "name" : "admin",
-                            "uuid" : "bca30ccff15e492a9ece8992c7529cbf"
+                            "uuid" : "ce94e60ae9c443b8af6c07d15ef1421f"
                           } ]
                         }
             responses: 
@@ -3446,12 +3446,6 @@ mediaType: application/json
         post: 
             description: Update the schema.
             queryParameters: 
-                strictValidation: 
-                    description: Validate the Elasticsearch settings in the schema. When this parameter is set, a schema update or creation will fail, when the respective Elasticsearch index cannot be created.
-                    type: boolean
-                    required: false
-                    repeat: false
-                    default: false
                 updateAssignedBranches: 
                     description: Update the schema version for all branches which already utilize the schema.
                     type: boolean
@@ -3464,6 +3458,12 @@ mediaType: application/json
                     required: false
                     repeat: false
                     example: summerBranch,winterBranch
+                strictValidation: 
+                    description: Validate the Elasticsearch settings in the schema. When this parameter is set, a schema update or creation will fail, when the respective Elasticsearch index cannot be created.
+                    type: boolean
+                    required: false
+                    repeat: false
+                    default: false
             body: 
                 application/json: 
                     schema: |
@@ -3897,7 +3897,7 @@ mediaType: application/json
                           "exclusive" : true,
                           "ignore" : [ {
                             "name" : "admin",
-                            "uuid" : "ba264d12206e4474b3f08c9cff6b996b"
+                            "uuid" : "bf05ce13e5ef49efba5464be74d669db"
                           } ]
                         }
             responses: 
@@ -4571,7 +4571,7 @@ mediaType: application/json
                           "exclusive" : true,
                           "ignore" : [ {
                             "name" : "admin",
-                            "uuid" : "041b9f2f07c740a9b3aecbdd927f22f8"
+                            "uuid" : "513b419f93ea4af6812a6076214b8b56"
                           } ]
                         }
             responses: 
@@ -10458,7 +10458,7 @@ mediaType: application/json
                           "exclusive" : true,
                           "ignore" : [ {
                             "name" : "admin",
-                            "uuid" : "69422d34fdb249d796a7f552a4e2f212"
+                            "uuid" : "39d16738842c4d5fa1df55690d4970a7"
                           } ]
                         }
             responses: 
@@ -11967,7 +11967,7 @@ mediaType: application/json
                           "exclusive" : true,
                           "ignore" : [ {
                             "name" : "admin",
-                            "uuid" : "caffbdfcf2064b328ec217bf48bcc0e9"
+                            "uuid" : "16cb95658a9745d99d490a692b526137"
                           } ]
                         }
             responses: 
@@ -12783,7 +12783,7 @@ mediaType: application/json
                           "exclusive" : true,
                           "ignore" : [ {
                             "name" : "admin",
-                            "uuid" : "1cdbe5629b124e48801f51dc05320c01"
+                            "uuid" : "614ca36eee2941648a05d1cf53ae9c44"
                           } ]
                         }
             responses: 
@@ -14572,7 +14572,7 @@ mediaType: application/json
                           "exclusive" : true,
                           "ignore" : [ {
                             "name" : "admin",
-                            "uuid" : "8c8fb8b23b7a466da95ab2184a9693ff"
+                            "uuid" : "876749991ec240d08323f3686839aeb4"
                           } ]
                         }
             responses: