Spring/spring-boot
Spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2024-08-29 03:06:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixup CLI POM

Browse Source 
Fix classloader issues by excluding spring JARs from test classpath
and also include spring-integration-groovy-dsl as a managed dependency.
This commit is contained in:
Phillip Webb 2013-08-25 08:20:32 -07:00
parent 0d75995aed
commit 4ad3d30a40
3 changed files with 33 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
spring-boot-cli/pom.xml
View File

@ -34,6 +34,12 @@
<artifactId>groovy-templates</artifactId>
<optional>true</optional>
</dependency>
<!-- Provided (to ensure in m2 repo for @grab to resolve) -->
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-dsl-groovy-core</artifactId>
<scope>provided</scope>
</dependency>
<!-- Test -->
<dependency>
<groupId>${project.groupId}</groupId>
@ -43,26 +49,8 @@
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
</exclusion>
<exclusion>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<exclusions>
<exclusion>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
</exclusion>
<exclusion>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
<groupId>${project.groupId}</groupId>
<artifactId>spring-boot</artifactId>
</exclusion>
</exclusions>
</dependency>
@ -81,6 +69,23 @@
</resource>
</resources>
<plugins>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<classpathDependencyExcludes>
<classpathDependencyExcludes>org.springframework:spring-core</classpathDependencyExcludes>
<classpathDependencyExcludes>org.springframework:spring-beans</classpathDependencyExcludes>
<classpathDependencyExcludes>org.springframework:spring-aop</classpathDependencyExcludes>
<classpathDependencyExcludes>org.springframework:spring-tx</classpathDependencyExcludes>
<classpathDependencyExcludes>org.springframework:spring-expression</classpathDependencyExcludes>
<classpathDependencyExcludes>org.springframework:spring-context</classpathDependencyExcludes>
<classpathDependencyExcludes>org.springframework:spring-test</classpathDependencyExcludes>
<classpathDependencyExcludes>org.springframework.retry:spring-retry</classpathDependencyExcludes>
<classpathDependencyExcludes>org.springframework.integration:spring-integration-core</classpathDependencyExcludes>
<classpathDependencyExcludes>org.springframework.integration:spring-integration-dsl-groovy-core</classpathDependencyExcludes>
</classpathDependencyExcludes>
</configuration>
</plugin>
<plugin>
<artifactId>maven-shade-plugin</artifactId>
<configuration>

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

@ -10,6 +10,7 @@
<spring.version>4.0.0.BUILD-SNAPSHOT</spring.version>
<spring.security.version>3.2.0.RC1</spring.security.version>
<spring.integration.version>2.2.4.RELEASE</spring.integration.version>
<spring.integration.groovydsl.version>1.0.0.M1</spring.integration.groovydsl.version>
<spring.batch.version>2.2.0.RELEASE</spring.batch.version>
<groovy.version>2.1.6</groovy.version>
<gradle.version>1.6</gradle.version>
@ -354,6 +355,11 @@
<artifactId>spring-integration-stream</artifactId>
<version>${spring.integration.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-dsl-groovy-core</artifactId>
<version>${spring.integration.groovydsl.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-core</artifactId>

4
spring-boot-parent/pom.xml
View File

@ -34,7 +34,7 @@
</scm>
<dependencyManagement>
<dependencies>
<!-- Additional Dependencies the consumers of spring-boot-dependencies
<!-- Additional Dependencies the consumers of spring-boot-dependencies
will generally not need -->
<dependency>
<groupId>net.sf.jopt-simple</groupId>
@ -294,7 +294,7 @@
</build>
<profiles>
<profile>
<!-- Allow snapshots and milestones when building locally, this profile
<!-- Allow snapshots and milestones when building locally, this profile
should not be enabled during release. -->
<id>spring-snapshot-build</id>
<activation>