Permalink
Browse files

Merge pull request #259 from SmartBear/remove-cajo-and-dependency-upd…

…ates

removed cajo and updated dependencies related to security vulnerabili…
  • Loading branch information...
spindelmanne committed Feb 2, 2017
2 parents 42af23f + 627ee14 commit 0562c0f1357c526711eabf1a87dfb5622f92a721
View
@@ -405,7 +405,7 @@
<dependency>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-all</artifactId>
<version>2.1.7</version>
<version>2.4.4</version>
</dependency>
<dependency>
<groupId>rhino</groupId>
@@ -528,11 +528,6 @@
<version>2.7.1</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>gnu.cajo</groupId>
<artifactId>cajo</artifactId>
<version>1.142</version>
</dependency>
<dependency>
<groupId>org.apache.ws.commons.util</groupId>
<artifactId>ws-commons-util</artifactId>
@@ -54,7 +54,6 @@
import com.eviware.soapui.impl.wsdl.submit.transports.jms.util.HermesUtils;
import com.eviware.soapui.impl.wsdl.support.HelpUrls;
import com.eviware.soapui.impl.wsdl.support.http.ProxyUtils;
import com.eviware.soapui.integration.impl.CajoServer;
import com.eviware.soapui.model.ModelItem;
import com.eviware.soapui.model.PanelBuilder;
import com.eviware.soapui.model.TestPropertyHolder;
@@ -70,7 +69,6 @@
import com.eviware.soapui.model.workspace.WorkspaceFactory;
import com.eviware.soapui.monitor.MockEngine;
import com.eviware.soapui.monitor.TestMonitor;
import com.eviware.soapui.settings.LoadUISettings;
import com.eviware.soapui.settings.ProxySettings;
import com.eviware.soapui.settings.UISettings;
import com.eviware.soapui.settings.VersionUpdateSettings;
@@ -728,7 +726,6 @@ public void run() {
});
}
startCajoServerIfNotOverriddenBySetting();
if (isFirstLaunch) {
Tools.openURL(HelpUrls.SOAPUI_WELCOME_PAGE);
}
@@ -741,14 +738,6 @@ public void run() {
System.exit(1);
}
}
private void startCajoServerIfNotOverriddenBySetting() {
if (!getSettings().isSet(LoadUISettings.START_CAJO_SERVER_AT_STARTUP) || getSettings().getBoolean(LoadUISettings.START_CAJO_SERVER_AT_STARTUP)) {
CajoServer.getInstance().start();
} else {
log.info("Cajo server not started because setting '" + LoadUISettings.START_CAJO_SERVER_AT_STARTUP + "' is false.");
}
}
}
private static final class WsdlProjectCreator implements Runnable {

This file was deleted.

Oops, something went wrong.

This file was deleted.

Oops, something went wrong.

This file was deleted.

Oops, something went wrong.
Oops, something went wrong.

0 comments on commit 0562c0f

Please sign in to comment.