Merge pull request #39 from Bernardo-MG/merge_master

Merge master

.travis.yml

@@ -22,7 +22,7 @@ matrix:
 
 before_install:
   # Gets scripts
-  - git clone -b v0.1.6 --single-branch https://github.com/Bernardo-MG/ci-shell-scripts.git ~/.scripts
+  - git clone -b v0.2.4 --single-branch https://github.com/Bernardo-MG/ci-shell-scripts.git ~/.scripts
   # Sets scripts as executable
   - chmod -R +x ~/.scripts/*
   # Prepares CI environment

pom.xml

@@ -11,7 +11,7 @@
    <parent>
       <groupId>com.wandrell.maven</groupId>
       <artifactId>base-pom</artifactId>
-      <version>1.0.1</version>
+      <version>1.0.5</version>
    </parent>
 
    <!-- ********************************************** -->
@@ -20,7 +20,7 @@
 
    <groupId>com.wandrell.example</groupId>
    <artifactId>swss-soap-example</artifactId>
-   <version>1.2.0</version>
+   <version>1.2.1</version>
    <packaging>war</packaging>
 
    <name>Spring Web Services WS-Security Example</name>
@@ -149,7 +149,7 @@
             <site>
                <id>site</id>
                <name>Project Documentation Site</name>
-               <url>ftp://docs.wandrell.com/swss-soap-example</url>
+               <url>scp://docs.wandrell.com:2222/home1/duenco/www/maven/swss-soap-example</url>
             </site>
          </distributionManagement>
       </profile>
@@ -161,7 +161,7 @@
             <site>
                <id>site-development</id>
                <name>Project Development Documentation Site</name>
-               <url>ftp://docs.wandrell.com/swss-soap-example</url>
+               <url>scp://docs.wandrell.com:2222/home1/duenco/www/development/maven/swss-soap-example</url>
             </site>
          </distributionManagement>
       </profile>
@@ -332,9 +332,9 @@
       <plugin.jetty.version>9.1.6.v20160112</plugin.jetty.version>
       <plugin.site.velocity.version>1.7</plugin.site.velocity.version>
       <plugin.tomcat7.version>2.2</plugin.tomcat7.version>
-      <plugin.war.version>2.6</plugin.war.version>
+      <plugin.war.version>3.0.0</plugin.war.version>
       <!-- Maven Site -->
-      <site.skin.version>0.3.0</site.skin.version>
+      <site.skin.version>0.4.0</site.skin.version>
       <!-- Testing server -->
       <server.test.path>/swss</server.test.path>
    </properties>

src/changes/changes.xml

@@ -91,5 +91,10 @@
             CI scripts are now taken from a repository.
          </action>
       </release>
+      <release version="1.2.1" date="2016-09-28" description="Site deployment">
+         <action dev="bmg" type="update">
+            Maven site is now deployed through SSH.
+         </action>
+      </release>
    </body>
 </document>

src/site/site.xml

@@ -14,10 +14,6 @@
 			<keywords>Spring, web service, ws, security, wss, XWSS, WSS4J, example</keywords>
 			<descriptionUrl>Check the documentation for Spring WS Security Example</descriptionUrl>
 			<twitterSite>@Wandrell_BMG</twitterSite>
-			<interpreters>
-				<interpreter>JDK 7</interpreter>
-				<interpreter>OpenJDK 7</interpreter>
-			</interpreters>
 			<topNav>
 				<menu>Documentation</menu>
 				<menu>Info and reports</menu>