Skip to content

Commit

Permalink
Upgrade spring data jdbc 2.1.0-M2
Browse files Browse the repository at this point in the history
  • Loading branch information
mhyeon-lee committed Sep 2, 2020
1 parent 2cca953 commit b9b6576
Show file tree
Hide file tree
Showing 14 changed files with 58 additions and 58 deletions.
8 changes: 4 additions & 4 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,13 @@ buildscript {
}
}
dependencies {
classpath("org.springframework.boot:spring-boot-gradle-plugin:2.3.2.RELEASE")
classpath("org.springframework.boot:spring-boot-gradle-plugin:2.4.0-M2")
}
}
dependencies {
implementation("org.springframework.boot:spring-boot-starter-data-jdbc")
implementation("com.navercorp.spring:spring-boot-starter-data-jdbc-plus-sql:2.0.2.RELEASE")
implementation("com.navercorp.spring:spring-boot-starter-data-jdbc-plus-sql:2.4.0-M2")
}
```

Expand All @@ -44,7 +44,7 @@ dependencies {
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.3.2.RELEASE</version>
<version>2.4.0-M2</version>
<relativePath/>
</parent>

Expand All @@ -56,7 +56,7 @@ dependencies {
<dependency>
<groupId>com.navercorp.spring</groupId>
<artifactId>spring-boot-starter-data-jdbc-plus-sql</artifactId>
<version>2.0.2.RELEASE</version>
<version>2.4.0-M2</version>
</dependency>
```

Expand Down
4 changes: 2 additions & 2 deletions build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@ buildscript {
}
}
dependencies {
classpath("org.springframework.boot:spring-boot-gradle-plugin:2.3.2.RELEASE")
classpath("org.springframework.boot:spring-boot-gradle-plugin:2.4.0-M2")
}
}

allprojects {
group = "com.navercorp.spring"
version = "2.1.0-M1"
version = "2.1.0-M2"
}

subprojects {
Expand Down
6 changes: 3 additions & 3 deletions guide-projects/plus-repository-guide/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ dependencies {
implementation("org.projectlombok:lombok")
annotationProcessor("org.projectlombok:lombok")

implementation("org.springframework.data:spring-data-jdbc:2.1.0-M1")
implementation("org.springframework.data:spring-data-relational:2.1.0-M1")
implementation("org.springframework.data:spring-data-commons:2.4.0-M1")
implementation("org.springframework.data:spring-data-jdbc:2.1.0-M2")
implementation("org.springframework.data:spring-data-relational:2.1.0-M2")
implementation("org.springframework.data:spring-data-commons:2.4.0-M2")

testImplementation("org.springframework.boot:spring-boot-starter-test") {
exclude group: "org.junit.vintage", module: "junit-vintage-engine"
Expand Down
12 changes: 6 additions & 6 deletions guide-projects/plus-sql-java-groovy-guide/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,15 +39,15 @@ dependencies {
implementation("org.codehaus.groovy:groovy:2.5.8")
implementation("com.h2database:h2")

implementation("org.springframework.data:spring-data-jdbc:2.1.0-M1")
implementation("org.springframework.data:spring-data-relational:2.1.0-M1")
implementation("org.springframework.data:spring-data-commons:2.4.0-M1")
implementation("org.springframework.data:spring-data-jdbc:2.1.0-M2")
implementation("org.springframework.data:spring-data-relational:2.1.0-M2")
implementation("org.springframework.data:spring-data-commons:2.4.0-M2")

implementation project(":spring-data-plus-sql-gen")
annotationProcessor project(":spring-data-plus-sql-gen")
annotationProcessor("org.springframework.data:spring-data-jdbc:2.1.0-M1")
annotationProcessor("org.springframework.data:spring-data-relational:2.1.0-M1")
annotationProcessor("org.springframework.data:spring-data-commons:2.4.0-M1")
annotationProcessor("org.springframework.data:spring-data-jdbc:2.1.0-M2")
annotationProcessor("org.springframework.data:spring-data-relational:2.1.0-M2")
annotationProcessor("org.springframework.data:spring-data-commons:2.4.0-M2")

compileOnly("org.projectlombok:lombok")
annotationProcessor("org.projectlombok:lombok")
Expand Down
6 changes: 3 additions & 3 deletions guide-projects/plus-sql-java-kotlin-guide/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,9 @@ dependencies {
implementation("org.projectlombok:lombok")
annotationProcessor("org.projectlombok:lombok")

implementation("org.springframework.data:spring-data-jdbc:2.1.0-M1")
implementation("org.springframework.data:spring-data-relational:2.1.0-M1")
implementation("org.springframework.data:spring-data-commons:2.4.0-M1")
implementation("org.springframework.data:spring-data-jdbc:2.1.0-M2")
implementation("org.springframework.data:spring-data-relational:2.1.0-M2")
implementation("org.springframework.data:spring-data-commons:2.4.0-M2")

testImplementation("org.springframework.boot:spring-boot-starter-test") {
exclude group: "org.junit.vintage", module: "junit-vintage-engine"
Expand Down
6 changes: 3 additions & 3 deletions guide-projects/plus-sql-kotlin-guide/build.gradle.kts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@ dependencies {
implementation("org.jetbrains.kotlin:kotlin-reflect")
implementation("com.h2database:h2")

implementation("org.springframework.data:spring-data-jdbc:2.1.0-M1")
implementation("org.springframework.data:spring-data-relational:2.1.0-M1")
implementation("org.springframework.data:spring-data-commons:2.4.0-M1")
implementation("org.springframework.data:spring-data-jdbc:2.1.0-M2")
implementation("org.springframework.data:spring-data-relational:2.1.0-M2")
implementation("org.springframework.data:spring-data-commons:2.4.0-M2")

testImplementation("org.springframework.boot:spring-boot-starter-test") {
exclude(group = "org.junit.vintage", module = "junit-vintage-engine")
Expand Down
6 changes: 3 additions & 3 deletions spring-boot-autoconfigure-data-jdbc-plus/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ dependencies {
implementation project(":spring-data-jdbc-plus-sql")
implementation project(":spring-data-jdbc-plus-repository")

implementation("org.springframework.data:spring-data-jdbc:2.1.0-M1")
implementation("org.springframework.data:spring-data-relational:2.1.0-M1")
implementation("org.springframework.data:spring-data-commons:2.4.0-M1")
implementation("org.springframework.data:spring-data-jdbc:2.1.0-M2")
implementation("org.springframework.data:spring-data-relational:2.1.0-M2")
implementation("org.springframework.data:spring-data-commons:2.4.0-M2")
implementation("io.projectreactor:reactor-core")

testImplementation("org.junit.jupiter:junit-jupiter")
Expand Down
6 changes: 3 additions & 3 deletions spring-boot-starter-data-jdbc-plus-repository/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ dependencies {
compile(project(":spring-data-jdbc-plus-repository"))
compile("org.springframework.boot:spring-boot-starter-jdbc")

implementation("org.springframework.data:spring-data-jdbc:2.1.0-M1")
implementation("org.springframework.data:spring-data-relational:2.1.0-M1")
implementation("org.springframework.data:spring-data-commons:2.4.0-M1")
implementation("org.springframework.data:spring-data-jdbc:2.1.0-M2")
implementation("org.springframework.data:spring-data-relational:2.1.0-M2")
implementation("org.springframework.data:spring-data-commons:2.4.0-M2")
}
6 changes: 3 additions & 3 deletions spring-boot-starter-data-jdbc-plus-sql/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ dependencies {
compile(project(":spring-data-jdbc-plus-sql"))
compile("org.springframework.boot:spring-boot-starter-jdbc")

implementation("org.springframework.data:spring-data-jdbc:2.1.0-M1")
implementation("org.springframework.data:spring-data-relational:2.1.0-M1")
implementation("org.springframework.data:spring-data-commons:2.4.0-M1")
implementation("org.springframework.data:spring-data-jdbc:2.1.0-M2")
implementation("org.springframework.data:spring-data-relational:2.1.0-M2")
implementation("org.springframework.data:spring-data-commons:2.4.0-M2")
}
6 changes: 3 additions & 3 deletions spring-data-jdbc-plus-repository/build.gradle
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
compileJava.dependsOn(processResources)

dependencies {
compile("org.springframework.data:spring-data-jdbc:2.1.0-M1")
compile("org.springframework.data:spring-data-relational:2.1.0-M1")
compile("org.springframework.data:spring-data-commons:2.4.0-M1")
compile("org.springframework.data:spring-data-jdbc:2.1.0-M2")
compile("org.springframework.data:spring-data-relational:2.1.0-M2")
compile("org.springframework.data:spring-data-commons:2.4.0-M2")

testImplementation("org.junit.jupiter:junit-jupiter")
testImplementation("org.junit.jupiter:junit-jupiter-api")
Expand Down
6 changes: 3 additions & 3 deletions spring-data-jdbc-plus-sql/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ compileJava.dependsOn(processResources)

dependencies {
compile project(":spring-jdbc-plus-support")
compile("org.springframework.data:spring-data-jdbc:2.1.0-M1")
compile("org.springframework.data:spring-data-relational:2.1.0-M1")
compile("org.springframework.data:spring-data-commons:2.4.0-M1")
compile("org.springframework.data:spring-data-jdbc:2.1.0-M2")
compile("org.springframework.data:spring-data-relational:2.1.0-M2")
compile("org.springframework.data:spring-data-commons:2.4.0-M2")
compileOnly("org.jetbrains.kotlin:kotlin-stdlib:1.3.72")
compileOnly("org.jetbrains.kotlin:kotlin-reflect:1.3.72")
compileOnly("io.projectreactor:reactor-core")
Expand Down
8 changes: 4 additions & 4 deletions .../com/navercorp/spring/data/jdbc/plus/sql/convert/SqlGeneratorFixedNamingStrategyTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,12 +80,12 @@ public void findOneWithOverriddenFixedTableName() {
+ "FROM \"FIXEDCUSTOMSCHEMA\".\"FIXEDCUSTOMTABLEPREFIX_DUMMYENTITY\" "
+ "LEFT OUTER JOIN \"FIXEDCUSTOMSCHEMA\""
+ ".\"FIXEDCUSTOMTABLEPREFIX_REFERENCEDENTITY\" "
+ "AS \"ref\" "
+ "\"ref\" "
+ "ON \"ref\".\"FIXEDCUSTOMTABLEPREFIX_DUMMYENTITY\" = "
+ "\"FIXEDCUSTOMSCHEMA\".\"FIXEDCUSTOMTABLEPREFIX_DUMMYENTITY\""
+ ".\"FIXEDCUSTOMPROPERTYPREFIX_ID\" "
+ "LEFT OUTER JOIN \"FIXEDCUSTOMSCHEMA\""
+ ".\"FIXEDCUSTOMTABLEPREFIX_SECONDLEVELREFERENCEDENTITY\" AS \"ref_further\" "
+ ".\"FIXEDCUSTOMTABLEPREFIX_SECONDLEVELREFERENCEDENTITY\" \"ref_further\" "
+ "ON \"ref_further\".\"FIXEDCUSTOMTABLEPREFIX_REFERENCEDENTITY\" "
+ "= \"ref\".\"FIXEDCUSTOMPROPERTYPREFIX_L1ID\" "
+ "WHERE \"FIXEDCUSTOMSCHEMA\".\"FIXEDCUSTOMTABLEPREFIX_DUMMYENTITY\""
Expand All @@ -108,9 +108,9 @@ public void findOneWithUppercasedTablesAndLowercasedColumns() {
+ "\"ref_further\".\"L2ID\" AS \"REF_FURTHER_L2ID\", "
+ "\"ref_further\".\"SOMETHING\" AS \"REF_FURTHER_SOMETHING\" "
+ "FROM \"DUMMYENTITY\" "
+ "LEFT OUTER JOIN \"REFERENCEDENTITY\" AS \"ref\" "
+ "LEFT OUTER JOIN \"REFERENCEDENTITY\" \"ref\" "
+ "ON \"ref\".\"DUMMYENTITY\" = \"DUMMYENTITY\".\"ID\" "
+ "LEFT OUTER JOIN \"SECONDLEVELREFERENCEDENTITY\" AS \"ref_further\" "
+ "LEFT OUTER JOIN \"SECONDLEVELREFERENCEDENTITY\" \"ref_further\" "
+ "ON \"ref_further\".\"REFERENCEDENTITY\" = \"ref\".\"L1ID\" "
+ "WHERE \"DUMMYENTITY\".\"ID\" = :id");
softAssertions.assertAll();
Expand Down
32 changes: 16 additions & 16 deletions ...s-sql/src/test/java/com/navercorp/spring/data/jdbc/plus/sql/convert/SqlGeneratorTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -178,9 +178,9 @@ public void findAllSortedBySingleField() {
"ref_further.x_l2id AS ref_further_x_l2id", //
"ref_further.x_something AS ref_further_x_something", //
"FROM dummy_entity ", //
"LEFT OUTER JOIN referenced_entity AS ref "
"LEFT OUTER JOIN referenced_entity ref "
+ "ON ref.dummy_entity = dummy_entity.id1", //
"LEFT OUTER JOIN second_level_referenced_entity AS ref_further "
"LEFT OUTER JOIN second_level_referenced_entity ref_further "
+ "ON ref_further.referenced_entity = ref.x_l1id", //
"ORDER BY x_name ASC");
}
Expand All @@ -202,9 +202,9 @@ public void findAllSortedByMultipleFields() {
"ref_further.x_l2id AS ref_further_x_l2id", //
"ref_further.x_something AS ref_further_x_something", //
"FROM dummy_entity ", //
"LEFT OUTER JOIN referenced_entity AS ref "
"LEFT OUTER JOIN referenced_entity ref "
+ "ON ref.dummy_entity = dummy_entity.id1", //
"LEFT OUTER JOIN second_level_referenced_entity AS ref_further "
"LEFT OUTER JOIN second_level_referenced_entity ref_further "
+ "ON ref_further.referenced_entity = ref.x_l1id", //
"ORDER BY x_name DESC", //
"x_other ASC");
Expand Down Expand Up @@ -232,9 +232,9 @@ public void findAllPaged() {
"ref_further.x_l2id AS ref_further_x_l2id", //
"ref_further.x_something AS ref_further_x_something", //
"FROM dummy_entity ", //
"LEFT OUTER JOIN referenced_entity AS ref "
"LEFT OUTER JOIN referenced_entity ref "
+ "ON ref.dummy_entity = dummy_entity.id1", //
"LEFT OUTER JOIN second_level_referenced_entity AS ref_further "
"LEFT OUTER JOIN second_level_referenced_entity ref_further "
+ "ON ref_further.referenced_entity = ref.x_l1id", //
"OFFSET 40", //
"LIMIT 20");
Expand All @@ -254,9 +254,9 @@ public void findAllPagedAndSorted() {
"ref_further.x_l2id AS ref_further_x_l2id", //
"ref_further.x_something AS ref_further_x_something", //
"FROM dummy_entity ", //
"LEFT OUTER JOIN referenced_entity AS ref "
"LEFT OUTER JOIN referenced_entity ref "
+ "ON ref.dummy_entity = dummy_entity.id1", //
"LEFT OUTER JOIN second_level_referenced_entity AS ref_further "
"LEFT OUTER JOIN second_level_referenced_entity ref_further "
+ "ON ref_further.referenced_entity = ref.x_l1id", //
"ORDER BY x_name ASC", //
"OFFSET 30", //
Expand All @@ -278,9 +278,9 @@ public void findAllByProperty() {
"ref_further.x_l2id AS ref_further_x_l2id", //
"ref_further.x_something AS ref_further_x_something", //
"FROM dummy_entity ", //
"LEFT OUTER JOIN referenced_entity AS ref "
"LEFT OUTER JOIN referenced_entity ref "
+ "ON ref.dummy_entity = dummy_entity.id1", //
"LEFT OUTER JOIN second_level_referenced_entity AS ref_further "
"LEFT OUTER JOIN second_level_referenced_entity ref_further "
+ "ON ref_further.referenced_entity = ref.x_l1id", //
"WHERE dummy_entity.backref = :backref");
}
Expand All @@ -302,8 +302,8 @@ public void findAllByPropertyWithMultipartIdentifier() {
"ref_further.x_l2id AS ref_further_x_l2id", //
"ref_further.x_something AS ref_further_x_something", //
"FROM dummy_entity ", //
"LEFT OUTER JOIN referenced_entity AS ref ON ref.dummy_entity = dummy_entity.id1", //
"LEFT OUTER JOIN second_level_referenced_entity AS ref_further "
"LEFT OUTER JOIN referenced_entity ref ON ref.dummy_entity = dummy_entity.id1", //
"LEFT OUTER JOIN second_level_referenced_entity ref_further "
+ "ON ref_further.referenced_entity = ref.x_l1id", //
"dummy_entity.backref = :backref", //
"dummy_entity.backref_key = :backref_key");
Expand All @@ -324,9 +324,9 @@ public void findAllByPropertyWithKey() {
+ "AS ref_further_x_something, " //
+ "dummy_entity.key-column AS key-column " //
+ "FROM dummy_entity " //
+ "LEFT OUTER JOIN referenced_entity AS ref "
+ "LEFT OUTER JOIN referenced_entity ref "
+ "ON ref.dummy_entity = dummy_entity.id1 " //
+ "LEFT OUTER JOIN second_level_referenced_entity AS ref_further "
+ "LEFT OUTER JOIN second_level_referenced_entity ref_further "
+ "ON ref_further.referenced_entity = ref.x_l1id " //
+ "WHERE dummy_entity.backref = :backref");
}
Expand All @@ -350,8 +350,8 @@ public void findAllByPropertyWithKeyOrdered() {
+ "AS ref_further_x_something, " //
+ "dummy_entity.key-column AS key-column " //
+ "FROM dummy_entity " //
+ "LEFT OUTER JOIN referenced_entity AS ref ON ref.dummy_entity = dummy_entity.id1 " //
+ "LEFT OUTER JOIN second_level_referenced_entity AS ref_further "
+ "LEFT OUTER JOIN referenced_entity ref ON ref.dummy_entity = dummy_entity.id1 " //
+ "LEFT OUTER JOIN second_level_referenced_entity ref_further "
+ "ON ref_further.referenced_entity = ref.x_l1id " //
+ "WHERE dummy_entity.backref = :backref " + "ORDER BY key-column");
}
Expand Down
4 changes: 2 additions & 2 deletions spring-data-plus-sql-gen/build.gradle
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
dependencies {
compile("org.springframework.data:spring-data-relational:2.1.0-M1")
compile("org.springframework.data:spring-data-commons:2.4.0-M1")
compile("org.springframework.data:spring-data-relational:2.1.0-M2")
compile("org.springframework.data:spring-data-commons:2.4.0-M2")
compile project(":spring-data-jdbc-plus-sql")
compile("com.squareup:javapoet:1.12.1")

Expand Down

0 comments on commit b9b6576

Please sign in to comment.