Changed links and versions

c5e79cd6 · Uwe Plonus · ca3025b7 · c5e79cd6 · c5e79cd6 · c5e79cd6
Verified Commit c5e79cd6 authored Jul 16, 2018 by Uwe Plonus
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
-image: $CI_REGISTRY/sw4j-net/jdk8-maven3
+image: $CI_REGISTRY/sw4j-net/jdk8-maven3/master:latest

 pages:
  stage: deploy
  script:
    - mvn clean site post-site
-    - cp -r target/staging public
  artifacts:
    paths:
      - public

--- a/pom.xml
+++ b/pom.xml
@@ -17,13 +17,13 @@
    <maven.compiler.source>1.8</maven.compiler.source>
    <maven.compiler.target>1.8</maven.compiler.target>

-    <testng.version>6.8.21</testng.version>
+    <testng.version>6.14.3</testng.version>

-    <doxia.markdown.version>1.6</doxia.markdown.version>
-    <javadoc.plugin.version>2.10.2</javadoc.plugin.version>
-    <project-info-reports.plugin.version>2.8</project-info-reports.plugin.version>
-    <scm-publish.plugin.version>1.1</scm-publish.plugin.version>
-    <site.plugin.version>3.4</site.plugin.version>
+    <doxia.markdown.version>1.8</doxia.markdown.version>
+    <fluido.skin.version>1.7</fluido.skin.version>
+    <javadoc.plugin.version>3.0.1</javadoc.plugin.version>
+    <project-info-reports.plugin.version>3.0.0</project-info-reports.plugin.version>
+    <site.plugin.version>3.7.1</site.plugin.version>
  </properties>

  <dependencies>
@@ -68,6 +68,7 @@
            </goals>
            <configuration>
              <skipDeploy>true</skipDeploy>
+              <stagingDirectory>${basedir}/public</stagingDirectory>
            </configuration>
          </execution>
        </executions>
@@ -120,7 +121,7 @@
  <distributionManagement>
    <site>
      <id>public</id>
-      <url>https://java-dojo.pages.sw4j.net/leap-year</url>
+      <url>https://java-dojo.pages.sw4j.net/leap-year/</url>
    </site>
  </distributionManagement>


--- a/src/site/markdown/index.md.vm
+++ b/src/site/markdown/index.md.vm
@@ -26,4 +26,4 @@ To perform this exercise you need a JDK 8 and Maven 3.3.x.

 * [Rosetta Code][rcly]

-[rcly]: http://rosettacode.org/wiki/Leap_year "Rosetta Code - Leap year"
+[rcly]: https://rosettacode.org/wiki/Leap_year "Rosetta Code - Leap year"
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -7,7 +7,7 @@
  <skin>
    <groupId>org.apache.maven.skins</groupId>
    <artifactId>maven-fluido-skin</artifactId>
-    <version>1.3.1</version>
+    <version>${fluido.skin.version}</version>
  </skin>

  <body>
@@ -23,6 +23,7 @@
    <menu ref="reports"/>

    <footer>
+      <![CDATA[
      <a rel="license" href="http://creativecommons.org/licenses/by-sa/4.0/">
        <img alt="Creative Commons License" style="border-width:0" src="https://i.creativecommons.org/l/by-sa/4.0/88x31.png" />
      </a>
@@ -33,6 +34,7 @@
      <span> is licensed under a </span>
      <a rel="license" href="http://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0 International License</a>
      <span>.</span>
+      ]]>
    </footer>

  </body>