diff --git a/pinery-ws/src/main/java/ca/on/oicr/pinery/ws/StatusController.java b/pinery-ws/src/main/java/ca/on/oicr/pinery/ws/StatusController.java index 765ade33..99e7df35 100644 --- a/pinery-ws/src/main/java/ca/on/oicr/pinery/ws/StatusController.java +++ b/pinery-ws/src/main/java/ca/on/oicr/pinery/ws/StatusController.java @@ -23,31 +23,31 @@ @RequestMapping("/") @ApiIgnore public class StatusController { - public static final ServerConfig SERVER_CONFIG = - new ServerConfig() { + public static final ServerConfig SERVER_CONFIG = new ServerConfig() { - @Override - public Stream navigation() { - return Stream.empty(); - } + @Override + public Stream navigation() { + return Stream.empty(); + } - @Override - public String name() { - return "Pinery"; - } + @Override + public String name() { + return "Pinery"; + } - @Override - public Stream
headers() { - return Stream.empty(); - } + @Override + public Stream
headers() { + return Stream.empty(); + } - @Override - public String documentationUrl() { - return "swagger-ui.html"; - } - }; + @Override + public String documentationUrl() { + return "swagger-ui/index.html"; + } + }; - @Autowired private Cache cache; + @Autowired + private Cache cache; @Value("${pinery.cache.interval:900000}") private int cacheInterval; diff --git a/pinery-ws/src/main/webapp/WEB-INF/spring-servlet.xml b/pinery-ws/src/main/webapp/WEB-INF/spring-servlet.xml index 128a8ae1..3fa12c9f 100644 --- a/pinery-ws/src/main/webapp/WEB-INF/spring-servlet.xml +++ b/pinery-ws/src/main/webapp/WEB-INF/spring-servlet.xml @@ -1,57 +1,60 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:context="http://www.springframework.org/schema/context" + xmlns:aop="http://www.springframework.org/schema/aop" + xmlns:task="http://www.springframework.org/schema/task" + xmlns:tx="http://www.springframework.org/schema/tx" + xmlns:mvc="http://www.springframework.org/schema/mvc" + xmlns:util="http://www.springframework.org/schema/util" + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.2.xsd + http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-3.2.xsd + http://www.springframework.org/schema/task http://www.springframework.org/schema/task/spring-task.xsd + http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-3.2.xsd + http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-3.2.xsd + http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd + http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-3.2.xsd"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/pom.xml b/pom.xml index 3489fe28..6b528896 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ 5.3.27 3.14.0.Final 1.0.1 - 2.9.2 + 3.0.0 4.13.1 1.3 2.6 @@ -447,4 +447,4 @@ https://artifacts.oicr.on.ca/artifactory/gsi-snapshots - + \ No newline at end of file