Merge pull request #42 from Bernardo-MG/release

Release
Bernardo-MG · Jan 5, 2017 · 1b4fab9 · 1b4fab9
2 parents 857ff6f + 7086b18
commit 1b4fab9
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 21 deletions.
diff --git a/pom.xml b/pom.xml
@@ -4,6 +4,10 @@
 
    <modelVersion>4.0.0</modelVersion>
 
+   <prerequisites>
+      <maven>${maven.version}</maven>
+   </prerequisites>
+
    <!-- ********************************************** -->
    <!-- ****************** BASE POM ****************** -->
    <!-- ********************************************** -->
@@ -20,7 +24,7 @@
 
    <groupId>com.wandrell.example</groupId>
    <artifactId>swss-soap-example</artifactId>
-   <version>1.2.2</version>
+   <version>1.2.3</version>
    <packaging>war</packaging>
 
    <name>Spring Web Services WS-Security Example</name>
@@ -295,45 +299,45 @@
       <ant.version>1.9.7</ant.version>
       <commons.codec.version>1.10</commons.codec.version>
       <commons.logging.version>1.2</commons.logging.version>
-      <ehcache.version>2.10.2</ehcache.version>
+      <ehcache.version>2.10.3</ehcache.version>
       <freemarker.version>2.3.23</freemarker.version>
-      <guava.version>19.0</guava.version>
-      <h2.version>1.4.192</h2.version>
+      <guava.version>20.0</guava.version>
+      <h2.version>1.4.193</h2.version>
       <hibernate.jpa.version>1.0.0.Final</hibernate.jpa.version>
-      <hibernate.version>5.1.0.Final</hibernate.version>
+      <hibernate.version>5.1.3.Final</hibernate.version>
       <hikari.version>2.4.7</hikari.version>
       <testng.version>6.9.10</testng.version>
       <javax.activation.version>1.1.1</javax.activation.version>
       <javax.stax.api.version>1.0-2</javax.stax.api.version>
       <jaxb.api.version>2.2.12</jaxb.api.version>
       <jaxb.version>2.2.11</jaxb.version>
-      <joda.time.version>2.9.4</joda.time.version>
-      <log4j.version>2.6.2</log4j.version>
+      <joda.time.version>2.9.7</joda.time.version>
+      <log4j.version>2.7</log4j.version>
       <mockito.version>1.10.19</mockito.version>
       <saaj.api.version>1.3.5</saaj.api.version>
       <saaj.impl.version>1.3.25</saaj.impl.version>
-      <slf4j.version>1.7.21</slf4j.version>
-      <spring.data.version>1.10.2.RELEASE</spring.data.version>
-      <spring.version>4.3.2.RELEASE</spring.version>
-      <spring.security.version>4.1.1.RELEASE</spring.security.version>
-      <spring.ws.version>2.3.0.RELEASE</spring.ws.version>
+      <slf4j.version>1.7.22</slf4j.version>
+      <spring.data.version>1.10.6.RELEASE</spring.data.version>
+      <spring.version>4.3.5.RELEASE</spring.version>
+      <spring.security.version>4.2.1.RELEASE</spring.security.version>
+      <spring.ws.version>2.4.0.RELEASE</spring.ws.version>
       <stax.api.version>1.0.1</stax.api.version>
       <stax.impl.version>1.2.0</stax.impl.version>
-      <testng.version>6.9.10</testng.version>
+      <testng.version>6.10</testng.version>
       <wsdl4j.version>1.6.3</wsdl4j.version>
-      <wss4j.version>2.1.7</wss4j.version>
+      <wss4j.version>2.1.8</wss4j.version>
       <xmlapis.version>2.0.2</xmlapis.version>
-      <xmlsec.version>2.0.7</xmlsec.version>
+      <xmlsec.version>2.0.8</xmlsec.version>
       <xwssecurity.version>3.0</xwssecurity.version>
       <!-- Plugins versions -->
       <plugin.buildhelp.version>1.12</plugin.buildhelp.version>
-      <plugin.changes.version>2.12</plugin.changes.version>
+      <plugin.changes.version>2.12.1</plugin.changes.version>
       <plugin.jaxb2.version>0.13.1</plugin.jaxb2.version>
       <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>
       <!-- Maven Site -->
-      <site.skin.version>0.5.0</site.skin.version>
+      <site.skin.version>0.5.3</site.skin.version>
       <!-- Testing server -->
       <server.test.path>/swss</server.test.path>
    </properties>

diff --git a/readme.md b/readme.md
@@ -62,7 +62,7 @@ All other dependencies are handled through Maven, and noted in the included POM
 
 ### Running the example
 
-To run the example just use the following Maven command for Jetty:
+To run the example locally just use the following Maven command for Jetty:
 
 ```
 $ mvn jetty:run-war -P jetty
@@ -82,10 +82,9 @@ $ mvn package
 
 After this all the endpoint URLs are accessible. These can be found below, and require some sort of SOAP client, such as the console one included in the project.
 
-This console client can be used by just running the ConsoleClient class,
-located in the com.wandrell.example.swss.client.console folder.
+This console client can be used by just running the ConsoleClient class, located in the com.wandrell.example.swss.client.console folder.
 
-### Running the example on Java 8
+### Running the example with Java 8
 
 Sadly, the example currently can't be run on Java 8. This is due a compatibility issue with Spring-WS and the security implementations.
 

diff --git a/src/changes/changes.xml b/src/changes/changes.xml
@@ -101,5 +101,10 @@
             Updated Maven configuration.
          </action>
       </release>
+      <release version="1.2.3" date="2016-01-06" description="Updated dependencies">
+         <action dev="bmg" type="update">
+            Updated dependencies.
+         </action>
+      </release>
    </body>
 </document>