Skip to content

Commit 7f928e8

Browse files
committed
Change merge.into project dependencies to provided
Change 'compile' dependencies to 'provided' for projects that are merged into other projects. This seems to prevent '-sources' and '-javadoc' jars from appearing on the classpath which can break javadoc generation.
1 parent 919aeb5 commit 7f928e8

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

build.gradle

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -526,8 +526,8 @@ project("spring-orm-hibernate4") {
526526
description = "Spring Object/Relational Mapping - Hibernate 4 support"
527527
merge.into = project(":spring-orm")
528528
dependencies {
529-
compile(project(":spring-tx"))
530-
compile(project(":spring-jdbc"))
529+
provided(project(":spring-tx"))
530+
provided(project(":spring-jdbc"))
531531
optional("org.hibernate:hibernate-core:4.1.0.Final")
532532
optional("org.hibernate:hibernate-entitymanager:4.1.0.Final")
533533
optional(project(":spring-web"))
@@ -597,8 +597,8 @@ project("spring-webmvc-tiles3") {
597597
description = "Spring Framework Tiles3 Integration"
598598
merge.into = project(":spring-webmvc")
599599
dependencies {
600-
compile(project(":spring-context"))
601-
compile(project(":spring-web"))
600+
provided(project(":spring-context"))
601+
provided(project(":spring-web"))
602602
provided("javax.el:el-api:1.0")
603603
provided("javax.servlet:jstl:1.2")
604604
provided("javax.servlet.jsp:jsp-api:2.1")
@@ -689,8 +689,8 @@ project("spring-test-mvc") {
689689
description = "Spring Test MVC Framework"
690690
merge.into = project(":spring-test")
691691
dependencies {
692-
optional(project(":spring-context"))
693-
compile(project(":spring-webmvc"))
692+
provided(project(":spring-context"))
693+
provided(project(":spring-webmvc"))
694694
provided("javax.servlet:javax.servlet-api:3.0.1")
695695
optional("org.hamcrest:hamcrest-core:1.3")
696696
optional("com.jayway.jsonpath:json-path:0.8.1")

0 commit comments

Comments
 (0)