diff --git a/configserver-eureka/pom.xml b/configserver-eureka/pom.xml new file mode 100644 index 0000000..0d70c95 --- /dev/null +++ b/configserver-eureka/pom.xml @@ -0,0 +1,71 @@ + + + 4.0.0 + + org.springframework.cloud + spring-cloud-sample-configserver-eureka + 1.0.1.BUILD-SNAPSHOT + jar + + spring-cloud-sample-configserver-eureka + Demo project for Spring Cloud + + + org.springframework.boot + spring-boot-starter-parent + 1.2.1.RELEASE + + + + + UTF-8 + demo.DemoApplication + 1.7 + + + + + + org.springframework.cloud + spring-cloud-starter-parent + 1.0.1.BUILD-SNAPSHOT + pom + import + + + + + + + org.springframework.cloud + spring-cloud-config-server + + + org.springframework.cloud + spring-cloud-starter-eureka + + + org.springframework.boot + spring-boot-starter-test + test + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + maven-deploy-plugin + + true + + + + + + diff --git a/configserver-eureka/src/main/java/demo/ConfigServerEurekaApplication.java b/configserver-eureka/src/main/java/demo/ConfigServerEurekaApplication.java new file mode 100644 index 0000000..5cf2d05 --- /dev/null +++ b/configserver-eureka/src/main/java/demo/ConfigServerEurekaApplication.java @@ -0,0 +1,17 @@ +package demo; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.cloud.config.server.EnableConfigServer; +import org.springframework.cloud.netflix.eureka.EnableEurekaClient; + +@SpringBootApplication +@EnableConfigServer +@EnableEurekaClient +public class ConfigServerEurekaApplication { + + public static void main(String[] args) { + SpringApplication.run(ConfigServerEurekaApplication.class, args); + } + +} diff --git a/configserver-eureka/src/main/resources/application.yml b/configserver-eureka/src/main/resources/application.yml new file mode 100644 index 0000000..73cad7f --- /dev/null +++ b/configserver-eureka/src/main/resources/application.yml @@ -0,0 +1,16 @@ +spring: + application: + name: configserver + cloud: + config: + server: + git: + uri: https://github.com/spring-cloud-samples/config-repo +server: + port: 8787 +eureka: + instance: + leaseRenewalIntervalInSeconds: 10 + client: + registryFetchIntervalSeconds: 5 + \ No newline at end of file diff --git a/configserver-eureka/src/test/java/demo/ConfigServerEurekaApplicationTests.java b/configserver-eureka/src/test/java/demo/ConfigServerEurekaApplicationTests.java new file mode 100644 index 0000000..f56f57e --- /dev/null +++ b/configserver-eureka/src/test/java/demo/ConfigServerEurekaApplicationTests.java @@ -0,0 +1,33 @@ +package demo; + +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.SpringApplicationConfiguration; +import org.springframework.cloud.client.discovery.DiscoveryClient; +import org.springframework.cloud.netflix.eureka.EurekaDiscoveryClient; +import org.springframework.test.annotation.DirtiesContext; +import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import org.springframework.test.context.web.WebAppConfiguration; + +import static org.junit.Assert.*; + +@RunWith(SpringJUnit4ClassRunner.class) +@SpringApplicationConfiguration(classes = ConfigServerEurekaApplication.class) +@WebAppConfiguration +@DirtiesContext +public class ConfigServerEurekaApplicationTests { + + @Autowired + DiscoveryClient discoveryClient; + + @Test + public void contextLoads() { + } + + @Test + public void discoveryClientIsEureka() { + assertTrue("discoveryClient is wrong type", discoveryClient instanceof EurekaDiscoveryClient); + } + +} diff --git a/eureka-first/pom.xml b/eureka-first/pom.xml new file mode 100644 index 0000000..3b54be1 --- /dev/null +++ b/eureka-first/pom.xml @@ -0,0 +1,71 @@ + + + 4.0.0 + + org.springframework.cloud + spring-cloud-sample-eureka-first + 1.0.1.BUILD-SNAPSHOT + jar + + spring-cloud-sample-eureka-first + Demo project for Spring Cloud + + + org.springframework.boot + spring-boot-starter-parent + 1.2.1.RELEASE + + + + + UTF-8 + demo.DemoApplication + 1.7 + + + + + + org.springframework.cloud + spring-cloud-starter-parent + 1.0.1.BUILD-SNAPSHOT + pom + import + + + + + + + org.springframework.boot + spring-boot-starter-web + + + org.springframework.cloud + spring-cloud-starter-eureka + + + org.springframework.boot + spring-boot-starter-test + test + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + maven-deploy-plugin + + true + + + + + + diff --git a/eureka-first/src/main/java/demo/EurekaFirstApplication.java b/eureka-first/src/main/java/demo/EurekaFirstApplication.java new file mode 100644 index 0000000..21641a7 --- /dev/null +++ b/eureka-first/src/main/java/demo/EurekaFirstApplication.java @@ -0,0 +1,12 @@ +package demo; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class EurekaFirstApplication { + + public static void main(String[] args) { + SpringApplication.run(EurekaFirstApplication.class, args); + } +} diff --git a/eureka-first/src/main/resources/application.yml b/eureka-first/src/main/resources/application.yml new file mode 100644 index 0000000..e71e64b --- /dev/null +++ b/eureka-first/src/main/resources/application.yml @@ -0,0 +1,3 @@ +server: + port: 9001 + \ No newline at end of file diff --git a/eureka-first/src/main/resources/bootstrap.yml b/eureka-first/src/main/resources/bootstrap.yml new file mode 100644 index 0000000..348e6a0 --- /dev/null +++ b/eureka-first/src/main/resources/bootstrap.yml @@ -0,0 +1,14 @@ +spring: + application: + name: eurekafirst + cloud: + config: + discovery: + enabled: true + serviceId: configserver +eureka: + instance: + leaseRenewalIntervalInSeconds: 10 + client: + registryFetchIntervalSeconds: 5 + \ No newline at end of file diff --git a/eureka-first/src/test/java/demo/EurekaFirstApplicationTests.java b/eureka-first/src/test/java/demo/EurekaFirstApplicationTests.java new file mode 100644 index 0000000..8b09eb0 --- /dev/null +++ b/eureka-first/src/test/java/demo/EurekaFirstApplicationTests.java @@ -0,0 +1,33 @@ +package demo; + +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.SpringApplicationConfiguration; +import org.springframework.cloud.client.discovery.DiscoveryClient; +import org.springframework.cloud.netflix.eureka.EurekaDiscoveryClient; +import org.springframework.test.annotation.DirtiesContext; +import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import org.springframework.test.context.web.WebAppConfiguration; + +import static org.junit.Assert.*; + +@RunWith(SpringJUnit4ClassRunner.class) +@SpringApplicationConfiguration(classes = EurekaFirstApplication.class) +@WebAppConfiguration +@DirtiesContext +public class EurekaFirstApplicationTests { + + @Autowired + DiscoveryClient discoveryClient; + + @Test + public void contextLoads() { + } + + @Test + public void discoveryClientIsEureka() { + assertTrue("discoveryClient is wrong type", discoveryClient instanceof EurekaDiscoveryClient); + } + +} diff --git a/eureka-noweb/pom.xml b/eureka-noweb/pom.xml index 46d3160..7fc3e69 100644 --- a/eureka-noweb/pom.xml +++ b/eureka-noweb/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-sample-eureka-noweb - 1.0.0.BUILD-SNAPSHOT + 1.0.1.BUILD-SNAPSHOT jar eureka-noweb @@ -14,7 +14,7 @@ org.springframework.cloud spring-cloud-starter-parent - 1.0.0.BUILD-SNAPSHOT + 1.0.1.BUILD-SNAPSHOT diff --git a/feign-eureka/pom.xml b/feign-eureka/pom.xml index 7750958..5c2ef20 100644 --- a/feign-eureka/pom.xml +++ b/feign-eureka/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-sample-feign-eureka - 1.0.0.BUILD-SNAPSHOT + 1.0.1.BUILD-SNAPSHOT jar spring-cloud-sample-feign-eureka @@ -14,7 +14,7 @@ org.springframework.cloud spring-cloud-starter-parent - 1.0.0.BUILD-SNAPSHOT + 1.0.1.BUILD-SNAPSHOT diff --git a/feign/pom.xml b/feign/pom.xml index 523afe8..badc165 100644 --- a/feign/pom.xml +++ b/feign/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-sample-feign - 1.0.0.BUILD-SNAPSHOT + 1.0.1.BUILD-SNAPSHOT jar spring-cloud-sample-feign @@ -14,7 +14,7 @@ org.springframework.cloud spring-cloud-starter-parent - 1.0.0.BUILD-SNAPSHOT + 1.0.1.BUILD-SNAPSHOT diff --git a/hystrix/pom.xml b/hystrix/pom.xml index a6289ec..f3b8c3a 100644 --- a/hystrix/pom.xml +++ b/hystrix/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-sample-hystrix - 1.0.0.BUILD-SNAPSHOT + 1.0.1.BUILD-SNAPSHOT jar spring-cloud-sample-hystrix @@ -14,7 +14,7 @@ org.springframework.cloud spring-cloud-starter-parent - 1.0.0.BUILD-SNAPSHOT + 1.0.1.BUILD-SNAPSHOT diff --git a/netflix-sidecar/pom.xml b/netflix-sidecar/pom.xml index abba3d9..181871c 100644 --- a/netflix-sidecar/pom.xml +++ b/netflix-sidecar/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-sample-netflix-sidecar - 1.0.0.BUILD-SNAPSHOT + 1.0.1.BUILD-SNAPSHOT jar spring-cloud-sample-netflix-sidecar @@ -29,7 +29,7 @@ org.springframework.cloud spring-cloud-starter-parent - 1.0.0.BUILD-SNAPSHOT + 1.0.1.BUILD-SNAPSHOT pom import @@ -48,7 +48,7 @@ org.springframework.cloud spring-cloud-netflix-sidecar - 1.0.0.BUILD-SNAPSHOT + 1.0.1.BUILD-SNAPSHOT org.springframework.boot diff --git a/noweb/pom.xml b/noweb/pom.xml index bdfe5ef..131c45a 100644 --- a/noweb/pom.xml +++ b/noweb/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-sample-noweb - 1.0.0.BUILD-SNAPSHOT + 1.0.1.BUILD-SNAPSHOT jar noweb @@ -14,7 +14,7 @@ org.springframework.cloud spring-cloud-starter-parent - 1.0.0.BUILD-SNAPSHOT + 1.0.1.BUILD-SNAPSHOT diff --git a/oauth2-ribbon/pom.xml b/oauth2-ribbon/pom.xml index fd69d57..fa1ac4e 100644 --- a/oauth2-ribbon/pom.xml +++ b/oauth2-ribbon/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-sample-oauth2-ribbon - 1.0.0.BUILD-SNAPSHOT + 1.0.1.BUILD-SNAPSHOT jar spring-cloud-sample-oauth2-ribbon @@ -14,7 +14,7 @@ org.springframework.cloud spring-cloud-starter-parent - 1.0.0.BUILD-SNAPSHOT + 1.0.1.BUILD-SNAPSHOT diff --git a/pom.xml b/pom.xml index f6e78ff..5752db4 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ spring-cloud-samples-tests - 1.0.0.BUILD-SNAPSHOT + 1.0.1.BUILD-SNAPSHOT pom Spring Cloud Samples Tests Spring Cloud Samples Tests @@ -18,6 +18,8 @@ http://www.spring.io + configserver-eureka + eureka-first feign feign-eureka eureka-noweb diff --git a/turbine/pom.xml b/turbine/pom.xml index 940ef71..e74203a 100644 --- a/turbine/pom.xml +++ b/turbine/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-sample-turbine - 1.0.0.BUILD-SNAPSHOT + 1.0.1.BUILD-SNAPSHOT jar turbine @@ -29,7 +29,7 @@ org.springframework.cloud spring-cloud-starter-parent - 1.0.0.BUILD-SNAPSHOT + 1.0.1.BUILD-SNAPSHOT pom import diff --git a/zuul-proxy-eureka/pom.xml b/zuul-proxy-eureka/pom.xml index 13866a2..a3da3da 100644 --- a/zuul-proxy-eureka/pom.xml +++ b/zuul-proxy-eureka/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-sample-zuul-proxy-eureka - 1.0.0.BUILD-SNAPSHOT + 1.0.1.BUILD-SNAPSHOT jar spring-cloud-sample-zuul-proxy-eureka @@ -29,7 +29,7 @@ org.springframework.cloud spring-cloud-starter-parent - 1.0.0.BUILD-SNAPSHOT + 1.0.1.BUILD-SNAPSHOT pom import diff --git a/zuul-proxy/pom.xml b/zuul-proxy/pom.xml index 24072a1..66bc75c 100644 --- a/zuul-proxy/pom.xml +++ b/zuul-proxy/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-sample-zuul-proxy - 1.0.0.BUILD-SNAPSHOT + 1.0.1.BUILD-SNAPSHOT jar spring-cloud-sample-zuul-proxy @@ -29,7 +29,7 @@ org.springframework.cloud spring-cloud-starter-parent - 1.0.0.BUILD-SNAPSHOT + 1.0.1.BUILD-SNAPSHOT pom import