From 12e7587dc37958f6277802e95a96fdea5b677b5f Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Wed, 11 Sep 2019 17:17:52 +0200 Subject: [PATCH 1/2] DATAJDBC-411 - Set project.root in module poms to correctly generate Javadoc. By setting project.root, Javadoc is aggregated in the parent pom target so it can be collected during the distribution build. --- spring-data-jdbc/pom.xml | 1 + spring-data-relational/pom.xml | 1 + 2 files changed, 2 insertions(+) diff --git a/spring-data-jdbc/pom.xml b/spring-data-jdbc/pom.xml index d33566bc88..c129547430 100644 --- a/spring-data-jdbc/pom.xml +++ b/spring-data-jdbc/pom.xml @@ -19,6 +19,7 @@ spring.data.jdbc + ${basedir}/.. 2017 diff --git a/spring-data-relational/pom.xml b/spring-data-relational/pom.xml index fa7f2f4873..6713282acc 100644 --- a/spring-data-relational/pom.xml +++ b/spring-data-relational/pom.xml @@ -18,6 +18,7 @@ spring.data.relational + ${basedir}/.. From 6301b02008da53f007bb53f3fd23574c8e7f6c6f Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Wed, 11 Sep 2019 17:18:26 +0200 Subject: [PATCH 2/2] DATAJDBC-411 - Prepare issue branch. --- pom.xml | 2 +- spring-data-jdbc-distribution/pom.xml | 2 +- spring-data-jdbc/pom.xml | 4 ++-- spring-data-relational/pom.xml | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pom.xml b/pom.xml index 2220303342..f9d36f7c40 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.springframework.data spring-data-relational-parent - 1.1.0.BUILD-SNAPSHOT + 1.1.0.DATAJDBC-411-SNAPSHOT pom Spring Data Relational Parent diff --git a/spring-data-jdbc-distribution/pom.xml b/spring-data-jdbc-distribution/pom.xml index 71b9a3c782..551ea567aa 100644 --- a/spring-data-jdbc-distribution/pom.xml +++ b/spring-data-jdbc-distribution/pom.xml @@ -14,7 +14,7 @@ org.springframework.data spring-data-relational-parent - 1.1.0.BUILD-SNAPSHOT + 1.1.0.DATAJDBC-411-SNAPSHOT ../pom.xml diff --git a/spring-data-jdbc/pom.xml b/spring-data-jdbc/pom.xml index c129547430..4f6d258cf6 100644 --- a/spring-data-jdbc/pom.xml +++ b/spring-data-jdbc/pom.xml @@ -5,7 +5,7 @@ 4.0.0 spring-data-jdbc - 1.1.0.BUILD-SNAPSHOT + 1.1.0.DATAJDBC-411-SNAPSHOT Spring Data JDBC Spring Data module for JDBC repositories. @@ -14,7 +14,7 @@ org.springframework.data spring-data-relational-parent - 1.1.0.BUILD-SNAPSHOT + 1.1.0.DATAJDBC-411-SNAPSHOT diff --git a/spring-data-relational/pom.xml b/spring-data-relational/pom.xml index 6713282acc..7144370207 100644 --- a/spring-data-relational/pom.xml +++ b/spring-data-relational/pom.xml @@ -5,7 +5,7 @@ 4.0.0 spring-data-relational - 1.1.0.BUILD-SNAPSHOT + 1.1.0.DATAJDBC-411-SNAPSHOT Spring Data Relational Spring Data Relational support @@ -13,7 +13,7 @@ org.springframework.data spring-data-relational-parent - 1.1.0.BUILD-SNAPSHOT + 1.1.0.DATAJDBC-411-SNAPSHOT