Skip to content

Commit 6129465

Browse files
committed
Add back (and deprecate) old 'amqp' poms
1 parent 0d92cb0 commit 6129465

File tree

7 files changed

+71
-6
lines changed

7 files changed

+71
-6
lines changed

pom.xml

+5-6
Original file line numberDiff line numberDiff line change
@@ -168,13 +168,10 @@
168168
</dependency>
169169
<dependency>
170170
<groupId>org.springframework.cloud</groupId>
171-
<artifactId>spring-cloud-stream</artifactId>
172-
<version>${spring-cloud-stream.version}</version>
173-
</dependency>
174-
<dependency>
175-
<groupId>org.springframework.cloud</groupId>
176-
<artifactId>spring-cloud-stream-binder-rabbit</artifactId>
171+
<artifactId>spring-cloud-stream-parent</artifactId>
177172
<version>${spring-cloud-stream.version}</version>
173+
<type>pom</type>
174+
<scope>import</scope>
178175
</dependency>
179176
<dependency>
180177
<groupId>com.netflix.archaius</groupId>
@@ -390,6 +387,7 @@
390387
<modules>
391388
<module>spring-cloud-netflix-core</module>
392389
<module>spring-cloud-netflix-hystrix-dashboard</module>
390+
<module>spring-cloud-netflix-hystrix-amqp</module>
393391
<module>spring-cloud-netflix-hystrix-stream</module>
394392
<module>spring-cloud-netflix-eureka-server</module>
395393
<module>spring-cloud-netflix-turbine</module>
@@ -402,6 +400,7 @@
402400
<module>spring-cloud-starter-hystrix-dashboard</module>
403401
<module>spring-cloud-starter-ribbon</module>
404402
<module>spring-cloud-starter-turbine</module>
403+
<module>spring-cloud-starter-turbine-amqp</module>
405404
<module>spring-cloud-starter-turbine-stream</module>
406405
<module>spring-cloud-starter-zuul</module>
407406
<module>docs</module>

spring-cloud-netflix-hystrix-amqp/.jdk8

Whitespace-only changes.
+32
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<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>org.springframework.cloud</groupId>
7+
<artifactId>spring-cloud-netflix</artifactId>
8+
<version>1.1.0.BUILD-SNAPSHOT</version>
9+
<relativePath>..</relativePath> <!-- lookup parent from repository -->
10+
</parent>
11+
<artifactId>spring-cloud-netflix-hystrix-amqp</artifactId>
12+
<name>spring-cloud-netflix-hystrix-amqp</name>
13+
<description>Spring Cloud Netflix Hystrix AMQP (deprecated, please use spring-cloud-netflix-hystrix-stream)</description>
14+
<url>http://projects.spring.io/spring-cloud</url>
15+
<organization>
16+
<name>Pivotal Software, Inc.</name>
17+
<url>http://www.spring.io</url>
18+
</organization>
19+
<properties>
20+
<main.basedir>${basedir}/../..</main.basedir>
21+
</properties>
22+
<dependencies>
23+
<dependency>
24+
<groupId>org.springframework.cloud</groupId>
25+
<artifactId>spring-cloud-netflix-hystrix-stream</artifactId>
26+
</dependency>
27+
<dependency>
28+
<groupId>org.springframework.cloud</groupId>
29+
<artifactId>spring-cloud-starter-stream-rabbit</artifactId>
30+
</dependency>
31+
</dependencies>
32+
</project>
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
provides: spring-cloud-netflix-turbine-amqp

spring-cloud-starter-turbine-amqp/.jdk8

Whitespace-only changes.
+32
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<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>org.springframework.cloud</groupId>
7+
<artifactId>spring-cloud-netflix</artifactId>
8+
<version>1.1.0.BUILD-SNAPSHOT</version>
9+
<relativePath>..</relativePath> <!-- lookup parent from repository -->
10+
</parent>
11+
<artifactId>spring-cloud-starter-turbine-amqp</artifactId>
12+
<name>spring-cloud-starter-turbine-amqp</name>
13+
<description>Spring Cloud Starter Turbine AMQP (deprecated, please use spring-cloud-starter-turbine-stream)</description>
14+
<url>http://projects.spring.io/spring-cloud</url>
15+
<organization>
16+
<name>Pivotal Software, Inc.</name>
17+
<url>http://www.spring.io</url>
18+
</organization>
19+
<properties>
20+
<main.basedir>${basedir}/../..</main.basedir>
21+
</properties>
22+
<dependencies>
23+
<dependency>
24+
<groupId>org.springframework.cloud</groupId>
25+
<artifactId>spring-cloud-starter-turbine-stream</artifactId>
26+
</dependency>
27+
<dependency>
28+
<groupId>org.springframework.cloud</groupId>
29+
<artifactId>spring-cloud-starter-stream-rabbit</artifactId>
30+
</dependency>
31+
</dependencies>
32+
</project>
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
provides: spring-cloud-netflix-turbine-amqp

0 commit comments

Comments
 (0)