This is an automated email from the ASF dual-hosted git repository. djkevincr 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 b38c957 GORA-652 Enable tests by default for redis/couchdb/aerospike datastore (#209) b38c957 is described below commit b38c957a6e6326fb827ca7f667566d060dabb4b1 Author: Damien Raude-Morvan <damien.raude-mor...@verteego.com> AuthorDate: Sat Oct 24 14:39:10 2020 +0200 GORA-652 Enable tests by default for redis/couchdb/aerospike datastore (#209) * GORA-652 Remove `aerospike-with-test` profile and enable tests by default * GORA-652 Remove `couchdb-with-test` profile and enable tests by default * GORA-652 Remove `redis-with-test` profile and enable tests by default * GORA-652 CouchDB: Use standard chouchdb container * GORA-652 CouchDB: Configure exposed port and server ip * GORA-652 CouchDB: wait for HTTP endpoint to return 200 * Update mvn opts * Remove Wait import --- .github/workflows/master-pr-build.yml | 2 +- .github/workflows/master-push-build.yml | 2 +- gora-aerospike/pom.xml | 26 ---------------------- gora-couchdb/pom.xml | 5 ----- .../apache/gora/couchdb/GoraCouchDBTestDriver.java | 1 + gora-redis/pom.xml | 26 ---------------------- 6 files changed, 3 insertions(+), 59 deletions(-) diff --git a/.github/workflows/master-pr-build.yml b/.github/workflows/master-pr-build.yml index 590833f..5d2a207 100644 --- a/.github/workflows/master-pr-build.yml +++ b/.github/workflows/master-pr-build.yml @@ -34,4 +34,4 @@ jobs: with: java-version: ${{ matrix.java }} - name: mvn sourcecheck - run: mvn clean install \ No newline at end of file + run: mvn --no-transfer-progress --batch-mode clean install \ No newline at end of file diff --git a/.github/workflows/master-push-build.yml b/.github/workflows/master-push-build.yml index 29d5746..3e3c627 100644 --- a/.github/workflows/master-push-build.yml +++ b/.github/workflows/master-push-build.yml @@ -34,4 +34,4 @@ jobs: with: java-version: ${{ matrix.java }} - name: mvn sourcecheck - run: mvn clean install \ No newline at end of file + run: mvn --no-transfer-progress --batch-mode clean install \ No newline at end of file diff --git a/gora-aerospike/pom.xml b/gora-aerospike/pom.xml index e2a734e..cf61899 100644 --- a/gora-aerospike/pom.xml +++ b/gora-aerospike/pom.xml @@ -54,24 +54,6 @@ <osgi.export>org.apache.gora.aerospike*;version="${project.version}";-noimport:=true</osgi.export> </properties> - <profiles> - <profile> - <id>aerospike-with-test</id> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <version>2.4.2</version> - <configuration> - <skipTests>false</skipTests> - </configuration> - </plugin> - </plugins> - </build> - </profile> - </profiles> - <build> <directory>target</directory> <outputDirectory>target/classes</outputDirectory> @@ -89,14 +71,6 @@ </testResources> <plugins> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <version>2.4.2</version> - <configuration> - <skipTests>true</skipTests> - </configuration> - </plugin> - <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>build-helper-maven-plugin</artifactId> <version>${build-helper-maven-plugin.version}</version> diff --git a/gora-couchdb/pom.xml b/gora-couchdb/pom.xml index 24f5355..4ff0b93 100644 --- a/gora-couchdb/pom.xml +++ b/gora-couchdb/pom.xml @@ -71,11 +71,6 @@ </testResources> <plugins> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <version>2.4.2</version> - </plugin> - <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>build-helper-maven-plugin</artifactId> <version>${build-helper-maven-plugin.version}</version> diff --git a/gora-couchdb/src/test/java/org/apache/gora/couchdb/GoraCouchDBTestDriver.java b/gora-couchdb/src/test/java/org/apache/gora/couchdb/GoraCouchDBTestDriver.java index 7996708..9b9b20a 100644 --- a/gora-couchdb/src/test/java/org/apache/gora/couchdb/GoraCouchDBTestDriver.java +++ b/gora-couchdb/src/test/java/org/apache/gora/couchdb/GoraCouchDBTestDriver.java @@ -53,6 +53,7 @@ public class GoraCouchDBTestDriver extends GoraTestDriver { @Override public void setUpClass() { log.info("Setting up CouchDB Test Driver"); + properties.put(CouchDBParameters.PROP_COUCHDB_SERVER, couchdbContainer.getContainerIpAddress()); properties.put(CouchDBParameters.PROP_COUCHDB_PORT, couchdbContainer.getMappedPort(5984).toString()); } diff --git a/gora-redis/pom.xml b/gora-redis/pom.xml index ee33cb1..1057afd 100755 --- a/gora-redis/pom.xml +++ b/gora-redis/pom.xml @@ -54,24 +54,6 @@ <osgi.export>org.apache.gora.redis*;version="${project.version}";-noimport:=true</osgi.export> </properties> - <profiles> - <profile> - <id>redis-with-test</id> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <version>2.4.2</version> - <configuration> - <skipTests>false</skipTests> - </configuration> - </plugin> - </plugins> - </build> - </profile> - </profiles> - <build> <directory>target</directory> <outputDirectory>target/classes</outputDirectory> @@ -90,14 +72,6 @@ </testResources> <plugins> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <version>2.4.2</version> - <configuration> - <skipTests>true</skipTests> - </configuration> - </plugin> - <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>build-helper-maven-plugin</artifactId> <version>${build-helper-maven-plugin.version}</version>