Skip to content

Commit 680c828

Browse files
ali-inceali-ince
authored
Tidy up and upgrade dependencies (#712)
1 parent 1ce0645 commit 680c828

File tree

19 files changed

+1263
-1232
lines changed

19 files changed

+1263
-1232
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,4 @@ jobs:
2020
distribution: 'temurin'
2121
cache: 'maven'
2222
- name: Build with Maven
23-
env:
24-
# needed for excluding enterprise tests
25-
TRAVIS: true
2623
run: mvn --batch-mode clean test --no-transfer-progress

‎.mvn/wrapper/MavenWrapperDownloader.java‎

Lines changed: 0 additions & 117 deletions
This file was deleted.

‎.mvn/wrapper/maven-wrapper.jar‎

-49.5 KB
Binary file not shown.

‎.mvn/wrapper/maven-wrapper.properties‎

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,19 @@
1-
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.zip
2-
wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar
1+
# Licensed to the Apache Software Foundation (ASF) under one
2+
# or more contributor license agreements. See the NOTICE file
3+
# distributed with this work for additional information
4+
# regarding copyright ownership. The ASF licenses this file
5+
# to you under the Apache License, Version 2.0 (the
6+
# "License"); you may not use this file except in compliance
7+
# with the License. You may obtain a copy of the License at
8+
#
9+
# http://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing,
12+
# software distributed under the License is distributed on an
13+
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14+
# KIND, either express or implied. See the License for the
15+
# specific language governing permissions and limitations
16+
# under the License.
17+
wrapperVersion=3.3.2
18+
distributionType=only-script
19+
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.9/apache-maven-3.9.9-bin.zip

‎common/pom.xml‎

Lines changed: 69 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,93 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<project xmlns="http://maven.apache.org/POM/4.0.0"
3-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
2+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
54
<modelVersion>4.0.0</modelVersion>
6-
7-
<artifactId>neo4j-streams-common</artifactId>
8-
<name>Neo4j Streams - Common</name>
9-
<description>Neo4j Streams - Commons Package</description>
10-
<version>4.1.5</version>
11-
<packaging>jar</packaging>
12-
135
<parent>
146
<groupId>org.neo4j</groupId>
157
<artifactId>neo4j-streams-parent</artifactId>
168
<version>4.1.5</version>
179
</parent>
18-
10+
<artifactId>neo4j-streams-common</artifactId>
11+
<version>4.1.5</version>
12+
<packaging>jar</packaging>
13+
<name>Neo4j Streams - Common</name>
14+
<description>Neo4j Streams - Commons Package</description>
1915
<dependencies>
2016
<dependency>
21-
<groupId>org.neo4j.driver</groupId>
22-
<artifactId>neo4j-java-driver</artifactId>
23-
<scope>provided</scope>
17+
<groupId>com.fasterxml.jackson.module</groupId>
18+
<artifactId>jackson-module-kotlin</artifactId>
19+
</dependency>
20+
<dependency>
21+
<groupId>com.github.conker84</groupId>
22+
<artifactId>neo4j-configuration-lifecycle</artifactId>
2423
</dependency>
25-
2624
<dependency>
2725
<groupId>org.apache.avro</groupId>
2826
<artifactId>avro</artifactId>
2927
</dependency>
30-
3128
<dependency>
3229
<groupId>org.apache.kafka</groupId>
3330
<artifactId>kafka-clients</artifactId>
34-
<scope>provided</scope>
3531
</dependency>
36-
32+
<dependency>
33+
<groupId>org.jetbrains.kotlin</groupId>
34+
<artifactId>kotlin-reflect</artifactId>
35+
</dependency>
36+
<dependency>
37+
<groupId>org.jetbrains.kotlin</groupId>
38+
<artifactId>kotlin-stdlib-jdk8</artifactId>
39+
</dependency>
40+
<dependency>
41+
<groupId>org.jetbrains.kotlinx</groupId>
42+
<artifactId>kotlinx-coroutines-core</artifactId>
43+
</dependency>
3744
<dependency>
3845
<groupId>org.neo4j</groupId>
39-
<artifactId>neo4j-configuration</artifactId>
46+
<artifactId>neo4j</artifactId>
47+
<scope>provided</scope>
48+
</dependency>
49+
<dependency>
50+
<groupId>org.neo4j.driver</groupId>
51+
<artifactId>neo4j-java-driver</artifactId>
4052
<scope>provided</scope>
4153
</dependency>
54+
<dependency>
55+
<groupId>junit</groupId>
56+
<artifactId>junit</artifactId>
57+
<scope>test</scope>
58+
</dependency>
59+
<dependency>
60+
<groupId>org.hamcrest</groupId>
61+
<artifactId>hamcrest-all</artifactId>
62+
<scope>test</scope>
63+
</dependency>
64+
<dependency>
65+
<groupId>org.jetbrains.kotlin</groupId>
66+
<artifactId>kotlin-test</artifactId>
67+
<scope>test</scope>
68+
</dependency>
69+
<dependency>
70+
<groupId>org.mockito</groupId>
71+
<artifactId>mockito-core</artifactId>
72+
<scope>test</scope>
73+
</dependency>
74+
<dependency>
75+
<groupId>org.neo4j.community</groupId>
76+
<artifactId>it-test-support</artifactId>
77+
<scope>test</scope>
78+
</dependency>
79+
<dependency>
80+
<groupId>org.testcontainers</groupId>
81+
<artifactId>testcontainers</artifactId>
82+
<scope>test</scope>
83+
</dependency>
4284
</dependencies>
43-
85+
<build>
86+
<plugins>
87+
<plugin>
88+
<groupId>org.jetbrains.kotlin</groupId>
89+
<artifactId>kotlin-maven-plugin</artifactId>
90+
</plugin>
91+
</plugins>
92+
</build>
4493
</project>

‎consumer/pom.xml‎

Lines changed: 61 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,66 +1,91 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<project xmlns="http://maven.apache.org/POM/4.0.0"
3-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
2+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
54
<modelVersion>4.0.0</modelVersion>
6-
7-
<groupId>org.neo4j</groupId>
8-
<artifactId>neo4j-streams-consumer</artifactId>
9-
<version>4.1.5</version>
10-
<name>Neo4j Streams - Consumer</name>
11-
<description>Neo4j Streams - Kafka Consumer</description>
12-
<packaging>jar</packaging>
13-
145
<parent>
156
<groupId>org.neo4j</groupId>
167
<artifactId>neo4j-streams-parent</artifactId>
178
<version>4.1.5</version>
189
</parent>
19-
20-
<repositories>
21-
<repository>
22-
<id>confluent</id>
23-
<name>Confluent</name>
24-
<url>https://packages.confluent.io/maven/</url>
25-
</repository>
26-
</repositories>
27-
<pluginRepositories>
28-
<pluginRepository>
29-
<id>confluent</id>
30-
<url>https://packages.confluent.io/maven/</url>
31-
</pluginRepository>
32-
</pluginRepositories>
33-
10+
<artifactId>neo4j-streams-consumer</artifactId>
11+
<version>4.1.5</version>
12+
<packaging>jar</packaging>
13+
<name>Neo4j Streams - Consumer</name>
14+
<description>Neo4j Streams - Kafka Consumer</description>
3415
<dependencies>
3516
<dependency>
36-
<groupId>org.neo4j</groupId>
37-
<artifactId>neo4j-streams-common</artifactId>
38-
<version>${project.version}</version>
39-
<scope>provided</scope>
17+
<groupId>io.confluent</groupId>
18+
<artifactId>kafka-avro-serializer</artifactId>
4019
</dependency>
4120
<dependency>
4221
<groupId>org.apache.avro</groupId>
4322
<artifactId>avro</artifactId>
4423
</dependency>
45-
<dependency>
46-
<groupId>io.confluent</groupId>
47-
<artifactId>kafka-avro-serializer</artifactId>
48-
</dependency>
4924
<dependency>
5025
<groupId>org.apache.kafka</groupId>
5126
<artifactId>kafka-clients</artifactId>
5227
</dependency>
5328
<dependency>
5429
<groupId>org.neo4j</groupId>
55-
<artifactId>neo4j-streams-test-support</artifactId>
30+
<artifactId>neo4j-streams-common</artifactId>
5631
<version>${project.version}</version>
32+
</dependency>
33+
<dependency>
34+
<groupId>org.neo4j</groupId>
35+
<artifactId>neo4j</artifactId>
36+
<scope>provided</scope>
37+
<exclusions>
38+
<exclusion>
39+
<groupId>org.slf4j</groupId>
40+
<artifactId>slf4j-nop</artifactId>
41+
</exclusion>
42+
</exclusions>
43+
</dependency>
44+
<dependency>
45+
<groupId>org.hamcrest</groupId>
46+
<artifactId>hamcrest-all</artifactId>
47+
<scope>test</scope>
48+
</dependency>
49+
<dependency>
50+
<groupId>org.jetbrains.kotlin</groupId>
51+
<artifactId>kotlin-test</artifactId>
5752
<scope>test</scope>
5853
</dependency>
5954
<dependency>
6055
<groupId>org.neo4j</groupId>
6156
<artifactId>log-test-utils</artifactId>
6257
<scope>test</scope>
6358
</dependency>
64-
59+
<dependency>
60+
<groupId>org.neo4j</groupId>
61+
<artifactId>neo4j-streams-test-support</artifactId>
62+
<version>${project.version}</version>
63+
<scope>test</scope>
64+
</dependency>
6565
</dependencies>
66+
<repositories>
67+
<repository>
68+
<id>confluent</id>
69+
<name>Confluent</name>
70+
<url>https://packages.confluent.io/maven/</url>
71+
</repository>
72+
</repositories>
73+
<pluginRepositories>
74+
<pluginRepository>
75+
<id>confluent</id>
76+
<url>https://packages.confluent.io/maven/</url>
77+
</pluginRepository>
78+
</pluginRepositories>
79+
<build>
80+
<plugins>
81+
<plugin>
82+
<groupId>org.jetbrains.kotlin</groupId>
83+
<artifactId>kotlin-maven-plugin</artifactId>
84+
</plugin>
85+
<plugin>
86+
<groupId>org.apache.maven.plugins</groupId>
87+
<artifactId>maven-shade-plugin</artifactId>
88+
</plugin>
89+
</plugins>
90+
</build>
6691
</project>

0 commit comments

Comments
 (0)