Release 1.0.26

PredixDev · Feb 1, 2018 · 9b21127 · 9b21127
1 parent f565355
commit 9b21127
Show file tree

Hide file tree

Showing 26 changed files with 3,112 additions and 3,116 deletions.
diff --git a/config/application-template.properties b/config/application-template.properties
@@ -9,8 +9,10 @@ server.port=9092
 spring.profiles.active=local,asset
 
 #if you are behind a corporate proxy/firewall and want to access Predix Cloud
-#predix.oauth.proxyHost =put.your.proxyHost.here 
-#predix.oauth.proxyPort=put.your.proxyPort.here
+#predix.rest.proxyHost=put.your.proxyHost.here
+#predix.rest.proxyPort=put.your.proxyPort.here
+#predix.rest.proxyUser=put.your.proxyUser.here.if.needed
+#predix.rest.proxyPassword=put.your.proxyPassword.here.if.needed
 
 #OAuth - please see predix-rest-client src/main/java/com/ge/predix/solsvc/restclient/config/OauthRestConfig.java for more info on oauth properties
 predix.oauth.issuerId.url=put.your.uaa.issuerId.here

diff --git a/config/application.properties b/config/application.properties
@@ -9,8 +9,10 @@ server.port=9092
 spring.profiles.active=local,asset
 
 #if you are behind a corporate proxy/firewall and want to access Predix Cloud
-#predix.oauth.proxyHost =put.your.proxyHost.here 
-#predix.oauth.proxyPort=put.your.proxyPort.here
+#predix.rest.proxyHost=put.your.proxyHost.here
+#predix.rest.proxyPort=put.your.proxyPort.here
+#predix.rest.proxyUser=put.your.proxyUser.here.if.needed
+#predix.rest.proxyPassword=put.your.proxyPassword.here.if.needed
 
 #OAuth - please see predix-rest-client src/main/java/com/ge/predix/solsvc/restclient/config/OauthRestConfig.java for more info on oauth properties
 predix.oauth.issuerId.url=put.your.uaa.issuerId.here

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.23.jar
+    path: target/kit-service-1.0.26.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.23.jar
+    path: target/kit-service-1.0.26.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.23</version>
+	<version>1.0.26</version>
 
 	<parent>
 		<groupId>org.springframework.boot</groupId>
@@ -15,8 +15,8 @@
 	</parent>
 
 	<properties>
-		<fdh-asset-handler.version>2.0.33</fdh-asset-handler.version>
-		<timeseries-bootstrap.version>2.1.32</timeseries-bootstrap.version>
+		<fdh-asset-handler.version>2.0.35</fdh-asset-handler.version>
+		<timeseries-bootstrap.version>2.1.34</timeseries-bootstrap.version>
 		<uaa-lib.version>3.2.2</uaa-lib.version>
 
 		<jetty.version>8.1.7.v20120910</jetty.version>