This is an automated email from the ASF dual-hosted git repository. drazzib pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/gora.git
The following commit(s) were added to refs/heads/master by this push: new 307ff87 GORA-674: upgrade testcontainers to 1.15.2 (#236) 307ff87 is described below commit 307ff87ef8581dd35acc3f3e0e0541cb138fdcbe Author: Damien Raude-Morvan <draz...@apache.org> AuthorDate: Sat Apr 10 22:16:47 2021 +0200 GORA-674: upgrade testcontainers to 1.15.2 (#236) * GORA-674 Upgrade testcontainers to 1.15.2 * GORA-674 gora-couchdb: Upgrade Jackson to a supported release 2.12 (as recommended in testcontainers/testcontainers-java#3937) * Github actions: Capture surefire reports * Github actions: Remove --fail-at-end from global options * Github actions: Always Publish Test Results --- .github/workflows/master-pr-build.yml | 26 ++++++++++++++++++---- .github/workflows/master-push-build.yml | 26 ++++++++++++++++++---- gora-couchdb/pom.xml | 4 ++++ .../couchdb/util/CouchDBObjectMapperFactory.java | 2 +- pom.xml | 11 +++++++-- 5 files changed, 58 insertions(+), 11 deletions(-) diff --git a/.github/workflows/master-pr-build.yml b/.github/workflows/master-pr-build.yml index 5ab3b17..d51f9b3 100644 --- a/.github/workflows/master-pr-build.yml +++ b/.github/workflows/master-pr-build.yml @@ -23,7 +23,7 @@ on: - master env: - MAVEN_CLI_OPTS: "--batch-mode --errors --fail-at-end --show-version --no-transfer-progress" + MAVEN_CLI_OPTS: "--batch-mode --errors --show-version --no-transfer-progress" jobs: build: @@ -32,14 +32,32 @@ jobs: matrix: java: [ '1.8' ] steps: - - uses: actions/checkout@v2 + - name: Checkout repository + uses: actions/checkout@v2 + + - name: Setup Maven caching + uses: actions/cache@v2 + with: + path: ~/.m2/repository + key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} + restore-keys: | + ${{ runner.os }}-maven- + - name: Set up JDK ${{ matrix.java }} uses: actions/setup-java@v1 with: java-version: ${{ matrix.java }} - name: Build - run: mvn $MAVEN_CLI_OPTS -DskipTests clean install + run: mvn $MAVEN_CLI_OPTS --fail-at-end -DskipTests clean install - name: Test - run: mvn $MAVEN_CLI_OPTS verify \ No newline at end of file + run: mvn $MAVEN_CLI_OPTS --fail-at-end verify + + - name: Publish Test Results + if: ${{ always() }} + uses: scacap/action-surefire-report@v1 + with: + github_token: ${{ secrets.GITHUB_TOKEN }} + check_name: Test Report (${{ matrix.java }}) + report_paths: '**/*-reports/TEST-*.xml' \ No newline at end of file diff --git a/.github/workflows/master-push-build.yml b/.github/workflows/master-push-build.yml index 517f455..d89aaab 100644 --- a/.github/workflows/master-push-build.yml +++ b/.github/workflows/master-push-build.yml @@ -23,7 +23,7 @@ on: - master env: - MAVEN_CLI_OPTS: "--batch-mode --errors --fail-at-end --show-version --no-transfer-progress" + MAVEN_CLI_OPTS: "--batch-mode --errors --show-version --no-transfer-progress" jobs: build: @@ -32,14 +32,32 @@ jobs: matrix: java: [ '1.8' ] steps: - - uses: actions/checkout@v2 + - name: Checkout repository + uses: actions/checkout@v2 + + - name: Setup Maven caching + uses: actions/cache@v2 + with: + path: ~/.m2/repository + key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} + restore-keys: | + ${{ runner.os }}-maven- + - name: Set up JDK ${{ matrix.java }} uses: actions/setup-java@v1 with: java-version: ${{ matrix.java }} - name: Build - run: mvn $MAVEN_CLI_OPTS -DskipTests clean install + run: mvn $MAVEN_CLI_OPTS --fail-at-end -DskipTests clean install - name: Test - run: mvn $MAVEN_CLI_OPTS verify \ No newline at end of file + run: mvn $MAVEN_CLI_OPTS --fail-at-end verify + + - name: Publish Test Results + if: ${{ always() }} + uses: scacap/action-surefire-report@v1 + with: + github_token: ${{ secrets.GITHUB_TOKEN }} + check_name: Test Report (${{ matrix.java }}) + report_paths: '**/*-reports/TEST-*.xml' \ No newline at end of file diff --git a/gora-couchdb/pom.xml b/gora-couchdb/pom.xml index e1add43..c61abca 100644 --- a/gora-couchdb/pom.xml +++ b/gora-couchdb/pom.xml @@ -126,6 +126,10 @@ <groupId>org.ektorp</groupId> <artifactId>org.ektorp</artifactId> </dependency> + <dependency> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-databind</artifactId> + </dependency> <dependency> <groupId>org.apache.avro</groupId> diff --git a/gora-couchdb/src/main/java/org/apache/gora/couchdb/util/CouchDBObjectMapperFactory.java b/gora-couchdb/src/main/java/org/apache/gora/couchdb/util/CouchDBObjectMapperFactory.java index 0fd3efa..0f66206 100644 --- a/gora-couchdb/src/main/java/org/apache/gora/couchdb/util/CouchDBObjectMapperFactory.java +++ b/gora-couchdb/src/main/java/org/apache/gora/couchdb/util/CouchDBObjectMapperFactory.java @@ -65,7 +65,7 @@ public class CouchDBObjectMapperFactory implements ObjectMapperFactory { */ private void applyDefaultConfiguration(ObjectMapper om) { om.configure(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS, this.writeDatesAsTimestamps); - om.getSerializationConfig().withSerializationInclusion(JsonInclude.Include.NON_NULL); + om.setSerializationInclusion(JsonInclude.Include.NON_NULL); } } \ No newline at end of file diff --git a/pom.xml b/pom.xml index 309a657..c864136 100755 --- a/pom.xml +++ b/pom.xml @@ -884,7 +884,7 @@ <!-- Testing Dependencies --> <junit.version>4.10</junit.version> - <test.container.version>1.14.3</test.container.version> + <testcontainers.version>1.15.2</testcontainers.version> <!-- gora-benchmark and version dependencies --> <site.ycsb.version>0.17.0</site.ycsb.version> @@ -1807,6 +1807,13 @@ <artifactId>org.ektorp</artifactId> <version>${couchdb.version}</version> </dependency> + <dependency> + <groupId>com.fasterxml.jackson</groupId> + <artifactId>jackson-bom</artifactId> + <version>2.12.1</version> + <scope>import</scope> + <type>pom</type> + </dependency> <!-- Testing Dependencies --> <dependency> @@ -1830,7 +1837,7 @@ <dependency> <groupId>org.testcontainers</groupId> <artifactId>testcontainers-bom</artifactId> - <version>${test.container.version}</version> + <version>${testcontainers.version}</version> <type>pom</type> <scope>import</scope> </dependency>