Merge branch 'master' into 401-rest-interface

wyona · Mar 6, 2017 · de3976f · de3976f
2 parents 161fc6c + 323ae16
commit de3976f
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/src/build/dependencies.xml b/src/build/dependencies.xml
@@ -127,7 +127,7 @@
       <dependency groupId="commons-beanutils" artifactId="commons-beanutils" version="1.6"/>
       <dependency groupId="commons-fileupload" artifactId="commons-fileupload" version="1.2"/>
       <dependency groupId="commons-lang" artifactId="commons-lang" version="2.5"/>
-      <dependency groupId="dom4j" artifactId="dom4j" version="1.5.2"/>
+      <dependency groupId="dom4j" artifactId="dom4j" version="1.6.1"/>
 
       <!-- IMPORTANT: Please make sure to update pom-core.xml as well! -->
       <dependency groupId="org.quartz-scheduler" artifactId="quartz" version="2.1.5"/>

diff --git a/src/resources/tinymce/src/java/org/wyona/yanel/impl/resources/tinymce/TinyMCEResource.java b/src/resources/tinymce/src/java/org/wyona/yanel/impl/resources/tinymce/TinyMCEResource.java
@@ -17,7 +17,9 @@
 import javax.xml.transform.Source;
 import javax.xml.transform.stream.StreamSource;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+
 import org.w3c.dom.Document;
 import org.w3c.tidy.Tidy;
 import org.wyona.yanel.core.Environment;
@@ -49,7 +51,7 @@
  */
 public class TinyMCEResource extends ExecutableUsecaseResource {
 
-    private static Logger log = Logger.getLogger(TinyMCEResource.class);
+    private static Logger log = LogManager.getLogger(TinyMCEResource.class);
 
     private static final String PARAMETER_EDIT_PATH = "edit-path";
     private static final String PARAMETER_CONTINUE_PATH = "continue-path";

diff --git a/src/webapp/src/java/org/wyona/yanel/servlet/menu/impl/RevisionInformationMenuItem.java b/src/webapp/src/java/org/wyona/yanel/servlet/menu/impl/RevisionInformationMenuItem.java
@@ -79,7 +79,7 @@ private String getContent(boolean mostRecent, boolean oldestRevision) {
                 if (ResourceAttributeHelper.hasAttributeImplemented(resource, "Workflowable", "1")) {
                     log.warn("Workflow interface 'WorkflowableV1' implemented, but does not seem to reference any workflow configuration!");
                 } else {
-                    log.warn("No workflow interface implemented!");
+                    log.debug("No workflow interface implemented!");
                 }
             }
         } catch (WorkflowException e) {