Skip to content
Snippets Groups Projects
Commit 4b18dc53 authored by Antoine Rey's avatar Antoine Rey
Browse files

Merge remote-tracking branch 'upstream/master' into admin 

# Conflicts:
#	pom.xml
#	spring-petclinic-api-gateway/pom.xml
parents b9a803ca 6c118e49
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 245 additions and 53 deletions
pom.xml
+ 9
− 2
View file @ 4b18dc53
...@@ -16,7 +16,6 @@ ...@@ -16,7 +16,6 @@
<modules> <modules>
<module>spring-petclinic-admin-server</module> <module>spring-petclinic-admin-server</module>
<module>spring-petclinic-ui</module>
<module>spring-petclinic-customers-service</module> <module>spring-petclinic-customers-service</module>
<module>spring-petclinic-vets-service</module> <module>spring-petclinic-vets-service</module>
<module>spring-petclinic-visits-service</module> <module>spring-petclinic-visits-service</module>
...@@ -29,7 +28,8 @@ ...@@ -29,7 +28,8 @@
<properties> <properties>
<assertj.version>3.5.2</assertj.version> <assertj.version>3.5.2</assertj.version>
<spring-cloud.version>Camden.SR1</spring-cloud.version> <spring-cloud.version>Camden.SR3</spring-cloud.version>
<sleuth.version>1.1.0.RELEASE</sleuth.version>
<java.version>1.8</java.version> <java.version>1.8</java.version>
<docker.image.prefix>mszarlinski</docker.image.prefix> <docker.image.prefix>mszarlinski</docker.image.prefix>
...@@ -38,6 +38,13 @@ ...@@ -38,6 +38,13 @@
<dependencyManagement> <dependencyManagement>
<dependencies> <dependencies>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-sleuth-dependencies</artifactId>
<type>pom</type>
<scope>import</scope>
<version>${sleuth.version}</version>
</dependency>
<dependency> <dependency>
<groupId>org.springframework.cloud</groupId> <groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dependencies</artifactId> <artifactId>spring-cloud-dependencies</artifactId>
......
spring-petclinic-api-gateway/.factorypath 0 → 100644
+ 159
− 0
View file @ 4b18dc53
This diff is collapsed.
spring-petclinic-api-gateway/.gitignore 0 → 100644
+ 1
− 0
View file @ 4b18dc53
/.apt_generated/
spring-petclinic-api-gateway/pom.xml
+ 67
− 48
View file @ 4b18dc53
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>org.springframework.samples.petclinic.api</groupId> <groupId>org.springframework.samples.petclinic.api</groupId>
...@@ -15,14 +15,16 @@ ...@@ -15,14 +15,16 @@
<version>1.4.2</version> <version>1.4.2</version>
</parent> </parent>
<dependencies> <properties>
<webjars-bootstrap.version>3.3.6</webjars-bootstrap.version>
<webjars-jquery-ui.version>1.11.4</webjars-jquery-ui.version>
<webjars-jquery.version>2.2.4</webjars-jquery.version>
<webjars-angular.version>1.5.8</webjars-angular.version>
<webjars-angular-ui-router.version>0.2.18</webjars-angular-ui-router.version>
<wro4j.version>1.8.0</wro4j.version>
</properties>
<!-- Petclinic --> <dependencies>
<dependency>
<groupId>org.springframework.samples</groupId>
<artifactId>spring-petclinic-ui</artifactId>
<version>${project.version}</version>
</dependency>
<!-- Spring Boot --> <!-- Spring Boot -->
<dependency> <dependency>
...@@ -43,10 +45,6 @@ ...@@ -43,10 +45,6 @@
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId> <artifactId>spring-boot-starter-web</artifactId>
</dependency> </dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-thymeleaf</artifactId>
</dependency>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId> <artifactId>spring-boot-starter-test</artifactId>
...@@ -84,42 +82,63 @@ ...@@ -84,42 +82,63 @@
<groupId>org.projectlombok</groupId> <groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId> <artifactId>lombok</artifactId>
</dependency> </dependency>
<!-- Webjars -->
<dependency>
<groupId>org.webjars</groupId>
<artifactId>angularjs</artifactId>
<version>${webjars-angular.version}</version>
</dependency>
<dependency>
<groupId>org.webjars</groupId>
<artifactId>jquery</artifactId>
<version>${webjars-jquery.version}</version>
</dependency>
<dependency>
<groupId>org.webjars</groupId>
<artifactId>bootstrap</artifactId>
<version>${webjars-bootstrap.version}</version>
</dependency>
<dependency>
<groupId>org.webjars</groupId>
<artifactId>angular-ui-router</artifactId>
<version>${webjars-angular-ui-router.version}</version>
</dependency>
<dependency>
<groupId>org.webjars</groupId>
<artifactId>webjars-locator</artifactId>
</dependency>
</dependencies> </dependencies>
<profiles> <build>
<profile> <plugins>
<id>buildDocker</id> <plugin>
<build> <groupId>ro.isdc.wro4j</groupId>
<plugins> <artifactId>wro4j-maven-plugin</artifactId>
<plugin> <version>${wro4j.version}</version>
<groupId>com.spotify</groupId> <executions>
<artifactId>docker-maven-plugin</artifactId> <execution>
<version>${docker.plugin.version}</version> <phase>generate-resources</phase>
<executions> <goals>
<execution> <goal>run</goal>
<phase>install</phase> </goals>
<goals> </execution>
<goal>build</goal> </executions>
</goals> <configuration>
</execution> <wroManagerFactory>ro.isdc.wro.maven.plugin.manager.factory.ConfigurableWroManagerFactory</wroManagerFactory>
</executions> <cssDestinationFolder>${project.build.directory}/classes/static/css</cssDestinationFolder>
<configuration> <wroFile>${basedir}/src/main/wro/wro.xml</wroFile>
<imageName>${docker.image.prefix}/${project.artifactId}</imageName> <extraConfigFile>${basedir}/src/main/wro/wro.properties</extraConfigFile>
<dockerDirectory>${project.basedir}/src/main/docker</dockerDirectory> <contextFolder>${basedir}/src/main/less</contextFolder>
<resources> </configuration>
<resource> <dependencies>
<targetPath>/</targetPath> <dependency>
<directory>${project.build.directory}</directory> <groupId>org.webjars</groupId>
<include>${project.build.finalName}.jar</include> <artifactId>bootstrap</artifactId>
</resource> <version>${webjars-bootstrap.version}</version>
</resources> </dependency>
<buildArgs> </dependencies>
<ARTIFACT_NAME>${project.build.finalName}</ARTIFACT_NAME> </plugin>
</buildArgs> </plugins>
</configuration> </build>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project> </project>
spring-petclinic-ui/src/less/petclinic.less → spring-petclinic-api-gateway/src/main/less/petclinic.less
+ 1
− 3
View file @ 4b18dc53
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
@import "../../bower_components/bootstrap/less/bootstrap.less"; @icon-font-path: "../webjars/bootstrap/fonts/";
@spring-green: #6db33f; @spring-green: #6db33f;
@spring-dark-green: #5fa134; @spring-dark-green: #5fa134;
...@@ -40,8 +40,6 @@ ...@@ -40,8 +40,6 @@
@btn-default-bg: @spring-brown; @btn-default-bg: @spring-brown;
@btn-default-border: @spring-green; @btn-default-border: @spring-green;
@icon-font-path: "../../bootstrap/fonts/";
@nav-tabs-active-link-hover-color: @spring-light-grey; @nav-tabs-active-link-hover-color: @spring-light-grey;
@nav-tabs-active-link-hover-bg: @spring-brown; @nav-tabs-active-link-hover-bg: @spring-brown;
@nav-tabs-active-link-hover-border-color: @spring-brown; @nav-tabs-active-link-hover-border-color: @spring-brown;
......
spring-petclinic-api-gateway/src/main/resources/application.yml 0 → 100644
+ 8
− 0
View file @ 4b18dc53
zuul:
prefix: /api
ignoredServices: '*'
routes:
vets-service: /vet/**
visits-service: /visit/**
customers-service: /customer/**
api-gateway: /gateway/**
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment