Skip to content

Commit

Permalink
Merge branch 'develop' into CrowdStrike_Alert
Browse files Browse the repository at this point in the history
  • Loading branch information
DerekRushton authored Aug 19, 2024
2 parents e647ebf + 134462d commit 9c02d98
Show file tree
Hide file tree
Showing 31 changed files with 14,377 additions and 5 deletions.
10 changes: 10 additions & 0 deletions .contrast-scan.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"excludes": [
"**/test/**",
"**/tests/**",
"**/deployment/**",
"**/scripts/changelog_generator/**",
"**/scripts/mysql_populate_script/**",
"**/scripts/supported_property_exporter.py"
]
}
23 changes: 23 additions & 0 deletions AUTHORS.MD
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
Project Authors
===============

A project made in collaboration with the OCA project and IBM Canada.

## Current Maintainers

## Connector Factory Developers- Fredericton (NB)

Derek Rushton - Developer - Fredericton (NB)
Eric Larsen - Developer - Fredericton (NB)
Ben Craig - Developer - Fredericton (NB)

## All other contributors and their affiliations:

## Connector Factory (former) - Fredericton (NB)

Danny Elliot - Developer(Maintainer) - Fredericton (NB)
Md Azam - Developer(Maintainer) - Fredericton (NB)
Arthur Muradyan - Developer - Frederiction (NB)
Omkar Gurav - Developer - Frederiction (NB)

## Special thanks to
1 change: 1 addition & 0 deletions catalog-info.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ metadata:
- interoperability
annotations:
github.com/project-slug: opencybersecurityalliance/stix-shifter
jira/component: "Connector Factory"
backstage.io/techdocs-ref: dir:.
spec:
type: library
Expand Down
5 changes: 2 additions & 3 deletions deployment/ibm_cloud_pak_for_security/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
FROM registry.access.redhat.com/ubi8/ubi-minimal
FROM registry.access.redhat.com/ubi9/ubi-minimal
ARG APP
ARG VERSION

USER root

RUN microdnf update -y && rm -fr /var/cache/yum && \
microdnf update -y gnutls systemd kernel-headers && \
microdnf install --nodocs python3 python3-devel unzip openssl && \
microdnf install -y --nodocs python3 unzip openssl python3-pip && \
rm -fr /var/cache/yum && microdnf update -y && rm -rf /var/cache/yum && \
microdnf clean all

Expand Down
1 change: 0 additions & 1 deletion stix_shifter/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ jsonmerge==1.9.2
numpy==1.24.4
pyOpenSSL==24.1.0
python-dateutil==2.8.2
requests_toolbelt==0.10.1
stix2-matcher==3.0.0
stix2-patterns==1.3.2
xmltodict==0.13.0
Expand Down
Loading

0 comments on commit 9c02d98

Please sign in to comment.