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

diff --git a/Dockerfile b/Dockerfile
new file mode 100644 (file)
index 0000000..b05bfd1
--- /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 (executable)
index 0000000..4500a61
--- /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 de49bef140bf3e465c7ec015b771c68d06715025..6e369e45637272fefd5d0ead7f2af7b334783016 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -15,7 +15,7 @@
   <description>Plugin for generating a database-schema from Hibernate-4-Mapping-Annotations</description>
   <version>1.0.1</version>
   <packaging>maven-plugin</packaging>
-  <url>http://juplo.de/hibernate4-maven-plugin</url>
+  <url>https://juplo.de/hibernate-maven-plugin/index.html</url>
 
   <prerequisites>
     <maven>2.0.6</maven>
@@ -188,18 +188,58 @@
           </execution>
         </executions>
       </plugin>
-    </plugins>
-  </build>
-
-  <reporting>
-    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-plugin-plugin</artifactId>
+        <version>3.2</version>
+        <executions>
+          <execution>
+            <id>generated-helpmojo</id>
+              <goals>
+                <goal>helpmojo</goal>
+              </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-invoker-plugin</artifactId>
+        <version>1.8</version>
+        <configuration>
+          <settingsFile>src/it/settings.xml</settingsFile>
+          <cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
+          <postBuildHookScript>verify</postBuildHookScript>
+          <addTestClassPath>true</addTestClassPath>
+        </configuration>
+        <executions>
+          <execution>
+            <id>integration-test</id>
+            <goals>
+              <goal>install</goal>
+              <goal>run</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
       <plugin>
         <artifactId>maven-site-plugin</artifactId>
-        <version>2.1</version>
+        <version>3.21.0</version>
         <configuration>
           <siteDirectory>${project.build.directory}/filtered-site</siteDirectory>
         </configuration>
+        <dependencies>
+          <dependency><!-- add support for ssh/scp -->
+            <groupId>org.apache.maven.wagon</groupId>
+            <artifactId>wagon-ssh-external</artifactId>
+            <version>2.12</version>
+          </dependency>
+        </dependencies>
       </plugin>
+    </plugins>
+  </build>
+
+  <reporting>
+    <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-changes-plugin</artifactId>
@@ -209,6 +249,9 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>
         <version>2.7</version><!-- Should be same version as in oss-parent-7 -->
+        <configuration>
+          <additionalparam>-Xdoclint:none</additionalparam>
+        </configuration>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>

diff --git a/src/site/apt/index.apt b/src/site/apt/index.apt
index ffe27dd514bc7e5f39948acadc16cb7521ed5891..70a97e47398063bfa25d50b43d078d564d4cafae 100644 (file)
--- 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 a8a3bef2b8ba3bbf754abdbefde65bc4f68a6df4..99214a668c90e38797e20423181026a24015612f 100644 (file)
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -1,33 +1,31 @@
 <project>
   <body>
-    <head>
-      <script type="text/javascript"><![CDATA[<!--
-
-        var _gaq = _gaq || [];
-        _gaq.push(['_setAccount', 'UA-571104-3']);
-        _gaq.push(['_trackPageview']);
-
-        (function() {
-          var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
-          ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
-          var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
-        })();
-
-      //-->]]>
-      </script>
-    </head>
-    <menu name="Overview">
-      <item name="Introduction" href="index.html"/>
+    <menu>
+      <item name="Hibernate 4 Maven Plugin" href="index.html"/>
       <item name="Configuration Examples" href="configuration.html"/>
       <item name="Parameter Documentation" href="export-mojo.html"/>
       <item name="Enable Debug-Output" href="debugging.html"/>
       <item name="Force Exceution" href="force.html"/>
-      <item name="Known Pitfalls" href="pitfalls.html"/>
+      <item name="Known Pitfalls (FAQ)" href="pitfalls.html"/>
+      <item name="Project Information" href="project-info.html"/>
+      <item name="Project Reports" href="project-reports.html"/>
     </menu>
     <menu ref="reports"/>
     <breadcrumbs>
       <item name="juplo" href="http://juplo.de"/>
     </breadcrumbs>
   </body>
+  <skin>
+    <groupId>de.juplo.maven</groupId>
+    <artifactId>maven-thymeleaf-skin</artifactId>
+    <version>1.1.2</version>
+  </skin>
+  <custom>
+    <thymeproxy>
+      <prefix>/projects</prefix>
+      <path>/hibernate-maven-plugin/</path>
+      <crumbs>"/index.html","/projects.html"</crumbs>
+      <command>th:replace="~{/templates/layout.html :: layout(uri='' + ~{:: code[class='site_uri']/text()}, title=~{:: title}, maincontent=~{:: .maincontent}, json='MERGE:' + ~{:: pre[class='json']/text()})}"</command>
+    </thymeproxy>
+  </custom>
 </project>
-