Skip to content

Commit db2d623

Browse files
author
phasenraum2010
committed
fixed #43
1 parent e3131b0 commit db2d623

File tree

2 files changed

+94
-9
lines changed
  • defcon-applications/defcon-cloud-apps/macports-dependencies
  • defcon-parent

2 files changed

+94
-9
lines changed

defcon-applications/defcon-cloud-apps/macports-dependencies/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

12-
<name>defcon :: cloud-apps :: macports-dependencies</name>
12+
<name>defcon :: cloud-apps :: macports :: deps</name>
1313
<artifactId>macports-dependencies</artifactId>
1414
<packaging>jar</packaging>
1515

defcon-parent/pom.xml

Lines changed: 93 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,8 @@
7070
<spring-cloud-gcp.version>1.0.0.RC1</spring-cloud-gcp.version>
7171
<spring-cloud-services.version>2.0.1.RELEASE</spring-cloud-services.version>
7272
<spring-cloud-task.version>2.0.0.RELEASE</spring-cloud-task.version>
73+
<org.springframework.cloud.version>2.0.1.RELEASE</org.springframework.cloud.version>
74+
<spring-cloud-dependencies.version>Finchley.RELEASE</spring-cloud-dependencies.version>
7375
<spring-cloud.version>Finchley.RELEASE</spring-cloud.version>
7476

7577
<!-- Spring Web MVC -->
@@ -134,7 +136,7 @@
134136
<dependency>
135137
<groupId>org.springframework.cloud</groupId>
136138
<artifactId>spring-cloud-dependencies</artifactId>
137-
<version>${spring-cloud.version}</version>
139+
<version>${spring-cloud-dependencies.version}</version>
138140
<type>pom</type>
139141
<scope>import</scope>
140142
</dependency>
@@ -273,11 +275,6 @@
273275
<artifactId>popper.js</artifactId>
274276
<version>${org.webjars.npm.popper.js}</version>
275277
</dependency>
276-
<dependency>
277-
<groupId>org.springframework.cloud</groupId>
278-
<artifactId>spring-cloud-starter-stream-rabbit</artifactId>
279-
<version>2.0.1.RELEASE</version>
280-
</dependency>
281278
<dependency>
282279
<groupId>org.apache.maven.skins</groupId>
283280
<artifactId>maven-fluido-skin</artifactId>
@@ -293,14 +290,95 @@
293290
<artifactId>logback-classic</artifactId>
294291
<version>1.2.3</version>
295292
</dependency>
293+
<dependency>
294+
<groupId>org.springframework.cloud</groupId>
295+
<artifactId>spring-cloud-starter-stream-rabbit</artifactId>
296+
<version>${org.springframework.cloud.version}</version>
297+
</dependency>
296298
<dependency>
297299
<groupId>org.springframework.cloud</groupId>
298300
<artifactId>spring-cloud-starter-sleuth</artifactId>
299-
<version>2.0.1.RELEASE</version>
301+
<version>${org.springframework.cloud.version}</version>
300302
</dependency>
303+
301304
<dependency>
302305
<groupId>org.springframework.cloud</groupId>
303306
<artifactId>spring-cloud-starter-config</artifactId>
307+
<version>${org.springframework.cloud.version}</version>
308+
</dependency>
309+
<dependency>
310+
<groupId>org.springframework.cloud</groupId>
311+
<artifactId>spring-cloud-netflix-hystrix-stream</artifactId>
312+
<version>${org.springframework.cloud.version}</version>
313+
</dependency>
314+
<!-- https://mvnrepository.com/artifact/org.springframework.cloud/spring-cloud-stream-binder-kafka -->
315+
<dependency>
316+
<groupId>org.springframework.cloud</groupId>
317+
<artifactId>spring-cloud-stream-binder-kafka</artifactId>
318+
<version>2.0.1.RELEASE</version>
319+
</dependency>
320+
<!-- https://mvnrepository.com/artifact/org.springframework.cloud/spring-cloud-stream-test-support -->
321+
<dependency>
322+
<groupId>org.springframework.cloud</groupId>
323+
<artifactId>spring-cloud-stream-test-support</artifactId>
324+
<version>2.0.1.RELEASE</version>
325+
<scope>test</scope>
326+
</dependency>
327+
<!-- https://mvnrepository.com/artifact/org.springframework.cloud/spring-cloud-starter-bus-amqp -->
328+
<dependency>
329+
<groupId>org.springframework.cloud</groupId>
330+
<artifactId>spring-cloud-starter-bus-amqp</artifactId>
331+
<version>2.0.0.RELEASE</version>
332+
</dependency>
333+
<!-- https://mvnrepository.com/artifact/org.springframework.cloud/spring-cloud-bus -->
334+
<dependency>
335+
<groupId>org.springframework.cloud</groupId>
336+
<artifactId>spring-cloud-bus</artifactId>
337+
<version>2.0.0.RELEASE</version>
338+
</dependency>
339+
<!-- https://mvnrepository.com/artifact/org.springframework.cloud/spring-cloud-gcp-starter -->
340+
<dependency>
341+
<groupId>org.springframework.cloud</groupId>
342+
<artifactId>spring-cloud-gcp-starter</artifactId>
343+
<version>1.0.0.RELEASE</version>
344+
</dependency>
345+
<dependency>
346+
<groupId>org.springframework.cloud</groupId>
347+
<artifactId>spring-cloud-starter-zipkin-legacy</artifactId>
348+
<version>1.3.4.RELEASE</version>
349+
</dependency>
350+
<dependency>
351+
<groupId>org.springframework.cloud</groupId>
352+
<artifactId>spring-cloud-sleuth-dependencies</artifactId>
353+
<version>2.0.1.RELEASE</version>
354+
<type>pom</type>
355+
</dependency>
356+
<!--
357+
<dependency>
358+
<groupId>org.springframework.cloud</groupId>
359+
<artifactId>spring-cloud-sleuth-zipkin-stream</artifactId>
360+
<version>1.3.4.RELEASE</version>
361+
</dependency>
362+
<dependency>
363+
<groupId>org.springframework.cloud</groupId>
364+
<artifactId>spring-cloud-sleuth-reactor</artifactId>
365+
<version>1.3.4.RELEASE</version>
366+
</dependency>
367+
-->
368+
<!-- https://mvnrepository.com/artifact/org.springframework.cloud/spring-cloud-starter-sleuth -->
369+
<dependency>
370+
<groupId>org.springframework.cloud</groupId>
371+
<artifactId>spring-cloud-starter-sleuth</artifactId>
372+
<version>2.0.1.RELEASE</version>
373+
</dependency>
374+
<dependency>
375+
<groupId>org.springframework.cloud</groupId>
376+
<artifactId>spring-cloud-netflix-hystrix-contract</artifactId>
377+
<version>2.0.0.RELEASE</version>
378+
</dependency>
379+
<dependency>
380+
<groupId>org.springframework.cloud</groupId>
381+
<artifactId>spring-cloud-commons</artifactId>
304382
<version>2.0.1.RELEASE</version>
305383
</dependency>
306384
</dependencies>
@@ -509,7 +587,6 @@
509587
<artifactId>git-commit-id-plugin</artifactId>
510588
<version>${git-commit-id-plugin.version}</version>
511589
</plugin>
512-
<!-- Deploy to Artifactory -->
513590
<plugin>
514591
<groupId>org.jfrog.buildinfo</groupId>
515592
<artifactId>artifactory-maven-plugin</artifactId>
@@ -741,6 +818,14 @@
741818
<enabled>false</enabled>
742819
</snapshots>
743820
</repository>
821+
<repository>
822+
<id>sonatype</id>
823+
<name>Sonatype Repository</name>
824+
<url>https://oss.sonatype.org/content/repositories/releases</url>
825+
<snapshots>
826+
<enabled>false</enabled>
827+
</snapshots>
828+
</repository>
744829
</repositories>
745830

746831
</project>

0 commit comments

Comments
 (0)