Merge pull request #40 from Bernardo-MG/merge_master

Merge master

.travis.yml

@@ -22,7 +22,7 @@ matrix:
 
 before_install:
   # Gets scripts
-  - git clone -b v0.2.4 --single-branch https://github.com/Bernardo-MG/ci-shell-scripts.git ~/.scripts
+  - git clone -b v0.4.1 --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.5</version>
+      <version>1.1.0</version>
    </parent>
 
    <!-- ********************************************** -->
@@ -20,7 +20,7 @@
 
    <groupId>com.wandrell.example</groupId>
    <artifactId>swss-soap-example</artifactId>
-   <version>1.2.1</version>
+   <version>1.2.2</version>
    <packaging>war</packaging>
 
    <name>Spring Web Services WS-Security Example</name>
@@ -330,11 +330,10 @@
       <plugin.changes.version>2.12</plugin.changes.version>
       <plugin.jaxb2.version>0.13.1</plugin.jaxb2.version>
       <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>3.0.0</plugin.war.version>
       <!-- Maven Site -->
-      <site.skin.version>0.4.0</site.skin.version>
+      <site.skin.version>0.5.0</site.skin.version>
       <!-- Testing server -->
       <server.test.path>/swss</server.test.path>
    </properties>
@@ -685,12 +684,6 @@
                   <artifactId>docs-maven-skin</artifactId>
                   <version>${site.skin.version}</version>
                </dependency>
-               <dependency>
-                  <!-- Velocity -->
-                  <groupId>org.apache.velocity</groupId>
-                  <artifactId>velocity</artifactId>
-                  <version>${plugin.site.velocity.version}</version>
-               </dependency>
             </dependencies>
          </plugin>
          <plugin>

src/changes/changes.xml

@@ -96,5 +96,10 @@
             Maven site is now deployed through SSH.
          </action>
       </release>
+      <release version="1.2.2" date="2016-12-09" description="Minor changes">
+         <action dev="bmg" type="update">
+            Updated Maven configuration.
+         </action>
+      </release>
    </body>
 </document>

src/main/java/com/wandrell/example/swss/service/security/DefaultUserDetailsService.java

@@ -26,8 +26,8 @@
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
+import java.util.ArrayList;
 import java.util.Collection;
-import java.util.LinkedList;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -74,7 +74,7 @@ public final UserDetails loadUserByUsername(final String username)
 
         if ("myUser".equalsIgnoreCase(username)) {
             // User for password-based security
-            authorities = new LinkedList<SimpleGrantedAuthority>();
+            authorities = new ArrayList<SimpleGrantedAuthority>();
             authorities.add(new SimpleGrantedAuthority("ROLE_ADMIN"));
 
             user = new User(username, "myPassword", authorities);