Merge pull request #46 from Bernardo-MG/release

Release
Bernardo-MG · Mar 31, 2017 · f881043 · f881043
2 parents e3ad828 + 13f343a
commit f881043
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 5 deletions.
diff --git a/pom.xml b/pom.xml
@@ -15,7 +15,7 @@
    <parent>
       <groupId>com.wandrell.maven</groupId>
       <artifactId>base-pom</artifactId>
-      <version>1.1.1</version>
+      <version>1.1.3</version>
    </parent>
 
    <!-- ********************************************** -->
@@ -24,7 +24,7 @@
 
    <groupId>com.wandrell.example</groupId>
    <artifactId>swss-soap-example</artifactId>
-   <version>1.2.4</version>
+   <version>1.2.5</version>
    <packaging>war</packaging>
 
    <name>Spring Web Services WS-Security Example</name>
@@ -338,8 +338,11 @@
       <plugin.jetty.version>9.1.6.v20160112</plugin.jetty.version>
       <plugin.tomcat7.version>2.2</plugin.tomcat7.version>
       <plugin.war.version>3.0.0</plugin.war.version>
+      <!-- Spring is using the Repeatable annotation, which breaks the Javadoc 
+         generation with an error -->
+      <maven.javadoc.failOnError>false</maven.javadoc.failOnError>
       <!-- Maven Site -->
-      <site.skin.version>0.5.3</site.skin.version>
+      <site.skin.version>0.6.0</site.skin.version>
       <!-- Testing server -->
       <server.test.path>/swss</server.test.path>
    </properties>

diff --git a/src/changes/changes.xml b/src/changes/changes.xml
@@ -101,18 +101,23 @@
             Updated Maven configuration.
          </action>
       </release>
-      <release version="1.2.3" date="2016-01-06" description="Updated dependencies">
+      <release version="1.2.3" date="2017-01-06" description="Updated dependencies">
          <action dev="bmg" type="update">
             Updated dependencies.
          </action>
       </release>
-      <release version="1.2.4" date="2016-02-09" description="Updated configuration">
+      <release version="1.2.4" date="2017-02-09" description="Updated configuration">
          <action dev="bmg" type="update">
             Updated base POM.
          </action>
          <action dev="bmg" type="update">
             Updated docs.
          </action>
       </release>
+      <release version="1.2.5" date="2017-03-31" description="Updated configuration">
+         <action dev="bmg" type="update">
+            Updated base POM and project configuration.
+         </action>
+      </release>
    </body>
 </document>
diff --git a/src/site/markdown/reports.md b/src/site/markdown/reports.md
@@ -23,6 +23,7 @@
 
 |Report|Description|
 |---|---|
+|[OWASP Dependencies check][dependencies-check]|Dependencies vulnerabilities report.|
 |[Dependencies][dependencies]|Dependencies used by the project.|
 |[Dependencies Analysis][dependency-analysis]|Dependencies analysis of the project (used declared, used undeclared, unused declared).|
 |[Plugins][plugins]|Maven plugins used by the project.|
@@ -38,6 +39,7 @@
 [checkstyle]: ./checkstyle.html
 [cpd]: ./cpd.html
 [dependencies]: ./dependencies.html
+[dependencies-check]: ./dependency-check-report.html
 [dependency-analysis]: ./dependency-analysis.html
 [failsafe]: ./failsafe-report.html
 [findbugs]: ./findbugs.html

diff --git a/src/site/site.xml b/src/site/site.xml
@@ -20,7 +20,11 @@
 			</topNav>
 			<bottomNav>
 				<menu>General Info</menu>
+            <menu>Code</menu>
 			</bottomNav>
+         <iconNav>
+            <menu>Icons</menu>
+         </iconNav>
 		</skinConfig>
 	</custom>
 
@@ -44,6 +48,20 @@
 			<item name="Reports" href="./reports.html" />
 			<item name="JavaDocs" href="./apidocs/" />
 		</menu>
+      <menu name="Code" inherit="bottom">
+         <item name="SCM" href="${project.scm.url}">
+            <description>GitHub</description>
+         </item>
+         <item name="CI" href="${project.ciManagement.url}">
+            <description>${project.ciManagement.system}</description>
+         </item>
+         <item name="Issues" href="${project.issueManagement.url}">
+            <description>${project.issueManagement.system}</description>
+         </item>
+      </menu>
+      <menu name="Icons" inherit="bottom">
+         <item name="Github" img="github" href="${project.scm.url}" />
+      </menu>
 	</body>
 
 </project>