Skip to content

Commit

Permalink
code changes in branch 5.0 (#538)
Browse files Browse the repository at this point in the history
  • Loading branch information
conker84 authored Oct 7, 2022
1 parent 6bfff36 commit 8f2dd69
Show file tree
Hide file tree
Showing 140 changed files with 530 additions and 17,072 deletions.
3 changes: 3 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,19 @@ jobs:

steps:
- uses: actions/checkout@v2

- name: Set up JDK 11
uses: actions/setup-java@v1
with:
java-version: 11

- name: Cache Maven packages
uses: actions/cache@v1
with:
path: ~/.m2
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
restore-keys: ${{ runner.os }}-m2

- name: Build with Maven
env:
# needed for excluding enterprise tests
Expand Down
30 changes: 30 additions & 0 deletions .github/workflows/cve.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
name: CVE Scanning with Trivy

on:
push:
branches: [ '**' ]
pull_request:
branches: [ '**' ]

jobs:
build:
name: Build
runs-on: ubuntu-20.04
steps:
- name: Checkout code
uses: actions/checkout@v3

- name: Run Trivy vulnerability scanner in repo mode
uses: aquasecurity/trivy-action@master
with:
scan-type: 'fs'
ignore-unfixed: true
format: 'sarif'
output: 'trivy-results.sarif'
skip-dirs: 'doc'
# severity: 'CRITICAL'

- name: Upload Trivy scan results to GitHub Security tab
uses: github/codeql-action/upload-sarif@v2
with:
sarif_file: 'trivy-results.sarif'
2 changes: 1 addition & 1 deletion .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:
paths:
- 'doc/*'
branches:
- '4.0'
- '5.0'
pull_request:
paths:
- 'doc/*'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/notify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:
paths:
- 'doc/docs'
branches:
- '4.0'
- '5.0'

jobs:
trigger_publish:
Expand Down
15 changes: 8 additions & 7 deletions common/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@
<artifactId>neo4j-streams-common</artifactId>
<name>Neo4j Streams - Common</name>
<description>Neo4j Streams - Commons Package</description>
<version>4.1.2</version>
<version>5.0.0</version>
<packaging>jar</packaging>

<parent>
<groupId>org.neo4j</groupId>
<artifactId>neo4j-streams-parent</artifactId>
<version>4.1.2</version>
<version>5.0.0</version>
</parent>

<dependencies>
Expand All @@ -24,16 +24,17 @@
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.apache.avro</groupId>
<artifactId>avro</artifactId>
</dependency>

<dependency>
<groupId>org.apache.kafka</groupId>
<artifactId>kafka-clients</artifactId>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
</dependency>

</dependencies>

</project>
216 changes: 0 additions & 216 deletions common/src/main/kotlin/streams/config/StreamsConfig.kt

This file was deleted.

Loading

0 comments on commit 8f2dd69

Please sign in to comment.