diff --git a/Source/Server/equellaserver/build.sbt b/Source/Server/equellaserver/build.sbt index 696b8adbdc..4ea6a804d4 100644 --- a/Source/Server/equellaserver/build.sbt +++ b/Source/Server/equellaserver/build.sbt @@ -19,7 +19,7 @@ updateOptions := updateOptions.value.withCachedResolution(true) val RestEasyVersion = "3.15.3.Final" val SwaggerVersion = "1.6.3" val TomcatVersion = "9.0.58" -val axis2Version = "1.6.3" +val axis2Version = "1.7.9" val circeVersion = "0.12.1" val cxfVersion = "3.5.0" val fs2Version = "2.4.4" @@ -46,7 +46,6 @@ libraryDependencies ++= Seq( "com.softwaremill.sttp" %% "circe" % sttpVersion, "io.github.doolse" %% "simpledba-jdbc" % simpledbaVersion, "io.github.doolse" %% "simpledba-circe" % simpledbaVersion, - "axis" % "axis" % "1.4", "cglib" % "cglib" % "3.3.0", "com.fasterxml.jackson.core" % "jackson-core" % jacksonVersion, "com.fasterxml.jackson.datatype" % "jackson-datatype-jsr310" % jacksonVersion, @@ -178,22 +177,20 @@ libraryDependencies ++= Seq( "org.apache.tika" % "tika-core" % tikaVersion, "org.apache.tika" % "tika-parsers-standard-package" % tikaVersion excludeAll ExclusionRule( organization = "org.apache.logging.log4j"), - "org.apache.tomcat" % "tomcat-annotations-api" % TomcatVersion, - "org.apache.tomcat" % "tomcat-api" % TomcatVersion, - "org.apache.tomcat" % "tomcat-catalina" % TomcatVersion, - "org.apache.tomcat" % "tomcat-catalina-ha" % TomcatVersion, - "org.apache.tomcat" % "tomcat-coyote" % TomcatVersion, - "org.apache.tomcat" % "tomcat-jsp-api" % TomcatVersion, - "org.apache.tomcat" % "tomcat-juli" % TomcatVersion, - "org.apache.tomcat" % "tomcat-servlet-api" % TomcatVersion, - "org.apache.tomcat" % "tomcat-tribes" % TomcatVersion, - "org.apache.tomcat" % "tomcat-util" % TomcatVersion, - "org.apache.tomcat" % "tomcat-util-scan" % TomcatVersion, - "org.apache.tomcat" % "tomcat-ssi" % TomcatVersion, - "org.apache.ws.commons.axiom" % "axiom-api" % "1.3.0", - "org.apache.ws.commons.axiom" % "axiom-impl" % "1.3.0", - "org.apache.ws.security" % "wss4j" % "1.6.19", - "org.apache.zookeeper" % "zookeeper" % "3.7.0" excludeAll ( + "org.apache.tomcat" % "tomcat-annotations-api" % TomcatVersion, + "org.apache.tomcat" % "tomcat-api" % TomcatVersion, + "org.apache.tomcat" % "tomcat-catalina" % TomcatVersion, + "org.apache.tomcat" % "tomcat-catalina-ha" % TomcatVersion, + "org.apache.tomcat" % "tomcat-coyote" % TomcatVersion, + "org.apache.tomcat" % "tomcat-jsp-api" % TomcatVersion, + "org.apache.tomcat" % "tomcat-juli" % TomcatVersion, + "org.apache.tomcat" % "tomcat-servlet-api" % TomcatVersion, + "org.apache.tomcat" % "tomcat-tribes" % TomcatVersion, + "org.apache.tomcat" % "tomcat-util" % TomcatVersion, + "org.apache.tomcat" % "tomcat-util-scan" % TomcatVersion, + "org.apache.tomcat" % "tomcat-ssi" % TomcatVersion, + "org.apache.ws.security" % "wss4j" % "1.6.19", + "org.apache.zookeeper" % "zookeeper" % "3.7.0" excludeAll ( ExclusionRule(organization = "org.slf4j", name = "slf4j-log4j12") ), @@ -202,9 +199,8 @@ libraryDependencies ++= Seq( // com.fasterxml.woodstox/woodstox-core/bundles/woodstox-core-5.0.3.jar:... // org.codehaus.woodstox/woodstox-core-asl/jars/woodstox-core-asl-4.4.1.jar:... //"org.codehaus.woodstox" % "woodstox-core-asl" % "5.0.3", - "org.codehaus.xfire" % "xfire-aegis" % "1.2.6", - "org.dspace" % "cql-java" % "1.0", - // "org.dspace.oclc" % "oclc-srw" % "1.0.20080328", + "org.codehaus.xfire" % "xfire-aegis" % "1.2.6", + "org.dspace" % "cql-java" % "1.0", "org.omegat" % "jmyspell-core" % "1.0.0-beta-2", "org.freemarker" % "freemarker" % "2.3.23", "com.github.equella.legacy" % "hurl" % "1.1", @@ -258,6 +254,13 @@ libraryDependencies ++= Seq( "org.jboss.spec.javax.xml.bind" % "jboss-jaxb-api_2.3_spec" % "2.0.1.Final" ) +/* +Although very old and has vulns, axis 1.4 is required for the SRW feature and is needed when +using the very old (and unsure where the code is) oclc-srw. +See Source/Plugins/RemoteRepositories/com.equella.srw/build.sbt + */ +libraryDependencies += "axis" % "axis" % "1.4" + libraryDependencies ++= { if (bundleOracleDriver.value) { oracleDriverMavenCoordinate.value diff --git a/autotest/OldTests/build.sbt b/autotest/OldTests/build.sbt index 1f0329f6ef..af30e50d9a 100644 --- a/autotest/OldTests/build.sbt +++ b/autotest/OldTests/build.sbt @@ -11,6 +11,15 @@ libraryDependencies ++= Seq( "com.thoughtworks.xstream" % "xstream" % "1.4.18" % Test ) +/* +Although very old and has vulns, axis 1.4 is required for the SRW tests (SRWTest etc) and is needed +when using the very old (and unsure where the code is) oclc-srw. + */ +libraryDependencies ++= Seq( + "axis" % "axis" % "1.4" % Test, + "org.dspace.oclc" % "oclc-srw" % "1.0.20080328" % Test +) + enablePlugins(TestNGPlugin) testNGOutputDirectory := (target.value / "testng").absolutePath diff --git a/autotest/OldTests/src/test/java/com/tle/webtests/test/webservices/soap/Soap51Test.java b/autotest/OldTests/src/test/java/com/tle/webtests/test/webservices/soap/Soap51Test.java index 68558dc7cb..d2a4bf71b9 100644 --- a/autotest/OldTests/src/test/java/com/tle/webtests/test/webservices/soap/Soap51Test.java +++ b/autotest/OldTests/src/test/java/com/tle/webtests/test/webservices/soap/Soap51Test.java @@ -971,8 +971,12 @@ public void hierarchyTest() throws Exception { } private void checkTopic(PropBagEx xml, String name, String uuid) { - String errorGet = "Topic does not match requested topic"; - assertTrue(xml.getNode("name").equals(name) && xml.getNode("@uuid").equals(uuid), errorGet); + String actualName = xml.getNode("name"); + String actualUuid = xml.getNode("@uuid"); + + String expectedTopic = uuid + " - " + name; + String actualTopic = actualUuid + " - " + actualName; + assertEquals(actualTopic, expectedTopic, "Topic does not match requested topic."); } private List removeThumbFiles(String[] filenames) { diff --git a/autotest/Tests/build.sbt b/autotest/Tests/build.sbt index 35d5321e22..58498e7334 100644 --- a/autotest/Tests/build.sbt +++ b/autotest/Tests/build.sbt @@ -20,32 +20,29 @@ libraryDependencies ++= Seq( ).map(_ % circeVersion) libraryDependencies ++= Seq( - "javax.jws" % "javax.jws-api" % "1.1", - "org.apache.commons" % "commons-lang3" % "3.12.0", - "org.seleniumhq.selenium" % "selenium-java" % "3.141.59", - "org.easytesting" % "fest-util" % "1.2.5", - "org.easytesting" % "fest-swing" % "1.2.1", - "org.codehaus.jackson" % "jackson-core-asl" % "1.9.13", - "org.codehaus.jackson" % "jackson-mapper-asl" % "1.9.13", - "xalan" % "xalan" % "2.7.2", - "org.dspace.oclc" % "oclc-srw" % "1.0.20080328", - "org.apache.cxf" % "cxf-rt-frontend-simple" % cxfVersion, - "org.apache.cxf" % "cxf-rt-databinding-aegis" % cxfVersion, - "org.apache.cxf" % "cxf-rt-transports-http" % cxfVersion, - "org.apache.httpcomponents" % "httpclient" % "4.5.13", - "axis" % "axis" % "1.4", - "com.jcraft" % "jsch" % "0.1.55", -// "jpf" % "jpf-tools" % "1.0.5", - "org.jacoco" % "org.jacoco.report" % "0.8.7", - "org.dspace" % "oclc-harvester2" % "0.1.12", - "com.typesafe" % "config" % "1.4.1", - "org.slf4j" % "slf4j-simple" % "1.7.35", - "org.scalacheck" %% "scalacheck" % "1.15.4" % "test,serial", - "org.http4s" %% "http4s-async-http-client" % http4sVersion, - "org.http4s" %% "http4s-blaze-client" % http4sVersion, - "org.http4s" %% "http4s-circe" % http4sVersion, - "org.typelevel" %% "cats-free" % catsVersion, - "com.unboundid" % "unboundid-ldapsdk" % "6.0.3" + "javax.jws" % "javax.jws-api" % "1.1", + "org.apache.commons" % "commons-lang3" % "3.12.0", + "org.seleniumhq.selenium" % "selenium-java" % "3.141.59", + "org.easytesting" % "fest-util" % "1.2.5", + "org.easytesting" % "fest-swing" % "1.2.1", + "org.codehaus.jackson" % "jackson-core-asl" % "1.9.13", + "org.codehaus.jackson" % "jackson-mapper-asl" % "1.9.13", + "xalan" % "xalan" % "2.7.2", + "org.apache.cxf" % "cxf-rt-frontend-simple" % cxfVersion, + "org.apache.cxf" % "cxf-rt-databinding-aegis" % cxfVersion, + "org.apache.cxf" % "cxf-rt-transports-http" % cxfVersion, + "org.apache.httpcomponents" % "httpclient" % "4.5.13", + "com.jcraft" % "jsch" % "0.1.55", + "org.jacoco" % "org.jacoco.report" % "0.8.7", + "org.dspace" % "oclc-harvester2" % "0.1.12", + "com.typesafe" % "config" % "1.4.1", + "org.slf4j" % "slf4j-simple" % "1.7.35", + "org.scalacheck" %% "scalacheck" % "1.15.4" % "test,serial", + "org.http4s" %% "http4s-async-http-client" % http4sVersion, + "org.http4s" %% "http4s-blaze-client" % http4sVersion, + "org.http4s" %% "http4s-circe" % http4sVersion, + "org.typelevel" %% "cats-free" % catsVersion, + "com.unboundid" % "unboundid-ldapsdk" % "6.0.3" ) (Compile / unmanagedBase) := baseDirectory.value / "lib/adminjars" diff --git a/project/plugins.sbt b/project/plugins.sbt index 70bff284c3..696603e5a7 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -28,24 +28,27 @@ addDependencyTreePlugin // Old version used because something else depends on an old JAWN val circeVersion = "0.7.1" +libraryDependencies ++= Seq( + "io.circe" %% "circe-core" % circeVersion, + "io.circe" %% "circe-generic" % circeVersion, + "io.circe" %% "circe-parser" % circeVersion +) +val axis2Version = "1.7.9" libraryDependencies ++= Seq( - "io.circe" %% "circe-core", - "io.circe" %% "circe-generic", - "io.circe" %% "circe-parser" -).map(_ % circeVersion) + "org.apache.axis2" % "axis2-kernel" % axis2Version, + "org.apache.axis2" % "axis2-java2wsdl" % axis2Version, + "org.apache.axis2" % "axis2-adb" % axis2Version, + "org.apache.axis2" % "axis2-jaxbri" % axis2Version, + "org.apache.axis2" % "axis2-adb-codegen" % axis2Version, + "org.apache.axis2" % "axis2-codegen" % axis2Version, + "org.apache.axis2" % "axis2-xmlbeans" % axis2Version +) libraryDependencies ++= Seq( "com.typesafe" % "config" % "1.4.1", "org.jacoco" % "org.jacoco.report" % "0.8.7", "org.jdom" % "jdom2" % "2.0.6.1", - "org.apache.axis2" % "axis2-kernel" % "1.6.2", - "org.apache.axis2" % "axis2-java2wsdl" % "1.6.2", - "org.apache.axis2" % "axis2-adb" % "1.6.2", - "org.apache.axis2" % "axis2-jaxbri" % "1.6.2", - "org.apache.axis2" % "axis2-adb-codegen" % "1.6.2", - "org.apache.axis2" % "axis2-codegen" % "1.6.2", - "org.apache.axis2" % "axis2-xmlbeans" % "1.6.2", "commons-logging" % "commons-logging" % "1.2", "commons-discovery" % "commons-discovery" % "0.5", "commons-configuration" % "commons-configuration" % "1.10",