Skip to content

Commit

Permalink
removed cajo and updated dependencies related to security vulnerabili…
Browse files Browse the repository at this point in the history
…ties
  • Loading branch information
olensmar committed Jan 26, 2017
1 parent 6be3ec7 commit 627ee14
Show file tree
Hide file tree
Showing 8 changed files with 2 additions and 1,263 deletions.
9 changes: 2 additions & 7 deletions soapui/pom.xml
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@
<dependency> <dependency>
<groupId>commons-collections</groupId> <groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId> <artifactId>commons-collections</artifactId>
<version>3.2.1</version> <version>3.2.2</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>commons-lang</groupId> <groupId>commons-lang</groupId>
Expand Down Expand Up @@ -405,7 +405,7 @@
<dependency> <dependency>
<groupId>org.codehaus.groovy</groupId> <groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-all</artifactId> <artifactId>groovy-all</artifactId>
<version>2.1.7</version> <version>2.4.4</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>rhino</groupId> <groupId>rhino</groupId>
Expand Down Expand Up @@ -528,11 +528,6 @@
<version>2.7.1</version> <version>2.7.1</version>
<type>jar</type> <type>jar</type>
</dependency> </dependency>
<dependency>
<groupId>gnu.cajo</groupId>
<artifactId>cajo</artifactId>
<version>1.142</version>
</dependency>
<dependency> <dependency>
<groupId>org.apache.ws.commons.util</groupId> <groupId>org.apache.ws.commons.util</groupId>
<artifactId>ws-commons-util</artifactId> <artifactId>ws-commons-util</artifactId>
Expand Down
11 changes: 0 additions & 11 deletions soapui/src/main/java/com/eviware/soapui/SoapUI.java
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@
import com.eviware.soapui.impl.wsdl.submit.transports.jms.util.HermesUtils; 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.HelpUrls;
import com.eviware.soapui.impl.wsdl.support.http.ProxyUtils; 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.ModelItem;
import com.eviware.soapui.model.PanelBuilder; import com.eviware.soapui.model.PanelBuilder;
import com.eviware.soapui.model.TestPropertyHolder; import com.eviware.soapui.model.TestPropertyHolder;
Expand All @@ -70,7 +69,6 @@
import com.eviware.soapui.model.workspace.WorkspaceFactory; import com.eviware.soapui.model.workspace.WorkspaceFactory;
import com.eviware.soapui.monitor.MockEngine; import com.eviware.soapui.monitor.MockEngine;
import com.eviware.soapui.monitor.TestMonitor; import com.eviware.soapui.monitor.TestMonitor;
import com.eviware.soapui.settings.LoadUISettings;
import com.eviware.soapui.settings.ProxySettings; import com.eviware.soapui.settings.ProxySettings;
import com.eviware.soapui.settings.UISettings; import com.eviware.soapui.settings.UISettings;
import com.eviware.soapui.settings.VersionUpdateSettings; import com.eviware.soapui.settings.VersionUpdateSettings;
Expand Down Expand Up @@ -728,7 +726,6 @@ public void run() {
}); });
} }


startCajoServerIfNotOverriddenBySetting();
if (isFirstLaunch) { if (isFirstLaunch) {
Tools.openURL(HelpUrls.SOAPUI_WELCOME_PAGE); Tools.openURL(HelpUrls.SOAPUI_WELCOME_PAGE);
} }
Expand All @@ -741,14 +738,6 @@ public void run() {
System.exit(1); 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 { private static final class WsdlProjectCreator implements Runnable {
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

Loading

0 comments on commit 627ee14

Please sign in to comment.