You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@tinkerpop.apache.org by va...@apache.org on 2022/10/21 18:33:48 UTC

[tinkerpop] branch master updated (fec78da471 -> f9f8bca06f)

This is an automated email from the ASF dual-hosted git repository.

valentyn pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git


    from fec78da471 Merge branch '3.6-dev'
     add 8947af0dda #2815 commons.text version 1.10.0
     add b694a2d44b Merge pull request #1832 from acoady/2815_3.5-dev
     add 06e8cc6a69 resolve merge conflict
     new f9f8bca06f resolve merge conflict

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(-)

[tinkerpop] 01/01: resolve merge conflict

Posted by va...@apache.org.

This is an automated email from the ASF dual-hosted git repository.

valentyn pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git

commit f9f8bca06f0833a29eb1911bae84d66b3e30433d
Merge: fec78da471 06e8cc6a69
Author: Valentyn Kahamlyk <va...@bitquilltech.com>
AuthorDate: Fri Oct 21 11:32:48 2022 -0700

    resolve merge conflict

 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --cc pom.xml
index bf19b841e9,578a74bac3..a8ec2beed5
--- a/pom.xml
+++ b/pom.xml
@@@ -156,8 -156,8 +156,8 @@@ limitations under the License
          <commons.configuration.version>2.8.0</commons.configuration.version>
          <commons.lang.version>2.6</commons.lang.version>
          <commons.io.version>2.8.0</commons.io.version>
 -        <commons.lang3.version>3.11</commons.lang3.version>
 +        <commons.lang3.version>3.12.0</commons.lang3.version>
-         <commons.text.version>1.9</commons.text.version>
+         <commons.text.version>1.10.0</commons.text.version>
          <cucumber.version>6.11.0</cucumber.version>
          <exp4j.version>0.4.8</exp4j.version>
          <groovy.version>2.5.18</groovy.version>