root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch '1.1.x' 

Conflicts:
	spring-boot-dependencies/pom.xml
This commit is contained in:
Phillip Webb 2014-08-22 09:47:30 -07:00
parent 658dc10722 bbdfcd4faa
commit 8f883febd1
1 changed files with 6 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
spring-boot-dependencies/pom.xml
View File

@ -527,6 +527,11 @@
<artifactId>activemq-pool</artifactId> <artifactId>activemq-pool</artifactId>
<version>${activemq.version}</version> <version>${activemq.version}</version>
</dependency> </dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-jms-pool</artifactId>
<version>${activemq.version}</version>
</dependency>
<dependency> <dependency>
<groupId>org.apache.commons</groupId> <groupId>org.apache.commons</groupId>
<artifactId>commons-pool2</artifactId> <artifactId>commons-pool2</artifactId>
@ -1313,37 +1318,4 @@
</plugins> </plugins>
</pluginManagement> </pluginManagement>
</build> </build>
<profiles> </project>
<profile>
<id>default</id>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
<repositories>
<!--
Repositories to allow snapshot and milestone BOM imports during
development. This section is stripped out when a full release is prepared.
-->
<repository>
<id>spring-milestones</id>
<name>Spring Milestones</name>
<url>http://repo.spring.io/milestone</url>
<snapshots>
<enabled>false</enabled>
</snapshots>
</repository>
<repository>
<id>spring-snapshots</id>
<name>Spring Snapshots</name>
<url>http://repo.spring.io/snapshot</url>
<snapshots>
<enabled>true</enabled>
</snapshots>
</repository>
</repositories>
</profile>
<profile>
<id>integration-test</id>
</profile>
</profiles>
</project>