Skip to content

Commit 8f2dd69

Browse files
authored
code changes in branch 5.0 (#538)
1 parent 6bfff36 commit 8f2dd69

File tree

140 files changed

+530
-17072
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

140 files changed

+530
-17072
lines changed

.github/workflows/ci.yml

+3
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,19 @@ jobs:
1313

1414
steps:
1515
- uses: actions/checkout@v2
16+
1617
- name: Set up JDK 11
1718
uses: actions/setup-java@v1
1819
with:
1920
java-version: 11
21+
2022
- name: Cache Maven packages
2123
uses: actions/cache@v1
2224
with:
2325
path: ~/.m2
2426
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
2527
restore-keys: ${{ runner.os }}-m2
28+
2629
- name: Build with Maven
2730
env:
2831
# needed for excluding enterprise tests

.github/workflows/cve.yml

+30
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
name: CVE Scanning with Trivy
2+
3+
on:
4+
push:
5+
branches: [ '**' ]
6+
pull_request:
7+
branches: [ '**' ]
8+
9+
jobs:
10+
build:
11+
name: Build
12+
runs-on: ubuntu-20.04
13+
steps:
14+
- name: Checkout code
15+
uses: actions/checkout@v3
16+
17+
- name: Run Trivy vulnerability scanner in repo mode
18+
uses: aquasecurity/trivy-action@master
19+
with:
20+
scan-type: 'fs'
21+
ignore-unfixed: true
22+
format: 'sarif'
23+
output: 'trivy-results.sarif'
24+
skip-dirs: 'doc'
25+
# severity: 'CRITICAL'
26+
27+
- name: Upload Trivy scan results to GitHub Security tab
28+
uses: github/codeql-action/upload-sarif@v2
29+
with:
30+
sarif_file: 'trivy-results.sarif'

.github/workflows/docs.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on:
55
paths:
66
- 'doc/*'
77
branches:
8-
- '4.0'
8+
- '5.0'
99
pull_request:
1010
paths:
1111
- 'doc/*'

.github/workflows/notify.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on:
55
paths:
66
- 'doc/docs'
77
branches:
8-
- '4.0'
8+
- '5.0'
99

1010
jobs:
1111
trigger_publish:

common/pom.xml

+8-7
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@
88
<artifactId>neo4j-streams-common</artifactId>
99
<name>Neo4j Streams - Common</name>
1010
<description>Neo4j Streams - Commons Package</description>
11-
<version>4.1.2</version>
11+
<version>5.0.0</version>
1212
<packaging>jar</packaging>
1313

1414
<parent>
1515
<groupId>org.neo4j</groupId>
1616
<artifactId>neo4j-streams-parent</artifactId>
17-
<version>4.1.2</version>
17+
<version>5.0.0</version>
1818
</parent>
1919

2020
<dependencies>
@@ -24,16 +24,17 @@
2424
<scope>provided</scope>
2525
</dependency>
2626

27-
<dependency>
28-
<groupId>org.apache.avro</groupId>
29-
<artifactId>avro</artifactId>
30-
</dependency>
31-
3227
<dependency>
3328
<groupId>org.apache.kafka</groupId>
3429
<artifactId>kafka-clients</artifactId>
3530
<scope>provided</scope>
3631
</dependency>
32+
33+
<dependency>
34+
<groupId>org.apache.commons</groupId>
35+
<artifactId>commons-lang3</artifactId>
36+
</dependency>
37+
3738
</dependencies>
3839

3940
</project>

common/src/main/kotlin/streams/config/StreamsConfig.kt

-216
This file was deleted.

0 commit comments

Comments
 (0)