Repository: syncope
Updated Branches:
  refs/heads/2_0_X 02c8233de -> 3927f2c96
  refs/heads/master de0beb548 -> 2b7cfed68


Upgrading Commons-Lang


Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/3927f2c9
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/3927f2c9
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/3927f2c9

Branch: refs/heads/2_0_X
Commit: 3927f2c9626c1c598df759c5c854644c019c9124
Parents: 02c8233
Author: Francesco Chicchiriccò <ilgro...@apache.org>
Authored: Mon Oct 17 15:11:19 2016 +0200
Committer: Francesco Chicchiriccò <ilgro...@apache.org>
Committed: Mon Oct 17 15:11:19 2016 +0200

----------------------------------------------------------------------
 .../org/apache/syncope/client/console/widgets/LoadWidget.java     | 3 ++-
 .../src/test/java/org/apache/syncope/fit/core/UserITCase.java     | 2 +-
 pom.xml                                                           | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/syncope/blob/3927f2c9/client/console/src/main/java/org/apache/syncope/client/console/widgets/LoadWidget.java
----------------------------------------------------------------------
diff --git 
a/client/console/src/main/java/org/apache/syncope/client/console/widgets/LoadWidget.java
 
b/client/console/src/main/java/org/apache/syncope/client/console/widgets/LoadWidget.java
index 835fd58..5a42f24 100644
--- 
a/client/console/src/main/java/org/apache/syncope/client/console/widgets/LoadWidget.java
+++ 
b/client/console/src/main/java/org/apache/syncope/client/console/widgets/LoadWidget.java
@@ -48,7 +48,8 @@ public class LoadWidget extends BaseWidget {
         List<Long> memValues = new ArrayList<>();
 
         for (SystemInfo.LoadInstant instant : systeminfo.getLoad()) {
-            
labels.add(DateFormatUtils.ISO_DATETIME_FORMAT.format(systeminfo.getStartTime() 
+ instant.getUptime()));
+            labels.add(DateFormatUtils.ISO_8601_EXTENDED_DATETIME_FORMAT.
+                    format(systeminfo.getStartTime() + instant.getUptime()));
 
             cpuValues.add(instant.getSystemLoadAverage() * 1000);
             memValues.add(instant.getTotalMemory());

http://git-wip-us.apache.org/repos/asf/syncope/blob/3927f2c9/fit/core-reference/src/test/java/org/apache/syncope/fit/core/UserITCase.java
----------------------------------------------------------------------
diff --git 
a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/UserITCase.java 
b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/UserITCase.java
index f5f73a5..456c728 100644
--- 
a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/UserITCase.java
+++ 
b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/UserITCase.java
@@ -88,7 +88,7 @@ import org.junit.Test;
 
 public class UserITCase extends AbstractITCase {
 
-    private static final FastDateFormat DATE_FORMAT = 
DateFormatUtils.ISO_DATE_FORMAT;
+    private static final FastDateFormat DATE_FORMAT = 
DateFormatUtils.ISO_8601_EXTENDED_DATETIME_FORMAT;
 
     private boolean getBooleanAttribute(final ConnObjectTO connObjectTO, final 
String attrName) {
         return 
Boolean.parseBoolean(connObjectTO.getAttrMap().get(attrName).getValues().get(0));

http://git-wip-us.apache.org/repos/asf/syncope/blob/3927f2c9/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 81b8bf7..c27550c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -387,7 +387,7 @@ under the License.
     <commons-email.version>1.4</commons-email.version>
     <commons-codec.version>1.10</commons-codec.version>
     <commons-jexl.version>3.0</commons-jexl.version>
-    <commons-lang.version>3.4</commons-lang.version>
+    <commons-lang.version>3.5</commons-lang.version>
     <commons-collection.version>4.1</commons-collection.version>
     <commons-logging.version>1.1.3</commons-logging.version>
 

Reply via email to