Skip to content

Commit

Permalink
Merge pull request #10 from kameshsampath/sb-1.5.x
Browse files Browse the repository at this point in the history 
Adding required spring framework/cloud deps that were missing w.r.t Brewery     App
  • Loading branch information
@cmoulliard
cmoulliard committed Sep 13, 2017
2 parents 1b3715c + e4b08a2 commit ffa4f50
Show file tree
Hide file tree
Showing 2 changed files with 171 additions and 9 deletions.
6 changes: 5 additions & 1 deletion .gitignore
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
.idea
*.iml
/target
*.jar
*.jar
.vscode
.project
.classpath
.settings/*
174 changes: 166 additions & 8 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,13 +72,35 @@
<version.org.slf4j.jul-to-slf4j>1.7.21</version.org.slf4j.jul-to-slf4j>
<version.org.slf4j.slf4j-api>1.7.21</version.org.slf4j.slf4j-api>
<version.org.springframework.boot.spring-boot>1.5.4.RELEASE</version.org.springframework.boot.spring-boot>
<version.org.springframework.cloud>Dalston.SR2</version.org.springframework.cloud>
<version.org.springframework.cloud.spring-cloud-config>1.3.2.RELEASE</version.org.springframework.cloud.spring-cloud-config>
<version.org.springframework.cloud.spring-cloud-netflix>1.3.2.RELEASE</version.org.springframework.cloud.spring-cloud-netflix>
<version.org.springframework.cloud.spring-cloud-sleuth>1.2.2.RELEASE</version.org.springframework.cloud.spring-cloud-sleuth>
<version.org.springframework.cloud.spring-cloud-sleuth-zipkin>1.2.2.RELEASE</version.org.springframework.cloud.spring-cloud-sleuth-zipkin>
<version.org.springframework.cloud.spring-cloud-kubernetes>0.2.0</version.org.springframework.cloud.spring-cloud-kubernetes>
<version.org.springframework.cloud.spring-cloud-kubernetes>0.2.0.RELEASE</version.org.springframework.cloud.spring-cloud-kubernetes>
<version.org.springframework.cloud.spring-cloud-starter-feign>1.3.4.RELEASE</version.org.springframework.cloud.spring-cloud-starter-feign>
<version.org.springframework.cloud.spring-cloud-starter-zuul>1.3.4.RELEASE</version.org.springframework.cloud.spring-cloud-starter-zuul>
<version.org.springframework.cloud.spring-cloud-sleuth-stream>1.2.4.RELEASE</version.org.springframework.cloud.spring-cloud-sleuth-stream>
<version.org.springframework.cloud.spring-cloud-starter-stream-rabbit>1.2.1.RELEASE</version.org.springframework.cloud.spring-cloud-starter-stream-rabbit>
<version.org.springframework.spring>4.3.9.RELEASE</version.org.springframework.spring>
<version.org.springframework.spring-aspects>4.3.9.RELEASE</version.org.springframework.spring-aspects>
<version.org.springframework.spring-beans>4.3.9.RELEASE</version.org.springframework.spring-beans>
<version.org.springframework.spring-context>4.3.9.RELEASE</version.org.springframework.spring-context>
<version.org.springframework.spring-core>4.3.9.RELEASE</version.org.springframework.spring-core>
<version.org.springframework.spring-orm>4.3.9.RELEASE</version.org.springframework.spring-orm>
<version.org.springframework.spring-tx>4.3.9.RELEASE</version.org.springframework.spring-tx>
<version.org.springframework.spring-web>4.3.9.RELEASE</version.org.springframework.spring-web>
<version.org.springframework.spring-webmvc>4.3.9.RELEASE</version.org.springframework.spring-webmvc>
<version.org.springframework.security.spring-security-crypto>4.2.3.RELEASE</version.org.springframework.security.spring-security-crypto>
<version.org.springframework.spring-amqp>1.7.3.RELEASE</version.org.springframework.spring-amqp>
<version.org.yaml.snakeyaml>1.17</version.org.yaml.snakeyaml>
<version.xml-apis.xml-apis>1.4.01</version.xml-apis.xml-apis>
<version.spock>1.0-groovy-2.4</version.spock>
<version.lombok>1.16.16</version.lombok>
<version.aspectj>1.8.10</version.aspectj>
<version.dropwizard-metrics>3.1.4</version.dropwizard-metrics>
<version.hsqldb>2.3.5</version.hsqldb>
<version.gauva>23.0</version.gauva>
</properties>

<dependencyManagement>
Expand All @@ -96,6 +118,11 @@
</dependency>

<!-- spring-boot -->
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>${version.lombok}</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot</artifactId>
Expand Down Expand Up @@ -184,6 +211,11 @@
<artifactId>spring-boot-starter-data-rest</artifactId>
<version>${version.org.springframework.boot.spring-boot}</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-feign</artifactId>
<version>${version.org.springframework.cloud.spring-cloud-starter-feign}</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-jdbc</artifactId>
Expand Down Expand Up @@ -222,6 +254,21 @@
</dependency>

<!-- spring-framework -->
<dependency>
<groupId>org.aspectj</groupId>
<artifactId>aspectjrt</artifactId>
<version>${version.aspectj}</version>
</dependency>
<dependency>
<groupId>org.aspectj</groupId>
<artifactId>aspectjtools</artifactId>
<version>${version.aspectj}</version>
</dependency>
<dependency>
<groupId>org.aspectj</groupId>
<artifactId>aspectjweaver</artifactId>
<version>${version.aspectj}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-aspects</artifactId>
Expand All @@ -248,6 +295,11 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-jdbc</artifactId>
<version>${version.org.springframework.spring-core}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-orm</artifactId>
Expand All @@ -273,7 +325,27 @@
<artifactId>spring-security-crypto</artifactId>
<version>${version.org.springframework.security.spring-security-crypto}</version>
</dependency>

<dependency>
<groupId>org.springframework.amqp</groupId>
<artifactId>spring-amqp</artifactId>
<version>${version.org.springframework.spring-amqp}</version>
</dependency>
<dependency>
<groupId>org.spockframework</groupId>
<artifactId>spock-core</artifactId>
<version>${version.spock}</version>
<exclusions>
<exclusion>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-all</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.spockframework</groupId>
<artifactId>spock-spring</artifactId>
<version>${version.spock}</version>
</dependency>
<dependency>
<groupId>com.fasterxml</groupId>
<artifactId>classmate</artifactId>
Expand Down Expand Up @@ -497,48 +569,134 @@
<artifactId>xml-apis</artifactId>
<version>${version.xml-apis.xml-apis}</version>
</dependency>
<dependency>
<groupId>io.dropwizard.metrics</groupId>
<artifactId>metrics-core</artifactId>
<version>${version.dropwizard-metrics}</version>
</dependency>
<dependency>
<groupId>io.dropwizard.metrics</groupId>
<artifactId>metrics-ganglia</artifactId>
<version>${version.dropwizard-metrics}</version>
</dependency>
<dependency>
<groupId>io.dropwizard.metrics</groupId>
<artifactId>metrics-graphite</artifactId>
<version>${version.dropwizard-metrics}</version>
</dependency>
<dependency>
<groupId>io.dropwizard.metrics</groupId>
<artifactId>metrics-servlets</artifactId>
<version>${version.dropwizard-metrics}</version>
</dependency>
<dependency>
<groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
<version>${version.hsqldb}</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>${version.gauva}</version>
</dependency>

<!-- spring-cloud -->
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-hystrix</artifactId>
<version>${version.org.springframework.cloud.spring-cloud-netflix}</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-config</artifactId>
<version>${version.org.springframework.cloud.spring-cloud-config}</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-stream-rabbit</artifactId>
<version>${version.org.springframework.cloud.spring-cloud-starter-stream-rabbit}</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-ribbon</artifactId>
<version>${version.org.springframework.cloud.spring-cloud-netflix}</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-sleuth</artifactId>
<version>${version.org.springframework.cloud.spring-cloud-sleuth}</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-sleuth-zipkin</artifactId>
<version>${version.org.springframework.cloud.spring-cloud-sleuth-zipkin}</version>
<version>${version.org.springframework.cloud.spring-cloud-sleuth}</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-sleuth-zipkin-stream</artifactId>
<version>${version.org.springframework.cloud.spring-cloud-sleuth}</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-sleuth-stream</artifactId>
<version>${version.org.springframework.cloud.spring-cloud-sleuth-stream}</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-kubernetes-core</artifactId>
<version>${version.org.springframework.cloud.spring-cloud-kubernetes}</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-kubernetes-config</artifactId>
<version>${version.org.springframework.cloud.spring-cloud-kubernetes}</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-kubernetes-discovery</artifactId>
<version>${version.org.springframework.cloud.spring-cloud-kubernetes}</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-kubernetes-archaius</artifactId>
<version>${version.org.springframework.cloud.spring-cloud-kubernetes}</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-kubernetes</artifactId>
<artifactId>spring-cloud-kubernetes-ribbon</artifactId>
<version>${version.org.springframework.cloud.spring-cloud-kubernetes}</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-kubernetes-config</artifactId>
<artifactId>spring-cloud-kubernetes-hystrix</artifactId>
<version>${version.org.springframework.cloud.spring-cloud-kubernetes}</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-kubernetes-netflix</artifactId>
<artifactId>spring-cloud-kubernetes-config</artifactId>
<version>${version.org.springframework.cloud.spring-cloud-kubernetes}</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-kubernetes-zipkin</artifactId>
<artifactId>spring-cloud-kubernetes-netflix</artifactId>
<version>${version.org.springframework.cloud.spring-cloud-kubernetes}</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-kubernetes-all</artifactId>
<artifactId>spring-cloud-kubernetes-zipkin</artifactId>
<version>${version.org.springframework.cloud.spring-cloud-kubernetes}</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-kubernetes-all</artifactId>
<version>${version.org.springframework.cloud.spring-cloud-kubernetes}</version>
</dependency>

<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-zuul</artifactId>
<version>${version.org.springframework.cloud.spring-cloud-starter-zuul}</version>
</dependency>

<!-- Tomcat -->
<dependency>
Expand Down

0 comments on commit ffa4f50

Please sign in to comment.