From 2686e255c0efbc825359094d8b65c6720538beb4 Mon Sep 17 00:00:00 2001 From: Kai Moritz Date: Mon, 6 May 2019 22:16:01 +0200 Subject: [PATCH] Switchted the docs to `maven-thymeleaf-skin:1.1.2` * Upgraded `maven-thymeleaf-skin` to `1.1.1` and adjusted the configuration * Upgraded `maven-site-plugin` to version `3.21.0` * Upgraded `maven-thymeleaf-skin` to version `1.1.2` * Added the prefix `/projects` to the URIs of the generated site * Switched the linking for all old projects to the refined path * Added a `Dockerfile` for building the project * Added missing versions and refined the pathes for old versions --- Dockerfile | 17 +++++++++++++++++ README.sh | 4 ++++ pom.xml | 34 +++++++++++++++------------------- src/site/site.xml | 16 ++++++++++++---- src/site/xhtml/index.xhtml | 12 ++++++------ 5 files changed, 54 insertions(+), 29 deletions(-) create mode 100644 Dockerfile create mode 100755 README.sh diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 00000000..b05bfd14 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,17 @@ +FROM openjdk:8-jdk + +RUN apt-get update +RUN apt-get install -y maven + +ARG UID=1000 +ARG GID=1000 + +RUN groupadd -g ${GID} build && useradd -m -u ${UID} -g ${GID} -s /bin/bash build + +USER build +WORKDIR /home/build + +ENV HOME=/home/build +ENV MAVEN_USER_HOME=/home/build/.m2 + +ENV MAVEN_CONFIG=/home/build/.m2 diff --git a/README.sh b/README.sh new file mode 100755 index 00000000..4500a614 --- /dev/null +++ b/README.sh @@ -0,0 +1,4 @@ +#!/bin/bash + +docker build -t jdk . +docker run --rm --name jdk -it -u $(id -u):$(id -g) -v $(pwd):/home/build -v $HOME/.m2:/home/build/.m2 jdk mvn clean compile test-compile site diff --git a/pom.xml b/pom.xml index 89862bc6..68d01ae3 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ Plugin for generating a database-schema from Hibernate-4-Mapping-Annotations 1.0.5 maven-plugin - http://juplo.de/hibernate4-maven-plugin + https://juplo.de/hibernate-maven-plugin/index.html 2.0.6 @@ -290,25 +290,21 @@ + + maven-site-plugin + 3.21.0 + + ${project.build.directory}/filtered-site + + + + org.apache.maven.wagon + wagon-ssh-external + 2.12 + + + - - - - maven-site-plugin - 3.3 - - ${project.build.directory}/filtered-site - - - - org.apache.maven.wagon - wagon-ssh - 1.0 - - - - - diff --git a/src/site/site.xml b/src/site/site.xml index 5399d177..cb9efcfe 100644 --- a/src/site/site.xml +++ b/src/site/site.xml @@ -1,7 +1,7 @@ - UA-571104-3 + @@ -12,9 +12,17 @@ - de.juplo - juplo-maven-skin - 1.0.7 + de.juplo.maven + maven-thymeleaf-skin + 1.1.2 + + + /projects + /hibernate-maven-plugin/ + "/index.html","/projects.html" + th:replace="~{/templates/layout.html :: layout(uri='' + ~{:: code[class='site_uri']/text()}, title=~{:: title}, maincontent=~{:: .maincontent}, json='MERGE:' + ~{:: pre[class='json']/text()})}" + + diff --git a/src/site/xhtml/index.xhtml b/src/site/xhtml/index.xhtml index d4568618..53939b5d 100644 --- a/src/site/xhtml/index.xhtml +++ b/src/site/xhtml/index.xhtml @@ -57,13 +57,13 @@

Releases

-- 2.39.5