Another bad merge

Author: bbimber

SequenceAnalysis/src/org/labkey/sequenceanalysis/run/preprocessing/CutadaptCropWrapper.java

@@ -1,7 +1,7 @@
 package org.labkey.sequenceanalysis.run.preprocessing;
 
 import org.apache.commons.io.FileUtils;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.Logger;
 import org.jetbrains.annotations.Nullable;
 import org.json.JSONObject;
 import org.labkey.api.pipeline.PipelineJobException;

omerointegration/src/org/labkey/omerointegration/OmeroServer.java

@@ -135,7 +135,7 @@ private String getProperty(String name)
     private ExperimenterData connect(Gateway gateway, URL url) throws Exception
     {
         LoginCredentials cred = new LoginCredentials();
-        cred.getServer().setHostname(url.getHost());
+        cred.getServer().setHost(url.getHost());
         if (url.getPort() > 0) {
             cred.getServer().setPort(url.getPort());
         }