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 <[email protected]>
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>

Reply via email to