Release 1.0.45

PredixDev · Mar 15, 2019 · ae19a3e · ae19a3e
1 parent ac94070
commit ae19a3e
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 16 deletions.
diff --git a/manifest.yml b/manifest.yml
@@ -2,7 +2,7 @@
 applications:
   - name: {your-name}-kit-service
     buildpack: java_buildpack
-    path: target/kit-service-1.0.44.jar
+    path: target/kit-service-1.0.45.jar
     memory: 512M
     timeout : 180
 services:

diff --git a/manifest.yml.template b/manifest.yml.template
@@ -2,7 +2,7 @@
 applications:
   - name: {your-name}-kit-service
     buildpack: java_buildpack
-    path: target/kit-service-1.0.44.jar
+    path: target/kit-service-1.0.45.jar
     memory: 512M
     timeout : 180
 services:

diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
 
 	<groupId>com.ge.predix.solsvc</groupId>
 	<artifactId>kit-service</artifactId>
-	<version>1.0.44</version>
+	<version>1.0.45</version>
 
 	<parent>
 		<groupId>org.springframework.boot</groupId>
@@ -15,10 +15,8 @@
 	</parent>
 
 	<properties>
-
-		<asset-bootstrap-client.version>2.0.72</asset-bootstrap-client.version>
-		<fdh-asset-handler.version>2.0.81</fdh-asset-handler.version>
-		<timeseries-bootstrap.version>2.1.89</timeseries-bootstrap.version>
+		<fdh-asset-handler.version>2.0.82</fdh-asset-handler.version>
+		<timeseries-bootstrap.version>2.1.90</timeseries-bootstrap.version>
 		<uaa-lib.version>3.2.2</uaa-lib.version>
 
 		<jetty.version>8.1.7.v20120910</jetty.version>
@@ -76,7 +74,7 @@
 		<dependency>
 			<groupId>org.springframework.security.oauth</groupId>
 			<artifactId>spring-security-oauth2</artifactId>
-			<version>2.0.12.RELEASE</version>
+			<version>2.3.5.RELEASE</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.security</groupId>
@@ -108,12 +106,6 @@
 			<artifactId>timeseries-bootstrap</artifactId>
 			<version>${timeseries-bootstrap.version}</version>
 		</dependency>
-
-		<dependency>
-			<groupId>com.ge.predix.solsvc</groupId>
-			<artifactId>asset-bootstrap-client</artifactId>
-			<version>${asset-bootstrap-client.version}</version>
-		</dependency>
 
 		<dependency>
 		  <groupId>org.freemarker</groupId>

diff --git a/src/main/java/com/ge/predix/solsvc/kitservice/manager/DeviceManager.java b/src/main/java/com/ge/predix/solsvc/kitservice/manager/DeviceManager.java
@@ -47,7 +47,7 @@
 
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.ge.predix.entity.asset.AssetTag;
-import com.ge.predix.entity.fielddata.Data;
+import com.ge.predix.entity.data.Data;
 import com.ge.predix.entity.fielddata.FieldData;
 import com.ge.predix.entity.fielddata.PredixString;
 import com.ge.predix.entity.getfielddata.GetFieldDataRequest;

diff --git a/src/main/java/com/ge/predix/solsvc/kitservice/manager/GroupManagementService.java b/src/main/java/com/ge/predix/solsvc/kitservice/manager/GroupManagementService.java
@@ -23,7 +23,7 @@
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
 
-import com.ge.predix.entity.fielddata.Data;
+import com.ge.predix.entity.data.Data;
 import com.ge.predix.entity.fielddata.FieldData;
 import com.ge.predix.entity.fielddata.PredixString;
 import com.ge.predix.entity.getfielddata.GetFieldDataRequest;