From 568f9e5bcda6ea1aa51401cc27cf69cdcd2781e9 Mon Sep 17 00:00:00 2001 From: Jens Schauder Date: Wed, 1 Aug 2018 15:58:34 +0200 Subject: [PATCH 1/3] DATAJDBC-246 - Prepare branch. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9b63bcc527..8985c5d43a 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.springframework.data spring-data-jdbc - 1.0.0.BUILD-SNAPSHOT + 1.0.0.DATAJDBC-246-SNAPSHOT Spring Data JDBC Spring Data module for JDBC repositories. From bd92e8368dc4a17b316fa109023578088ba484fd Mon Sep 17 00:00:00 2001 From: Jens Schauder Date: Wed, 1 Aug 2018 15:59:20 +0200 Subject: [PATCH 2/3] DATAJDBC-246 - Configured Travis CI build for JDK 9-11. Upgraded the dependency-plugin. Configured matrix build for travis, allowing the JDK 11 build to fail. The failure should go away once the Spring Framework version we use include the fix for SPR-17093. Removed Jacoco from the build for JDK 10+. --- .travis.yml | 24 ++++++++++-- pom.xml | 24 ++++++++++++ ...nableJdbcAuditingHsqlIntegrationTests.java | 39 ++++++++++++------- 3 files changed, 71 insertions(+), 16 deletions(-) diff --git a/.travis.yml b/.travis.yml index c926555157..6098a28424 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,23 @@ language: java -jdk: - - oraclejdk8 +matrix: + include: + - jdk: oraclejdk8 + env: JDK='Oracle JDK 8' + - jdk: oraclejdk9 + env: JDK='Oracle JDK 9' + - env: + - JDK='Oracle JDK 10' + - NO_JACOCO='true' + before_install: wget https://github.com/sormuras/bach/raw/master/install-jdk.sh && . ./install-jdk.sh -F 10 -L BCL + - env: + - JDK='Oracle JDK 11' + - NO_JACOCO='true' + before_install: wget https://github.com/sormuras/bach/raw/master/install-jdk.sh && . ./install-jdk.sh -F 11 -L BCL + allow_failures: + - env: + - JDK='Oracle JDK 11' + - NO_JACOCO='true' addons: apt: @@ -19,4 +35,6 @@ services: install: true -script: "mvn clean dependency:list test -Pall-dbs -Dsort -U" +script: + - "mvn -version" + - "mvn clean dependency:list test -Pall-dbs${NO_JACOCO:+',no-jacoco'} -Dsort -U" diff --git a/pom.xml b/pom.xml index 8985c5d43a..21ed2c33c5 100644 --- a/pom.xml +++ b/pom.xml @@ -78,6 +78,25 @@ + + no-jacoco + + + + org.jacoco + jacoco-maven-plugin + + + jacoco-initialize + none + + + + + + + + all-dbs @@ -273,6 +292,11 @@ maven-surefire-plugin 2.12 + + org.apache.maven.plugins + maven-dependency-plugin + 3.1.0 + diff --git a/src/test/java/org/springframework/data/jdbc/repository/config/EnableJdbcAuditingHsqlIntegrationTests.java b/src/test/java/org/springframework/data/jdbc/repository/config/EnableJdbcAuditingHsqlIntegrationTests.java index 16e566a376..779ce24f40 100644 --- a/src/test/java/org/springframework/data/jdbc/repository/config/EnableJdbcAuditingHsqlIntegrationTests.java +++ b/src/test/java/org/springframework/data/jdbc/repository/config/EnableJdbcAuditingHsqlIntegrationTests.java @@ -33,7 +33,6 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Primary; -import org.springframework.context.annotation.Profile; import org.springframework.data.annotation.CreatedBy; import org.springframework.data.annotation.CreatedDate; import org.springframework.data.annotation.Id; @@ -70,13 +69,19 @@ public void auditForAnnotatedEntity() { AuditingAnnotatedDummyEntity entity = repository.save(new AuditingAnnotatedDummyEntity()); - softly.assertThat(entity.id).isNotNull(); - softly.assertThat(entity.getCreatedBy()).isEqualTo("user01"); - softly.assertThat(entity.getCreatedDate()).isAfter(now); - softly.assertThat(entity.getLastModifiedBy()).isEqualTo("user01"); - softly.assertThat(entity.getLastModifiedDate()).isAfterOrEqualTo(entity.getCreatedDate()); - softly.assertThat(entity.getLastModifiedDate()).isAfter(now); - softly.assertThat(repository.findById(entity.id).get()).isEqualTo(entity); + softly.assertThat(entity.id).as("id not null").isNotNull(); + softly.assertThat(entity.getCreatedBy()).as("created by set").isEqualTo("user01"); + softly.assertThat(entity.getCreatedDate()).as("created date set").isAfter(now); + softly.assertThat(entity.getLastModifiedBy()).as("modified by set").isEqualTo("user01"); + softly.assertThat(entity.getLastModifiedDate()).as("modified date set").isAfterOrEqualTo(entity.getCreatedDate()); + softly.assertThat(entity.getLastModifiedDate()).as("modified date after instance creation").isAfter(now); + + AuditingAnnotatedDummyEntity reloaded = repository.findById(entity.id).get(); + + softly.assertThat(reloaded.getCreatedBy()).as("reload created by").isNotNull(); + softly.assertThat(reloaded.getCreatedDate()).as("reload created date").isNotNull(); + softly.assertThat(reloaded.getLastModifiedBy()).as("reload modified by").isNotNull(); + softly.assertThat(reloaded.getLastModifiedDate()).as("reload modified date").isNotNull(); LocalDateTime beforeCreatedDate = entity.getCreatedDate(); LocalDateTime beforeLastModifiedDate = entity.getLastModifiedDate(); @@ -89,11 +94,19 @@ public void auditForAnnotatedEntity() { entity = repository.save(entity); - softly.assertThat(entity.getCreatedBy()).isEqualTo("user01"); - softly.assertThat(entity.getCreatedDate()).isEqualTo(beforeCreatedDate); - softly.assertThat(entity.getLastModifiedBy()).isEqualTo("user02"); - softly.assertThat(entity.getLastModifiedDate()).isAfter(beforeLastModifiedDate); - softly.assertThat(repository.findById(entity.id).get()).isEqualTo(entity); + softly.assertThat(entity.getCreatedBy()).as("created by unchanged").isEqualTo("user01"); + softly.assertThat(entity.getCreatedDate()).as("created date unchanged").isEqualTo(beforeCreatedDate); + softly.assertThat(entity.getLastModifiedBy()).as("modified by updated").isEqualTo("user02"); + softly.assertThat(entity.getLastModifiedDate()).as("modified date updated").isAfter(beforeLastModifiedDate); + + reloaded = repository.findById(entity.id).get(); + + softly.assertThat(reloaded.getCreatedBy()).as("2. reload created by").isNotNull(); + softly.assertThat(reloaded.getCreatedDate()).as("2. reload created date").isNotNull(); + softly.assertThat(reloaded.getLastModifiedBy()).as("2. reload modified by").isNotNull(); + softly.assertThat(reloaded.getLastModifiedDate()).as("2. reload modified date").isNotNull(); + + softly.assertAll(); }); } From c8e8ca0726493199212e5121462dd2f6d7d882b9 Mon Sep 17 00:00:00 2001 From: Jens Schauder Date: Thu, 2 Aug 2018 15:58:26 +0200 Subject: [PATCH 3/3] DATAJDBC-246 - Polishing. Formating pom.xml --- pom.xml | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/pom.xml b/pom.xml index 21ed2c33c5..2429619183 100644 --- a/pom.xml +++ b/pom.xml @@ -1,11 +1,12 @@ - + 4.0.0 - org.springframework.data - spring-data-jdbc - 1.0.0.DATAJDBC-246-SNAPSHOT + org.springframework.data + spring-data-jdbc + 1.0.0.DATAJDBC-246-SNAPSHOT Spring Data JDBC Spring Data module for JDBC repositories. @@ -242,10 +243,10 @@ - org.mariadb.jdbc - mariadb-java-client - ${mariadb-java-client.version} - test + org.mariadb.jdbc + mariadb-java-client + ${mariadb-java-client.version} + test