service-discovery-task

applications/allocations-server/src/main/resources/application.properties

@@ -4,6 +4,5 @@ server.port=8081
 spring.datasource.username=tracker
 spring.datasource.url=jdbc:mysql://localhost:3306/tracker_allocations_dev?useSSL=false&useTimezone=true&serverTimezone=UTC&useLegacyDatetimeCode=false
 registration.server.endpoint=http://registration-server
-
 security.basic.enabled=false
-management.security.enabled=false
+management.security.enabled=false

applications/allocations-server/src/test/resources/application.properties

@@ -4,6 +4,5 @@ server.port=8181
 spring.datasource.username=tracker
 spring.datasource.url=jdbc:mysql://localhost:3306/tracker_allocations_test?useSSL=false&useTimezone=true&serverTimezone=UTC&useLegacyDatetimeCode=false
 registration.server.endpoint=http://registration-server
-
 security.basic.enabled=false
-management.security.enabled=false
+management.security.enabled=false

applications/backlog-server/src/main/resources/application.properties

@@ -4,6 +4,5 @@ server.port=8082
 spring.datasource.username=tracker
 spring.datasource.url=jdbc:mysql://localhost:3306/tracker_backlog_dev?useSSL=false&useTimezone=true&serverTimezone=UTC&useLegacyDatetimeCode=false
 registration.server.endpoint=http://registration-server
-
 security.basic.enabled=false
-management.security.enabled=false
+management.security.enabled=false

applications/backlog-server/src/test/resources/application.properties

@@ -4,6 +4,5 @@ server.port=8181
 spring.datasource.username=tracker
 spring.datasource.url=jdbc:mysql://localhost:3306/tracker_backlog_test?useSSL=false&useTimezone=true&serverTimezone=UTC&useLegacyDatetimeCode=false
 registration.server.endpoint=http://registration-server
-
 security.basic.enabled=false
-management.security.enabled=false
+management.security.enabled=false

applications/registration-server/src/main/resources/application.properties

@@ -4,6 +4,5 @@ server.port=8083
 spring.datasource.username=tracker
 spring.datasource.url=jdbc:mysql://localhost:3306/tracker_registration_dev?useSSL=false&useTimezone=true&serverTimezone=UTC&useLegacyDatetimeCode=false
 registration.server.endpoint=http://registration-server
-
 security.basic.enabled=false
-management.security.enabled=false
+management.security.enabled=false

applications/registration-server/src/test/resources/application.properties

@@ -4,6 +4,5 @@ server.port=8181
 spring.datasource.username=tracker
 spring.datasource.url=jdbc:mysql://localhost:3306/tracker_registration_test?useSSL=false&useTimezone=true&serverTimezone=UTC&useLegacyDatetimeCode=false
 registration.server.endpoint=http://registration-server
-
 security.basic.enabled=false
-management.security.enabled=false
+management.security.enabled=false

applications/timesheets-server/src/main/resources/application.properties

@@ -4,6 +4,5 @@ server.port=8084
 spring.datasource.username=tracker
 spring.datasource.url=jdbc:mysql://localhost:3306/tracker_timesheets_dev?useSSL=false&useTimezone=true&serverTimezone=UTC&useLegacyDatetimeCode=false
 registration.server.endpoint=http://registration-server
-
 security.basic.enabled=false
-management.security.enabled=false
+management.security.enabled=false

applications/timesheets-server/src/test/resources/application.properties

@@ -4,6 +4,5 @@ server.port=8181
 spring.datasource.username=tracker
 spring.datasource.url=jdbc:mysql://localhost:3306/tracker_timesheets_test?useSSL=false&useTimezone=true&serverTimezone=UTC&useLegacyDatetimeCode=false
 registration.server.endpoint=http://registration-server
-
 security.basic.enabled=false
 management.security.enabled=false

build.gradle

@@ -5,8 +5,8 @@ buildscript {
         springBootVersion = "1.5.7.RELEASE"
         springVersion = "4.3.8.RELEASE"
         mysqlVersion = "8.0.11"
-        springCloudDependenciesVersion = "Edgware.SR3"
-        springCloudServicesVersion = "1.6.1.RELEASE"
+        springCloudDependenciesVersion = "Edgware.RELEASE"
+        springCloudServicesVersion = "1.6.0.RELEASE"
     }
 
     repositories {

integration-test/src/test/java/test/pivotal/pal/tracker/support/ApplicationServer.java

@@ -37,7 +37,6 @@ public void startWithDatabaseName(String dbName) throws IOException, Interrupted
 
         start(envMapBuilder()
             .put("SPRING_DATASOURCE_URL", dbUrl)
-            .put("REGISTRATION_SERVER_ENDPOINT", "http://localhost:8883")
             .put("EUREKA_CLIENT_ENABLED", "false")
             .put("RIBBON_EUREKA_ENABLED", "false")
             .put("REGISTRATION_SERVER_RIBBON_LISTOFSERVERS", "http://localhost:8883")
@@ -49,7 +48,6 @@ public void stop() {
         serverProcess.destroyForcibly();
     }
 
-
     public static void waitOnPorts(String... ports) throws InterruptedException {
         for (String port : ports) waitUntilServerIsUp(port);
     }

manifest-allocations.yml

@@ -5,7 +5,6 @@ applications:
   - route: allocations-pal-hot-tea.cfapps.io
   memory: 1G
   instances: 1
-  env:
-    REGISTRATION_SERVER_ENDPOINT: http://registration-pal-hot-tea.cfapps.io
   services:
   - tracker-allocations-database
+  - tracker-service-registry

manifest-backlog.yml

@@ -5,7 +5,6 @@ applications:
   - route: backlog-pal-hot-tea.cfapps.io
   memory: 1G
   instances: 1
-  env:
-    REGISTRATION_SERVER_ENDPOINT: http://registration-pal-hot-tea.cfapps.io
   services:
   - tracker-backlog-database
+  - tracker-service-registry

manifest-registration.yml

@@ -7,3 +7,4 @@ applications:
   instances: 1
   services:
   - tracker-registration-database
+  - tracker-service-registry

manifest-timesheets.yml

@@ -5,7 +5,6 @@ applications:
   - route: timesheets-pal-hot-tea.cfapps.io
   memory: 1G
   instances: 1
-  env:
-    REGISTRATION_SERVER_ENDPOINT: http://registration-pal-hot-tea.cfapps.io
   services:
   - tracker-timesheets-database
+  - tracker-service-registry

platform-services/eureka-server/src/main/resources/application.properties

@@ -0,0 +1,2 @@
+spring.application.name=eureka-server
+server.port=8761