SAK-40004 - JDK9 Fixes (sakaiproject#5655)

* Fix Kernel-Util * org.dom4j * org.dom4j version * com.google.gueva * jmock-legacy * com.h2database * validation-api
WritingPanda · Jul 2, 2018 · 74b472e · 74b472e
1 parent 1cba64b
commit 74b472e
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 16 deletions.
diff --git a/deploy/pom.xml b/deploy/pom.xml
@@ -563,7 +563,7 @@
 
         <!-- xml -->
         <dependency>
-            <groupId>dom4j</groupId>
+            <groupId>org.dom4j</groupId>
             <artifactId>dom4j</artifactId>
             <scope>compile</scope>
         </dependency>

diff --git a/kernel/kernel-impl/pom.xml b/kernel/kernel-impl/pom.xml
@@ -187,7 +187,7 @@
     <dependency>
         <groupId>com.google.guava</groupId>
         <artifactId>guava</artifactId>
-        <version>16.0.1</version>
+        <version>23.0</version>
     </dependency>
     <dependency>
         <groupId>com.google.code.findbugs</groupId>
@@ -321,7 +321,7 @@
     <dependency>
         <groupId>org.jmock</groupId>
         <artifactId>jmock-legacy</artifactId>
-        <version>2.5.1</version>
+        <version>2.8.4</version>
         <scope>test</scope>
     </dependency>
     <dependency>

diff --git a/kernel/kernel-util/pom.xml b/kernel/kernel-util/pom.xml
@@ -95,7 +95,7 @@
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>javax.servlet-api</artifactId>
-      <version>3.0.1</version>
+      <version>4.0.1</version>
       <scope>test</scope>
     </dependency>
 

diff --git a/kernel/kernel-util/src/main/java/org/sakaiproject/util/DateFormatterUtil.java b/kernel/kernel-util/src/main/java/org/sakaiproject/util/DateFormatterUtil.java
@@ -94,18 +94,17 @@ public static Date parseISODate(final String inputDate) {
 	 * 			If throws a parse exception then returns the SHORT format by default (MM/dd/yyyy hh:mm a)
 	 */
 	public static String format(Date inputDate, String format, Locale locale) {
-		SimpleDateFormat formatter = null;
-
 		if(inputDate == null){
 			return null;
 		}
 
 		try {
-			formatter = new SimpleDateFormat(format, locale);
-			return formatter.format(inputDate);
+			return new SimpleDateFormat(format, locale)
+					.format(inputDate);
 		} catch(Exception ex) {
-			formatter = (SimpleDateFormat) DateFormat.getDateTimeInstance(DateFormat.SHORT, DateFormat.SHORT, Locale.US);
-			return formatter.format(inputDate);
+			return DateFormat.getDateTimeInstance(DateFormat.SHORT, DateFormat.SHORT, Locale.US)
+					.format(inputDate)
+					.replace(",",""); // FIX JDK8 -> JDK9
 		}
 	}
 }
diff --git a/master/pom.xml b/master/pom.xml
@@ -658,9 +658,9 @@
         <scope>provided</scope>
       </dependency>
       <dependency>
-        <groupId>dom4j</groupId>
+        <groupId>org.dom4j</groupId>
         <artifactId>dom4j</artifactId>
-        <version>1.6.1</version>
+        <version>2.1.0</version>
         <scope>provided</scope>
       </dependency>
       <dependency>
@@ -752,7 +752,7 @@
       <dependency>
         <groupId>javax.validation</groupId>
         <artifactId>validation-api</artifactId>
-        <version>1.1.0.Final</version>
+        <version>2.0.1.Final</version>
         <scope>provided</scope>
       </dependency>
       <dependency>
@@ -1034,7 +1034,7 @@
       <dependency>
         <groupId>com.h2database</groupId>
         <artifactId>h2</artifactId>
-        <version>1.3.172</version>
+        <version>1.4.197</version>
         <scope>provided</scope>
       </dependency>
       <!-- Elasticsearch -->

diff --git a/signup/impl/pom.xml b/signup/impl/pom.xml
@@ -98,7 +98,7 @@
             <artifactId>hsqldb</artifactId>
         </dependency>
         <dependency>
-            <groupId>dom4j</groupId>
+            <groupId>org.dom4j</groupId>
             <artifactId>dom4j</artifactId>
         </dependency>
         <dependency>

diff --git a/sitestats/sitestats-impl/pom.xml b/sitestats/sitestats-impl/pom.xml
@@ -187,7 +187,7 @@
         <!-- <dependency> <groupId>com.oracle</groupId> <artifactId>ojdbc14</artifactId>
             <scope>test</scope> </dependency> -->
         <dependency>
-            <groupId>dom4j</groupId>
+            <groupId>org.dom4j</groupId>
             <artifactId>dom4j</artifactId>
             <scope>test</scope>
         </dependency>