Skip to content

S
spring-boot
Commit 78351f0f authored by Phillip Webb's avatar Phillip Webb
Browse files
Options

Fixup CLI POM 

Fix classloader issues by excluding spring JARs from test classpath
and also include spring-integration-groovy-dsl as a managed dependency.
parent de02a847
Hide whitespace changes
Inline Side-by-side
Showing with 33 additions and 22 deletions
spring-boot-cli/pom.xml
View file @ 78351f0f
...@@ -34,6 +34,12 @@ ...@@ -34,6 +34,12 @@
<artifactId>groovy-templates</artifactId> <artifactId>groovy-templates</artifactId>
<optional>true</optional> <optional>true</optional>
</dependency> </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 --> <!-- Test -->
<dependency> <dependency>
<groupId>${project.groupId}</groupId> <groupId>${project.groupId}</groupId>
...@@ -43,26 +49,8 @@ ...@@ -43,26 +49,8 @@
<scope>test</scope> <scope>test</scope>
<exclusions> <exclusions>
<exclusion> <exclusion>
<groupId>org.springframework</groupId> <groupId>${project.groupId}</groupId>
<artifactId>spring-core</artifactId> <artifactId>spring-boot</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>
</exclusion> </exclusion>
</exclusions> </exclusions>
</dependency> </dependency>
...@@ -81,6 +69,23 @@ ...@@ -81,6 +69,23 @@
</resource> </resource>
</resources> </resources>
<plugins> <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> <plugin>
<artifactId>maven-shade-plugin</artifactId> <artifactId>maven-shade-plugin</artifactId>
<configuration> <configuration>
......
spring-boot-dependencies/pom.xml
View file @ 78351f0f
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
<spring.version>4.0.0.BUILD-SNAPSHOT</spring.version> <spring.version>4.0.0.BUILD-SNAPSHOT</spring.version>
<spring.security.version>3.2.0.RC1</spring.security.version> <spring.security.version>3.2.0.RC1</spring.security.version>
<spring.integration.version>2.2.4.RELEASE</spring.integration.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> <spring.batch.version>2.2.0.RELEASE</spring.batch.version>
<groovy.version>2.1.6</groovy.version> <groovy.version>2.1.6</groovy.version>
<gradle.version>1.6</gradle.version> <gradle.version>1.6</gradle.version>
...@@ -354,6 +355,11 @@ ...@@ -354,6 +355,11 @@
<artifactId>spring-integration-stream</artifactId> <artifactId>spring-integration-stream</artifactId>
<version>${spring.integration.version}</version> <version>${spring.integration.version}</version>
</dependency> </dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-dsl-groovy-core</artifactId>
<version>${spring.integration.groovydsl.version}</version>
</dependency>
<dependency> <dependency>
<groupId>org.springframework.security</groupId> <groupId>org.springframework.security</groupId>
<artifactId>spring-security-core</artifactId> <artifactId>spring-security-core</artifactId>
......
spring-boot-parent/pom.xml
View file @ 78351f0f
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
</scm> </scm>
<dependencyManagement> <dependencyManagement>
<dependencies> <dependencies>
<!-- Additional Dependencies the consumers of spring-boot-dependencies <!-- Additional Dependencies the consumers of spring-boot-dependencies
will generally not need --> will generally not need -->
<dependency> <dependency>
<groupId>net.sf.jopt-simple</groupId> <groupId>net.sf.jopt-simple</groupId>
...@@ -294,7 +294,7 @@ ...@@ -294,7 +294,7 @@
</build> </build>
<profiles> <profiles>
<profile> <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. --> should not be enabled during release. -->
<id>spring-snapshot-build</id> <id>spring-snapshot-build</id>
<activation> <activation>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment