Merge remote-tracking branch 'origin/main' into hchavda_resolve_merge…

…_conflicts
splunk-soar-connectors · Apr 3, 2024 · b018ee6 · b018ee6
2 parents 01b71fc + 1b3988a
commit b018ee6
Show file tree

Hide file tree

Showing 10 changed files with 1 addition and 25 deletions.
diff --git a/LICENSE b/LICENSE
@@ -198,4 +198,4 @@
    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.
+   limitations under the License.
diff --git a/junipersrx.json b/junipersrx.json
@@ -519,14 +519,6 @@
                 "module": "PyNaCl",
                 "input_file": "wheels/py36/PyNaCl-1.5.0-cp36-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"
             },
-            {
-                "module": "bcrypt",
-                "input_file": "wheels/py36/bcrypt-4.0.1-cp36-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"
-            },
-            {
-                "module": "cffi",
-                "input_file": "wheels/py36/cffi-1.15.1-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl"
-            },
             {
                 "module": "decorator",
                 "input_file": "wheels/py3/decorator-5.1.1-py3-none-any.whl"
@@ -551,10 +543,6 @@
                 "module": "ply",
                 "input_file": "wheels/shared/ply-3.11-py2.py3-none-any.whl"
             },
-            {
-                "module": "pycparser",
-                "input_file": "wheels/shared/pycparser-2.21-py2.py3-none-any.whl"
-            },
             {
                 "module": "setuptools",
                 "input_file": "wheels/py3/setuptools-59.6.0-py3-none-any.whl"
@@ -579,14 +567,6 @@
                 "module": "PyNaCl",
                 "input_file": "wheels/py36/PyNaCl-1.5.0-cp36-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"
             },
-            {
-                "module": "bcrypt",
-                "input_file": "wheels/py39/bcrypt-4.1.2-cp39-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"
-            },
-            {
-                "module": "cffi",
-                "input_file": "wheels/py39/cffi-1.16.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"
-            },
             {
                 "module": "decorator",
                 "input_file": "wheels/py3/decorator-5.1.1-py3-none-any.whl"
@@ -611,10 +591,6 @@
                 "module": "ply",
                 "input_file": "wheels/shared/ply-3.11-py2.py3-none-any.whl"
             },
-            {
-                "module": "pycparser",
-                "input_file": "wheels/shared/pycparser-2.21-py2.py3-none-any.whl"
-            },
             {
                 "module": "setuptools",
                 "input_file": "wheels/py3/setuptools-69.2.0-py3-none-any.whl"

diff --git a/wheels/py3/setuptools-69.0.2-py3-none-any.whl b/wheels/py3/setuptools-69.0.2-py3-none-any.whl
diff --git a/wheels/py36/bcrypt-4.0.1-cp36-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl b/wheels/py36/bcrypt-4.0.1-cp36-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl
diff --git a/...36m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl b/...36m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl
diff --git a/...xml-4.9.3-cp36-cp36m-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl b/...xml-4.9.3-cp36-cp36m-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl
diff --git a/wheels/py39/bcrypt-4.1.2-cp39-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl b/wheels/py39/bcrypt-4.1.2-cp39-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl
diff --git a/wheels/py39/cffi-1.16.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl b/wheels/py39/cffi-1.16.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl
diff --git a/...lxml-4.9.3-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl b/...lxml-4.9.3-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl
diff --git a/wheels/shared/pycparser-2.21-py2.py3-none-any.whl b/wheels/shared/pycparser-2.21-py2.py3-none-any.whl