svn commit: r1028803 - /websites/production/gora/content/
Author: madhawa Date: Mon Apr 23 03:36:16 2018 New Revision: 1028803 Log: Publishing svnmucc operation to gora site by madhawa Added: websites/production/gora/content/ - copied from r1028802, websites/staging/gora/trunk/content/
svn commit: r1028807 - /websites/production/gora/content/
Author: madhawa Date: Mon Apr 23 03:49:35 2018 New Revision: 1028807 Log: Publishing svnmucc operation to gora site by madhawa Added: websites/production/gora/content/ - copied from r1028806, websites/staging/gora/trunk/content/
svn commit: r1829805 - /gora/site/trunk/content/credits.md
Author: madhawa Date: Mon Apr 23 03:49:05 2018 New Revision: 1829805 URL: http://svn.apache.org/viewvc?rev=1829805=rev Log: CMS commit to gora by madhawa Modified: gora/site/trunk/content/credits.md Modified: gora/site/trunk/content/credits.md URL: http://svn.apache.org/viewvc/gora/site/trunk/content/credits.md?rev=1829805=1829804=1829805=diff == --- gora/site/trunk/content/credits.md (original) +++ gora/site/trunk/content/credits.md Mon Apr 23 03:49:05 2018 @@ -25,6 +25,7 @@ Gora active committers include (ordered * [Apostolos Giannakidis](http://uk.linkedin.com/in/giannakidisapostolos) (apgiannakidis) - Oracle **CP** * [Damien Raude-Morvan](https://www.linkedin.com/in/damienraudemorvan) (drazzib) - [Dictanova](http://www.dictanova.com) **CP** * [Pierre Sutra](https://sites.google.com/site/0track/) (otrack) - [Telecom SudParis](http://www.telecom-sudparis.eu/) **CP** +* [Madhawa Gunasekara](http://www.linkedin.com/in/mgunasekara) (madhawa) - [WSO2](http://wso2.com) **CP** * [Talat Uyarer](https://tr.linkedin.com/in/talatuyarer) (talat) - **CP** Gora members can be contacted by appending @apache.org to their usernames.
svn commit: r1028802 - /websites/production/gora/content/
Author: madhawa Date: Mon Apr 23 03:35:04 2018 New Revision: 1028802 Log: publish site Added: websites/production/gora/content/ - copied from r1028801, websites/staging/gora/trunk/content/
svn commit: r1028805 - /websites/production/gora/content/
Author: madhawa Date: Mon Apr 23 03:48:37 2018 New Revision: 1028805 Log: Publishing svnmucc operation to gora site by madhawa Added: websites/production/gora/content/ - copied from r1028804, websites/staging/gora/trunk/content/
svn commit: r1028804 - /websites/production/gora/content/
Author: madhawa Date: Mon Apr 23 03:43:12 2018 New Revision: 1028804 Log: Publishing svnmucc operation to gora site by madhawa Added: websites/production/gora/content/ - copied from r1028803, websites/staging/gora/trunk/content/
[gora] branch master updated: GORA 616 Fix Multiple slf4j conflict issue
This is an automated email from the ASF dual-hosted git repository. madhawa 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 1be5841 GORA 616 Fix Multiple slf4j conflict issue 1be5841 is described below commit 1be58412bc5a221f14bc92f05fac70d1f0582f4e Author: Chanaka Balasooriya AuthorDate: Wed Jul 17 00:17:34 2019 +0530 GORA 616 Fix Multiple slf4j conflict issue --- gora-tutorial/pom.xml | 12 1 file changed, 12 insertions(+) diff --git a/gora-tutorial/pom.xml b/gora-tutorial/pom.xml index fe46e44..cac29c1 100644 --- a/gora-tutorial/pom.xml +++ b/gora-tutorial/pom.xml @@ -111,6 +111,12 @@ org.apache.gora gora-couchdb + + + org.slf4j + slf4j-simple + + @@ -121,6 +127,12 @@ org.apache.gora gora-solr + + + org.apache.logging.log4j + log4j-slf4j-impl + +
[gora] 01/02: Fix goracompiler cli output for --help
This is an automated email from the ASF dual-hosted git repository. madhawa pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/gora.git commit 05bf5e43e4b12a786fbc45488931b7b8c908d72c Author: LahiruJayasekara AuthorDate: Thu May 23 07:38:15 2019 +0530 Fix goracompiler cli output for --help --- .../apache/gora/compiler/cli/GoraCompilerCLI.java | 26 +- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/gora-compiler-cli/src/main/java/org/apache/gora/compiler/cli/GoraCompilerCLI.java b/gora-compiler-cli/src/main/java/org/apache/gora/compiler/cli/GoraCompilerCLI.java index ca4b0ee..8f6e455 100644 --- a/gora-compiler-cli/src/main/java/org/apache/gora/compiler/cli/GoraCompilerCLI.java +++ b/gora-compiler-cli/src/main/java/org/apache/gora/compiler/cli/GoraCompilerCLI.java @@ -103,16 +103,20 @@ public class GoraCompilerCLI { } private static void printHelp() { -LOG.info("Usage: gora-compiler ( -h | --help ) | ( [...] [-license ])"); -LOG.error("License header options include;\n" + - "\t\t ASLv2 (Apache Software License v2.0) \n" + - "\t\t AGPLv3 (GNU Affero General Public License) \n" + - "\t\t CDDLv1 (Common Development and Distribution License v1.0) \n" + - "\t\t FDLv13 (GNU Free Documentation License v1.3) \n" + - "\t\t GPLv1 (GNU General Public License v1.0) \n" + - "\t\t GPLv2 (GNU General Public License v2.0) \n" + - "\t\t GPLv3 (GNU General Public License v3.0) \n" + - "\t\t LGPLv21 (GNU Lesser General Public License v2.1) \n" + - "\t\t LGPLv3 (GNU Lesser General Public License v2.1)"); +LOG.info("Usage: GoraCompiler [-license ]\n" + +"- individual avsc file to be compiled or a directory path containing avsc files\n" + +" - output directory for generated Java files\n" + +" [-license ] - the preferred license header to add to the generated Java file.\n" + +"Current License header options include;\n" + +"\t\t ASLv2 (Apache Software License v2.0) \n" + +"\t\t AGPLv3 (GNU Affero General Public License) \n" + +"\t\t CDDLv1 (Common Development and Distribution License v1.0) \n" + +"\t\t FDLv13 (GNU Free Documentation License v1.3) \n" + +"\t\t GPLv1 (GNU General Public License v1.0) \n" + +"\t\t GPLv2 (GNU General Public License v2.0) \n" + +"\t\t GPLv3 (GNU General Public License v3.0) \n" + +"\t\t LGPLv21 (GNU Lesser General Public License v2.1) \n" + +"\t\t LGPLv3 (GNU Lesser General Public License v2.1)" +); } }
[gora] 02/02: Replace "\n" with `System.lineSeparator()`
This is an automated email from the ASF dual-hosted git repository. madhawa pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/gora.git commit 95c607c3dd493b6cdd5958ee12287379e4c53e01 Author: LahiruJayasekara AuthorDate: Fri May 24 18:04:50 2019 +0530 Replace "\n" with `System.lineSeparator()` --- .../apache/gora/compiler/cli/GoraCompilerCLI.java | 28 -- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/gora-compiler-cli/src/main/java/org/apache/gora/compiler/cli/GoraCompilerCLI.java b/gora-compiler-cli/src/main/java/org/apache/gora/compiler/cli/GoraCompilerCLI.java index 8f6e455..ac672e5 100644 --- a/gora-compiler-cli/src/main/java/org/apache/gora/compiler/cli/GoraCompilerCLI.java +++ b/gora-compiler-cli/src/main/java/org/apache/gora/compiler/cli/GoraCompilerCLI.java @@ -103,19 +103,21 @@ public class GoraCompilerCLI { } private static void printHelp() { -LOG.info("Usage: GoraCompiler [-license ]\n" + -"- individual avsc file to be compiled or a directory path containing avsc files\n" + -" - output directory for generated Java files\n" + -" [-license ] - the preferred license header to add to the generated Java file.\n" + -"Current License header options include;\n" + -"\t\t ASLv2 (Apache Software License v2.0) \n" + -"\t\t AGPLv3 (GNU Affero General Public License) \n" + -"\t\t CDDLv1 (Common Development and Distribution License v1.0) \n" + -"\t\t FDLv13 (GNU Free Documentation License v1.3) \n" + -"\t\t GPLv1 (GNU General Public License v1.0) \n" + -"\t\t GPLv2 (GNU General Public License v2.0) \n" + -"\t\t GPLv3 (GNU General Public License v3.0) \n" + -"\t\t LGPLv21 (GNU Lesser General Public License v2.1) \n" + +LOG.info("Usage: GoraCompiler [-license ]" + System.lineSeparator() + +"- individual avsc file to be compiled or a directory path containing avsc files" + +System.lineSeparator() + +" - output directory for generated Java files" + System.lineSeparator() + +" [-license ] - the preferred license header to add to the generated Java file." + +System.lineSeparator() + +"Current License header options include;" + System.lineSeparator() + +"\t\t ASLv2 (Apache Software License v2.0)" + System.lineSeparator() + +"\t\t AGPLv3 (GNU Affero General Public License)" + System.lineSeparator() + +"\t\t CDDLv1 (Common Development and Distribution License v1.0)" + System.lineSeparator() + +"\t\t FDLv13 (GNU Free Documentation License v1.3)" + System.lineSeparator() + +"\t\t GPLv1 (GNU General Public License v1.0)" + System.lineSeparator() + +"\t\t GPLv2 (GNU General Public License v2.0)" + System.lineSeparator() + +"\t\t GPLv3 (GNU General Public License v3.0)" + System.lineSeparator() + +"\t\t LGPLv21 (GNU Lesser General Public License v2.1)" + System.lineSeparator() + "\t\t LGPLv3 (GNU Lesser General Public License v2.1)" ); }
[gora] branch master updated (1be5841 -> 95c607c)
This is an automated email from the ASF dual-hosted git repository. madhawa pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/gora.git. from 1be5841 GORA 616 Fix Multiple slf4j conflict issue new 05bf5e4 Fix goracompiler cli output for --help new 95c607c Replace "\n" with `System.lineSeparator()` The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../apache/gora/compiler/cli/GoraCompilerCLI.java | 28 +- 1 file changed, 17 insertions(+), 11 deletions(-)
[gora] branch master updated (783580c -> 3f4d474)
This is an automated email from the ASF dual-hosted git repository. madhawa pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/gora.git. from 783580c Update developers list (#200) new e08524c Fix mapping file name access method in hbaseStore new 18d95f9 Fix mapping file name access method in dynamoDBStore new 3f4d474 Remove unused imports The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../apache/gora/dynamodb/store/DynamoDBStore.java | 9 --- .../org/apache/gora/hbase/store/HBaseStore.java| 31 +- 2 files changed, 19 insertions(+), 21 deletions(-)
[gora] branch master updated: Fix gitworkflow in README
This is an automated email from the ASF dual-hosted git repository. madhawa 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 798f402 Fix gitworkflow in README new 220bb3a Merge pull request #203 from madhawa-gunasekara/FixReadMe 798f402 is described below commit 798f40208116e1c41222a2f7430d9b10096b4ec2 Author: madhawa-gunasekara AuthorDate: Fri Mar 13 20:39:11 2020 +0100 Fix gitworkflow in README --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index e696c10..5beabdb 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ http://gora.apache.org/resources/img/powered-by-gora.png; align="right" width="300" /> -[![CI](https://github.com/apache/gora/workflows/CI/badge.svg?branch=master)](https://github.com/apache/gora/actions?query=workflow%3ACI) +[![build](https://github.com/apache/gora/workflows/build/badge.svg?branch=master)](https://github.com/apache/gora/actions?query=workflow%3Abuild) [![license](https://img.shields.io/github/license/apache/gora.svg?maxAge=2592000?style=plastic)](http://www.apache.org/licenses/LICENSE-2.0) [![Jenkins](https://img.shields.io/jenkins/s/https/builds.apache.org/gora-trunk.svg?maxAge=2592000?style=plastic)](https://builds.apache.org/job/gora-trunk/) [![Jenkins tests](https://img.shields.io/jenkins/t/https/builds.apache.org/gora-trunk.svg?maxAge=2592000?style=plastic)](https://builds.apache.org/job/gora-trunk)
[gora] 01/03: Fix mapping file name access method in hbaseStore
This is an automated email from the ASF dual-hosted git repository. madhawa pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/gora.git commit e08524c5d5aaac9fd3e4ed42739c03e398d6fa8b Author: LahiruJayasekara AuthorDate: Sat May 11 01:50:44 2019 +0530 Fix mapping file name access method in hbaseStore --- .../org/apache/gora/hbase/store/HBaseStore.java| 28 ++ 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/gora-hbase/src/main/java/org/apache/gora/hbase/store/HBaseStore.java b/gora-hbase/src/main/java/org/apache/gora/hbase/store/HBaseStore.java index 518f6ac..d16700b 100644 --- a/gora-hbase/src/main/java/org/apache/gora/hbase/store/HBaseStore.java +++ b/gora-hbase/src/main/java/org/apache/gora/hbase/store/HBaseStore.java @@ -139,20 +139,17 @@ public class HBaseStore extends DataStoreBase try { this.conf = HBaseConfiguration.create(getConf()); - - InputStream mappingInputStream ; - // If there is a mapping definition in the Properties, use it. - if (properties.containsKey(XML_MAPPING_DEFINITION)) { -if (LOG.isTraceEnabled()) LOG.trace(XML_MAPPING_DEFINITION + " = " + properties.getProperty(XML_MAPPING_DEFINITION)); -mappingInputStream = IOUtils.toInputStream(properties.getProperty(XML_MAPPING_DEFINITION), (Charset)null) ; - } - // Otherwise use the configuration from de default file gora-hbase-mapping.xml or whatever - // configured in the key "gora.hbase.mapping.file" - else { -mappingInputStream = getClass().getClassLoader().getResourceAsStream(getConf().get(PARSE_MAPPING_FILE_KEY, DEFAULT_MAPPING_FILE)) ; + + String mappingFile = DataStoreFactory.getMappingFile(properties, this, + DEFAULT_MAPPING_FILE); + + // if there is no mapping.file property in gora.properties, then check + // configurations for mapping.file key + if (mappingFile.equals(DEFAULT_MAPPING_FILE)) { +mappingFile = getConf().get(PARSE_MAPPING_FILE_KEY, DEFAULT_MAPPING_FILE); } - mapping = readMapping(mappingInputStream); + mapping = readMapping(mappingFile); filterUtil = new HBaseFilterUtil<>(this.conf); } catch (FileNotFoundException ex) { throw new GoraException("Mapping file '" + getConf().get(PARSE_MAPPING_FILE_KEY, DEFAULT_MAPPING_FILE) + "' not found.",ex); @@ -819,13 +816,14 @@ public class HBaseStore extends DataStoreBase } @SuppressWarnings("unchecked") - private HBaseMapping readMapping(InputStream mappingStream) throws IOException { + private HBaseMapping readMapping(String filename) throws IOException { HBaseMappingBuilder mappingBuilder = new HBaseMappingBuilder(); try { SAXBuilder builder = new SAXBuilder(); - Document doc = builder.build(mappingStream); + Document doc = builder.build(getClass().getClassLoader() + .getResourceAsStream(filename)); Element root = doc.getRootElement(); List tableElements = root.getChildren("table"); @@ -892,7 +890,7 @@ public class HBaseStore extends DataStoreBase LOG.error("Error while trying to read the mapping file {}. " + "Expected to be in the classpath " + "(ClassLoader#getResource(java.lang.String)).", - mappingStream) ; + filename) ; LOG.error("Actual classpath = {}", Arrays.asList( ((URLClassLoader) getClass().getClassLoader()).getURLs())); throw ex ;
[gora] 02/03: Fix mapping file name access method in dynamoDBStore
This is an automated email from the ASF dual-hosted git repository. madhawa pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/gora.git commit 18d95f9b59c7a74be741f400ff97fc2d83b396bc Author: LahiruJayasekara AuthorDate: Sun May 12 13:23:31 2019 +0530 Fix mapping file name access method in dynamoDBStore --- .../main/java/org/apache/gora/dynamodb/store/DynamoDBStore.java | 9 ++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/gora-dynamodb/src/main/java/org/apache/gora/dynamodb/store/DynamoDBStore.java b/gora-dynamodb/src/main/java/org/apache/gora/dynamodb/store/DynamoDBStore.java index e5ba17c..48ecf3a 100644 --- a/gora-dynamodb/src/main/java/org/apache/gora/dynamodb/store/DynamoDBStore.java +++ b/gora-dynamodb/src/main/java/org/apache/gora/dynamodb/store/DynamoDBStore.java @@ -41,6 +41,7 @@ import org.apache.gora.query.PartitionQuery; import org.apache.gora.query.Query; import org.apache.gora.query.Result; import org.apache.gora.store.DataStore; +import org.apache.gora.store.DataStoreFactory; import org.apache.gora.util.GoraException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -226,7 +227,9 @@ public class DynamoDBStore implements DataStore { setDynamoDBClient(DynamoDBUtils.getClient( properties.getProperty(CLI_TYP_PROP), creds)); getDynamoDBClient().setEndpoint(properties.getProperty(ENDPOINT_PROP)); -setDynamoDbMapping(readMapping()); +String mappingFile = DataStoreFactory.getMappingFile(properties, this, +MAPPING_FILE); +setDynamoDbMapping(readMapping(mappingFile)); setConsistency(properties.getProperty(CONSISTENCY_READS)); } @@ -311,14 +314,14 @@ public class DynamoDBStore implements DataStore { * @throws IOException */ @SuppressWarnings("unchecked") - private DynamoDBMapping readMapping() throws IOException { + private DynamoDBMapping readMapping(String filename) throws IOException { DynamoDBMappingBuilder mappingBuilder = new DynamoDBMappingBuilder(); try { SAXBuilder builder = new SAXBuilder(); Document doc = builder.build(getClass().getClassLoader() - .getResourceAsStream(MAPPING_FILE)); + .getResourceAsStream(filename)); if (doc == null || doc.getRootElement() == null) throw new GoraException("Unable to load " + MAPPING_FILE + ". Please check its existance!");
[gora] 03/03: Remove unused imports
This is an automated email from the ASF dual-hosted git repository. madhawa pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/gora.git commit 3f4d474c98c4c4fde94b915d54a60f126448def3 Author: LahiruJayasekara AuthorDate: Sun May 12 13:25:56 2019 +0530 Remove unused imports --- gora-hbase/src/main/java/org/apache/gora/hbase/store/HBaseStore.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/gora-hbase/src/main/java/org/apache/gora/hbase/store/HBaseStore.java b/gora-hbase/src/main/java/org/apache/gora/hbase/store/HBaseStore.java index d16700b..77a30bd 100644 --- a/gora-hbase/src/main/java/org/apache/gora/hbase/store/HBaseStore.java +++ b/gora-hbase/src/main/java/org/apache/gora/hbase/store/HBaseStore.java @@ -22,10 +22,8 @@ import static org.apache.gora.hbase.util.HBaseByteInterface.toBytes; import java.io.FileNotFoundException; import java.io.IOException; -import java.io.InputStream; import java.net.MalformedURLException; import java.net.URLClassLoader; -import java.nio.charset.Charset; import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; @@ -43,7 +41,6 @@ import org.apache.avro.Schema; import org.apache.avro.Schema.Field; import org.apache.avro.Schema.Type; import org.apache.avro.util.Utf8; -import org.apache.commons.io.IOUtils; import org.apache.gora.hbase.query.HBaseGetResult; import org.apache.gora.hbase.query.HBaseQuery; import org.apache.gora.hbase.query.HBaseScannerResult;
[gora] branch FixReadMe created (now 1ef6a8f)
This is an automated email from the ASF dual-hosted git repository. madhawa pushed a change to branch FixReadMe in repository https://gitbox.apache.org/repos/asf/gora.git. at 1ef6a8f Fix gitworkflow in README This branch includes the following new commits: new 1ef6a8f Fix gitworkflow in README The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[gora] 01/01: Fix gitworkflow in README
This is an automated email from the ASF dual-hosted git repository. madhawa pushed a commit to branch FixReadMe in repository https://gitbox.apache.org/repos/asf/gora.git commit 1ef6a8f0610b8549667dd51ed76cfa4148bf8c71 Author: madhawa-gunasekara AuthorDate: Fri Mar 13 20:39:11 2020 +0100 Fix gitworkflow in README --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index e696c10..5beabdb 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ http://gora.apache.org/resources/img/powered-by-gora.png; align="right" width="300" /> -[![CI](https://github.com/apache/gora/workflows/CI/badge.svg?branch=master)](https://github.com/apache/gora/actions?query=workflow%3ACI) +[![build](https://github.com/apache/gora/workflows/build/badge.svg?branch=master)](https://github.com/apache/gora/actions?query=workflow%3Abuild) [![license](https://img.shields.io/github/license/apache/gora.svg?maxAge=2592000?style=plastic)](http://www.apache.org/licenses/LICENSE-2.0) [![Jenkins](https://img.shields.io/jenkins/s/https/builds.apache.org/gora-trunk.svg?maxAge=2592000?style=plastic)](https://builds.apache.org/job/gora-trunk/) [![Jenkins tests](https://img.shields.io/jenkins/t/https/builds.apache.org/gora-trunk.svg?maxAge=2592000?style=plastic)](https://builds.apache.org/job/gora-trunk)
[gora] 01/01: GORA-645 Upgrade MongoDB driver version to 3.12.2
This is an automated email from the ASF dual-hosted git repository. madhawa pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/gora.git commit 3ed6327e447a5c1606d263a161ddc48476614dc6 Merge: 220bb3a 56e6252 Author: Madhawa Gunasekara AuthorDate: Sun Mar 15 19:38:25 2020 +0100 GORA-645 Upgrade MongoDB driver version to 3.12.2 GORA-645 Upgrade MongoDB driver version to 3.12.2 gora-mongodb/pom.xml | 8 -- .../gora/mongodb/filters/DefaultFactoryTest.java | 30 ++ pom.xml| 9 +++ 3 files changed, 29 insertions(+), 18 deletions(-)
[gora] branch master updated (220bb3a -> 3ed6327)
This is an automated email from the ASF dual-hosted git repository. madhawa pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/gora.git. from 220bb3a Merge pull request #203 from madhawa-gunasekara/FixReadMe add 4ff0eb7 GORA-645 Upgrade MongoDB driver version to 3.12.2 add 56e6252 Fix MongoDB Tests Fails new 3ed6327 GORA-645 Upgrade MongoDB driver version to 3.12.2 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: gora-mongodb/pom.xml | 8 -- .../gora/mongodb/filters/DefaultFactoryTest.java | 30 ++ pom.xml| 9 +++ 3 files changed, 29 insertions(+), 18 deletions(-)
[gora] branch master updated (927ccdb -> 588cdc4)
This is an automated email from the ASF dual-hosted git repository. madhawa pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/gora.git. from 927ccdb GORA-643 Upgrade Apache Parent pom version 22 add 7daea67 GORA-654 Upgrade Lucene store to 8.5.0 java driver new 588cdc4 GORA-654 Upgrade Lucene store to 8.5.0 java driver The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[gora] 01/01: GORA-654 Upgrade Lucene store to 8.5.0 java driver
This is an automated email from the ASF dual-hosted git repository. madhawa pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/gora.git commit 588cdc45f91951261ffbaf386590cffe5aeae9df Merge: 927ccdb 7daea67 Author: Madhawa Gunasekara AuthorDate: Tue Mar 31 14:33:41 2020 +0200 GORA-654 Upgrade Lucene store to 8.5.0 java driver GORA-654 Upgrade Lucene store to 8.5.0 java driver pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[gora] 01/01: GORA-643 Upgrade Apache Parent pom version 22
This is an automated email from the ASF dual-hosted git repository. madhawa pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/gora.git commit 927ccdbd66d0dde483e7bac32ec00d1c702b4fa0 Merge: d65aa1f c5515ca Author: Madhawa Gunasekara AuthorDate: Mon Mar 30 12:15:32 2020 +0200 GORA-643 Upgrade Apache Parent pom version 22 GORA-643 Upgrade Apache Parent pom version 22 pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[gora] branch master updated (d65aa1f -> 927ccdb)
This is an automated email from the ASF dual-hosted git repository. madhawa pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/gora.git. from d65aa1f GORA-649 Remove usage of com.mongodb.MongoClient in test code add c5515ca GORA-643 Upgrade Apache Parent pom version 22 new 927ccdb GORA-643 Upgrade Apache Parent pom version 22 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[gora] 01/01: [GORA-655] RethinkDB datastore Implementation
This is an automated email from the ASF dual-hosted git repository. madhawa pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/gora.git commit dff7b93dc68bf9cfaeb1296135eaf3a862117384 Merge: ff64c7e c80d232 Author: Madhawa Gunasekara AuthorDate: Wed Oct 14 23:53:28 2020 +0200 [GORA-655] RethinkDB datastore Implementation [GORA-655] RethinkDB datastore Implementation gora-rethinkdb/pom.xml | 146 .../org/apache/gora/rethinkdb/package-info.java| 19 + .../gora/rethinkdb/query/RethinkDBQuery.java | 99 +++ .../gora/rethinkdb/query/RethinkDBResult.java | 96 +++ .../apache/gora/rethinkdb/query/package-info.java | 19 + .../gora/rethinkdb/store/RethinkDBMapping.java | 116 +++ .../rethinkdb/store/RethinkDBMappingBuilder.java | 119 .../gora/rethinkdb/store/RethinkDBStore.java | 774 + .../rethinkdb/store/RethinkDBStoreParameters.java | 94 +++ .../apache/gora/rethinkdb/store/package-info.java | 19 + .../apache/gora/rethinkdb/RethinkDBTestDriver.java | 85 +++ .../org/apache/gora/rethinkdb/package-info.java| 19 + .../store/RethinkDBGoraDataStoreTest.java | 78 +++ .../store/RethinkDBStartupWaitStrategy.java| 52 ++ .../apache/gora/rethinkdb/store/package-info.java | 19 + .../src/test/resources/gora-rethinkdb-mapping.xml | 46 ++ gora-rethinkdb/src/test/resources/gora.properties | 21 + pom.xml| 11 + 18 files changed, 1832 insertions(+)
[gora] branch master updated (ff64c7e -> dff7b93)
This is an automated email from the ASF dual-hosted git repository. madhawa pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/gora.git. from ff64c7e Merge pull request #224 from podorvanova/document-gora-compiler add a1efada GORA-655 Initial commit for RethinkDB datastore add 1ccae46 Fix container variable names add c80d232 Add RethinkDB query execution new dff7b93 [GORA-655] RethinkDB datastore Implementation The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: {gora-jcache => gora-rethinkdb}/pom.xml| 57 +- .../org/apache/gora/rethinkdb}/package-info.java | 8 +- .../gora/rethinkdb/query/RethinkDBQuery.java | 99 +++ .../gora/rethinkdb/query/RethinkDBResult.java | 63 +- .../apache/gora/rethinkdb/query}/package-info.java | 8 +- .../gora/rethinkdb/store/RethinkDBMapping.java | 93 +-- .../rethinkdb/store/RethinkDBMappingBuilder.java | 26 +- .../gora/rethinkdb/store/RethinkDBStore.java | 774 + .../rethinkdb/store/RethinkDBStoreParameters.java | 94 +++ .../apache/gora/rethinkdb/store}/package-info.java | 8 +- .../apache/gora/rethinkdb/RethinkDBTestDriver.java | 61 +- .../org/apache/gora/rethinkdb}/package-info.java | 8 +- .../store/RethinkDBGoraDataStoreTest.java | 29 +- .../store/RethinkDBStartupWaitStrategy.java| 11 +- .../apache/gora/rethinkdb/store}/package-info.java | 8 +- .../src/test/resources/gora-rethinkdb-mapping.xml | 12 +- .../src/test/resources}/gora.properties| 9 +- pom.xml| 11 + 18 files changed, 1137 insertions(+), 242 deletions(-) copy {gora-jcache => gora-rethinkdb}/pom.xml (81%) copy {gora-hive/src/main/java/org/apache/gora/hive => gora-rethinkdb/src/main/java/org/apache/gora/rethinkdb}/package-info.java (89%) create mode 100644 gora-rethinkdb/src/main/java/org/apache/gora/rethinkdb/query/RethinkDBQuery.java copy gora-orientdb/src/main/java/org/apache/gora/orientdb/query/OrientDBResult.java => gora-rethinkdb/src/main/java/org/apache/gora/rethinkdb/query/RethinkDBResult.java (52%) copy {gora-hive/src/main/java/org/apache/gora/hive => gora-rethinkdb/src/main/java/org/apache/gora/rethinkdb/query}/package-info.java (89%) copy gora-orientdb/src/main/java/org/apache/gora/orientdb/store/OrientDBMapping.java => gora-rethinkdb/src/main/java/org/apache/gora/rethinkdb/store/RethinkDBMapping.java (53%) copy gora-orientdb/src/main/java/org/apache/gora/orientdb/store/OrientDBMappingBuilder.java => gora-rethinkdb/src/main/java/org/apache/gora/rethinkdb/store/RethinkDBMappingBuilder.java (83%) create mode 100644 gora-rethinkdb/src/main/java/org/apache/gora/rethinkdb/store/RethinkDBStore.java create mode 100644 gora-rethinkdb/src/main/java/org/apache/gora/rethinkdb/store/RethinkDBStoreParameters.java copy {gora-hive/src/main/java/org/apache/gora/hive => gora-rethinkdb/src/main/java/org/apache/gora/rethinkdb/store}/package-info.java (89%) copy gora-aerospike/src/test/java/org/apache/gora/aerospike/GoraAerospikeTestDriver.java => gora-rethinkdb/src/test/java/org/apache/gora/rethinkdb/RethinkDBTestDriver.java (53%) copy {gora-hive/src/main/java/org/apache/gora/hive => gora-rethinkdb/src/test/java/org/apache/gora/rethinkdb}/package-info.java (89%) copy gora-orientdb/src/test/java/org/apache/gora/orientdb/store/OrientDBGoraDataStoreTest.java => gora-rethinkdb/src/test/java/org/apache/gora/rethinkdb/store/RethinkDBGoraDataStoreTest.java (63%) copy gora-aerospike/src/test/java/org/apache/gora/aerospike/store/AerospikeStartupLogWaitStrategy.java => gora-rethinkdb/src/test/java/org/apache/gora/rethinkdb/store/RethinkDBStartupWaitStrategy.java (82%) copy {gora-hive/src/main/java/org/apache/gora/hive => gora-rethinkdb/src/test/java/org/apache/gora/rethinkdb/store}/package-info.java (89%) copy gora-mongodb/src/test/conf/gora-mongodb-mapping.xml => gora-rethinkdb/src/test/resources/gora-rethinkdb-mapping.xml (85%) copy {gora-aerospike/src/test/conf => gora-rethinkdb/src/test/resources}/gora.properties (77%)
[gora] branch master updated: GORA-658 Upgrade Cassandra driver version
This is an automated email from the ASF dual-hosted git repository. madhawa 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 77aaf1b GORA-658 Upgrade Cassandra driver version new 28168c3 Merge pull request #213 from arnenissen/master 77aaf1b is described below commit 77aaf1b5935d429aac92d66c3328eb8618d1c4e3 Author: arnenissen AuthorDate: Fri May 29 14:03:15 2020 +0200 GORA-658 Upgrade Cassandra driver version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 541540c..a9a1e57 100755 --- a/pom.xml +++ b/pom.xml @@ -822,7 +822,7 @@ 1.10.55 -3.3.0 +3.9.0 3.11.0 2.6.0
[gora] branch master updated: GORA-660 upgrade hive version to the latest
This is an automated email from the ASF dual-hosted git repository. madhawa 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 75d85e2 GORA-660 upgrade hive version to the latest new f202e4d Merge pull request #215 from rumesh-perera/GORA-660 75d85e2 is described below commit 75d85e268fcdb868697de10e16366a06e5c66236 Author: rumesh-perera AuthorDate: Sat May 30 03:35:57 2020 +0530 GORA-660 upgrade hive version to the latest --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 541540c..e2af7eb 100755 --- a/pom.xml +++ b/pom.xml @@ -874,7 +874,7 @@ 5.3.0 20180813 -2.3.5 +2.3.7 2.6.0
[gora] branch master updated: GORA-430 Address use of deprecated API's
This is an automated email from the ASF dual-hosted git repository. madhawa 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 8b05230 GORA-430 Address use of deprecated API's new 2819737 Merge pull request #223 from podorvanova/address-use-of-deprecated-apis 8b05230 is described below commit 8b052303a069d63e36c11c6e0c917c17466f3d0b Author: Maria Podorvanova AuthorDate: Thu Oct 8 15:13:21 2020 +1100 GORA-430 Address use of deprecated API's --- .../gora/cassandra/store/CassandraClient.java | 48 -- .../cassandra/store/CassandraStoreParameters.java | 9 +--- .../org/apache/gora/compiler/GoraCompiler.java | 7 ++-- .../apache/gora/couchdb/store/CouchDBStore.java| 2 +- .../java/org/apache/gora/goraci/Generator.java | 6 +-- .../main/java/org/apache/gora/goraci/Verify.java | 2 +- .../gora/goraci/chef/ChefSoftwareProvisioning.java | 15 +++ .../goraci/rackspace/RackspaceOrchestration.java | 1 - .../apache/gora/infinispan/SimulationDriver.java | 1 - .../org/apache/gora/tutorial/log/LogAnalytics.java | 2 +- 10 files changed, 27 insertions(+), 66 deletions(-) diff --git a/gora-cassandra/src/main/java/org/apache/gora/cassandra/store/CassandraClient.java b/gora-cassandra/src/main/java/org/apache/gora/cassandra/store/CassandraClient.java index aeda495..f0cb738 100644 --- a/gora-cassandra/src/main/java/org/apache/gora/cassandra/store/CassandraClient.java +++ b/gora-cassandra/src/main/java/org/apache/gora/cassandra/store/CassandraClient.java @@ -30,7 +30,6 @@ import com.datastax.driver.core.TypeCodec; import com.datastax.driver.core.policies.ConstantReconnectionPolicy; import com.datastax.driver.core.policies.DCAwareRoundRobinPolicy; import com.datastax.driver.core.policies.DefaultRetryPolicy; -import com.datastax.driver.core.policies.DowngradingConsistencyRetryPolicy; import com.datastax.driver.core.policies.ExponentialReconnectionPolicy; import com.datastax.driver.core.policies.FallthroughRetryPolicy; import com.datastax.driver.core.policies.LatencyAwarePolicy; @@ -276,24 +275,12 @@ public class CassandraClient { break; case "DCAwareRoundRobinPolicy": { String dataCenter = properties.getProperty(CassandraStoreParameters.DATA_CENTER); - boolean allowRemoteDCsForLocalConsistencyLevel = Boolean.parseBoolean( - properties.getProperty(CassandraStoreParameters.ALLOW_REMOTE_DCS_FOR_LOCAL_CONSISTENCY_LEVEL)); if (dataCenter != null && !dataCenter.isEmpty()) { -if (allowRemoteDCsForLocalConsistencyLevel) { - builder = builder.withLoadBalancingPolicy( - DCAwareRoundRobinPolicy.builder().withLocalDc(dataCenter) - .allowRemoteDCsForLocalConsistencyLevel().build()); -} else { - builder = builder.withLoadBalancingPolicy( - DCAwareRoundRobinPolicy.builder().withLocalDc(dataCenter).build()); -} +builder = builder.withLoadBalancingPolicy( + DCAwareRoundRobinPolicy.builder().withLocalDc(dataCenter).build()); } else { -if (allowRemoteDCsForLocalConsistencyLevel) { - builder = builder.withLoadBalancingPolicy( - (DCAwareRoundRobinPolicy.builder().allowRemoteDCsForLocalConsistencyLevel().build())); -} else { - builder = builder.withLoadBalancingPolicy((DCAwareRoundRobinPolicy.builder().build())); -} +builder = builder.withLoadBalancingPolicy( +(DCAwareRoundRobinPolicy.builder().build())); } break; } @@ -302,25 +289,12 @@ public class CassandraClient { break; case "TokenAwareDCAwareRoundRobinPolicy": { String dataCenter = properties.getProperty(CassandraStoreParameters.DATA_CENTER); - boolean allowRemoteDCsForLocalConsistencyLevel = Boolean.parseBoolean( - properties.getProperty(CassandraStoreParameters.ALLOW_REMOTE_DCS_FOR_LOCAL_CONSISTENCY_LEVEL)); if (dataCenter != null && !dataCenter.isEmpty()) { -if (allowRemoteDCsForLocalConsistencyLevel) { - builder = builder.withLoadBalancingPolicy(new TokenAwarePolicy( - DCAwareRoundRobinPolicy.builder().withLocalDc(dataCenter) - .allowRemoteDCsForLocalConsistencyLevel().build())); -} else { - builder = builder.withLoadBalancingPolicy(new TokenAwarePolicy( - DCAwareRoundRobinPolicy.builder().withLocalDc(dataCenter).build())); -} +builder = builder.withLoadBalancingPolicy(new TokenAwarePolicy( + DCAwareRoundRobinPolicy.bui
[gora] branch master updated (7bb1e5a -> 3d8d9b3)
This is an automated email from the ASF dual-hosted git repository. madhawa pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/gora.git. from 7bb1e5a Merge pull request #214 from arnenissen/mongo new 9376adf GORA-653 Upgrade solr java driver to version 8.5.0 new e7b6298 Merge branch 'master' of https://github.com/apache/gora into GORA-653 new 3d8d9b3 Merge pull request #212 from rumesh-perera/GORA-653 The 1325 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: gora-solr/pom.xml | 2 +- pom.xml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-)
[gora] 01/01: Merge pull request #217 from apache/revert-212-GORA-653
This is an automated email from the ASF dual-hosted git repository. madhawa pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/gora.git commit 88a1819c1bc86e65e95b1c0fd92db33273eab71a Merge: 3d8d9b3 eb21056 Author: Madhawa Gunasekara AuthorDate: Fri Jun 19 16:06:30 2020 +0200 Merge pull request #217 from apache/revert-212-GORA-653 Revert "GORA-653 Upgrade solr java driver to version 8.5.0" gora-solr/pom.xml | 2 +- pom.xml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-)
[gora] branch master updated (3d8d9b3 -> 88a1819)
This is an automated email from the ASF dual-hosted git repository. madhawa pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/gora.git. from 3d8d9b3 Merge pull request #212 from rumesh-perera/GORA-653 add eb21056 Revert "GORA-653 Upgrade solr java driver to version 8.5.0" new 88a1819 Merge pull request #217 from apache/revert-212-GORA-653 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: gora-solr/pom.xml | 2 +- pom.xml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-)
[gora] 01/01: Revert "GORA-653 Upgrade solr java driver to version 8.5.0"
This is an automated email from the ASF dual-hosted git repository. madhawa pushed a commit to branch revert-212-GORA-653 in repository https://gitbox.apache.org/repos/asf/gora.git commit eb21056d9de8cfb48fc6b4881f860603c610cd51 Author: Madhawa Gunasekara AuthorDate: Fri Jun 19 16:06:17 2020 +0200 Revert "GORA-653 Upgrade solr java driver to version 8.5.0" --- gora-solr/pom.xml | 2 +- pom.xml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gora-solr/pom.xml b/gora-solr/pom.xml index b278a29..e488c61 100644 --- a/gora-solr/pom.xml +++ b/gora-solr/pom.xml @@ -52,7 +52,7 @@ * org.apache.gora.solr*;version="${project.version}";-noimport:=true -9.4.27.v20200227 +9.4.14.v20181114 diff --git a/pom.xml b/pom.xml index 68fb669..b329f8f 100755 --- a/pom.xml +++ b/pom.xml @@ -833,10 +833,10 @@ 1.9.0 8.5.0 -8.5.0 -9.4.27.v20200227 +8.0.0 +9.4.14.v20181114 1.12 -4.5.10 +4.5.6 2.5 2.3.1
[gora] branch revert-212-GORA-653 created (now eb21056)
This is an automated email from the ASF dual-hosted git repository. madhawa pushed a change to branch revert-212-GORA-653 in repository https://gitbox.apache.org/repos/asf/gora.git. at eb21056 Revert "GORA-653 Upgrade solr java driver to version 8.5.0" This branch includes the following new commits: new eb21056 Revert "GORA-653 Upgrade solr java driver to version 8.5.0" The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[gora] branch master updated (7f19ab9 -> 7bb1e5a)
This is an automated email from the ASF dual-hosted git repository. madhawa pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/gora.git. from 7f19ab9 Merge pull request #216 from rumesh-perera/GORA-661 new 3ba38f0 GORA-659 Upgrade mongodb drvier version new 7bb1e5a Merge pull request #214 from arnenissen/mongo The 1322 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[gora] branch master updated: GORA-661 Upgrade CouchDB module to the latest driver
This is an automated email from the ASF dual-hosted git repository. madhawa 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 5dd382a GORA-661 Upgrade CouchDB module to the latest driver new 7f19ab9 Merge pull request #216 from rumesh-perera/GORA-661 5dd382a is described below commit 5dd382a1340aea246f50452170377d9c5d808b86 Author: rumesh-perera AuthorDate: Mon Jun 1 01:17:47 2020 +0530 GORA-661 Upgrade CouchDB module to the latest driver --- gora-couchdb/pom.xml | 23 - .../couchdb/CouchDBStartupLogWaitStrategy.java | 60 ++ .../gora/couchdb/store/TestCouchDBStore.java | 12 +++-- pom.xml| 2 +- 4 files changed, 69 insertions(+), 28 deletions(-) diff --git a/gora-couchdb/pom.xml b/gora-couchdb/pom.xml index df464b7..24f5355 100644 --- a/gora-couchdb/pom.xml +++ b/gora-couchdb/pom.xml @@ -54,24 +54,6 @@ org.apache.gora.couchdb*;version="${project.version}";-noimport:=true - - - couchdb-with-test - - - -org.apache.maven.plugins -maven-surefire-plugin -2.4.2 - - false - - - - - - - target target/classes @@ -92,9 +74,6 @@ org.apache.maven.plugins maven-surefire-plugin 2.4.2 - - true - org.codehaus.mojo @@ -151,10 +130,8 @@ org.ektorp org.ektorp - 1.4.2 - org.apache.avro avro diff --git a/gora-couchdb/src/test/java/org/apache/gora/couchdb/CouchDBStartupLogWaitStrategy.java b/gora-couchdb/src/test/java/org/apache/gora/couchdb/CouchDBStartupLogWaitStrategy.java new file mode 100644 index 000..7cd06cf --- /dev/null +++ b/gora-couchdb/src/test/java/org/apache/gora/couchdb/CouchDBStartupLogWaitStrategy.java @@ -0,0 +1,60 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.gora.couchdb; + +import org.testcontainers.containers.ContainerLaunchException; +import org.testcontainers.containers.GenericContainer; +import org.testcontainers.containers.output.OutputFrame; +import org.testcontainers.containers.output.WaitingConsumer; + +import java.util.concurrent.TimeUnit; +import java.util.concurrent.TimeoutException; +import java.util.function.Predicate; + +/** + * Log based CouchDB server startup wait strategy to sync server + * startup to test suit startup. + */ +public class CouchDBStartupLogWaitStrategy extends GenericContainer.AbstractWaitStrategy { + + private static final String regEx = ".*Apache CouchDB has started. Time to relax..*"; + + private int times = 1; + + protected void waitUntilReady() { +WaitingConsumer waitingConsumer = new WaitingConsumer(); +this.container.followOutput(waitingConsumer); +Predicate waitPredicate = (outputFrame) -> { + String trimmedFrameText = ((OutputFrame) outputFrame) + .getUtf8String() + .replaceFirst("\n$", ""); + return trimmedFrameText.matches(regEx); +}; + +try { + waitingConsumer.waitUntil(waitPredicate, this.startupTimeout.getSeconds(), TimeUnit.SECONDS, + this.times); +} catch (TimeoutException var4) { + throw new ContainerLaunchException( + "Timed out waiting for log output matching CouchDB server startup Log \'" + regEx + + "\'"); +} + } + +} \ No newline at end of file diff --git a/gora-couchdb/src/test/java/org/apache/gora/couchdb/store/TestCouchDBStore.java b/gora-couchdb/src/test/java/org/apache/gora/couchdb/store/TestCouchDBStore.java index ffcd0dd..da6996f 100644 --- a/gora-couchdb/src/test/java/org/apache/gora/couchdb/store/TestCouchDBStore.java +++ b/gora-couchdb/src/test/java/org/apache/gora/couchdb/store/TestCouchDBStore.java @@ -17,13 +17,12 @@ package org.apache.gora.couchdb.store; import org.apache.avr
[gora] 01/01: GORA-676 Upgrade Aerospike 5.0.6
This is an automated email from the ASF dual-hosted git repository. madhawa pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/gora.git commit cd28146e4b4ad59587f2ad4c2748905954f837d8 Merge: d265e86 718dd30 Author: Madhawa Gunasekara AuthorDate: Sun Jun 6 20:05:01 2021 +0530 GORA-676 Upgrade Aerospike 5.0.6 GORA-676 Upgrade Aerospike 5.0.6 .../aerospike/store/AerospikeMappingBuilder.java | 52 -- .../gora/aerospike/store/AerospikePolicyConst.java | 4 +- .../mapreduce/TestAerospikeStoreCountQuery.java| 2 +- .../TestAerospikeStoreMapReduceSerialization.java | 2 +- .../mapreduce/TestAerospikeStoreWordCount.java | 2 +- .../gora/aerospike/store/TestAerospikeStore.java | 2 +- pom.xml| 2 +- 7 files changed, 36 insertions(+), 30 deletions(-)
[gora] branch master updated (d265e86 -> cd28146)
This is an automated email from the ASF dual-hosted git repository. madhawa pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/gora.git. from d265e86 Delete .travis.yml add 718dd30 GORA-676 Upgrade Aerospike 5.0.6 new cd28146 GORA-676 Upgrade Aerospike 5.0.6 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../aerospike/store/AerospikeMappingBuilder.java | 52 -- .../gora/aerospike/store/AerospikePolicyConst.java | 4 +- .../mapreduce/TestAerospikeStoreCountQuery.java| 2 +- .../TestAerospikeStoreMapReduceSerialization.java | 2 +- .../mapreduce/TestAerospikeStoreWordCount.java | 2 +- .../gora/aerospike/store/TestAerospikeStore.java | 2 +- pom.xml| 2 +- 7 files changed, 36 insertions(+), 30 deletions(-)
[gora] branch master updated (ffc3a13 -> 4a9394e)
This is an automated email from the ASF dual-hosted git repository. madhawa pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/gora.git. from ffc3a13 GORA-664 Fix testcases / formatting (#247) add 6aaf2c8 GORA-677 Upgrade Ignite version 2.10.0 new 4a9394e GORA-677 Upgrade Ignite version 2.10.0 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[gora] 01/01: GORA-677 Upgrade Ignite version 2.10.0
This is an automated email from the ASF dual-hosted git repository. madhawa pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/gora.git commit 4a9394ecf8e91fc644a8f1103783ef3804f15312 Merge: ffc3a13 6aaf2c8 Author: Madhawa Gunasekara AuthorDate: Wed Aug 11 22:38:39 2021 +0200 GORA-677 Upgrade Ignite version 2.10.0 GORA-677 Upgrade Ignite version 2.10.0 pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[gora] 01/01: Update mongodb driver version to 3.12.8
This is an automated email from the ASF dual-hosted git repository. madhawa pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/gora.git commit 3da368d4d46aaaded5543d01342abb3a49cd4d53 Merge: 4a9394e d926947 Author: Madhawa Gunasekara AuthorDate: Wed Aug 11 22:39:40 2021 +0200 Update mongodb driver version to 3.12.8 Update mongodb driver version to 3.12.8 pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[gora] branch master updated (4a9394e -> 3da368d)
This is an automated email from the ASF dual-hosted git repository. madhawa pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/gora.git. from 4a9394e GORA-677 Upgrade Ignite version 2.10.0 add d926947 Update mongodb driver version to 3.12.8 new 3da368d Update mongodb driver version to 3.12.8 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[gora] 01/01: Upgrade Cassandra driver version
This is an automated email from the ASF dual-hosted git repository. madhawa pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/gora.git commit e779d7c48c934bd1cbdd382c0746ef90c95aa78a Merge: 44ecabb2 f78de95c Author: Madhawa Gunasekara AuthorDate: Tue Apr 19 04:01:43 2022 +0200 Upgrade Cassandra driver version Upgrade Cassandra driver version pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[gora] branch master updated (44ecabb2 -> e779d7c4)
This is an automated email from the ASF dual-hosted git repository. madhawa pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/gora.git from 44ecabb2 Update master-pr-build.yml add f78de95c Upgrade cassandra driver version new e779d7c4 Upgrade Cassandra driver version The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[gora] branch master updated (e779d7c4 -> acdb7f4d)
This is an automated email from the ASF dual-hosted git repository. madhawa pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/gora.git from e779d7c4 Upgrade Cassandra driver version new cb8e6ba6 GORA-692 Upgrade MongoDB java driver new e2ef9987 Merge branch 'master' of https://github.com/apache/gora into GORA-692 new 056eb7d5 Fix merge conflicts new acdb7f4d Merge pull request #254 from trisha-melani/GORA-692 The 1393 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[gora] branch master updated: GORA-691 upgrade Lucene driver
This is an automated email from the ASF dual-hosted git repository. madhawa 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 b04a2398 GORA-691 upgrade Lucene driver new 4672568e Merge pull request #253 from trisha-melani/GORA-691 b04a2398 is described below commit b04a239866d010d4850e6558f435c9cb1009f13c Author: trisha-melani AuthorDate: Fri Nov 5 00:06:28 2021 +0530 GORA-691 upgrade Lucene driver --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b3b27f9b..304f4009 100755 --- a/pom.xml +++ b/pom.xml @@ -847,7 +847,7 @@ 1.9.0 -8.5.0 +8.10.1 8.0.0 9.4.14.v20181114 1.12