Bump jaydebeapi and jpype1 (#6963)

* Bump jaydebeapi and jpype1
* Add gcc and g++ to -jdbc docker image

datadog_checks_base/datadog_checks/base/data/agent_requirements.in

@@ -20,8 +20,10 @@ futures==3.3.0; python_version < '3.0'
 gearman==2.0.2; sys_platform != 'win32' and python_version < '3.0'
 in-toto==0.4.2
 ipaddress==1.0.22; python_version < '3.0'
-jaydebeapi==1.1.1
-jpype1==0.7.0
+jaydebeapi==1.2.3
+jpype1==0.7.1 ; python_version <= '2.7'
+# 0.7.1 version breaks in py3 but is the latest py2 compatible version
+jpype1==1.0.2 ; python_version > '3'
 kafka-python==2.0.0
 kazoo==2.6.1; sys_platform != 'win32'
 kubernetes==8.0.1

oracle/requirements.in

@@ -1,3 +1,5 @@
 cx-oracle==7.2.0
-jaydebeapi==1.1.1
-jpype1==0.7.0
+jaydebeapi==1.2.3
+# 0.7.1 version breaks in py3 but is the latest py2 compatible version
+jpype1==0.7.1 ; python_version <= '2.7'
+jpype1==1.0.2 ; python_version > '3'

oracle/tests/conftest.py

@@ -25,6 +25,7 @@
     'start_commands': [
         'bash /tmp/install_instant_client.sh',
         'apt-get install libaio1',  # `apt-get update` already ran in install_instant_client.sh
+        'apt-get install gcc g++ -y',
     ],
     'env_vars': {'LD_LIBRARY_PATH': '/opt/oracle/instantclient_19_3'},
 }
@@ -34,7 +35,10 @@
     # the integration will fallback to JDBC client
     'use_jmx': True,  # Using jmx to have a ready to use java runtime
     'docker_volumes': ['{}/scripts/install_instant_client.sh:/tmp/install_instant_client.sh'.format(HERE)],
-    'start_commands': ['bash /tmp/install_instant_client.sh'],
+    'start_commands': [
+        'bash /tmp/install_instant_client.sh',
+        'apt-get install gcc g++ -y',  # `apt-get update` already ran in install_instant_client.sh
+    ],
 }