Skip to content

Commit 08746e5

Browse files
joshistejoshiste
committed
Fix build
1 parent 11ca47c commit 08746e5

File tree

2 files changed

+196
-192
lines changed
  • spring-boot-admin-server-ui-turbine
  • spring-boot-admin-server

2 files changed

+196
-192
lines changed

‎spring-boot-admin-server-ui-turbine/pom.xml‎

Lines changed: 100 additions & 96 deletions
Original file line numberDiff line numberDiff line change
@@ -1,99 +1,103 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4-
<modelVersion>4.0.0</modelVersion>
5-
<parent>
6-
<groupId>de.codecentric</groupId>
7-
<artifactId>spring-boot-admin</artifactId>
8-
<version>1.5.0-SNAPSHOT</version>
9-
<relativePath>..</relativePath>
10-
</parent>
11-
<artifactId>spring-boot-admin-server-ui-turbine</artifactId>
12-
<dependencies>
13-
<dependency>
14-
<groupId>de.codecentric</groupId>
15-
<artifactId>spring-boot-admin-server</artifactId>
16-
</dependency>
17-
<dependency>
18-
<groupId>de.codecentric</groupId>
19-
<artifactId>spring-boot-admin-server-ui-hystrix</artifactId>
20-
<scope>runtime</scope>
21-
</dependency>
22-
<dependency>
23-
<groupId>org.springframework.boot</groupId>
24-
<artifactId>spring-boot-configuration-processor</artifactId>
25-
<optional>true</optional>
26-
</dependency>
27-
<dependency>
28-
<groupId>org.springframework.boot</groupId>
29-
<artifactId>spring-boot-starter-test</artifactId>
30-
<scope>test</scope>
31-
</dependency>
32-
<dependency>
33-
<groupId>com.jayway.jsonpath</groupId>
34-
<artifactId>json-path</artifactId>
35-
<scope>test</scope>
36-
</dependency>
37-
</dependencies>
38-
<build>
39-
<plugins>
40-
<plugin>
41-
<groupId>org.codehaus.mojo</groupId>
42-
<artifactId>exec-maven-plugin</artifactId>
43-
<executions>
44-
<execution>
45-
<id>npm-install</id>
46-
<phase>validate</phase>
47-
<goals>
48-
<goal>exec</goal>
49-
</goals>
50-
<configuration>
51-
<executable>npm</executable>
52-
<arguments>
53-
<argument>install</argument>
54-
</arguments>
55-
</configuration>
56-
</execution>
57-
<execution>
58-
<id>npm-build</id>
59-
<phase>generate-resources</phase>
60-
<goals>
61-
<goal>exec</goal>
62-
</goals>
63-
<configuration>
64-
<executable>npm</executable>
65-
<arguments>
66-
<argument>run</argument>
67-
<argument>build</argument>
68-
</arguments>
69-
</configuration>
70-
</execution>
71-
<execution>
72-
<id>npm-test</id>
73-
<phase>test</phase>
74-
<goals>
75-
<goal>exec</goal>
76-
</goals>
77-
<configuration>
78-
<skip>true</skip>
79-
<executable>npm</executable>
80-
<arguments>
81-
<argument>run</argument>
82-
<argument>test</argument>
83-
</arguments>
84-
</configuration>
85-
</execution>
86-
</executions>
87-
</plugin>
88-
</plugins>
89-
<resources>
90-
<resource>
91-
<directory>target/dist</directory>
92-
<targetPath>META-INF/spring-boot-admin-server-ui</targetPath>
93-
</resource>
94-
<resource>
95-
<directory>src/main/resources</directory>
96-
</resource>
97-
</resources>
98-
</build>
3+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4+
<modelVersion>4.0.0</modelVersion>
5+
<parent>
6+
<groupId>de.codecentric</groupId>
7+
<artifactId>spring-boot-admin</artifactId>
8+
<version>1.5.0-SNAPSHOT</version>
9+
<relativePath>..</relativePath>
10+
</parent>
11+
<artifactId>spring-boot-admin-server-ui-turbine</artifactId>
12+
<dependencies>
13+
<dependency>
14+
<groupId>de.codecentric</groupId>
15+
<artifactId>spring-boot-admin-server</artifactId>
16+
</dependency>
17+
<dependency>
18+
<groupId>de.codecentric</groupId>
19+
<artifactId>spring-boot-admin-server-ui-hystrix</artifactId>
20+
<scope>runtime</scope>
21+
</dependency>
22+
<dependency>
23+
<groupId>org.springframework.cloud</groupId>
24+
<artifactId>spring-cloud-starter</artifactId>
25+
</dependency>
26+
<dependency>
27+
<groupId>org.springframework.boot</groupId>
28+
<artifactId>spring-boot-configuration-processor</artifactId>
29+
<optional>true</optional>
30+
</dependency>
31+
<dependency>
32+
<groupId>org.springframework.boot</groupId>
33+
<artifactId>spring-boot-starter-test</artifactId>
34+
<scope>test</scope>
35+
</dependency>
36+
<dependency>
37+
<groupId>com.jayway.jsonpath</groupId>
38+
<artifactId>json-path</artifactId>
39+
<scope>test</scope>
40+
</dependency>
41+
</dependencies>
42+
<build>
43+
<plugins>
44+
<plugin>
45+
<groupId>org.codehaus.mojo</groupId>
46+
<artifactId>exec-maven-plugin</artifactId>
47+
<executions>
48+
<execution>
49+
<id>npm-install</id>
50+
<phase>validate</phase>
51+
<goals>
52+
<goal>exec</goal>
53+
</goals>
54+
<configuration>
55+
<executable>npm</executable>
56+
<arguments>
57+
<argument>install</argument>
58+
</arguments>
59+
</configuration>
60+
</execution>
61+
<execution>
62+
<id>npm-build</id>
63+
<phase>generate-resources</phase>
64+
<goals>
65+
<goal>exec</goal>
66+
</goals>
67+
<configuration>
68+
<executable>npm</executable>
69+
<arguments>
70+
<argument>run</argument>
71+
<argument>build</argument>
72+
</arguments>
73+
</configuration>
74+
</execution>
75+
<execution>
76+
<id>npm-test</id>
77+
<phase>test</phase>
78+
<goals>
79+
<goal>exec</goal>
80+
</goals>
81+
<configuration>
82+
<skip>true</skip>
83+
<executable>npm</executable>
84+
<arguments>
85+
<argument>run</argument>
86+
<argument>test</argument>
87+
</arguments>
88+
</configuration>
89+
</execution>
90+
</executions>
91+
</plugin>
92+
</plugins>
93+
<resources>
94+
<resource>
95+
<directory>target/dist</directory>
96+
<targetPath>META-INF/spring-boot-admin-server-ui</targetPath>
97+
</resource>
98+
<resource>
99+
<directory>src/main/resources</directory>
100+
</resource>
101+
</resources>
102+
</build>
99103
</project>

‎spring-boot-admin-server/pom.xml‎

Lines changed: 96 additions & 96 deletions
Original file line numberDiff line numberDiff line change
@@ -1,102 +1,102 @@
11
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
3-
<modelVersion>4.0.0</modelVersion>
4-
<parent>
5-
<groupId>de.codecentric</groupId>
6-
<artifactId>spring-boot-admin</artifactId>
7-
<version>1.5.0-SNAPSHOT</version>
8-
<relativePath>..</relativePath>
9-
</parent>
10-
<artifactId>spring-boot-admin-server</artifactId>
11-
<dependencies>
2+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
3+
<modelVersion>4.0.0</modelVersion>
4+
<parent>
5+
<groupId>de.codecentric</groupId>
6+
<artifactId>spring-boot-admin</artifactId>
7+
<version>1.5.0-SNAPSHOT</version>
8+
<relativePath>..</relativePath>
9+
</parent>
10+
<artifactId>spring-boot-admin-server</artifactId>
11+
<dependencies>
1212
<dependency>
1313
<groupId>org.springframework.boot</groupId>
1414
<artifactId>spring-boot-starter-web</artifactId>
1515
</dependency>
16-
<dependency>
17-
<groupId>org.springframework.boot</groupId>
18-
<artifactId>spring-boot-starter-actuator</artifactId>
19-
</dependency>
20-
<dependency>
21-
<groupId>com.fasterxml.jackson.core</groupId>
22-
<artifactId>jackson-databind</artifactId>
23-
</dependency>
24-
<!-- Use Zuul WITHOUT archaius/Ribbon/Config Client -->
25-
<dependency>
26-
<groupId>com.netflix.zuul</groupId>
27-
<artifactId>zuul-core</artifactId>
28-
</dependency>
29-
<dependency>
30-
<groupId>com.netflix.hystrix</groupId>
31-
<artifactId>hystrix-core</artifactId>
32-
</dependency>
33-
<dependency>
34-
<groupId>org.springframework.cloud</groupId>
35-
<artifactId>spring-cloud-netflix-core</artifactId>
36-
</dependency>
37-
<dependency>
38-
<groupId>org.springframework.cloud</groupId>
39-
<artifactId>spring-cloud-commons</artifactId>
40-
</dependency>
41-
<dependency>
42-
<groupId>org.apache.httpcomponents</groupId>
43-
<artifactId>httpclient</artifactId>
44-
</dependency>
45-
<!-- Optional Mail Starter for mail-notfications -->
46-
<dependency>
47-
<groupId>org.springframework.boot</groupId>
48-
<artifactId>spring-boot-starter-mail</artifactId>
49-
<optional>true</optional>
50-
</dependency>
51-
<!-- Optional Discovery Client -->
52-
<dependency>
53-
<groupId>org.springframework.cloud</groupId>
54-
<artifactId>spring-cloud-starter</artifactId>
55-
<optional>true</optional>
56-
</dependency>
57-
<!-- Optional Eureka Discovery Client -->
58-
<dependency>
59-
<groupId>org.springframework.cloud</groupId>
60-
<artifactId>spring-cloud-starter-eureka</artifactId>
61-
<optional>true</optional>
62-
</dependency>
63-
<!-- Optional Hazelcast-Support -->
64-
<dependency>
65-
<groupId>com.hazelcast</groupId>
66-
<artifactId>hazelcast</artifactId>
67-
<optional>true</optional>
68-
</dependency>
69-
<!-- Optional Configuration Processor for metadata -->
70-
<dependency>
71-
<groupId>org.springframework.boot</groupId>
72-
<artifactId>spring-boot-configuration-processor</artifactId>
73-
<optional>true</optional>
74-
</dependency>
75-
<!-- Test -->
76-
<dependency>
77-
<groupId>org.springframework.boot</groupId>
78-
<artifactId>spring-boot-starter-test</artifactId>
79-
<scope>test</scope>
80-
</dependency>
81-
<dependency>
82-
<groupId>com.jayway.jsonpath</groupId>
83-
<artifactId>json-path</artifactId>
84-
<scope>test</scope>
85-
</dependency>
86-
</dependencies>
87-
<build>
88-
<finalName>${project.artifactId}</finalName>
89-
<resources>
90-
<resource>
91-
<directory>src/main/resources</directory>
92-
</resource>
93-
<resource>
94-
<directory>src/main/resources</directory>
95-
<filtering>true</filtering>
96-
<includes>
97-
<include>application.properties</include>
98-
</includes>
99-
</resource>
100-
</resources>
101-
</build>
16+
<dependency>
17+
<groupId>org.springframework.boot</groupId>
18+
<artifactId>spring-boot-starter-actuator</artifactId>
19+
</dependency>
20+
<dependency>
21+
<groupId>com.fasterxml.jackson.core</groupId>
22+
<artifactId>jackson-databind</artifactId>
23+
</dependency>
24+
<!-- Use Zuul WITHOUT archaius/Ribbon/Config Client -->
25+
<dependency>
26+
<groupId>com.netflix.zuul</groupId>
27+
<artifactId>zuul-core</artifactId>
28+
</dependency>
29+
<dependency>
30+
<groupId>com.netflix.hystrix</groupId>
31+
<artifactId>hystrix-core</artifactId>
32+
</dependency>
33+
<dependency>
34+
<groupId>org.springframework.cloud</groupId>
35+
<artifactId>spring-cloud-netflix-core</artifactId>
36+
</dependency>
37+
<dependency>
38+
<groupId>org.springframework.cloud</groupId>
39+
<artifactId>spring-cloud-commons</artifactId>
40+
</dependency>
41+
<dependency>
42+
<groupId>org.apache.httpcomponents</groupId>
43+
<artifactId>httpclient</artifactId>
44+
</dependency>
45+
<!-- Optional Mail Starter for mail-notfications -->
46+
<dependency>
47+
<groupId>org.springframework.boot</groupId>
48+
<artifactId>spring-boot-starter-mail</artifactId>
49+
<optional>true</optional>
50+
</dependency>
51+
<!-- Optional Discovery Client -->
52+
<dependency>
53+
<groupId>org.springframework.cloud</groupId>
54+
<artifactId>spring-cloud-starter</artifactId>
55+
<optional>true</optional>
56+
</dependency>
57+
<!-- Optional Eureka Discovery Client -->
58+
<dependency>
59+
<groupId>org.springframework.cloud</groupId>
60+
<artifactId>spring-cloud-starter-eureka</artifactId>
61+
<optional>true</optional>
62+
</dependency>
63+
<!-- Optional Hazelcast-Support -->
64+
<dependency>
65+
<groupId>com.hazelcast</groupId>
66+
<artifactId>hazelcast</artifactId>
67+
<optional>true</optional>
68+
</dependency>
69+
<!-- Optional Configuration Processor for metadata -->
70+
<dependency>
71+
<groupId>org.springframework.boot</groupId>
72+
<artifactId>spring-boot-configuration-processor</artifactId>
73+
<optional>true</optional>
74+
</dependency>
75+
<!-- Test -->
76+
<dependency>
77+
<groupId>org.springframework.boot</groupId>
78+
<artifactId>spring-boot-starter-test</artifactId>
79+
<scope>test</scope>
80+
</dependency>
81+
<dependency>
82+
<groupId>com.jayway.jsonpath</groupId>
83+
<artifactId>json-path</artifactId>
84+
<scope>test</scope>
85+
</dependency>
86+
</dependencies>
87+
<build>
88+
<finalName>${project.artifactId}</finalName>
89+
<resources>
90+
<resource>
91+
<directory>src/main/resources</directory>
92+
</resource>
93+
<resource>
94+
<directory>src/main/resources</directory>
95+
<filtering>true</filtering>
96+
<includes>
97+
<include>application.properties</include>
98+
</includes>
99+
</resource>
100+
</resources>
101+
</build>
102102
</project>

0 commit comments

Comments
 (0)