From 08d53ad8a13dbf44b0d421976ce852585d872577 Mon Sep 17 00:00:00 2001
From: jomu <jomu@711a9084-f618-47a6-a783-754c49204487>
Date: Sun, 10 Jul 2016 14:48:57 +0000
Subject: [PATCH] updated libraries

---
 account/pom.xml                                     | 12 ++++--------
 .../account/business/account/AccountControl.java    |  2 +-
 .../de/muehlencord/shared/account/ui/LoginView.java |  2 +-
 pom.xml                                             | 13 +++++++++++++
 4 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/account/pom.xml b/account/pom.xml
index 8c58465..8e8125b 100644
--- a/account/pom.xml
+++ b/account/pom.xml
@@ -22,26 +22,22 @@
     </properties>
 
     <dependencies>
-        <dependency>
-            <groupId>commons-lang</groupId>
-            <artifactId>commons-lang</artifactId>            
-            <version>2.6</version>
-        </dependency>
+            <dependency>
+                <groupId>org.apache.commons</groupId>
+                <artifactId>commons-lang3</artifactId>
+            </dependency> 
         <dependency>
             <groupId>org.freemarker</groupId>
             <artifactId>freemarker</artifactId>
-            <version>2.3.23</version>
         </dependency>
         <dependency>
             <groupId>org.apache.shiro</groupId>
             <artifactId>shiro-core</artifactId>
-            <version>1.2.4</version>
             <scope>provided</scope>
         </dependency>        
         <dependency>
             <groupId>org.apache.shiro</groupId>
             <artifactId>shiro-web</artifactId>
-            <version>1.2.4</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
diff --git a/account/src/main/java/de/muehlencord/shared/account/business/account/AccountControl.java b/account/src/main/java/de/muehlencord/shared/account/business/account/AccountControl.java
index 08a150b..f6834a3 100644
--- a/account/src/main/java/de/muehlencord/shared/account/business/account/AccountControl.java
+++ b/account/src/main/java/de/muehlencord/shared/account/business/account/AccountControl.java
@@ -16,7 +16,7 @@ import javax.persistence.NoResultException;
 import javax.persistence.PersistenceContext;
 import javax.persistence.Query;
 import javax.transaction.Transactional;
-import org.apache.commons.lang.RandomStringUtils;
+import org.apache.commons.lang3.RandomStringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.apache.shiro.SecurityUtils;
diff --git a/account/src/main/java/de/muehlencord/shared/account/ui/LoginView.java b/account/src/main/java/de/muehlencord/shared/account/ui/LoginView.java
index da2de2e..098160b 100644
--- a/account/src/main/java/de/muehlencord/shared/account/ui/LoginView.java
+++ b/account/src/main/java/de/muehlencord/shared/account/ui/LoginView.java
@@ -41,7 +41,7 @@ public class LoginView implements Serializable {
     private String resetPasswordToken = null;
 
     private static final Logger LOGGER = LoggerFactory.getLogger(LoginView.class.getName());
-
+    
     public void authenticate() {
 
         // Example using most common scenario of username/password pair:
diff --git a/pom.xml b/pom.xml
index e467c80..49ea402 100644
--- a/pom.xml
+++ b/pom.xml
@@ -43,6 +43,7 @@
         <freemarker.version>2.3.24-incubating</freemarker.version>
         <pdfbox.version>2.0.2</pdfbox.version>
         <gson.version>2.7</gson.version>
+        <shiro.version>1.2.6</shiro.version>
     </properties>
     
     <dependencyManagement>
@@ -96,6 +97,16 @@
                 <artifactId>gson</artifactId>
                 <version>${gson.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.apache.shiro</groupId>
+                <artifactId>shiro-core</artifactId>
+                <version>${shiro.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.shiro</groupId>
+                <artifactId>shiro-web</artifactId>
+                <version>${shiro.version}</version>
+            </dependency>            
             <dependency>
                 <groupId>javax</groupId>
                 <artifactId>javaee-api</artifactId>
@@ -143,6 +154,8 @@
                 <artifactId>shared-util</artifactId>                            
                 <version>${project.version}</version>
             </dependency>                           
+            
+            
         </dependencies>
     </dependencyManagement>