From 8f1f349e2f06dc4f06499ac829564ae7b0f1e41f Mon Sep 17 00:00:00 2001 From: Kai Moritz Date: Sat, 16 Jul 2016 23:24:17 +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 | 57 ++++++++++++++++++++++++++++++++++++------ src/site/apt/index.apt | 4 +-- src/site/site.xml | 38 +++++++++++++--------------- 5 files changed, 91 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 de49bef1..6e369e45 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ Plugin for generating a database-schema from Hibernate-4-Mapping-Annotations 1.0.1 maven-plugin - http://juplo.de/hibernate4-maven-plugin + https://juplo.de/hibernate-maven-plugin/index.html 2.0.6 @@ -188,18 +188,58 @@ - - - - - + + org.apache.maven.plugins + maven-plugin-plugin + 3.2 + + + generated-helpmojo + + helpmojo + + + + + + org.apache.maven.plugins + maven-invoker-plugin + 1.8 + + src/it/settings.xml + ${project.build.directory}/it + verify + true + + + + integration-test + + install + run + + + + maven-site-plugin - 2.1 + 3.21.0 ${project.build.directory}/filtered-site + + + org.apache.maven.wagon + wagon-ssh-external + 2.12 + + + + + + + org.apache.maven.plugins maven-changes-plugin @@ -209,6 +249,9 @@ org.apache.maven.plugins maven-javadoc-plugin 2.7 + + -Xdoclint:none + org.apache.maven.plugins diff --git a/src/site/apt/index.apt b/src/site/apt/index.apt index ffe27dd5..70a97e47 100644 --- a/src/site/apt/index.apt +++ b/src/site/apt/index.apt @@ -41,8 +41,8 @@ A simple Plugin for generating a Database-Schema from Hibernate 4 Mapping-Annota * Releases - * {{{http://juplo.de/hibernate4-maven-plugin} current version}} + * {{{/hibernate-maven-plugin/index.html} current version}} * ${project.version} (this version) - * {{{http://juplo.de/hibernate4-maven-plugin-1.0} 1.0}} + * {{{/projects/hibernate-maven-plugin/1.0/index.html} 1.0}} diff --git a/src/site/site.xml b/src/site/site.xml index a8a3bef2..99214a66 100644 --- a/src/site/site.xml +++ b/src/site/site.xml @@ -1,33 +1,31 @@ - - - - - + + - + + + + + 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()})}" + + - -- 2.39.5