Release 2.0.58

manifest.yml

@@ -1,7 +1,7 @@
 applications:
   - name: your-name-winddata-service
     buildpack: java_buildpack
-    path: target/winddata-timeseries-service-2.0.57.jar
+    path: target/winddata-timeseries-service-2.0.58.jar
     memory: 500M
     timeout: 180
     services:

manifest.yml.template

@@ -1,7 +1,7 @@
 applications:
   - name: your-name-winddata-service
     buildpack: java_buildpack
-    path: target/winddata-timeseries-service-2.0.57.jar
+    path: target/winddata-timeseries-service-2.0.58.jar
     memory: 500M
     timeout: 180
     services:

pom.xml

@@ -5,7 +5,7 @@
 
 	<groupId>com.ge.predix.solsvc</groupId>
 	<artifactId>winddata-timeseries-service</artifactId>
-	<version>2.0.57</version>
+	<version>2.0.58</version>
 
 	<parent>
 		<groupId>org.springframework.boot</groupId>
@@ -15,7 +15,7 @@
 	</parent>
 
 	<properties>
-		<predix-timeseries-client.version>2.1.82</predix-timeseries-client.version>
+		<predix-timeseries-client.version>2.1.86</predix-timeseries-client.version>
 
 		<cxf.version>3.1.7</cxf.version>
 		<jetty.version>8.1.7.v20120910</jetty.version>

src/main/java/com/ge/predix/solsvc/boot/Application.java

@@ -15,6 +15,7 @@
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.context.embedded.ServletRegistrationBean;
 import org.springframework.boot.context.embedded.tomcat.TomcatEmbeddedServletContainerFactory;
+import org.springframework.boot.test.SpringApplicationConfiguration;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ImportResource;
@@ -27,6 +28,8 @@
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.context.support.StandardServletEnvironment;
 
+import com.ge.predix.solsvc.timeseries.bootstrap.client.TimeseriesClientImpl;
+
 /**
  * This project uses a SpringBoot HelloWorld as a starting point. Then it adds in the capability to cf push a 
  * CXF Rest Service simply by extending PredixSpringBootInitializer.
@@ -61,7 +64,7 @@
  * Or if you want to import Spring XMLs from other dependent projects you can use the @ImportResource, e.g. 
  * \@ImportResource(
  * {
- *         "classpath*:META-INF/spring/predix-rest-client-scan-context.xml"
+ *         "classpath*:META-INF/spring/timeseries-bootstrap-scan-context.xml"
  * })
  * 
  * For other Spring Features see: http://docs.spring.io/spring-boot/docs/current/reference/html/
@@ -74,15 +77,14 @@
 
 })
 @PropertySource("classpath:application-default.properties")
+@SpringApplicationConfiguration(classes =
+{
+        TimeseriesClientImpl.class
+})
 @ImportResource(
 {
     "classpath*:META-INF/spring/winddata-cxf-context.xml",
-    "classpath*:META-INF/spring/winddata-scan-context.xml",
-    "classpath*:META-INF/spring/ext-util-scan-context.xml",
-    "classpath*:META-INF/spring/predix-rest-client-scan-context.xml",
-    "classpath*:META-INF/spring/predix-websocket-client-scan-context.xml",
-    "classpath*:META-INF/spring/timeseries-bootstrap-scan-context.xml"
-
+    "classpath*:META-INF/spring/winddata-scan-context.xml"       
 })
 @Controller
 public class Application