Skip to content

Commit 0f02480

Browse files
committed
Merge branch '3.7-dev' into 3.8-dev
2 parents 9509d4f + f4516e4 commit 0f02480

2 files changed

Lines changed: 8 additions & 1 deletion

File tree

gremlin-console/src/test/python/setup.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
tests_require=[
3333
'pytest>=6.2.5,<8.0.0',
3434
'mock>=3.0.5,<4.0.0',
35+
'more-itertools<11.0.0',
3536
'pexpect==4.8.0'
3637
]
3738
)

pom.xml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -785,7 +785,13 @@ limitations under the License.
785785
<dependency>
786786
<groupId>commons-beanutils</groupId>
787787
<artifactId>commons-beanutils</artifactId>
788-
<version>1.9.4</version>
788+
<version>1.11.0</version>
789+
<exclusions>
790+
<exclusion>
791+
<groupId>commons-logging</groupId>
792+
<artifactId>commons-logging</artifactId>
793+
</exclusion>
794+
</exclusions>
789795
</dependency>
790796
<dependency>
791797
<groupId>commons-collections</groupId>

0 commit comments

Comments
 (0)